Change in osmo-bts[master]: pcuif_proto: version 10: add frequency hopping parameters

[fixeria]

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19513 )


Change subject: pcuif_proto: version 10: add frequency hopping parameters
......................................................................

pcuif_proto: version 10: add frequency hopping parameters

Change-Id: I04782222b499d0488269544910fbd4ed9929c05d
Related: Idf11bc4ba3ff0b00b32f2beab8fd020c67119d05
Related: SYS#4868, OS#4546, OS#4547
---
M include/osmo-bts/pcuif_proto.h
M src/common/pcu_sock.c
2 files changed, 27 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/13/19513/1

diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h
index e977914..bbba179 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		0x09
+#define PCU_IF_VERSION		0x0a
 #define TXT_MAX_LEN	128
 
 /* msg_type */
@@ -112,12 +112,19 @@
 	uint8_t		ts_nr;
 } __attribute__ ((packed));
 
+struct gsm_pcu_if_info_trx_ts {
+	uint8_t		tsc;
+	uint8_t		hopping;
+	uint8_t		hsn;
+	uint8_t		maio;
+	uint8_t		ma[8];
+} __attribute__ ((packed));
+
 struct gsm_pcu_if_info_trx {
 	uint16_t	arfcn;
 	uint8_t		pdch_mask;		/* PDCH channels per TS */
-	uint8_t		spare;
-	uint8_t		tsc[8];			/* TSC per channel */
 	uint32_t	hlayer1;
+	struct gsm_pcu_if_info_trx_ts ts[8];
 } __attribute__ ((packed));
 
 struct gsm_pcu_if_info_ind {
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 53822a2..d8fccc9 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -138,10 +138,25 @@
 			continue;
 
 		trx_info->pdch_mask |= (1 << tn);
-		trx_info->tsc[tn] = gsm_ts_tsc(ts);
+		trx_info->ts[tn].tsc = gsm_ts_tsc(ts);
+
+		if ((trx_info->ts[tn].hopping = ts->hopping.enabled)) {
+			trx_info->ts[tn].maio = ts->hopping.maio;
+			trx_info->ts[tn].hsn = ts->hopping.hsn;
+
+			/* Mobile Allocation (8 * 8 bit buffer) */
+			memcpy(trx_info->ts[tn].ma, ts->hopping.ma,
+			       sizeof(trx_info->ts[tn].ma));
+		}
 
 		LOGPTRX(trx, DPCU, LOGL_INFO, "PDCH on ts=%u is available "
-			"(tsc=%u arfcn=%u)\n", ts->nr, trx_info->tsc[tn], trx->arfcn);
+			"(tsc=%u ", ts->nr, trx_info->ts[tn].tsc);
+		if (ts->hopping.enabled) {
+			LOGPC(DPCU, LOGL_INFO, "hopping=yes hsn=%u maio=%u ma_len=%u)\n",
+			      ts->hopping.hsn, ts->hopping.maio, ts->hopping.ma_len);
+		} else {
+			LOGPC(DPCU, LOGL_INFO, "hopping=no arfcn=%u)\n", trx->arfcn);
+		}
 	}
 }
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19513
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I04782222b499d0488269544910fbd4ed9929c05d
Gerrit-Change-Number: 19513
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200802/591862ea/attachment.htm>