[misc] Fix compile warnings...

This commit is contained in:
Holger Freyther 2009-03-09 16:17:14 +00:00
parent 015b9ad9db
commit ff9592fa10
6 changed files with 22 additions and 6 deletions

View File

@ -139,4 +139,10 @@ int e1inp_event(struct e1inp_ts *ts, int evt, u_int8_t tei, u_int8_t sapi);
/* called by TRAU muxer to obtain the destination mux entity */
struct subch_mux *e1inp_get_mux(u_int8_t e1_nr, u_int8_t ts_nr);
/* e1_config.c */
int e1_config(struct gsm_bts *bts);
int ia_config(struct gsm_bts *bts);
int ipaccess_setup(struct e1inp_line *line);
#endif /* _E1_INPUT_H */

View File

@ -20,8 +20,9 @@
#ifndef MISDN_H
#define MISDN_H
int mi_setup(struct gsm_bts *bts, int cardnr,
void (cb)(int event, struct gsm_bts *bts));
#include "e1_input.h"
int mi_setup(int cardnr, struct e1inp_line *line);
void mi_set_pcap_fd(int fd);
int _abis_nm_sendmsg(struct msgb *msg);

View File

@ -428,6 +428,9 @@ int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj,
break;
}
break;
case EVT_STATECHG_ADM:
DEBUGP(DMM, "Unhandled state change in %s:%d\n", __func__, __LINE__);
break;
}
return 0;
}

View File

@ -4,6 +4,7 @@
#include <openbsc/gsm_data.h>
#include <openbsc/e1_input.h>
#include <openbsc/trau_mux.h>
#include <openbsc/misdn.h>
#define SAPI_L2ML 0
#define SAPI_OML 62
@ -67,7 +68,7 @@ int e1_config(struct gsm_bts *bts)
bts->trx[1].rsl_link = rsl_link;
#endif
return mi_setup(0, line, NULL);
return mi_setup(0, line);
}
/* do some compiled-in configuration for our BTS/E1 setup */

View File

@ -57,6 +57,9 @@ static LLIST_HEAD(driver_list);
/* list of all E1 lines */
static LLIST_HEAD(line_list);
/* to be implemented, e.g. by bsc_hack.c */
void input_event(int event, enum e1inp_sign_type type, struct gsm_bts_trx *trx);
#if 0
/*
* pcap writing of the misdn load
@ -430,7 +433,8 @@ int e1inp_event(struct e1inp_ts *ts, int evt, u_int8_t tei, u_int8_t sapi)
return -EINVAL;
/* FIXME: report further upwards */
return input_event(evt, link->type, link->trx);
input_event(evt, link->type, link->trx);
return 0;
}
/* register a driver with the E1 core */

View File

@ -56,10 +56,11 @@ static const u_int8_t id_ack[] = { 0, 1, IPAC_PROTO_IPACCESS, IPAC_MSGT_ID_ACK }
static int ipaccess_rcvmsg(struct msgb *msg, int fd)
{
u_int8_t msg_type = *(msg->l2h);
int ret = 0;
switch (msg_type) {
case IPAC_MSGT_PING:
write(fd, pong, sizeof(pong));
ret = write(fd, pong, sizeof(pong));
break;
case IPAC_MSGT_PONG:
DEBUGP(DMI, "PONG!\n");
@ -69,7 +70,7 @@ static int ipaccess_rcvmsg(struct msgb *msg, int fd)
break;
case IPAC_MSGT_ID_ACK:
DEBUGP(DMI, "ID_ACK? -> ACK!\n");
write(fd, id_ack, sizeof(id_ack));
ret = write(fd, id_ack, sizeof(id_ack));
break;
}