fixeria has uploaded this change for review.
trxcon: use 3GPP TS 45.002 definitions from libosmogsm
Change-Id: Ieb3b502e1e5432e425a55c1217211b77e9ca91c9
Depends: libosmocore.git I1c38ccc2b64ba9046bb3b1221d99cc55ec493802
---
M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h
M src/host/trxcon/src/sched_lchan_desc.c
M src/host/trxcon/src/sched_lchan_pdtch.c
M src/host/trxcon/src/sched_lchan_rach.c
M src/host/trxcon/src/sched_lchan_tchf.c
M src/host/trxcon/src/sched_lchan_tchh.c
M src/host/trxcon/src/sched_lchan_xcch.c
M src/host/trxcon/src/sched_trx.c
M src/host/trxcon/src/trx_if.c
9 files changed, 59 insertions(+), 55 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/38/31738/1
diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h
index 0ea1ba0..84695fe 100644
--- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h
+++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h
@@ -14,12 +14,6 @@
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/timer.h>
-#define GSM_BURST_LEN 148
-#define GSM_BURST_PL_LEN 116
-
-#define GPRS_BURST_LEN GSM_BURST_LEN
-#define EDGE_BURST_LEN 444
-
#define GPRS_L2_MAX_LEN 54
#define EDGE_L2_MAX_LEN 155
@@ -141,7 +135,7 @@
/* Internally used by the scheduler */
uint8_t bid;
- ubit_t burst[EDGE_BURST_LEN];
+ ubit_t burst[GSM_NBITS_NB_8PSK_BURST];
size_t burst_len;
};
@@ -158,7 +152,7 @@
/* Internally used by the scheduler */
uint8_t bid;
- sbit_t burst[EDGE_BURST_LEN];
+ sbit_t burst[GSM_NBITS_NB_8PSK_BURST];
size_t burst_len;
};
diff --git a/src/host/trxcon/src/sched_lchan_desc.c b/src/host/trxcon/src/sched_lchan_desc.c
index cb1a431..e5f85b4 100644
--- a/src/host/trxcon/src/sched_lchan_desc.c
+++ b/src/host/trxcon/src/sched_lchan_desc.c
@@ -90,7 +90,7 @@
/* Rx only, xCCH convolutional coding (3GPP TS 05.03, section 4.4),
* regular interleaving (3GPP TS 05.02, clause 7, table 3):
* a L2 frame is interleaved over 4 consecutive bursts. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_AUTO,
.rx_fn = rx_data_fn,
},
@@ -113,7 +113,7 @@
/* Rx only, xCCH convolutional coding (3GPP TS 05.03, section 4.4),
* regular interleaving (3GPP TS 05.02, clause 7, table 3):
* a L2 frame is interleaved over 4 consecutive bursts. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_AUTO,
.rx_fn = rx_data_fn,
},
@@ -135,7 +135,7 @@
*
* The MS shall continuously transmit bursts, even if there is nothing
* to send, unless DTX (Discontinuous Transmission) is used. */
- .burst_buf_size = 8 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 8 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_tchf_fn,
.tx_fn = tx_tchf_fn,
@@ -164,7 +164,7 @@
*
* The MS shall continuously transmit bursts, even if there is nothing
* to send, unless DTX (Discontinuous Transmission) is used. */
- .burst_buf_size = 6 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 6 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_tchh_fn,
.tx_fn = tx_tchh_fn,
@@ -178,7 +178,7 @@
.ss_nr = 1,
/* Same as for L1SCHED_TCHH_0, see above. */
- .burst_buf_size = 6 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 6 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_tchh_fn,
.tx_fn = tx_tchh_fn,
@@ -192,7 +192,7 @@
.ss_nr = 0,
/* Same as for L1SCHED_BCCH (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -206,7 +206,7 @@
.ss_nr = 1,
/* Same as for L1SCHED_BCCH (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -220,7 +220,7 @@
.ss_nr = 2,
/* Same as for L1SCHED_BCCH (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -234,7 +234,7 @@
.ss_nr = 3,
/* Same as for L1SCHED_BCCH (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -248,7 +248,7 @@
.ss_nr = 0,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH4_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -262,7 +262,7 @@
.ss_nr = 1,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH4_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -276,7 +276,7 @@
.ss_nr = 2,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH4_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -290,7 +290,7 @@
.ss_nr = 3,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH4_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -304,7 +304,7 @@
.ss_nr = 4,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH4_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -318,7 +318,7 @@
.ss_nr = 5,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH4_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -332,7 +332,7 @@
.ss_nr = 6,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH4_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -346,7 +346,7 @@
.ss_nr = 7,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH4_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -359,7 +359,7 @@
.link_id = L1SCHED_CH_LID_SACCH,
/* Same as for L1SCHED_BCCH (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -373,7 +373,7 @@
.ss_nr = 0,
/* Same as for L1SCHED_BCCH (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -387,7 +387,7 @@
.ss_nr = 1,
/* Same as for L1SCHED_BCCH (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -401,7 +401,7 @@
.ss_nr = 0,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH4_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -415,7 +415,7 @@
.ss_nr = 1,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH4_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -429,7 +429,7 @@
.ss_nr = 2,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH4_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -443,7 +443,7 @@
.ss_nr = 3,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH4_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -457,7 +457,7 @@
.ss_nr = 0,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH8_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -471,7 +471,7 @@
.ss_nr = 1,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH8_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -485,7 +485,7 @@
.ss_nr = 2,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH8_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -499,7 +499,7 @@
.ss_nr = 3,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH8_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -513,7 +513,7 @@
.ss_nr = 4,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH8_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -527,7 +527,7 @@
.ss_nr = 5,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH8_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -541,7 +541,7 @@
.ss_nr = 6,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH8_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -555,7 +555,7 @@
.ss_nr = 7,
/* Same as for L1SCHED_BCCH and L1SCHED_SDCCH8_* (xCCH), see above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_CBTX,
.rx_fn = rx_data_fn,
.tx_fn = tx_data_fn,
@@ -570,7 +570,7 @@
* 05.03, chapter 5), regular interleaving as specified for xCCH.
* NOTE: the burst buffer is three times bigger because the
* payload of EDGE bursts is three times longer. */
- .burst_buf_size = 3 * 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_8PSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_PDCH,
.rx_fn = rx_pdtch_fn,
.tx_fn = tx_pdtch_fn,
@@ -587,7 +587,7 @@
* transfer mode. On Downlink, the network sends timing advance
* updates for several mobile stations. The coding scheme used
* for PTCCH/D messages is the same as for PDTCH CS-1. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_PDCH,
.rx_fn = rx_pdtch_fn,
.tx_fn = tx_rach_fn,
@@ -600,7 +600,7 @@
.ss_nr = 2,
/* Same as for L1SCHED_BCCH (xCCH), but Rx only. See above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.flags = L1SCHED_CH_FLAG_AUTO,
.rx_fn = rx_data_fn,
},
@@ -612,7 +612,7 @@
.ss_nr = 2,
/* Same as for L1SCHED_BCCH (xCCH), but Rx only. See above. */
- .burst_buf_size = 4 * GSM_BURST_PL_LEN,
+ .burst_buf_size = 4 * GSM_NBITS_NB_GMSK_PAYLOAD,
.rx_fn = rx_data_fn,
},
};
diff --git a/src/host/trxcon/src/sched_lchan_pdtch.c b/src/host/trxcon/src/sched_lchan_pdtch.c
index 2951c86..a518d72 100644
--- a/src/host/trxcon/src/sched_lchan_pdtch.c
+++ b/src/host/trxcon/src/sched_lchan_pdtch.c
@@ -152,7 +152,7 @@
memcpy(br->burst + 61, tsc, 26); /* TSC */
memcpy(br->burst + 87, offset + 58, 58); /* Payload 2/2 */
memset(br->burst + 145, 0, 3); /* TB */
- br->burst_len = GSM_BURST_LEN;
+ br->burst_len = GSM_NBITS_NB_GMSK_BURST;
LOGP_LCHAND(lchan, LOGL_DEBUG, "Scheduled at fn=%u burst=%u\n", br->fn, br->bid);
diff --git a/src/host/trxcon/src/sched_lchan_rach.c b/src/host/trxcon/src/sched_lchan_rach.c
index 8fd7fcc..e59c97d 100644
--- a/src/host/trxcon/src/sched_lchan_rach.c
+++ b/src/host/trxcon/src/sched_lchan_rach.c
@@ -143,8 +143,8 @@
burst_ptr += RACH_PAYLOAD_LEN;
/* BN85-156: tail bits & extended guard period */
- memset(burst_ptr, 0, br->burst + GSM_BURST_LEN - burst_ptr);
- br->burst_len = GSM_BURST_LEN;
+ memset(burst_ptr, 0, br->burst + GSM_NBITS_NB_GMSK_BURST - burst_ptr);
+ br->burst_len = GSM_NBITS_NB_GMSK_BURST;
LOGP_LCHAND(lchan, LOGL_NOTICE, "Scheduled %s-bit RACH (%s) at fn=%u\n",
L1SCHED_PRIM_IS_RACH11(lchan->prim) ? "11" : "8",
diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c
index eed1c8a..af7695b 100644
--- a/src/host/trxcon/src/sched_lchan_tchf.c
+++ b/src/host/trxcon/src/sched_lchan_tchf.c
@@ -350,7 +350,7 @@
memcpy(br->burst + 61, tsc, 26); /* TSC */
memcpy(br->burst + 87, offset + 58, 58); /* Payload 2/2 */
memset(br->burst + 145, 0, 3); /* TB */
- br->burst_len = GSM_BURST_LEN;
+ br->burst_len = GSM_NBITS_NB_GMSK_BURST;
LOGP_LCHAND(lchan, LOGL_DEBUG, "Scheduled fn=%u burst=%u\n", br->fn, br->bid);
diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c
index 963b2d4..bebd6e3 100644
--- a/src/host/trxcon/src/sched_lchan_tchh.c
+++ b/src/host/trxcon/src/sched_lchan_tchh.c
@@ -570,7 +570,7 @@
memcpy(br->burst + 61, tsc, 26); /* TSC */
memcpy(br->burst + 87, offset + 58, 58); /* Payload 2/2 */
memset(br->burst + 145, 0, 3); /* TB */
- br->burst_len = GSM_BURST_LEN;
+ br->burst_len = GSM_NBITS_NB_GMSK_BURST;
LOGP_LCHAND(lchan, LOGL_DEBUG, "Scheduled fn=%u burst=%u\n", br->fn, br->bid);
diff --git a/src/host/trxcon/src/sched_lchan_xcch.c b/src/host/trxcon/src/sched_lchan_xcch.c
index aff4220..0f47ffe 100644
--- a/src/host/trxcon/src/sched_lchan_xcch.c
+++ b/src/host/trxcon/src/sched_lchan_xcch.c
@@ -158,7 +158,7 @@
memcpy(br->burst + 61, tsc, 26); /* TSC */
memcpy(br->burst + 87, offset + 58, 58); /* Payload 2/2 */
memset(br->burst + 145, 0, 3); /* TB */
- br->burst_len = GSM_BURST_LEN;
+ br->burst_len = GSM_NBITS_NB_GMSK_BURST;
LOGP_LCHAND(lchan, LOGL_DEBUG, "Scheduled fn=%u burst=%u\n", br->fn, br->bid);
diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c
index 267f128..ac55f92 100644
--- a/src/host/trxcon/src/sched_trx.c
+++ b/src/host/trxcon/src/sched_trx.c
@@ -736,7 +736,7 @@
.toa256 = 0,
.rssi = -120,
.burst = { 0 },
- .burst_len = GSM_BURST_LEN,
+ .burst_len = GSM_NBITS_NB_GMSK_BURST,
};
/* Traverse from fp till the current frame */
diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c
index 078f71b..50c5c89 100644
--- a/src/host/trxcon/src/trx_if.c
+++ b/src/host/trxcon/src/trx_if.c
@@ -39,12 +39,12 @@
#include <osmocom/core/fsm.h>
#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/gsm/gsm0502.h>
#include <osmocom/bb/trxcon/trx_if.h>
#include <osmocom/bb/trxcon/logging.h>
#define TRXDv0_HDR_LEN 8
-#define GMSK_BURST_LEN 148
#define S(x) (1 << (x))
@@ -645,7 +645,7 @@
return read_len;
}
- if (read_len < (TRXDv0_HDR_LEN + GMSK_BURST_LEN)) {
+ if (read_len < (TRXDv0_HDR_LEN + GSM_NBITS_NB_GMSK_BURST)) {
LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR,
"Got data message with invalid length '%zd'\n", read_len);
return -EINVAL;
@@ -664,7 +664,7 @@
.fn = osmo_load32be(buf + 1),
.rssi = -(int8_t) buf[5],
.toa256 = (int16_t) (buf[6] << 8) | buf[7],
- .burst = burst, /* at least GMSK_BURST_LEN */
+ .burst = burst, /* at least GSM_NBITS_NB_GMSK_BURST */
.burst_len = read_len - TRXDv0_HDR_LEN,
};
@@ -676,7 +676,7 @@
burst[i] = 127 - buf[8 + i];
}
- if (bi.fn >= 2715648) {
+ if (bi.fn >= GSM_TDMA_HYPERFRAME) {
LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, "Illegal FN %u\n", bi.fn);
return -EINVAL;
}
To view, visit change 31738. To unsubscribe, or for help writing mail filters, visit settings.