Merge remote-tracking branch 'origin/master' into updater-fix-len-calc

Author: mcspr

cores/esp8266/esp8266_peri.h

@@ -255,7 +255,7 @@ extern volatile uint32_t* const esp8266_gpioToFn[16];
 //UART STATUS Registers Bits
 #define USTX    31 //TX PIN Level (Doesn't seem to work, always reads as 0 for both uarts. HW bug? Possible workaround: Enable loopback UxC0 |= 1<<UCLBE and read USRXD, see https://github.com/esp8266/Arduino/issues/7256 for discussion.)
 #define USRTS   30 //RTS PIN Level
-#define USDTR   39 //DTR PIN Level
+#define USDTR   29 //DTR PIN Level
 #define USTXC   16 //TX FIFO COUNT (8bit)
 #define USRXD   15 //RX PIN Level
 #define USCTS   14 //CTS PIN Level

tests/host/Makefile

@@ -374,9 +374,10 @@ ssl:							# download source and build BearSSL
 	cd ../../tools/sdk/ssl && $(MAKE) native$(N32)
 
 ULIBPATHS = $(shell echo $(ULIBDIRS) | sed 's,:, ,g')
-USERLIBDIRS = $(shell test -z "$(ULIBPATHS)" || for d in $(ULIBPATHS); do for dd in $$d $$d/src $$d/src/libmad; do test -d $$dd && { echo -I$$dd; echo "userlib: using directory '$$dd'" 1>&2; } done; done)
-USERLIBSRCS = $(shell test -z "$(ULIBPATHS)" || for d in $(ULIBPATHS); do for ss in $$d/*.cpp $$d/src/*.cpp $$d/src/libmad/*.c; do test -r $$ss && echo $$ss; done; done)
-INC_PATHS += $(USERLIBDIRS)
+USERLIBDIRS = $(shell test -z "$(ULIBPATHS)" || for d in $(ULIBPATHS); do for dd in $$d $$d/utility $$d/src $$d/src/utility; do test -d $$dd && echo $$dd; done; done)
+USERLIBSRCS := $(shell test -z "$(USERLIBDIRS)" || for d in $(USERLIBDIRS); do for ss in $$d/*.c $$d/*.cpp; do test -r $$ss && echo $$ss; done; done)
+USERLIBINCS = $(shell for d in $(USERLIBDIRS); do echo -I$$d; done)
+INC_PATHS += $(USERLIBINCS)
 INC_PATHS += -I$(INODIR)/..
 CPP_OBJECTS_CORE_EMU = $(CPP_SOURCES_CORE_EMU:.cpp=.cpp.o) $(USERLIBSRCS:.cpp=.cpp.o) $(USERCXXSOURCES:.cpp=.cpp.o)
 C_OBJECTS_CORE_EMU = $(USERCSOURCES:.c=.c.o)

tests/host/common/ArduinoMain.cpp

@@ -115,8 +115,14 @@ static int mock_stop_uart(void)
 
 static uint8_t mock_read_uart(void)
 {
-    uint8_t ch = 0;
-    return (read(STDIN, &ch, 1) == 1) ? ch : 0;
+    uint8_t ch  = 0;
+    int     ret = read(STDIN, &ch, 1);
+    if (ret == -1)
+    {
+        perror("read(STDIN,1)");
+        return 0;
+    }
+    return (ret == 1) ? ch : 0;
 }
 
 void help(const char* argv0, int exitcode)

tests/host/common/MockWiFiServerSocket.cpp

@@ -129,7 +129,7 @@ bool WiFiServer::hasClient()
 
 void WiFiServer::close()
 {
-    if (pcb2int(_listen_pcb) >= 0)
+    if (pcb2int(_listen_pcb) >= 3)  // 0=stdin 1=stdout 2=stderr
         ::close(pcb2int(_listen_pcb));
     _listen_pcb = int2pcb(-1);
 }

tests/host/sys/pgmspace.h

@@ -75,10 +75,12 @@ inline int vsnprintf_P(char* str, size_t size, const char* format, va_list ap)
 #define memmove_P memmove
 #define strncpy_P strncpy
 #define strcmp_P strcmp
+#define strcasecmp_P strcasecmp
 #define memccpy_P memccpy
 #define snprintf_P snprintf
 #define sprintf_P sprintf
 #define strncmp_P strncmp
+#define strncasecmp_P strncasecmp
 #define strcat_P strcat
 
 #endif

tools/platformio-build.py

@@ -59,7 +59,13 @@ def scons_patched_match_splitext(path, suffixes=None):
     gzip_switch = ["--gzip", "PIO"]
 
 env.Append(
-    ASFLAGS=["-x", "assembler-with-cpp"],
+    ASFLAGS=[
+        "-mlongcalls",
+        "-mtext-section-literals",
+    ],
+    ASPPFLAGS=[
+        "-x", "assembler-with-cpp",
+    ],
 
     # General options that are passed to the C compiler (C only; not C++)
     CFLAGS=[
@@ -78,7 +84,6 @@ def scons_patched_match_splitext(path, suffixes=None):
         "-mtext-section-literals",
         "-falign-functions=4",
         "-U__STRICT_ANSI__",
-        "-D_GNU_SOURCE",
         "-ffunction-sections",
         "-fdata-sections",
         "-Wall",
@@ -119,6 +124,7 @@ def scons_patched_match_splitext(path, suffixes=None):
         ("F_CPU", "$BOARD_F_CPU"),
         "__ets__",
         "ICACHE_FLASH",
+        "_GNU_SOURCE",
         ("ARDUINO", 10805),
         ("ARDUINO_BOARD", '\\"PLATFORMIO_%s\\"' % env.BoardConfig().id.upper()),
         "FLASHMODE_${BOARD_FLASH_MODE.upper()}",
@@ -166,9 +172,6 @@ def scons_patched_match_splitext(path, suffixes=None):
     )
 )
 
-# copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
-env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])
-
 flatten_cppdefines = env.Flatten(env['CPPDEFINES'])
 
 #