Change in osmo-bts[master]: osmo-bts-trx: 'burst type' is actually modulation type

laforge gerrit-no-reply at lists.osmocom.org
Sat Apr 24 08:47:02 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23827 )

Change subject: osmo-bts-trx: 'burst type' is actually modulation type
......................................................................

osmo-bts-trx: 'burst type' is actually modulation type

Burst type and modulation type are actually different things.

Change-Id: Ic06c96434ad32dd3770b88cb1fefcbefb2fc3928
Related: SYS#4895, OS#4941, OS#4006
---
M include/osmo-bts/scheduler.h
M src/osmo-bts-trx/sched_lchan_pdtch.c
M src/osmo-bts-trx/trx_if.c
3 files changed, 18 insertions(+), 18 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  dexter: Looks good to me, but someone else must approve
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h
index b1e4294..ad6e5c5 100644
--- a/include/osmo-bts/scheduler.h
+++ b/include/osmo-bts/scheduler.h
@@ -63,9 +63,9 @@
 #define GPRS_BURST_LEN		GSM_BURST_LEN
 #define EGPRS_BURST_LEN		444
 
-enum trx_burst_type {
-	TRX_BURST_GMSK,
-	TRX_BURST_8PSK,
+enum trx_mod_type {
+	TRX_MOD_T_GMSK,
+	TRX_MOD_T_8PSK,
 };
 
 /* A set of measurements belonging to one Uplink burst */
@@ -85,7 +85,7 @@
 	/* scheduler */
 	bool			active;		/* Channel is active */
 	ubit_t			*dl_bursts;	/* burst buffer for TX */
-	enum trx_burst_type	dl_burst_type;  /* GMSK or 8PSK burst type */
+	enum trx_mod_type	dl_mod_type;	/* Downlink modulation type */
 	sbit_t			*ul_bursts;	/* burst buffer for RX */
 	sbit_t			*ul_bursts_prev;/* previous burst buffer for RX (repeated SACCH) */
 	uint32_t		ul_first_fn;	/* fn of first burst */
@@ -244,7 +244,7 @@
 	int8_t rssi;		/*!< Received Signal Strength Indication */
 
 	/* Optional fields (defined by flags) */
-	enum trx_burst_type bt;	/*!< Modulation type */
+	enum trx_mod_type mod;	/*!< Modulation type */
 	uint8_t tsc_set;	/*!< Training Sequence Set */
 	uint8_t tsc;		/*!< Training Sequence Code */
 	int16_t ci_cb;		/*!< Carrier-to-Interference ratio (in centiBels) */
diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c
index 5e61a1d..d936f75 100644
--- a/src/osmo-bts-trx/sched_lchan_pdtch.c
+++ b/src/osmo-bts-trx/sched_lchan_pdtch.c
@@ -156,7 +156,7 @@
 	struct gsm_bts_trx_ts *ts = &l1t->trx->ts[br->tn];
 	struct msgb *msg = NULL; /* make GCC happy */
 	ubit_t *burst, **bursts_p = &l1ts->chan_state[chan].dl_bursts;
-	enum trx_burst_type *burst_type = &l1ts->chan_state[chan].dl_burst_type;
+	enum trx_mod_type *mod = &l1ts->chan_state[chan].dl_mod_type;
 	int rc = 0;
 
 	/* send burst, if we already got a frame */
@@ -205,9 +205,9 @@
 		msgb_free(msg);
 		goto no_msg;
 	} else if (rc == GSM0503_EGPRS_BURSTS_NBITS) {
-		*burst_type = TRX_BURST_8PSK;
+		*mod = TRX_MOD_T_8PSK;
 	} else {
-		*burst_type = TRX_BURST_GMSK;
+		*mod = TRX_MOD_T_GMSK;
 	}
 
 	/* free message */
@@ -215,7 +215,7 @@
 
 send_burst:
 	/* compose burst */
-	if (*burst_type == TRX_BURST_8PSK) {
+	if (*mod == TRX_MOD_T_8PSK) {
 		burst = *bursts_p + bid * 348;
 		memset(br->burst, 1, 9);
 		memcpy(br->burst + 9, burst, 174);
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index 905d3da..bfa1514 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -786,11 +786,11 @@
 	/* Modulation info and TSC set */
 	mts = (buf[0] >> 3) & 0b1111;
 	if ((mts & 0b1100) == 0x00) {
-		bi->bt = TRX_BURST_GMSK;
+		bi->mod = TRX_MOD_T_GMSK;
 		bi->tsc_set = mts & 0b11;
 		bi->flags |= TRX_BI_F_MOD_TYPE;
 	} else if ((mts & 0b0100) == 0b0100) {
-		bi->bt = TRX_BURST_8PSK;
+		bi->mod = TRX_MOD_T_8PSK;
 		bi->tsc_set = mts & 0b1;
 		bi->flags |= TRX_BI_F_MOD_TYPE;
 	} else {
@@ -854,15 +854,15 @@
 {
 	/* Modulation types defined in 3GPP TS 45.002 */
 	static const size_t bl[] = {
-		[TRX_BURST_GMSK] = 148, /* 1 bit per symbol */
-		[TRX_BURST_8PSK] = 444, /* 3 bits per symbol */
+		[TRX_MOD_T_GMSK] = 148, /* 1 bit per symbol */
+		[TRX_MOD_T_8PSK] = 444, /* 3 bits per symbol */
 	};
 
 	/* Verify burst length */
-	if (bl[bi->bt] != buf_len) {
+	if (bl[bi->mod] != buf_len) {
 		LOGPPHI(l1h->phy_inst, DTRX, LOGL_NOTICE,
 			"Rx TRXD message with odd burst length %zu, "
-			"expected %zu\n", buf_len, bl[bi->bt]);
+			"expected %zu\n", buf_len, bl[bi->mod]);
 		return -EINVAL;
 	}
 
@@ -878,8 +878,8 @@
 
 	/* Modulation types defined in 3GPP TS 45.002 */
 	static const char *mod_names[] = {
-		[TRX_BURST_GMSK] = "GMSK",
-		[TRX_BURST_8PSK] = "8-PSK",
+		[TRX_MOD_T_GMSK] = "GMSK",
+		[TRX_MOD_T_8PSK] = "8-PSK",
 	};
 
 	/* Initialize the string buffer */
@@ -901,7 +901,7 @@
 
 	/* Modulation and TSC set */
 	if (bi->flags & TRX_BI_F_MOD_TYPE)
-		OSMO_STRBUF_PRINTF(sb, " mod=%s", mod_names[bi->bt]);
+		OSMO_STRBUF_PRINTF(sb, " mod=%s", mod_names[bi->mod]);
 
 	/* Training Sequence Code */
 	if (bi->flags & TRX_BI_F_TS_INFO)

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ic06c96434ad32dd3770b88cb1fefcbefb2fc3928
Gerrit-Change-Number: 23827
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210424/fbfd4942/attachment.htm>


More information about the gerrit-log mailing list