mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-24 15:40:31 +08:00
flashfs: fix alignment ambiguity
Instead of ignoring the warnings. Thanks to @Ole2mail and @yuhaim for the suggestions.
This commit is contained in:
committed by
Lorenz Meier
parent
920d6d84b5
commit
02c0f08060
@@ -42,7 +42,6 @@ target_compile_options(flashparams
|
||||
PRIVATE
|
||||
-Wno-sign-compare # TODO: fix this
|
||||
-Wno-cast-align # TODO: fix and enable
|
||||
-Wno-address-of-packed-member # TODO: fix this
|
||||
)
|
||||
|
||||
target_link_libraries(flashparams PRIVATE nuttx_arch)
|
||||
|
||||
@@ -86,11 +86,10 @@ typedef enum flash_flags_t {
|
||||
} flash_flags_t;
|
||||
|
||||
|
||||
/* File flash_entry_header_t will be sizeof(h_magic_t) aligned
|
||||
/* The struct flash_entry_header_t will be sizeof(uint32_t) aligned
|
||||
* The Size will be the actual length of the header plus the data
|
||||
* and any padding needed to have the size be an even multiple of
|
||||
* sizeof(h_magic_t)
|
||||
* The
|
||||
* sizeof(uint32_t)
|
||||
*/
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wattributes"
|
||||
@@ -102,7 +101,7 @@ typedef begin_packed_struct struct flash_entry_header_t {
|
||||
* Will result the offset of the next active file or
|
||||
* free space. */
|
||||
flash_file_token_t file_token; /* file token type - essentially the name/type */
|
||||
} end_packed_struct flash_entry_header_t;
|
||||
} end_packed_struct flash_entry_header_t __attribute__((aligned(sizeof(uint32_t))));
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
/****************************************************************************
|
||||
|
||||
Reference in New Issue
Block a user