From 97a282b037408438a876af81e2e9c5194c2bb69e Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 14 Mar 2010 15:37:43 +0800 Subject: Create new gprs-conf branch with the non-SGSN part of the gprs branch This new gprs-conf branch is intended to contain everything needed to configure GPRS in the nanoBTS, but without implementing the SGSN/GGSN functionality. The SGSN/GGSN development will happen in a branch based on this branch called "gprs-sgsn" --- openbsc/include/openbsc/abis_nm.h | 1 + openbsc/include/openbsc/gsm_data.h | 13 +++++++++++++ 2 files changed, 14 insertions(+) (limited to 'openbsc/include/openbsc') diff --git a/openbsc/include/openbsc/abis_nm.h b/openbsc/include/openbsc/abis_nm.h index cff91e0a0..45307e3c8 100644 --- a/openbsc/include/openbsc/abis_nm.h +++ b/openbsc/include/openbsc/abis_nm.h @@ -154,6 +154,7 @@ int abis_nm_ipaccess_set_attr(struct gsm_bts *bts, u_int8_t obj_class, u_int8_t *attr, u_int8_t attr_len); int abis_nm_ipaccess_rsl_connect(struct gsm_bts_trx *trx, u_int32_t ip, u_int16_t port, u_int8_t stream); +void abis_nm_ipaccess_cgi(u_int8_t *buf, struct gsm_bts *bts); int ipac_parse_bcch_info(struct ipac_bcch_info *binf, u_int8_t *buf); const char *ipacc_testres_name(u_int8_t res); diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index db3eaff59..1c18c55d9 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -374,6 +374,7 @@ struct gsm_envabtse { struct gsm_bts_gprs_nsvc { struct gsm_bts *bts; int id; + u_int16_t nsvci; struct gsm_nm_state nm_state; }; @@ -467,8 +468,10 @@ struct gsm_bts { } nse; struct { struct gsm_nm_state nm_state; + u_int16_t bvci; } cell; struct gsm_bts_gprs_nsvc nsvc[2]; + u_int8_t rac; } gprs; /* transceivers */ @@ -681,6 +684,16 @@ const char *rrlp_mode_name(enum rrlp_mode mode); void gsm_trx_lock_rf(struct gsm_bts_trx *trx, int locked); +/* A parsed GPRS routing area */ +struct gprs_ra_id { + u_int16_t mnc; + u_int16_t mcc; + u_int16_t lac; + u_int8_t rac; +}; + +int gsm48_ra_id_by_bts(u_int8_t *buf, struct gsm_bts *bts); +void gprs_ra_id_by_bts(struct gprs_ra_id *raid, struct gsm_bts *bts); struct gsm_meas_rep *lchan_next_meas_rep(struct gsm_lchan *lchan); int gsm_bts_model_register(struct gsm_bts_model *model); -- cgit v1.2.3