fix merge artefacts, make firmware build again

4 files changed, 12 insertions, 10 deletions

diff --git a/src/target/firmware/include/layer1/tdma_sched.h b/src/target/firmware/include/layer1/tdma_sched.h
index 40fcb479..9486c4ab 100644
--- a/src/target/firmware/include/layer1/tdma_sched.h
+++ b/src/target/firmware/include/layer1/tdma_sched.h
@@ -54,7 +54,7 @@ void tdma_sched_reset(void);
 void tdma_sched_dump(void);
 
 
-extern void tdma_end_set(uint8_t p1, uint8_t p2, uint16_t p3);
+extern int tdma_end_set(uint8_t p1, uint8_t p2, uint16_t p3);
 #define SCHED_ITEM(x, y, z)		{ .cb = x, .p1 = y, .p2 = z }
 #define SCHED_END_FRAME()		{ .cb = NULL, .p1 = 0, .p2 = 0 }
 #define SCHED_END_SET()			{ .cb = &tdma_end_set, .p1 = 0, .p2 = 0 }
diff --git a/src/target/firmware/layer1/init.c b/src/target/firmware/layer1/init.c
index 317a1266..601b1a2d 100644
--- a/src/target/firmware/layer1/init.c
+++ b/src/target/firmware/layer1/init.c
@@ -68,6 +68,6 @@ void layer1_init(void)
 	irq_disable(IRQ_RTC_TIMER);
 
 	/* inform l2 and upwards that we are ready for orders */
-	msg = l1_create_l2_msg(LAYER1_RESET, 0, 0);
+	msg = l1_create_l2_msg(L1CTL_RESET, 0, 0);
 	l1_queue_for_l2(msg);
 }
diff --git a/src/target/firmware/layer1/sync.c b/src/target/firmware/layer1/sync.c
index d9958caa..22add4a4 100644
--- a/src/target/firmware/layer1/sync.c
+++ b/src/target/firmware/layer1/sync.c
@@ -49,6 +49,8 @@
 #include <layer1/tpu_window.h>
 #include <layer1/l23_api.h>
 
+#include <l1a_l23_interface.h>
+
 //#define DEBUG_EVERY_TDMA
 
 /* A debug macro to print every TDMA frame */
@@ -609,7 +611,7 @@ static int l1s_sbdet_resp(uint8_t p1, uint8_t attempt, uint16_t p3)
 	int qbits, fn_offset;
 	struct l1_cell_info *cinfo = &l1s.serving_cell;
 	int fnr_delta, bits_delta;
-	struct l1_sync_new_ccch_resp *l1;
+	struct l1ctl_sync_new_ccch_resp *l1;
 	struct msgb *msg;
 
 	putchart('s');
@@ -676,7 +678,7 @@ static int l1s_sbdet_resp(uint8_t p1, uint8_t attempt, uint16_t p3)
 
 	/* place it in the queue for the layer2 */
 	msg = l1_create_l2_msg(L1CTL_NEW_CCCH_RESP, sb_time.fn, last_fb->snr);
-	l1 = (struct l1_sync_new_ccch_resp *) msgb_put(msg, sizeof(*l1));
+	l1 = (struct l1ctl_sync_new_ccch_resp *) msgb_put(msg, sizeof(*l1));
 	l1->bsic = bsic;
 	l1_queue_for_l2(msg);
 
@@ -833,8 +835,8 @@ static int l1s_nb_resp(uint8_t p1, uint8_t burst_id, uint16_t p3)
 
 	/* 4th burst, get frame data */
 	if (dsp_api.db_r->d_burst_d == 3) {
-		struct l1_info_dl *dl;
-		struct l1_data_ind *l1;
+		struct l1ctl_info_dl *dl;
+		struct l1ctl_data_ind *l1;
 		uint8_t i, j;
 
 		sig->signum = L1_SIG_NB;
@@ -854,8 +856,8 @@ static int l1s_nb_resp(uint8_t p1, uint8_t burst_id, uint16_t p3)
 
 		/* place it in the queue for the layer2 */
 		msg = l1_create_l2_msg(L1CTL_DATA_IND, l1s.current_time.fn-4, last_fb->snr);
-		dl = (struct l1_info_dl *) msg->data;
-		l1 = (struct l1_data_ind *) msgb_put(msg, sizeof(*l1));
+		dl = (struct l1ctl_info_dl *) msg->data;
+		l1 = (struct l1ctl_data_ind *) msgb_put(msg, sizeof(*l1));
 
 		/* Set Channel Number depending on MFrame Task ID */
 		dl->chan_nr = mframe_task2chan_nr(mf_task_id, 0); /* FIXME: TS */
diff --git a/src/target/firmware/layer1/tdma_sched.c b/src/target/firmware/layer1/tdma_sched.c
index 12296d78..2097bb04 100644
--- a/src/target/firmware/layer1/tdma_sched.c
+++ b/src/target/firmware/layer1/tdma_sched.c
@@ -33,9 +33,9 @@
 #include <calypso/dsp.h>
 
 /* dummy function to mark end of set */
-void tdma_end_set(uint8_t p1, uint8_t p2, uint16_t p3)
+int tdma_end_set(uint8_t p1, uint8_t p2, uint16_t p3)
 {
-
+	return 0;
 }
 
 static uint8_t wrap_bucket(uint8_t offset)