<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13472">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">multi-ARFCN: fix maximum number of carriers limitation<br><br>Maximum number of carriers is fixed to 3 channels on a single<br>physical RF channel in multi-ARFCN mode. For some reason, it<br>was limited to 5.<br><br>Let's fix this, and also follow this limitation in the<br>following VTY command handlers:<br><br> - cfg_multi_arfcn_cmd,<br> - cfg_chan_cmd.<br><br>Change-Id: I66a1462f368458afd313ee6f0bc0abc496dde817<br>---<br>M CommonLibs/trx_vty.c<br>M CommonLibs/trx_vty.h<br>M Transceiver52M/osmo-trx.cpp<br>3 files changed, 16 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c</span><br><span>index 3b1b979..06e20ab 100644</span><br><span>--- a/CommonLibs/trx_vty.c</span><br><span>+++ b/CommonLibs/trx_vty.c</span><br><span>@@ -236,12 +236,16 @@</span><br><span> </span><br><span> if (strcmp("disable", argv[0]) == 0) {</span><br><span> trx->cfg.multi_arfcn = false;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (strcmp("enable", argv[0]) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- trx->cfg.multi_arfcn = true;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->cfg.num_chans > TRX_MCHAN_MAX) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "Up to %i channels are supported for multi-TRX mode%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ TRX_MCHAN_MAX, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ trx->cfg.multi_arfcn = true;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -354,7 +358,12 @@</span><br><span> if (idx >= TRX_CHAN_MAX) {</span><br><span> vty_out(vty, "Chan list full.%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (trx->cfg.multi_arfcn && trx->cfg.num_chans >= TRX_MCHAN_MAX) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "Up to %i channels are supported for multi-TRX mode%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ TRX_MCHAN_MAX, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (trx->cfg.num_chans < idx) { /* Unexisting or creating non-consecutive */</span><br><span> vty_out(vty, "Non-existent or non-consecutive chan %d.%s",</span><br><span> idx, VTY_NEWLINE);</span><br><span>diff --git a/CommonLibs/trx_vty.h b/CommonLibs/trx_vty.h</span><br><span>index 8d251ee..8e91113 100644</span><br><span>--- a/CommonLibs/trx_vty.h</span><br><span>+++ b/CommonLibs/trx_vty.h</span><br><span>@@ -6,7 +6,10 @@</span><br><span> </span><br><span> extern struct vty_app_info g_vty_info;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Maximum number of physical RF channels */</span><br><span> #define TRX_CHAN_MAX 8</span><br><span style="color: hsl(120, 100%, 40%);">+/* Maximum number of carriers in multi-ARFCN mode */</span><br><span style="color: hsl(120, 100%, 40%);">+#define TRX_MCHAN_MAX 3</span><br><span> </span><br><span> /* Samples-per-symbol for downlink path</span><br><span> * 4 - Uses precision modulator (more computation, less distortion)</span><br><span>diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp</span><br><span>index b252d0c..7489e7c 100644</span><br><span>--- a/Transceiver52M/osmo-trx.cpp</span><br><span>+++ b/Transceiver52M/osmo-trx.cpp</span><br><span>@@ -411,7 +411,7 @@</span><br><span> </span><br><span> int trx_validate_config(struct trx_ctx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx->cfg.multi_arfcn && trx->cfg.num_chans > 5) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->cfg.multi_arfcn && trx->cfg.num_chans > TRX_MCHAN_MAX) {</span><br><span> LOG(ERROR) << "Unsupported number of channels";</span><br><span> return -1;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13472">change 13472</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13472"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I66a1462f368458afd313ee6f0bc0abc496dde817 </div>
<div style="display:none"> Gerrit-Change-Number: 13472 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Tom Tsou <tom@tsou.cc> </div>