[PATCH] osmo-bsc[master]: pcu_if: implement support for 3-digit MNC -- TODO

2018-02-27 Thread Neels Hofmeyr
Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/6669

to look at the new patch set (#3).

pcu_if: implement support for 3-digit MNC -- TODO

I am actually unsure how this one relates to the pcuif of osmo-bts and
osmo-pcu, if at all. Pushing this for review to probe the community for the
proper counterpart of this.

Change-Id: I78f30aef7aa224b2e9db54c3a844d8f520b3aee0
---
M include/osmocom/bsc/pcuif_proto.h
M src/libbsc/pcu_sock.c
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/6669/3

diff --git a/include/osmocom/bsc/pcuif_proto.h 
b/include/osmocom/bsc/pcuif_proto.h
index eb28d66..2e3f782 100644
--- a/include/osmocom/bsc/pcuif_proto.h
+++ b/include/osmocom/bsc/pcuif_proto.h
@@ -1,7 +1,7 @@
 #ifndef _PCUIF_PROTO_H
 #define _PCUIF_PROTO_H
 
-#define PCU_IF_VERSION 0x08
+#define PCU_IF_VERSION 0x09
 
 /* msg_type */
 #define PCU_IF_MSG_DATA_REQ0x00/* send data to given channel */
@@ -106,7 +106,9 @@
struct gsm_pcu_if_info_trx trx[8];  /* TRX infos per BTS */
uint8_t bsic;
/* RAI */
-   uint16_tmcc, mnc, lac, rac;
+   uint16_tmcc, mnc;
+   uint8_t mnc_3_digits;
+   uint16_tlac, rac;
/* NSE */
uint16_tnsei;
uint8_t nse_timer[7];
diff --git a/src/libbsc/pcu_sock.c b/src/libbsc/pcu_sock.c
index 85af598..caec40d 100644
--- a/src/libbsc/pcu_sock.c
+++ b/src/libbsc/pcu_sock.c
@@ -154,7 +154,7 @@
/* RAI */
info_ind->mcc = bts->network->plmn.mcc;
info_ind->mnc = bts->network->plmn.mnc;
-   /* TODO: plmn.mnc_3_digits */
+   info_ind->mnc_3_digits = bts->network->plmn.mnc_3_digits;
info_ind->lac = bts->location_area_code;
info_ind->rac = bts->gprs.rac;
 

-- 
To view, visit https://gerrit.osmocom.org/6669
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I78f30aef7aa224b2e9db54c3a844d8f520b3aee0
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder


[PATCH] osmo-bsc[master]: pcu_if: implement support for 3-digit MNC -- TODO

2018-02-21 Thread Neels Hofmeyr

Review at  https://gerrit.osmocom.org/6669

pcu_if: implement support for 3-digit MNC -- TODO

I am actually unsure how this one relates to the pcuif of osmo-bts and
osmo-pcu, if at all. Pushing this for review to probe the community for the
proper counterpart of this.

Change-Id: I78f30aef7aa224b2e9db54c3a844d8f520b3aee0
---
M include/osmocom/bsc/pcuif_proto.h
M src/libbsc/pcu_sock.c
2 files changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/6669/1

diff --git a/include/osmocom/bsc/pcuif_proto.h 
b/include/osmocom/bsc/pcuif_proto.h
index eb28d66..2e3f782 100644
--- a/include/osmocom/bsc/pcuif_proto.h
+++ b/include/osmocom/bsc/pcuif_proto.h
@@ -1,7 +1,7 @@
 #ifndef _PCUIF_PROTO_H
 #define _PCUIF_PROTO_H
 
-#define PCU_IF_VERSION 0x08
+#define PCU_IF_VERSION 0x09
 
 /* msg_type */
 #define PCU_IF_MSG_DATA_REQ0x00/* send data to given channel */
@@ -106,7 +106,9 @@
struct gsm_pcu_if_info_trx trx[8];  /* TRX infos per BTS */
uint8_t bsic;
/* RAI */
-   uint16_tmcc, mnc, lac, rac;
+   uint16_tmcc, mnc;
+   uint8_t mnc_3_digits;
+   uint16_tlac, rac;
/* NSE */
uint16_tnsei;
uint8_t nse_timer[7];
diff --git a/src/libbsc/pcu_sock.c b/src/libbsc/pcu_sock.c
index 9f1c80c..0075a93 100644
--- a/src/libbsc/pcu_sock.c
+++ b/src/libbsc/pcu_sock.c
@@ -154,6 +154,7 @@
/* RAI */
info_ind->mcc = bts->network->country_code;
info_ind->mnc = bts->network->network_code;
+   info_ind->mnc_3_digits = bts->network->network_code_3_digits;
info_ind->lac = bts->location_area_code;
info_ind->rac = bts->gprs.rac;
 

-- 
To view, visit https://gerrit.osmocom.org/6669
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78f30aef7aa224b2e9db54c3a844d8f520b3aee0
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr