Merge pull request #19 from bugadani/init-fix

Set flash params on init

Author: bugadani

src/flash.rs

@@ -3,7 +3,6 @@ extern "C" {
     // fn esp_rom_spiflash_write_encrypted_enable();
     // fn esp_rom_spiflash_write_encrypted_disable();
     // fn esp_rom_spiflash_write_encrypted(addr: u32, data: *const u8, len: u32);
-    // fn esp_rom_spiflash_config_param();
     // fn esp_rom_spiflash_select_qio_pins();
     // fn esp_rom_spi_flash_auto_sus_res();
     // fn esp_rom_spi_flash_send_resume();
@@ -27,6 +26,15 @@ extern "C" {
     // fn esp_rom_spiflash_lock(); // can't find in idf defs?
     fn esp_rom_spiflash_attach(config: u32, legacy: bool);
 
+    fn esp_rom_spiflash_config_param(
+        device_id: u32,
+        chip_size: u32,
+        block_size: u32,
+        sector_size: u32,
+        page_size: u32,
+        status_mask: u32,
+    ) -> u32;
+
     #[cfg(any(
         feature = "esp32",
         feature = "esp32s2",
@@ -36,7 +44,7 @@ extern "C" {
     fn ets_efuse_get_spiconfig() -> u32;
 }
 
-pub fn attach() {
+pub fn attach() -> i32 {
     #[cfg(any(
         feature = "esp32",
         feature = "esp32s2",
@@ -50,7 +58,23 @@ pub fn attach() {
 
     // TODO: raise CPU frequency
 
-    unsafe { esp_rom_spiflash_attach(spiconfig, false) };
+    let config_result = unsafe {
+        esp_rom_spiflash_config_param(
+            0,
+            crate::properties::FLASH_SIZE,        // total_size
+            crate::properties::FLASH_BLOCK_SIZE,  // block_size
+            crate::properties::FLASH_SECTOR_SIZE, // sector_size
+            crate::properties::PAGE_SIZE,         // page_size
+            crate::properties::FLASH_STATUS_MASK, // status_mask
+        )
+    };
+
+    if config_result == 0 {
+        unsafe { esp_rom_spiflash_attach(spiconfig, false) };
+        0
+    } else {
+        -1
+    }
 }
 
 pub fn erase_block(adr: u32) -> i32 {

src/main.rs

@@ -132,12 +132,13 @@ fn is_inited() -> bool {
 pub unsafe extern "C" fn Init_impl(_adr: u32, _clk: u32, _fnc: u32) -> i32 {
     dprintln!("INIT");
 
-    flash::attach();
-
-    *DECOMPRESSOR = Decompressor::new();
-    *INITED = INITED_MAGIC;
-
-    0
+    if flash::attach() == 0 {
+        *DECOMPRESSOR = Decompressor::new();
+        *INITED = INITED_MAGIC;
+        0
+    } else {
+        1
+    }
 }
 
 /// Erase the sector at the given address in flash

src/properties.rs

@@ -10,11 +10,14 @@ pub const FLASH_BLOCK_SIZE: u32 = 65536;
     feature = "esp32h2"
 ))]
 // Max of 16MB
-const FLASH_SIZE: u32 = 0x1000000;
+pub const FLASH_SIZE: u32 = 0x1000000;
 
 #[cfg(any(feature = "esp32s2", feature = "esp32s3"))]
 // Max of 1GB
-const FLASH_SIZE: u32 = 0x40000000;
+pub const FLASH_SIZE: u32 = 0x40000000;
+
+pub const FLASH_STATUS_MASK: u32 = 0xFFFF;
+pub const FLASH_SECTOR_SIZE: u32 = 4096;
 
 #[allow(non_upper_case_globals)]
 #[no_mangle]