diff options
| author | Harald Welte <laforge@gnumonks.org> | 2009-08-06 19:20:22 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2009-08-06 19:20:22 +0200 |
| commit | 99a452a197ca56f5892ad0e7263492101e7b7db4 (patch) | |
| tree | da70f2addbfd2899b61f5e310afe9d7070d70317 /openbsc/include/openbsc | |
| parent | a1b285861e966346df9f6974fe6de499ba3e98fc (diff) | |
| parent | 67ce073110b390997fd08c69b44c6b5d9f6a3cef (diff) | |
Merge branch 'master' into sms
Diffstat (limited to 'openbsc/include/openbsc')
| -rw-r--r-- | openbsc/include/openbsc/abis_nm.h | 9 | ||||
| -rw-r--r-- | openbsc/include/openbsc/abis_rsl.h | 1 | ||||
| -rw-r--r-- | openbsc/include/openbsc/gsm_data.h | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/openbsc/include/openbsc/abis_nm.h b/openbsc/include/openbsc/abis_nm.h index 47baafb55..3dc553144 100644 --- a/openbsc/include/openbsc/abis_nm.h +++ b/openbsc/include/openbsc/abis_nm.h @@ -482,6 +482,12 @@ enum abis_nm_chan_comb { NM_CHANC_BCCH = 0x06, NM_CHANC_BCCH_CBCH = 0x07, NM_CHANC_SDCCH_CBCH = 0x08, + /* ip.access */ + NM_CHANC_IPAC_bPDCH = 0x0b, /* PBCCH + PCCCH + PDTCH/F + PACCH/F + PTCCH/F */ + NM_CHANC_IPAC_cPDCH = 0x0c, /* PBCCH + PDTCH/F + PACCH/F + PTCCH/F */ + NM_CHANC_IPAC_PDCH = 0x0d, /* PDTCH/F + PACCH/F + PTCCH/F */ + NM_CHANC_IPAC_TCHFull_PDCH = 0x80, + NM_CHANC_IPAC_TCHFull_TCHHalf = 0x81, }; /* Section 9.4.16: Event Type */ @@ -672,6 +678,9 @@ int abis_nm_software_load_status(struct gsm_bts *bts); int abis_nm_software_activate(struct gsm_bts *bts, const char *fname, gsm_cbfn *cbfn, void *cb_data); +int abis_nm_conn_mdrop_link(struct gsm_bts *bts, u_int8_t e1_port0, u_int8_t ts0, + u_int8_t e1_port1, u_int8_t ts1); + /* Siemens / BS-11 specific */ int abis_nm_bs11_reset_resource(struct gsm_bts *bts); int abis_nm_bs11_db_transmission(struct gsm_bts *bts, int begin); diff --git a/openbsc/include/openbsc/abis_rsl.h b/openbsc/include/openbsc/abis_rsl.h index a2a01d321..201c77fbc 100644 --- a/openbsc/include/openbsc/abis_rsl.h +++ b/openbsc/include/openbsc/abis_rsl.h @@ -333,6 +333,7 @@ struct rsl_ie_chan_ident { #define RSL_ERR_TALKER_ACC_FAIL 0x03 #define RSL_ERR_OM_INTERVENTION 0x07 #define RSL_ERR_NORMAL_UNSPEC 0x0f +#define RSL_ERR_T_MSRFPCI_EXP 0x18 /* resource unavailable */ #define RSL_ERR_EQUIPMENT_FAIL 0x20 #define RSL_ERR_RR_UNAVAIL 0x21 diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 50d24b679..52dec90da 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -54,6 +54,11 @@ enum gsm_chreq_reason_t { #define HARDCODED_TSC 7 #define HARDCODED_BSIC 0x3f /* NCC = 7 / BCC = 7 */ +/* for multi-drop config */ +#define HARDCODED_BTS0_TS 1 +#define HARDCODED_BTS1_TS 6 +#define HARDCODED_BTS2_TS 11 + enum gsm_hooks { GSM_HOOK_NM_SWLOAD, GSM_HOOK_RR_PAGING, |