osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

gsm_03_41: Fix structure definitions for big-endian machines 

this was detected by debian packaging, as the associated gsm_03_41 test
case fails on big endian machines like ppc.
This commit is contained in:
Ruben Undheim 2015-12-09 20:22:42 +01:00 committed by Harald Welte
parent 84c19a9b36
commit 771a58feee
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/osmocom/gsm/protocol/gsm_03_41.h
View File

@ -2,8 +2,13 @@
#include <stdint.h>
#include <osmocom/core/endian.h>
#include <osmocom/gsm/protocol/gsm_04_12.h>
#ifndef OSMO_IS_LITTLE_ENDIAN
#define OSMO_IS_LITTLE_ENDIAN 0
#endif
/* GSM TS 03.41 definitions also TS 23.041*/
#define GSM341_MAX_PAYLOAD (GSM412_MSG_LEN-sizeof(struct gsm341_ms_message))
@ -13,19 +18,36 @@
/* Chapter 9.3.2 */
struct gsm341_ms_message {
struct {
#if OSMO_IS_LITTLE_ENDIAN == 1
uint8_t code_hi:6;
uint8_t gs:2;
uint8_t update:4;
uint8_t code_lo:4;
#else
uint8_t gs:2;
uint8_t code_hi:6;
uint8_t code_lo:4;
uint8_t update:4;
#endif
} serial;
uint16_t msg_id;
struct {
#if OSMO_IS_LITTLE_ENDIAN == 1
uint8_t language:4;
uint8_t group:4;
#else
uint8_t group:4;
uint8_t language:4;
#endif
} dcs;
struct {
#if OSMO_IS_LITTLE_ENDIAN == 1
uint8_t total:4;
uint8_t current:4;
#else
uint8_t current:4;
uint8_t total:4;
#endif
} page;
uint8_t data[0];
} __attribute__((packed));
@ -33,12 +55,21 @@ struct gsm341_ms_message {
/* Chapter 9.4.1.3 */
struct gsm341_etws_message {
struct {
#if OSMO_IS_LITTLE_ENDIAN == 1
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;
#else
uint8_t gs:2;
uint8_t alert:1;
uint8_t popup:1;
uint8_t code_hi:4;
uint8_t code_lo:4;
uint8_t update:4;
#endif
} serial;
uint16_t msg_id;
uint16_t warning_type;