Merge branch 'nosizeconf' of github.com:d-a-v/Arduino into nosizeconf

d-a-v · d-a-v · commit 855dd3421ec9 · 2019-11-24T00:53:24.000+01:00
diff --git a/cores/esp8266/Updater.cpp b/cores/esp8266/Updater.cpp
@@ -22,7 +22,7 @@ extern "C" {
     #include "user_interface.h"
 }
 
-#include "flash_hal.h"
+#include <flash_hal.h>
 
 UpdaterClass::UpdaterClass()
 : _async(false)
diff --git a/cores/esp8266/spiffs_api.h b/cores/esp8266/spiffs_api.h
@@ -35,7 +35,7 @@ extern "C" {
 };
 #include "debug.h"
 #include "flash_utils.h"
-#include "flash_hal.h"
+#include <flash_hal.h>
 
 using namespace fs;
 
diff --git a/tests/host/common/flash_hal.h b/tests/host/common/flash_hal.h
@@ -0,0 +1,29 @@
+#ifndef flash_hal_mock_h
+#define flash_hal_mock_h
+
+#include <stdint.h>
+
+#define FLASH_HAL_OK          (0)
+#define FLASH_HAL_READ_ERROR  (-1)
+#define FLASH_HAL_WRITE_ERROR (-2)
+#define FLASH_HAL_ERASE_ERROR (-3)
+
+#define FS_start 0
+#define FS_end 0
+
+extern "C"
+{
+
+extern uint32_t s_phys_addr;
+extern uint32_t s_phys_size;
+extern uint32_t s_phys_page;
+extern uint32_t s_phys_block;
+extern uint8_t* s_phys_data;
+
+extern int32_t flash_hal_read(uint32_t addr, uint32_t size, uint8_t *dst);
+extern int32_t flash_hal_write(uint32_t addr, uint32_t size, const uint8_t *src);
+extern int32_t flash_hal_erase(uint32_t addr, uint32_t size);
+
+}
+
+#endif
diff --git a/tests/host/common/flash_hal_mock.cpp b/tests/host/common/flash_hal_mock.cpp
@@ -3,6 +3,8 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "flash_hal.h"
+
 extern "C"
 {
     uint32_t s_phys_addr = 0;
diff --git a/tests/host/common/flash_hal_mock.h b/tests/host/common/flash_hal_mock.h
diff --git a/tests/host/common/littlefs_mock.cpp b/tests/host/common/littlefs_mock.cpp
@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include "flash_hal_mock.h"
+#include <flash_hal.h>
 
 #define LITTLEFS_FILE_NAME "littlefs.bin"
 
diff --git a/tests/host/common/littlefs_mock.h b/tests/host/common/littlefs_mock.h
@@ -23,7 +23,7 @@
 #include <stddef.h>
 #include <vector>
 #include <FS.h>
-#include "flash_hal_mock.h"
+#include <flash_hal.h>
 
 #define DEFAULT_LITTLEFS_FILE_NAME "littlefs.bin"
 
diff --git a/tests/host/common/spiffs_mock.cpp b/tests/host/common/spiffs_mock.cpp
@@ -27,7 +27,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "flash_hal_mock.h"
+#include <flash_hal.h>
 
 #define SPIFFS_FILE_NAME "spiffs.bin"
 
diff --git a/tests/host/common/spiffs_mock.h b/tests/host/common/spiffs_mock.h
@@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <vector>
 #include <FS.h>
-#include "flash_hal_mock.h"
+#include <flash_hal.h>
 
 #define DEFAULT_SPIFFS_FILE_NAME "spiffs.bin"
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ extern "C" {`
`22`	`22`	`#include "user_interface.h"`
`23`	`23`	`}`
`24`	`24`
`25`		`-#include "flash_hal.h"`
	`25`	`+#include <flash_hal.h>`
`26`	`26`
`27`	`27`	`UpdaterClass::UpdaterClass()`
`28`	`28`	`: _async(false)`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`#include <stdint.h>`
`4`	`4`	`#include <string.h>`
`5`	`5`
	`6`	`+#include "flash_hal.h"`
	`7`	`+`
`6`	`8`	`extern "C"`
`7`	`9`	`{`
`8`	`10`	`uint32_t s_phys_addr = 0;`