michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ieee802154: Realign structure bitfields

Browse source 
Unsigned integer name change messed up the alignement of the size in
bitfields.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2017-06-07 10:26:08 +02:00 • committed by Jukka Rissanen
commit 3a025544a1
2 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/net/ieee802154.h
View file

@ -23,9 +23,9 @@ struct ieee802154_security_ctx {
struct cipher_ctx dec; struct cipher_ctx dec;
u8_t key[16]; u8_t key[16];
u8_t key_len; u8_t key_len;
u8_t level : 3; u8_t level : 3;
u8_t key_mode : 2; u8_t key_mode : 2;
u8_t _unused : 3; u8_t _unused : 3;
}; };
/* This not meant to be used by any code but 802.15.4 L2 stack */ /* This not meant to be used by any code but 802.15.4 L2 stack */
@ -54,7 +54,7 @@ struct ieee802154_context {
u8_t sequence; u8_t sequence;
u8_t ack_received : 1; u8_t ack_received : 1;
u8_t ack_requested : 1; u8_t ack_requested : 1;
u8_t associated : 1; u8_t associated : 1;
u8_t _unused : 5; u8_t _unused : 5;
}; };
@ -250,8 +250,8 @@ struct ieee802154_security_params {
u8_t key[16]; u8_t key[16];
u8_t key_len; u8_t key_len;
u8_t key_mode : 2; u8_t key_mode : 2;
u8_t level : 3; u8_t level : 3;
u8_t _unused : 3; u8_t _unused : 3;
}; };
#endif /* __IEEE802154_H__ */ #endif /* __IEEE802154_H__ */

80
subsys/net/ip/l2/ieee802154/ieee802154_frame.h
View file

@ -78,27 +78,27 @@ struct ieee802154_fcf_seq {
struct { struct {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
u16_t frame_type :3; u16_t frame_type :3;
u16_t security_enabled :1; u16_t security_enabled :1;
u16_t frame_pending :1; u16_t frame_pending :1;
u16_t ar :1; u16_t ar :1;
u16_t pan_id_comp :1; u16_t pan_id_comp :1;
u16_t reserved :1; u16_t reserved :1;
u16_t seq_num_suppr :1; u16_t seq_num_suppr :1;
u16_t ie_list :1; u16_t ie_list :1;
u16_t dst_addr_mode :2; u16_t dst_addr_mode :2;
u16_t frame_version :2; u16_t frame_version :2;
u16_t src_addr_mode :2; u16_t src_addr_mode :2;
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
u16_t reserved :1; u16_t reserved :1;
u16_t pan_id_comp :1; u16_t pan_id_comp :1;
u16_t ar :1; u16_t ar :1;
u16_t frame_pending :1; u16_t frame_pending :1;
u16_t security_enabled :1; u16_t security_enabled :1;
u16_t frame_type :3; u16_t frame_type :3;
u16_t src_addr_mode :2; u16_t src_addr_mode :2;
u16_t frame_version :2; u16_t frame_version :2;
u16_t dst_addr_mode :2; u16_t dst_addr_mode :2;
u16_t ie_list :1; u16_t ie_list :1;
u16_t seq_num_suppr :1; u16_t seq_num_suppr :1;
#endif #endif
} fc __packed; } fc __packed;
@ -166,9 +166,9 @@ struct ieee802154_security_control_field {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
u8_t security_level :3; u8_t security_level :3;
u8_t key_id_mode :2; u8_t key_id_mode :2;
u8_t reserved :3; u8_t reserved :3;
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
u8_t reserved :3; u8_t reserved :3;
u8_t key_id_mode :2; u8_t key_id_mode :2;
u8_t security_level :3; u8_t security_level :3;
#endif #endif
@ -225,9 +225,9 @@ struct ieee802154_mfr {
struct ieee802154_gts_dir { struct ieee802154_gts_dir {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
u8_t mask : 7; u8_t mask : 7;
u8_t reserved : 1; u8_t reserved : 1;
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
u8_t reserved : 1; u8_t reserved : 1;
u8_t mask : 7; u8_t mask : 7;
#endif #endif
} __packed; } __packed;
@ -246,16 +246,16 @@ struct ieee802154_gts {
struct ieee802154_gts_spec { struct ieee802154_gts_spec {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
/* Descriptor Count */ /* Descriptor Count */
u8_t desc_count : 3; u8_t desc_count : 3;
u8_t reserved : 4; u8_t reserved : 4;
/* GTS Permit */ /* GTS Permit */
u8_t permit : 1; u8_t permit : 1;
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
/* GTS Permit */ /* GTS Permit */
u8_t permit : 1; u8_t permit : 1;
u8_t reserved : 4; u8_t reserved : 4;
/* Descriptor Count */ /* Descriptor Count */
u8_t desc_count : 3; u8_t desc_count : 3;
#endif #endif
} __packed; } __packed;
@ -263,15 +263,15 @@ struct ieee802154_pas_spec {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
/* Number of Short Addresses Pending */ /* Number of Short Addresses Pending */
u8_t nb_sap : 3; u8_t nb_sap : 3;
u8_t reserved_1 : 1; u8_t reserved_1 : 1;
/* Number of Extended Addresses Pending */ /* Number of Extended Addresses Pending */
u8_t nb_eap : 3; u8_t nb_eap : 3;
u8_t reserved_2 : 1; u8_t reserved_2 : 1;
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
u8_t reserved_1 : 1; u8_t reserved_1 : 1;
/* Number of Extended Addresses Pending */ /* Number of Extended Addresses Pending */
u8_t nb_eap : 3; u8_t nb_eap : 3;
u8_t reserved_2 : 1; u8_t reserved_2 : 1;
/* Number of Short Addresses Pending */ /* Number of Short Addresses Pending */
u8_t nb_sap : 3; u8_t nb_sap : 3;
#endif #endif
@ -280,32 +280,32 @@ struct ieee802154_pas_spec {
struct ieee802154_beacon_sf { struct ieee802154_beacon_sf {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
/* Beacon Order*/ /* Beacon Order*/
u16_t bc_order : 4; u16_t bc_order : 4;
/* Superframe Order*/ /* Superframe Order*/
u16_t sf_order : 4; u16_t sf_order : 4;
/* Final CAP Slot */ /* Final CAP Slot */
u16_t cap_slot : 4; u16_t cap_slot : 4;
/* Battery Life Extension */ /* Battery Life Extension */
u16_t ble : 1; u16_t ble : 1;
u16_t reserved : 1; u16_t reserved : 1;
/* PAN Coordinator */ /* PAN Coordinator */
u16_t coordinator : 1; u16_t coordinator : 1;
/* Association Permit */ /* Association Permit */
u16_t association : 1; u16_t association : 1;
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
/* Superframe Order*/ /* Superframe Order*/
u16_t sf_order : 4; u16_t sf_order : 4;
/* Beacon Order*/ /* Beacon Order*/
u16_t bc_order : 4; u16_t bc_order : 4;
/* Association Permit */ /* Association Permit */
u16_t association : 1; u16_t association : 1;
/* PAN Coordinator */ /* PAN Coordinator */
u16_t coordinator : 1; u16_t coordinator : 1;
u16_t reserved : 1; u16_t reserved : 1;
/* Battery Life Extension */ /* Battery Life Extension */
u16_t ble : 1; u16_t ble : 1;
/* Final CAP Slot */ /* Final CAP Slot */
u16_t cap_slot : 4; u16_t cap_slot : 4;
#endif #endif
} __packed; } __packed;
@ -320,21 +320,21 @@ struct ieee802154_beacon {
struct ieee802154_cmd_assoc_req { struct ieee802154_cmd_assoc_req {
struct { struct {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
u8_t reserved_1 : 1; u8_t reserved_1 : 1;
u8_t dev_type : 1; u8_t dev_type : 1;
u8_t power_src : 1; u8_t power_src : 1;
u8_t rx_on : 1; u8_t rx_on : 1;
u8_t reserved_2 : 2; u8_t reserved_2 : 2;
u8_t sec_capability : 1; u8_t sec_capability : 1;
u8_t alloc_addr : 1; u8_t alloc_addr : 1;
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
u8_t alloc_addr : 1; u8_t alloc_addr : 1;
u8_t sec_capability : 1; u8_t sec_capability : 1;
u8_t reserved_2 : 2; u8_t reserved_2 : 2;
u8_t rx_on : 1; u8_t rx_on : 1;
u8_t power_src : 1; u8_t power_src : 1;
u8_t dev_type : 1; u8_t dev_type : 1;
u8_t reserved_1 : 1; u8_t reserved_1 : 1;
#endif #endif
} ci; } ci;
} __packed; } __packed;
@ -380,13 +380,13 @@ struct ieee802154_gts_request {
struct { struct {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
u8_t length : 4; u8_t length : 4;
u8_t direction : 1; u8_t direction : 1;
u8_t type : 1; u8_t type : 1;
u8_t reserved : 2; u8_t reserved : 2;
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
u8_t reserved : 2; u8_t reserved : 2;
u8_t type : 1; u8_t type : 1;
u8_t direction : 1; u8_t direction : 1;
u8_t length : 4; u8_t length : 4;
#endif #endif
} gts; } gts;