diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-02-21 00:38:05 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-11 00:45:49 +0100 |
| commit | 02d1fe87f0fdf4d9e08cde9f727f00e17343c20c (patch) | |
| tree | cfe3f9d74d2b24735fcee66cd2ef4b465c7a2fe3 /include | |
| parent | 29cd7a84089b4a29748a0c9723f539bc6005ad99 (diff) | |
implement support for 3-digit MNC with leading zeros
Record the mnc_3_digits flag from SI and pass on via the PCU interface.
Instead of changing to e.g. osmo_plmn_id, add the flag separately, and instead
of bool use a uint8_t, to not raise any struct packing issues and clarify the
flag's size beyond any doubt.
Bump the PCU interface version to 9.
This is one part of the three identical pcuif_proto.h patches:
- I49cd762c3c9d7ee6a82451bdf3ffa2a060767947 (osmo-bts)
- I787fed84a7b613158a5618dd5cffafe4e4927234 (osmo-pcu)
- I78f30aef7aa224b2e9db54c3a844d8f520b3aee0 (osmo-bsc)
Depends: Id2240f7f518494c9df6c8bda52c0d5092f90f221 (libosmocore)
Change-Id: I49cd762c3c9d7ee6a82451bdf3ffa2a060767947
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmo-bts/gsm_data.h | 3 | ||||
| -rw-r--r-- | include/osmo-bts/pcuif_proto.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 10c9d049..16521044 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -4,6 +4,7 @@ #include <osmocom/core/timer.h> #include <osmocom/core/linuxlist.h> #include <osmocom/gsm/lapdm.h> +#include <osmocom/gsm/gsm23003.h> #include <osmo-bts/paging.h> #include <osmo-bts/tx_power.h> @@ -29,7 +30,7 @@ struct smscb_msg; struct gsm_network { struct llist_head bts_list; unsigned int num_bts; - uint16_t mcc, mnc; + struct osmo_plmn_id plmn; struct pcu_sock_state *pcu_state; }; diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index 00b7bd54..b06077c3 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -5,7 +5,7 @@ #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" -#define PCU_IF_VERSION 0x08 +#define PCU_IF_VERSION 0x09 #define TXT_MAX_LEN 128 /* msg_type */ @@ -122,7 +122,9 @@ struct gsm_pcu_if_info_ind { struct gsm_pcu_if_info_trx trx[8]; /* TRX infos per BTS */ uint8_t bsic; /* RAI */ - uint16_t mcc, mnc, lac, rac; + uint16_t mcc, mnc; + uint8_t mnc_3_digits; + uint16_t lac, rac; /* NSE */ uint16_t nsei; uint8_t nse_timer[7]; |