From: Anton Maklakov <anton@espressif.com>
Date: Thu, 1 Aug 2019 04:23:41 +0000 (+0700)
Subject: Fix a build issue with replacing init_spi_flash() in the host tests
X-Git-Tag: v4.1-dev~31^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec94ee80f72aacd2c078e6ce13c5355a8cf6c461;p=esp-idf

Fix a build issue with replacing init_spi_flash() in the host tests
---

diff --git a/components/fatfs/test_fatfs_host/Makefile b/components/fatfs/test_fatfs_host/Makefile
index 4c43e16aab..3d17e5ac1a 100644
--- a/components/fatfs/test_fatfs_host/Makefile
+++ b/components/fatfs/test_fatfs_host/Makefile
@@ -81,7 +81,6 @@ $(foreach cxxfile, $(CPPFILES), $(eval $(call COMPILE_CPP, $(cxxfile))))
 TEST_SOURCE_FILES = \
 	test_fatfs.cpp \
 	main.cpp \
-	test_utils.c
 
 TEST_OBJ_FILES = $(filter %.o, $(TEST_SOURCE_FILES:.cpp=.o) $(TEST_SOURCE_FILES:.c=.o))
 
diff --git a/components/fatfs/test_fatfs_host/test_fatfs.cpp b/components/fatfs/test_fatfs_host/test_fatfs.cpp
index fcbbe55945..d1f7119e61 100644
--- a/components/fatfs/test_fatfs_host/test_fatfs.cpp
+++ b/components/fatfs/test_fatfs_host/test_fatfs.cpp
@@ -9,11 +9,11 @@
 
 #include "catch.hpp"
 
-extern "C" void init_spi_flash(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
+extern "C" void _spi_flash_init(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
 
 TEST_CASE("create volume, open file, write and read back data", "[fatfs]")
 {
-    init_spi_flash(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
+    _spi_flash_init(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
 
     FRESULT fr_result;
     BYTE pdrv;
diff --git a/components/fatfs/test_fatfs_host/test_utils.c b/components/fatfs/test_fatfs_host/test_utils.c
deleted file mode 100644
index 3e4b05758a..0000000000
--- a/components/fatfs/test_fatfs_host/test_utils.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "esp_spi_flash.h"
-#include "esp_partition.h"
-
-void init_spi_flash(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin)
-{
-    spi_flash_init(chip_size, block_size, sector_size, page_size, partition_bin);
-}
diff --git a/components/spi_flash/sim/flash_mock_util.c b/components/spi_flash/sim/flash_mock_util.c
index 770600e642..2db51c58ae 100644
--- a/components/spi_flash/sim/flash_mock_util.c
+++ b/components/spi_flash/sim/flash_mock_util.c
@@ -4,13 +4,6 @@
 #include "esp_err.h"
 #include "esp32/rom/spi_flash.h"
 
-extern void _spi_flash_init(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
-
-void spi_flash_init(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin)
-{
-    _spi_flash_init(chip_size, block_size, sector_size, page_size, partition_bin);
-}
-
 bool spi_flash_check_and_flush_cache(size_t start_addr, size_t length)
 {
     return true;
diff --git a/components/spi_flash/sim/stubs/freertos/include/freertos/FreeRTOS.h b/components/spi_flash/sim/stubs/freertos/include/freertos/FreeRTOS.h
index 9abd0dd8ba..5bafa772df 100644
--- a/components/spi_flash/sim/stubs/freertos/include/freertos/FreeRTOS.h
+++ b/components/spi_flash/sim/stubs/freertos/include/freertos/FreeRTOS.h
@@ -2,7 +2,3 @@
 
 #include "projdefs.h"
 #include "semphr.h"
-
-// Avoid redefinition compile error. Put here since this is included
-// in flash_ops.c.
-#define spi_flash_init()                     overriden_spi_flash_init()
diff --git a/components/spiffs/test_spiffs_host/Makefile b/components/spiffs/test_spiffs_host/Makefile
index 4d016f7b4d..15b327acf1 100644
--- a/components/spiffs/test_spiffs_host/Makefile
+++ b/components/spiffs/test_spiffs_host/Makefile
@@ -79,7 +79,6 @@ $(foreach cxxfile, $(CPPFILES), $(eval $(call COMPILE_CPP, $(cxxfile))))
 TEST_SOURCE_FILES = \
 	test_spiffs.cpp \
 	main.cpp \
-	test_utils.c
 
 TEST_OBJ_FILES = $(filter %.o, $(TEST_SOURCE_FILES:.cpp=.o) $(TEST_SOURCE_FILES:.c=.o))
 
diff --git a/components/spiffs/test_spiffs_host/test_spiffs.cpp b/components/spiffs/test_spiffs_host/test_spiffs.cpp
index a523f06a73..868ce45809 100644
--- a/components/spiffs/test_spiffs_host/test_spiffs.cpp
+++ b/components/spiffs/test_spiffs_host/test_spiffs.cpp
@@ -12,7 +12,7 @@
 
 #include "catch.hpp"
 
-extern "C" void init_spi_flash(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
+extern "C" void _spi_flash_init(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
 
 static void init_spiffs(spiffs *fs, uint32_t max_files)
 {
@@ -152,7 +152,7 @@ static void check_spiffs_files(spiffs *fs, const char *base_path, char* cur_path
 
 TEST_CASE("format disk, open file, write and read file", "[spiffs]")
 {
-    init_spi_flash(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
+    _spi_flash_init(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
 
     spiffs fs;
     s32_t spiffs_res;
@@ -204,7 +204,7 @@ TEST_CASE("format disk, open file, write and read file", "[spiffs]")
 
 TEST_CASE("can read spiffs image", "[spiffs]")
 {
-    init_spi_flash(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
+    _spi_flash_init(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
 
     spiffs fs;
     s32_t spiffs_res;
diff --git a/components/spiffs/test_spiffs_host/test_utils.c b/components/spiffs/test_spiffs_host/test_utils.c
deleted file mode 100644
index 3e4b05758a..0000000000
--- a/components/spiffs/test_spiffs_host/test_utils.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "esp_spi_flash.h"
-#include "esp_partition.h"
-
-void init_spi_flash(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin)
-{
-    spi_flash_init(chip_size, block_size, sector_size, page_size, partition_bin);
-}
diff --git a/components/wear_levelling/test_wl_host/Makefile b/components/wear_levelling/test_wl_host/Makefile
index 5d94990cc2..40e517445a 100644
--- a/components/wear_levelling/test_wl_host/Makefile
+++ b/components/wear_levelling/test_wl_host/Makefile
@@ -80,7 +80,6 @@ $(foreach cxxfile, $(CPPFILES), $(eval $(call COMPILE_CPP, $(cxxfile))))
 TEST_SOURCE_FILES = \
 	test_wl.cpp \
 	main.cpp \
-	test_utils.c
 
 TEST_OBJ_FILES = $(filter %.o, $(TEST_SOURCE_FILES:.cpp=.o) $(TEST_SOURCE_FILES:.c=.o))
 
diff --git a/components/wear_levelling/test_wl_host/test_utils.c b/components/wear_levelling/test_wl_host/test_utils.c
deleted file mode 100644
index 3e4b05758a..0000000000
--- a/components/wear_levelling/test_wl_host/test_utils.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "esp_spi_flash.h"
-#include "esp_partition.h"
-
-void init_spi_flash(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin)
-{
-    spi_flash_init(chip_size, block_size, sector_size, page_size, partition_bin);
-}
diff --git a/components/wear_levelling/test_wl_host/test_wl.cpp b/components/wear_levelling/test_wl_host/test_wl.cpp
index 2589024391..32993876ca 100644
--- a/components/wear_levelling/test_wl_host/test_wl.cpp
+++ b/components/wear_levelling/test_wl_host/test_wl.cpp
@@ -12,14 +12,14 @@
 
 #include "sdkconfig.h"
 
-extern "C" void init_spi_flash(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
+extern "C" void _spi_flash_init(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
 extern SpiFlash spiflash;
 
 #define TEST_COUNT_MAX 100
 
 TEST_CASE("write and read back data", "[wear_levelling]")
 {
-    init_spi_flash(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
+    _spi_flash_init(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
 
     esp_err_t result;
     wl_handle_t wl_handle;
@@ -92,7 +92,7 @@ TEST_CASE("write and read back data", "[wear_levelling]")
 
 TEST_CASE("power down test", "[wear_levelling]")
 {
-    init_spi_flash(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
+    _spi_flash_init(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
 
     esp_err_t result;
     wl_handle_t wl_handle;