src: use new libosmogsm and include/osmocom/[gsm|core] path to headers

[osmocom-bb.git] / src / host / layer23 / include / osmocom / bb / common / osmocom_data.h

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 2fa59f7..9d8a030 100644 (file)
--- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
+++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
@@ -1,9 +1,9 @@
 #ifndef osmocom_data_h
 #define osmocom_data_h
 
-#include <osmocore/select.h>
-#include <osmocore/gsm_utils.h>
-#include <osmocore/write_queue.h>
+#include <osmocom/core/select.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/write_queue.h>
 
 struct osmocom_ms;
 
@@ -12,11 +12,13 @@ struct osmocom_ms;
 #include <osmocom/bb/mobile/settings.h>
 #include <osmocom/bb/mobile/subscriber.h>
 #include <osmocom/bb/common/lapdm.h>
+#include <osmocom/bb/common/sap_interface.h>
 #include <osmocom/bb/mobile/gsm48_rr.h>
-#include <osmocom/bb/mobile/sysinfo.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/common/sim.h>
 
 /* A layer2 entity */
 struct osmol2_entity {
@@ -25,32 +27,40 @@ struct osmol2_entity {
        osmol2_cb_t msg_handler;
 };
 
+struct osmosap_entity {
+       osmosap_cb_t msg_handler;
+};
+
 /* 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;
 };
 
 /* One Mobilestation for osmocom */
 struct osmocom_ms {
        struct llist_head entity;
        char name[32];
-       struct write_queue wq;
+       struct write_queue l2_wq, sap_wq;
        uint16_t test_arfcn;
 
+       uint8_t deleting, shutdown, started;
        struct gsm_support support;
-
        struct gsm_settings settings;
-
        struct gsm_subscriber subscr;
-
+       struct gsm_sim sim;
        struct osmol2_entity l2_entity;
-
+       struct osmosap_entity sap_entity;
        struct rx_meas_stat meas;
-
        struct gsm48_rrlayer rrlayer;
        struct gsm322_plmn plmn;
        struct gsm322_cellsel cellsel;
@@ -61,15 +71,28 @@ struct osmocom_ms {
 
 enum osmobb_sig_subsys {
        SS_L1CTL,
+       SS_GLOBAL,
 };
 
-enum osmobb_meas_sig {
+enum osmobb_l1ctl_sig {
        S_L1CTL_FBSB_ERR,
        S_L1CTL_FBSB_RESP,
        S_L1CTL_RESET,
        S_L1CTL_PM_RES,
        S_L1CTL_PM_DONE,
        S_L1CTL_CCCH_MODE_CONF,
+       S_L1CTL_TCH_MODE_CONF,
+       S_L1CTL_LOSS_IND,
+};
+
+enum osmobb_global_sig {
+       S_GLOBAL_SHUTDOWN,
+};
+
+struct osmobb_fbsb_res {
+       struct osmocom_ms *ms;
+       int8_t snr;
+       uint8_t bsic;
 };
 
 struct osmobb_meas_res {
@@ -83,4 +106,9 @@ struct osmobb_ccch_mode_conf {
        uint8_t ccch_mode;
 };
 
+struct osmobb_tch_mode_conf {
+       struct osmocom_ms *ms;
+       uint8_t tch_mode;
+};
+
 #endif