<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24485">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[VAMOS] conf_lchans_as_pchan(): improve readability<br><br>Change-Id: I1c5a033e89d9ca5fb01ebe9ffb521fd67d159bee<br>---<br>M src/common/oml.c<br>1 file changed, 21 insertions(+), 33 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index cf83903..aba8847 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -813,62 +813,50 @@</span><br><span> return conf_lchans_as_pchan(ts, pchan);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static inline void lchans_type_set(struct gsm_bts_trx_ts *ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_chan_t lchan_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int num_lchans)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < num_lchans; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->lchan[i].type = lchan_type;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int conf_lchans_as_pchan(struct gsm_bts_trx_ts *ts,</span><br><span> enum gsm_phys_chan_config pchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan *lchan;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> switch (pchan) {</span><br><span> case GSM_PCHAN_CCCH_SDCCH4_CBCH:</span><br><span style="color: hsl(0, 100%, 40%);">- /* fallthrough */</span><br><span> case GSM_PCHAN_CCCH_SDCCH4:</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < 4; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = &ts->lchan[i];</span><br><span style="color: hsl(0, 100%, 40%);">- if (pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH</span><br><span style="color: hsl(0, 100%, 40%);">- && i == 2) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->type = GSM_LCHAN_CBCH;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->type = GSM_LCHAN_SDCCH;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ lchans_type_set(ts, GSM_LCHAN_SDCCH, 4);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH)</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->lchan[2].type = GSM_LCHAN_CBCH;</span><br><span> /* fallthrough */</span><br><span> case GSM_PCHAN_CCCH:</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = &ts->lchan[CCCH_LCHAN];</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->type = GSM_LCHAN_CCCH;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->lchan[CCCH_LCHAN].type = GSM_LCHAN_CBCH;</span><br><span> break;</span><br><span> case GSM_PCHAN_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = &ts->lchan[0];</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->type = GSM_LCHAN_TCH_F;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchans_type_set(ts, GSM_LCHAN_TCH_F, 1);</span><br><span> break;</span><br><span> case GSM_PCHAN_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < 2; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = &ts->lchan[i];</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->type = GSM_LCHAN_TCH_H;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ lchans_type_set(ts, GSM_LCHAN_TCH_H, 2);</span><br><span> break;</span><br><span> case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:</span><br><span style="color: hsl(0, 100%, 40%);">- /* fallthrough */</span><br><span> case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < 8; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = &ts->lchan[i];</span><br><span style="color: hsl(0, 100%, 40%);">- if (pchan == GSM_PCHAN_SDCCH8_SACCH8C_CBCH</span><br><span style="color: hsl(0, 100%, 40%);">- && i == 2) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->type = GSM_LCHAN_CBCH;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->type = GSM_LCHAN_SDCCH;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ lchans_type_set(ts, GSM_LCHAN_SDCCH, 8);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pchan == GSM_PCHAN_SDCCH8_SACCH8C_CBCH)</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->lchan[2].type = GSM_LCHAN_CBCH;</span><br><span> break;</span><br><span> case GSM_PCHAN_PDCH:</span><br><span style="color: hsl(0, 100%, 40%);">- lchan = &ts->lchan[0];</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->type = GSM_LCHAN_PDTCH;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchans_type_set(ts, GSM_LCHAN_PDTCH, 1);</span><br><span> break;</span><br><span> default:</span><br><span> LOGP(DOML, LOGL_ERROR, "Unknown/unhandled PCHAN type: %u %s\n",</span><br><span> ts->pchan, gsm_pchan_name(ts->pchan));</span><br><span> return -NM_NACK_PARAM_RANGE;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24485">change 24485</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/c/osmo-bts/+/24485"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1c5a033e89d9ca5fb01ebe9ffb521fd67d159bee </div>
<div style="display:none"> Gerrit-Change-Number: 24485 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>