diff options
author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-07-04 20:02:38 +0200 |
---|---|---|
committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-07-04 20:02:53 +0200 |
commit | 2308b582503e45e4e9fdd0f82aa37d3dd9b93ff4 (patch) | |
tree | 81f8dadad0b786754c8c2108b9ddf73b24dd5af6 | |
parent | f8bc28505f60e2a5636ad7779a13374ed661ad14 (diff) |
trxcon/scheduler: unify and enrich decoding error messages
Regarding the removal of burst_mask2str() from the TCH/H handler,
it does not make sense to print it because the mask is already
shifted and an earlier logging should already contain this info.
Change-Id: I42d20e2da73c21ca366dd246244cd716c8ccb459
Related: OS#4823
-rw-r--r-- | src/host/trxcon/sched_lchan_pdtch.c | 7 | ||||
-rw-r--r-- | src/host/trxcon/sched_lchan_tchf.c | 4 | ||||
-rw-r--r-- | src/host/trxcon/sched_lchan_tchh.c | 5 | ||||
-rw-r--r-- | src/host/trxcon/sched_lchan_xcch.c | 7 |
4 files changed, 8 insertions, 15 deletions
diff --git a/src/host/trxcon/sched_lchan_pdtch.c b/src/host/trxcon/sched_lchan_pdtch.c index abbd480c..bd028654 100644 --- a/src/host/trxcon/sched_lchan_pdtch.c +++ b/src/host/trxcon/sched_lchan_pdtch.c @@ -99,11 +99,8 @@ int rx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts, rc = gsm0503_pdtch_decode(l2, buffer, NULL, &n_errors, &n_bits_total); if (rc < 0) { - LOGP(DSCHD, LOGL_ERROR, "Received bad packet data frame " - "at fn=%u (%u/%u) for %s\n", lchan->meas_avg.fn, - lchan->meas_avg.fn % ts->mf_layout->period, - ts->mf_layout->period, - lchan_desc->name); + LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n", + lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn); } /* Determine L2 length */ diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c index 1e38e963..0b38ea10 100644 --- a/src/host/trxcon/sched_lchan_tchf.c +++ b/src/host/trxcon/sched_lchan_tchf.c @@ -125,8 +125,8 @@ int rx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts, /* Check decoding result */ if (rc < 4) { - LOGP(DSCHD, LOGL_ERROR, "Received bad TCH frame ending at " - "fn=%u for %s\n", fn, lchan_desc->name); + LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n", + lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn); /* Send BFI */ goto bfi; diff --git a/src/host/trxcon/sched_lchan_tchh.c b/src/host/trxcon/sched_lchan_tchh.c index 6a5c4714..1079bb0b 100644 --- a/src/host/trxcon/sched_lchan_tchh.c +++ b/src/host/trxcon/sched_lchan_tchh.c @@ -295,9 +295,8 @@ int rx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts, /* Calculate AVG of the measurements (assuming 4 bursts) */ sched_trx_meas_avg(lchan, 4); - LOGP(DSCHD, LOGL_ERROR, "Received bad TCH frame (%s) " - "at fn=%u on %s (rc=%d)\n", burst_mask2str(mask, 6), - lchan->meas_avg.fn, lchan_desc->name, rc); + LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n", + lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn); /* Send BFI */ goto bfi; diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/sched_lchan_xcch.c index 41677ec1..78397fe4 100644 --- a/src/host/trxcon/sched_lchan_xcch.c +++ b/src/host/trxcon/sched_lchan_xcch.c @@ -100,11 +100,8 @@ int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts, /* Attempt to decode */ rc = gsm0503_xcch_decode(l2, buffer, &n_errors, &n_bits_total); if (rc) { - LOGP(DSCHD, LOGL_ERROR, "Received bad data frame at fn=%u " - "(%u/%u) for %s\n", lchan->meas_avg.fn, - lchan->meas_avg.fn % ts->mf_layout->period, - ts->mf_layout->period, - lchan_desc->name); + LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n", + lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn); /** * We should anyway send dummy frame for |