[MERGED] osmo-bts[master]: Move copy-pasted array into shared header

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: Move copy-pasted array into shared header
......................................................................


Move copy-pasted array into shared header

Change-Id: I377ece2845830e3defab2d515f44b629ce5aed8e
---
M include/osmo-bts/l1sap.h
M src/common/l1sap.c
M src/osmo-bts-litecell15/l1_if.c
M src/osmo-bts-sysmo/l1_if.c
4 files changed, 8 insertions(+), 18 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h
index 981cd75..77bfbaa 100644
--- a/include/osmo-bts/l1sap.h
+++ b/include/osmo-bts/l1sap.h
@@ -1,6 +1,8 @@
 #ifndef L1SAP_H
 #define L1SAP_H
 
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+
 /* timeslot and subslot from chan_nr */
 #define L1SAP_CHAN2TS(chan_nr) (chan_nr & 7)
 #define L1SAP_CHAN2SS_TCHH(chan_nr) ((chan_nr >> 3) & 1)
@@ -28,6 +30,12 @@
 #define L1SAP_FN2PTCCHBLOCK(fn) ((fn / 104) & 3)
 #define L1SAP_IS_PTCCH(fn) ((fn % 52) == 12)
 
+static const uint8_t fill_frame[GSM_MACBLOCK_LEN] = {
+        0x03, 0x03, 0x01, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B,
+        0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B,
+        0x2B, 0x2B, 0x2B
+};
+
 /* subslot from any chan_nr */
 static inline uint8_t l1sap_chan2ss(uint8_t chan_nr)
 {
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index dd34d80..dd234ee 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -86,12 +86,6 @@
 	return GSM_RTP_DURATION;
 }
 
-static const uint8_t fill_frame[GSM_MACBLOCK_LEN] = {
-        0x03, 0x03, 0x01, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B,
-        0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B,
-        0x2B, 0x2B, 0x2B
-};
-
 /* allocate a msgb containing a osmo_phsap_prim + optional l2 data
  * in order to wrap femtobts header arround l2 data, there must be enough space
  * in front and behind data pointer */
diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index a4378c1..1c98951 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -286,12 +286,6 @@
 	return empty_req;
 }
 
-static const uint8_t fill_frame[GSM_MACBLOCK_LEN] = {
-	0x03, 0x03, 0x01, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B,
-	0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B,
-	0x2B, 0x2B, 0x2B
-};
-
 /* fill PH-DATA.req from l1sap primitive */
 static GsmL1_PhDataReq_t *
 data_req_from_l1sap(GsmL1_Prim_t *l1p, struct lc15l1_hdl *fl1,
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 09627af..11a5729 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -281,12 +281,6 @@
 	return empty_req;
 }
 
-static const uint8_t fill_frame[GSM_MACBLOCK_LEN] = {
-	0x03, 0x03, 0x01, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B,
-	0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B,
-	0x2B, 0x2B, 0x2B
-};
-
 /* fill PH-DATA.req from l1sap primitive */
 static GsmL1_PhDataReq_t *
 data_req_from_l1sap(GsmL1_Prim_t *l1p, struct femtol1_hdl *fl1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I377ece2845830e3defab2d515f44b629ce5aed8e
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder