summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2017-07-26 20:28:01 +0600
committerVadim Yanitskiy <axilirator@gmail.com>2017-10-23 22:05:49 +0330
commit8e2db3bbc83fe6037d02fb6135f98454a715023e (patch)
treeec121b7103936ebd19695758e3789b0a9aca6d52
parent1515045c816a999b9470651acb2eb6e30148e02c (diff)
host/trxcon: adjust default verbosity level
-rw-r--r--src/host/trxcon/l1ctl.c21
-rw-r--r--src/host/trxcon/sched_clck.c6
-rw-r--r--src/host/trxcon/sched_trx.c8
3 files changed, 22 insertions, 13 deletions
diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c
index 7810763..f9c1cad 100644
--- a/src/host/trxcon/l1ctl.c
+++ b/src/host/trxcon/l1ctl.c
@@ -283,7 +283,7 @@ static int l1ctl_rx_fbsb_req(struct l1ctl_link *l1l, struct msgb *msg)
band_arfcn = ntohs(fbsb->band_arfcn);
timeout = ntohs(fbsb->timeout);
- LOGP(DL1C, LOGL_DEBUG, "Recv FBSB Req (%s %d)\n",
+ LOGP(DL1C, LOGL_NOTICE, "Received FBSB request (%s %d)\n",
gsm_band_name(gsm_arfcn2band(band_arfcn)),
band_arfcn &~ ARFCN_FLAG_MASK);
@@ -335,7 +335,8 @@ static int l1ctl_rx_pm_req(struct l1ctl_link *l1l, struct msgb *msg)
arfcn_start = ntohs(pmr->range.band_arfcn_from);
arfcn_stop = ntohs(pmr->range.band_arfcn_to);
- LOGP(DL1C, LOGL_DEBUG, "Recv PM Req (%s: %d -> %d)\n",
+ LOGP(DL1C, LOGL_NOTICE, "Received power measurement "
+ "request (%s: %d -> %d)\n",
gsm_band_name(gsm_arfcn2band(arfcn_start)),
arfcn_start &~ ARFCN_FLAG_MASK,
arfcn_stop &~ ARFCN_FLAG_MASK);
@@ -361,7 +362,8 @@ static int l1ctl_rx_reset_req(struct l1ctl_link *l1l, struct msgb *msg)
goto exit;
}
- LOGP(DL1C, LOGL_DEBUG, "Recv Reset Req (%u)\n", res->type);
+ LOGP(DL1C, LOGL_NOTICE, "Received reset request (%u)\n",
+ res->type);
switch (res->type) {
case L1CTL_RES_T_FULL:
@@ -414,7 +416,9 @@ static int l1ctl_rx_ccch_mode_req(struct l1ctl_link *l1l, struct msgb *msg)
goto exit;
}
- LOGP(DL1C, LOGL_DEBUG, "Recv CCCH Mode Req (%u)\n", req->ccch_mode);
+ LOGP(DL1C, LOGL_NOTICE, "Received CCCH mode request (%s)\n",
+ req->ccch_mode == CCCH_MODE_COMBINED ?
+ "combined" : "not combined");
/* Reconfigure TS0 */
mode = req->ccch_mode == CCCH_MODE_COMBINED ?
@@ -445,8 +449,8 @@ static int l1ctl_rx_rach_req(struct l1ctl_link *l1l, struct msgb *msg)
/* Convert offset value to host format */
req->offset = ntohs(req->offset);
- LOGP(DL1C, LOGL_DEBUG, "Recv RACH Req (offset=%u ra=0x%02x)\n",
- req->offset, req->ra);
+ LOGP(DL1C, LOGL_NOTICE, "Received RACH request "
+ "(offset=%u ra=0x%02x)\n", req->offset, req->ra);
/* FIXME: can we use other than TS0? */
ts = sched_trx_find_ts(l1l->trx, 0);
@@ -496,7 +500,7 @@ static int l1ctl_rx_dm_est_req(struct l1ctl_link *l1l, struct msgb *msg)
band_arfcn = ntohs(est_req->h0.band_arfcn);
chan_nr = ul->chan_nr;
- LOGP(DL1C, LOGL_DEBUG, "Recv L1CTL_DM_EST_REQ (arfcn=%u, "
+ LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_DM_EST_REQ (arfcn=%u, "
"chan_nr=0x%02x, tsc=%u)\n", (band_arfcn &~ ARFCN_FLAG_MASK),
chan_nr, est_req->tsc);
@@ -559,6 +563,9 @@ exit:
static int l1ctl_rx_dm_rel_req(struct l1ctl_link *l1l, struct msgb *msg)
{
+ LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_DM_REL_REQ, "
+ "switching back to CCCH\n");
+
/* Reset scheduler */
sched_trx_reset(l1l->trx, 0);
diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c
index d57d07e..59cffb2 100644
--- a/src/host/trxcon/sched_clck.c
+++ b/src/host/trxcon/sched_clck.c
@@ -52,7 +52,7 @@ static void sched_clck_tick(void *data)
/* Check if transceiver is still alive */
if (sched->fn_counter_lost++ == TRX_LOSS_FRAMES) {
- LOGP(DSCH, LOGL_NOTICE, "No more clock from transceiver\n");
+ LOGP(DSCH, LOGL_DEBUG, "No more clock from transceiver\n");
sched->state = SCH_CLCK_STATE_WAIT;
return;
@@ -131,12 +131,14 @@ int sched_clck_handle(struct trx_sched *sched, uint32_t fn)
if (sched->state == SCH_CLCK_STATE_WAIT) {
sched_clck_correct(sched, &tv_now, fn);
- LOGP(DSCH, LOGL_NOTICE, "Initial clock received: fn=%u\n", fn);
+ LOGP(DSCH, LOGL_DEBUG, "Initial clock received: fn=%u\n", fn);
sched->state = SCH_CLCK_STATE_OK;
return 0;
}
+ LOGP(DSCH, LOGL_NOTICE, "Clock indication: fn=%u\n", fn);
+
osmo_timer_del(&sched->clock_timer);
/* Calculate elapsed time / frames since last processed fn */
diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c
index 94a8e68..7ac6497 100644
--- a/src/host/trxcon/sched_trx.c
+++ b/src/host/trxcon/sched_trx.c
@@ -155,7 +155,7 @@ struct trx_ts *sched_trx_add_ts(struct trx_instance *trx, int ts_num)
{
struct trx_ts *ts;
- LOGP(DSCH, LOGL_INFO, "Add a new TDMA timeslot #%u\n", ts_num);
+ LOGP(DSCH, LOGL_NOTICE, "Add a new TDMA timeslot #%u\n", ts_num);
ts = talloc_zero(trx, struct trx_ts);
if (!ts)
@@ -190,7 +190,7 @@ void sched_trx_del_ts(struct trx_instance *trx, int ts_num)
if (ts == NULL)
return;
- LOGP(DSCH, LOGL_INFO, "Delete TDMA timeslot #%u\n", ts_num);
+ LOGP(DSCH, LOGL_NOTICE, "Delete TDMA timeslot #%u\n", ts_num);
/* Flush queue primitives for TX */
msgb_queue_flush(&ts->tx_prims);
@@ -232,7 +232,7 @@ int sched_trx_configure_ts(struct trx_instance *trx, int ts_num,
if (ts->mf_layout->chan_config != config)
return -EINVAL;
- LOGP(DSCH, LOGL_INFO, "(Re)configure TDMA timeslot #%u as %s\n",
+ LOGP(DSCH, LOGL_NOTICE, "(Re)configure TDMA timeslot #%u as %s\n",
ts_num, ts->mf_layout->name);
/* Count channel states */
@@ -431,7 +431,7 @@ int sched_trx_handle_rx_burst(struct trx_instance *trx, uint8_t ts_num,
/* Check whether required timeslot is enabled / configured */
ts = sched_trx_find_ts(trx, ts_num);
if (ts == NULL) {
- LOGP(DSCH, LOGL_ERROR, "TDMA timeslot #%u isn't configured, "
+ LOGP(DSCH, LOGL_DEBUG, "TDMA timeslot #%u isn't configured, "
"ignoring burst...\n", ts_num);
return -EINVAL;
}