<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10945">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/scheduler.h: share FRAME_DURATION_uS definition<br><br>Change-Id: I88be6088141af6bac8d34844b71193bfef51ad31<br>---<br>M src/host/trxcon/l1ctl.c<br>M src/host/trxcon/sched_clck.c<br>M src/host/trxcon/scheduler.h<br>3 files changed, 4 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c</span><br><span>index 1e88f8b..a8a1289 100644</span><br><span>--- a/src/host/trxcon/l1ctl.c</span><br><span>+++ b/src/host/trxcon/l1ctl.c</span><br><span>@@ -337,10 +337,10 @@</span><br><span>    trx_if_cmd_poweron(l1l->trx);</span><br><span> </span><br><span>         /* Start FBSB expire timer */</span><br><span style="color: hsl(0, 100%, 40%);">-   /* TODO: share FRAME_DURATION_uS=4615 from scheduler.c */</span><br><span>    l1l->fbsb_timer.data = l1l;</span><br><span>       l1l->fbsb_timer.cb = fbsb_timer_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-  osmo_timer_schedule(&l1l->fbsb_timer, 0, timeout * 4615);</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_timer_schedule(&l1l->fbsb_timer, 0,</span><br><span style="color: hsl(120, 100%, 40%);">+               timeout * FRAME_DURATION_uS);</span><br><span> </span><br><span> exit:</span><br><span>   msgb_free(msg);</span><br><span>diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c</span><br><span>index 56b89a2..dab9578 100644</span><br><span>--- a/src/host/trxcon/sched_clck.c</span><br><span>+++ b/src/host/trxcon/sched_clck.c</span><br><span>@@ -43,7 +43,6 @@</span><br><span> #include "trx_if.h"</span><br><span> #include "trxcon.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define FRAME_DURATION_uS 4615</span><br><span> #define MAX_FN_SKEW             50</span><br><span> #define TRX_LOSS_FRAMES   400</span><br><span> </span><br><span>diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/scheduler.h</span><br><span>index 6c3a2f2..ddb863f 100644</span><br><span>--- a/src/host/trxcon/scheduler.h</span><br><span>+++ b/src/host/trxcon/scheduler.h</span><br><span>@@ -5,6 +5,8 @@</span><br><span> </span><br><span> #include <osmocom/core/timer.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define FRAME_DURATION_uS  4615</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define GSM_SUPERFRAME                (26 * 51)</span><br><span> #define GSM_HYPERFRAME             (2048 * GSM_SUPERFRAME)</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10945">change 10945</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/10945"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I88be6088141af6bac8d34844b71193bfef51ad31 </div>
<div style="display:none"> Gerrit-Change-Number: 10945 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>