diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2023-07-13 05:09:38 +0700 |
|---|---|---|
| committer | fixeria <vyanitskiy@sysmocom.de> | 2023-07-13 13:18:02 +0000 |
| commit | 4344f323f23517e53c32deae75b3bb5e15b31ad4 (patch) | |
| tree | 63dbfb7e31e4acbb9950a95f226bd2423ff21fd6 /src | |
| parent | 17087a08c71e6bfa58fcd7daf382ea2ccd347c2b (diff) | |
osmo-bts-trx: rx_tch[fh]_fn(): combine rc-checking ifs
Change-Id: I7bb341867e362bf2061608ff54c3596ad209af90
Diffstat (limited to 'src')
| -rw-r--r-- | src/osmo-bts-trx/sched_lchan_tchf.c | 5 | ||||
| -rw-r--r-- | src/osmo-bts-trx/sched_lchan_tchh.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 4832311c..949e059f 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -306,10 +306,7 @@ int rx_tchf_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi, BAD_DATA_MSG_FMT "\n", BAD_DATA_MSG_ARGS); rc = 0; /* this is how we signal BFI to l1sap */ - } - - /* FACCH */ - if (rc == GSM_MACBLOCK_LEN) { + } else if (rc == GSM_MACBLOCK_LEN) { /* FACCH/F */ _sched_compose_ph_data_ind(l1ts, fn_begin, bi->chan, &tch_data[amr], GSM_MACBLOCK_LEN, ber10k, diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index a1283206..7e494def 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -361,10 +361,7 @@ int rx_tchh_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi, BAD_DATA_MSG_FMT "\n", BAD_DATA_MSG_ARGS); rc = 0; /* this is how we signal BFI to l1sap */ - } - - /* FACCH */ - if (rc == GSM_MACBLOCK_LEN) { + } else if (rc == GSM_MACBLOCK_LEN) { /* FACCH */ chan_state->ul_ongoing_facch = 1; /* In order to provide an even stream of measurement reports in *speech* * mode, here we intentionally invalidate RSSI for FACCH, so that this |