<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11179">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/l1ctl.c: properly handle indicated CCCH mode<br><br>The 'ccch_mode' enum from 'l1ctl_proto.h' to be extended in the<br>near future in order to reflect persistence of CBCH. Thus it<br>should be handled in a switch statement.<br><br>Change-Id: I75e3b8deac1da296efb178e65ff6992b5c407b80<br>---<br>M src/host/trxcon/l1ctl.c<br>1 file changed, 29 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c</span><br><span>index a8a1289..f7f48af 100644</span><br><span>--- a/src/host/trxcon/l1ctl.c</span><br><span>+++ b/src/host/trxcon/l1ctl.c</span><br><span>@@ -256,6 +256,25 @@</span><br><span> return l1ctl_link_send(l1l, msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static enum gsm_phys_chan_config l1ctl_ccch_mode2pchan_config(enum ccch_mode mode)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: distinguish extended BCCH */</span><br><span style="color: hsl(120, 100%, 40%);">+ case CCCH_MODE_NON_COMBINED:</span><br><span style="color: hsl(120, 100%, 40%);">+ case CCCH_MODE_NONE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM_PCHAN_CCCH;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: distinguish CBCH */</span><br><span style="color: hsl(120, 100%, 40%);">+ case CCCH_MODE_COMBINED:</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM_PCHAN_CCCH_SDCCH4;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, LOGL_NOTICE, "Undandled CCCH mode (%u), "</span><br><span style="color: hsl(120, 100%, 40%);">+ "assuming non-combined configuration\n", mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM_PCHAN_CCCH;</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%);">+</span><br><span> /* FBSB expire timer */</span><br><span> static void fbsb_timer_cb(void *data)</span><br><span> {</span><br><span>@@ -292,6 +311,7 @@</span><br><span> </span><br><span> static int l1ctl_rx_fbsb_req(struct l1ctl_link *l1l, struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_phys_chan_config ch_config;</span><br><span> struct l1ctl_fbsb_req *fbsb;</span><br><span> uint16_t band_arfcn;</span><br><span> uint16_t timeout;</span><br><span>@@ -305,6 +325,7 @@</span><br><span> goto exit;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ch_config = l1ctl_ccch_mode2pchan_config(fbsb->ccch_mode);</span><br><span> band_arfcn = ntohs(fbsb->band_arfcn);</span><br><span> timeout = ntohs(fbsb->timeout);</span><br><span> </span><br><span>@@ -316,10 +337,7 @@</span><br><span> sched_trx_reset(l1l->trx, 1);</span><br><span> </span><br><span> /* Configure a single timeslot */</span><br><span style="color: hsl(0, 100%, 40%);">- if (fbsb->ccch_mode == CCCH_MODE_COMBINED)</span><br><span style="color: hsl(0, 100%, 40%);">- sched_trx_configure_ts(l1l->trx, 0, GSM_PCHAN_CCCH_SDCCH4);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- sched_trx_configure_ts(l1l->trx, 0, GSM_PCHAN_CCCH);</span><br><span style="color: hsl(120, 100%, 40%);">+ sched_trx_configure_ts(l1l->trx, 0, ch_config);</span><br><span> </span><br><span> /* Ask SCH handler to send L1CTL_FBSB_CONF */</span><br><span> l1l->fbsb_conf_sent = 0;</span><br><span>@@ -434,9 +452,10 @@</span><br><span> </span><br><span> static int l1ctl_rx_ccch_mode_req(struct l1ctl_link *l1l, struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_phys_chan_config ch_config;</span><br><span> struct l1ctl_ccch_mode_req *req;</span><br><span> struct trx_ts *ts;</span><br><span style="color: hsl(0, 100%, 40%);">- int mode, rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = 0;</span><br><span> </span><br><span> req = (struct l1ctl_ccch_mode_req *) msg->l1h;</span><br><span> if (msgb_l1len(msg) < sizeof(*req)) {</span><br><span>@@ -446,9 +465,8 @@</span><br><span> goto exit;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1C, LOGL_NOTICE, "Received CCCH mode request (%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- req->ccch_mode == CCCH_MODE_COMBINED ?</span><br><span style="color: hsl(0, 100%, 40%);">- "combined" : "not combined");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, LOGL_NOTICE, "Received CCCH mode request (%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ req->ccch_mode); /* TODO: add value-string for ccch_mode */</span><br><span> </span><br><span> /* Make sure that TS0 is allocated and configured */</span><br><span> ts = l1l->trx->ts_list[0];</span><br><span>@@ -459,12 +477,11 @@</span><br><span> }</span><br><span> </span><br><span> /* Choose corresponding channel combination */</span><br><span style="color: hsl(0, 100%, 40%);">- mode = req->ccch_mode == CCCH_MODE_COMBINED ?</span><br><span style="color: hsl(0, 100%, 40%);">- GSM_PCHAN_CCCH_SDCCH4 : GSM_PCHAN_CCCH;</span><br><span style="color: hsl(120, 100%, 40%);">+ ch_config = l1ctl_ccch_mode2pchan_config(req->ccch_mode);</span><br><span> </span><br><span> /* Do nothing if the current mode matches required */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->mf_layout->chan_config != mode)</span><br><span style="color: hsl(0, 100%, 40%);">- rc = sched_trx_configure_ts(l1l->trx, 0, mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->mf_layout->chan_config != ch_config)</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = sched_trx_configure_ts(l1l->trx, 0, ch_config);</span><br><span> </span><br><span> /* Confirm reconfiguration */</span><br><span> if (!rc)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11179">change 11179</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/11179"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I75e3b8deac1da296efb178e65ff6992b5c407b80 </div>
<div style="display:none"> Gerrit-Change-Number: 11179 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>