trxcon/scheduler: share lchan link identifiers

Change-Id: Ie1632f274b2ae6147a8e918ebfea60eeeb6a234c

2 files changed, 41 insertions, 41 deletions

diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c
index e94a2083..37d12730 100644
--- a/src/host/trxcon/sched_lchan_desc.c
+++ b/src/host/trxcon/sched_lchan_desc.c
@@ -25,9 +25,6 @@
 
 #include "sched_trx.h"
 
-#define LID_DEDIC	0x00
-#define LID_SACCH	0x40
-
 /* TODO: implement */
 #define tx_pdtch_fn	NULL
 #define tx_tchh_fn	NULL
@@ -60,7 +57,7 @@ int tx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts,
 const struct trx_lchan_desc trx_lchan_desc[_TRX_CHAN_MAX] = {
 	{
 		TRXC_IDLE,		"IDLE",
-		0x00,			LID_DEDIC,
+		0x00,			TRX_CH_LID_DEDIC,
 		0x00,			0x00,
 
 		/**
@@ -71,7 +68,7 @@ const struct trx_lchan_desc trx_lchan_desc[_TRX_CHAN_MAX] = {
 	},
 	{
 		TRXC_FCCH,		"FCCH",
-		0x00,			LID_DEDIC,
+		0x00,			TRX_CH_LID_DEDIC,
 		0x00,			0x00,
 
 		/* FCCH is handled by transceiver */
@@ -79,7 +76,7 @@ const struct trx_lchan_desc trx_lchan_desc[_TRX_CHAN_MAX] = {
 	},
 	{
 		TRXC_SCH, 		"SCH",
-		0x00,			LID_DEDIC,
+		0x00,			TRX_CH_LID_DEDIC,
 		0x00,			TRX_CH_FLAG_AUTO,
 
 		/**
@@ -90,211 +87,211 @@ const struct trx_lchan_desc trx_lchan_desc[_TRX_CHAN_MAX] = {
 	},
 	{
 		TRXC_BCCH,		"BCCH",
-		0x80,			LID_DEDIC,
+		0x80,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_AUTO,
 		rx_data_fn,		NULL,
 	},
 	{
 		TRXC_RACH,		"RACH",
-		0x88,			LID_DEDIC,
+		0x88,			TRX_CH_LID_DEDIC,
 		0x00,			TRX_CH_FLAG_AUTO,
 		NULL,			tx_rach_fn,
 	},
 	{
 		TRXC_CCCH,		"CCCH",
-		0x90,			LID_DEDIC,
+		0x90,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_AUTO,
 		rx_data_fn,		NULL,
 	},
 	{
 		TRXC_TCHF,		"TCH/F",
-		0x08,			LID_DEDIC,
+		0x08,			TRX_CH_LID_DEDIC,
 		8 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_tchf_fn,		tx_tchf_fn,
 	},
 	{
 		TRXC_TCHH_0,		"TCH/H(0)",
-		0x10,			LID_DEDIC,
+		0x10,			TRX_CH_LID_DEDIC,
 		6 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_tchh_fn,		tx_tchh_fn,
 	},
 	{
 		TRXC_TCHH_1,		"TCH/H(1)",
-		0x18,			LID_DEDIC,
+		0x18,			TRX_CH_LID_DEDIC,
 		6 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_tchh_fn,		tx_tchh_fn,
 	},
 	{
 		TRXC_SDCCH4_0,		"SDCCH/4(0)",
-		0x20,			LID_DEDIC,
+		0x20,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SDCCH4_1,		"SDCCH/4(1)",
-		0x28,			LID_DEDIC,
+		0x28,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SDCCH4_2,		"SDCCH/4(2)",
-		0x30,			LID_DEDIC,
+		0x30,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SDCCH4_3,		"SDCCH/4(3)",
-		0x38,			LID_DEDIC,
+		0x38,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SDCCH8_0,		"SDCCH/8(0)",
-		0x40,			LID_DEDIC,
+		0x40,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SDCCH8_1,		"SDCCH/8(1)",
-		0x48,			LID_DEDIC,
+		0x48,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SDCCH8_2,		"SDCCH/8(2)",
-		0x50,			LID_DEDIC,
+		0x50,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SDCCH8_3,		"SDCCH/8(3)",
-		0x58,			LID_DEDIC,
+		0x58,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SDCCH8_4,		"SDCCH/8(4)",
-		0x60,			LID_DEDIC,
+		0x60,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SDCCH8_5,		"SDCCH/8(5)",
-		0x68,			LID_DEDIC,
+		0x68,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SDCCH8_6,		"SDCCH/8(6)",
-		0x70,			LID_DEDIC,
+		0x70,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SDCCH8_7,		"SDCCH/8(7)",
-		0x78,			LID_DEDIC,
+		0x78,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCHTF,		"SACCH/TF",
-		0x08,			LID_SACCH,
+		0x08,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCHTH_0,		"SACCH/TH(0)",
-		0x10,			LID_SACCH,
+		0x10,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCHTH_1,		"SACCH/TH(1)",
-		0x18,			LID_SACCH,
+		0x18,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCH4_0,		"SACCH/4(0)",
-		0x20,			LID_SACCH,
+		0x20,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCH4_1,		"SACCH/4(1)",
-		0x28,			LID_SACCH,
+		0x28,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCH4_2,		"SACCH/4(2)",
-		0x30,			LID_SACCH,
+		0x30,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCH4_3,		"SACCH/4(3)",
-		0x38,			LID_SACCH,
+		0x38,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCH8_0,		"SACCH/8(0)",
-		0x40,			LID_SACCH,
+		0x40,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCH8_1,		"SACCH/8(1)",
-		0x48,			LID_SACCH,
+		0x48,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCH8_2,		"SACCH/8(2)",
-		0x50,			LID_SACCH,
+		0x50,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCH8_3,		"SACCH/8(3)",
-		0x58,			LID_SACCH,
+		0x58,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCH8_4,		"SACCH/8(4)",
-		0x60,			LID_SACCH,
+		0x60,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCH8_5,		"SACCH/8(5)",
-		0x68,			LID_SACCH,
+		0x68,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCH8_6,		"SACCH/8(6)",
-		0x70,			LID_SACCH,
+		0x70,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_SACCH8_7,		"SACCH/8(7)",
-		0x78,			LID_SACCH,
+		0x78,			TRX_CH_LID_SACCH,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_CBTX,
 		rx_data_fn,		tx_data_fn,
 	},
 	{
 		TRXC_PDTCH,		"PDTCH",
-		0x08,			LID_DEDIC,
+		0x08,			TRX_CH_LID_DEDIC,
 		12 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_PDCH,
 		rx_pdtch_fn,		tx_pdtch_fn,
 	},
 	{
 		TRXC_PTCCH,		"PTCCH",
-		0x08,			LID_DEDIC,
+		0x08,			TRX_CH_LID_DEDIC,
 		4 * GSM_BURST_PL_LEN,	TRX_CH_FLAG_PDCH,
 		rx_data_fn,		tx_data_fn,
 	},
diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h
index 80b8dd29..bba8bcf8 100644
--- a/src/host/trxcon/sched_trx.h
+++ b/src/host/trxcon/sched_trx.h
@@ -17,6 +17,9 @@
 #define GPRS_BURST_LEN		GSM_BURST_LEN
 #define EDGE_BURST_LEN		444
 
+#define TRX_CH_LID_DEDIC	0x00
+#define TRX_CH_LID_SACCH	0x40
+
 /* Is a channel related to PDCH (GPRS) */
 #define TRX_CH_FLAG_PDCH	(1 << 0)
 /* Should a channel be activated automatically */