aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2016-01-09 17:56:10 +0100
committerHarald Welte <laforge@gnumonks.org>2016-01-16 17:48:20 +0100
commit601781f463d0f5798ac27fd90be63d9f15261683 (patch)
tree303ed7df271cf5bbce516a7f12e1206e3694b66f
parent695d8eb27721352e2b9d13f31f28153f57c03a15 (diff)
move 'GSM_FR_BYTES' and related definitiions to common part
-rw-r--r--include/osmo-bts/gsm_data.h7
-rw-r--r--src/osmo-bts-sysmo/tch.c7
2 files changed, 7 insertions, 7 deletions
diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h
index 06115b33..8f977980 100644
--- a/include/osmo-bts/gsm_data.h
+++ b/include/osmo-bts/gsm_data.h
@@ -8,6 +8,13 @@
#include <osmo-bts/paging.h>
#include <osmo-bts/tx_power.h>
+#define GSM_FR_BITS 260
+#define GSM_EFR_BITS 244
+
+#define GSM_FR_BYTES 33 /* TS 101318 Chapter 5.1: 260 bits + 4bit sig */
+#define GSM_HR_BYTES 14 /* TS 101318 Chapter 5.2: 112 bits, no sig */
+#define GSM_EFR_BYTES 31 /* TS 101318 Chapter 5.3: 244 bits + 4bit sig */
+
#define GSM_BTS_AGCH_QUEUE_THRESH_LEVEL_DEFAULT 41
#define GSM_BTS_AGCH_QUEUE_THRESH_LEVEL_DISABLE 999999
#define GSM_BTS_AGCH_QUEUE_LOW_LEVEL_DEFAULT 41
diff --git a/src/osmo-bts-sysmo/tch.c b/src/osmo-bts-sysmo/tch.c
index a6ce0e15..fa21eb53 100644
--- a/src/osmo-bts-sysmo/tch.c
+++ b/src/osmo-bts-sysmo/tch.c
@@ -90,13 +90,6 @@ void osmo_nibble_shift_left_unal(uint8_t *out, const uint8_t *in,
}
-#define GSM_FR_BITS 260
-#define GSM_EFR_BITS 244
-
-#define GSM_FR_BYTES 33 /* TS 101318 Chapter 5.1: 260 bits + 4bit sig */
-#define GSM_HR_BYTES 14 /* TS 101318 Chapter 5.2: 112 bits, no sig */
-#define GSM_EFR_BYTES 31 /* TS 101318 Chapter 5.3: 244 bits + 4bit sig */
-
static struct msgb *l1_to_rtppayload_fr(uint8_t *l1_payload, uint8_t payload_len)
{
struct msgb *msg;