summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2018-01-05 15:06:42 +0700
committerVadim Yanitskiy <axilirator@gmail.com>2018-01-05 15:06:48 +0700
commit0192c028e449d9d5f33cf8f0099e0742b1ba80e2 (patch)
treecc2e3f7a0b957a0a3d813d57a829a70a14a21544
parentf09be8a9af8735449a0d846c0b432f7090a4342c (diff)
trxcon/scheduler: use TCH frame length defs from libosmocodec
-rw-r--r--src/host/trxcon/sched_lchan_common.c2
-rw-r--r--src/host/trxcon/sched_trx.h5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c
index 9eccc3e..52c9a21 100644
--- a/src/host/trxcon/sched_lchan_common.c
+++ b/src/host/trxcon/sched_lchan_common.c
@@ -33,6 +33,8 @@
#include <osmocom/core/logging.h>
#include <osmocom/core/bits.h>
+#include <osmocom/codec/codec.h>
+
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/gsm/protocol/gsm_08_58.h>
diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h
index 7ee1d47..b01624c 100644
--- a/src/host/trxcon/sched_trx.h
+++ b/src/host/trxcon/sched_trx.h
@@ -23,11 +23,6 @@
#define MAX_A5_KEY_LEN (128 / 8)
-/* TS 101318 Chapter 5.1: 260 bits + 4bit sig */
-#define GSM_FR_BYTES 33
-/* TS 101318 Chapter 5.3: 244 bits + 4bit sig */
-#define GSM_EFR_BYTES 31
-
/* Forward declaration to avoid mutual include */
struct trx_lchan_state;
struct trx_instance;