layer23: Move osmocom_ms to a separate file

This way we can extend its API and contents more easily,
and keep most of it together in one place.

Change-Id: Icb4891cc1e4a0ecb5f09cb8a84b0ebe1b91a46b8

3 files changed, 105 insertions, 102 deletions

diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am
index 31bb6b64..8663d9cd 100644
--- a/src/host/layer23/include/osmocom/bb/common/Makefile.am
+++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am
@@ -3,6 +3,7 @@ noinst_HEADERS = \
 	l1l2_interface.h \
 	l23_app.h \
 	logging.h \
+	ms.h \
 	networks.h \
 	gps.h \
 	sysinfo.h \
diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h b/src/host/layer23/include/osmocom/bb/common/ms.h
new file mode 100644
index 00000000..b9c9276a
--- /dev/null
+++ b/src/host/layer23/include/osmocom/bb/common/ms.h
@@ -0,0 +1,102 @@
+/* Mobile Station */
+#pragma once
+
+#include <osmocom/core/select.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/write_queue.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/gsm/lapdm.h>
+#include <osmocom/bb/common/sap_interface.h>
+#include <osmocom/bb/common/sap_proto.h>
+#include <osmocom/bb/mobile/gsm48_rr.h>
+#include <osmocom/bb/common/sysinfo.h>
+#include <osmocom/bb/mobile/gsm322.h>
+#include <osmocom/bb/mobile/gsm48_mm.h>
+#include <osmocom/bb/mobile/gsm48_cc.h>
+#include <osmocom/bb/mobile/mncc_sock.h>
+#include <osmocom/bb/common/sim.h>
+#include <osmocom/bb/common/l1ctl.h>
+
+
+struct osmosap_entity {
+	struct osmo_fsm_inst *fi;
+	uint16_t max_msg_size;
+
+	/* Current state of remote SIM card */
+	enum sap_card_status_type card_status;
+
+	/* Optional SAP message call-back */
+	sap_msg_cb_t sap_msg_cb;
+	/* Optional response call-back */
+	sap_rsp_cb_t sap_rsp_cb;
+};
+
+struct osmol1_entity {
+	int (*l1_traffic_ind)(struct osmocom_ms *ms, struct msgb *msg);
+};
+
+struct osmomncc_entity {
+	int (*mncc_recv)(struct osmocom_ms *ms, int msg_type, void *arg);
+	struct mncc_sock_state *sock_state;
+	uint32_t ref;
+};
+
+/* RX measurement statistics */
+struct rx_meas_stat {
+	uint32_t last_fn;
+
+	/* cumulated values of current cell from SACCH dl */
+	uint32_t frames;
+	uint32_t snr;
+	uint32_t berr;
+	uint32_t rxlev;
+
+	/* counters loss criterion */
+	int16_t dsc, ds_fail;
+	int16_t s, rl_fail;
+};
+
+enum {
+	MS_SHUTDOWN_NONE = 0,
+	MS_SHUTDOWN_IMSI_DETACH = 1,
+	MS_SHUTDOWN_WAIT_RESET = 2,
+	MS_SHUTDOWN_COMPL = 3,
+};
+
+struct osmocom_ms {
+	struct llist_head entity;
+	char *name;
+	struct osmo_wqueue l2_wq, sap_wq;
+	uint16_t test_arfcn;
+	struct osmol1_entity l1_entity;
+
+	bool started, deleting;
+	uint8_t shutdown;
+	struct gsm_support support;
+	struct gsm_settings settings;
+	struct gsm_subscriber subscr;
+	struct gsm_sim sim;
+	struct lapdm_channel lapdm_channel;
+	struct osmosap_entity sap_entity;
+	struct rx_meas_stat meas;
+	struct gsm48_rrlayer rrlayer;
+	struct gsm322_plmn plmn;
+	struct gsm322_cellsel cellsel;
+	struct gsm48_mmlayer mmlayer;
+	struct gsm48_cclayer cclayer;
+	struct osmomncc_entity mncc_entity;
+	struct llist_head trans_list;
+
+	/* Audio I/O */
+	struct gapk_io_state *gapk_io;
+
+	void *lua_state;
+	int lua_cb_ref;
+	char *lua_script;
+};
+
+struct osmocom_ms *osmocom_ms_alloc(void *ctx);
diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
index a8af1e85..d78edc3e 100644
--- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
+++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
@@ -1,108 +1,10 @@
-#ifndef osmocom_data_h
-#define osmocom_data_h
+#pragma once
 
-#include <osmocom/core/select.h>
-#include <osmocom/gsm/gsm_utils.h>
-#include <osmocom/core/write_queue.h>
+#include <stdint.h>
 
 struct osmocom_ms;
 struct gapk_io_state;
 
-	/* 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/gsm/lapdm.h>
-#include <osmocom/bb/common/sap_interface.h>
-#include <osmocom/bb/common/sap_proto.h>
-#include <osmocom/bb/mobile/gsm48_rr.h>
-#include <osmocom/bb/common/sysinfo.h>
-#include <osmocom/bb/mobile/gsm322.h>
-#include <osmocom/bb/mobile/gsm48_mm.h>
-#include <osmocom/bb/mobile/gsm48_cc.h>
-#include <osmocom/bb/mobile/mncc_sock.h>
-#include <osmocom/bb/common/sim.h>
-#include <osmocom/bb/common/l1ctl.h>
-
-struct osmosap_entity {
-	struct osmo_fsm_inst *fi;
-	uint16_t max_msg_size;
-
-	/* Current state of remote SIM card */
-	enum sap_card_status_type card_status;
-
-	/* Optional SAP message call-back */
-	sap_msg_cb_t sap_msg_cb;
-	/* Optional response call-back */
-	sap_rsp_cb_t sap_rsp_cb;
-};
-
-struct osmol1_entity {
-	int (*l1_traffic_ind)(struct osmocom_ms *ms, struct msgb *msg);
-};
-
-struct osmomncc_entity {
-	int (*mncc_recv)(struct osmocom_ms *ms, int msg_type, void *arg);
-	struct mncc_sock_state *sock_state;
-	uint32_t ref;
-};
-
-
-/* RX measurement statistics */
-struct rx_meas_stat {
-	uint32_t last_fn;
-
-	/* cumulated values of current cell from SACCH dl */
-	uint32_t frames;
-	uint32_t snr;
-	uint32_t berr;
-	uint32_t rxlev;
-
-	/* counters loss criterion */
-	int16_t dsc, ds_fail;
-	int16_t s, rl_fail;
-};
-
-enum {
-	MS_SHUTDOWN_NONE = 0,
-	MS_SHUTDOWN_IMSI_DETACH = 1,
-	MS_SHUTDOWN_WAIT_RESET = 2,
-	MS_SHUTDOWN_COMPL = 3,
-};
-
-/* One Mobilestation for osmocom */
-struct osmocom_ms {
-	struct llist_head entity;
-	char *name;
-	struct osmo_wqueue l2_wq, sap_wq;
-	uint16_t test_arfcn;
-	struct osmol1_entity l1_entity;
-
-	bool started, deleting;
-	uint8_t shutdown;
-	struct gsm_support support;
-	struct gsm_settings settings;
-	struct gsm_subscriber subscr;
-	struct gsm_sim sim;
-	struct lapdm_channel lapdm_channel;
-	struct osmosap_entity sap_entity;
-	struct rx_meas_stat meas;
-	struct gsm48_rrlayer rrlayer;
-	struct gsm322_plmn plmn;
-	struct gsm322_cellsel cellsel;
-	struct gsm48_mmlayer mmlayer;
-	struct gsm48_cclayer cclayer;
-	struct osmomncc_entity mncc_entity;
-	struct llist_head trans_list;
-
-	/* Audio I/O */
-	struct gapk_io_state *gapk_io;
-
-	void *lua_state;
-	int lua_cb_ref;
-	char *lua_script;
-};
-
 enum osmobb_sig_subsys {
 	SS_L1CTL,
 	SS_GLOBAL,
@@ -153,5 +55,3 @@ struct osmobb_neigh_pm_ind {
 	uint16_t band_arfcn;
 	uint8_t rx_lev;
 };
-
-#endif