diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2012-02-28 12:28:37 +0100 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2012-02-28 12:28:37 +0100 |
| commit | 00eb456826d3e76cc22505f21e9ad5cdd95d1e62 (patch) | |
| tree | 23d6ab0e640c25ffc67f2026e1dc398509d8ac97 /src | |
| parent | ac8a726ad658e35cf73d4a62646cbe5ba3e38da4 (diff) | |
| download | fastd-00eb456826d3e76cc22505f21e9ad5cdd95d1e62.tar fastd-00eb456826d3e76cc22505f21e9ad5cdd95d1e62.zip | |
Fix bitfield endianess
Diffstat (limited to 'src')
| -rw-r--r-- | src/packet.h | 64 |
1 files changed, 47 insertions, 17 deletions
diff --git a/src/packet.h b/src/packet.h index 548b9a4..b014f2b 100644 --- a/src/packet.h +++ b/src/packet.h @@ -28,35 +28,65 @@ #ifndef _FASTD_PACKET_H_ #define _FASTD_PACKET_H_ +#include <asm/byteorder.h> +#include <stdint.h> + typedef enum _fastd_reply_code { REPLY_SUCCESS = 0, } fastd_reply_code; typedef struct __attribute__ ((__packed__)) _fastd_packet_any { - unsigned reply : 1; - unsigned cp : 1; - unsigned req_id : 6; - unsigned rsv : 8; +#if defined(__LITTLE_ENDIAN_BITFIELD) + unsigned req_id : 6; + unsigned cp : 1; + unsigned reply : 1; +#elif defined (__BIG_ENDIAN_BITFIELD) + unsigned reply : 1; + unsigned cp : 1; + unsigned req_id : 6; +#else +#error "Bitfield endianess not defined." +#endif + + uint8_t rsv; } fastd_packet_any; typedef struct __attribute__ ((__packed__)) _fastd_packet_request { - unsigned reply : 1; - unsigned cp : 1; - unsigned req_id : 6; - unsigned rsv : 8; - unsigned flags : 8; - unsigned proto : 8; - unsigned method_len : 8; - char method_name[]; +#if defined(__LITTLE_ENDIAN_BITFIELD) + unsigned req_id : 6; + unsigned cp : 1; + unsigned reply : 1; +#elif defined (__BIG_ENDIAN_BITFIELD) + unsigned reply : 1; + unsigned cp : 1; + unsigned req_id : 6; +#else +#error "Bitfield endianess not defined." +#endif + + uint8_t rsv; + uint8_t flags; + uint8_t proto; + uint8_t method_len; + char method_name[]; } fastd_packet_request; typedef struct __attribute__ ((__packed__)) _fastd_packet_reply { - unsigned reply : 1; - unsigned cp : 1; - unsigned req_id : 6; - unsigned rsv : 8; - unsigned reply_code : 8; +#if defined(__LITTLE_ENDIAN_BITFIELD) + unsigned req_id : 6; + unsigned cp : 1; + unsigned reply : 1; +#elif defined (__BIG_ENDIAN_BITFIELD) + unsigned reply : 1; + unsigned cp : 1; + unsigned req_id : 6; +#else +#error "Bitfield endianess not defined." +#endif + + uint8_t rsv; + uint8_t reply_code; } fastd_packet_reply; typedef union _fastd_packet { |