include: Rename l1a_l23_interface.h to l1ctl_proto.h

The interface between l1 and upper layer is called by several
name. IMHO l1ctl is shorted and sounds good so try to unify
using that.

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>

17 files changed, 15 insertions, 15 deletions

diff --git a/include/l1a_l23_interface.h b/include/l1ctl_proto.h
index 6c47246b..6c47246b 100644
--- a/include/l1a_l23_interface.h
+++ b/include/l1ctl_proto.h
diff --git a/src/host/layer23/include/Makefile.am b/src/host/layer23/include/Makefile.am
index ca774b6b..297ece97 100644
--- a/src/host/layer23/include/Makefile.am
+++ b/src/host/layer23/include/Makefile.am
@@ -1,2 +1,2 @@
-noinst_HEADERS = l1a_l23_interface.h
+noinst_HEADERS = l1ctl_proto.h
 SUBDIRS = osmocom
diff --git a/src/host/layer23/include/l1a_l23_interface.h b/src/host/layer23/include/l1a_l23_interface.h
deleted file mode 120000
index 2bbc9679..00000000
--- a/src/host/layer23/include/l1a_l23_interface.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../include/l1a_l23_interface.h
\ No newline at end of file
diff --git a/src/host/layer23/include/l1ctl_proto.h b/src/host/layer23/include/l1ctl_proto.h
new file mode 120000
index 00000000..f12ba71e
--- /dev/null
+++ b/src/host/layer23/include/l1ctl_proto.h
@@ -0,0 +1 @@
+../../../../include/l1ctl_proto.h
\ No newline at end of file
diff --git a/src/host/layer23/include/osmocom/bb/common/lapdm.h b/src/host/layer23/include/osmocom/bb/common/lapdm.h
index ab048b8a..de954fb1 100644
--- a/src/host/layer23/include/osmocom/bb/common/lapdm.h
+++ b/src/host/layer23/include/osmocom/bb/common/lapdm.h
@@ -6,7 +6,7 @@
 #include <osmocore/timer.h>
 #include <osmocore/msgb.h>
 
-#include <l1a_l23_interface.h>
+#include <l1ctl_proto.h>
 
 enum lapdm_state {
 	LAPDm_STATE_NULL = 0,
diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c
index 3ddae8ae..132d5ce1 100644
--- a/src/host/layer23/src/common/l1ctl.c
+++ b/src/host/layer23/src/common/l1ctl.c
@@ -28,7 +28,7 @@
 
 #include <arpa/inet.h>
 
-#include <l1a_l23_interface.h>
+#include <l1ctl_proto.h>
 
 #include <osmocore/signal.h>
 #include <osmocore/logging.h>
diff --git a/src/host/layer23/src/common/lapdm.c b/src/host/layer23/src/common/lapdm.c
index c47bd7cd..4aa4662c 100644
--- a/src/host/layer23/src/common/lapdm.c
+++ b/src/host/layer23/src/common/lapdm.c
@@ -70,7 +70,7 @@
 #include <osmocom/bb/common/lapdm.h>
 #include <osmocom/bb/common/logging.h>
 
-#include <l1a_l23_interface.h>
+#include <l1ctl_proto.h>
 
 /* TS 04.06 Figure 4 / Section 3.2 */
 #define LAPDm_LPD_NORMAL  0
diff --git a/src/host/layer23/src/misc/bcch_scan.c b/src/host/layer23/src/misc/bcch_scan.c
index e057da32..dff4dc9b 100644
--- a/src/host/layer23/src/misc/bcch_scan.c
+++ b/src/host/layer23/src/misc/bcch_scan.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <l1a_l23_interface.h>
+#include <l1ctl_proto.h>
 
 #include <osmocore/logging.h>
 #include <osmocore/talloc.h>
diff --git a/src/target/firmware/include/layer1/l23_api.h b/src/target/firmware/include/layer1/l23_api.h
index 1ba6d173..b1602705 100644
--- a/src/target/firmware/include/layer1/l23_api.h
+++ b/src/target/firmware/include/layer1/l23_api.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 #include <osmocore/msgb.h>
-#include <l1a_l23_interface.h>
+#include <l1ctl_proto.h>
 
 void l1a_l23api_init(void);
 void l1_queue_for_l2(struct msgb *msg);
diff --git a/src/target/firmware/include/layer1/sync.h b/src/target/firmware/include/layer1/sync.h
index 76134497..257244b1 100644
--- a/src/target/firmware/include/layer1/sync.h
+++ b/src/target/firmware/include/layer1/sync.h
@@ -5,7 +5,7 @@
 #include <osmocore/gsm_utils.h>
 #include <layer1/tdma_sched.h>
 #include <layer1/mframe_sched.h>
-#include <l1a_l23_interface.h>
+#include <l1ctl_proto.h>
 
 /* structure representing L1 sync information about a cell */
 struct l1_cell_info {
diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c
index f1997dc5..8cd8ad00 100644
--- a/src/target/firmware/layer1/l23_api.c
+++ b/src/target/firmware/layer1/l23_api.c
@@ -39,7 +39,7 @@
 
 #include <rf/trf6151.h>
 
-#include <l1a_l23_interface.h>
+#include <l1ctl_proto.h>
 
 /* the size we will allocate struct msgb* for HDLC */
 #define L3_MSG_HEAD 4
diff --git a/src/target/firmware/layer1/prim_fbsb.c b/src/target/firmware/layer1/prim_fbsb.c
index 4360f7c4..a399d903 100644
--- a/src/target/firmware/layer1/prim_fbsb.c
+++ b/src/target/firmware/layer1/prim_fbsb.c
@@ -47,7 +47,7 @@
 #include <layer1/tpu_window.h>
 #include <layer1/l23_api.h>
 
-#include <l1a_l23_interface.h>
+#include <l1ctl_proto.h>
 
 #define FB0_RETRY_COUNT		3
 #define AFC_RETRY_COUNT		30
diff --git a/src/target/firmware/layer1/prim_pm.c b/src/target/firmware/layer1/prim_pm.c
index 80650f60..b5260cb9 100644
--- a/src/target/firmware/layer1/prim_pm.c
+++ b/src/target/firmware/layer1/prim_pm.c
@@ -45,7 +45,7 @@
 #include <layer1/tpu_window.h>
 #include <layer1/l23_api.h>
 
-#include <l1a_l23_interface.h>
+#include <l1ctl_proto.h>
 
 static void l1ddsp_meas_read(uint8_t nbmeas, uint16_t *pm)
 {
diff --git a/src/target/firmware/layer1/prim_rach.c b/src/target/firmware/layer1/prim_rach.c
index 6f4ad6d3..763ec61c 100644
--- a/src/target/firmware/layer1/prim_rach.c
+++ b/src/target/firmware/layer1/prim_rach.c
@@ -46,7 +46,7 @@
 #include <layer1/tpu_window.h>
 #include <layer1/l23_api.h>
 
-#include <l1a_l23_interface.h>
+#include <l1ctl_proto.h>
 
 struct {
 	uint32_t fn;
diff --git a/src/target/firmware/layer1/prim_rx_nb.c b/src/target/firmware/layer1/prim_rx_nb.c
index 036f4e6d..e49e1a41 100644
--- a/src/target/firmware/layer1/prim_rx_nb.c
+++ b/src/target/firmware/layer1/prim_rx_nb.c
@@ -47,7 +47,7 @@
 #include <layer1/l23_api.h>
 #include <layer1/rfch.h>
 
-#include <l1a_l23_interface.h>
+#include <l1ctl_proto.h>
 
 struct l1s_rxnb_state {
 	struct l1s_meas_hdr meas[4];
diff --git a/src/target/firmware/layer1/prim_tx_nb.c b/src/target/firmware/layer1/prim_tx_nb.c
index 7e4bd960..f1398e0d 100644
--- a/src/target/firmware/layer1/prim_tx_nb.c
+++ b/src/target/firmware/layer1/prim_tx_nb.c
@@ -48,7 +48,7 @@
 #include <layer1/l23_api.h>
 #include <layer1/rfch.h>
 
-#include <l1a_l23_interface.h>
+#include <l1ctl_proto.h>
 
 /* Channel type definitions for DEDICATED mode */
 #define INVALID_CHANNEL    0
diff --git a/src/target/firmware/layer1/sync.c b/src/target/firmware/layer1/sync.c
index d4d2aed3..7d7d29f6 100644
--- a/src/target/firmware/layer1/sync.c
+++ b/src/target/firmware/layer1/sync.c
@@ -56,7 +56,7 @@
 #include <layer1/tpu_window.h>
 #include <layer1/l23_api.h>
 
-#include <l1a_l23_interface.h>
+#include <l1ctl_proto.h>
 
 struct l1s_state l1s;