fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/28757 )
Change subject: trxcon: ensure TRXD logging is actually using LOGPFSMSL()
......................................................................
trxcon: ensure TRXD logging is actually using LOGPFSMSL()
This should have been done in [1], but somehow I forgot about TRXD.
Change-Id: Ia5124061fe391644267a6117ac2627cad7adf873
Fixes: [1] Ic253903e7b8635bb13e210acfe929c73f8870632
Related: OS#5599
---
M src/host/trxcon/src/trx_if.c
1 file changed, 13 insertions(+), 11 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c
index 7daedad..7499740 100644
--- a/src/host/trxcon/src/trx_if.c
+++ b/src/host/trxcon/src/trx_if.c
@@ -601,13 +601,13 @@
read_len = read(ofd->fd, buf, sizeof(buf));
if (read_len <= 0) {
- LOGP(DTRXD, LOGL_ERROR, "read() failed with rc=%zd\n",
read_len);
+ LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, "read() failed with
rc=%zd\n", read_len);
return read_len;
}
if (read_len < (8 + 148)) { /* TRXDv0 header + GMSK burst */
- LOGP(DTRXD, LOGL_ERROR, "Got data message with invalid "
- "length '%zd'\n", read_len);
+ LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR,
+ "Got data message with invalid length '%zd'\n",
read_len);
return -EINVAL;
}
@@ -620,17 +620,18 @@
osmo_ubit2sbit(bits, buf + 8, 148);
if (tn >= 8) {
- LOGP(DTRXD, LOGL_ERROR, "Illegal TS %d\n", tn);
+ LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, "Illegal TS %d\n", tn);
return -EINVAL;
}
if (fn >= 2715648) {
- LOGP(DTRXD, LOGL_ERROR, "Illegal FN %u\n", fn);
+ LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, "Illegal FN %u\n", fn);
return -EINVAL;
}
- LOGP(DTRXD, LOGL_DEBUG, "RX burst tn=%u fn=%u rssi=%d toa=%d\n",
- tn, fn, rssi, toa256);
+ LOGPFSMSL(trx->fi, DTRXD, LOGL_DEBUG,
+ "RX burst tn=%u fn=%u rssi=%d toa=%d\n",
+ tn, fn, rssi, toa256);
/* Group the measurements together */
meas = (struct l1sched_meas_set) {
@@ -664,14 +665,15 @@
*/
#if 0
if (trx->fi->state != TRX_STATE_ACTIVE) {
- LOGP(DTRXD, LOGL_ERROR, "Ignoring TX data, "
- "transceiver isn't ready\n");
+ LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR,
+ "Ignoring TX data, transceiver isn't ready\n");
return -EAGAIN;
}
#endif
- LOGP(DTRXD, LOGL_DEBUG, "TX burst tn=%u fn=%u pwr=%u\n",
- br->tn, br->fn, br->pwr);
+ LOGPFSMSL(trx->fi, DTRXD, LOGL_DEBUG,
+ "TX burst tn=%u fn=%u pwr=%u\n",
+ br->tn, br->fn, br->pwr);
buf[0] = br->tn;
osmo_store32be(br->fn, buf + 1);
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28757
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ia5124061fe391644267a6117ac2627cad7adf873
Gerrit-Change-Number: 28757
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
