From 96da00d45766d43c919d059fb94e9106cff33f2b Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Thu, 4 Jan 2018 01:20:39 +0100 Subject: [PATCH] trxcon/scheduler: share chan / prim identification helpers Because they would be also used outside. Change-Id: Ic8af9d7c72fdb124caef82e35170f92b84e16eb9 --- src/host/trxcon/sched_prim.c | 9 --------- src/host/trxcon/sched_trx.h | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index 1f466a1e8..fb5f0a0de 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -126,15 +126,6 @@ int sched_prim_push(struct trx_instance *trx, return 0; } -#define CHAN_IS_TCH(chan) \ - (chan == TRXC_TCHF || chan == TRXC_TCHH_0 || chan == TRXC_TCHH_1) - -#define PRIM_IS_TCH(prim) \ - CHAN_IS_TCH(prim->chan) && prim->payload_len != GSM_MACBLOCK_LEN - -#define PRIM_IS_FACCH(prim) \ - CHAN_IS_TCH(prim->chan) && prim->payload_len == GSM_MACBLOCK_LEN - /** * Dequeues a TCH or FACCH frame, prioritizing the second. * In case if a FACCH frame is found, a TCH frame is being diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index 504054a58..b93011cb1 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -274,6 +274,15 @@ int sched_prim_init(struct trx_instance *trx, struct trx_ts_prim **prim, int sched_prim_push(struct trx_instance *trx, struct trx_ts_prim *prim, uint8_t chan_nr); +#define CHAN_IS_TCH(chan) \ + (chan == TRXC_TCHF || chan == TRXC_TCHH_0 || chan == TRXC_TCHH_1) + +#define PRIM_IS_TCH(prim) \ + CHAN_IS_TCH(prim->chan) && prim->payload_len != GSM_MACBLOCK_LEN + +#define PRIM_IS_FACCH(prim) \ + CHAN_IS_TCH(prim->chan) && prim->payload_len == GSM_MACBLOCK_LEN + struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue, enum trx_lchan_type lchan_type); void sched_prim_drop(struct trx_lchan_state *lchan);