From 5cbb1943acf9e4f93a7f8db215210827142e40f6 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 12 Mar 2018 15:34:16 +0300 Subject: [PATCH] Structure size alligned by compiler. --- .../private_include/WL_Config.h | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/components/wear_levelling/private_include/WL_Config.h b/components/wear_levelling/private_include/WL_Config.h index 62f10eec3c..a1daa32d92 100644 --- a/components/wear_levelling/private_include/WL_Config.h +++ b/components/wear_levelling/private_include/WL_Config.h @@ -20,11 +20,17 @@ * @brief This class is used as a structure to configure wear levelling module * */ -#ifndef wl_config_t_size -#define wl_config_t_size (int)((48 - (2*sizeof(size_t) + 7*sizeof(uint32_t)) + sizeof(uint32_t) - 1)/sizeof(uint32_t)) -#endif // wl_config_t_size -typedef struct WL_Config_s { - size_t start_addr; /*!< start address in the flash*/ + +#if defined(_MSC_VER) +#define ALIGNED_(x) __declspec(align(x)) +#else +#if defined(__GNUC__) +#define ALIGNED_(x) __attribute__ ((aligned(x))) +#endif +#endif + +typedef struct ALIGNED_(16) WL_Config_s { /*!< Size of wl_config_t structure should be divided by 16 for encryption*/ + size_t start_addr; /*!< start address in the flash*/ uint32_t full_mem_size; /*!< Amount of memory used to store data in bytes*/ uint32_t page_size; /*!< One page size in bytes. Page could be more then memory block. This parameter must be page_size >= N*block_size.*/ uint32_t sector_size; /*!< size of flash memory sector that will be erased and stored at once (erase)*/ @@ -32,13 +38,7 @@ typedef struct WL_Config_s { uint32_t wr_size; /*!< Minimum amount of bytes per one block at write operation: 1...*/ uint32_t version; /*!< A version of current implementatioon. To erase and reallocate complete memory this ID must be different from id before.*/ size_t temp_buff_size; /*!< Size of temporary allocated buffer to copy from one flash area to another. The best way, if this value will be equal to sector size.*/ - uint32_t reserved[wl_config_t_size]; /*!< dummy array to make wl_config_t size compatible with flash encryption (divided by 16)*/ uint32_t crc; /*!< CRC for this config*/ -public: - WL_Config_s() - { - for (int i=0 ; i< wl_config_t_size ; i++) this->reserved[i] = 0; - } } wl_config_t; #ifndef _MSC_VER // MSVS has different format for this define