From 1b9479a6501308857a653fcade5b2b100667b4f1 Mon Sep 17 00:00:00 2001 From: HuangRui Date: Thu, 1 Jan 2015 22:22:05 +0800 Subject: [PATCH] Added NODE_STORE_ATTR __attribute__((aligned(4),packed)) --- app/include/user_config.h | 7 +++++-- app/platform/flash_api.h | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/include/user_config.h b/app/include/user_config.h index ab0edf23..9f4512c7 100644 --- a/app/include/user_config.h +++ b/app/include/user_config.h @@ -4,10 +4,11 @@ #define NODE_VERSION_MAJOR 0U #define NODE_VERSION_MINOR 9U #define NODE_VERSION_REVISION 4U -#define NODE_VERSION_INTERNAL 0U +#define NODE_VERSION_INTERNAL 0U #define NODE_VERSION "NodeMcu 0.9.4" -#define BUILD_DATE "build " __DATE__ +#define BUILD_DATE "build 20150101" + // #define FLASH_512K // #define FLASH_1M // #define FLASH_2M @@ -34,6 +35,8 @@ #define NODE_ERR #endif /* NODE_ERROR */ +#define NODE_STORE_ATTR __attribute__((aligned(4),packed)) + #define CLIENT_SSL_ENABLE #define GPIO_INTERRUPT_ENABLE diff --git a/app/platform/flash_api.h b/app/platform/flash_api.h index 5642562f..6ba98120 100644 --- a/app/platform/flash_api.h +++ b/app/platform/flash_api.h @@ -1,7 +1,8 @@ #ifndef __FLASH_API_H__ #define __FLASH_API_H__ #include "ets_sys.h" -typedef struct __attribute__((packed)) +#include "user_config.h" +typedef struct { uint8_t unknown0; uint8_t unknown1; @@ -27,7 +28,7 @@ typedef struct __attribute__((packed)) SIZE_16MBIT = 3, SIZE_32MBIT = 4, } size : 4; -} SPIFlashInfo; +} NODE_STORE_ATTR SPIFlashInfo; SPIFlashInfo *flash_get_info(void); uint8_t flash_get_size(void);