Merge branch 'master' into testing

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

diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h
index 24cb64b..f5ea1f9 100644 (file)
--- a/include/l1ctl_proto.h
+++ b/include/l1ctl_proto.h
@@ -51,6 +51,9 @@ enum {
        L1CTL_SIM_CONF,
        L1CTL_TCH_MODE_REQ,
        L1CTL_TCH_MODE_CONF,
+       L1CTL_VOICE_REQ,
+       L1CTL_VOICE_CONF,
+       L1CTL_VOICE_IND,
 };
 
 enum ccch_mode {
@@ -120,6 +123,11 @@ struct l1ctl_data_ind {
        uint8_t data[23];
 } __attribute__((packed));
 
+/* voice data from network */
+struct l1ctl_voice_ind {
+       uint8_t data[33];
+} __attribute__((packed));
+
 /*
  * uplink info
  */
@@ -176,9 +184,8 @@ struct l1ctl_tch_mode_req {
 /* 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 */
@@ -256,4 +263,9 @@ struct l1ctl_reset {
        uint8_t pad[3];
 } __attribute__((packed));
 
+/* voice data to network */
+struct l1ctl_voice_req {
+       uint8_t data[33];
+} __attribute__((packed));
+
 #endif /* __L1CTL_PROTO_H__ */