<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24456">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  neels: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fixup for gsm48_chan_mode_to_non_vamos()<br><br>When modifying chan modes, I first thought rather always fail if there<br>is no equivalent mode.<br><br>That is true for gsm48_chan_mode_to_vamos(), but for a change to<br>non-VAMOS, rather return the unchanged mode for non-VAMOS modes, so that<br>gsm48_chan_mode_to_non_vamos(GSM_CMODE_SIGN) works without failure.<br><br>This makes more convenient checking, e.g. in osmo-bsc's lchan_fsm.c<br>making sure that a non-VAMOS lchan has a non-VAMOS chan_mode, for all<br>types of lchans.<br><br>Change-Id: Ibf20f04d167e0e0599012ff530bc17ba8c8ab562<br>---<br>M src/gsm/gsm48.c<br>1 file changed, 2 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c</span><br><span>index 02489c9..ae1a21b 100644</span><br><span>--- a/src/gsm/gsm48.c</span><br><span>+++ b/src/gsm/gsm48.c</span><br><span>@@ -463,22 +463,19 @@</span><br><span> }</span><br><span> </span><br><span> /*! Translate GSM48_CMODE_SPEECH_*_VAMOS to its corresponding GSM48_CMODE_SPEECH_* non-vamos mode.</span><br><span style="color: hsl(0, 100%, 40%);">- * If the mode has no equivalent non-VAMOS mode, return a negative value.</span><br><span style="color: hsl(120, 100%, 40%);">+ * If the mode is not a VAMOS mode, return the unchanged mode.</span><br><span>  */</span><br><span> enum gsm48_chan_mode gsm48_chan_mode_to_non_vamos(enum gsm48_chan_mode mode)</span><br><span> {</span><br><span>     switch (mode) {</span><br><span>      case GSM48_CMODE_SPEECH_V1_VAMOS:</span><br><span style="color: hsl(0, 100%, 40%);">-       case GSM48_CMODE_SPEECH_V1:</span><br><span>          return GSM48_CMODE_SPEECH_V1;</span><br><span>        case GSM48_CMODE_SPEECH_V2_VAMOS:</span><br><span style="color: hsl(0, 100%, 40%);">-       case GSM48_CMODE_SPEECH_EFR:</span><br><span>                 return GSM48_CMODE_SPEECH_EFR;</span><br><span>       case GSM48_CMODE_SPEECH_V3_VAMOS:</span><br><span style="color: hsl(0, 100%, 40%);">-       case GSM48_CMODE_SPEECH_AMR:</span><br><span>                 return GSM48_CMODE_SPEECH_AMR;</span><br><span>       default:</span><br><span style="color: hsl(0, 100%, 40%);">-                return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+            return mode;</span><br><span>         }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24456">change 24456</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/libosmocore/+/24456"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ibf20f04d167e0e0599012ff530bc17ba8c8ab562 </div>
<div style="display:none"> Gerrit-Change-Number: 24456 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>