<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10458">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/scheduler: get rid of useless lchan->rsl_mode<br><br>This field of the logical channel state structure was not used at<br>all as there is nothing related to A-bis / RSL in trxcon itself.<br><br>Change-Id: Iec1abf777a74cf57deadafa95e2337cba5d02842<br>---<br>M src/host/trxcon/sched_lchan_common.c<br>M src/host/trxcon/sched_lchan_tchf.c<br>M src/host/trxcon/sched_prim.c<br>M src/host/trxcon/sched_trx.c<br>M src/host/trxcon/sched_trx.h<br>5 files changed, 5 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c</span><br><span>index 76a32fe..2767b90 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_common.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_common.c</span><br><span>@@ -36,7 +36,6 @@</span><br><span> #include <osmocom/codec/codec.h></span><br><span> </span><br><span> #include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsm/protocol/gsm_08_58.h></span><br><span> </span><br><span> #include "l1ctl_proto.h"</span><br><span> #include "scheduler.h"</span><br><span>@@ -145,10 +144,6 @@</span><br><span> */</span><br><span> size_t sched_bad_frame_ind(uint8_t *l2, struct trx_lchan_state *lchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* BFI is only required for speech */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->rsl_cmode != RSL_CMOD_SPD_SPEECH)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> switch (lchan->tch_mode) {</span><br><span> case GSM48_CMODE_SIGN:</span><br><span> case GSM48_CMODE_SPEECH_V1:</span><br><span>diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c</span><br><span>index 86cdb12..f6465f9 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_tchf.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_tchf.c</span><br><span>@@ -30,7 +30,6 @@</span><br><span> #include <osmocom/core/bits.h></span><br><span> </span><br><span> #include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsm/protocol/gsm_08_58.h></span><br><span> #include <osmocom/gsm/gsm_utils.h></span><br><span> </span><br><span> #include <osmocom/coding/gsm0503_coding.h></span><br><span>@@ -50,7 +49,6 @@</span><br><span> {</span><br><span> const struct trx_lchan_desc *lchan_desc;</span><br><span> int n_errors = -1, n_bits_total, rc;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t rsl_cmode, tch_mode, mode;</span><br><span> sbit_t *buffer, *offset;</span><br><span> uint8_t l2[128], *mask;</span><br><span> uint32_t *first_fn;</span><br><span>@@ -92,15 +90,6 @@</span><br><span> if (bid != 3)</span><br><span> return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /**</span><br><span style="color: hsl(0, 100%, 40%);">- * Get current RSL / TCH modes</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * FIXME: we do support speech only, and</span><br><span style="color: hsl(0, 100%, 40%);">- * CSD support may be implemented latter.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- rsl_cmode = RSL_CMOD_SPD_SPEECH;</span><br><span style="color: hsl(0, 100%, 40%);">- tch_mode = lchan->tch_mode;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Check for complete set of bursts */</span><br><span> if ((*mask & 0xf) != 0xf) {</span><br><span> LOGP(DSCHD, LOGL_ERROR, "Received incomplete traffic frame at "</span><br><span>@@ -113,10 +102,7 @@</span><br><span> goto bfi;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mode = rsl_cmode != RSL_CMOD_SPD_SPEECH ?</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_CMODE_SPEECH_V1 : tch_mode;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (lchan->tch_mode) {</span><br><span> case GSM48_CMODE_SIGN:</span><br><span> case GSM48_CMODE_SPEECH_V1: /* FR */</span><br><span> rc = gsm0503_tch_fr_decode(l2, buffer,</span><br><span>@@ -134,7 +120,7 @@</span><br><span> LOGP(DSCHD, LOGL_ERROR, "AMR isn't supported yet\n");</span><br><span> return -ENOTSUP;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSCHD, LOGL_ERROR, "Invalid TCH mode: %u\n", tch_mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSCHD, LOGL_ERROR, "Invalid TCH mode: %u\n", lchan->tch_mode);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c</span><br><span>index 2aeaa5d..e663bc3 100644</span><br><span>--- a/src/host/trxcon/sched_prim.c</span><br><span>+++ b/src/host/trxcon/sched_prim.c</span><br><span>@@ -32,7 +32,6 @@</span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> </span><br><span> #include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsm/protocol/gsm_08_58.h></span><br><span> </span><br><span> #include "scheduler.h"</span><br><span> #include "sched_trx.h"</span><br><span>diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c</span><br><span>index fd43a56..8bd3c72 100644</span><br><span>--- a/src/host/trxcon/sched_trx.c</span><br><span>+++ b/src/host/trxcon/sched_trx.c</span><br><span>@@ -465,8 +465,7 @@</span><br><span> lchan->dl_ongoing_facch = 0;</span><br><span> lchan->ul_ongoing_facch = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rsl_cmode = 0x00;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->tch_mode = 0x00;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->tch_mode = GSM48_CMODE_SIGN;</span><br><span> </span><br><span> /* Reset AMR state */</span><br><span> memset(&lchan->amr, 0x00, sizeof(lchan->amr));</span><br><span>diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h</span><br><span>index 2aafbf0..730923b 100644</span><br><span>--- a/src/host/trxcon/sched_trx.h</span><br><span>+++ b/src/host/trxcon/sched_trx.h</span><br><span>@@ -167,8 +167,8 @@</span><br><span> /*! \brief A primitive being sent */</span><br><span> struct trx_ts_prim *prim;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /*! \brief Mode for TCH channels */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t rsl_cmode, tch_mode;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! \brief Mode for TCH channels (see GSM48_CMODE_*) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tch_mode;</span><br><span> </span><br><span> /*! \brief FACCH/H on downlink */</span><br><span> uint8_t dl_ongoing_facch;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10458">change 10458</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/10458"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iec1abf777a74cf57deadafa95e2337cba5d02842 </div>
<div style="display:none"> Gerrit-Change-Number: 10458 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>