Browse Source

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

HuangRui 9 years ago
parent
commit
1b9479a650
2 changed files with 8 additions and 4 deletions
  1. 5 2
      app/include/user_config.h
  2. 3 2
      app/platform/flash_api.h

+ 5 - 2
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
 

+ 3 - 2
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);