Merge branch 'master' into unaligned

Author: earlephilhower

.travis.yml

@@ -65,6 +65,17 @@ jobs:
       env:
         - BUILD_PARITY=odd
 
+    - name: "Build lwIP-v1.4 (1)"
+      stage: build
+      script: $TRAVIS_BUILD_DIR/tests/build1.sh
+      env:
+        - BUILD_PARITY=even
+    - name: "Build lwIP-v1.4 (2)"
+      stage: build
+      script: $TRAVIS_BUILD_DIR/tests/build1.sh
+      env:
+        - BUILD_PARITY=odd
+
     - name: "Host tests"
       stage: build
       script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh

cores/esp8266/IPAddress.h

@@ -35,9 +35,12 @@
 #define IP_IS_V4_VAL(x) (1)
 #define IP_SET_TYPE_VAL(x,y) do { (void)0; } while (0)
 #define IP_ANY_TYPE (&ip_addr_any)
+#define IP4_ADDR_ANY IPADDR_ANY
 #define IP4_ADDR_ANY4 IPADDR_ANY
 #define IPADDR4_INIT(x) { x }
 #define CONST /* nothing: lwIP-v1 does not use const */
+#define ip4_addr_netcmp ip_addr_netcmp
+#define netif_dhcp_data(netif) ((netif)->dhcp)
 #else // lwIP-v2+
 #define CONST const
 #if !LWIP_IPV6
@@ -84,13 +87,15 @@ class IPAddress: public Printable {
 
         // Overloaded cast operator to allow IPAddress objects to be used where a pointer
         // to a four-byte uint8_t array is expected
-        operator uint32_t() const {
-            return isV4()? v4(): (uint32_t)0;
-        }
+        operator uint32_t() const { return isV4()? v4(): (uint32_t)0; }
+        operator uint32_t()       { return isV4()? v4(): (uint32_t)0; }
+        operator u32_t()    const { return isV4()? v4():    (u32_t)0; }
+        operator u32_t()          { return isV4()? v4():    (u32_t)0; }
 
-        // the above uint32_t() cast can be ambiguous
-        // if gcc complains, use instead isSet() or v4() according to what's relevant
         bool isSet () const;
+        operator bool () const { return isSet(); } // <-
+        operator bool ()       { return isSet(); } // <- both are needed
+
         // generic IPv4 wrapper to uint32-view like arduino loves to see it
         const u32_t& v4() const { return ip_2_ip4(&_ip)->addr; } // for raw_address(const)
               u32_t& v4()       { return ip_2_ip4(&_ip)->addr; }
@@ -115,6 +120,10 @@ class IPAddress: public Printable {
         }
         bool operator==(const uint8_t* addr) const;
 
+        int operator>>(int n) const {
+            return isV4()? v4() >> n: 0;
+        }
+
         // Overloaded index operator to allow getting and setting individual octets of the address
         uint8_t operator[](int index) const {
             return isV4()? *(raw_address() + index): 0;
@@ -152,6 +161,9 @@ class IPAddress: public Printable {
         IPAddress(const ipv4_addr& fw_addr)   { setV4(); v4() = fw_addr.addr; }
         IPAddress(const ipv4_addr* fw_addr)   { setV4(); v4() = fw_addr->addr; }
 
+        IPAddress& operator=(const ipv4_addr& fw_addr)   { setV4(); v4() = fw_addr.addr;  return *this; }
+        IPAddress& operator=(const ipv4_addr* fw_addr)   { setV4(); v4() = fw_addr->addr; return *this; }
+
         operator       ip_addr_t () const { return  _ip; }
         operator const ip_addr_t*() const { return &_ip; }
         operator       ip_addr_t*()       { return &_ip; }
@@ -166,6 +178,9 @@ class IPAddress: public Printable {
         IPAddress(const ip_addr_t& lwip_addr) { ip_addr_copy(_ip, lwip_addr); }
         IPAddress(const ip_addr_t* lwip_addr) { ip_addr_copy(_ip, *lwip_addr); }
 
+        IPAddress& operator=(const ip_addr_t& lwip_addr) { ip_addr_copy(_ip, lwip_addr); return *this; }
+        IPAddress& operator=(const ip_addr_t* lwip_addr) { ip_addr_copy(_ip, *lwip_addr); return *this; }
+
         uint16_t* raw6()
         {
             setV6();

cores/esp8266/gdb_hooks.c

@@ -25,12 +25,18 @@
    value is in register, it doesn't hurt to return a bool, so that the
    same stub can be used for gdb_present. */
 
-bool ICACHE_RAM_ATTR __gdb_no_op()
+static bool ICACHE_RAM_ATTR __gdb_no_op()
 {
     return false;
 }
 
-extern void gdb_init(void) __attribute__ ((weak, alias("__gdb_no_op")));
-extern void gdb_do_break(void) __attribute__ ((weak, alias("__gdb_no_op")));
-extern bool gdb_present(void) __attribute__ ((weak, alias("__gdb_no_op")));
+void gdb_init(void) __attribute__ ((weak, alias("__gdb_no_op")));
+void gdb_do_break(void) __attribute__ ((weak, alias("__gdb_no_op")));
+bool gdb_present(void) __attribute__ ((weak, alias("__gdb_no_op")));
+bool gdbstub_has_putc1_control(void) __attribute__ ((weak, alias("__gdb_no_op")));
+void gdbstub_set_putc1_callback(void (*func)(char)) __attribute__ ((weak, alias("__gdb_no_op")));
+bool gdbstub_has_uart_isr_control(void) __attribute__ ((weak, alias("__gdb_no_op")));
+void gdbstub_set_uart_isr_callback(void (*func)(void*, uint8_t), void* arg) __attribute__ ((weak, alias("__gdb_no_op")));
+void gdbstub_write_char(char c) __attribute__ ((weak, alias("__gdb_no_op")));
+void gdbstub_write(const char* buf, size_t size) __attribute__ ((weak, alias("__gdb_no_op")));
 

cores/esp8266/gdb_hooks.h

@@ -52,6 +52,71 @@ void gdb_do_break(void);
  */
 bool gdb_present(void);
 
+// If gdbstub has these set true, then we will disable our own
+// usage of them, but use gdbstub's callbacks for them instead
+/**
+ * @brief Check if GDB is installing a putc1 callback.
+ * 
+ * By default, this function returns false. When GDBStub library is linked,
+ * this function is overriden and returns true.
+ * 
+ * @return true if GDB is installing a putc1 callback
+ */
+bool gdbstub_has_putc1_control(void);
+
+/**
+ * @brief Register a putc1 callback with GDB.
+ * @param func function GDB will proxy putc1 data to
+ * 
+ * By default, this function is a no-op. When GDBStub library is linked,
+ * this function is overriden and sets GDB stub's secondary putc1 callback to
+ * func. When GDB stub is linked, but a GDB session is not current attached,
+ * then GDB stub will pass putc1 chars directly to this function.
+ */
+void gdbstub_set_putc1_callback(void (*func)(char));
+
+/**
+ * @brief Check if GDB is installing a uart0 isr callback.
+ * 
+ * By default, this function returns false. When GDBStub library is linked,
+ * this function is overriden and returns true.
+ * 
+ * @return true if GDB is installing a uart0 isr callback
+ */
+bool gdbstub_has_uart_isr_control(void);
+
+/**
+ * @brief Register a uart0 isr callback with GDB.
+ * @param func function GDB will proxy uart0 isr data to
+ * 
+ * By default, this function is a no-op. When GDBStub library is linked,
+ * this function is overriden and sets GDB stub's secondary uart0 isr callback
+ * to func. When GDB stub is linked, but a GDB session is not current attached,
+ * then GDB stub will pass uart0 isr data back to this function.
+ */
+void gdbstub_set_uart_isr_callback(void (*func)(void*, uint8_t), void* arg);
+
+/**
+ * @brief Write a character for output to a GDB session on uart0.
+ * @param c character to write
+ * 
+ * By default, this function is a no-op. When GDBStub library is linked,
+ * this function is overriden and writes a char to either the GDB session on
+ * uart0 or directly to uart0 if not GDB session is attached.
+ */
+void gdbstub_write_char(char c);
+
+/**
+ * @brief Write a char buffer for output to a GDB session on uart0.
+ * @param buf buffer of data to write
+ * @param size length of buffer
+ * 
+ * By default, this function is a no-op. When GDBStub library is linked,
+ * this function is overriden and writes a buffer to either the GDB session on
+ * uart0 or directly to uart0 if not GDB session is attached.
+ */
+void gdbstub_write(const char* buf, size_t size);
+
 #ifdef __cplusplus
 }
 #endif

cores/esp8266/spiffs_api.h

@@ -154,6 +154,9 @@ class SPIFFSImpl : public FSImpl
             return;
         }
         SPIFFS_unmount(&_fs);
+        _workBuf.reset(nullptr);
+        _fdsBuf.reset(nullptr);
+        _cacheBuf.reset(nullptr);
     }
 
     bool format() override