diff options
| author | Max <msuraev@sysmocom.de> | 2017-08-29 13:14:24 +0200 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2017-08-30 08:26:12 +0000 |
| commit | 5932ff04a1c7c3c831dae366d394d7ef0f8d1ffd (patch) | |
| tree | f5faa9ea3f34b4d72bbc651725115fcb81053ebd /openbsc/include | |
| parent | e747a9b9231e286f4bc72848e039aaa9d76b269d (diff) | |
SI13: drop PBCCH-related bits
According to 3GPP TS 44.018 ยง1.8 the "network shall never enable PBCCH
and PCCCH".
Change-Id: I319e71a4b0c682361529e9c21377398a826b934b
Related: OS#2400
Diffstat (limited to 'openbsc/include')
| -rw-r--r-- | openbsc/include/openbsc/rest_octets.h | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/openbsc/include/openbsc/rest_octets.h b/openbsc/include/openbsc/rest_octets.h index 49a231296..ca7b57c95 100644 --- a/openbsc/include/openbsc/rest_octets.h +++ b/openbsc/include/openbsc/rest_octets.h @@ -62,12 +62,6 @@ int rest_octets_si3(uint8_t *data, const struct gsm48_si_ro_info *si3); /* Generate SI4 Rest Octets (Chapter 10.5.2.35) */ int rest_octets_si4(uint8_t *data, const struct gsm48_si_ro_info *si4, int len); -enum pbcch_carrier_type { - PBCCH_BCCH, - PBCCH_ARFCN, - PBCCH_MAIO -}; - /* TS 03.60 Chapter 6.3.3.1: Network Mode of Operation */ enum gprs_nmo { GPRS_NMO_I = 0, /* CS pagin on GPRS paging or traffic channel */ @@ -112,25 +106,10 @@ struct gsm48_si13_info { struct gprs_power_ctrl_pars pwr_ctrl_pars; uint8_t bcch_change_mark; uint8_t si_change_field; - uint8_t pbcch_present; - - union { - struct { - uint8_t rac; - uint8_t spgc_ccch_sup; - uint8_t net_ctrl_ord; - uint8_t prio_acc_thr; - } no_pbcch; - struct { - uint8_t psi1_rep_per; - uint8_t pb; - uint8_t tsc; - uint8_t tn; - enum pbcch_carrier_type carrier_type; - uint16_t arfcn; - uint8_t maio; - } pbcch; - }; + uint8_t rac; + uint8_t spgc_ccch_sup; + uint8_t net_ctrl_ord; + uint8_t prio_acc_thr; }; /* Generate SI13 Rest Octests (Chapter 10.5.2.37b) */ |