Change in ...osmo-pcu[master]: pcu_l1_if.cpp: Replace value 23 with libosmocore's GSM_MACBLOCK_LEN

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Mon Oct 7 19:57:47 UTC 2019


laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15686 )

Change subject: pcu_l1_if.cpp: Replace value 23 with libosmocore's GSM_MACBLOCK_LEN
......................................................................

pcu_l1_if.cpp: Replace value 23 with libosmocore's GSM_MACBLOCK_LEN

Change-Id: Ieec3dd028fffa1a735afaaf3f93da0a1202d122a
---
M src/pcu_l1_if.cpp
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 4ed512a..883cb22 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -208,16 +208,16 @@
 void pcu_l1if_tx_agch(bitvec * block, int plen)
 {
 	struct gprs_rlcmac_bts *bts = bts_main_data();
-	uint8_t data[23]; /* prefix PLEN */
-	
+	uint8_t data[GSM_MACBLOCK_LEN]; /* prefix PLEN */
+
 	/* FIXME: why does OpenBTS has no PLEN and no fill in message? */
 	bitvec_pack(block, data + 1);
 	data[0] = (plen << 2) | 0x01;
 
 	if (bts->gsmtap_categ_mask & (1 << PCU_GSMTAP_C_DL_AGCH))
-		gsmtap_send(bts->gsmtap, 0, 0, GSMTAP_CHANNEL_AGCH, 0, 0, 0, 0, data, 23);
+		gsmtap_send(bts->gsmtap, 0, 0, GSMTAP_CHANNEL_AGCH, 0, 0, 0, 0, data, GSM_MACBLOCK_LEN);
 
-	pcu_tx_data_req(0, 0, PCU_IF_SAPI_AGCH, 0, 0, 0, data, 23);
+	pcu_tx_data_req(0, 0, PCU_IF_SAPI_AGCH, 0, 0, 0, data, GSM_MACBLOCK_LEN);
 }
 
 #define PAGING_GROUP_LEN 3
@@ -379,8 +379,8 @@
 	case PCU_IF_SAPI_PTCCH:
 		/* FIXME */
 		{
-			struct msgb *msg = msgb_alloc(23, "l1_prim");
-			memset(msgb_put(msg, 23), 0x2b, 23);
+			struct msgb *msg = msgb_alloc(GSM_MACBLOCK_LEN, "l1_prim");
+			memset(msgb_put(msg, GSM_MACBLOCK_LEN), 0x2b, GSM_MACBLOCK_LEN);
 			pcu_l1if_tx_ptcch(msg, rts_req->trx_nr, rts_req->ts_nr,
 				rts_req->arfcn, rts_req->fn, rts_req->block_nr);
 		}

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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ieec3dd028fffa1a735afaaf3f93da0a1202d122a
Gerrit-Change-Number: 15686
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191007/58819c72/attachment.htm>


More information about the gerrit-log mailing list