fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28790 ) Change subject: trxcon: pass lchan to tchh_block_dl_first_fn() for logging ...................................................................... trxcon: pass lchan to tchh_block_dl_first_fn() for logging Change-Id: I8fafd180e2539be860bf183782817690dcad2d7d --- M src/host/trxcon/src/sched_lchan_tchh.c 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index 2b4b682..a8c641b 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -149,9 +149,10 @@ * @return either frame number of the first burst, * or fn=last_fn if calculation failed */ -static uint32_t tchh_block_dl_first_fn(enum l1sched_lchan_type chan, +static uint32_t tchh_block_dl_first_fn(const struct l1sched_lchan_state *lchan, uint32_t last_fn, bool facch) { + enum l1sched_lchan_type chan = lchan->type; uint8_t fn_mf, fn_diff; int i = 0; @@ -182,11 +183,9 @@ BLOCK_FIRST_FN(tch_h1_traffic_block_map); } -#if 0 LOGP_LCHAND(lchan, LOGL_ERROR, "Failed to calculate TDMA frame number of the first burst of %s block, " "using the current fn=%u\n", facch ? "FACCH/H" : "TCH/H", last_fn); -#endif /* Couldn't calculate the first fn, return the last */ return last_fn; @@ -331,7 +330,7 @@ /* Didn't try to decode, fake measurements */ if (n_errors < 0) { lchan->meas_avg = (struct l1sched_meas_set) { - .fn = tchh_block_dl_first_fn(lchan->type, fn, false), + .fn = tchh_block_dl_first_fn(lchan, fn, false), .toa256 = 0, .rssi = -110, }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8fafd180e2539be860bf183782817690dcad2d7d Gerrit-Change-Number: 28790 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: merged