From 909c86df29b2018fe602438f90e2d56e3bde48e1 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Fri, 14 Sep 2018 18:12:20 +0700 Subject: trxcon/scheduler.h: share FRAME_DURATION_uS definition Change-Id: I88be6088141af6bac8d34844b71193bfef51ad31 --- src/host/trxcon/l1ctl.c | 4 ++-- src/host/trxcon/sched_clck.c | 1 - src/host/trxcon/scheduler.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 1e88f8b4..a8a1289d 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -337,10 +337,10 @@ static int l1ctl_rx_fbsb_req(struct l1ctl_link *l1l, struct msgb *msg) 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 56b89a25..dab95789 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 6c3a2f20..ddb863f2 100644 --- a/src/host/trxcon/scheduler.h +++ b/src/host/trxcon/scheduler.h @@ -5,6 +5,8 @@ #include +#define FRAME_DURATION_uS 4615 + #define GSM_SUPERFRAME (26 * 51) #define GSM_HYPERFRAME (2048 * GSM_SUPERFRAME) -- cgit v1.2.3