From 156db0bc5e02dca6efa37e4515a4add9e160bd0b Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Wed, 19 Nov 2025 09:57:37 -0300 Subject: [PATCH] enable CYW driver autoinit --- mongoose.h | 30 ++++++++++++++---------------- src/drivers/cyw.h | 30 ++++++++++++++---------------- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/mongoose.h b/mongoose.h index 5592d83d..44ac2777 100644 --- a/mongoose.h +++ b/mongoose.h @@ -3305,26 +3305,24 @@ struct mg_tcpip_driver_cyw_data { struct mg_wifi_data wifi; void *bus; struct mg_tcpip_driver_cyw_firmware *fw; - bool hs; // use chip "high-speed" mode; otherwise SPI CPOL0 CPHA0 (DS 4.2.3 Table 6) + bool hs; // use chip "high-speed" mode; otherwise SPI CPOL0 CPHA0 (DS 4.2.3 Table 6) }; -#if 0 -#define MG_TCPIP_DRIVER_INIT(mgr) \ - do { \ - static struct mg_tcpip_driver_cyw_data driver_data_; \ - static struct mg_tcpip_if mif_; \ - MG_SET_WIFI_CONFIG(&driver_data_); \ - mif_.ip = MG_TCPIP_IP; \ - mif_.mask = MG_TCPIP_MASK; \ - mif_.gw = MG_TCPIP_GW; \ - mif_.driver = &mg_tcpip_driver_pico_w; \ - mif_.driver_data = &driver_data_; \ - mif_.recv_queue.size = 8192; \ - mif_.mac[0] = 2; /* MAC read from OTP at driver init */ \ - mg_tcpip_init(mgr, &mif_); \ +#define MG_TCPIP_DRIVER_INIT(mgr) \ + do { \ + static struct mg_tcpip_driver_cyw_data driver_data_; \ + static struct mg_tcpip_if mif_; \ + MG_SET_WIFI_CONFIG(&driver_data_); \ + mif_.ip = MG_TCPIP_IP; \ + mif_.mask = MG_TCPIP_MASK; \ + mif_.gw = MG_TCPIP_GW; \ + mif_.driver = &mg_tcpip_driver_cyw; \ + mif_.driver_data = &driver_data_; \ + mif_.recv_queue.size = 8192; \ + mif_.mac[0] = 2; /* MAC read from OTP at driver init */ \ + mg_tcpip_init(mgr, &mif_); \ MG_INFO(("Driver: cyw, MAC: %M", mg_print_mac, mif_.mac)); \ } while (0) -#endif #endif diff --git a/src/drivers/cyw.h b/src/drivers/cyw.h index e7cfb5a1..cbeebed1 100644 --- a/src/drivers/cyw.h +++ b/src/drivers/cyw.h @@ -25,25 +25,23 @@ struct mg_tcpip_driver_cyw_data { struct mg_wifi_data wifi; void *bus; struct mg_tcpip_driver_cyw_firmware *fw; - bool hs; // use chip "high-speed" mode; otherwise SPI CPOL0 CPHA0 (DS 4.2.3 Table 6) + bool hs; // use chip "high-speed" mode; otherwise SPI CPOL0 CPHA0 (DS 4.2.3 Table 6) }; -#if 0 -#define MG_TCPIP_DRIVER_INIT(mgr) \ - do { \ - static struct mg_tcpip_driver_cyw_data driver_data_; \ - static struct mg_tcpip_if mif_; \ - MG_SET_WIFI_CONFIG(&driver_data_); \ - mif_.ip = MG_TCPIP_IP; \ - mif_.mask = MG_TCPIP_MASK; \ - mif_.gw = MG_TCPIP_GW; \ - mif_.driver = &mg_tcpip_driver_pico_w; \ - mif_.driver_data = &driver_data_; \ - mif_.recv_queue.size = 8192; \ - mif_.mac[0] = 2; /* MAC read from OTP at driver init */ \ - mg_tcpip_init(mgr, &mif_); \ +#define MG_TCPIP_DRIVER_INIT(mgr) \ + do { \ + static struct mg_tcpip_driver_cyw_data driver_data_; \ + static struct mg_tcpip_if mif_; \ + MG_SET_WIFI_CONFIG(&driver_data_); \ + mif_.ip = MG_TCPIP_IP; \ + mif_.mask = MG_TCPIP_MASK; \ + mif_.gw = MG_TCPIP_GW; \ + mif_.driver = &mg_tcpip_driver_cyw; \ + mif_.driver_data = &driver_data_; \ + mif_.recv_queue.size = 8192; \ + mif_.mac[0] = 2; /* MAC read from OTP at driver init */ \ + mg_tcpip_init(mgr, &mif_); \ MG_INFO(("Driver: cyw, MAC: %M", mg_print_mac, mif_.mac)); \ } while (0) -#endif #endif