<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24354">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">eliminate lchan->rsl_cmode<br><br>Related: SYS#5315 OS#4940<br>Change-Id: I1c167b22bb6638a929488d093bde0f1a5fb227ad<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/gsm_04_08_rr.c<br>M src/osmo-bsc/gsm_data.c<br>M src/osmo-bsc/lchan_fsm.c<br>5 files changed, 26 insertions(+), 43 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 68c3074..ce47792 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -668,7 +668,6 @@</span><br><span> /* The logical channel type */</span><br><span> enum gsm_chan_t type;</span><br><span> /* RSL channel mode */</span><br><span style="color: hsl(0, 100%, 40%);">- enum rsl_cmod_spd rsl_cmode;</span><br><span> 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>@@ -1390,4 +1389,6 @@</span><br><span> </span><br><span> extern const struct gsm_power_ctrl_params power_ctrl_params_def;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum rsl_cmod_spd chan_mode_to_rsl_cmod_spd(enum gsm48_chan_mode chan_mode);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif /* _GSM_DATA_H */</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 1aaebe3..9aced8b 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -364,12 +364,11 @@</span><br><span> cm->dtx_dtu |= RSL_CMOD_DTXd;</span><br><span> </span><br><span> /* set TCH Speech/Data */</span><br><span style="color: hsl(0, 100%, 40%);">- cm->spd_ind = lchan->rsl_cmode;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->rsl_cmode == RSL_CMOD_SPD_SIGN &&</span><br><span style="color: hsl(0, 100%, 40%);">- ch_mode_rate->chan_mode != GSM48_CMODE_SIGN)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRSL, LOGL_ERROR, "unsupported: rsl_mode == signalling, "</span><br><span style="color: hsl(0, 100%, 40%);">- "but tch_mode != signalling\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->spd_ind = chan_mode_to_rsl_cmod_spd(ch_mode_rate->chan_mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cm->spd_ind < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRSL, LOGL_ERROR, "unsupported: chan_mode = 0x%02x\n", ch_mode_rate->chan_mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ return cm->spd_ind;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> switch (lchan->type) {</span><br><span> case GSM_LCHAN_SDCCH:</span><br><span>diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>index 8a375cb..bcc61a5 100644</span><br><span>--- a/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>+++ b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>@@ -678,24 +678,6 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* update the channel type */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (mod->mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SIGN:</span><br><span style="color: hsl(0, 100%, 40%);">- msg->lchan->rsl_cmode = RSL_CMOD_SPD_SIGN;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</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%);">- msg->lchan->rsl_cmode = RSL_CMOD_SPD_SPEECH;</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%);">- case GSM48_CMODE_DATA_12k0:</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_DATA_6k0:</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_DATA_3k6:</span><br><span style="color: hsl(0, 100%, 40%);">- msg->lchan->rsl_cmode = RSL_CMOD_SPD_DATA;</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> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index a371064..09fb64f 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -1059,3 +1059,22 @@</span><br><span> .h_reqt = 6, /* TODO: investigate a reasonable default value */</span><br><span> },</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum rsl_cmod_spd chan_mode_to_rsl_cmod_spd(enum gsm48_chan_mode chan_mode)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (chan_mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SIGN:</span><br><span style="color: hsl(120, 100%, 40%);">+ return RSL_CMOD_SPD_SIGN;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_V1:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_EFR:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_AMR:</span><br><span style="color: hsl(120, 100%, 40%);">+ return RSL_CMOD_SPD_SPEECH;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_DATA_14k5:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_DATA_12k0:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_DATA_6k0:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_DATA_3k6:</span><br><span style="color: hsl(120, 100%, 40%);">+ return RSL_CMOD_SPD_DATA;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 6144ccf..d648202 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -653,24 +653,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch (info->ch_mode_rate.chan_mode) {</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM48_CMODE_SIGN:</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rsl_cmode = RSL_CMOD_SPD_SIGN;</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%);">- 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%);">- lchan->rsl_cmode = RSL_CMOD_SPD_SPEECH;</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%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_fail("Not implemented: cannot activate for chan mode %s",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_chan_mode_name(info->ch_mode_rate.chan_mode));</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan);</span><br><span> </span><br><span> LOG_LCHAN(lchan, LOGL_INFO,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24354">change 24354</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/+/24354"/><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: I1c167b22bb6638a929488d093bde0f1a5fb227ad </div>
<div style="display:none"> Gerrit-Change-Number: 24354 </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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>