|
@@ -20,23 +20,83 @@ static volatile const uint8_t flash_init_data[128] ICACHE_STORE_ATTR ICACHE_RODA
|
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
|
|
};
|
|
|
|
|
|
-SPIFlashInfo flash_get_info(void)
|
|
|
+uint32_t flash_detect_size_byte(void)
|
|
|
+{
|
|
|
+ uint32_t dummy_size = FLASH_SIZE_256KBYTE;
|
|
|
+ uint8_t data_orig[64] ICACHE_STORE_ATTR = {0};
|
|
|
+ uint8_t data_new[64] ICACHE_STORE_ATTR = {0};
|
|
|
+ if (SPI_FLASH_RESULT_OK == flash_safe_read(0, (uint32 *)data_orig, 64))
|
|
|
+ {
|
|
|
+ dummy_size = FLASH_SIZE_256KBYTE;
|
|
|
+ while ((dummy_size < FLASH_SIZE_16MBYTE) &&
|
|
|
+ (SPI_FLASH_RESULT_OK == flash_safe_read(dummy_size, (uint32 *)data_new, 64)))
|
|
|
+ {
|
|
|
+ dummy_size *= 2;
|
|
|
+ }
|
|
|
+ };
|
|
|
+ return dummy_size;
|
|
|
+}
|
|
|
+
|
|
|
+uint32_t flash_safe_get_size_byte(void)
|
|
|
+{
|
|
|
+ static uint32_t flash_size = 0;
|
|
|
+ if (flash_size == 0)
|
|
|
+ {
|
|
|
+ flash_size = flash_detect_size_byte();
|
|
|
+ }
|
|
|
+ return flash_size;
|
|
|
+}
|
|
|
+
|
|
|
+uint16_t flash_safe_get_sec_num(void)
|
|
|
+{
|
|
|
+ return (flash_safe_get_size_byte() / (SPI_FLASH_SEC_SIZE));
|
|
|
+}
|
|
|
+
|
|
|
+SpiFlashOpResult flash_safe_read(uint32 src_addr, uint32 *des_addr, uint32 size)
|
|
|
+{
|
|
|
+ SpiFlashOpResult result = SPI_FLASH_RESULT_ERR;
|
|
|
+ FLASH_SAFEMODE_ENTER();
|
|
|
+ result = spi_flash_read(src_addr, (uint32 *) des_addr, size);
|
|
|
+ FLASH_SAFEMODE_LEAVE();
|
|
|
+ return result;
|
|
|
+}
|
|
|
+
|
|
|
+SpiFlashOpResult flash_safe_write(uint32 des_addr, uint32 *src_addr, uint32 size)
|
|
|
+{
|
|
|
+ SpiFlashOpResult result = SPI_FLASH_RESULT_ERR;
|
|
|
+ FLASH_SAFEMODE_ENTER();
|
|
|
+ result = spi_flash_write(des_addr, src_addr, size);
|
|
|
+ FLASH_SAFEMODE_LEAVE();
|
|
|
+ return result;
|
|
|
+}
|
|
|
+
|
|
|
+SpiFlashOpResult flash_safe_erase_sector(uint16 sec)
|
|
|
+{
|
|
|
+ SpiFlashOpResult result = SPI_FLASH_RESULT_ERR;
|
|
|
+ FLASH_SAFEMODE_ENTER();
|
|
|
+ result = spi_flash_erase_sector(sec);
|
|
|
+ FLASH_SAFEMODE_LEAVE();
|
|
|
+ return result;
|
|
|
+}
|
|
|
+
|
|
|
+SPIFlashInfo flash_rom_getinfo(void)
|
|
|
{
|
|
|
volatile SPIFlashInfo spi_flash_info ICACHE_STORE_ATTR;
|
|
|
- spi_flash_info = *((SPIFlashInfo *)(FLASH_MAP_START_ADDRESS));
|
|
|
- // spi_flash_read(0, (uint32 *)(& spi_flash_info), sizeof(spi_flash_info));
|
|
|
+ // Don't use it before cache read disabled
|
|
|
+ // spi_flash_info = *((SPIFlashInfo *)(FLASH_ADDRESS_START_MAP));
|
|
|
+ flash_safe_read(0, (uint32 *)(& spi_flash_info), sizeof(spi_flash_info));
|
|
|
return spi_flash_info;
|
|
|
}
|
|
|
|
|
|
-uint8_t flash_get_size(void)
|
|
|
+uint8_t flash_rom_get_size_type(void)
|
|
|
{
|
|
|
- return flash_get_info().size;
|
|
|
+ return flash_rom_getinfo().size;
|
|
|
}
|
|
|
|
|
|
-uint32_t flash_get_size_byte(void)
|
|
|
+uint32_t flash_rom_get_size_byte(void)
|
|
|
{
|
|
|
uint32_t flash_size = 0;
|
|
|
- switch (flash_get_info().size)
|
|
|
+ switch (flash_rom_getinfo().size)
|
|
|
{
|
|
|
case SIZE_2MBIT:
|
|
|
// 2Mbit, 256kByte
|
|
@@ -74,23 +134,23 @@ uint32_t flash_get_size_byte(void)
|
|
|
return flash_size;
|
|
|
}
|
|
|
|
|
|
-bool flash_set_size(uint8_t size)
|
|
|
+bool flash_rom_set_size_type(uint8_t size)
|
|
|
{
|
|
|
// Dangerous, here are dinosaur infested!!!!!
|
|
|
// Reboot required!!!
|
|
|
// If you don't know what you're doing, your nodemcu may turn into stone ...
|
|
|
uint8_t data[SPI_FLASH_SEC_SIZE] ICACHE_STORE_ATTR;
|
|
|
- spi_flash_read(0, (uint32 *)data, sizeof(data));
|
|
|
+ flash_safe_read(0, (uint32 *)data, sizeof(data));
|
|
|
SPIFlashInfo *p_spi_flash_info = (SPIFlashInfo *)(data);
|
|
|
p_spi_flash_info->size = size;
|
|
|
- spi_flash_erase_sector(0);
|
|
|
- spi_flash_write(0, (uint32 *)data, sizeof(data));
|
|
|
- //p_spi_flash_info = flash_get_info();
|
|
|
+ flash_safe_erase_sector(0);
|
|
|
+ flash_safe_write(0, (uint32 *)data, sizeof(data));
|
|
|
+ //p_spi_flash_info = flash_rom_getinfo();
|
|
|
//p_spi_flash_info->size = size;
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
-bool flash_set_size_byte(uint32_t size)
|
|
|
+bool flash_rom_set_size_byte(uint32_t size)
|
|
|
{
|
|
|
// Dangerous, here are dinosaur infested!!!!!
|
|
|
// Reboot required!!!
|
|
@@ -102,27 +162,27 @@ bool flash_set_size_byte(uint32_t size)
|
|
|
case 256 * 1024:
|
|
|
// 2Mbit, 256kByte
|
|
|
flash_size = SIZE_2MBIT;
|
|
|
- flash_set_size(flash_size);
|
|
|
+ flash_rom_set_size_type(flash_size);
|
|
|
break;
|
|
|
case 512 * 1024:
|
|
|
// 4Mbit, 512kByte
|
|
|
flash_size = SIZE_4MBIT;
|
|
|
- flash_set_size(flash_size);
|
|
|
+ flash_rom_set_size_type(flash_size);
|
|
|
break;
|
|
|
case 1 * 1024 * 1024:
|
|
|
// 8Mbit, 1MByte
|
|
|
flash_size = SIZE_8MBIT;
|
|
|
- flash_set_size(flash_size);
|
|
|
+ flash_rom_set_size_type(flash_size);
|
|
|
break;
|
|
|
case 2 * 1024 * 1024:
|
|
|
// 16Mbit, 2MByte
|
|
|
flash_size = SIZE_16MBIT;
|
|
|
- flash_set_size(flash_size);
|
|
|
+ flash_rom_set_size_type(flash_size);
|
|
|
break;
|
|
|
case 4 * 1024 * 1024:
|
|
|
// 32Mbit, 4MByte
|
|
|
flash_size = SIZE_32MBIT;
|
|
|
- flash_set_size(flash_size);
|
|
|
+ flash_rom_set_size_type(flash_size);
|
|
|
break;
|
|
|
default:
|
|
|
// Unknown flash size.
|
|
@@ -132,22 +192,22 @@ bool flash_set_size_byte(uint32_t size)
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
-uint16_t flash_get_sec_num(void)
|
|
|
+uint16_t flash_rom_get_sec_num(void)
|
|
|
{
|
|
|
//static uint16_t sec_num = 0;
|
|
|
- // return flash_get_size_byte() / (SPI_FLASH_SEC_SIZE);
|
|
|
- // c_printf("\nflash_get_size_byte()=%d\n", ( flash_get_size_byte() / (SPI_FLASH_SEC_SIZE) ));
|
|
|
+ // return flash_rom_get_size_byte() / (SPI_FLASH_SEC_SIZE);
|
|
|
+ // c_printf("\nflash_rom_get_size_byte()=%d\n", ( flash_rom_get_size_byte() / (SPI_FLASH_SEC_SIZE) ));
|
|
|
// if( sec_num == 0 )
|
|
|
//{
|
|
|
// sec_num = 4 * 1024 * 1024 / (SPI_FLASH_SEC_SIZE);
|
|
|
//}
|
|
|
//return sec_num;
|
|
|
- return ( flash_get_size_byte() / (SPI_FLASH_SEC_SIZE) );
|
|
|
+ return ( flash_rom_get_size_byte() / (SPI_FLASH_SEC_SIZE) );
|
|
|
}
|
|
|
|
|
|
-uint8_t flash_get_mode(void)
|
|
|
+uint8_t flash_rom_get_mode(void)
|
|
|
{
|
|
|
- SPIFlashInfo spi_flash_info = flash_get_info();
|
|
|
+ SPIFlashInfo spi_flash_info = flash_rom_getinfo();
|
|
|
switch (spi_flash_info.mode)
|
|
|
{
|
|
|
// Reserved for future use
|
|
@@ -163,10 +223,10 @@ uint8_t flash_get_mode(void)
|
|
|
return spi_flash_info.mode;
|
|
|
}
|
|
|
|
|
|
-uint32_t flash_get_speed(void)
|
|
|
+uint32_t flash_rom_get_speed(void)
|
|
|
{
|
|
|
uint32_t speed = 0;
|
|
|
- SPIFlashInfo spi_flash_info = flash_get_info();
|
|
|
+ SPIFlashInfo spi_flash_info = flash_rom_getinfo();
|
|
|
switch (spi_flash_info.speed)
|
|
|
{
|
|
|
case SPEED_40MHZ:
|
|
@@ -193,7 +253,7 @@ bool flash_init_data_written(void)
|
|
|
{
|
|
|
// FLASH SEC - 4
|
|
|
uint32_t data[2] ICACHE_STORE_ATTR;
|
|
|
- if (SPI_FLASH_RESULT_OK == spi_flash_read((flash_get_sec_num() - 4) * SPI_FLASH_SEC_SIZE, (uint32 *)data, sizeof(data)))
|
|
|
+ if (SPI_FLASH_RESULT_OK == flash_safe_read((flash_rom_get_sec_num() - 4) * SPI_FLASH_SEC_SIZE, (uint32 *)data, sizeof(data)))
|
|
|
{
|
|
|
if (data[0] == 0xFFFFFFFF && data[1] == 0xFFFFFFFF)
|
|
|
{
|
|
@@ -210,9 +270,9 @@ bool flash_init_data_default(void)
|
|
|
// Reboot required!!!
|
|
|
// It will init system data to default!
|
|
|
bool result = false;
|
|
|
- if (SPI_FLASH_RESULT_OK == spi_flash_erase_sector((flash_get_sec_num() - 4)))
|
|
|
+ if (SPI_FLASH_RESULT_OK == flash_safe_erase_sector((flash_rom_get_sec_num() - 4)))
|
|
|
{
|
|
|
- if (SPI_FLASH_RESULT_OK == spi_flash_write((flash_get_sec_num() - 4) * SPI_FLASH_SEC_SIZE, (uint32 *)flash_init_data, 128))
|
|
|
+ if (SPI_FLASH_RESULT_OK == flash_safe_write((flash_rom_get_sec_num() - 4) * SPI_FLASH_SEC_SIZE, (uint32 *)flash_init_data, 128))
|
|
|
{
|
|
|
result = true;
|
|
|
}
|
|
@@ -227,8 +287,8 @@ bool flash_init_data_blank(void)
|
|
|
// Reboot required!!!
|
|
|
// It will init system config to blank!
|
|
|
bool result = false;
|
|
|
- if ((SPI_FLASH_RESULT_OK == spi_flash_erase_sector((flash_get_sec_num() - 2))) &&
|
|
|
- (SPI_FLASH_RESULT_OK == spi_flash_erase_sector((flash_get_sec_num() - 1))))
|
|
|
+ if ((SPI_FLASH_RESULT_OK == flash_safe_erase_sector((flash_rom_get_sec_num() - 2))) &&
|
|
|
+ (SPI_FLASH_RESULT_OK == flash_safe_erase_sector((flash_rom_get_sec_num() - 1))))
|
|
|
{
|
|
|
result = true;
|
|
|
}
|