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

[osmocom-bb.git] / include / l1a_l23_interface.h

diff --git a/include/l1a_l23_interface.h b/include/l1a_l23_interface.h
index 12eaf7a..5408c48 100644 (file)
--- a/include/l1a_l23_interface.h
+++ b/include/l1a_l23_interface.h
@@ -25,17 +25,29 @@
 #define l1a_l23_interface_h
 
 #define L1CTL_FBSB_REQ         1
-#define L1CTL_FBSB_RESP                2
+#define L1CTL_FBSB_CONF                2
 #define L1CTL_DATA_IND         3
 #define L1CTL_RACH_REQ         4
 #define L1CTL_DM_EST_REQ       5
 #define L1CTL_DATA_REQ         7
-#define L1CTL_RESET            8
+#define L1CTL_RESET_IND                8
 #define L1CTL_PM_REQ           9       /* power measurement */
-#define L1CTL_PM_RESP          10      /* power measurement */
+#define L1CTL_PM_CONF          10      /* power measurement */
 #define L1CTL_ECHO_REQ         11
-#define L1CTL_ECHO_RESP                12
-#define L1CTL_RACH_RESP                13
+#define L1CTL_ECHO_CONF                12
+#define L1CTL_RACH_CONF                13
+#define L1CTL_RESET_REQ                14
+#define L1CTL_RESET_CONF       15
+#define L1CTL_DATA_CONF                16
+#define L1CTL_CCCH_MODE_REQ    17
+#define L1CTL_CCCH_MODE_CONF   18
+#define L1CTL_DM_REL_REQ       19
+
+enum ccch_mode {
+       CCCH_MODE_NONE = 0,
+       CCCH_MODE_NON_COMBINED,
+       CCCH_MODE_COMBINED,
+};
 
 /*
  * NOTE: struct size. We do add manual padding out of the believe
@@ -74,13 +86,19 @@ struct l1ctl_info_dl {
 } __attribute__((packed));
 
 /* new CCCH was found. This is following the header */
-struct l1ctl_fbsb_resp {
+struct l1ctl_fbsb_conf {
        int16_t initial_freq_err;
        uint8_t result;
        uint8_t bsic;
        /* FIXME: contents of cell_info ? */
 } __attribute__((packed));
 
+/* CCCH mode was changed */
+struct l1ctl_ccch_mode_conf {
+       uint8_t ccch_mode;      /* enum ccch_mode */
+       uint8_t padding[3];
+} __attribute__((packed));
+
 /* data on the CCCH was found. This is following the header */
 struct l1ctl_data_ind {
        uint8_t data[23];
@@ -114,7 +132,7 @@ struct l1ctl_fbsb_req {
        uint8_t num_freqerr_avg;
        uint8_t flags;          /* L1CTL_FBSB_F_* */
        uint8_t sync_info_idx;
-       uint8_t reserved;
+       uint8_t ccch_mode;      /* enum ccch_mode */
 } __attribute__((packed));
 
 #define L1CTL_FBSB_F_FB0       (1 << 0)
@@ -122,29 +140,37 @@ struct l1ctl_fbsb_req {
 #define L1CTL_FBSB_F_SB                (1 << 2)
 #define L1CTL_FBSB_F_FB01SB    (L1CTL_FBSB_F_FB0|L1CTL_FBSB_F_FB1|L1CTL_FBSB_F_SB)
 
+/*
+ * msg for CCCH_MODE_REQ
+ * the l1_info_ul header is in front
+ */
+struct l1ctl_ccch_mode_req {
+       uint8_t ccch_mode;      /* enum ccch_mode */
+       uint8_t padding[3];
+} __attribute__((packed));
+
 /* the l1_info_ul header is in front */
 struct l1ctl_rach_req {
        uint8_t ra;
-       uint8_t padding[3];
+       uint8_t fn51;
+       uint8_t mf_off;
+       uint8_t padding[1];
 } __attribute__((packed));
 
 struct l1ctl_dm_est_req {
-       uint16_t band_arfcn;
+       uint8_t tsc;
+       uint8_t h;
        union {
                struct {
-                       uint8_t maio_high:4,
-                                h:1,
-                                tsc:3;
-                       uint8_t hsn:6,
-                                maio_low:2;
-               } h1;
-               struct {
-                       uint8_t arfcn_high:2,
-                                spare:2,
-                                h:1,
-                                tsc:3;
-                       uint8_t arfcn_low;
+                       uint16_t band_arfcn;
                } h0;
+               struct {
+                       uint8_t hsn;
+                       uint8_t maio;
+                       uint8_t n;
+                       uint8_t _padding[1];
+                       uint16_t ma[64];
+               } h1;
        };
 } __attribute__((packed));
 
@@ -161,9 +187,20 @@ struct l1ctl_pm_req {
 } __attribute__((packed));
 
 /* a single L1CTL_PM response */
-struct l1ctl_pm_resp {
+struct l1ctl_pm_conf {
        uint16_t band_arfcn;
        uint8_t pm[2];
 } __attribute__((packed));
 
+enum l1ctl_reset_type {
+       L1CTL_RES_T_BOOT,       /* only _IND */
+       L1CTL_RES_T_FULL,
+};
+
+/* argument to L1CTL_RESET_REQ and L1CTL_RESET_IND */
+struct l1ctl_reset {
+       uint8_t type;
+       uint8_t pad[3];
+} __attribute__((packed));
+
 #endif