diff options
| author | Harald Welte (local) <laflocal@hanuman.gnumonks.org> | 2009-12-28 23:14:22 +0100 |
|---|---|---|
| committer | Harald Welte (local) <laflocal@hanuman.gnumonks.org> | 2009-12-28 23:14:22 +0100 |
| commit | ec79abd31f6a973024cec8644b994d3ba353e15b (patch) | |
| tree | 79601896a9589ee6a26a9f27f7586e1da3fb7ad5 /openbsc | |
| parent | e88c531a48766eb68df14a66de5d9bf18763e6fd (diff) | |
rsl: add new 'gsm_trx_name()' function and use it
Diffstat (limited to 'openbsc')
| -rw-r--r-- | openbsc/include/openbsc/gsm_data.h | 1 | ||||
| -rw-r--r-- | openbsc/src/abis_rsl.c | 12 | ||||
| -rw-r--r-- | openbsc/src/gsm_data.c | 9 |
3 files changed, 16 insertions, 6 deletions
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index aee359219..0e22fdefa 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -629,6 +629,7 @@ const char *gsm_pchan_name(enum gsm_phys_chan_config c); enum gsm_phys_chan_config gsm_pchan_parse(const char *name); const char *gsm_lchant_name(enum gsm_chan_t c); const char *gsm_chreq_name(enum gsm_chreq_reason_t c); +char *gsm_trx_name(struct gsm_bts_trx *trx); char *gsm_ts_name(struct gsm_bts_trx_ts *ts); char *gsm_lchan_name(struct gsm_lchan *lchan); diff --git a/openbsc/src/abis_rsl.c b/openbsc/src/abis_rsl.c index dbe3540cf..0c2944127 100644 --- a/openbsc/src/abis_rsl.c +++ b/openbsc/src/abis_rsl.c @@ -1207,7 +1207,7 @@ static int rsl_rx_error_rep(struct msgb *msg) struct abis_rsl_common_hdr *rslh = msgb_l2(msg); struct tlv_parsed tp; - LOGP(DRSL, LOGL_ERROR, "ERROR REPORT "); + LOGP(DRSL, LOGL_ERROR, "%s ERROR REPORT ", gsm_trx_name(msg->trx)); rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg)-sizeof(*rslh)); @@ -1231,16 +1231,16 @@ static int abis_rsl_rx_trx(struct msgb *msg) break; case RSL_MT_RF_RES_IND: /* interference on idle channels of TRX */ - //DEBUGP(DRSL, "TRX: RF Interference Indication\n"); + //DEBUGP(DRSL, "%s RF Resource Indication\n", gsm_trx_name(msg->trx)); break; case RSL_MT_OVERLOAD: /* indicate CCCH / ACCH / processor overload */ - LOGP(DRSL, LOGL_ERROR, "(bts=%u, trx=%u) CCCH/ACCH/CPU Overload\n", - msg->trx->bts->nr, msg->trx->nr); + LOGP(DRSL, LOGL_ERROR, "%s CCCH/ACCH/CPU Overload\n", + gsm_trx_name(msg->trx)); break; default: - LOGP(DRSL, LOGL_NOTICE, "Unknown Abis RSL TRX message " - "type 0x%02x\n", rslh->msg_type); + LOGP(DRSL, LOGL_NOTICE, "%s Unknown Abis RSL TRX message " + "type 0x%02x\n", gsm_trx_name(msg->trx), rslh->msg_type); return -EINVAL; } return rc; diff --git a/openbsc/src/gsm_data.c b/openbsc/src/gsm_data.c index 7e62aa846..248eb90a2 100644 --- a/openbsc/src/gsm_data.c +++ b/openbsc/src/gsm_data.c @@ -299,6 +299,15 @@ struct gsm_bts_trx *gsm_bts_trx_num(struct gsm_bts *bts, int num) static char ts2str[255]; +char *gsm_trx_name(struct gsm_bts_trx *trx) +{ + snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d)", + trx->bts->nr, trx->nr); + + return ts2str; +} + + char *gsm_ts_name(struct gsm_bts_trx_ts *ts) { snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d,ts=%d)", |