From 7f41fbc3323b12939f97b729bdbdfd78ce209464 Mon Sep 17 00:00:00 2001 From: fabianoms Date: Mon, 12 Mar 2018 22:25:11 -0300 Subject: [PATCH 1/3] Code cleanup FLASH_SECTOR_SIZE defined in terms of SPI_FLASH_SEC_SIZE (issue #2421). --- cores/esp8266/flash_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/esp8266/flash_utils.h b/cores/esp8266/flash_utils.h index 67dc6ebadd..471cd07e03 100644 --- a/cores/esp8266/flash_utils.h +++ b/cores/esp8266/flash_utils.h @@ -31,7 +31,7 @@ int SPIRead(uint32_t addr, void *dest, size_t size); int SPIWrite(uint32_t addr, void *src, size_t size); int SPIEraseAreaEx(const uint32_t start, const uint32_t size); -#define FLASH_SECTOR_SIZE 0x1000 +#define FLASH_SECTOR_SIZE SPI_FLASH_SEC_SIZE #define FLASH_BLOCK_SIZE 0x10000 #define APP_START_OFFSET 0x1000 From e8b40d7923f497abfcd5636574d295f6a27deb3e Mon Sep 17 00:00:00 2001 From: fabianoms Date: Mon, 12 Mar 2018 22:42:10 -0300 Subject: [PATCH 2/3] Add an include to "spi_flash.h" This was a necessary include so that SPI_FLASH_SEC_SIZE can be referenced. --- cores/esp8266/flash_utils.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cores/esp8266/flash_utils.h b/cores/esp8266/flash_utils.h index 471cd07e03..d20045514c 100644 --- a/cores/esp8266/flash_utils.h +++ b/cores/esp8266/flash_utils.h @@ -25,6 +25,8 @@ extern "C" { #endif +#include "spi_flash.h" + int SPIEraseBlock(uint32_t block); int SPIEraseSector(uint32_t sector); int SPIRead(uint32_t addr, void *dest, size_t size); From 93a18810757739f44eaa7d4885889cf3689671d2 Mon Sep 17 00:00:00 2001 From: fabianoms Date: Mon, 19 Mar 2018 23:42:21 -0300 Subject: [PATCH 3/3] Update flash_utils.h --- cores/esp8266/flash_utils.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cores/esp8266/flash_utils.h b/cores/esp8266/flash_utils.h index d20045514c..66730b4b5b 100644 --- a/cores/esp8266/flash_utils.h +++ b/cores/esp8266/flash_utils.h @@ -21,12 +21,13 @@ #ifndef FLASH_UTILS_H #define FLASH_UTILS_H +#include "c_types.h" +#include "spi_flash.h" + #ifdef __cplusplus extern "C" { #endif -#include "spi_flash.h" - int SPIEraseBlock(uint32_t block); int SPIEraseSector(uint32_t sector); int SPIRead(uint32_t addr, void *dest, size_t size);