Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/10945 )
Change subject: trxcon/scheduler.h: share FRAME_DURATION_uS definition
......................................................................
trxcon/scheduler.h: share FRAME_DURATION_uS definition
Change-Id: I88be6088141af6bac8d34844b71193bfef51ad31
---
M src/host/trxcon/l1ctl.c
M src/host/trxcon/sched_clck.c
M src/host/trxcon/scheduler.h
3 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c
index 1e88f8b..a8a1289 100644
--- a/src/host/trxcon/l1ctl.c
+++ b/src/host/trxcon/l1ctl.c
@@ -337,10 +337,10 @@
trx_if_cmd_poweron(l1l->trx);
/* Start FBSB expire timer */
- /* TODO: share FRAME_DURATION_uS=4615 from scheduler.c */
l1l->fbsb_timer.data = l1l;
l1l->fbsb_timer.cb = fbsb_timer_cb;
- osmo_timer_schedule(&l1l->fbsb_timer, 0, timeout * 4615);
+ osmo_timer_schedule(&l1l->fbsb_timer, 0,
+ timeout * FRAME_DURATION_uS);
exit:
msgb_free(msg);
diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c
index 56b89a2..dab9578 100644
--- a/src/host/trxcon/sched_clck.c
+++ b/src/host/trxcon/sched_clck.c
@@ -43,7 +43,6 @@
#include "trx_if.h"
#include "trxcon.h"
-#define FRAME_DURATION_uS 4615
#define MAX_FN_SKEW 50
#define TRX_LOSS_FRAMES 400
diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/scheduler.h
index 6c3a2f2..ddb863f 100644
--- a/src/host/trxcon/scheduler.h
+++ b/src/host/trxcon/scheduler.h
@@ -5,6 +5,8 @@
#include <osmocom/core/timer.h>
+#define FRAME_DURATION_uS 4615
+
#define GSM_SUPERFRAME (26 * 51)
#define GSM_HYPERFRAME (2048 * GSM_SUPERFRAME)
--
To view, visit https://gerrit.osmocom.org/10945
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I88be6088141af6bac8d34844b71193bfef51ad31
Gerrit-Change-Number: 10945
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
