29 files changed, 32 insertions, 40 deletions
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/Makefile.am b/src/host/layer23/include/osmocom/Makefile.am
index 86537aa5..5adf9df5 100644
--- a/src/host/layer23/include/osmocom/Makefile.am
+++ b/src/host/layer23/include/osmocom/Makefile.am
@@ -1,2 +1 @@
-noinst_HEADERS = l1ctl.h osmocom_data.h lapdm.h rslms.h layer3.h \
-		 gsmtap_util.h logging.h
+SUBDIRS = bb
diff --git a/src/host/layer23/include/osmocom/bb/Makefile.am b/src/host/layer23/include/osmocom/bb/Makefile.am
new file mode 100644
index 00000000..58a5f7fb
--- /dev/null
+++ b/src/host/layer23/include/osmocom/bb/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = common misc mobile
diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am
new file mode 100644
index 00000000..fa467575
--- /dev/null
+++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am
@@ -0,0 +1,2 @@
+noinst_HEADERS = l1ctl.h l1l2_interface.h l23_app.h lapdm.h logging.h  networks.h \
+		 osmocom_data.h
diff --git a/src/host/layer23/include/osmocom/l1ctl.h b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
index 9e76382c..ad113237 100644
--- a/src/host/layer23/include/osmocom/l1ctl.h
+++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
@@ -2,7 +2,7 @@
 #define osmocom_l1ctl_h
 
 #include <osmocore/msgb.h>
-#include <osmocom/osmocom_data.h>
+#include <osmocom/bb/common/osmocom_data.h>
 
 struct osmocom_ms;
 
@@ -10,32 +10,34 @@ struct osmocom_ms;
 int l1ctl_recv(struct osmocom_ms *ms, struct msgb *msg);
 
 /* Transmit L1CTL_DATA_REQ */
-int tx_ph_data_req(struct osmocom_ms *ms, struct msgb *msg, uint8_t chan_nr,
+int l1ctl_tx_data_req(struct osmocom_ms *ms, struct msgb *msg, uint8_t chan_nr,
 	uint8_t link_id);
 
 /* Transmit L1CTL_PARAM_REQ */
-int l1ctl_tx_ph_param_req(struct osmocom_ms *ms, uint8_t ta, uint8_t tx_power);
+int l1ctl_tx_param_req(struct osmocom_ms *ms, uint8_t ta, uint8_t tx_power);
 
 /* Transmit L1CTL_RACH_REQ */
-int tx_ph_rach_req(struct osmocom_ms *ms, uint8_t ra, uint8_t fn51,
+int l1ctl_tx_rach_req(struct osmocom_ms *ms, uint8_t ra, uint8_t fn51,
 	uint8_t mf_off);
 
 /* Transmit L1CTL_DM_EST_REQ */
-int tx_ph_dm_est_req_h0(struct osmocom_ms *ms, uint16_t band_arfcn,
+int l1ctl_tx_dm_est_req_h0(struct osmocom_ms *ms, uint16_t band_arfcn,
 	uint8_t chan_nr, uint8_t tsc);
-int tx_ph_dm_est_req_h1(struct osmocom_ms *ms, uint8_t maio, uint8_t hsn,
+int l1ctl_tx_dm_est_req_h1(struct osmocom_ms *ms, uint8_t maio, uint8_t hsn,
 	uint16_t *ma, uint8_t ma_len, uint8_t chan_nr, uint8_t tsc);
 
 /* Transmit L1CTL_DM_REL_REQ */
-int tx_ph_dm_rel_req(struct osmocom_ms *ms);
+int l1ctl_tx_dm_rel_req(struct osmocom_ms *ms);
 
 /* Transmit FBSB_REQ */
 int l1ctl_tx_fbsb_req(struct osmocom_ms *ms, uint16_t arfcn,
 		      uint8_t flags, uint16_t timeout, uint8_t sync_info_idx,
 		      uint8_t ccch_mode);
 
+/* Transmit CCCH_MODE_REQ */
 int l1ctl_tx_ccch_mode_req(struct osmocom_ms *ms, uint8_t ccch_mode);
 
+/* Transmit ECHO_REQ */
 int l1ctl_tx_echo_req(struct osmocom_ms *ms, unsigned int len);
 
 /* Transmit L1CTL_RESET_REQ */
diff --git a/src/host/layer23/include/osmocom/l1l2_interface.h b/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h
index 41403d87..41403d87 100644
--- a/src/host/layer23/include/osmocom/l1l2_interface.h
+++ b/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h
diff --git a/src/host/layer23/include/osmocom/l23_app.h b/src/host/layer23/include/osmocom/bb/common/l23_app.h
index 1a228567..1a228567 100644
--- a/src/host/layer23/include/osmocom/l23_app.h
+++ b/src/host/layer23/include/osmocom/bb/common/l23_app.h
diff --git a/src/host/layer23/include/osmocom/lapdm.h b/src/host/layer23/include/osmocom/bb/common/lapdm.h
index ab048b8a..de954fb1 100644
--- a/src/host/layer23/include/osmocom/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/include/osmocom/logging.h b/src/host/layer23/include/osmocom/bb/common/logging.h
index 1a11cf9d..1a11cf9d 100644
--- a/src/host/layer23/include/osmocom/logging.h
+++ b/src/host/layer23/include/osmocom/bb/common/logging.h
diff --git a/src/host/layer23/include/osmocom/networks.h b/src/host/layer23/include/osmocom/bb/common/networks.h
index e8c1b18e..e8c1b18e 100644
--- a/src/host/layer23/include/osmocom/networks.h
+++ b/src/host/layer23/include/osmocom/bb/common/networks.h
diff --git a/src/host/layer23/include/osmocom/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
index 6fdeef78..dc7ba11d 100644
--- a/src/host/layer23/include/osmocom/osmocom_data.h
+++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
@@ -7,15 +7,16 @@
 
 struct osmocom_ms;
 
-#include <osmocom/support.h>
-#include <osmocom/settings.h>
-#include <osmocom/subscriber.h>
-#include <osmocom/lapdm.h>
-#include <osmocom/gsm48_rr.h>
-#include <osmocom/sysinfo.h>
-#include <osmocom/gsm322.h>
-#include <osmocom/gsm48_mm.h>
-#include <osmocom/gsm48_cc.h>
+	/* FIXME no 'mobile' specific stuff should be here */
+#include <osmocom/bb/mobile/support.h>
+#include <osmocom/bb/mobile/settings.h>
+#include <osmocom/bb/mobile/subscriber.h>
+#include <osmocom/bb/common/lapdm.h>
+#include <osmocom/bb/mobile/gsm48_rr.h>
+#include <osmocom/bb/mobile/sysinfo.h>
+#include <osmocom/bb/mobile/gsm322.h>
+#include <osmocom/bb/mobile/gsm48_mm.h>
+#include <osmocom/bb/mobile/gsm48_cc.h>
 
 /* A layer2 entity */
 struct osmol2_entity {
diff --git a/src/host/layer23/include/osmocom/bb/misc/Makefile.am b/src/host/layer23/include/osmocom/bb/misc/Makefile.am
new file mode 100644
index 00000000..71c9d389
--- /dev/null
+++ b/src/host/layer23/include/osmocom/bb/misc/Makefile.am
@@ -0,0 +1 @@
+noinst_HEADERS = layer3.h rslms.h
diff --git a/src/host/layer23/include/osmocom/layer3.h b/src/host/layer23/include/osmocom/bb/misc/layer3.h
index bf68102d..dc7da87f 100644
--- a/src/host/layer23/include/osmocom/layer3.h
+++ b/src/host/layer23/include/osmocom/bb/misc/layer3.h
@@ -2,7 +2,7 @@
 #define _OSMOCOM_L3_H
 
 #include <osmocore/msgb.h>
-#include <osmocom/osmocom_data.h>
+#include <osmocom/bb/common/osmocom_data.h>
 
 int gsm48_rx_ccch(struct msgb *msg, struct osmocom_ms *ms);
 int gsm48_rx_dcch(struct msgb *msg, struct osmocom_ms *ms);
diff --git a/src/host/layer23/include/osmocom/rslms.h b/src/host/layer23/include/osmocom/bb/misc/rslms.h
index 8f17b818..8b62ba92 100644
--- a/src/host/layer23/include/osmocom/rslms.h
+++ b/src/host/layer23/include/osmocom/bb/misc/rslms.h
@@ -2,7 +2,7 @@
 #define _OSMOCOM_RSLMS_H
 
 #include <osmocore/msgb.h>
-#include <osmocom/osmocom_data.h>
+#include <osmocom/bb/common/osmocom_data.h>
 
 /* From L3 into RSLMS (direction -> L2) */
 
diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am
new file mode 100644
index 00000000..49c8378b
--- /dev/null
+++ b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am
@@ -0,0 +1,2 @@
+noinst_HEADERS = gsm322.h gsm48_cc.h gsm48_mm.h gsm48_rr.h mncc.h settings.h \
+		 subscriber.h support.h sysinfo.h transaction.h
diff --git a/src/host/layer23/include/osmocom/gsm322.h b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h
index 78e380fe..78e380fe 100755..100644
--- a/src/host/layer23/include/osmocom/gsm322.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h
diff --git a/src/host/layer23/include/osmocom/gsm48_cc.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_cc.h
index d6ea5756..d6ea5756 100644
--- a/src/host/layer23/include/osmocom/gsm48_cc.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_cc.h
diff --git a/src/host/layer23/include/osmocom/gsm48_mm.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
index b988bd9a..b988bd9a 100644
--- a/src/host/layer23/include/osmocom/gsm48_mm.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
diff --git a/src/host/layer23/include/osmocom/gsm48_rr.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
index f5d52206..f5d52206 100644
--- a/src/host/layer23/include/osmocom/gsm48_rr.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
diff --git a/src/host/layer23/include/osmocom/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
index d1d4d38f..d1d4d38f 100644
--- a/src/host/layer23/include/osmocom/mncc.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
diff --git a/src/host/layer23/include/osmocom/settings.h b/src/host/layer23/include/osmocom/bb/mobile/settings.h
index be13d208..be13d208 100644
--- a/src/host/layer23/include/osmocom/settings.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/settings.h
diff --git a/src/host/layer23/include/osmocom/subscriber.h b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h
index 34f45289..34f45289 100644
--- a/src/host/layer23/include/osmocom/subscriber.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h
diff --git a/src/host/layer23/include/osmocom/support.h b/src/host/layer23/include/osmocom/bb/mobile/support.h
index 9af4d1b6..9af4d1b6 100644
--- a/src/host/layer23/include/osmocom/support.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/support.h
diff --git a/src/host/layer23/include/osmocom/sysinfo.h b/src/host/layer23/include/osmocom/bb/mobile/sysinfo.h
index 6f57fcd5..6f57fcd5 100644
--- a/src/host/layer23/include/osmocom/sysinfo.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/sysinfo.h
diff --git a/src/host/layer23/include/osmocom/transaction.h b/src/host/layer23/include/osmocom/bb/mobile/transaction.h
index 4be82c19..4be82c19 100644
--- a/src/host/layer23/include/osmocom/transaction.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/transaction.h
diff --git a/src/host/layer23/include/osmocom/vty.h b/src/host/layer23/include/osmocom/bb/mobile/vty.h
index f9e65a12..70faef5b 100644
--- a/src/host/layer23/include/osmocom/vty.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/vty.h
@@ -1,7 +1,7 @@
 #ifndef OSMOCOM_VTY_H
 #define OSMOCOM_VTY_H
 
-#include <osmocom/osmocom_data.h>
+#include <osmocom/bb/common/osmocom_data.h>
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/buffer.h>
 #include <osmocom/vty/command.h>
diff --git a/src/host/layer23/include/osmocom/gsmtap_util.h b/src/host/layer23/include/osmocom/gsmtap_util.h
deleted file mode 100644
index 30fc1267..00000000
--- a/src/host/layer23/include/osmocom/gsmtap_util.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _GSMTAP_UTIL_H
-#define _GSMTAP_UTIL_H
-
-#include <stdint.h>
-
-/* convert RSL channel number to GSMTAP channel type */
-uint8_t chantype_rsl2gsmtap(uint8_t rsl_chantype, uint8_t rsl_link_id);
-
-/* receive a message from L1/L2 and put it in GSMTAP */
-int gsmtap_sendmsg(uint16_t arfcn, uint8_t ts, uint8_t chan_type, uint8_t ss,
-		   uint32_t fn, int8_t signal_dbm, uint8_t snr,
-		   const uint8_t *data, unsigned int len);
-
-int gsmtap_init(uint32_t dst_ip);
-
-#endif /* _GSMTAP_UTIL_H */