Add driver init to mg_mgr_init()

examples/arduino/w5500-http/mongoose_custom.h

@@ -10,6 +10,7 @@
 #define MG_ARCH MG_ARCH_CUSTOM
 #define MG_ENABLE_SOCKET 0
 #define MG_ENABLE_TCPIP 1
+#define MG_ENABLE_DRIVER_W5500 1
 #define mkdir(a, b) (-1)
 #define MG_IO_SIZE 128
 //#define MG_ENABLE_LOG 0

examples/arduino/w5500-mqtt/mongoose_custom.h

@@ -10,6 +10,7 @@
 #define MG_ARCH MG_ARCH_CUSTOM
 #define MG_ENABLE_SOCKET 0
 #define MG_ENABLE_TCPIP 1
+#define MG_ENABLE_DRIVER_W5500 1
 #define mkdir(a, b) (-1)
 #define MG_IO_SIZE 512
 //#define MG_ENABLE_LOG 0

examples/rp2040/pico-w5500/CMakeLists.txt

@@ -14,6 +14,7 @@ pico_enable_stdio_uart(firmware 1)   # to the UART, for remote testing
 
 # Mongoose build flags
 add_definitions(-DMG_ENABLE_TCPIP=1)
+add_definitions(-DMG_ENABLE_DRIVER_W5500=1)
 add_definitions(-DMG_ENABLE_PACKED_FS=1)
 add_definitions(-DMG_ENABLE_CUSTOM_RANDOM=1)
 add_definitions(-DMG_ENABLE_POSIX_FS=0)

mongoose.c

@@ -4851,6 +4851,11 @@ void mg_mgr_free(struct mg_mgr *mgr) {
   mg_tls_ctx_free(mgr);
 }
 
+
+#if MG_ENABLE_TCPIP && MG_ENABLE_TCPIP_DRIVER_INIT
+void mg_tcpip_auto_init(struct mg_mgr *);
+#endif
+
 void mg_mgr_init(struct mg_mgr *mgr) {
   memset(mgr, 0, sizeof(*mgr));
 #if MG_ENABLE_EPOLL
@@ -4869,6 +4874,8 @@ void mg_mgr_init(struct mg_mgr *mgr) {
   // Ignore SIGPIPE signal, so if client cancels the request, it
   // won't kill the whole process.
   signal(SIGPIPE, SIG_IGN);
+#elif MG_ENABLE_TCPIP && MG_ENABLE_TCPIP_DRIVER_INIT
+  mg_tcpip_auto_init(mgr);
 #endif
   mgr->pipe = MG_INVALID_SOCKET;
   mgr->dnstimeout = 3000;
@@ -6007,6 +6014,26 @@ bool mg_send(struct mg_connection *c, const void *buf, size_t len) {
   }
   return res;
 }
+
+#if MG_ENABLE_TCPIP_DRIVER_INIT
+void mg_tcpip_auto_init(struct mg_mgr *mgr);
+void mg_tcpip_auto_init(struct mg_mgr *mgr) {
+  MG_TCPIP_DRIVER_DATA      // static ... driver_data
+  struct mg_tcpip_if i = {  // let the compiler solve the macros at run time
+      .mac = MG_MAC_ADDRESS,
+      .ip = MG_TCPIP_IP,
+      .mask = MG_TCPIP_MASK,
+      .gw = MG_TCPIP_GW,
+      .driver = MG_TCPIP_DRIVER_CODE,
+      .driver_data = &driver_data,
+  };
+  static struct mg_tcpip_if mif;
+
+  mif = i;  // copy the initialized structure to a static to be exported
+  mg_tcpip_init(mgr, &mif);
+  MG_INFO(("Driver: " MG_TCPIP_DRIVER_NAME ", MAC: %M", mg_print_mac, mif.mac));
+}
+#endif
 #endif  // MG_ENABLE_TCPIP
 
 #ifdef MG_ENABLE_LINES
@@ -14939,7 +14966,8 @@ struct mg_tcpip_driver mg_tcpip_driver_ra = {mg_tcpip_driver_ra_init,
 #endif
 
 
-#if defined(MG_ENABLE_DRIVER_SAME54) && MG_ENABLE_DRIVER_SAME54
+#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_SAME54) && MG_ENABLE_DRIVER_SAME54
+
 #include <sam.h>
 
 #define ETH_PKT_SIZE 1536  // Max frame size
@@ -15942,7 +15970,7 @@ struct mg_tcpip_driver mg_tcpip_driver_tm4c = {mg_tcpip_driver_tm4c_init,
 #endif
 
 
-#if MG_ENABLE_TCPIP
+#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_W5500) && MG_ENABLE_DRIVER_W5500
 
 enum { W5500_CR = 0, W5500_S0 = 1, W5500_TX0 = 2, W5500_RX0 = 3 };
 

mongoose.h

@@ -833,6 +833,24 @@ struct timeval {
 #define MG_ENABLE_PROFILE 0
 #endif
 
+#ifndef MG_ENABLE_TCPIP_DRIVER_INIT    // mg_mgr_init() will also initialize
+#define MG_ENABLE_TCPIP_DRIVER_INIT 1  // enabled built-in driver for
+#endif                                 // Mongoose built-in network stack
+
+#ifndef MG_TCPIP_IP  // e.g. MG_IPV4(192, 168, 0, 223)
+#define MG_TCPIP_IP MG_IPV4(0, 0, 0, 0)  // or leave as 0 for DHCP
+#endif
+
+#ifndef MG_TCPIP_MASK
+#define MG_TCPIP_MASK MG_IPV4(255, 255, 255, 0)
+#endif
+
+#ifndef MG_TCPIP_GW
+#define MG_TCPIP_GW MG_IPV4(0, 0, 0, 1)
+#endif
+
+#define MG_MAC_ADDRESS_RANDOM { 0, 0, 0, 0, 0, 0 }
+
 
 
 
@@ -1060,6 +1078,8 @@ uint64_t mg_now(void);     // Return milliseconds since Epoch
   (((uint32_t) ((a) & 255) << 24) | ((uint32_t) ((b) & 255) << 16) | \
    ((uint32_t) ((c) & 255) << 8) | (uint32_t) ((d) & 255))
 
+#define MG_IPV4(a, b, c, d) mg_htonl(MG_U32(a, b, c, d))
+
 // For printing IPv4 addresses: printf("%d.%d.%d.%d\n", MG_IPADDR_PARTS(&ip))
 #define MG_U8P(ADDR) ((uint8_t *) (ADDR))
 #define MG_IPADDR_PARTS(ADDR) \
@@ -2858,8 +2878,19 @@ struct mg_profitem {
 #include "Driver_ETH_MAC.h"  // keep this include
 #include "Driver_ETH_PHY.h"  // keep this include
 
+#ifndef MG_MAC_ADDRESS
+#define MG_MAC_ADDRESS MG_MAC_ADDRESS_RANDOM
 #endif
 
+#define MG_TCPIP_DRIVER_DATA
+
+#define MG_TCPIP_DRIVER_CODE &mg_tcpip_driver_cmsis
+#define MG_TCPIP_DRIVER_NAME "cmsis"
+
+#endif
+
+
+#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_IMXRT) && MG_ENABLE_DRIVER_IMXRT
 
 struct mg_tcpip_driver_imxrt_data {
   // MDC clock divider. MDC clock is derived from IPS Bus clock (ipg_clk),
@@ -2878,6 +2909,31 @@ struct mg_tcpip_driver_imxrt_data {
   uint8_t phy_addr;  // PHY address
 };
 
+#ifndef MG_MAC_ADDRESS
+#define MG_MAC_ADDRESS MG_MAC_ADDRESS_RANDOM
+#endif
+
+#ifndef MG_TCPIP_PHY_ADDR
+#define MG_TCPIP_PHY_ADDR 2
+#endif
+
+#ifndef MG_DRIVER_MDC_CR
+#define MG_DRIVER_MDC_CR 24
+#endif
+
+#define MG_TCPIP_DRIVER_DATA                                \
+  static struct mg_tcpip_driver_imxrt_data driver_data = { \
+      .mdc_cr = MG_DRIVER_MDC_CR,                            \
+      .phy_addr = MG_TCPIP_PHY_ADDR,                        \
+  };
+
+#define MG_TCPIP_DRIVER_CODE &mg_tcpip_driver_imxrt
+#define MG_TCPIP_DRIVER_NAME "imxrt"
+
+#endif
+
+
+#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_RA) && MG_ENABLE_DRIVER_RA
 
 struct mg_tcpip_driver_ra_data {
   // MDC clock "divider". MDC clock is software generated,
@@ -2886,11 +2942,65 @@ struct mg_tcpip_driver_ra_data {
   uint8_t phy_addr;  // PHY address
 };
 
+#undef MG_ENABLE_TCPIP_DRIVER_INIT
+#define MG_ENABLE_TCPIP_DRIVER_INIT 0  // TODO(): needs SystemCoreClock
+#if 0
+#ifndef MG_MAC_ADDRESS
+#define MG_MAC_ADDRESS MG_MAC_ADDRESS_RANDOM
+#endif
+
+#ifndef MG_TCPIP_PHY_ADDR
+#define MG_TCPIP_PHY_ADDR 1
+#endif
+
+#ifndef MG_DRIVER_RA_CLOCK
+#define MG_DRIVER_RA_CLOCK
+#endif
+
+#ifndef MG_DRIVER_RA_IRQNO
+#define MG_DRIVER_RA_IRQNO 0
+#endif
+
+#define MG_TCPIP_DRIVER_DATA                                \
+  static struct mg_tcpip_driver_ra_data driver_data = { \
+      .clock = MG_DRIVER_RA_CLOCK,                            \
+      .irqno = MG_DRIVER_RA_CLOCK,                            \
+      .phy_addr = MG_TCPIP_PHY_ADDR,                        \
+  };
+
+#define MG_TCPIP_DRIVER_CODE &mg_tcpip_driver_ra
+#define MG_TCPIP_DRIVER_NAME "ra"
+#endif
+#endif
+
+
+#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_SAME54) && MG_ENABLE_DRIVER_SAME54
 
 struct mg_tcpip_driver_same54_data {
     int mdc_cr;
 };
 
+#ifndef MG_MAC_ADDRESS
+#define MG_MAC_ADDRESS MG_MAC_ADDRESS_RANDOM
+#endif
+
+#ifndef MG_DRIVER_MDC_CR
+#define MG_DRIVER_MDC_CR 5
+#endif
+
+#define MG_TCPIP_DRIVER_DATA                                \
+  static struct mg_tcpip_driver_same54_data driver_data = { \
+      .mdc_cr = MG_DRIVER_MDC_CR,                            \
+  };
+
+#define MG_TCPIP_DRIVER_CODE &mg_tcpip_driver_same54
+#define MG_TCPIP_DRIVER_NAME "same54"
+
+#endif
+
+
+#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_STM32F) && \
+    MG_ENABLE_DRIVER_STM32F
 
 struct mg_tcpip_driver_stm32f_data {
   // MDC clock divider. MDC clock is derived from HCLK, must not exceed 2.5MHz
@@ -2909,6 +3019,32 @@ struct mg_tcpip_driver_stm32f_data {
   uint8_t phy_addr;  // PHY address
 };
 
+#ifndef MG_MAC_ADDRESS
+#define MG_MAC_ADDRESS MG_MAC_ADDRESS_RANDOM
+#endif
+
+#ifndef MG_TCPIP_PHY_ADDR
+#define MG_TCPIP_PHY_ADDR 0
+#endif
+
+#ifndef MG_DRIVER_MDC_CR
+#define MG_DRIVER_MDC_CR 4
+#endif
+
+#define MG_TCPIP_DRIVER_DATA                                \
+  static struct mg_tcpip_driver_stm32f_data driver_data = { \
+      .mdc_cr = MG_DRIVER_MDC_CR,                            \
+      .phy_addr = MG_TCPIP_PHY_ADDR,                        \
+  };
+
+#define MG_TCPIP_DRIVER_CODE &mg_tcpip_driver_stm32f
+#define MG_TCPIP_DRIVER_NAME "stm32f"
+
+#endif
+
+
+#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_STM32H) && \
+    MG_ENABLE_DRIVER_STM32H
 
 struct mg_tcpip_driver_stm32h_data {
   // MDC clock divider. MDC clock is derived from HCLK, must not exceed 2.5MHz
@@ -2925,6 +3061,26 @@ struct mg_tcpip_driver_stm32h_data {
   int mdc_cr;  // Valid values: -1, 0, 1, 2, 3, 4, 5
 };
 
+#ifndef MG_MAC_ADDRESS
+#define MG_MAC_ADDRESS MG_MAC_ADDRESS_RANDOM
+#endif
+
+#ifndef MG_DRIVER_MDC_CR
+#define MG_DRIVER_MDC_CR 4
+#endif
+
+#define MG_TCPIP_DRIVER_DATA                                \
+  static struct mg_tcpip_driver_stm32h_data driver_data = { \
+      .mdc_cr = MG_DRIVER_MDC_CR,                            \
+  };
+
+#define MG_TCPIP_DRIVER_CODE &mg_tcpip_driver_stm32h
+#define MG_TCPIP_DRIVER_NAME "stm32h"
+
+#endif
+
+
+#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_TM4C) && MG_ENABLE_DRIVER_TM4C
 
 struct mg_tcpip_driver_tm4c_data {
   // MDC clock divider. MDC clock is derived from SYSCLK, must not exceed 2.5MHz
@@ -2939,6 +3095,33 @@ struct mg_tcpip_driver_tm4c_data {
   int mdc_cr;  // Valid values: -1, 0, 1, 2, 3
 };
 
+#ifndef MG_MAC_ADDRESS
+#define MG_MAC_ADDRESS MG_MAC_ADDRESS_RANDOM
+#endif
+
+#ifndef MG_DRIVER_MDC_CR
+#define MG_DRIVER_MDC_CR 1
+#endif
+
+#define MG_TCPIP_DRIVER_DATA                                \
+  static struct mg_tcpip_driver_tm4c_data driver_data = { \
+      .mdc_cr = MG_DRIVER_MDC_CR,                            \
+  };
+
+#define MG_TCPIP_DRIVER_CODE &mg_tcpip_driver_tm4c
+#define MG_TCPIP_DRIVER_NAME "tm4c"
+
+
+#endif
+
+
+#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_W5500) && MG_ENABLE_DRIVER_W5500
+
+#undef MG_ENABLE_TCPIP_DRIVER_INIT
+#define MG_ENABLE_TCPIP_DRIVER_INIT 0  // TODO(): needs SystemCoreClock
+
+#endif
+
 #ifdef __cplusplus
 }
 #endif

src/config.h

@@ -157,3 +157,21 @@
 #ifndef MG_ENABLE_PROFILE
 #define MG_ENABLE_PROFILE 0
 #endif
+
+#ifndef MG_ENABLE_TCPIP_DRIVER_INIT    // mg_mgr_init() will also initialize
+#define MG_ENABLE_TCPIP_DRIVER_INIT 1  // enabled built-in driver for
+#endif                                 // Mongoose built-in network stack
+
+#ifndef MG_TCPIP_IP  // e.g. MG_IPV4(192, 168, 0, 223)
+#define MG_TCPIP_IP MG_IPV4(0, 0, 0, 0)  // or leave as 0 for DHCP
+#endif
+
+#ifndef MG_TCPIP_MASK
+#define MG_TCPIP_MASK MG_IPV4(255, 255, 255, 0)
+#endif
+
+#ifndef MG_TCPIP_GW
+#define MG_TCPIP_GW MG_IPV4(0, 0, 0, 1)
+#endif
+
+#define MG_MAC_ADDRESS_RANDOM { 0, 0, 0, 0, 0, 0 }

src/drivers/cmsis.h

@@ -5,4 +5,13 @@
 #include "Driver_ETH_MAC.h"  // keep this include
 #include "Driver_ETH_PHY.h"  // keep this include
 
+#ifndef MG_MAC_ADDRESS
+#define MG_MAC_ADDRESS MG_MAC_ADDRESS_RANDOM
+#endif
+
+#define MG_TCPIP_DRIVER_DATA
+
+#define MG_TCPIP_DRIVER_CODE &mg_tcpip_driver_cmsis
+#define MG_TCPIP_DRIVER_NAME "cmsis"
+
 #endif

src/drivers/imxrt.c

@@ -1,4 +1,4 @@
-#include "tcpip.h"
+#include "net_builtin.h"
 
 #if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_IMXRT) && MG_ENABLE_DRIVER_IMXRT
 struct imxrt_enet {