diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-07-23 10:53:30 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-07-23 10:53:30 +0200 |
| commit | b226864db5951e3da21dc45a611c8590c22fee30 (patch) | |
| tree | 854bf225173f87e3256a8d54e7677d91158bf2ef | |
| parent | d455ebe5ff38778643ce43b7e03fdcc6cd6cbcc0 (diff) | |
fix some header file related issues preventing lcr from compiling
| -rw-r--r-- | openbsc/include/openbsc/gsm_04_08.h | 10 | ||||
| -rw-r--r-- | openbsc/src/libbsc/gsm_04_08_utils.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/openbsc/include/openbsc/gsm_04_08.h b/openbsc/include/openbsc/gsm_04_08.h index b9b89e60c..ec6c2c001 100644 --- a/openbsc/include/openbsc/gsm_04_08.h +++ b/openbsc/include/openbsc/gsm_04_08.h @@ -1,10 +1,11 @@ #ifndef _GSM_04_08_H #define _GSM_04_08_H -#include <openbsc/meas_rep.h> - -#include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/gsm48.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> + +#include <openbsc/meas_rep.h> struct msgb; struct gsm_bts; @@ -31,7 +32,8 @@ int gsm0408_dispatch(struct gsm_subscriber_connection *conn, struct msgb *msg); int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id); int gsm0408_new_conn(struct gsm_subscriber_connection *conn); enum gsm_chan_t get_ctype_by_chreq(struct gsm_network *bts, uint8_t ra); -enum gsm_chreq_reason_t get_reason_by_chreq(uint8_t ra, int neci); +/* don't use "enum gsm_chreq_reason_t" to avoid circular dependency */ +int get_reason_by_chreq(uint8_t ra, int neci); void gsm_net_update_ctype(struct gsm_network *net); int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn); diff --git a/openbsc/src/libbsc/gsm_04_08_utils.c b/openbsc/src/libbsc/gsm_04_08_utils.c index 17bce85a6..92335f24c 100644 --- a/openbsc/src/libbsc/gsm_04_08_utils.c +++ b/openbsc/src/libbsc/gsm_04_08_utils.c @@ -190,7 +190,7 @@ enum gsm_chan_t get_ctype_by_chreq(struct gsm_network *network, uint8_t ra) return GSM_LCHAN_SDCCH; } -enum gsm_chreq_reason_t get_reason_by_chreq(uint8_t ra, int neci) +int get_reason_by_chreq(uint8_t ra, int neci) { int i; int length; |