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 a20b177..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;
 
@@ -14,7 +14,7 @@ struct osmocom_ms;
 #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>
@@ -40,6 +40,10 @@ struct rx_meas_stat {
        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 */
@@ -49,6 +53,7 @@ struct osmocom_ms {
        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;
@@ -66,9 +71,10 @@ 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,
@@ -76,6 +82,11 @@ enum osmobb_meas_sig {
        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 {