[layer23] Updated layer23 to current L1 support and forthcomming hopping.

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

diff --git a/src/host/layer23/include/osmocom/gsm322.h b/src/host/layer23/include/osmocom/gsm322.h
index c6828be..d9cd226 100755 (executable)
--- a/src/host/layer23/include/osmocom/gsm322.h
+++ b/src/host/layer23/include/osmocom/gsm322.h
@@ -114,7 +114,6 @@ struct gsm322_cs_list {
 struct gsm322_plmn {
        struct osmocom_ms       *ms;
        int                     state; /* GSM322_Ax_* or GSM322_Mx_* */
-       int                     mode; /* PLMN_MODE_* */
 
        struct llist_head       event_queue; /* event messages */
        struct llist_head       sorted_plmn; /* list of sorted PLMN */
@@ -150,6 +149,7 @@ struct gsm322_cellsel {
        uint32_t                scan_state; /* special state of current scan */
        uint8_t                 ccch_state; /* special state of current ccch */
        uint16_t                arfcn; /* current tuned idle mode arfcn */
+       uint8_t                 ccch_mode; /* curren CCCH_MODE_* */
        struct gsm48_sysinfo    *si; /* current sysinfo */
 
        uint8_t                 selected; /* if a cell is selected */
@@ -186,8 +186,14 @@ int gsm322_is_forbidden_la(struct osmocom_ms *ms, uint16_t mcc, uint16_t mnc,
 int gsm322_dump_sorted_plmn(struct osmocom_ms *ms);
 int gsm322_dump_cs_list(struct gsm322_cellsel *cs, uint8_t flags,
                        void (*print)(void *, const char *, ...), void *priv);
-int gsm322_dump_forbidden_la(struct osmocom_ms *ms);
+int gsm322_dump_forbidden_la(struct osmocom_ms *ms,
+                       void (*print)(void *, const char *, ...), void *priv);
+int gsm322_dump_ba_list(struct gsm322_cellsel *cs, uint16_t mcc, uint16_t mnc,
+                       void (*print)(void *, const char *, ...), void *priv);
 void start_cs_timer(struct gsm322_cellsel *cs, int sec, int micro);
 void start_loss_timer(struct gsm322_cellsel *cs, int sec, int micro);
+extern const char *plmn_a_state_names[];
+extern const char *plmn_m_state_names[];
+extern const char *cs_state_names[];
 
 #endif /* _GSM322_H */