fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27683 ) Change subject: osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly ...................................................................... osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly There is no reason not to use 'chan_state->tch_mode' directly in the 'switch' statement. If a logical channel is in signalling mode, then both 'chan_state->{rsl,tch}_cmode' are set to RSL_CMOD_SPD_SIGN and GSM48_CMODE_SIGN, respectively. Change-Id: I9e5e2c891c80c32fc522b53c9371b71ea32dd54d Related: SYS#5853 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 6a9a0f0..4f5d6d3 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -116,8 +116,8 @@ /* decode * also shift buffer by 4 bursts for interleaving */ - switch ((rsl_cmode != RSL_CMOD_SPD_SPEECH) ? GSM48_CMODE_SPEECH_V1 - : tch_mode) { + switch (tch_mode) { + case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* FR */ rc = gsm0503_tch_fr_decode(tch_data, *bursts_p, 1, 0, &n_errors, &n_bits_total); if (rc == GSM_FR_BYTES) /* only for valid *speech* frames */ diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 369e35b..a8bdd08 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -133,8 +133,8 @@ /* decode * also shift buffer by 4 bursts for interleaving */ - switch ((rsl_cmode != RSL_CMOD_SPD_SPEECH) ? GSM48_CMODE_SPEECH_V1 - : tch_mode) { + switch (tch_mode) { + case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* HR or signalling */ /* Note on FN-10: If we are at FN 10, we decoded an even aligned * TCH/FACCH frame, because our burst buffer carries 6 bursts. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9e5e2c891c80c32fc522b53c9371b71ea32dd54d Gerrit-Change-Number: 27683 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged