Added NODE_STORE_ATTR __attribute__((aligned(4),packed))

This commit is contained in:
HuangRui 2015-01-01 22:22:05 +08:00
parent b0ec34567c
commit 1b9479a650
2 changed files with 8 additions and 4 deletions

View File

@ -4,10 +4,11 @@
#define NODE_VERSION_MAJOR 0U #define NODE_VERSION_MAJOR 0U
#define NODE_VERSION_MINOR 9U #define NODE_VERSION_MINOR 9U
#define NODE_VERSION_REVISION 4U #define NODE_VERSION_REVISION 4U
#define NODE_VERSION_INTERNAL 0U #define NODE_VERSION_INTERNAL 0U
#define NODE_VERSION "NodeMcu 0.9.4" #define NODE_VERSION "NodeMcu 0.9.4"
#define BUILD_DATE "build " __DATE__ #define BUILD_DATE "build 20150101"
// #define FLASH_512K // #define FLASH_512K
// #define FLASH_1M // #define FLASH_1M
// #define FLASH_2M // #define FLASH_2M
@ -34,6 +35,8 @@
#define NODE_ERR #define NODE_ERR
#endif /* NODE_ERROR */ #endif /* NODE_ERROR */
#define NODE_STORE_ATTR __attribute__((aligned(4),packed))
#define CLIENT_SSL_ENABLE #define CLIENT_SSL_ENABLE
#define GPIO_INTERRUPT_ENABLE #define GPIO_INTERRUPT_ENABLE

View File

@ -1,7 +1,8 @@
#ifndef __FLASH_API_H__ #ifndef __FLASH_API_H__
#define __FLASH_API_H__ #define __FLASH_API_H__
#include "ets_sys.h" #include "ets_sys.h"
typedef struct __attribute__((packed)) #include "user_config.h"
typedef struct
{ {
uint8_t unknown0; uint8_t unknown0;
uint8_t unknown1; uint8_t unknown1;
@ -27,7 +28,7 @@ typedef struct __attribute__((packed))
SIZE_16MBIT = 3, SIZE_16MBIT = 3,
SIZE_32MBIT = 4, SIZE_32MBIT = 4,
} size : 4; } size : 4;
} SPIFlashInfo; } NODE_STORE_ATTR SPIFlashInfo;
SPIFlashInfo *flash_get_info(void); SPIFlashInfo *flash_get_info(void);
uint8_t flash_get_size(void); uint8_t flash_get_size(void);