<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17349">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/scheduler: make TDMA_FN_INC(fn) behave like ++fn<br><br>Change-Id: I9c2fa26df54b5de836a18f09363a9221c24ae707<br>---<br>M src/host/trxcon/sched_clck.c<br>M src/host/trxcon/sched_trx.c<br>M src/host/trxcon/scheduler.h<br>3 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c</span><br><span>index 66477b2..7c814dc 100644</span><br><span>--- a/src/host/trxcon/sched_clck.c</span><br><span>+++ b/src/host/trxcon/sched_clck.c</span><br><span>@@ -82,7 +82,7 @@</span><br><span> timespecadd(tv_clock, &frame_duration, tv_clock);</span><br><span> elapsed_us -= FRAME_DURATION_uS;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sched->fn_counter_proc = TDMA_FN_INC(sched->fn_counter_proc);</span><br><span style="color: hsl(120, 100%, 40%);">+ TDMA_FN_INC(&sched->fn_counter_proc);</span><br><span> </span><br><span> /* Call frame callback */</span><br><span> if (sched->clock_cb)</span><br><span>@@ -178,7 +178,7 @@</span><br><span> </span><br><span> /* Transmit what we still need to transmit */</span><br><span> while (fn != sched->fn_counter_proc) {</span><br><span style="color: hsl(0, 100%, 40%);">- sched->fn_counter_proc = TDMA_FN_INC(sched->fn_counter_proc);</span><br><span style="color: hsl(120, 100%, 40%);">+ TDMA_FN_INC(&sched->fn_counter_proc);</span><br><span> </span><br><span> /* Call frame callback */</span><br><span> if (sched->clock_cb)</span><br><span>diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c</span><br><span>index 6bb662d..b7914b6 100644</span><br><span>--- a/src/host/trxcon/sched_trx.c</span><br><span>+++ b/src/host/trxcon/sched_trx.c</span><br><span>@@ -640,7 +640,7 @@</span><br><span> * start counting from last fn + 1</span><br><span> */</span><br><span> if (elapsed < 10)</span><br><span style="color: hsl(0, 100%, 40%);">- fn = TDMA_FN_INC(ts->mf_last_fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ fn = TDMA_FN_SUM(ts->mf_last_fn, 1);</span><br><span> else</span><br><span> fn = burst_fn;</span><br><span> </span><br><span>@@ -682,7 +682,7 @@</span><br><span> if (fn == burst_fn)</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fn = TDMA_FN_INC(fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ TDMA_FN_INC(&fn);</span><br><span> }</span><br><span> </span><br><span> /* Set last processed frame number */</span><br><span>diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/scheduler.h</span><br><span>index 7ab17ab..36c64e5 100644</span><br><span>--- a/src/host/trxcon/scheduler.h</span><br><span>+++ b/src/host/trxcon/scheduler.h</span><br><span>@@ -16,7 +16,7 @@</span><br><span> #define TDMA_FN_SUB(a, b) \</span><br><span> ((a + GSM_HYPERFRAME - b) % GSM_HYPERFRAME)</span><br><span> #define TDMA_FN_INC(fn) \</span><br><span style="color: hsl(0, 100%, 40%);">- TDMA_FN_SUM(fn, 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ (*fn = TDMA_FN_SUM(*fn, 1))</span><br><span> #define TDMA_FN_MIN(a, b) \</span><br><span> (a < b ? a : b)</span><br><span> #define TDMA_FN_DIFF(a, b) \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17349">change 17349</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/osmocom-bb/+/17349"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9c2fa26df54b5de836a18f09363a9221c24ae707 </div>
<div style="display:none"> Gerrit-Change-Number: 17349 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>