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
This commit is contained in:
Vadim Yanitskiy 2021-07-04 20:02:38 +02:00
parent f8bc28505f
commit 2308b58250
4 changed files with 8 additions and 15 deletions

View File

@ -99,11 +99,8 @@ int rx_pdtch_fn(struct trx_instance *trx, struct trx_ts *ts,
rc = gsm0503_pdtch_decode(l2, buffer, rc = gsm0503_pdtch_decode(l2, buffer,
NULL, &n_errors, &n_bits_total); NULL, &n_errors, &n_bits_total);
if (rc < 0) { if (rc < 0) {
LOGP(DSCHD, LOGL_ERROR, "Received bad packet data frame " LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n",
"at fn=%u (%u/%u) for %s\n", lchan->meas_avg.fn, lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn);
lchan->meas_avg.fn % ts->mf_layout->period,
ts->mf_layout->period,
lchan_desc->name);
} }
/* Determine L2 length */ /* Determine L2 length */

View File

@ -125,8 +125,8 @@ int rx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts,
/* Check decoding result */ /* Check decoding result */
if (rc < 4) { if (rc < 4) {
LOGP(DSCHD, LOGL_ERROR, "Received bad TCH frame ending at " LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n",
"fn=%u for %s\n", fn, lchan_desc->name); lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn);
/* Send BFI */ /* Send BFI */
goto bfi; goto bfi;

View File

@ -295,9 +295,8 @@ int rx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts,
/* Calculate AVG of the measurements (assuming 4 bursts) */ /* Calculate AVG of the measurements (assuming 4 bursts) */
sched_trx_meas_avg(lchan, 4); sched_trx_meas_avg(lchan, 4);
LOGP(DSCHD, LOGL_ERROR, "Received bad TCH frame (%s) " LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n",
"at fn=%u on %s (rc=%d)\n", burst_mask2str(mask, 6), lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn);
lchan->meas_avg.fn, lchan_desc->name, rc);
/* Send BFI */ /* Send BFI */
goto bfi; goto bfi;

View File

@ -100,11 +100,8 @@ int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts,
/* Attempt to decode */ /* Attempt to decode */
rc = gsm0503_xcch_decode(l2, buffer, &n_errors, &n_bits_total); rc = gsm0503_xcch_decode(l2, buffer, &n_errors, &n_bits_total);
if (rc) { if (rc) {
LOGP(DSCHD, LOGL_ERROR, "Received bad data frame at fn=%u " LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n",
"(%u/%u) for %s\n", lchan->meas_avg.fn, lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn);
lchan->meas_avg.fn % ts->mf_layout->period,
ts->mf_layout->period,
lchan_desc->name);
/** /**
* We should anyway send dummy frame for * We should anyway send dummy frame for