diff --git a/mongoose.h b/mongoose.h index 8b47a98a..c2a30096 100644 --- a/mongoose.h +++ b/mongoose.h @@ -4842,7 +4842,6 @@ void mg_tcpip_arp_request(struct mg_tcpip_if *ifp, uint32_t ip, uint8_t *mac); // Built-in hardware drivers. Assign one to mg_tcpip_if.driver before calling // mg_tcpip_init(). Each driver also requires a corresponding driver_data // struct; see the matching driver header for details. -extern struct mg_tcpip_driver mg_tcpip_driver_stm32f; extern struct mg_tcpip_driver mg_tcpip_driver_w5500; extern struct mg_tcpip_driver mg_tcpip_driver_w5100; extern struct mg_tcpip_driver mg_tcpip_driver_tm4c; @@ -4867,6 +4866,7 @@ extern struct mg_tcpip_driver mg_tcpip_driver_netc; + // SPI bus abstraction for SPI-attached network chips (e.g. W5500). // Populate and assign to the driver's driver_data field. struct mg_tcpip_spi { @@ -5369,7 +5369,7 @@ struct mg_tcpip_driver_mcxw71_data { extern struct mg_tcpip_driver mg_tcpip_driver_mcxw71; -#define MG_TCPIP_DRIVER_MCXW71_INIT(manager) \ +#define MG_TCPIP_DRIVER_MCXW71_INIT(mgr) \ do { \ static struct mg_tcpip_driver_mcxw71_data driver_data_; \ static struct mg_tcpip_if mif_; \ @@ -5377,10 +5377,9 @@ extern struct mg_tcpip_driver mg_tcpip_driver_mcxw71; mif_.ip = MG_TCPIP_IP; \ mif_.mask = MG_TCPIP_MASK; \ mif_.gw = MG_TCPIP_GW; \ - mif_.mgr = (manager); \ mif_.driver = &mg_tcpip_driver_mcxw71; \ mif_.driver_data = &driver_data_; \ - mg_tcpip_init((manager), &mif_); \ + mg_tcpip_init((mgr), &mif_); \ MG_INFO(("Driver: mcxw71, MAC: %M", mg_print_mac, mif_.mac)); \ } while (0) @@ -5403,7 +5402,7 @@ struct mg_tcpip_driver_mg24_data { extern struct mg_tcpip_driver mg_tcpip_driver_mg24; -#define MG_TCPIP_DRIVER_MG24_INIT(manager) \ +#define MG_TCPIP_DRIVER_MG24_INIT(mgr) \ do { \ static struct mg_tcpip_driver_mg24_data driver_data_; \ static struct mg_tcpip_if mif_; \ @@ -5411,10 +5410,9 @@ extern struct mg_tcpip_driver mg_tcpip_driver_mg24; mif_.ip = MG_TCPIP_IP; \ mif_.mask = MG_TCPIP_MASK; \ mif_.gw = MG_TCPIP_GW; \ - mif_.mgr = (manager); \ mif_.driver = &mg_tcpip_driver_mg24; \ mif_.driver_data = &driver_data_; \ - mg_tcpip_init((manager), &mif_); \ + mg_tcpip_init((mgr), &mif_); \ MG_INFO(("Driver: mg24, MAC: %M", mg_print_mac, mif_.mac)); \ } while (0) @@ -5486,7 +5484,7 @@ struct mg_tcpip_driver_nrf52_data { extern struct mg_tcpip_driver mg_tcpip_driver_nrf52; -#define MG_TCPIP_DRIVER_NRF52_INIT(manager) \ +#define MG_TCPIP_DRIVER_NRF52_INIT(mgr) \ do { \ static struct mg_tcpip_driver_nrf52_data driver_data_; \ static struct mg_tcpip_if mif_; \ @@ -5494,10 +5492,9 @@ extern struct mg_tcpip_driver mg_tcpip_driver_nrf52; mif_.ip = MG_TCPIP_IP; \ mif_.mask = MG_TCPIP_MASK; \ mif_.gw = MG_TCPIP_GW; \ - mif_.mgr = (manager); \ mif_.driver = &mg_tcpip_driver_nrf52; \ mif_.driver_data = &driver_data_; \ - mg_tcpip_init((manager), &mif_); \ + mg_tcpip_init((mgr), &mif_); \ MG_INFO(("Driver: nrf52, MAC: %M", mg_print_mac, mif_.mac)); \ } while (0) @@ -5692,7 +5689,7 @@ struct mg_tcpip_driver_rw612w_data { extern struct mg_tcpip_driver mg_tcpip_driver_rw612w; -#define MG_TCPIP_DRIVER_RW612W_INIT(manager) \ +#define MG_TCPIP_DRIVER_RW612W_INIT(mgr) \ do { \ static struct mg_tcpip_driver_rw612w_data driver_data_; \ static struct mg_tcpip_if mif_; \ @@ -5700,10 +5697,9 @@ extern struct mg_tcpip_driver mg_tcpip_driver_rw612w; mif_.ip = MG_TCPIP_IP; \ mif_.mask = MG_TCPIP_MASK; \ mif_.gw = MG_TCPIP_GW; \ - mif_.mgr = (manager); \ mif_.driver = &mg_tcpip_driver_rw612w; \ mif_.driver_data = &driver_data_; \ - mg_tcpip_init((manager), &mif_); \ + mg_tcpip_init((mgr), &mif_); \ MG_INFO(("Driver: rw612w, MAC: %M", mg_print_mac, mif_.mac)); \ } while (0) @@ -5851,7 +5847,9 @@ struct mg_tcpip_driver_stm32f_data { #define MG_ENABLE_ETH_IRQ() #endif -#define MG_TCPIP_DRIVER_INIT(mgr) \ +extern struct mg_tcpip_driver mg_tcpip_driver_stm32f; + +#define MG_TCPIP_DRIVER_STM32F_INIT(mgr) \ do { \ static struct mg_tcpip_driver_stm32f_data driver_data_; \ static struct mg_tcpip_if mif_; \ @@ -5864,10 +5862,14 @@ struct mg_tcpip_driver_stm32f_data { mif_.driver_data = &driver_data_; \ MG_SET_MAC_ADDRESS(mif_.mac); \ MG_ENABLE_ETH_IRQ(); \ - mg_tcpip_init(mgr, &mif_); \ + mg_tcpip_init((mgr), &mif_); \ MG_INFO(("Driver: stm32f, MAC: %M", mg_print_mac, mif_.mac)); \ } while (0) +#ifndef MG_TCPIP_DRIVER_INIT +#define MG_TCPIP_DRIVER_INIT(x) MG_TCPIP_DRIVER_STM32F_INIT(x) +#endif + #endif diff --git a/src/drivers/mcxw71.h b/src/drivers/mcxw71.h index fb4a6abc..8dc65179 100644 --- a/src/drivers/mcxw71.h +++ b/src/drivers/mcxw71.h @@ -13,7 +13,7 @@ struct mg_tcpip_driver_mcxw71_data { extern struct mg_tcpip_driver mg_tcpip_driver_mcxw71; -#define MG_TCPIP_DRIVER_MCXW71_INIT(manager) \ +#define MG_TCPIP_DRIVER_MCXW71_INIT(mgr) \ do { \ static struct mg_tcpip_driver_mcxw71_data driver_data_; \ static struct mg_tcpip_if mif_; \ @@ -21,10 +21,9 @@ extern struct mg_tcpip_driver mg_tcpip_driver_mcxw71; mif_.ip = MG_TCPIP_IP; \ mif_.mask = MG_TCPIP_MASK; \ mif_.gw = MG_TCPIP_GW; \ - mif_.mgr = (manager); \ mif_.driver = &mg_tcpip_driver_mcxw71; \ mif_.driver_data = &driver_data_; \ - mg_tcpip_init((manager), &mif_); \ + mg_tcpip_init((mgr), &mif_); \ MG_INFO(("Driver: mcxw71, MAC: %M", mg_print_mac, mif_.mac)); \ } while (0) diff --git a/src/drivers/mg24.h b/src/drivers/mg24.h index 039e13d2..cc37ca62 100644 --- a/src/drivers/mg24.h +++ b/src/drivers/mg24.h @@ -12,7 +12,7 @@ struct mg_tcpip_driver_mg24_data { extern struct mg_tcpip_driver mg_tcpip_driver_mg24; -#define MG_TCPIP_DRIVER_MG24_INIT(manager) \ +#define MG_TCPIP_DRIVER_MG24_INIT(mgr) \ do { \ static struct mg_tcpip_driver_mg24_data driver_data_; \ static struct mg_tcpip_if mif_; \ @@ -20,10 +20,9 @@ extern struct mg_tcpip_driver mg_tcpip_driver_mg24; mif_.ip = MG_TCPIP_IP; \ mif_.mask = MG_TCPIP_MASK; \ mif_.gw = MG_TCPIP_GW; \ - mif_.mgr = (manager); \ mif_.driver = &mg_tcpip_driver_mg24; \ mif_.driver_data = &driver_data_; \ - mg_tcpip_init((manager), &mif_); \ + mg_tcpip_init((mgr), &mif_); \ MG_INFO(("Driver: mg24, MAC: %M", mg_print_mac, mif_.mac)); \ } while (0) diff --git a/src/drivers/nrf52.h b/src/drivers/nrf52.h index e88a7aeb..f019ec89 100644 --- a/src/drivers/nrf52.h +++ b/src/drivers/nrf52.h @@ -12,7 +12,7 @@ struct mg_tcpip_driver_nrf52_data { extern struct mg_tcpip_driver mg_tcpip_driver_nrf52; -#define MG_TCPIP_DRIVER_NRF52_INIT(manager) \ +#define MG_TCPIP_DRIVER_NRF52_INIT(mgr) \ do { \ static struct mg_tcpip_driver_nrf52_data driver_data_; \ static struct mg_tcpip_if mif_; \ @@ -20,10 +20,9 @@ extern struct mg_tcpip_driver mg_tcpip_driver_nrf52; mif_.ip = MG_TCPIP_IP; \ mif_.mask = MG_TCPIP_MASK; \ mif_.gw = MG_TCPIP_GW; \ - mif_.mgr = (manager); \ mif_.driver = &mg_tcpip_driver_nrf52; \ mif_.driver_data = &driver_data_; \ - mg_tcpip_init((manager), &mif_); \ + mg_tcpip_init((mgr), &mif_); \ MG_INFO(("Driver: nrf52, MAC: %M", mg_print_mac, mif_.mac)); \ } while (0) diff --git a/src/drivers/rw612w.h b/src/drivers/rw612w.h index 084e3e7c..05ae30ea 100644 --- a/src/drivers/rw612w.h +++ b/src/drivers/rw612w.h @@ -13,7 +13,7 @@ struct mg_tcpip_driver_rw612w_data { extern struct mg_tcpip_driver mg_tcpip_driver_rw612w; -#define MG_TCPIP_DRIVER_RW612W_INIT(manager) \ +#define MG_TCPIP_DRIVER_RW612W_INIT(mgr) \ do { \ static struct mg_tcpip_driver_rw612w_data driver_data_; \ static struct mg_tcpip_if mif_; \ @@ -21,10 +21,9 @@ extern struct mg_tcpip_driver mg_tcpip_driver_rw612w; mif_.ip = MG_TCPIP_IP; \ mif_.mask = MG_TCPIP_MASK; \ mif_.gw = MG_TCPIP_GW; \ - mif_.mgr = (manager); \ mif_.driver = &mg_tcpip_driver_rw612w; \ mif_.driver_data = &driver_data_; \ - mg_tcpip_init((manager), &mif_); \ + mg_tcpip_init((mgr), &mif_); \ MG_INFO(("Driver: rw612w, MAC: %M", mg_print_mac, mif_.mac)); \ } while (0) diff --git a/src/drivers/stm32f.h b/src/drivers/stm32f.h index 1adff507..20ac1e03 100644 --- a/src/drivers/stm32f.h +++ b/src/drivers/stm32f.h @@ -34,7 +34,9 @@ struct mg_tcpip_driver_stm32f_data { #define MG_ENABLE_ETH_IRQ() #endif -#define MG_TCPIP_DRIVER_INIT(mgr) \ +extern struct mg_tcpip_driver mg_tcpip_driver_stm32f; + +#define MG_TCPIP_DRIVER_STM32F_INIT(mgr) \ do { \ static struct mg_tcpip_driver_stm32f_data driver_data_; \ static struct mg_tcpip_if mif_; \ @@ -47,8 +49,12 @@ struct mg_tcpip_driver_stm32f_data { mif_.driver_data = &driver_data_; \ MG_SET_MAC_ADDRESS(mif_.mac); \ MG_ENABLE_ETH_IRQ(); \ - mg_tcpip_init(mgr, &mif_); \ + mg_tcpip_init((mgr), &mif_); \ MG_INFO(("Driver: stm32f, MAC: %M", mg_print_mac, mif_.mac)); \ } while (0) +#ifndef MG_TCPIP_DRIVER_INIT +#define MG_TCPIP_DRIVER_INIT(x) MG_TCPIP_DRIVER_STM32F_INIT(x) +#endif + #endif diff --git a/src/net_builtin.h b/src/net_builtin.h index dd0ddf11..40ce1243 100644 --- a/src/net_builtin.h +++ b/src/net_builtin.h @@ -135,7 +135,6 @@ void mg_tcpip_arp_request(struct mg_tcpip_if *ifp, uint32_t ip, uint8_t *mac); // Built-in hardware drivers. Assign one to mg_tcpip_if.driver before calling // mg_tcpip_init(). Each driver also requires a corresponding driver_data // struct; see the matching driver header for details. -extern struct mg_tcpip_driver mg_tcpip_driver_stm32f; extern struct mg_tcpip_driver mg_tcpip_driver_w5500; extern struct mg_tcpip_driver mg_tcpip_driver_w5100; extern struct mg_tcpip_driver mg_tcpip_driver_tm4c; @@ -159,6 +158,7 @@ extern struct mg_tcpip_driver mg_tcpip_driver_netc; #include "drivers/mcxw71.h" #include "drivers/nrf52.h" #include "drivers/rw612w.h" +#include "drivers/stm32f.h" // SPI bus abstraction for SPI-attached network chips (e.g. W5500). // Populate and assign to the driver's driver_data field.