<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24355">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move lchan->csd_mode into channel_mode_and_rate<br><br>The GSM48_CMODE_DATA_* rates are completely unused in OsmoBSC anyway,<br>but there is some code in abis_rsl.c checking its value, and if we were<br>to start using it that is the place where it should be.<br><br>Related: SYS#5315 OS#4940 OS#3787 OS#3833<br>Change-Id: Ie0e065a5dca5f4a31d5d81e3528a539214a74170<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>2 files changed, 16 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index ce47792..04d5e52 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -107,10 +107,24 @@</span><br><span> </span><br><span> enum channel_rate chan_t_to_chan_rate(enum gsm_chan_t chan_t);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum lchan_csd_mode {</span><br><span style="color: hsl(120, 100%, 40%);">+ LCHAN_CSD_M_NT,</span><br><span style="color: hsl(120, 100%, 40%);">+ LCHAN_CSD_M_T_1200_75,</span><br><span style="color: hsl(120, 100%, 40%);">+ LCHAN_CSD_M_T_600,</span><br><span style="color: hsl(120, 100%, 40%);">+ LCHAN_CSD_M_T_1200,</span><br><span style="color: hsl(120, 100%, 40%);">+ LCHAN_CSD_M_T_2400,</span><br><span style="color: hsl(120, 100%, 40%);">+ LCHAN_CSD_M_T_9600,</span><br><span style="color: hsl(120, 100%, 40%);">+ LCHAN_CSD_M_T_14400,</span><br><span style="color: hsl(120, 100%, 40%);">+ LCHAN_CSD_M_T_29000,</span><br><span style="color: hsl(120, 100%, 40%);">+ LCHAN_CSD_M_T_32000,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct channel_mode_and_rate {</span><br><span> enum gsm48_chan_mode chan_mode;</span><br><span> enum channel_rate chan_rate;</span><br><span> uint16_t s15_s0;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* only used for GSM48_CMODE_DATA_* */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum lchan_csd_mode csd_mode;</span><br><span> };</span><br><span> </span><br><span> enum assign_for {</span><br><span>@@ -499,18 +513,6 @@</span><br><span> };</span><br><span> /* /BTS ONLY */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum lchan_csd_mode {</span><br><span style="color: hsl(0, 100%, 40%);">- LCHAN_CSD_M_NT,</span><br><span style="color: hsl(0, 100%, 40%);">- LCHAN_CSD_M_T_1200_75,</span><br><span style="color: hsl(0, 100%, 40%);">- LCHAN_CSD_M_T_600,</span><br><span style="color: hsl(0, 100%, 40%);">- LCHAN_CSD_M_T_1200,</span><br><span style="color: hsl(0, 100%, 40%);">- LCHAN_CSD_M_T_2400,</span><br><span style="color: hsl(0, 100%, 40%);">- LCHAN_CSD_M_T_9600,</span><br><span style="color: hsl(0, 100%, 40%);">- LCHAN_CSD_M_T_14400,</span><br><span style="color: hsl(0, 100%, 40%);">- LCHAN_CSD_M_T_29000,</span><br><span style="color: hsl(0, 100%, 40%);">- LCHAN_CSD_M_T_32000,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* State of the SAPIs in the lchan */</span><br><span> enum lchan_sapi_state {</span><br><span> LCHAN_SAPI_S_NONE,</span><br><span>@@ -667,8 +669,6 @@</span><br><span> </span><br><span> /* The logical channel type */</span><br><span> enum gsm_chan_t type;</span><br><span style="color: hsl(0, 100%, 40%);">- /* RSL channel mode */</span><br><span style="color: hsl(0, 100%, 40%);">- enum lchan_csd_mode csd_mode;</span><br><span> /* Power levels for MS and BTS */</span><br><span> uint8_t bs_power;</span><br><span> uint8_t ms_power;</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 9aced8b..ecc7329 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -405,7 +405,7 @@</span><br><span> case GSM48_CMODE_DATA_14k5:</span><br><span> case GSM48_CMODE_DATA_12k0:</span><br><span> case GSM48_CMODE_DATA_6k0:</span><br><span style="color: hsl(0, 100%, 40%);">- switch (lchan->csd_mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ch_mode_rate->csd_mode) {</span><br><span> case LCHAN_CSD_M_NT:</span><br><span> /* non-transparent CSD with RLP */</span><br><span> switch (ch_mode_rate->chan_mode) {</span><br><span>@@ -451,9 +451,7 @@</span><br><span> cm->chan_rate = RSL_CMOD_CSD_T_32000;</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRSL, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "unsupported lchan->csd_mode %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->csd_mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRSL, LOGL_ERROR, "unsupported csd_mode %u\n", ch_mode_rate->csd_mode);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24355">change 24355</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/+/24355"/><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: Ie0e065a5dca5f4a31d5d81e3528a539214a74170 </div>
<div style="display:none"> Gerrit-Change-Number: 24355 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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>