Browse Source

flashfs: fix alignment ambiguity

Instead of ignoring the warnings.
Thanks to @Ole2mail and @yuhaim for the suggestions.
release/1.12
Matthias Grob 4 years ago committed by Lorenz Meier
parent
commit
02c0f08060
  1. 1
      src/lib/parameters/flashparams/CMakeLists.txt
  2. 7
      src/lib/parameters/flashparams/flashfs.c

1
src/lib/parameters/flashparams/CMakeLists.txt

@ -42,7 +42,6 @@ target_compile_options(flashparams @@ -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)

7
src/lib/parameters/flashparams/flashfs.c

@ -86,11 +86,10 @@ typedef enum flash_flags_t { @@ -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 { @@ -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
/****************************************************************************

Loading…
Cancel
Save