ESP32 now uses IDF hardware implementation if available (#2156)

***NO_CI***

Author: josesimoes

CMake/Modules/FindESP32_IDF.cmake

@@ -53,6 +53,7 @@ list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/wear_level
 
 list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_rom/include/${TARGET_SERIES_SHORT}/rom)
 list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_rom/include)
+list(APPEND ESP32_IDF_INCLUDE_DIRS ${esp32_idf_SOURCE_DIR}/components/esp_rom/${TARGET_SERIES_SHORT})
 
 # includes specific to ESP32S2
 if(${TARGET_SERIES_SHORT} STREQUAL "esp32s2")

CMake/Modules/FindNF_CoreCLR.cmake

@@ -75,7 +75,6 @@ set(NF_CoreCLR_SRCS
     TypeSystemLookup.cpp
     StringTableData.cpp
     TypeSystem.cpp
-    nanoSupport_CRC32.c
     nanoHAL_SystemInformation.cpp
     Various.cpp
 
@@ -159,6 +158,11 @@ set(NF_CoreCLR_SRCS
     GenericPort_stubs.c
 )
 
+# append CRC32, if not already included with Wire Protocol
+if(NOT WireProtocol_FOUND)
+    list(APPEND NF_CoreCLR_SRCS nanoSupport_CRC32.c)
+endif()
+
 # include System.Reflection API files depending on build option
 if(NF_FEATURE_SUPPORT_REFLECTION)
     list(APPEND NF_CoreCLR_SRCS corlib_native_System_Reflection_Assembly.cpp)

src/CLR/Core/nanoSupport_CRC32.c

@@ -12,7 +12,7 @@
 // CRC 32 table for use under ZModem protocol, IEEE 802
 // G(x) = x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1
 //
-static const uint32_t c_CRCTable[256] = {
+const uint32_t c_CRCTable[256] = {
     0x00000000, 0x04C11DB7, 0x09823B6E, 0x0D4326D9, 0x130476DC, 0x17C56B6B, 0x1A864DB2, 0x1E475005, 0x2608EDB8,
     0x22C9F00F, 0x2F8AD6D6, 0x2B4BCB61, 0x350C9B64, 0x31CD86D3, 0x3C8EA00A, 0x384FBDBD, 0x4C11DB70, 0x48D0C6C7,
     0x4593E01E, 0x4152FDA9, 0x5F15ADAC, 0x5BD4B01B, 0x569796C2, 0x52568B75, 0x6A1936C8, 0x6ED82B7F, 0x639B0DA6,

targets/ESP32/_Include/esp32_idf.h

@@ -51,6 +51,8 @@
 #include <soc/uart_channel.h>
 #include <spiffs_config.h>
 #include <esp_spiffs.h>
+#include <esp_rom_crc.h>
+#include <esp_rom_caps.h>
 
 // includes specific for TinyUSB and CDC
 #if CONFIG_USB_CDC_ENABLED

targets/ESP32/_common/CMakeLists.txt

@@ -16,6 +16,7 @@ list(APPEND TARGET_ESP32_IDF_COMMON_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/WireProt
 
 list(APPEND TARGET_ESP32_IDF_COMMON_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/targetHAL_ConfigStorageSPIFFS.c)
 list(APPEND TARGET_ESP32_IDF_COMMON_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/targetHAL_ConfigurationManager.cpp)
+list(APPEND TARGET_ESP32_IDF_COMMON_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nanoSupport_CRC32.c)
 
 # add device mapping
 # check if there is a specific one for the target...

targets/ESP32/_common/nanoSupport_CRC32.c

@@ -0,0 +1,45 @@
+//
+// Copyright (c) .NET Foundation and Contributors
+// Portions Copyright (c) Microsoft Corporation.  All rights reserved.
+// See LICENSE file in the project root for full license information.
+//
+
+#include <esp32_idf.h>
+
+#ifndef ESP_ROM_HAS_CRC_BE
+extern const uint32_t c_CRCTable[256];
+const uint32_t *myCRCTable = c_CRCTable;
+#endif
+
+// strong implementation of this function specific to the ESP32
+uint32_t SUPPORT_ComputeCRC(const void *rgBlock, const uint32_t nLength, const uint32_t crc)
+{
+    uint8_t const *ptr = (const unsigned char *)rgBlock;
+    int32_t lenght = nLength;
+    uint32_t newCrc = crc;
+
+#ifdef ESP_ROM_HAS_CRC_BE
+
+    // this series has ROM support for CRC32
+
+    // IDF CRC32 polinomial required this tweak
+    if (crc == 0)
+    {
+        newCrc = 0xFFFFFFFF;
+    }
+
+    newCrc = ~esp_rom_crc32_be(newCrc, ptr, lenght);
+
+#else
+
+    // this series does not have ROM support for CRC32
+    // use our implementation and CRC table
+    while (lenght-- > 0)
+    {
+        newCrc = myCRCTable[((newCrc >> 24) ^ (*ptr++)) & 0xFF] ^ (newCrc << 8);
+    }
+
+#endif
+
+    return newCrc;
+}