[PATCH] osmo-bts[master]: Log fn across different layers

[Pau Espin Pedrol]

Review at  https://gerrit.osmocom.org/3098

Log fn across different layers

This commit also fixes a missing end of line in the log output of handle_ph_data_ind

Change-Id: I049f58d51333d3590361db5c0105e6899a862af6
---
M src/common/l1sap.c
M src/osmo-bts-litecell15/l1_if.c
M src/osmo-bts-sysmo/l1_if.c
3 files changed, 9 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/3098/1

diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 076222b..4a7e2c7 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -963,8 +963,8 @@
 
 	gsm_fn2gsmtime(&g_time, fn);
 
-	DEBUGP(DL1P, "Rx PH-DATA.ind %02u/%02u/%02u chan_nr=%d link_id=%d\n",
-		g_time.t1, g_time.t2, g_time.t3, chan_nr, link_id);
+	DEBUGP(DL1P, "Rx PH-DATA.ind %02u/%02u/%02u chan_nr=%d link_id=%d fn=%"PRIu32"\n",
+		g_time.t1, g_time.t2, g_time.t3, chan_nr, link_id, fn);
 
 	if (ts_is_pdch(&trx->ts[tn])) {
 		lchan = get_lchan_by_chan_nr(trx, chan_nr);
@@ -1067,8 +1067,8 @@
 
 	gsm_fn2gsmtime(&g_time, fn);
 
-	DEBUGP(DL1P, "Rx TCH.ind %02u/%02u/%02u chan_nr=%d\n",
-		g_time.t1, g_time.t2, g_time.t3, chan_nr);
+	DEBUGP(DL1P, "Rx TCH.ind %02u/%02u/%02u chan_nr=%d fn=%"PRIu32"\n",
+		g_time.t1, g_time.t2, g_time.t3, chan_nr, fn);
 
 	lchan = get_active_lchan_by_chan_nr(trx, chan_nr);
 	if (!lchan)
diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index 66aa21a..1880db7 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -943,9 +943,9 @@
 
 	process_meas_res(trx, chan_nr, &data_ind->measParam, fn);
 
-	DEBUGP(DL1C, "Rx PH-DATA.ind %s (hL2 %08x): %s",
+	DEBUGP(DL1P, "Rx PH-DATA.ind %s (hL2 %08x fn %"PRIu32"): %s\n",
 		get_value_string(lc15bts_l1sapi_names, data_ind->sapi),
-		(uint32_t)data_ind->hLayer2,
+		(uint32_t)data_ind->hLayer2, fn,
 		osmo_hexdump(data_ind->msgUnitParam.u8Buffer,
 			     data_ind->msgUnitParam.u8Size));
 	dump_meas_res(LOGL_DEBUG, &data_ind->measParam);
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 299a743..d96e780 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -942,9 +943,9 @@
 
 	process_meas_res(trx, chan_nr, fn, &data_ind->measParam);
 
-	DEBUGP(DL1P, "Rx PH-DATA.ind %s (hL2 %08x): %s",
+	DEBUGP(DL1P, "Rx PH-DATA.ind %s (hL2 %08x fn %"PRIu32"): %s\n",
 		get_value_string(femtobts_l1sapi_names, data_ind->sapi),
-		data_ind->hLayer2,
+		data_ind->hLayer2, fn,
 		osmo_hexdump(data_ind->msgUnitParam.u8Buffer,
 			     data_ind->msgUnitParam.u8Size));
 	dump_meas_res(LOGL_DEBUG, &data_ind->measParam);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I049f58d51333d3590361db5c0105e6899a862af6
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>