commit d280045884f5878c393c1786ff518567d0ea0593
author Tom Tsou <tom.tsou@ettus.com> Mon Apr 01 07:55:48 2019 +0700
committer Harald Welte <laforge@gnumonks.org> Thu Apr 11 07:33:40 2019 +0000
tree 9a5830c9ca8cfa3078e8fcb154b03a80a34b02f4
parent 5e6f3e0cadf7859ae90073cd07afec550892a448

multi-ARFCN: fix maximum number of carriers limitation

Maximum number of carriers is fixed to 3 channels on a single
physical RF channel in multi-ARFCN mode. For some reason, it
was limited to 5.

Let's fix this, and also follow this limitation in the
following VTY command handlers:

  - cfg_multi_arfcn_cmd,
  - cfg_chan_cmd.

Change-Id: I66a1462f368458afd313ee6f0bc0abc496dde817

CommonLibs/trx_vty.c

diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c
index 3b1b979..06e20ab 100644
--- a/CommonLibs/trx_vty.c
+++ b/CommonLibs/trx_vty.c
@@ -236,12 +236,16 @@
 
 	if (strcmp("disable", argv[0]) == 0) {
 		trx->cfg.multi_arfcn = false;
-	} else if (strcmp("enable", argv[0]) == 0) {
-		trx->cfg.multi_arfcn = true;
-	} else {
+		return CMD_SUCCESS;
+	}
+
+	if (trx->cfg.num_chans > TRX_MCHAN_MAX) {
+		vty_out(vty, "Up to %i channels are supported for multi-TRX mode%s",
+			TRX_MCHAN_MAX, VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
+	trx->cfg.multi_arfcn = true;
 	return CMD_SUCCESS;
 }
 
@@ -354,7 +358,12 @@
 	if (idx >= TRX_CHAN_MAX) {
 		vty_out(vty, "Chan list full.%s", VTY_NEWLINE);
 		return CMD_WARNING;
+	} else if (trx->cfg.multi_arfcn && trx->cfg.num_chans >= TRX_MCHAN_MAX) {
+		vty_out(vty, "Up to %i channels are supported for multi-TRX mode%s",
+			TRX_MCHAN_MAX, VTY_NEWLINE);
+		return CMD_WARNING;
 	}
+
 	if (trx->cfg.num_chans < idx) { /* Unexisting or creating non-consecutive */
 		vty_out(vty, "Non-existent or non-consecutive chan %d.%s",
 				idx, VTY_NEWLINE);

CommonLibs/trx_vty.h

diff --git a/CommonLibs/trx_vty.h b/CommonLibs/trx_vty.h
index 8d251ee..8e91113 100644
--- a/CommonLibs/trx_vty.h
+++ b/CommonLibs/trx_vty.h
@@ -6,7 +6,10 @@
 
 extern struct vty_app_info g_vty_info;
 
+/* Maximum number of physical RF channels */
 #define TRX_CHAN_MAX 8
+/* Maximum number of carriers in multi-ARFCN mode */
+#define TRX_MCHAN_MAX 3
 
 /* Samples-per-symbol for downlink path
  *     4 - Uses precision modulator (more computation, less distortion)

Transceiver52M/osmo-trx.cpp

diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index b252d0c..7489e7c 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -411,7 +411,7 @@
 
 int trx_validate_config(struct trx_ctx *trx)
 {
-	if (trx->cfg.multi_arfcn && trx->cfg.num_chans > 5) {
+	if (trx->cfg.multi_arfcn && trx->cfg.num_chans > TRX_MCHAN_MAX) {
 		LOG(ERROR) << "Unsupported number of channels";
 		return -1;
 	}