Merge commit '4a4f96d1f67441e2902a0806f1d7c4b29a072ca3'

[osmocom-bb.git] / src / shared / libosmocore / include / osmocore / protocol / gsm_03_41.h

diff --git a/src/shared/libosmocore/include/osmocore/protocol/gsm_03_41.h b/src/shared/libosmocore/include/osmocore/protocol/gsm_03_41.h
index 250d667..3b1b7c9 100644 (file)
--- a/src/shared/libosmocore/include/osmocore/protocol/gsm_03_41.h
+++ b/src/shared/libosmocore/include/osmocore/protocol/gsm_03_41.h
@@ -3,15 +3,15 @@
 
 #include <stdint.h>
 
-/* GSM TS 03.41 definitions */
+/* GSM TS 03.41 definitions also TS 23.041*/
 
 /* Chapter 9.3.2 */
 struct gsm341_ms_message {
        struct {
                uint8_t code_hi:6;
                uint8_t gs:2;
-               uint8_t update:2;
-               uint8_t code_lo:6;
+               uint8_t update:4;
+               uint8_t code_lo:4;
        } serial;
        uint16_t msg_id;
        struct {
@@ -25,6 +25,23 @@ struct gsm341_ms_message {
        uint8_t data[0];
 } __attribute__((packed));
 
+/* Chapter 9.4.1.3 */
+struct gsm341_etws_message {
+       struct {
+               uint8_t code_hi:4;
+               uint8_t popup:1;
+               uint8_t alert:1;
+               uint8_t gs:2;
+               uint8_t update:4;
+               uint8_t code_lo:4;
+       } serial;
+       uint16_t msg_id;
+       uint16_t warning_type;
+       uint8_t data[0];
+} __attribute__((packed));
+
+#define GSM341_MSG_CODE(ms) (ms->serial.code_lo | (msg->serial.code_hi << 4))
+
 /* Section 9.3.2.1 - Geographical Scope */
 #define GSM341_GS_CELL_WIDE_IMMED      0
 #define GSM341_GS_PLMN_WIDE            1