Review at https://gerrit.osmocom.org/6750
host/trxcon: adjust default verbosity level Change-Id: I91258091b59e5cdd30b767364fb48c3d67980eb7 --- M src/host/trxcon/l1ctl.c M src/host/trxcon/sched_clck.c M src/host/trxcon/sched_trx.c 3 files changed, 22 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/50/6750/1 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ /* 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 @@ 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 @@ 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 @@ /* 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 @@ 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 *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 @@ 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 @@ 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 @@ /* 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; } -- To view, visit https://gerrit.osmocom.org/6750 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91258091b59e5cdd30b767364fb48c3d67980eb7 Gerrit-PatchSet: 1 Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Owner: Harald Welte <lafo...@gnumonks.org>