diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-09-17 20:52:50 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-09-17 20:53:37 +0200 |
| commit | 7c82b4a872960b8f0cb45c6ffec509b854c73f2f (patch) | |
| tree | 5c16440c9892b26d5bd93722c400e98f872c640b | |
| parent | 19795c5ab22b6502f543a44b30224ad57befafa4 (diff) | |
l1sap/scheduler: Consistently print chan_nr as hex number
It's very confusing if some log messages log chan_nr as decimal, while
most log it as hexadecimal. Let's standardize on hex everywhere.
Change-Id: Ia6566d5bbee8124fb7c689c962ce34d714208503
| -rw-r--r-- | src/common/l1sap.c | 10 | ||||
| -rw-r--r-- | src/common/scheduler.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b29fcc71..1a7a965a 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -508,7 +508,7 @@ static int l1sap_info_meas_ind(struct gsm_bts_trx *trx, lchan = get_active_lchan_by_chan_nr(trx, info_meas_ind->chan_nr); if (!lchan) { LOGPFN(DL1P, LOGL_ERROR, info_meas_ind->fn, - "No lchan for MPH INFO MEAS IND (chan_nr=%u)\n", info_meas_ind->chan_nr); + "No lchan for MPH INFO MEAS IND (chan_nr=0x%02x)\n", info_meas_ind->chan_nr); return 0; } @@ -746,7 +746,7 @@ static int l1sap_ph_rts_ind(struct gsm_bts_trx *trx, } else if (!(chan_nr & 0x80)) { /* only TCH/F, TCH/H, SDCCH/4 and SDCCH/8 have C5 bit cleared */ lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%u)\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr); return 0; } if (L1SAP_IS_LINK_SACCH(link_id)) { @@ -875,7 +875,7 @@ static int l1sap_tch_rts_ind(struct gsm_bts_trx *trx, lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%u)\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=0x%02x)\n", chan_nr); return 0; } @@ -1069,7 +1069,7 @@ static int l1sap_ph_data_ind(struct gsm_bts_trx *trx, lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=%d\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for chan_nr=0x%02x\n", chan_nr); return 0; } @@ -1137,7 +1137,7 @@ static int l1sap_tch_ind(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap, lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { - LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=%u)\n", chan_nr); + LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for TCH.ind (chan_nr=0x%02x)\n", chan_nr); return 0; } diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 8a6c0078..65ece7ff 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -329,8 +329,8 @@ free_msg: found_msg: if ((chan_nr ^ (trx_chan_desc[chan].chan_nr | tn)) || ((link_id & 0xc0) ^ trx_chan_desc[chan].link_id)) { - LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong chan_nr=%02x link_id=%02x, " - "expecting chan_nr=%02x link_id=%02x.\n", chan_nr, link_id, + LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong chan_nr=0x%02x link_id=%02x, " + "expecting chan_nr=0x%02x link_id=%02x.\n", chan_nr, link_id, trx_chan_desc[chan].chan_nr | tn, trx_chan_desc[chan].link_id); goto free_msg; } |