neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31612 )
Change subject: cosmetic: clarify test_codec_support_bts()
......................................................................
cosmetic: clarify test_codec_support_bts()
Change-Id: I13d9b158d08f4938c5aa47ef3134819a4b1f7d29
---
M src/osmo-bsc/codec_pref.c
1 file changed, 25 insertions(+), 22 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
neels: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c
index 581872a..11421a9 100644
--- a/src/osmo-bsc/codec_pref.c
+++ b/src/osmo-bsc/codec_pref.c
@@ -178,19 +178,22 @@
{
unsigned int i;
struct gsm_bts_trx *trx;
- enum gsm_phys_chan_config pchan;
llist_for_each_entry(trx, &bts->trx_list, list) {
for (i = 0; i < TRX_NR_TS; i++) {
- pchan = trx->ts[i].pchan_from_config;
- if (pchan == GSM_PCHAN_OSMO_DYN)
+ switch (trx->ts[i].pchan_from_config) {
+ case GSM_PCHAN_OSMO_DYN:
return true;
- else if (full_rate && pchan == GSM_PCHAN_TCH_F)
- return true;
- else if (full_rate && pchan == GSM_PCHAN_TCH_F_PDCH)
- return true;
- else if (!full_rate && pchan == GSM_PCHAN_TCH_H)
- return true;
+ case GSM_PCHAN_TCH_F:
+ case GSM_PCHAN_TCH_F_PDCH:
+ if (full_rate)
+ return true;
+ case GSM_PCHAN_TCH_H:
+ if (!full_rate)
+ return true;
+ default:
+ continue;
+ }
}
}
@@ -220,21 +223,12 @@
* selectively disable GSM-RF per BTS via VTY. */
return true;
case GSM0808_PERM_FR2:
- if (bts_codec->efr)
- return true;
- break;
+ return (bool)bts_codec->efr;
case GSM0808_PERM_FR3:
- if (bts_codec->amr)
- return true;
- break;
- case GSM0808_PERM_HR1:
- if (bts_codec->hr)
- return true;
- break;
case GSM0808_PERM_HR3:
- if (bts_codec->amr)
- return true;
- break;
+ return (bool)bts_codec->amr;
+ case GSM0808_PERM_HR1:
+ return (bool)bts_codec->hr;
default:
return false;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31612
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I13d9b158d08f4938c5aa47ef3134819a4b1f7d29
Gerrit-Change-Number: 31612
Gerrit-PatchSet: 3
Gerrit-Owner: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-CC: fixeria <vyanits...@sysmocom.de>
Gerrit-MessageType: merged
