Change in osmocom-bb[master]: trxcon: refactor trx_if_cmd_setfh(): send Rx/Tx frequencies

[fixeria]

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/18319 )


Change subject: trxcon: refactor trx_if_cmd_setfh(): send Rx/Tx frequencies
......................................................................

trxcon: refactor trx_if_cmd_setfh(): send Rx/Tx frequencies

It would make sense to send the ARFCN list in parameters of SETFH
command, if there was a clear distinction between transceivers in
fake_trx.py, i.e. which one is an MS and which is a BTS.

Right now, every Transceiver is an abstract entity that emits
and receives bursts. So when you convert an ARFCN to a pair of
Downlink/Uplink frequencies, you don't know whether it maps
as Rx/Tx or as Tx/Rx for a given Transceiver.

Of course, we could assume that this is an MS specific feature,
and a pair of Downlink/Uplink frequencies always corresponds to
Rx/Tx, but what if some day we would need to implement and test
a similar approach for the BTS side? Also, by sending frequency
values in kHz (rather than ARFCNs) we can avoid inconsistency
with the existing RXTUNE / TXTUNE commands.

Change-Id: Ia2bf08797f1a37b56cf47945694b901f92765b58
Related: I587e4f5da67c7b7f28e010ed46b24622c31a3fdd
Related: OS#4546
---
M src/host/trxcon/trx_if.c
1 file changed, 38 insertions(+), 20 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/19/18319/1

diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c
index cb54c9e..ce8d50e 100644
--- a/src/host/trxcon/trx_if.c
+++ b/src/host/trxcon/trx_if.c
@@ -397,41 +397,59 @@
 }
 
 /*
- * Frequency Hopping parameters indication
+ * Frequency Hopping parameters indication.
  *
- * SETFH instructs transceiver to enable frequency
- * hopping mode using the given parameters.
- * CMD SETFH <HSN> <MAIO> <CH1> <CH2> [... <CHN>]
+ * SETFH instructs transceiver to enable frequency hopping mode
+ * using the given HSN, MAIO, and Mobile Allocation parameters.
+ *
+ * CMD SETFH <HSN> <MAIO> <RXF1> <TXF1>
+ *			  <RXF2> <TXF2>
+ *		     [... <RXFN> <TXFN>]
+ *
+ * where <RXFN> and <TXFN> is a pair of Rx/Tx frequencies (in kHz)
+ * corresponding to one ARFCN the Mobile Allocation. Note that the
+ * channel list is expected to be sorted in ascending order.
  */
 
 int trx_if_cmd_setfh(struct trx_instance *trx, uint8_t hsn,
 	uint8_t maio, uint16_t *ma, size_t ma_len)
 {
-	char ma_buf[100];
+	/* Reserve some room for CMD SETFH <HSN> <MAIO> */
+	char ma_buf[TRXC_BUF_SIZE - 24];
+	size_t ma_buf_len = sizeof(ma_buf) - 1;
+	uint16_t rx_freq, tx_freq;
 	char *ptr;
 	int i, rc;
 
-	/* No channels, WTF?!? */
-	if (!ma_len)
+	/* Make sure that Mobile Allocation has at least two entries */
+	if (ma_len < 2 || ma == NULL) {
+		LOGP(DTRX, LOGL_ERROR, "Mobile Allocation is too short\n");
 		return -EINVAL;
+	}
 
-	/**
-	 * Compose a sequence of channels (mobile allocation)
-	 * FIXME: the length of a CTRL command is limited to 128 symbols,
-	 * so we may have some problems if there are many channels...
-	 */
+	/* Compose a sequence of Rx/Tx frequencies (mobile allocation) */
 	for (i = 0, ptr = ma_buf; i < ma_len; i++) {
-		/* Append a channel */
-		rc = snprintf(ptr, ma_buf + sizeof(ma_buf) - ptr, "%u ", ma[i]);
-		if (rc < 0)
-			return rc;
+		/* Convert ARFCN to a pair of Rx/Tx frequencies (Hz * 10) */
+		rx_freq = gsm_arfcn2freq10(ma[i], 0); /* Rx: Downlink */
+		tx_freq = gsm_arfcn2freq10(ma[i], 1); /* Tx: Uplink */
+		if (rx_freq == 0xffff || tx_freq == 0xffff) {
+			LOGP(DTRX, LOGL_ERROR, "Failed to convert ARFCN %u "
+			     "to a pair of Rx/Tx frequencies\n",
+			     ma[i] & ~ARFCN_FLAG_MASK);
+			return -EINVAL;
+		}
+
+		/* Append a pair of Rx/Tx frequencies (in kHz) to the buffer */
+		rc = snprintf(ptr, ma_buf_len, "%u %u ", rx_freq * 100, tx_freq * 100);
+		if (rc < 0 || rc > ma_buf_len) { /* Prevent buffer overflow */
+			LOGP(DTRX, LOGL_ERROR, "Not enough room to encode "
+			     "Mobile Allocation (N=%zu)\n", ma_len);
+			return -ENOSPC;
+		}
 
 		/* Move pointer */
+		ma_buf_len -= rc;
 		ptr += rc;
-
-		/* Prevent buffer overflow */
-		if (ptr >= (ma_buf + 100))
-			return -EIO;
 	}
 
 	/* Overwrite the last space */

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

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ia2bf08797f1a37b56cf47945694b901f92765b58
Gerrit-Change-Number: 18319
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200515/9c74c020/attachment.htm>