BAckport esp8266#7514 (part2)

Author: Jason2866

tests/host/common/MockEsp.cpp

@@ -159,7 +159,15 @@ FlashMode_t EspClass::magicFlashChipMode(uint8_t byte)
 	return FM_DOUT;
 }
 
-bool EspClass::flashWrite(uint32_t offset, uint32_t *data, size_t size)
+bool EspClass::flashWrite(uint32_t offset, const uint32_t *data, size_t size)
+{
+	(void)offset;
+	(void)data;
+	(void)size;
+	return true;
+}
+
+bool EspClass::flashWrite(uint32_t offset, const uint8_t *data, size_t size)
 {
 	(void)offset;
 	(void)data;
@@ -175,6 +183,14 @@ bool EspClass::flashRead(uint32_t offset, uint32_t *data, size_t size)
 	return true;
 }
 
+bool EspClass::flashRead(uint32_t offset, uint8_t *data, size_t size)
+{
+	(void)offset;
+	(void)data;
+	(void)size;
+	return true;
+}
+
 uint32_t EspClass::magicFlashChipSize(uint8_t byte) {
     switch(byte & 0x0F) {
         case 0x0: // 4 Mbit (512KB)
@@ -208,7 +224,7 @@ uint32_t EspClass::getFlashChipSize(void)
 
 String EspClass::getFullVersion ()
 {
-	return "host-emulation";
+	return "emulation-on-host";
 }
 
 uint32_t EspClass::getFreeContStack()
@@ -221,6 +237,11 @@ void EspClass::resetFreeContStack()
 }
 
 uint32_t EspClass::getCycleCount()
+{
+    return esp_get_cycle_count();
+}
+
+uint32_t esp_get_cycle_count()
 {
     timeval t;
     gettimeofday(&t, NULL);

tests/host/common/mock.h

@@ -30,42 +30,14 @@
 */
 
 #define CORE_MOCK 1
-
-// include host's STL before any other include file
-// because core definition like max() is in the way
-
-#ifdef __cplusplus
-#include <vector>
-#endif
-#include <stddef.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-//#include <stdlib_noniso.h>
-char* itoa (int val, char *s, int radix);
-char* ltoa (long val, char *s, int radix);
-#ifdef __cplusplus
-}
-#endif
-
-size_t strlcat(char *dst, const char *src, size_t size);
-size_t strlcpy(char *dst, const char *src, size_t size);
-
-// exotic typedefs used in the sdk
-
-#include <stdint.h>
-typedef uint8_t uint8;
-typedef uint32_t uint32;
+#define MOCK "(mock) " // TODO: provide common logging API instead of adding this string everywhere?
 
 //
 
 #define ARDUINO 267
 #define ESP8266 1
 #define A0 0
 #define LED_BUILTIN 0
-#define F_CPU 80000000
 #define LWIP_OPEN_SRC
 #define TCP_MSS 536
 #define LWIP_FEATURES 1
@@ -82,13 +54,38 @@ typedef uint32_t uint32;
 #define D7 7
 #define D8 8
 
-//
+#include <stddef.h>
 
-#include <Arduino.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+// TODO: #include <stdlib_noniso.h> ?
+char* itoa (int val, char *s, int radix);
+char* ltoa (long val, char *s, int radix);
+
+
+size_t strlcat(char *dst, const char *src, size_t size);
+size_t strlcpy(char *dst, const char *src, size_t size);
+
+#ifdef __cplusplus
+}
+#endif
+
+// exotic typedefs used in the sdk
+
+#include <stdint.h>
+typedef uint8_t uint8;
+typedef uint32_t uint32;
 
 //
 
-#include <stdlib.h>
+#include <c_types.h>
+#include <core_esp8266_features.h>
+
+uint32_t esp_get_cycle_count();
+
+#include <Arduino.h>
+
 #define RANDOM_REG32 ((uint32_t)random())
 
 // net tweak