[MERGED] osmo-bts[master]: l1sap: Fix log subsystem: Use DRTP for RTP related bits, L1C...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: l1sap: Fix log subsystem: Use DRTP for RTP related bits, L1C for MPH
......................................................................


l1sap: Fix log subsystem: Use DRTP for RTP related bits, L1C for MPH

Change-Id: Icc0325f41a1d80535d33e123083e220ee47df129
---
M src/common/l1sap.c
1 file changed, 11 insertions(+), 11 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index c388c82..d294110 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -91,7 +91,7 @@
 		r -= r % GSM_RTP_DURATION;
 
 		if (r != GSM_RTP_DURATION)
-			LOGP(DL1P, LOGL_ERROR, "RTP clock out of sync with lower layer:"
+			LOGP(DRTP, LOGL_ERROR, "RTP clock out of sync with lower layer:"
 				" %"PRIu32" vs %d (%"PRIu32"->%"PRIu32")\n",
 				r, GSM_RTP_DURATION, lchan->tch.last_fn, fn);
 	}
@@ -573,7 +573,7 @@
 {
 	struct gsm_lchan *lchan;
 
-	LOGP(DL1P, LOGL_INFO, "activate confirm chan_nr=0x%02x trx=%d\n",
+	LOGP(DL1C, LOGL_INFO, "activate confirm chan_nr=0x%02x trx=%d\n",
 		info_act_cnf->chan_nr, trx->nr);
 
 	lchan = get_lchan_by_chan_nr(trx, info_act_cnf->chan_nr);
@@ -598,7 +598,7 @@
 {
 	struct gsm_lchan *lchan;
 
-	LOGP(DL1P, LOGL_INFO, "deactivate confirm chan_nr=0x%02x trx=%d\n",
+	LOGP(DL1C, LOGL_INFO, "deactivate confirm chan_nr=0x%02x trx=%d\n",
 		info_act_cnf->chan_nr, trx->nr);
 
 	lchan = get_lchan_by_chan_nr(trx, info_act_cnf->chan_nr);
@@ -629,7 +629,7 @@
 		rc = l1sap_info_rel_cnf(trx, l1sap, &info->u.act_cnf);
 		break;
 	default:
-		LOGP(DL1P, LOGL_NOTICE, "unknown MPH_INFO cnf type %d\n",
+		LOGP(DL1C, LOGL_NOTICE, "unknown MPH_INFO cnf type %d\n",
 			info->type);
 		break;
 	}
@@ -1101,7 +1101,7 @@
 
 	gsm_fn2gsmtime(&g_time, fn);
 
-	DEBUGP(DL1P, "Rx TCH.ind %s chan_nr=0x%02x\n", osmo_dump_gsmtime(&g_time), chan_nr);
+	LOGP(DL1P, LOGL_INFO, "Rx TCH.ind %s chan_nr=0x%02x\n", osmo_dump_gsmtime(&g_time), chan_nr);
 
 	lchan = get_active_lchan_by_chan_nr(trx, chan_nr);
 	if (!lchan) {
@@ -1132,7 +1132,7 @@
 		/* Only clear the marker bit once we have sent a RTP packet with it */
 		lchan->rtp_tx_marker = false;
 	} else {
-		DEBUGP(DL1P, "Skipping RTP frame with lost payload\n");
+		DEBUGP(DRTP, "Skipping RTP frame with lost payload\n");
 		if (lchan->abis_ip.rtp_socket)
 			osmo_rtp_skipped_frame(lchan->abis_ip.rtp_socket, fn_ms_adj(fn, lchan));
 		lchan->rtp_tx_marker = true;
@@ -1326,7 +1326,7 @@
 	struct gsm48_chan_desc *cd;
 	int rc;
 
-	LOGP(DL1P, LOGL_INFO, "activating channel chan_nr=0x%02x trx=%d\n",
+	LOGP(DL1C, LOGL_INFO, "activating channel chan_nr=0x%02x trx=%d\n",
 		chan_nr, trx->nr);
 
 	/* osmo-pcu calls this without a valid 'tp' parameter, so we
@@ -1340,7 +1340,7 @@
 		 * one one TRX, so we need to make sure not to activate
 		 * channels with a different TSC!! */
 		if (cd->h0.tsc != (lchan->ts->trx->bts->bsic & 7)) {
-			LOGP(DRSL, LOGL_ERROR, "lchan TSC %u != BSIC-TSC %u\n",
+			LOGP(DL1C, LOGL_ERROR, "lchan TSC %u != BSIC-TSC %u\n",
 				cd->h0.tsc, lchan->ts->trx->bts->bsic & 7);
 			return -RSL_ERR_SERV_OPT_UNIMPL;
 		}
@@ -1366,7 +1366,7 @@
 int l1sap_chan_rel(struct gsm_bts_trx *trx, uint8_t chan_nr)
 {
 	struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr);
-	LOGP(DL1P, LOGL_INFO, "deactivating channel chan_nr=0x%02x trx=%d\n",
+	LOGP(DL1C, LOGL_INFO, "deactivating channel chan_nr=0x%02x trx=%d\n",
 		chan_nr, trx->nr);
 
 	if (lchan->tch.dtx.dl_amr_fsm) {
@@ -1382,7 +1382,7 @@
 {
 	struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr);
 
-	LOGP(DL1P, LOGL_INFO, "deactivating sacch chan_nr=0x%02x trx=%d\n",
+	LOGP(DL1C, LOGL_INFO, "deactivating sacch chan_nr=0x%02x trx=%d\n",
 		chan_nr, trx->nr);
 
 	lchan->sacch_deact = 1;
@@ -1393,7 +1393,7 @@
 
 int l1sap_chan_modify(struct gsm_bts_trx *trx, uint8_t chan_nr)
 {
-	LOGP(DL1P, LOGL_INFO, "modifying channel chan_nr=0x%02x trx=%d\n",
+	LOGP(DL1C, LOGL_INFO, "modifying channel chan_nr=0x%02x trx=%d\n",
 		chan_nr, trx->nr);
 
 	return l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_MODIFY, 0);

-- 
To view, visit https://gerrit.osmocom.org/5135
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc0325f41a1d80535d33e123083e220ee47df129
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder