Hello Harald Welte, Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/3098
to look at the new patch set (#3).
Use osmo_dump_gsmtime to 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, 17 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/3098/3
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index f487d77..b6fcad3 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -798,8 +798,7 @@
gsm_fn2gsmtime(&g_time, fn);
- DEBUGP(DL1P, "Rx TCH-RTS.ind %02u/%02u/%02u chan_nr=%d\n",
- g_time.t1, g_time.t2, g_time.t3, chan_nr);
+ DEBUGP(DL1P, "Rx TCH-RTS.ind %s chan_nr=%d\n",
osmo_dump_gsmtime(&g_time), chan_nr);
lchan = get_active_lchan_by_chan_nr(trx, chan_nr);
if (!lchan)
@@ -955,8 +954,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 %s chan_nr=%d link_id=%d\n",
+ osmo_dump_gsmtime(&g_time), chan_nr, link_id);
if (ts_is_pdch(&trx->ts[tn])) {
lchan = get_lchan_by_chan_nr(trx, chan_nr);
@@ -1060,8 +1059,7 @@
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 %s chan_nr=%d\n", osmo_dump_gsmtime(&g_time),
chan_nr);
lchan = get_active_lchan_by_chan_nr(trx, chan_nr);
if (!lchan)
@@ -1212,9 +1210,9 @@
gsm_fn2gsmtime(&g_time, fn);
- DEBUGP(DL1P, "TX packet data %02u/%02u/%02u is_ptcch=%d trx=%d ts=%d "
- "block_nr=%d, arfcn=%d, len=%d\n", g_time.t1, g_time.t2,
- g_time.t3, is_ptcch, ts->trx->nr, ts->nr, block_nr, arfcn, len);
+ DEBUGP(DL1P, "TX packet data %s is_ptcch=%d trx=%d ts=%d "
+ "block_nr=%d, arfcn=%d, len=%d\n", osmo_dump_gsmtime(&g_time),
+ is_ptcch, ts->trx->nr, ts->nr, block_nr, arfcn, len);
msg = l1sap_msgb_alloc(len);
l1sap = msgb_l1sap_prim(msg);
diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index 66aa21a..b82a7c6 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -926,6 +926,7 @@
uint8_t chan_nr, link_id;
struct osmo_phsap_prim *l1sap;
uint32_t fn;
+ struct gsm_time g_time;
uint8_t *data, len;
int rc = 0;
int8_t rssi;
@@ -943,9 +944,11 @@
process_meas_res(trx, chan_nr, &data_ind->measParam, fn);
- DEBUGP(DL1C, "Rx PH-DATA.ind %s (hL2 %08x): %s",
+ gsm_fn2gsmtime(&g_time, fn);
+
+ DEBUGP(DL1P, "Rx PH-DATA.ind %s %s (hL2 %08x): %s\n",
get_value_string(lc15bts_l1sapi_names, data_ind->sapi),
- (uint32_t)data_ind->hLayer2,
+ osmo_dump_gsmtime(&g_time), (uint32_t)data_ind->hLayer2,
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..e5e295a 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -927,6 +927,7 @@
struct msgb *sap_msg;
struct osmo_phsap_prim *l1sap;
uint32_t fn;
+ struct gsm_time g_time;
int rc = 0;
chan_nr = chan_nr_by_sapi(&trx->ts[data_ind->u8Tn], data_ind->sapi,
@@ -942,9 +943,11 @@
process_meas_res(trx, chan_nr, fn, &data_ind->measParam);
- DEBUGP(DL1P, "Rx PH-DATA.ind %s (hL2 %08x): %s",
+ gsm_fn2gsmtime(&g_time, fn);
+
+ DEBUGP(DL1P, "Rx PH-DATA.ind %s %s (hL2 %08x): %s\n",
get_value_string(femtobts_l1sapi_names, data_ind->sapi),
- data_ind->hLayer2,
+ osmo_dump_gsmtime(&g_time), data_ind->hLayer2,
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: newpatchset
Gerrit-Change-Id: I049f58d51333d3590361db5c0105e6899a862af6
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pes...@sysmocom.de>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
