From ed96213d24de9590960f6651ceea4028a5eeae01 Mon Sep 17 00:00:00 2001 From: scaprile Date: Thu, 4 Sep 2025 14:01:52 -0300 Subject: [PATCH] fixes for Keil --- .../device-dashboard.uvprojx | 8 +-- .../device-dashboard.uvprojx | 8 +-- .../device-dashboard.uvprojx | 8 +-- .../device-dashboard.uvprojx | 8 +-- .../device-dashboard.uvprojx | 8 +-- .../device-dashboard.uvprojx | 8 +-- .../device-dashboard.uvprojx | 8 +-- .../device-dashboard.uvprojx | 8 +-- .../device-dashboard.uvprojx | 8 +-- .../device-dashboard.uvprojx | 8 +-- .../device-dashboard.uvprojx | 8 +-- mongoose.h | 70 +++++++++---------- 12 files changed, 79 insertions(+), 79 deletions(-) diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-baremetal/device-dashboard.uvprojx b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-baremetal/device-dashboard.uvprojx index 7ad4508c..bde48a8b 100644 --- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-baremetal/device-dashboard.uvprojx +++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-baremetal/device-dashboard.uvprojx @@ -469,8 +469,8 @@ - - + + @@ -561,8 +561,8 @@ RTE\Network_Library\mongoose_config.h - - + + diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-lwip/device-dashboard.uvprojx b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-lwip/device-dashboard.uvprojx index 048305f2..0688afcc 100644 --- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-lwip/device-dashboard.uvprojx +++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-lwip/device-dashboard.uvprojx @@ -508,8 +508,8 @@ - - + + @@ -658,8 +658,8 @@ RTE\Network_Library\mongoose_config.h - - + + diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-tcp/device-dashboard.uvprojx b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-tcp/device-dashboard.uvprojx index 81db343c..c1bb7814 100644 --- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-tcp/device-dashboard.uvprojx +++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-tcp/device-dashboard.uvprojx @@ -533,8 +533,8 @@ - - + + @@ -619,8 +619,8 @@ RTE\Network_Library\mongoose_config.h - - + + diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos/device-dashboard.uvprojx b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos/device-dashboard.uvprojx index afc6532b..fe1a7972 100644 --- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos/device-dashboard.uvprojx +++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos/device-dashboard.uvprojx @@ -490,8 +490,8 @@ - - + + @@ -582,8 +582,8 @@ RTE\Network_Library\mongoose_config.h - - + + diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2-lwip/device-dashboard.uvprojx b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2-lwip/device-dashboard.uvprojx index df2f9368..b94b79c5 100644 --- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2-lwip/device-dashboard.uvprojx +++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2-lwip/device-dashboard.uvprojx @@ -532,8 +532,8 @@ - - + + @@ -688,8 +688,8 @@ RTE\Network_Library\mongoose_config.h - - + + diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2/device-dashboard.uvprojx b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2/device-dashboard.uvprojx index bda352d9..86bda423 100644 --- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2/device-dashboard.uvprojx +++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2/device-dashboard.uvprojx @@ -514,8 +514,8 @@ - - + + @@ -612,8 +612,8 @@ RTE\Network_Library\mongoose_config.h - - + + diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx-mdk/device-dashboard.uvprojx b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx-mdk/device-dashboard.uvprojx index 29fc0419..9cc2b755 100644 --- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx-mdk/device-dashboard.uvprojx +++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx-mdk/device-dashboard.uvprojx @@ -499,8 +499,8 @@ - - + + @@ -687,8 +687,8 @@ RTE\Network_Library\mongoose_config.h - - + + diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx/device-dashboard.uvprojx b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx/device-dashboard.uvprojx index 56156ce8..b1799e2c 100644 --- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx/device-dashboard.uvprojx +++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx/device-dashboard.uvprojx @@ -481,8 +481,8 @@ - - + + @@ -587,8 +587,8 @@ RTE\Network_Library\mongoose_config.h - - + + diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-lwip/device-dashboard.uvprojx b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-lwip/device-dashboard.uvprojx index 1b062b53..1a6d132c 100644 --- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-lwip/device-dashboard.uvprojx +++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-lwip/device-dashboard.uvprojx @@ -499,8 +499,8 @@ - - + + @@ -671,8 +671,8 @@ RTE\Network_Library\mongoose_config.h - - + + diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-mdk/device-dashboard.uvprojx b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-mdk/device-dashboard.uvprojx index 1216dbae..d2add683 100644 --- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-mdk/device-dashboard.uvprojx +++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-mdk/device-dashboard.uvprojx @@ -499,8 +499,8 @@ - - + + @@ -695,8 +695,8 @@ RTE\Network_Library\mongoose_config.h - - + + diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5/device-dashboard.uvprojx b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5/device-dashboard.uvprojx index 87527e97..26823473 100644 --- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5/device-dashboard.uvprojx +++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5/device-dashboard.uvprojx @@ -481,8 +481,8 @@ - - + + @@ -595,8 +595,8 @@ RTE\Network_Library\mongoose_config.h - - + + diff --git a/mongoose.h b/mongoose.h index 0f17fae8..640de3b6 100644 --- a/mongoose.h +++ b/mongoose.h @@ -4010,6 +4010,41 @@ struct mg_tcpip_driver_tms570_data { +#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_XMC7) && MG_ENABLE_DRIVER_XMC7 + +struct mg_tcpip_driver_xmc7_data { + int mdc_cr; // Valid values: -1, 0, 1, 2, 3, 4, 5 + uint8_t phy_addr; +}; + +#ifndef MG_TCPIP_PHY_ADDR +#define MG_TCPIP_PHY_ADDR 0 +#endif + +#ifndef MG_DRIVER_MDC_CR +#define MG_DRIVER_MDC_CR 3 +#endif + +#define MG_TCPIP_DRIVER_INIT(mgr) \ + do { \ + static struct mg_tcpip_driver_xmc7_data driver_data_; \ + static struct mg_tcpip_if mif_; \ + driver_data_.mdc_cr = MG_DRIVER_MDC_CR; \ + driver_data_.phy_addr = MG_TCPIP_PHY_ADDR; \ + mif_.ip = MG_TCPIP_IP; \ + mif_.mask = MG_TCPIP_MASK; \ + mif_.gw = MG_TCPIP_GW; \ + mif_.driver = &mg_tcpip_driver_xmc7; \ + mif_.driver_data = &driver_data_; \ + MG_SET_MAC_ADDRESS(mif_.mac); \ + mg_tcpip_init(mgr, &mif_); \ + MG_INFO(("Driver: xmc7, MAC: %M", mg_print_mac, mif_.mac)); \ + } while (0) + +#endif + + + #if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_XMC) && MG_ENABLE_DRIVER_XMC struct mg_tcpip_driver_xmc_data { @@ -4056,41 +4091,6 @@ struct mg_tcpip_driver_xmc_data { #endif - -#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_XMC7) && MG_ENABLE_DRIVER_XMC7 - -struct mg_tcpip_driver_xmc7_data { - int mdc_cr; // Valid values: -1, 0, 1, 2, 3, 4, 5 - uint8_t phy_addr; -}; - -#ifndef MG_TCPIP_PHY_ADDR -#define MG_TCPIP_PHY_ADDR 0 -#endif - -#ifndef MG_DRIVER_MDC_CR -#define MG_DRIVER_MDC_CR 3 -#endif - -#define MG_TCPIP_DRIVER_INIT(mgr) \ - do { \ - static struct mg_tcpip_driver_xmc7_data driver_data_; \ - static struct mg_tcpip_if mif_; \ - driver_data_.mdc_cr = MG_DRIVER_MDC_CR; \ - driver_data_.phy_addr = MG_TCPIP_PHY_ADDR; \ - mif_.ip = MG_TCPIP_IP; \ - mif_.mask = MG_TCPIP_MASK; \ - mif_.gw = MG_TCPIP_GW; \ - mif_.driver = &mg_tcpip_driver_xmc7; \ - mif_.driver_data = &driver_data_; \ - MG_SET_MAC_ADDRESS(mif_.mac); \ - mg_tcpip_init(mgr, &mif_); \ - MG_INFO(("Driver: xmc7, MAC: %M", mg_print_mac, mif_.mac)); \ - } while (0) - -#endif - - #ifdef __cplusplus } #endif