Merge pull request arduino#37 from bcmi-labs/fix_ethernet_client

Fix ethernet client

boards.txt

@@ -24,8 +24,8 @@ portenta_h33.upload_port.1.pid=0x0368
 
 portenta_h33.compiler.fsp.defines={build.variant.path}/defines.txt
 portenta_h33.compiler.fsp.ldflags={build.variant.path}/ldflags.txt
-portenta_h33.compiler.fsp.cflags=-mthumb -D_RA_CORE=CM33 -D_RENESAS_RA_ -DAGT_PIN_FOR_25MHZ=BSP_IO_PORT_06_PIN_00 -DAGT_TIMER_FOR_25MHZ=3
-portenta_h33.compiler.fsp.cxxflags=-mthumb -D_RA_CORE=CM33 -D_RENESAS_RA_ -DAGT_PIN_FOR_25MHZ=BSP_IO_PORT_06_PIN_00 -DAGT_TIMER_FOR_25MHZ=3
+portenta_h33.compiler.fsp.cflags=-mthumb @{compiler.fsp.defines}
+portenta_h33.compiler.fsp.cxxflags=-mthumb @{compiler.fsp.defines}
 portenta_h33.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
 portenta_h33.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
 portenta_h33.compiler.fsp.includes={build.variant.path}/includes.txt
@@ -72,8 +72,8 @@ santiago.upload_port.1.pid=0x0369
 
 santiago.compiler.fsp.defines={build.variant.path}/defines.txt
 santiago.compiler.fsp.ldflags={build.variant.path}/ldflags.txt
-santiago.compiler.fsp.cflags=-mthumb -D_RA_CORE=CM4 -D_RENESAS_RA_
-santiago.compiler.fsp.cxxflags=-mthumb -D_RA_CORE=CM4 -D_RENESAS_RA_
+santiago.compiler.fsp.cflags=-mthumb @{compiler.fsp.defines}
+santiago.compiler.fsp.cxxflags=-mthumb @{compiler.fsp.defines}
 santiago.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
 santiago.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
 santiago.compiler.fsp.includes={build.variant.path}/includes.txt

cores/arduino/FifoBuffer.h

@@ -23,6 +23,7 @@
 
 #include <stdint.h>
 #include <string.h>
+#include <Arduino.h>
 
 namespace arduino {
 

libraries/Ethernet/examples/AdvancedChatServer/AdvancedChatServer.ino

@@ -19,7 +19,6 @@
 
  */
 
-#include <lwIP_Arduino.h>
 #include <EthernetRA.h>
 
 // Enter an IP address for your controller below.

libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.ino

@@ -24,7 +24,6 @@
  by sstaub
  */
 
-#include <lwIP_Arduino.h>
 #include <EthernetRA.h>
 // the sensor communicates using SPI, so include the library:
 #include <SPI.h>

libraries/Ethernet/examples/ChatServer/ChatServer.ino

@@ -15,7 +15,6 @@
  by sstaub
  */
 
-#include <lwIP_Arduino.h>
 #include <EthernetRA.h>
 
 // Enter an IP address for your controller below.

libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.ino

@@ -15,7 +15,6 @@
   by sstaub
 */
 
-#include <lwIP_Arduino.h>
 #include <EthernetRA.h>
 
 

libraries/Ethernet/examples/DhcpChatServer/DhcpChatServer.ino

@@ -19,7 +19,6 @@
  by sstaub
  */
 
-#include <lwIP_Arduino.h>
 #include <EthernetRA.h>
 
 // Enter an IP address for your controller below.

libraries/Ethernet/examples/TelnetClient/TelnetClient.ino

@@ -19,7 +19,6 @@
  by sstaub
  */
 
-#include <lwIP_Arduino.h>
 #include <EthernetRA.h>
 
 // Enter an IP address for your controller below.
@@ -37,7 +36,11 @@ EthernetClient client;
 
 void setup() {
   // start the Ethernet connection:
-  Ethernet.begin(ip);
+  if (Ethernet.begin() == 0) {
+    Serial.println("Failed to configure Ethernet using DHCP");
+    // try to configure using IP address instead of DHCP:
+    Ethernet.begin(ip);
+  }
   // Open serial communications and wait for port to open:
   Serial.begin(9600);
   while (!Serial) {

libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.ino

@@ -15,7 +15,6 @@
  This code is in the public domain.
  */
 
-#include <lwIP_Arduino.h>
 #include <EthernetRA.h>
 #include <EthernetUdp.h>         // UDP library from: bjoern@cs.stanford.edu 12/30/2008
 
@@ -35,7 +34,11 @@ EthernetUDP Udp;
 
 void setup() {
   // start the Ethernet and UDP:
-  Ethernet.begin(ip);
+  Eif (Ethernet.begin() == 0) {
+    Serial.println("Failed to configure Ethernet using DHCP");
+    // try to configure using IP address instead of DHCP:
+    Ethernet.begin(ip);
+  }
   Udp.begin(localPort);
 
   Serial.begin(9600);

libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.ino

@@ -21,7 +21,6 @@
 
  */
 
-#include <lwIP_Arduino.h>
 #include <EthernetRA.h>
 #include <EthernetUdp.h>
 

libraries/Ethernet/examples/WebClient/WebClient.ino

@@ -13,7 +13,6 @@
  by sstaub
  */
 
-#include <lwIP_Arduino.h>
 #include <EthernetRA.h>
 
 // if you don't want to use DNS (and reduce your sketch size)

libraries/Ethernet/examples/WebClientRepeating/WebClientRepeating.ino

@@ -19,7 +19,6 @@
 
  */
 
-#include <lwIP_Arduino.h>
 #include <EthernetRA.h>
 
 // fill in an available IP address on your network here,

libraries/Ethernet/examples/WebServer/WebServer.ino

@@ -18,7 +18,6 @@
  by sstaub
  */
 
-#include <lwIP_Arduino.h>
 #include <EthernetRA.h>
 
 // Enter an IP address for your controller below.
@@ -37,9 +36,12 @@ void setup() {
     ; // wait for serial port to connect. Needed for native USB port only
   }
 
-
   // start the Ethernet connection and the server:
-  Ethernet.begin(ip);
+  if (Ethernet.begin() == 0) {
+    Serial.println("Failed to configure Ethernet using DHCP");
+    // try to configure using IP address instead of DHCP:
+    Ethernet.begin(ip);
+  }
   server.begin();
   Serial.print("server is at ");
   Serial.println(Ethernet.localIP());

libraries/Ethernet/library.properties

@@ -8,3 +8,5 @@ category=Communication
 url=https://github.com/arduino/ArduinoCore-renesas/tree/master/libraries/Ethernet
 architectures=renesas
 includes=EthernetRA.h
+precompiled=true
+ldflags=-llwIP

libraries/Ethernet/src/EthernetClient.cpp

@@ -39,7 +39,7 @@ int EthernetClient::connect(const char *host, uint16_t port)
   if (ret == 1) {
     return connect(remote_addr, port);
   } else {
-    return ret;
+    return 0;
   }
 }
 

libraries/Ethernet/src/arch/ethernetDriver.cpp

@@ -16,7 +16,7 @@ typedef enum {
 
 
 
-#define ETHERNET_DEBUG_ENABLED 1
+#define ETHERNET_DEBUG_ENABLED 0
 
 class EthernetDriver {
 public:

libraries/Ethernet/src/lwip/include/compat/posix/arpa/inet.h

@@ -0,0 +1,33 @@
+/**
+ * @file
+ * This file is a posix wrapper for lwip/sockets.h.
+ */
+
+/*
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ */
+
+#include "lwip/sockets.h"

libraries/Ethernet/src/lwip/include/compat/posix/net/if.h

@@ -0,0 +1,36 @@
+/**
+ * @file
+ * This file is a posix wrapper for lwip/if_api.h.
+ */
+
+/*
+ * Copyright (c) 2017 Joel Cunningham, Garmin International, Inc. <joel.cunningham@garmin.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ */
+
+#include "lwip/if_api.h"

libraries/Ethernet/src/lwip/include/compat/posix/netdb.h

@@ -0,0 +1,33 @@
+/**
+ * @file
+ * This file is a posix wrapper for lwip/netdb.h.
+ */
+
+/*
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ */
+
+#include "lwip/netdb.h"

libraries/Ethernet/src/lwip/include/compat/posix/sys/socket.h

@@ -0,0 +1,33 @@
+/**
+ * @file
+ * This file is a posix wrapper for lwip/sockets.h.
+ */
+
+/*
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ */
+
+#include "lwip/sockets.h"

libraries/Ethernet/src/lwip/include/compat/stdc/errno.h

@@ -0,0 +1,33 @@
+/**
+ * @file
+ * This file is a posix/stdc wrapper for lwip/errno.h.
+ */
+
+/*
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ */
+
+#include "lwip/errno.h"