l1ctl: Add definition for TRAFFIC_{REQ,CONF,IND}

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

diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h
index 060922a..3970588 100644 (file)
--- a/include/l1ctl_proto.h
+++ b/include/l1ctl_proto.h
@@ -45,6 +45,17 @@ enum {
        L1CTL_CCCH_MODE_CONF,
        L1CTL_DM_REL_REQ,
        L1CTL_PARAM_REQ,
+       L1CTL_DM_FREQ_REQ,
+       L1CTL_CRYPTO_REQ,
+       L1CTL_SIM_REQ,
+       L1CTL_SIM_CONF,
+       L1CTL_TCH_MODE_REQ,
+       L1CTL_TCH_MODE_CONF,
+       L1CTL_NEIGH_PM_REQ,
+       L1CTL_NEIGH_PM_IND,
+       L1CTL_TRAFFIC_REQ,
+       L1CTL_TRAFFIC_CONF,
+       L1CTL_TRAFFIC_IND,
 };
 
 enum ccch_mode {
@@ -53,6 +64,14 @@ enum ccch_mode {
        CCCH_MODE_COMBINED,
 };
 
+enum neigh_mode {
+       NEIGH_MODE_NONE = 0,
+       NEIGH_MODE_PM,
+       NEIGH_MODE_SB,
+};
+
+#define TRAFFIC_DATA_LEN       40
+
 /*
  * NOTE: struct size. We do add manual padding out of the believe
  * that it will avoid some unaligned access.
@@ -103,11 +122,22 @@ struct l1ctl_ccch_mode_conf {
        uint8_t padding[3];
 } __attribute__((packed));
 
+/* TCH mode was changed */
+struct l1ctl_tch_mode_conf {
+       uint8_t tch_mode;       /* enum tch_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];
 } __attribute__((packed));
 
+/* traffic from the network */
+struct l1ctl_traffic_ind {
+       uint8_t data[TRAFFIC_DATA_LEN];
+} __attribute__((packed));
+
 /*
  * uplink info
  */
@@ -152,12 +182,20 @@ struct l1ctl_ccch_mode_req {
        uint8_t padding[3];
 } __attribute__((packed));
 
+/*
+ * msg for TCH_MODE_REQ
+ * the l1_info_ul header is in front
+ */
+struct l1ctl_tch_mode_req {
+       uint8_t tch_mode;       /* enum gsm48_chan_mode */
+       uint8_t padding[3];
+} __attribute__((packed));
+
 /* the l1_info_ul header is in front */
 struct l1ctl_rach_req {
        uint8_t ra;
-       uint8_t fn51;
-       uint8_t mf_off;
-       uint8_t padding[1];
+       uint8_t combined;
+       uint16_t offset;
 } __attribute__((packed));
 
 /* the l1_info_ul header is in front */
@@ -167,23 +205,44 @@ struct l1ctl_par_req {
        uint8_t padding[2];
 } __attribute__((packed));
 
+struct l1ctl_h0 {
+       uint16_t band_arfcn;
+} __attribute__((packed));
+
+struct l1ctl_h1 {
+       uint8_t hsn;
+       uint8_t maio;
+       uint8_t n;
+       uint8_t _padding[1];
+       uint16_t ma[64];
+} __attribute__((packed));
+
 struct l1ctl_dm_est_req {
        uint8_t tsc;
        uint8_t h;
        union {
-               struct {
-                       uint16_t band_arfcn;
-               } h0;
-               struct {
-                       uint8_t hsn;
-                       uint8_t maio;
-                       uint8_t n;
-                       uint8_t _padding[1];
-                       uint16_t ma[64];
-               } h1;
+               struct l1ctl_h0 h0;
+               struct l1ctl_h1 h1;
+       };
+       uint8_t tch_mode;
+       uint8_t _padding[1];
+} __attribute__((packed));
+
+struct l1ctl_dm_freq_req {
+       uint16_t fn;
+       uint8_t tsc;
+       uint8_t h;
+       union {
+               struct l1ctl_h0 h0;
+               struct l1ctl_h1 h1;
        };
 } __attribute__((packed));
 
+struct l1ctl_crypto_req {
+       uint8_t algo;
+       uint8_t key[0];
+} __attribute__((packed));
+
 struct l1ctl_pm_req {
        uint8_t type;
        uint8_t padding[3];
@@ -214,4 +273,21 @@ struct l1ctl_reset {
        uint8_t pad[3];
 } __attribute__((packed));
 
+struct l1ctl_neigh_pm_req {
+       uint8_t n;
+       uint8_t padding[1];
+       uint16_t band_arfcn[64];
+} __attribute__((packed));
+
+/* neighbour cell measurement results */
+struct l1ctl_neigh_pm_ind {
+       uint16_t band_arfcn;
+       uint8_t pm[2];
+} __attribute__((packed));
+
+/* traffic data to network */
+struct l1ctl_traffic_req {
+       uint8_t data[TRAFFIC_DATA_LEN];
+} __attribute__((packed));
+
 #endif /* __L1CTL_PROTO_H__ */