diff options
Diffstat (limited to 'openbsc/include/openbsc')
-rw-r--r-- | openbsc/include/openbsc/db.h | 4 | ||||
-rw-r--r-- | openbsc/include/openbsc/debug.h | 1 | ||||
-rw-r--r-- | openbsc/include/openbsc/gprs_sgsn.h | 2 | ||||
-rw-r--r-- | openbsc/include/openbsc/gsm_04_08.h | 10 | ||||
-rw-r--r-- | openbsc/include/openbsc/mgcp.h | 2 | ||||
-rw-r--r-- | openbsc/include/openbsc/osmo_msc_data.h | 2 | ||||
-rw-r--r-- | openbsc/include/openbsc/paging.h | 2 |
7 files changed, 14 insertions, 9 deletions
diff --git a/openbsc/include/openbsc/db.h b/openbsc/include/openbsc/db.h index 37011a16e..d0c85ea30 100644 --- a/openbsc/include/openbsc/db.h +++ b/openbsc/include/openbsc/db.h @@ -31,8 +31,8 @@ struct gsm_subscriber; /* one time initialisation */ int db_init(const char *name); -int db_prepare(); -int db_fini(); +int db_prepare(void); +int db_fini(void); /* subscriber management */ struct gsm_subscriber *db_create_subscriber(struct gsm_network *net, diff --git a/openbsc/include/openbsc/debug.h b/openbsc/include/openbsc/debug.h index ff4aec1d5..d78252a93 100644 --- a/openbsc/include/openbsc/debug.h +++ b/openbsc/include/openbsc/debug.h @@ -35,6 +35,7 @@ enum { DLLC, DSNDCP, DNAT, + DCTRL, Debug_LastEntry, }; diff --git a/openbsc/include/openbsc/gprs_sgsn.h b/openbsc/include/openbsc/gprs_sgsn.h index 5023d0684..62fbb85a5 100644 --- a/openbsc/include/openbsc/gprs_sgsn.h +++ b/openbsc/include/openbsc/gprs_sgsn.h @@ -78,7 +78,7 @@ struct sgsn_mm_ctx { /* CKSN */ enum gprs_ciph_algo ciph_algo; struct { - uint8_t buf[14]; /* 10.5.5.12a */ + uint8_t buf[52]; /* 10.5.5.12a */ uint8_t len; } ms_radio_access_capa; struct { 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/include/openbsc/mgcp.h b/openbsc/include/openbsc/mgcp.h index b9f81161f..7c290c7f3 100644 --- a/openbsc/include/openbsc/mgcp.h +++ b/openbsc/include/openbsc/mgcp.h @@ -82,7 +82,7 @@ struct mgcp_trunk_config; typedef int (*mgcp_realloc)(struct mgcp_trunk_config *cfg, int endpoint); typedef int (*mgcp_change)(struct mgcp_trunk_config *cfg, int endpoint, int state); typedef int (*mgcp_policy)(struct mgcp_trunk_config *cfg, int endpoint, int state, const char *transactio_id); -typedef int (*mgcp_reset)(struct mgcp_config *cfg); +typedef int (*mgcp_reset)(struct mgcp_trunk_config *cfg); #define PORT_ALLOC_STATIC 0 #define PORT_ALLOC_DYNAMIC 1 diff --git a/openbsc/include/openbsc/osmo_msc_data.h b/openbsc/include/openbsc/osmo_msc_data.h index 3212b3657..59b75c303 100644 --- a/openbsc/include/openbsc/osmo_msc_data.h +++ b/openbsc/include/openbsc/osmo_msc_data.h @@ -65,7 +65,7 @@ struct osmo_msc_data { char *mid_call_txt; int mid_call_timeout; char *rf_ctrl_name; - struct osmo_bsc_rf *rf_ctl; + struct osmo_bsc_rf *rf_ctrl; /* ussd welcome text */ char *ussd_welcome_txt; diff --git a/openbsc/include/openbsc/paging.h b/openbsc/include/openbsc/paging.h index 0872eb866..e1438ba4c 100644 --- a/openbsc/include/openbsc/paging.h +++ b/openbsc/include/openbsc/paging.h @@ -68,4 +68,6 @@ void paging_update_buffer_space(struct gsm_bts *bts, uint16_t); /* pending paging requests */ unsigned int paging_pending_requests_nr(struct gsm_bts *bts); +void *paging_get_data(struct gsm_bts *bts, struct gsm_subscriber *subscr); + #endif |