Merge branch 'master' into pr-heap-refactor3

Author: mhightower83

boards.txt

@@ -365,6 +365,18 @@ generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
 generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221
 generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
 generic.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
+generic.menu.sdk.nonosdk300=nonos-sdk 3.0.0
+generic.menu.sdk.nonosdk300.build.sdk=NONOSDK300
+generic.menu.sdk.nonosdk301=nonos-sdk 3.0.1
+generic.menu.sdk.nonosdk301.build.sdk=NONOSDK301
+generic.menu.sdk.nonosdk302=nonos-sdk 3.0.2
+generic.menu.sdk.nonosdk302.build.sdk=NONOSDK302
+generic.menu.sdk.nonosdk303=nonos-sdk 3.0.3
+generic.menu.sdk.nonosdk303.build.sdk=NONOSDK303
+generic.menu.sdk.nonosdk304=nonos-sdk 3.0.4
+generic.menu.sdk.nonosdk304.build.sdk=NONOSDK304
+generic.menu.sdk.nonosdk305=nonos-sdk 3.0.5
+generic.menu.sdk.nonosdk305.build.sdk=NONOSDK305
 generic.menu.ip.lm2f=v2 Lower Memory
 generic.menu.ip.lm2f.build.lwip_include=lwip2/include
 generic.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -710,6 +722,18 @@ esp8285.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
 esp8285.menu.sdk.nonosdk221.build.sdk=NONOSDK221
 esp8285.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
 esp8285.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
+esp8285.menu.sdk.nonosdk300=nonos-sdk 3.0.0
+esp8285.menu.sdk.nonosdk300.build.sdk=NONOSDK300
+esp8285.menu.sdk.nonosdk301=nonos-sdk 3.0.1
+esp8285.menu.sdk.nonosdk301.build.sdk=NONOSDK301
+esp8285.menu.sdk.nonosdk302=nonos-sdk 3.0.2
+esp8285.menu.sdk.nonosdk302.build.sdk=NONOSDK302
+esp8285.menu.sdk.nonosdk303=nonos-sdk 3.0.3
+esp8285.menu.sdk.nonosdk303.build.sdk=NONOSDK303
+esp8285.menu.sdk.nonosdk304=nonos-sdk 3.0.4
+esp8285.menu.sdk.nonosdk304.build.sdk=NONOSDK304
+esp8285.menu.sdk.nonosdk305=nonos-sdk 3.0.5
+esp8285.menu.sdk.nonosdk305.build.sdk=NONOSDK305
 esp8285.menu.ip.lm2f=v2 Lower Memory
 esp8285.menu.ip.lm2f.build.lwip_include=lwip2/include
 esp8285.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat

cores/esp8266/FS.cpp

@@ -173,18 +173,15 @@ File File::openNextFile() {
     return _fakeDir->openFile("r");
 }
 
-String File::readString()
-{
+String File::readString() {
     String ret;
     ret.reserve(size() - position());
-    char temp[256+1];
-    int countRead = readBytes(temp, sizeof(temp)-1);
-    while (countRead > 0)
-    {
-        temp[countRead] = 0;
-        ret += temp;
-        countRead = readBytes(temp, sizeof(temp)-1);
-    }
+    uint8_t temp[256];
+    int countRead;
+    do {
+        countRead = read(temp, sizeof(temp));
+        ret.concat((const char*)temp, countRead);
+    } while (countRead > 0);
     return ret;
 }
 

cores/esp8266/core_esp8266_main.cpp

@@ -404,7 +404,77 @@ extern "C" void flashinit (void);
 uint32_t __flashindex;
 #endif
 
+#if (NONOSDK >= (0x30000))
+
+extern "C" void ICACHE_FLASH_ATTR user_pre_init(void)
+{
+    uint32_t rf_cal = 0;
+    uint32_t phy_data = 0;
+    uint32_t system_parameter = 0;
+
+    switch (system_get_flash_size_map())
+    {
+    case FLASH_SIZE_2M:
+        rf_cal = 0x3b000;
+        phy_data = 0x3c000;
+        system_parameter = 0x3d000;
+        break;
+    case FLASH_SIZE_4M_MAP_256_256:
+        rf_cal = 0x7b000;
+        phy_data = 0x7c000;
+        system_parameter = 0x7d000;
+        break;
+    case FLASH_SIZE_8M_MAP_512_512:
+        rf_cal = 0xfb000;
+        phy_data = 0xfc000;
+        system_parameter = 0xfd000;
+        break;
+    case FLASH_SIZE_16M_MAP_512_512:
+    case FLASH_SIZE_16M_MAP_1024_1024:
+        rf_cal = 0x1fb000;
+        phy_data = 0x1fc000;
+        system_parameter = 0x1fd000;
+        break;
+    case FLASH_SIZE_32M_MAP_512_512:
+    case FLASH_SIZE_32M_MAP_1024_1024:
+    case FLASH_SIZE_32M_MAP_2048_2048:
+        rf_cal = 0x3fb000;
+        phy_data = 0x3fc000;
+        system_parameter = 0x3fd000;
+        break;
+    case FLASH_SIZE_64M_MAP_1024_1024:
+        rf_cal = 0x7fb000;
+        phy_data = 0x7fc000;
+        system_parameter = 0x7fd000;
+        break;
+    case FLASH_SIZE_128M_MAP_1024_1024:
+        rf_cal = 0xffb000;
+        phy_data = 0xffc000;
+        system_parameter = 0xffd000;
+        break;
+    }
+
+    extern uint32_t user_rf_cal_sector_set(void);
+    user_rf_cal_sector_set();
+
+    const partition_item_t at_partition_table[] =
+    {
+        { SYSTEM_PARTITION_RF_CAL,           rf_cal,           0x1000 },
+        { SYSTEM_PARTITION_PHY_DATA,         phy_data,         0x1000 },
+        { SYSTEM_PARTITION_SYSTEM_PARAMETER, system_parameter, 0x3000 },
+    };
+    system_partition_table_regist(at_partition_table, sizeof(at_partition_table) / sizeof(at_partition_table[0]), system_get_flash_size_map());
+}
+
+#endif
+
 extern "C" void user_init(void) {
+
+#if (NONOSDK >= (0x30000))
+    extern void user_rf_pre_init();
+    user_rf_pre_init();
+#endif
+
     struct rst_info *rtc_info_ptr = system_get_rst_info();
     memcpy((void *) &resetInfo, (void *) rtc_info_ptr, sizeof(resetInfo));
 
@@ -426,7 +496,7 @@ extern "C" void user_init(void) {
     install_vm_exception_handler();
 #endif
 
-#if defined(NON32XFER_HANDLER) || defined(MMU_IRAM_HEAP)
+#if defined(NON32XFER_HANDLER) || (defined(MMU_IRAM_HEAP) && (NONOSDK < (0x30000 - 1)))
     install_non32xfer_exception_handler();
 #endif
 

cores/esp8266/core_esp8266_non32xfer.cpp

@@ -26,10 +26,14 @@
  * Code taken directly from @pvvx's public domain code in
  * https://github.com/pvvx/esp8266web/blob/master/app/sdklib/system/app_main.c
  *
+ * In Espressif versions NONOSDK v3.0.0+ a similar feature was added
+ * load_non_32_wide_handler. Theirs is always loaded. Add weak attribute to
+ * theirs so we can choose by adding an alias to ours.
  *
  */
 
 #include <Arduino.h>
+#include <user_interface.h>
 #define VERIFY_C_ASM_EXCEPTION_FRAME_STRUCTURE
 #include <esp8266_undocumented.h>
 #include <core_esp8266_non32xfer.h>
@@ -58,10 +62,13 @@ extern "C" {
 
 #define EXCCAUSE_LOAD_STORE_ERROR 3 /* Non 32-bit read/write error */
 
+#if (defined(NON32XFER_HANDLER) || defined(MMU_IRAM_HEAP)) && (NONOSDK < (0x30000 - 1))
 static fn_c_exception_handler_t old_c_handler = NULL;
+#endif
 
+#if defined(NON32XFER_HANDLER) || (defined(MMU_IRAM_HEAP) && (NONOSDK < (0x30000 - 1)))
 static
-IRAM_ATTR void non32xfer_exception_handler(struct __exception_frame *ef, int cause)
+IRAM_ATTR void non32xfer_exception_handler(struct __exception_frame *ef, [[maybe_unused]] int cause)
 {
   do {
     uint32_t insn, excvaddr;
@@ -138,6 +145,7 @@ IRAM_ATTR void non32xfer_exception_handler(struct __exception_frame *ef, int cau
   } while(false);
 
 /* Fail request, die */
+#if (NONOSDK < (0x30000 - 1))
   /*
     The old handler points to the SDK. Be alert for HWDT when Calling with
     INTLEVEL != 0. I cannot create it any more. I thought I saw this as a
@@ -148,16 +156,23 @@ IRAM_ATTR void non32xfer_exception_handler(struct __exception_frame *ef, int cau
     old_c_handler(ef, cause);
     return;
   }
-
+#endif
   /*
     Calling _xtos_unhandled_exception(ef, cause) in the Boot ROM, gets us a
     hardware wdt.
 
     Use panic instead as a fall back. It will produce a stack trace.
    */
+#if defined(DEBUG_ESP_PORT) || defined(DEBUG_ESP_MMU)
   panic();
+#else
+  // For non-debug builds, save on resources
+  abort();
+#endif
 }
+#endif // #if defined(NON32XFER_HANDLER) || (defined(MMU_IRAM_HEAP) && (NONOSDK < (0x30000 - 1)))
 
+#if (defined(NON32XFER_HANDLER) || defined(MMU_IRAM_HEAP)) && (NONOSDK < (0x30000 - 1))
 /*
   To operate reliably, this module requires the new
   `_xtos_set_exception_handler` from `exc-sethandler.cpp` and
@@ -174,5 +189,17 @@ void install_non32xfer_exception_handler(void) {
       non32xfer_exception_handler);
   }
 }
+#else
+// For v3.0.x SDKs, no need for install - call_user_start will do the job.
+// Need this for build dependencies
+void install_non32xfer_exception_handler(void) __attribute__((weak));
+void install_non32xfer_exception_handler(void) {}
+#endif
+
+#if defined(NON32XFER_HANDLER)
+// For SDKs 3.0.x, we made load_non_32_wide_handler in
+// libmain.c:user_exceptions.o a weak symbol allowing this override to work.
+extern void load_non_32_wide_handler(struct __exception_frame *ef, int cause) __attribute__((alias("non32xfer_exception_handler")));
+#endif
 
 };

cores/esp8266/exc-sethandler.cpp

@@ -39,8 +39,10 @@
  * architecture, I am not convinced it can be done safely.
  *
 */
+#include <user_interface.h> // need NONOSDK
 
-#if defined(NON32XFER_HANDLER) || defined(MMU_IRAM_HEAP) || defined(NEW_EXC_C_WRAPPER) || defined(MMU_EXTERNAL_HEAP)
+#if defined(NON32XFER_HANDLER) || defined(MMU_IRAM_HEAP) || \
+    defined(NEW_EXC_C_WRAPPER) || defined(MMU_EXTERNAL_HEAP) || (NONOSDK >= (0x30000 - 1))
 
 /*
  * The original module source code came from:

cores/esp8266/heap.cpp

@@ -670,6 +670,61 @@ void* _heap_abi_malloc(size_t size, bool unhandled, const void* caller)
 }
 #endif
 
+#if (NONOSDK >= (0x30000))
+////////////////////////////////////////////////////////////////////////////////
+/*
+  New for NON-OS SDK 3.0.0 and up
+  Needed for WPA2 Enterprise support. This was not present in SDK pre 3.0
+
+  The NON-OS SDK 3.0.x has breaking changes to pvPortMalloc. They added one more
+  argument for selecting a heap. To avoid breaking the build, I renamed their
+  broken version pvEsprMalloc. To be used, the LIBS need to be edited.
+
+  They also added pvPortZallocIram and pvPortCallocIram, which are not a
+  problem.
+
+  WPA2 Enterprise connect crashing is fixed at v3.0.2 and up.
+
+  Not used for unreleased version NONOSDK3V0.
+*/
+void* IRAM_ATTR sdk3_pvPortMalloc(size_t size, const char* file, int line, bool iram)
+{
+    if (iram) {
+        HeapSelectIram ephemeral;
+        return heap_pvPortMalloc(size, file, line);
+    } else {
+        HeapSelectDram ephemeral;
+        return heap_pvPortMalloc(size, file, line);
+    }
+}
+
+void* IRAM_ATTR pvPortCallocIram(size_t count, size_t size, const char* file, int line)
+{
+    HeapSelectIram ephemeral;
+    return heap_pvPortCalloc(count, size, file, line);
+}
+
+void* IRAM_ATTR pvPortZallocIram(size_t size, const char* file, int line)
+{
+    HeapSelectIram ephemeral;
+    return heap_pvPortZalloc(size, file, line);
+}
+
+/*
+  uint32_t IRAM_ATTR user_iram_memory_is_enabled(void)
+  {
+    return CONFIG_ENABLE_IRAM_MEMORY;
+  }
+
+  We do not need the function user_iram_memory_is_enabled().
+  1. It was used by mem_manager.o which was replaced with this custom heap
+     implementation. IRAM memory selection is handled differently.
+  2. In libmain.a, Cache_Read_Enable_New uses it for cache size. However, When
+     using IRAM for memory or running with 48K IRAM for code, we use a
+     replacement Cache_Read_Enable to correct the cache size ignoring
+     Cache_Read_Enable_New's selected value.
+*/
+#endif
 };
 
 #if defined(ENABLE_THICK_DEBUG_WRAPPERS)