<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24367">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;">add chan_mode_to_chan_type()<br><br>Move the conversion from chan_mode to lchan type out of the<br>lchan_select_by_chan_mode() function, so that the conversion can be used<br>by other code paths, coming up in VAMOS patches.<br><br>Related: SYS#5315 OS#4940<br>Change-Id: I296651ebadba81f8b3db0d9bb5b5377877a43677<br>---<br>M include/osmocom/bsc/lchan_select.h<br>M src/osmo-bsc/lchan_select.c<br>2 files changed, 25 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/lchan_select.h b/include/osmocom/bsc/lchan_select.h</span><br><span>index 11f63b0..aa2f40e 100644</span><br><span>--- a/include/osmocom/bsc/lchan_select.h</span><br><span>+++ b/include/osmocom/bsc/lchan_select.h</span><br><span>@@ -2,6 +2,7 @@</span><br><span> #pragma once</span><br><span> </span><br><span> struct gsm_lchan *lchan_select_by_type(struct gsm_bts *bts, enum gsm_chan_t type);</span><br><span style="color: hsl(120, 100%, 40%);">+enum gsm_chan_t chan_mode_to_chan_type(enum gsm48_chan_mode chan_mode, enum channel_rate chan_rate);</span><br><span> struct gsm_lchan *lchan_select_by_chan_mode(struct gsm_bts *bts,</span><br><span> enum gsm48_chan_mode chan_mode, enum channel_rate chan_rate);</span><br><span> struct gsm_lchan *lchan_avail_by_type(struct gsm_bts *bts, enum gsm_chan_t type, bool log);</span><br><span>diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c</span><br><span>index 626520c..b494f02 100644</span><br><span>--- a/src/osmo-bsc/lchan_select.c</span><br><span>+++ b/src/osmo-bsc/lchan_select.c</span><br><span>@@ -142,37 +142,46 @@</span><br><span> return _lc_dyn_find_bts(bts, pchan, pchan, log);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_lchan *lchan_select_by_chan_mode(struct gsm_bts *bts,</span><br><span style="color: hsl(0, 100%, 40%);">- enum gsm48_chan_mode chan_mode, enum channel_rate chan_rate)</span><br><span style="color: hsl(120, 100%, 40%);">+enum gsm_chan_t chan_mode_to_chan_type(enum gsm48_chan_mode chan_mode, enum channel_rate chan_rate)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- enum gsm_chan_t type;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> switch (chan_mode) {</span><br><span> case GSM48_CMODE_SIGN:</span><br><span> switch (chan_rate) {</span><br><span style="color: hsl(0, 100%, 40%);">- case CH_RATE_SDCCH: type = GSM_LCHAN_SDCCH; break;</span><br><span style="color: hsl(0, 100%, 40%);">- case CH_RATE_HALF: type = GSM_LCHAN_TCH_H; break;</span><br><span style="color: hsl(0, 100%, 40%);">- case CH_RATE_FULL: type = GSM_LCHAN_TCH_F; break;</span><br><span style="color: hsl(0, 100%, 40%);">- default: return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CH_RATE_SDCCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM_LCHAN_SDCCH;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CH_RATE_HALF:</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM_LCHAN_TCH_H;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CH_RATE_FULL:</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM_LCHAN_TCH_F;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM_LCHAN_NONE;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> case GSM48_CMODE_SPEECH_EFR:</span><br><span> /* EFR works over FR channels only */</span><br><span> if (chan_rate != CH_RATE_FULL)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM_LCHAN_NONE;</span><br><span> /* fall through */</span><br><span> case GSM48_CMODE_SPEECH_V1:</span><br><span> case GSM48_CMODE_SPEECH_AMR:</span><br><span> switch (chan_rate) {</span><br><span style="color: hsl(0, 100%, 40%);">- case CH_RATE_HALF: type = GSM_LCHAN_TCH_H; break;</span><br><span style="color: hsl(0, 100%, 40%);">- case CH_RATE_FULL: type = GSM_LCHAN_TCH_F; break;</span><br><span style="color: hsl(0, 100%, 40%);">- default: return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CH_RATE_HALF:</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM_LCHAN_TCH_H;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CH_RATE_FULL:</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM_LCHAN_TCH_F;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM_LCHAN_NONE;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM_LCHAN_NONE;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_lchan *lchan_select_by_chan_mode(struct gsm_bts *bts,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm48_chan_mode chan_mode, enum channel_rate chan_rate)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_chan_t type = chan_mode_to_chan_type(chan_mode, chan_rate);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (type == GSM_LCHAN_NONE)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> return lchan_select_by_type(bts, type);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24367">change 24367</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-bsc/+/24367"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I296651ebadba81f8b3db0d9bb5b5377877a43677 </div>
<div style="display:none"> Gerrit-Change-Number: 24367 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>