Merge branch 'feature/update_nvs_flash_from_esp-idf' into 'master'

feat(nvs_flash): Update nvs_flash from esp-idf

See merge request sdk/ESP8266_RTOS_SDK!1628

Author: donghengqaz

components/esp8266/include/esp_attr.h

@@ -68,4 +68,10 @@
 
 #define _COUNTER_STRINGIFY(COUNTER) #COUNTER
 
+#ifdef IDF_CI_BUILD
+#define IDF_DEPRECATED(REASON) __attribute__((deprecated(REASON)))
+#else
+#define IDF_DEPRECATED(REASON)
+#endif
+
 #endif /* __ESP_ATTR_H__ */

components/esp8266/source/phy_init.c

@@ -204,15 +204,15 @@ static const char* PHY_NAMESPACE = "phy";
 static const char* PHY_CAL_DATA_KEY = "cal_data";
 static const char* PHY_RX_GAIN_DC_TABLE_KEY = "dc_table";
 
-static esp_err_t load_cal_data_from_nvs_handle(nvs_handle handle,
+static esp_err_t load_cal_data_from_nvs_handle(nvs_handle_t handle,
         esp_phy_calibration_data_t* out_cal_data);
 
-static esp_err_t store_cal_data_to_nvs_handle(nvs_handle handle,
+static esp_err_t store_cal_data_to_nvs_handle(nvs_handle_t handle,
         const esp_phy_calibration_data_t* cal_data);
 
 esp_err_t esp_phy_load_cal_data_from_nvs(esp_phy_calibration_data_t* out_cal_data)
 {
-    nvs_handle handle;
+    nvs_handle_t handle;
     esp_err_t err = nvs_open(PHY_NAMESPACE, NVS_READONLY, &handle);
 
     if (err == ESP_ERR_NVS_NOT_INITIALIZED) {
@@ -230,7 +230,7 @@ esp_err_t esp_phy_load_cal_data_from_nvs(esp_phy_calibration_data_t* out_cal_dat
 
 esp_err_t esp_phy_store_cal_data_to_nvs(const esp_phy_calibration_data_t* cal_data)
 {
-    nvs_handle handle;
+    nvs_handle_t handle;
     esp_err_t err = nvs_open(PHY_NAMESPACE, NVS_READWRITE, &handle);
 
     if (err != ESP_OK) {
@@ -243,7 +243,7 @@ esp_err_t esp_phy_store_cal_data_to_nvs(const esp_phy_calibration_data_t* cal_da
     }
 }
 
-static esp_err_t load_cal_data_from_nvs_handle(nvs_handle handle,
+static esp_err_t load_cal_data_from_nvs_handle(nvs_handle_t handle,
         esp_phy_calibration_data_t* out_cal_data)
 {
     esp_err_t err;
@@ -278,7 +278,7 @@ static esp_err_t load_cal_data_from_nvs_handle(nvs_handle handle,
     return ESP_OK;
 }
 
-static esp_err_t store_cal_data_to_nvs_handle(nvs_handle handle,
+static esp_err_t store_cal_data_to_nvs_handle(nvs_handle_t handle,
         const esp_phy_calibration_data_t* cal_data)
 {
     esp_err_t err;

components/esp8266/source/system_api.c

@@ -136,7 +136,7 @@ static const char *BACKUP_MAC_DATA_KEY = "backup_mac_data";
 static esp_err_t load_backup_mac_data(uint8_t *mac)
 {
     esp_err_t err;
-    nvs_handle handle;
+    nvs_handle_t handle;
     uint32_t efuse[4];
     uint8_t efuse_crc = 0;
     uint8_t calc_crc = 0;
@@ -221,7 +221,7 @@ static esp_err_t load_backup_mac_data(uint8_t *mac)
 static esp_err_t store_backup_mac_data()
 {
     esp_err_t err;
-    nvs_handle handle;
+    nvs_handle_t handle;
     uint32_t efuse[4];
     efuse[0] = REG_READ(EFUSE_DATA0_REG);
     efuse[1] = REG_READ(EFUSE_DATA1_REG);

components/lwip/port/esp8266/netif/dhcp_state.c

@@ -31,7 +31,6 @@ static const char *interface_key[] = {"IF_STA", "IF_AP", "IF_ETH", "IF_TEST"};
 _Static_assert(sizeof(interface_key) / sizeof(char*) == TCPIP_ADAPTER_IF_MAX,
                "Number interface keys differs from number of interfaces");
 
-typedef nvs_handle nvs_handle_t;
 bool dhcp_ip_addr_restore(void *netif)
 {
     nvs_handle_t nvs;

components/nvs_flash/CMakeLists.txt

@@ -1,6 +1,51 @@
-set(COMPONENT_SRCDIRS "src")
-set(COMPONENT_ADD_INCLUDEDIRS "include")
+idf_build_get_property(target IDF_TARGET)
 
-set(COMPONENT_PRIV_REQUIRES "spi_flash")
+set(srcs "src/nvs_api.cpp"
+         "src/nvs_cxx_api.cpp"
+         "src/nvs_item_hash_list.cpp"
+         "src/nvs_page.cpp"
+         "src/nvs_pagemanager.cpp"
+         "src/nvs_storage.cpp"
+         "src/nvs_handle_simple.cpp"
+         "src/nvs_handle_locked.cpp"
+         "src/nvs_partition.cpp"
+         "src/nvs_partition_lookup.cpp"
+         "src/nvs_partition_manager.cpp"
+         "src/nvs_types.cpp")
 
-register_component()
+set(public_req spi_flash)
+
+set(include_dirs "include")
+
+idf_component_register(SRCS "${srcs}"
+                    REQUIRES "${public_req}"
+                    INCLUDE_DIRS "${include_dirs}")
+
+# If we use the linux target, we need to redirect the crc functions to the linux
+if(${target} STREQUAL "linux")
+    if(CONFIG_NVS_ENCRYPTION)
+        # mbedtls isn't configured for building with linux or as mock target. It will draw in all kind of dependencies
+        message(FATAL_ERROR "NVS currently doesn't support encryption if built for Linux.")
+    endif()
+    idf_component_get_property(spi_flash_dir spi_flash COMPONENT_DIR)
+    target_include_directories(${COMPONENT_LIB} PUBLIC
+            "${CMAKE_CURRENT_SOURCE_DIR}/mock/int"
+            "${spi_flash_dir}/sim/stubs/freertos/include")
+    target_sources(${COMPONENT_LIB} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/mock/int/crc.cpp")
+    target_compile_options(${COMPONENT_LIB} PUBLIC "-DLINUX_TARGET")
+else()
+    # TODO: this is a workaround until IDF-2085 is fixed
+    idf_component_get_property(mbedtls_lib mbedtls COMPONENT_LIB)
+    target_link_libraries(${COMPONENT_LIB} PUBLIC ${mbedtls_lib})
+endif()
+
+if(CONFIG_NVS_ENCRYPTION)
+    target_sources(${COMPONENT_LIB} PRIVATE "src/nvs_encrypted_partition.cpp")
+    idf_component_get_property(mbedtls_lib mbedtls COMPONENT_LIB)
+    target_link_libraries(${COMPONENT_LIB} PUBLIC ${mbedtls_lib})
+endif()
+
+if(${target} STREQUAL "linux")
+    target_compile_options(${COMPONENT_LIB} PUBLIC --coverage)
+    target_link_libraries(${COMPONENT_LIB} PUBLIC --coverage)
+endif()