<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/17136">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">l1_if: Fix strange formatting of Meas info logging<br><br>Some use LOGPC, but were used after a LOGP with a trailing newline.<br>Let's simply add some defines/macros to be able to include it into a<br>normal LOGP easily insted of having a function.<br><br>Change-Id: Ie082b11c9d6d00ff2206184f03f6e3647c3da18c<br>---<br>M src/osmo-bts-litecell15/l1_if.c<br>M src/osmo-bts-oc2g/l1_if.c<br>M src/osmo-bts-octphy/l1_if.c<br>M src/osmo-bts-sysmo/l1_if.c<br>4 files changed, 27 insertions(+), 40 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/36/17136/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c</span><br><span>index d7e0cde..989cc10 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_if.c</span><br><span>+++ b/src/osmo-bts-litecell15/l1_if.c</span><br><span>@@ -936,12 +936,8 @@</span><br><span> goto tx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void dump_meas_res(int ll, GsmL1_MeasParam_t *m)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPC(DL1C, ll, ", Meas: RSSI %-3.2f dBm, Qual %-3.2f dB, "</span><br><span style="color: hsl(0, 100%, 40%);">- "BER %-3.2f, Timing %d\n", m->fRssi, m->fLinkQuality,</span><br><span style="color: hsl(0, 100%, 40%);">- m->fBer, m->i16BurstTiming);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_FMT_MEAS "Meas: RSSI %-3.2f dBm, Qual %-3.2f dB, BER %-3.2f, Timing %d"</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_PARAM_MEAS(meas_param) (meas_param)->fRssi, (meas_param)->fLinkQuality, (meas_param)->fBer, (meas_param)->i16BurstTiming</span><br><span> </span><br><span> static int process_meas_res(struct gsm_bts_trx *trx, uint8_t chan_nr,</span><br><span> GsmL1_MeasParam_t *m, uint32_t fn)</span><br><span>@@ -992,10 +988,10 @@</span><br><span> process_meas_res(trx, chan_nr, &data_ind->measParam, fn);</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind %s (hL2 %08x): %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind %s (hL2 %08x): %s, " LOG_FMT_MEAS "\n",</span><br><span> get_value_string(lc15bts_l1sapi_names, data_ind->sapi), (uint32_t)data_ind->hLayer2,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_hexdump(data_ind->msgUnitParam.u8Buffer, data_ind->msgUnitParam.u8Size));</span><br><span style="color: hsl(0, 100%, 40%);">- dump_meas_res(LOGL_DEBUG, &data_ind->measParam);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump(data_ind->msgUnitParam.u8Buffer, data_ind->msgUnitParam.u8Size),</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PARAM_MEAS(&data_ind->measParam));</span><br><span> </span><br><span> /* check for TCH */</span><br><span> if (data_ind->sapi == GsmL1_Sapi_TchF</span><br><span>@@ -1046,7 +1042,8 @@</span><br><span> struct ph_rach_ind_param rach_ind_param;</span><br><span> </span><br><span> set_log_ctx_sapi(ra_ind->sapi);</span><br><span style="color: hsl(0, 100%, 40%);">- dump_meas_res(LOGL_DEBUG, &ra_ind->measParam);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFN(DL1C, LOGL_DEBUG, ra_ind->u32Fn, "Rx PH-RA.ind, " LOG_FMT_MEAS "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PARAM_MEAS(&ra_ind->measParam));</span><br><span> </span><br><span> if ((ra_ind->msgUnitParam.u8Size != 1) &&</span><br><span> (ra_ind->msgUnitParam.u8Size != 2)) {</span><br><span>diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c</span><br><span>index 425fd0d..9816979 100644</span><br><span>--- a/src/osmo-bts-oc2g/l1_if.c</span><br><span>+++ b/src/osmo-bts-oc2g/l1_if.c</span><br><span>@@ -992,12 +992,9 @@</span><br><span> goto tx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void dump_meas_res(int ll, GsmL1_MeasParam_t *m)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPC(DL1C, ll, ", Meas: RSSI %-3.2f dBm, Qual %-3.2f dB, "</span><br><span style="color: hsl(0, 100%, 40%);">- "BER %-3.2f, Timing %d\n", m->fRssi, m->fLinkQuality,</span><br><span style="color: hsl(0, 100%, 40%);">- m->fBer, m->i16BurstTiming);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_FMT_MEAS "Meas: RSSI %-3.2f dBm, Qual %-3.2f dB, BER %-3.2f, Timing %d"</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_PARAM_MEAS(meas_param) (meas_param)->fRssi, (meas_param)->fLinkQuality, (meas_param)->fBer, (meas_param)->i16BurstTiming</span><br><span> </span><br><span> static int process_meas_res(struct gsm_bts_trx *trx, uint8_t chan_nr,</span><br><span> GsmL1_MeasParam_t *m, uint32_t fn)</span><br><span>@@ -1048,10 +1045,10 @@</span><br><span> process_meas_res(trx, chan_nr, &data_ind->measParam, fn);</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind %s (hL2 %08x): %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind %s (hL2 %08x): %s, " LOG_FMT_MEAS "\n",</span><br><span> get_value_string(oc2gbts_l1sapi_names, data_ind->sapi), (uint32_t)data_ind->hLayer2,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_hexdump(data_ind->msgUnitParam.u8Buffer, data_ind->msgUnitParam.u8Size));</span><br><span style="color: hsl(0, 100%, 40%);">- dump_meas_res(LOGL_DEBUG, &data_ind->measParam);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump(data_ind->msgUnitParam.u8Buffer, data_ind->msgUnitParam.u8Size),</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PARAM_MEAS(&data_ind->measParam));</span><br><span> </span><br><span> /* check for TCH */</span><br><span> if (data_ind->sapi == GsmL1_Sapi_TchF</span><br><span>@@ -1102,7 +1099,8 @@</span><br><span> struct ph_rach_ind_param rach_ind_param;</span><br><span> </span><br><span> set_log_ctx_sapi(ra_ind->sapi);</span><br><span style="color: hsl(0, 100%, 40%);">- dump_meas_res(LOGL_DEBUG, &ra_ind->measParam);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFN(DL1C, LOGL_DEBUG, ra_ind->u32Fn, "Rx PH-RA.ind, " LOG_FMT_MEAS "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PARAM_MEAS(&ra_ind->measParam));</span><br><span> </span><br><span> if ((ra_ind->msgUnitParam.u8Size != 1) &&</span><br><span> (ra_ind->msgUnitParam.u8Size != 2)) {</span><br><span>diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c</span><br><span>index 8f06b34..bdf85ca 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_if.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_if.c</span><br><span>@@ -906,14 +906,9 @@</span><br><span> l1sap_up(trx, &l1sap);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void dump_meas_res(int ll, tOCTVC1_GSM_MEASUREMENT_INFO * m)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMEAS, ll,</span><br><span style="color: hsl(0, 100%, 40%);">- "Meas: RSSI %d dBm, Burst Timing %d Quarter of bits :%d, "</span><br><span style="color: hsl(0, 100%, 40%);">- "BER Error Count %d , BER Toatal Bit count %d in last decoded frame\n",</span><br><span style="color: hsl(0, 100%, 40%);">- m->sRSSIDbm, m->sBurstTiming, m->sBurstTiming4x, m->usBERCnt,</span><br><span style="color: hsl(0, 100%, 40%);">- m->usBERTotalBitCnt);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_FMT_MEAS "Meas: RSSI %d dBm, Burst Timing %d Quarter of bits: %d, BER Error Count %d, BER Toatal Bit count %d in last decoded frame"</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_PARAM_MEAS(meas_param) (meas_param)->sRSSIDbm, (meas_param)->sBurstTiming, (meas_param)->sBurstTiming4x, (meas_param)->usBERCnt, (meas_param)->usBERTotalBitCnt</span><br><span> </span><br><span> static int handle_mph_time_ind(struct octphy_hdl *fl1, uint8_t trx_id, uint32_t fn)</span><br><span> {</span><br><span>@@ -1218,7 +1213,8 @@</span><br><span> </span><br><span> set_log_ctx_sapi(ra_ind->LchId.bySAPI);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- dump_meas_res(LOGL_DEBUG, &ra_ind->MeasurementInfo);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFN(DL1C, LOGL_DEBUG, ra_ind->ulFrameNumber, "Rx PH-RA.ind, " LOG_FMT_MEAS "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PARAM_MEAS(&ra_ind->MeasurementInfo));</span><br><span> </span><br><span> if (ra_ind->ulMsgLength != 1) {</span><br><span> LOGPFN(DL1C, LOGL_ERROR, ra_ind->ulFrameNumber,</span><br><span>diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c</span><br><span>index 199d8bd..db0dfb5 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_if.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_if.c</span><br><span>@@ -937,12 +937,8 @@</span><br><span> goto tx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void dump_meas_res(int ll, GsmL1_MeasParam_t *m)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPC(DL1C, ll, ", Meas: RSSI %-3.2f dBm, Qual %-3.2f dB, "</span><br><span style="color: hsl(0, 100%, 40%);">- "BER %-3.2f, Timing %d\n", m->fRssi, m->fLinkQuality,</span><br><span style="color: hsl(0, 100%, 40%);">- m->fBer, m->i16BurstTiming);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_FMT_MEAS "Meas: RSSI %-3.2f dBm, Qual %-3.2f dB, BER %-3.2f, Timing %d"</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_PARAM_MEAS(meas_param) (meas_param)->fRssi, (meas_param)->fLinkQuality, (meas_param)->fBer, (meas_param)->i16BurstTiming</span><br><span> </span><br><span> static int process_meas_res(struct gsm_bts_trx *trx, uint8_t chan_nr,</span><br><span> uint32_t fn, GsmL1_MeasParam_t *m)</span><br><span>@@ -991,10 +987,10 @@</span><br><span> </span><br><span> gsm_fn2gsmtime(&g_time, fn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind %s (hL2 %08x): %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind %s (hL2 %08x): %s, " LOG_FMT_MEAS "\n",</span><br><span> get_value_string(femtobts_l1sapi_names, data_ind->sapi), data_ind->hLayer2,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_hexdump(data_ind->msgUnitParam.u8Buffer, data_ind->msgUnitParam.u8Size));</span><br><span style="color: hsl(0, 100%, 40%);">- dump_meas_res(LOGL_DEBUG, &data_ind->measParam);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump(data_ind->msgUnitParam.u8Buffer, data_ind->msgUnitParam.u8Size),</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PARAM_MEAS(&data_ind->measParam));</span><br><span> </span><br><span> /* check for TCH */</span><br><span> if (data_ind->sapi == GsmL1_Sapi_TchF</span><br><span>@@ -1040,8 +1036,8 @@</span><br><span> struct ph_rach_ind_param rach_ind_param;</span><br><span> </span><br><span> set_log_ctx_sapi(ra_ind->sapi);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- dump_meas_res(LOGL_DEBUG, &ra_ind->measParam);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFN(DL1C, LOGL_DEBUG, ra_ind->u32Fn, "Rx PH-RA.ind, " LOG_FMT_MEAS "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PARAM_MEAS(&ra_ind->measParam));</span><br><span> </span><br><span> if ((ra_ind->msgUnitParam.u8Size != 1) &&</span><br><span> (ra_ind->msgUnitParam.u8Size != 2)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/17136">change 17136</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/17136"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie082b11c9d6d00ff2206184f03f6e3647c3da18c </div>
<div style="display:none"> Gerrit-Change-Number: 17136 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>