<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9284">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use libosmocore's gsm0808_permitted_speech(), gsm0808_chosen_channel()<br><br>The guts of bssap_speech_from_lchan() and lchan_to_chosen_channel() have been<br>moved to libosmocore; call that. The functions become mere wrappers to feed the<br>right lchan members.<br><br>Depends: I8a3cc5d4548e9a78d945d54c69ccced251edcec9 (libosmocore)<br>Change-Id: Ib5c940a9dae11c5e26d4b47fa9d95fef889ad2f6<br>---<br>M src/libbsc/bsc_subscr_conn_fsm.c<br>1 file changed, 5 insertions(+), 72 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/9284/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c</span><br><span>index 7617dba..e1706d2 100644</span><br><span>--- a/src/libbsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/libbsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -147,82 +147,15 @@</span><br><span> /* See TS 48.008 3.2.2.11 Channel Type Octet 5 */</span><br><span> static int bssap_speech_from_lchan(const struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- switch (lchan->type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_LCHAN_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">- switch (lchan->tch_mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_V1:</span><br><span style="color: hsl(0, 100%, 40%);">- return 0x05;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_AMR:</span><br><span style="color: hsl(0, 100%, 40%);">- return 0x25;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_LCHAN_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">- switch (lchan->tch_mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_V1:</span><br><span style="color: hsl(0, 100%, 40%);">- return 0x01;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_EFR:</span><br><span style="color: hsl(0, 100%, 40%);">- return 0x11;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_AMR:</span><br><span style="color: hsl(0, 100%, 40%);">- return 0x21;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm0808_permitted_speech(lchan->type, lchan->tch_mode);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* GSM 08.08 3.2.2.33 */</span><br><span> static uint8_t lchan_to_chosen_channel(struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t channel_mode = 0, channel = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (lchan->tch_mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_V1:</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_EFR:</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SPEECH_AMR:</span><br><span style="color: hsl(0, 100%, 40%);">- channel_mode = 0x9;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SIGN:</span><br><span style="color: hsl(0, 100%, 40%);">- channel_mode = 0x8;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_DATA_14k5:</span><br><span style="color: hsl(0, 100%, 40%);">- channel_mode = 0xe;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_DATA_12k0:</span><br><span style="color: hsl(0, 100%, 40%);">- channel_mode = 0xb;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_DATA_6k0:</span><br><span style="color: hsl(0, 100%, 40%);">- channel_mode = 0xc;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_DATA_3k6:</span><br><span style="color: hsl(0, 100%, 40%);">- channel_mode = 0xd;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (lchan->type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_LCHAN_NONE:</span><br><span style="color: hsl(0, 100%, 40%);">- channel = 0x0;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_LCHAN_SDCCH:</span><br><span style="color: hsl(0, 100%, 40%);">- channel = 0x1;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_LCHAN_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">- channel = 0x8;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_LCHAN_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">- channel = 0x9;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_LCHAN_UNKNOWN:</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSC, LOGL_ERROR, "Unknown lchan type: %p\n", lchan);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return channel_mode << 4 | channel;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t chosen_channel = gsm0808_chosen_channel(lchan->tch_mode, lchan->type);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!chosen_channel)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "Unknown lchan type or TCH mode: %s\n", gsm_lchan_name(lchan));</span><br><span style="color: hsl(120, 100%, 40%);">+ return chosen_channel;</span><br><span> }</span><br><span> </span><br><span> /* Generate and send assignment complete message */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9284">change 9284</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/9284"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib5c940a9dae11c5e26d4b47fa9d95fef889ad2f6 </div>
<div style="display:none"> Gerrit-Change-Number: 9284 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>