fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16104 )
Change subject: osmo-bts-trx/trx_if.c: fix: NOPE.ind also contains C/I filed ...................................................................... osmo-bts-trx/trx_if.c: fix: NOPE.ind also contains C/I filed Change-Id: I201b72d2a6f5307ede252d5d707f1ebadafe6a4b --- M src/osmo-bts-trx/trx_if.c 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/04/16104/1 diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 38ec8eb..099c330 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -728,7 +728,7 @@ /* IDLE / NOPE frame indication */ if (buf[0] & (1 << 7)) { bi->flags |= TRX_BI_F_NOPE_IND; - return TRX_UL_V1HDR_LEN; + goto skip_mts; } /* Modulation info and TSC set */ @@ -751,6 +751,7 @@ bi->tsc = buf[0] & 0b111; bi->flags |= TRX_BI_F_TS_INFO; +skip_mts: /* C/I: Carrier-to-Interference ratio (in centiBels) */ bi->ci_cb = (int16_t) osmo_load16be(buf + 1); bi->flags |= TRX_BI_F_CI_CB; @@ -838,6 +839,10 @@ /* RSSI and ToA256 */ OSMO_STRBUF_PRINTF(sb, " rssi=%d toa256=%d", bi->rssi, bi->toa256); + /* C/I: Carrier-to-Interference ratio (in centiBels) */ + if (bi->flags & TRX_BI_F_CI_CB) + OSMO_STRBUF_PRINTF(sb, " C/I=%d cB", bi->ci_cb); + /* Nothing else to print for NOPE.ind */ if (bi->flags & TRX_BI_F_NOPE_IND) return buf; @@ -850,10 +855,6 @@ if (bi->flags & TRX_BI_F_TS_INFO) OSMO_STRBUF_PRINTF(sb, " set=%u tsc=%u", bi->tsc_set, bi->tsc); - /* C/I: Carrier-to-Interference ratio (in centiBels) */ - if (bi->flags & TRX_BI_F_CI_CB) - OSMO_STRBUF_PRINTF(sb, " C/I=%d cB", bi->ci_cb); - /* Burst length */ OSMO_STRBUF_PRINTF(sb, " burst_len=%zu", bi->burst_len); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I201b72d2a6f5307ede252d5d707f1ebadafe6a4b Gerrit-Change-Number: 16104 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <axilira...@gmail.com> Gerrit-MessageType: newchange