diff options
| author | Vadim Yanitskiy <axilirator@gmail.com> | 2019-11-19 14:37:14 +0700 |
|---|---|---|
| committer | fixeria <axilirator@gmail.com> | 2019-11-20 13:43:37 +0000 |
| commit | 595eb576fc370d54f1a137616b16a5748389a427 (patch) | |
| tree | 458a696ac00dbc30ef51a34590316b67f0bc2403 | |
| parent | 5c5ad3cb4afb131ce32cdc857899540c51aab604 (diff) | |
osmo-bts-trx/trx_if.c: fix: NOPE.ind also contains C/I field
Change-Id: I201b72d2a6f5307ede252d5d707f1ebadafe6a4b
| -rw-r--r-- | src/osmo-bts-trx/trx_if.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 38ec8ebe..099c3301 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -728,7 +728,7 @@ static int trx_data_handle_hdr_v1(struct trx_l1h *l1h, /* 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 @@ static int trx_data_handle_hdr_v1(struct trx_l1h *l1h, 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 @@ static const char *trx_data_desc_msg(const struct trx_ul_burst_ind *bi) /* 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 @@ static const char *trx_data_desc_msg(const struct trx_ul_burst_ind *bi) 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); |