31 Mar
2023
31 Mar
'23
1:56 p.m.
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32093 )
Change subject: Replace explicit gsm_lchan_name() calls with LOGPLCHAN
......................................................................
Replace explicit gsm_lchan_name() calls with LOGPLCHAN
There was a surprising number of explicit gsm_lchan_name() calls
from within log message code. Let's avoid that whenever possible and
use a LOGPLCHAN() or related macro.
Change-Id: If4f4f555f5ca61dfa624b298805f5375efc0b137
---
M src/common/l1sap.c
M src/common/measurement.c
M src/common/rsl.c
M src/osmo-bts-lc15/oml.c
M src/osmo-bts-oc2g/oml.c
M src/osmo-bts-octphy/l1_tch.c
M src/osmo-bts-sysmo/oml.c
M src/osmo-bts-virtual/l1_if.c
8 files changed, 161 insertions(+), 273 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 1f173db..09ac6be 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -751,10 +751,9 @@
OSMO_ASSERT(false);
}
- DEBUGPFN(DL1P, fn,
- "%s %s meas ind, ta_offs_256bits=%d, ber10k=%d, inv_rssi=%u, C/I=%d cB\n",
- gsm_lchan_name(lchan), ind_name, ulm.ta_offs_256bits,
- ulm.ber10k, ulm.inv_rssi, ulm.ci_cb);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, fn,
+ "%s meas ind, ta_offs_256bits=%d, ber10k=%d, inv_rssi=%u, C/I=%d cB\n",
+ ind_name, ulm.ta_offs_256bits, ulm.ber10k, ulm.inv_rssi, ulm.ci_cb);
/* we assume that symbol period is 1 bit: */
set_ms_to_data(lchan, ulm.ta_offs_256bits / 256, true);
diff --git a/src/common/measurement.c b/src/common/measurement.c
index 388f710..b6cfee0 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -327,8 +327,8 @@
if (!ulm->is_sub)
dest->is_sub = ts45008_83_is_sub(lchan, fn);
- DEBUGPFN(DMEAS, fn, "%s adding a %s measurement (ber10k=%u, ta_offs=%d, ci_cB=%d,
rssi=-%u), num_ul_meas=%d, fn_mod=%u\n",
- gsm_lchan_name(lchan),
+ LOGPLCFN(lchan, DMEAS, LOGL_DEBUG, fn,
+ "adding a %s measurement (ber10k=%u, ta_offs=%d, ci_cB=%d, rssi=-%u),
num_ul_meas=%d, fn_mod=%u\n",
dest->is_sub ? "SUB" : "FULL",
ulm->ber10k, ulm->ta_offs_256bits, ulm->ci_cb, ulm->inv_rssi,
lchan->meas.num_ul_meas, fn_mod);
diff --git a/src/common/rsl.c b/src/common/rsl.c
index 8f1ff5d..a8c16a7 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1386,7 +1386,7 @@
struct msgb *msg;
if (lchan)
- LOGP(DRSL, LOGL_NOTICE, "%s: ", gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "");
else
LOGP(DRSL, LOGL_NOTICE, "0x%02x: ", chan_nr);
LOGPC(DRSL, LOGL_NOTICE, "Sending Channel Activated NACK: cause = 0x%02x\n",
cause);
@@ -2170,7 +2170,7 @@
struct msgb *msg;
if (lchan)
- LOGP(DRSL, LOGL_NOTICE, "%s: ", gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "");
else
LOGP(DRSL, LOGL_NOTICE, "0x%02x: ", chan_nr);
LOGPC(DRSL, LOGL_NOTICE, "Tx MODE MODIFY NACK (cause = 0x%02x)\n", cause);
@@ -3086,7 +3086,6 @@
if (pdch_act) {
/* Clear TCH state. Only first lchan matters for PDCH */
clear_lchan_for_pdch_activ(ts->lchan);
-
/* First, disconnect the TCH channel, to connect PDTCH later */
rc = bts_model_ts_disconnect(ts);
} else {
@@ -3115,14 +3114,12 @@
enum gsm_phys_chan_config as_pchan;
if (ts->flags & TS_F_PDCH_DEACT_PENDING) {
- LOGP(DRSL, LOGL_DEBUG,
- "%s PDCH DEACT operation: channel disconnected, will reconnect as
TCH\n",
- gsm_lchan_name(ts->lchan));
+ LOGPLCHAN(ts->lchan, DRSL, LOGL_DEBUG,
+ "PDCH DEACT operation: channel disconnected, will reconnect as TCH\n");
as_pchan = GSM_PCHAN_TCH_F;
} else if (ts->flags & TS_F_PDCH_ACT_PENDING) {
- LOGP(DRSL, LOGL_DEBUG,
- "%s PDCH ACT operation: channel disconnected, will reconnect as
PDTCH\n",
- gsm_lchan_name(ts->lchan));
+ LOGPLCHAN(ts->lchan, DRSL, LOGL_DEBUG,
+ "PDCH ACT operation: channel disconnected, will reconnect as PDTCH\n");
as_pchan = GSM_PCHAN_PDCH;
} else
/* No reconnect pending. */
@@ -3183,39 +3180,31 @@
static void ipacc_dyn_pdch_ts_connected(struct gsm_bts_trx_ts *ts, int rc)
{
if (rc) {
- LOGP(DRSL, LOGL_NOTICE, "%s PDCH ACT IPA operation failed (%d) in bts
model\n",
- gsm_lchan_name(ts->lchan), rc);
+ LOGPLCHAN(ts->lchan, DRSL, LOGL_NOTICE, "PDCH ACT IPA operation failed (%d) in
bts model\n", rc);
ipacc_dyn_pdch_complete(ts, rc);
return;
}
if (ts->flags & TS_F_PDCH_DEACT_PENDING) {
- if (ts->lchan[0].type != GSM_LCHAN_TCH_F)
- LOGP(DRSL, LOGL_ERROR, "%s PDCH DEACT error:"
- " timeslot connected, so expecting"
- " lchan type TCH/F, but is %s\n",
- gsm_lchan_name(ts->lchan),
- gsm_lchant_name(ts->lchan[0].type));
+ if (ts->lchan[0].type != GSM_LCHAN_TCH_F) {
+ LOGPLCHAN(ts->lchan, DRSL, LOGL_ERROR, "PDCH DEACT error: timeslot connected,
so "
+ "expecting lchan type TCH/F, but is %s\n",
gsm_lchant_name(ts->lchan[0].type));
+ }
- LOGP(DRSL, LOGL_DEBUG, "%s PDCH DEACT operation:"
- " timeslot connected as TCH/F\n",
- gsm_lchan_name(ts->lchan));
+ LOGPLCHAN(ts->lchan, DRSL, LOGL_DEBUG, "PDCH DEACT operation: timeslot
connected as TCH/F\n");
/* During PDCH DEACT, we're done right after the TCH/F came
* back up. */
ipacc_dyn_pdch_complete(ts, 0);
} else if (ts->flags & TS_F_PDCH_ACT_PENDING) {
- if (ts->lchan[0].type != GSM_LCHAN_PDTCH)
- LOGP(DRSL, LOGL_ERROR, "%s PDCH ACT error:"
- " timeslot connected, so expecting"
- " lchan type PDTCH, but is %s\n",
- gsm_lchan_name(ts->lchan),
+ if (ts->lchan[0].type != GSM_LCHAN_PDTCH) {
+ LOGPLCHAN(ts->lchan, DRSL, LOGL_ERROR, "PDCH ACT error: timeslot connected,
"
+ "so expecting lchan type PDTCH, but is %s\n",
gsm_lchant_name(ts->lchan[0].type));
+ }
- LOGP(DRSL, LOGL_DEBUG, "%s PDCH ACT operation:"
- " timeslot connected as PDTCH\n",
- gsm_lchan_name(ts->lchan));
+ LOGPLCHAN(ts->lchan, DRSL, LOGL_DEBUG, "PDCH ACT operation: timeslot connected
as PDTCH\n");
/* The PDTCH is connected, now tell the PCU about it. Except
* when the PCU is not connected (yet), then there's nothing
@@ -3241,8 +3230,7 @@
unsigned int ln;
if (rc) {
- LOGP(DRSL, LOGL_NOTICE, "%s PDCH ACT OSMO operation failed (%d) in bts
model\n",
- gsm_lchan_name(ts->lchan), rc);
+ LOGPLCHAN(ts->lchan, DRSL, LOGL_NOTICE, "PDCH ACT OSMO operation failed (%d) in
bts model\n", rc);
ipacc_dyn_pdch_complete(ts, rc);
return;
}
@@ -3287,10 +3275,10 @@
pdch_act = ts->flags & TS_F_PDCH_ACT_PENDING;
- if ((ts->flags & TS_F_PDCH_PENDING_MASK) == TS_F_PDCH_PENDING_MASK)
- LOGP(DRSL, LOGL_ERROR,
- "%s Internal Error: both PDCH ACT and PDCH DEACT pending\n",
- gsm_lchan_name(ts->lchan));
+ if ((ts->flags & TS_F_PDCH_PENDING_MASK) == TS_F_PDCH_PENDING_MASK) {
+ LOGPLCHAN(ts->lchan, DRSL, LOGL_ERROR,
+ "Internal Error: both PDCH ACT and PDCH DEACT pending\n");
+ }
ts->flags &= ~TS_F_PDCH_PENDING_MASK;
@@ -3306,9 +3294,8 @@
ts->flags |= TS_F_PDCH_ACTIVE;
else
ts->flags &= ~TS_F_PDCH_ACTIVE;
- DEBUGP(DRSL, "%s %s switched to %s mode (ts->flags == %x)\n",
- gsm_lchan_name(ts->lchan), gsm_pchan_name(ts->pchan),
- pdch_act? "PDCH" : "TCH/F", ts->flags);
+ LOGPLCHAN(ts->lchan, DRSL, LOGL_DEBUG, "%s switched to %s mode (ts->flags ==
%x)\n",
+ gsm_pchan_name(ts->pchan), pdch_act ? "PDCH" : "TCH/F",
ts->flags);
rc = rsl_tx_dyn_pdch_ack(ts->lchan, pdch_act);
if (rc)
@@ -3410,8 +3397,7 @@
return -1;
}
- DEBUGP(DRLL, "%s Rx RLL %s Abis -> LAPDm\n", gsm_lchan_name(lchan),
- rsl_msg_name(rh->c.msg_type));
+ LOGPLCHAN(lchan, DRLL, LOGL_DEBUG, "Rx RLL %s Abis -> LAPDm\n",
rsl_msg_name(rh->c.msg_type));
/* make copy of RLL header, as the message will be free'd in case of erroneous
return */
rh2 = *rh;
@@ -3506,7 +3492,7 @@
int rc;
if (!gh || msgb_l3len(msg) < sizeof(*gh)+sizeof(*gsr)) {
- LOGP(DRSL, LOGL_NOTICE, "%s Short GPRS SUSPEND REQ received, ignoring\n",
gsm_lchan_name(msg->lchan));
+ LOGPLCHAN(msg->lchan, DRSL, LOGL_NOTICE, "Short GPRS SUSPEND REQ received,
ignoring\n");
msgb_free(msg);
return -EINVAL;
}
@@ -3514,8 +3500,7 @@
gsr = (struct gsm48_gprs_susp_req *) gh->data;
tlli = osmo_ntohl(gsr->tlli);
- LOGP(DRSL, LOGL_INFO, "%s Fwd GPRS SUSPEND REQ for TLLI=0x%08x to PCU\n",
- gsm_lchan_name(msg->lchan), tlli);
+ LOGPLCHAN(msg->lchan, DRSL, LOGL_INFO, "Fwd GPRS SUSPEND REQ for TLLI=0x%08x to
PCU\n", tlli);
rc = pcu_tx_susp_req(msg->lchan, tlli, gsr->ra_id, gsr->cause);
msgb_free(msg);
diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c
index 3709d8c..d702da7 100644
--- a/src/osmo-bts-lc15/oml.c
+++ b/src/osmo-bts-lc15/oml.c
@@ -571,8 +571,7 @@
case GSM_LCHAN_TCH_H:
return GsmL1_Sapi_TchH;
default:
- LOGP(DL1C, LOGL_NOTICE, "%s cannot determine L1 SAPI\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_NOTICE, "cannot determine L1 SAPI\n");
break;
}
return GsmL1_Sapi_Idle;
@@ -783,12 +782,8 @@
talloc_free(cmd);
if (end || llist_empty(&lchan->sapi_cmds)) {
- LOGP(DL1C, LOGL_DEBUG,
- "%s End of SAPI cmd queue encountered.%s\n",
- gsm_lchan_name(lchan),
- llist_empty(&lchan->sapi_cmds)
- ? " Queue is now empty."
- : " More pending.");
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "End of SAPI cmd queue encountered.%s\n",
+ llist_empty(&lchan->sapi_cmds) ? " Queue is now empty." : "
More pending.");
return;
}
@@ -828,9 +823,8 @@
goto err;
}
- LOGP(DL1C, LOGL_INFO, "%s MPH-ACTIVATE.conf (%s ",
- gsm_lchan_name(lchan),
- get_value_string(lc15bts_l1sapi_names, ic->sapi));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-ACTIVATE.conf (%s ",
+ get_value_string(lc15bts_l1sapi_names, ic->sapi));
LOGPC(DL1C, LOGL_INFO, "%s)\n",
get_value_string(lc15bts_dir_names, ic->dir));
@@ -851,19 +845,15 @@
lchan->sapis_ul[ic->sapi] = status;
if (llist_empty(&lchan->sapi_cmds)) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Got activation confirmation with empty queue\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Got activation confirmation with empty
queue\n");
goto err;
}
cmd = llist_entry(lchan->sapi_cmds.next, struct sapi_cmd, entry);
if (cmd->sapi != ic->sapi || cmd->dir != ic->dir ||
cmd->type != SAPI_CMD_ACTIVATE) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Confirmation mismatch (%d, %d) (%d, %d)\n",
- gsm_lchan_name(lchan), cmd->sapi, cmd->dir,
- ic->sapi, ic->dir);
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Confirmation mismatch (%d, %d) (%d,
%d)\n",
+ cmd->sapi, cmd->dir, ic->sapi, ic->dir);
goto err;
}
@@ -944,8 +934,7 @@
(struct gsm48_multi_rate_conf *) amr_mrc->gsm48_ie;
int j;
- LOGP(DL1C, LOGL_INFO, "%s: %s tch_mode=0x%02x\n",
- gsm_lchan_name(lchan), __func__, lchan->tch_mode);
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "%s tch_mode=0x%02x\n", __func__,
lchan->tch_mode);
switch (lchan->tch_mode) {
case GSM48_CMODE_SIGN:
@@ -1098,9 +1087,8 @@
break;
}
- LOGP(DL1C, LOGL_INFO, "%s MPH-ACTIVATE.req (hL2=0x%08x, %s ",
- gsm_lchan_name(lchan), (uint32_t)act_req->hLayer2,
- get_value_string(lc15bts_l1sapi_names, act_req->sapi));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-ACTIVATE.req (hL2=0x%08x, %s ",
+ (uint32_t)act_req->hLayer2, get_value_string(lc15bts_l1sapi_names,
act_req->sapi));
dump_lch_par(LOGL_INFO, lch_par, act_req->sapi);
LOGPC(DL1C, LOGL_INFO, "%s)\n",
get_value_string(lc15bts_dir_names, act_req->dir));
@@ -1125,9 +1113,7 @@
/* FIXME: Error handling */
if (status != GsmL1_Status_Success) {
- LOGP(DL1C, LOGL_ERROR,
- "%s act failed mark broken due status: %d\n",
- gsm_lchan_name(lchan), status);
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "act failed mark broken due status: %d\n",
status);
lchan_set_state(lchan, LCHAN_S_BROKEN);
sapi_clear_queue(&lchan->sapi_cmds);
mph_info_chan_confirm(lchan, PRIM_INFO_ACTIVATE, RSL_ERR_PROCESSOR_OVERLOAD);
@@ -1174,9 +1160,7 @@
lchan_set_state(lchan, LCHAN_S_ACT_REQ);
if (!llist_empty(&lchan->sapi_cmds))
- LOGP(DL1C, LOGL_ERROR,
- "%s Trying to activate lchan, but commands in queue\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Trying to activate lchan, but commands in
queue\n");
/* For handover, always start the main channel immediately.
lchan->want_dl_sacch_active indicates whether dl
* SACCH should be activated. Also, for HO, start the RACH SAPI. */
@@ -1337,9 +1321,8 @@
goto err;
}
- LOGP(DL1C, LOGL_INFO, "%s MPH-CONFIG.conf (%s) ",
- gsm_lchan_name(lchan),
- get_value_string(lc15bts_l1cfgt_names, cc->cfgParamId));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-CONFIG.conf (%s) ",
+ get_value_string(lc15bts_l1cfgt_names, cc->cfgParamId));
switch (cc->cfgParamId) {
case GsmL1_ConfigParamId_SetLogChParams:
@@ -1371,9 +1354,7 @@
break;
}
if (llist_empty(&lchan->sapi_cmds)) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Got ciphering conf with empty queue\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Got ciphering conf with empty
queue\n");
goto err;
}
@@ -1424,10 +1405,8 @@
/* FIXME: update encryption */
- LOGP(DL1C, LOGL_INFO, "%s MPH-CONFIG.req (%s) ",
- gsm_lchan_name(lchan),
- get_value_string(lc15bts_l1sapi_names,
- conf_req->cfgParams.setLogChParams.sapi));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-CONFIG.req (%s) ",
+ get_value_string(lc15bts_l1sapi_names, conf_req->cfgParams.setLogChParams.sapi));
LOGPC(DL1C, LOGL_INFO, "cfgParams Tn=%u, subCh=%u, dir=0x%x ",
conf_req->cfgParams.setLogChParams.u8Tn,
conf_req->cfgParams.setLogChParams.subCh,
@@ -1537,11 +1516,9 @@
return -EINVAL;
cfgr->cfgParams.setCipheringParams.cipherId = rsl2l1_ciph[lchan->encr.alg_id];
- LOGP(DL1C, LOGL_NOTICE, "%s SET_CIPHERING (ALG=%u %s)\n",
- gsm_lchan_name(lchan),
+ LOGPLCHAN(lchan, DL1C, LOGL_NOTICE, "SET_CIPHERING (ALG=%u %s)\n",
cfgr->cfgParams.setCipheringParams.cipherId,
- get_value_string(lc15bts_dir_names,
- cfgr->cfgParams.setCipheringParams.dir));
+ get_value_string(lc15bts_dir_names, cfgr->cfgParams.setCipheringParams.dir));
memcpy(cfgr->cfgParams.setCipheringParams.u8Kc,
lchan->encr.key, lchan->encr.key_len);
@@ -1619,9 +1596,8 @@
goto err;
}
- LOGP(DL1C, LOGL_INFO, "%s MPH-DEACTIVATE.conf (%s ",
- gsm_lchan_name(lchan),
- get_value_string(lc15bts_l1sapi_names, ic->sapi));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-DEACTIVATE.conf (%s ",
+ get_value_string(lc15bts_l1sapi_names, ic->sapi));
LOGPC(DL1C, LOGL_INFO, "%s)\n",
get_value_string(lc15bts_dir_names, ic->dir));
@@ -1643,19 +1619,15 @@
if (llist_empty(&lchan->sapi_cmds)) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Got de-activation confirmation with empty queue\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Got de-activation confirmation with empty
queue\n");
goto err;
}
cmd = llist_entry(lchan->sapi_cmds.next, struct sapi_cmd, entry);
if (cmd->sapi != ic->sapi || cmd->dir != ic->dir ||
cmd->type != SAPI_CMD_DEACTIVATE) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Confirmation mismatch (%d, %d) (%d, %d)\n",
- gsm_lchan_name(lchan), cmd->sapi, cmd->dir,
- ic->sapi, ic->dir);
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Confirmation mismatch (%d, %d) (%d,
%d)\n",
+ cmd->sapi, cmd->dir, ic->sapi, ic->dir);
goto err;
}
@@ -1680,9 +1652,8 @@
deact_req->sapi = cmd->sapi;
deact_req->hLayer3 = (HANDLE)l1if_lchan_to_hLayer(lchan);
- LOGP(DL1C, LOGL_INFO, "%s MPH-DEACTIVATE.req (%s ",
- gsm_lchan_name(lchan),
- get_value_string(lc15bts_l1sapi_names, deact_req->sapi));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-DEACTIVATE.req (%s ",
+ get_value_string(lc15bts_l1sapi_names, deact_req->sapi));
LOGPC(DL1C, LOGL_INFO, "%s)\n",
get_value_string(lc15bts_dir_names, deact_req->dir));
@@ -1694,8 +1665,7 @@
{
/* FIXME: Error handling. There is no NACK... */
if (status != GsmL1_Status_Success && lchan->state == LCHAN_S_REL_REQ) {
- LOGP(DL1C, LOGL_ERROR, "%s is now broken. Stopping the release.\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "is now broken. Stopping the
release.\n");
lchan_set_state(lchan, LCHAN_S_BROKEN);
sapi_clear_queue(&lchan->sapi_cmds);
mph_info_chan_confirm(lchan, PRIM_INFO_DEACTIVATE, 0);
@@ -1780,8 +1750,7 @@
/* nothing was queued */
if (res == 0) {
- LOGP(DL1C, LOGL_ERROR, "%s all SAPIs already released?\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "all SAPIs already released?\n");
lchan_set_state(lchan, LCHAN_S_BROKEN);
mph_info_chan_confirm(lchan, PRIM_INFO_DEACTIVATE, 0);
}
@@ -2014,8 +1983,7 @@
if (lchan->ho.active == HANDOVER_NONE)
return -1;
- LOGP(DHO, LOGL_ERROR, "%s modifying channel for handover\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DHO, LOGL_ERROR, "modifying channel for handover\n");
/* Give up listening to RACH bursts */
release_sapi_ul_rach(lchan);
@@ -2031,8 +1999,7 @@
{
/* A duplicate RF Release Request, ignore it */
if (lchan->state == LCHAN_S_REL_REQ) {
- LOGP(DL1C, LOGL_ERROR, "%s already in release request state.\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "already in release request state.\n");
return 0;
}
@@ -2068,8 +2035,7 @@
struct gsm_bts_trx_ts *ts = &trx->ts[cnf->u8Tn];
OSMO_ASSERT(cnf->u8Tn < TRX_NR_TS);
- LOGP(DL1C, LOGL_DEBUG, "%s Rx mphDisconnectCnf\n",
- gsm_lchan_name(ts->lchan));
+ LOGPLCHAN(ts->lchan, DL1C, LOGL_DEBUG, "Rx mphDisconnectCnf\n");
cb_ts_disconnected(ts);
@@ -2084,7 +2050,7 @@
struct lc15l1_hdl *fl1h = trx_lc15l1_hdl(ts->trx);
GsmL1_MphDisconnectReq_t *cr;
- DEBUGP(DRSL, "%s TS disconnect\n", gsm_lchan_name(ts->lchan));
+ LOGPLCHAN(ts->lchan, DRSL, LOGL_DEBUG, "TS disconnect\n");
cr = prim_init(msgb_l1prim(msg), GsmL1_PrimId_MphDisconnectReq, fl1h,
l1p_handle_for_ts(ts));
cr->u8Tn = ts->nr;
@@ -2100,8 +2066,7 @@
struct gsm_bts_trx_ts *ts = &trx->ts[cnf->u8Tn];
OSMO_ASSERT(cnf->u8Tn < TRX_NR_TS);
- DEBUGP(DL1C, "%s %s Rx mphConnectCnf flags=%s%s%s\n",
- gsm_lchan_name(ts->lchan),
+ LOGPLCHAN(ts->lchan, DL1C, LOGL_DEBUG, "%s Rx mphConnectCnf
flags=%s%s%s\n",
gsm_pchan_name(ts->pchan),
ts->flags & TS_F_PDCH_ACTIVE ? "ACTIVE " : "",
ts->flags & TS_F_PDCH_ACT_PENDING ? "ACT_PENDING " :
"",
diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c
index 233a1f7..dfcb4a6 100644
--- a/src/osmo-bts-oc2g/oml.c
+++ b/src/osmo-bts-oc2g/oml.c
@@ -586,8 +586,7 @@
case GSM_LCHAN_TCH_H:
return GsmL1_Sapi_TchH;
default:
- LOGP(DL1C, LOGL_NOTICE, "%s cannot determine L1 SAPI\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_NOTICE, "cannot determine L1 SAPI\n");
break;
}
return GsmL1_Sapi_Idle;
@@ -798,12 +797,8 @@
talloc_free(cmd);
if (end || llist_empty(&lchan->sapi_cmds)) {
- LOGP(DL1C, LOGL_DEBUG,
- "%s End of SAPI cmd queue encountered.%s\n",
- gsm_lchan_name(lchan),
- llist_empty(&lchan->sapi_cmds)
- ? " Queue is now empty."
- : " More pending.");
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "End of SAPI cmd queue encountered.%s\n",
+ llist_empty(&lchan->sapi_cmds) ? " Queue is now empty." : "
More pending.");
return;
}
@@ -843,9 +838,8 @@
goto err;
}
- LOGP(DL1C, LOGL_INFO, "%s MPH-ACTIVATE.conf (%s ",
- gsm_lchan_name(lchan),
- get_value_string(oc2gbts_l1sapi_names, ic->sapi));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-ACTIVATE.conf (%s ",
+ get_value_string(oc2gbts_l1sapi_names, ic->sapi));
LOGPC(DL1C, LOGL_INFO, "%s)\n",
get_value_string(oc2gbts_dir_names, ic->dir));
@@ -866,19 +860,15 @@
lchan->sapis_ul[ic->sapi] = status;
if (llist_empty(&lchan->sapi_cmds)) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Got activation confirmation with empty queue\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Got activation confirmation with empty
queue\n");
goto err;
}
cmd = llist_entry(lchan->sapi_cmds.next, struct sapi_cmd, entry);
if (cmd->sapi != ic->sapi || cmd->dir != ic->dir ||
cmd->type != SAPI_CMD_ACTIVATE) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Confirmation mismatch (%d, %d) (%d, %d)\n",
- gsm_lchan_name(lchan), cmd->sapi, cmd->dir,
- ic->sapi, ic->dir);
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Confirmation mismatch (%d, %d) (%d,
%d)\n",
+ cmd->sapi, cmd->dir, ic->sapi, ic->dir);
goto err;
}
@@ -959,8 +949,7 @@
(struct gsm48_multi_rate_conf *) amr_mrc->gsm48_ie;
int j;
- LOGP(DL1C, LOGL_INFO, "%s: %s tch_mode=0x%02x\n",
- gsm_lchan_name(lchan), __func__, lchan->tch_mode);
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "%s tch_mode=0x%02x\n", __func__,
lchan->tch_mode);
switch (lchan->tch_mode) {
case GSM48_CMODE_SIGN:
@@ -1113,9 +1102,8 @@
break;
}
- LOGP(DL1C, LOGL_INFO, "%s MPH-ACTIVATE.req (hL2=0x%08x, %s ",
- gsm_lchan_name(lchan), (uint32_t)act_req->hLayer2,
- get_value_string(oc2gbts_l1sapi_names, act_req->sapi));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-ACTIVATE.req (hL2=0x%08x, %s ",
+ (uint32_t)act_req->hLayer2, get_value_string(oc2gbts_l1sapi_names,
act_req->sapi));
dump_lch_par(LOGL_INFO, lch_par, act_req->sapi);
LOGPC(DL1C, LOGL_INFO, "%s)\n",
get_value_string(oc2gbts_dir_names, act_req->dir));
@@ -1140,9 +1128,7 @@
/* FIXME: Error handling */
if (status != GsmL1_Status_Success) {
- LOGP(DL1C, LOGL_ERROR,
- "%s act failed mark broken due status: %d\n",
- gsm_lchan_name(lchan), status);
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "act failed mark broken due status: %d\n",
status);
lchan_set_state(lchan, LCHAN_S_BROKEN);
sapi_clear_queue(&lchan->sapi_cmds);
mph_info_chan_confirm(lchan, PRIM_INFO_ACTIVATE, RSL_ERR_PROCESSOR_OVERLOAD);
@@ -1189,9 +1175,7 @@
lchan_set_state(lchan, LCHAN_S_ACT_REQ);
if (!llist_empty(&lchan->sapi_cmds))
- LOGP(DL1C, LOGL_ERROR,
- "%s Trying to activate lchan, but commands in queue\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Trying to activate lchan, but commands in
queue\n");
/* For handover, always start the main channel immediately.
lchan->want_dl_sacch_active indicates whether dl
* SACCH should be activated. Also, for HO, start the RACH SAPI. */
@@ -1348,9 +1332,8 @@
goto err;
}
- LOGP(DL1C, LOGL_INFO, "%s MPH-CONFIG.conf (%s) ",
- gsm_lchan_name(lchan),
- get_value_string(oc2gbts_l1cfgt_names, cc->cfgParamId));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-CONFIG.conf (%s) ",
+ get_value_string(oc2gbts_l1cfgt_names, cc->cfgParamId));
switch (cc->cfgParamId) {
case GsmL1_ConfigParamId_SetLogChParams:
@@ -1382,9 +1365,7 @@
break;
}
if (llist_empty(&lchan->sapi_cmds)) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Got ciphering conf with empty queue\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Got ciphering conf with empty
queue\n");
goto err;
}
@@ -1435,10 +1416,8 @@
/* FIXME: update encryption */
- LOGP(DL1C, LOGL_INFO, "%s MPH-CONFIG.req (%s) ",
- gsm_lchan_name(lchan),
- get_value_string(oc2gbts_l1sapi_names,
- conf_req->cfgParams.setLogChParams.sapi));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-CONFIG.req (%s) ",
+ get_value_string(oc2gbts_l1sapi_names, conf_req->cfgParams.setLogChParams.sapi));
LOGPC(DL1C, LOGL_INFO, "cfgParams Tn=%u, subCh=%u, dir=0x%x ",
conf_req->cfgParams.setLogChParams.u8Tn,
conf_req->cfgParams.setLogChParams.subCh,
@@ -1546,11 +1525,9 @@
return -EINVAL;
cfgr->cfgParams.setCipheringParams.cipherId = rsl2l1_ciph[lchan->encr.alg_id];
- LOGP(DL1C, LOGL_NOTICE, "%s SET_CIPHERING (ALG=%u %s)\n",
- gsm_lchan_name(lchan),
- cfgr->cfgParams.setCipheringParams.cipherId,
- get_value_string(oc2gbts_dir_names,
- cfgr->cfgParams.setCipheringParams.dir));
+ LOGPLCHAN(lchan, DL1C, LOGL_NOTICE, "SET_CIPHERING (ALG=%u %s)\n",
+ cfgr->cfgParams.setCipheringParams.cipherId,
+ get_value_string(oc2gbts_dir_names, cfgr->cfgParams.setCipheringParams.dir));
memcpy(cfgr->cfgParams.setCipheringParams.u8Kc,
lchan->encr.key, lchan->encr.key_len);
@@ -1628,9 +1605,8 @@
goto err;
}
- LOGP(DL1C, LOGL_INFO, "%s MPH-DEACTIVATE.conf (%s ",
- gsm_lchan_name(lchan),
- get_value_string(oc2gbts_l1sapi_names, ic->sapi));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-DEACTIVATE.conf (%s ",
+ get_value_string(oc2gbts_l1sapi_names, ic->sapi));
LOGPC(DL1C, LOGL_INFO, "%s)\n",
get_value_string(oc2gbts_dir_names, ic->dir));
@@ -1652,19 +1628,15 @@
if (llist_empty(&lchan->sapi_cmds)) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Got de-activation confirmation with empty queue\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Got de-activation confirmation with empty
queue\n");
goto err;
}
cmd = llist_entry(lchan->sapi_cmds.next, struct sapi_cmd, entry);
if (cmd->sapi != ic->sapi || cmd->dir != ic->dir ||
cmd->type != SAPI_CMD_DEACTIVATE) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Confirmation mismatch (%d, %d) (%d, %d)\n",
- gsm_lchan_name(lchan), cmd->sapi, cmd->dir,
- ic->sapi, ic->dir);
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Confirmation mismatch (%d, %d) (%d,
%d)\n",
+ cmd->sapi, cmd->dir, ic->sapi, ic->dir);
goto err;
}
@@ -1689,9 +1661,8 @@
deact_req->sapi = cmd->sapi;
deact_req->hLayer3 = (HANDLE)l1if_lchan_to_hLayer(lchan);
- LOGP(DL1C, LOGL_INFO, "%s MPH-DEACTIVATE.req (%s ",
- gsm_lchan_name(lchan),
- get_value_string(oc2gbts_l1sapi_names, deact_req->sapi));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-DEACTIVATE.req (%s ",
+ get_value_string(oc2gbts_l1sapi_names, deact_req->sapi));
LOGPC(DL1C, LOGL_INFO, "%s)\n",
get_value_string(oc2gbts_dir_names, deact_req->dir));
@@ -1703,8 +1674,7 @@
{
/* FIXME: Error handling. There is no NACK... */
if (status != GsmL1_Status_Success && lchan->state == LCHAN_S_REL_REQ) {
- LOGP(DL1C, LOGL_ERROR, "%s is now broken. Stopping the release.\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "is now broken. Stopping the
release.\n");
lchan_set_state(lchan, LCHAN_S_BROKEN);
sapi_clear_queue(&lchan->sapi_cmds);
mph_info_chan_confirm(lchan, PRIM_INFO_DEACTIVATE, 0);
@@ -1789,8 +1759,7 @@
/* nothing was queued */
if (res == 0) {
- LOGP(DL1C, LOGL_ERROR, "%s all SAPIs already released?\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "all SAPIs already released?\n");
lchan_set_state(lchan, LCHAN_S_BROKEN);
mph_info_chan_confirm(lchan, PRIM_INFO_DEACTIVATE, 0);
}
@@ -2017,8 +1986,7 @@
if (lchan->ho.active == HANDOVER_NONE)
return -1;
- LOGP(DHO, LOGL_ERROR, "%s modifying channel for handover\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DHO, LOGL_ERROR, "modifying channel for handover\n");
/* Give up listening to RACH bursts */
release_sapi_ul_rach(lchan);
@@ -2034,8 +2002,7 @@
{
/* A duplicate RF Release Request, ignore it */
if (lchan->state == LCHAN_S_REL_REQ) {
- LOGP(DL1C, LOGL_ERROR, "%s already in release request state.\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "already in release request state.\n");
return 0;
}
@@ -2071,8 +2038,7 @@
struct gsm_bts_trx_ts *ts = &trx->ts[cnf->u8Tn];
OSMO_ASSERT(cnf->u8Tn < TRX_NR_TS);
- LOGP(DL1C, LOGL_DEBUG, "%s Rx mphDisconnectCnf\n",
- gsm_lchan_name(ts->lchan));
+ LOGPLCHAN(ts->lchan, DL1C, LOGL_DEBUG, "Rx mphDisconnectCnf\n");
cb_ts_disconnected(ts);
@@ -2087,7 +2053,7 @@
struct oc2gl1_hdl *fl1h = trx_oc2gl1_hdl(ts->trx);
GsmL1_MphDisconnectReq_t *cr;
- DEBUGP(DRSL, "%s TS disconnect\n", gsm_lchan_name(ts->lchan));
+ LOGPLCHAN(ts->lchan, DRSL, LOGL_DEBUG, "TS disconnect\n");
cr = prim_init(msgb_l1prim(msg), GsmL1_PrimId_MphDisconnectReq, fl1h,
l1p_handle_for_ts(ts));
cr->u8Tn = ts->nr;
@@ -2103,12 +2069,11 @@
struct gsm_bts_trx_ts *ts = &trx->ts[cnf->u8Tn];
OSMO_ASSERT(cnf->u8Tn < TRX_NR_TS);
- DEBUGP(DL1C, "%s %s Rx mphConnectCnf flags=%s%s%s\n",
- gsm_lchan_name(ts->lchan),
- gsm_pchan_name(ts->pchan),
- ts->flags & TS_F_PDCH_ACTIVE ? "ACTIVE " : "",
- ts->flags & TS_F_PDCH_ACT_PENDING ? "ACT_PENDING " :
"",
- ts->flags & TS_F_PDCH_DEACT_PENDING ? "DEACT_PENDING " :
"");
+ LOGPLCHAN(ts->lchan, DL1C, LOGL_DEBUG, "%s Rx mphConnectCnf
flags=%s%s%s\n",
+ gsm_pchan_name(ts->pchan),
+ ts->flags & TS_F_PDCH_ACTIVE ? "ACTIVE " : "",
+ ts->flags & TS_F_PDCH_ACT_PENDING ? "ACT_PENDING " : "",
+ ts->flags & TS_F_PDCH_DEACT_PENDING ? "DEACT_PENDING " :
"");
cb_ts_connected(ts, 0);
diff --git a/src/osmo-bts-octphy/l1_tch.c b/src/osmo-bts-octphy/l1_tch.c
index bce55f1..f8800fd 100644
--- a/src/osmo-bts-octphy/l1_tch.c
+++ b/src/osmo-bts-octphy/l1_tch.c
@@ -241,8 +241,7 @@
uint8_t *l1_payload;
int rc = -1;
- DEBUGP(DRTP, "%s RTP IN: %s\n", gsm_lchan_name(lchan),
- osmo_hexdump(rtp_pl, rtp_pl_len));
+ LOGPLCHAN(lchan, DRTP, LOGL_DEBUG, "RTP IN: %s\n", osmo_hexdump(rtp_pl,
rtp_pl_len));
l1_payload = &data[0];
@@ -271,13 +270,11 @@
}
if (rc < 0) {
- LOGP(DRTP, LOGL_ERROR, "%s unable to parse RTP payload\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DRTP, LOGL_ERROR, "unable to parse RTP payload\n");
return;
}
*len = rc;
- DEBUGP(DRTP, "%s RTP->L1: %s\n", gsm_lchan_name(lchan),
- osmo_hexdump(data, *len));
+ LOGPLCHAN(lchan, DRTP, LOGL_DEBUG, "RTP->L1: %s\n", osmo_hexdump(data,
*len));
}
diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c
index 653d37d..4be222c 100644
--- a/src/osmo-bts-sysmo/oml.c
+++ b/src/osmo-bts-sysmo/oml.c
@@ -536,10 +536,9 @@
cr->u8Tn = ts->nr;
cr->logChComb = pchan_to_logChComb[pchan];
- DEBUGP(DL1C, "%s pchan=%s ts_connect_as(%s) logChComb=%s\n",
- gsm_lchan_name(ts->lchan), gsm_pchan_name(ts->pchan),
- gsm_pchan_name(pchan), get_value_string(femtobts_chcomb_names,
- cr->logChComb));
+ LOGPLCHAN(ts->lchan, DL1C, LOGL_DEBUG, "pchan=%s ts_connect_as(%s)
logChComb=%s\n",
+ gsm_pchan_name(ts->pchan), gsm_pchan_name(pchan),
+ get_value_string(femtobts_chcomb_names, cr->logChComb));
return l1if_gsm_req_compl(fl1h, msg, cb, NULL);
}
@@ -572,8 +571,7 @@
case GSM_LCHAN_TCH_H:
return GsmL1_Sapi_TchH;
default:
- LOGP(DL1C, LOGL_NOTICE, "%s cannot determine L1 SAPI\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_NOTICE, "cannot determine L1 SAPI\n");
break;
}
return GsmL1_Sapi_Idle;
@@ -785,12 +783,8 @@
talloc_free(cmd);
if (end || llist_empty(&lchan->sapi_cmds)) {
- LOGP(DL1C, LOGL_DEBUG,
- "%s End of SAPI cmd queue encountered.%s\n",
- gsm_lchan_name(lchan),
- llist_empty(&lchan->sapi_cmds)
- ? " Queue is now empty."
- : " More pending.");
+ LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "End of SAPI cmd queue encountered.%s\n",
+ llist_empty(&lchan->sapi_cmds) ? " Queue is now empty." : "
More pending.");
return;
}
@@ -830,8 +824,7 @@
goto err;
}
- LOGP(DL1C, LOGL_INFO, "%s MPH-ACTIVATE.conf (%s ",
- gsm_lchan_name(lchan),
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-ACTIVATE.conf (%s ",
get_value_string(femtobts_l1sapi_names, ic->sapi));
LOGPC(DL1C, LOGL_INFO, "%s)\n",
get_value_string(femtobts_dir_names, ic->dir));
@@ -853,19 +846,15 @@
lchan->sapis_ul[ic->sapi] = status;
if (llist_empty(&lchan->sapi_cmds)) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Got activation confirmation with empty queue\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Got activation confirmation with empty
queue\n");
goto err;
}
cmd = llist_entry(lchan->sapi_cmds.next, struct sapi_cmd, entry);
if (cmd->sapi != ic->sapi || cmd->dir != ic->dir ||
cmd->type != SAPI_CMD_ACTIVATE) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Confirmation mismatch (%d, %d) (%d, %d)\n",
- gsm_lchan_name(lchan), cmd->sapi, cmd->dir,
- ic->sapi, ic->dir);
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Confirmation mismatch (%d, %d) (%d,
%d)\n",
+ cmd->sapi, cmd->dir, ic->sapi, ic->dir);
goto err;
}
@@ -952,8 +941,7 @@
(struct gsm48_multi_rate_conf *) amr_mrc->gsm48_ie;
int j;
- LOGP(DL1C, LOGL_INFO, "%s: %s tch_mode=0x%02x\n",
- gsm_lchan_name(lchan), __func__, lchan->tch_mode);
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, ": %s tch_mode=0x%02x\n", __func__,
lchan->tch_mode);
switch (lchan->tch_mode) {
case GSM48_CMODE_SIGN:
@@ -1106,9 +1094,8 @@
break;
}
- LOGP(DL1C, LOGL_INFO, "%s MPH-ACTIVATE.req (hL2=0x%08x, %s ",
- gsm_lchan_name(lchan), act_req->hLayer2,
- get_value_string(femtobts_l1sapi_names, act_req->sapi));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-ACTIVATE.req (hL2=0x%08x, %s ",
act_req->hLayer2,
+ get_value_string(femtobts_l1sapi_names, act_req->sapi));
dump_lch_par(LOGL_INFO, lch_par, act_req->sapi);
LOGPC(DL1C, LOGL_INFO, "%s)\n",
get_value_string(femtobts_dir_names, act_req->dir));
@@ -1133,9 +1120,7 @@
/* FIXME: Error handling */
if (status != GsmL1_Status_Success) {
- LOGP(DL1C, LOGL_ERROR,
- "%s act failed mark broken due status: %d\n",
- gsm_lchan_name(lchan), status);
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "act failed mark broken due status: %d\n",
status);
lchan_set_state(lchan, LCHAN_S_BROKEN);
sapi_clear_queue(&lchan->sapi_cmds);
mph_info_chan_confirm(lchan, PRIM_INFO_ACTIVATE, RSL_ERR_PROCESSOR_OVERLOAD);
@@ -1182,9 +1167,7 @@
lchan_set_state(lchan, LCHAN_S_ACT_REQ);
if (!llist_empty(&lchan->sapi_cmds))
- LOGP(DL1C, LOGL_ERROR,
- "%s Trying to activate lchan, but commands in queue\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Trying to activate lchan, but commands in
queue\n");
/* For handover, always start the main channel immediately.
lchan->want_dl_sacch_active indicates whether dl
* SACCH should be activated. Also, for HO, start the RACH SAPI. */
@@ -1294,9 +1277,8 @@
goto err;
}
- LOGP(DL1C, LOGL_INFO, "%s MPH-CONFIG.conf (%s) ",
- gsm_lchan_name(lchan),
- get_value_string(femtobts_l1cfgt_names, cc->cfgParamId));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-CONFIG.conf (%s) ",
+ get_value_string(femtobts_l1cfgt_names, cc->cfgParamId));
switch (cc->cfgParamId) {
case GsmL1_ConfigParamId_SetLogChParams:
@@ -1328,9 +1310,7 @@
break;
}
if (llist_empty(&lchan->sapi_cmds)) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Got ciphering conf with empty queue\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Got ciphering conf with empty
queue\n");
goto err;
}
@@ -1381,10 +1361,8 @@
/* FIXME: update encryption */
- LOGP(DL1C, LOGL_INFO, "%s MPH-CONFIG.req (%s) ",
- gsm_lchan_name(lchan),
- get_value_string(femtobts_l1sapi_names,
- conf_req->cfgParams.setLogChParams.sapi));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-CONFIG.req (%s) ",
+ get_value_string(femtobts_l1sapi_names,
conf_req->cfgParams.setLogChParams.sapi));
LOGPC(DL1C, LOGL_INFO, "cfgParams Tn=%u, subCh=%u, dir=0x%x ",
conf_req->cfgParams.setLogChParams.u8Tn,
conf_req->cfgParams.setLogChParams.subCh,
@@ -1451,11 +1429,9 @@
return -EINVAL;
cfgr->cfgParams.setCipheringParams.cipherId = rsl2l1_ciph[lchan->encr.alg_id];
- LOGP(DL1C, LOGL_NOTICE, "%s SET_CIPHERING (ALG=%u %s)\n",
- gsm_lchan_name(lchan),
- cfgr->cfgParams.setCipheringParams.cipherId,
- get_value_string(femtobts_dir_names,
- cfgr->cfgParams.setCipheringParams.dir));
+ LOGPLCHAN(lchan, DL1C, LOGL_NOTICE, "SET_CIPHERING (ALG=%u %s)\n",
+ cfgr->cfgParams.setCipheringParams.cipherId,
+ get_value_string(femtobts_dir_names, cfgr->cfgParams.setCipheringParams.dir));
memcpy(cfgr->cfgParams.setCipheringParams.u8Kc,
lchan->encr.key, lchan->encr.key_len);
@@ -1533,9 +1509,8 @@
goto err;
}
- LOGP(DL1C, LOGL_INFO, "%s MPH-DEACTIVATE.conf (%s ",
- gsm_lchan_name(lchan),
- get_value_string(femtobts_l1sapi_names, ic->sapi));
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-DEACTIVATE.conf (%s ",
+ get_value_string(femtobts_l1sapi_names, ic->sapi));
LOGPC(DL1C, LOGL_INFO, "%s)\n",
get_value_string(femtobts_dir_names, ic->dir));
@@ -1557,19 +1532,15 @@
if (llist_empty(&lchan->sapi_cmds)) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Got de-activation confirmation with empty queue\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Got de-activation confirmation with empty
queue\n");
goto err;
}
cmd = llist_entry(lchan->sapi_cmds.next, struct sapi_cmd, entry);
if (cmd->sapi != ic->sapi || cmd->dir != ic->dir ||
cmd->type != SAPI_CMD_DEACTIVATE) {
- LOGP(DL1C, LOGL_ERROR,
- "%s Confirmation mismatch (%d, %d) (%d, %d)\n",
- gsm_lchan_name(lchan), cmd->sapi, cmd->dir,
- ic->sapi, ic->dir);
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Confirmation mismatch (%d, %d) (%d,
%d)\n",
+ cmd->sapi, cmd->dir, ic->sapi, ic->dir);
goto err;
}
@@ -1594,8 +1565,7 @@
deact_req->sapi = cmd->sapi;
deact_req->hLayer3 = l1if_lchan_to_hLayer(lchan);
- LOGP(DL1C, LOGL_INFO, "%s MPH-DEACTIVATE.req (%s ",
- gsm_lchan_name(lchan),
+ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "MPH-DEACTIVATE.req (%s ",
get_value_string(femtobts_l1sapi_names, deact_req->sapi));
LOGPC(DL1C, LOGL_INFO, "%s)\n",
get_value_string(femtobts_dir_names, deact_req->dir));
@@ -1608,8 +1578,7 @@
{
/* FIXME: Error handling. There is no NACK... */
if (status != GsmL1_Status_Success && lchan->state == LCHAN_S_REL_REQ) {
- LOGP(DL1C, LOGL_ERROR, "%s is now broken. Stopping the release.\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "is now broken. Stopping the
release.\n");
lchan_set_state(lchan, LCHAN_S_BROKEN);
sapi_clear_queue(&lchan->sapi_cmds);
mph_info_chan_confirm(lchan, PRIM_INFO_DEACTIVATE, 0);
@@ -1694,8 +1663,7 @@
/* nothing was queued */
if (res == 0) {
- LOGP(DL1C, LOGL_ERROR, "%s all SAPIs already released?\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "all SAPIs already released?\n");
lchan_set_state(lchan, LCHAN_S_BROKEN);
mph_info_chan_confirm(lchan, PRIM_INFO_DEACTIVATE, 0);
}
@@ -1895,8 +1863,7 @@
if (lchan->ho.active == HANDOVER_NONE)
return -1;
- LOGP(DHO, LOGL_ERROR, "%s modifying channel for handover\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DHO, LOGL_ERROR, "modifying channel for handover\n");
/* Give up listening to RACH bursts */
release_sapi_ul_rach(lchan);
@@ -1921,8 +1888,7 @@
{
/* A duplicate RF Release Request, ignore it */
if (lchan->state == LCHAN_S_REL_REQ) {
- LOGP(DL1C, LOGL_ERROR, "%s already in release request state.\n",
- gsm_lchan_name(lchan));
+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "already in release request state.\n");
return 0;
}
@@ -1958,8 +1924,7 @@
struct gsm_bts_trx_ts *ts = &trx->ts[cnf->u8Tn];
OSMO_ASSERT(cnf->u8Tn < TRX_NR_TS);
- LOGP(DL1C, LOGL_DEBUG, "%s Rx mphDisconnectCnf\n",
- gsm_lchan_name(ts->lchan));
+ LOGPLCHAN(ts->lchan, DL1C, LOGL_DEBUG, "Rx mphDisconnectCnf\n");
cb_ts_disconnected(ts);
@@ -1972,7 +1937,7 @@
struct femtol1_hdl *fl1h = trx_femtol1_hdl(ts->trx);
GsmL1_MphDisconnectReq_t *cr;
- DEBUGP(DRSL, "%s TS disconnect\n", gsm_lchan_name(ts->lchan));
+ LOGPLCHAN(ts->lchan, DRSL, LOGL_DEBUG, "TS disconnect\n");
cr = prim_init(msgb_l1prim(msg), GsmL1_PrimId_MphDisconnectReq, fl1h,
l1p_handle_for_ts(ts));
cr->u8Tn = ts->nr;
@@ -1988,8 +1953,7 @@
struct gsm_bts_trx_ts *ts = &trx->ts[cnf->u8Tn];
OSMO_ASSERT(cnf->u8Tn < TRX_NR_TS);
- DEBUGP(DL1C, "%s %s Rx mphConnectCnf flags=%s%s%s\n",
- gsm_lchan_name(ts->lchan),
+ LOGPLCHAN(ts->lchan, DL1C, LOGL_DEBUG, "%s Rx mphConnectCnf
flags=%s%s%s\n",
gsm_pchan_name(ts->pchan),
ts->flags & TS_F_PDCH_ACTIVE ? "ACTIVE " : "",
ts->flags & TS_F_PDCH_ACT_PENDING ? "ACT_PENDING " :
"",
diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c
index b578ca0..105e726 100644
--- a/src/osmo-bts-virtual/l1_if.c
+++ b/src/osmo-bts-virtual/l1_if.c
@@ -319,10 +319,10 @@
/* 100% BER is n_bits_total is 0 */
float ber = n_bits_total==0 ? 1.0 : (float)n_errors / (float)n_bits_total;
- DEBUGPFN(DMEAS, fn, "RX L1 frame %s chan_nr=0x%02x MS pwr=%ddBm rssi=%.1f dBFS
"
- "ber=%.2f%% (%d/%d bits) L1_ta=%d ta_ctrl.current=%d toa=%.2f\n",
- gsm_lchan_name(lchan), chan_nr, ms_pwr_dbm(lchan->ts->trx->bts->band,
lchan->ms_power_ctrl.max),
- rssi, ber*100, n_errors, n_bits_total, lchan->meas.l1_info.ta,
lchan->ta_ctrl.current, toa);
+ LOGPLCFN(lchan, DMEAS, LOGL_DEBUG, fn, "RX L1 frame chan_nr=0x%02x MS pwr=%ddBm
rssi=%.1f dBFS "
+ "ber=%.2f%% (%d/%d bits) L1_ta=%d ta_ctrl.current=%d toa=%.2f\n",
+ chan_nr, ms_pwr_dbm(lchan->ts->trx->bts->band,
lchan->ms_power_ctrl.max),
+ rssi, ber*100, n_errors, n_bits_total, lchan->meas.l1_info.ta,
lchan->ta_ctrl.current, toa);
l1if_fill_meas_res(&l1sap, chan_nr, lchan->ta_ctrl.current + toa, ber, rssi,
fn);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32093
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: If4f4f555f5ca61dfa624b298805f5375efc0b137
Gerrit-Change-Number: 32093
Gerrit-PatchSet: 6
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged