From 45ccc810d296f1a5ffadc50aa56bce3f2c39f7c8 Mon Sep 17 00:00:00 2001 From: sakumisu <1203593632@qq.com> Date: Tue, 20 May 2025 18:45:51 +0800 Subject: [PATCH] fix(demo): move dhcp_start in init Signed-off-by: sakumisu <1203593632@qq.com> --- demo/cdc_ecm_template.c | 7 ++----- demo/cdc_rndis_template.c | 11 ++++------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/demo/cdc_ecm_template.c b/demo/cdc_ecm_template.c index bb83f4cf..9dde1275 100644 --- a/demo/cdc_ecm_template.c +++ b/demo/cdc_ecm_template.c @@ -276,7 +276,8 @@ void cdc_ecm_lwip_init(void) eth_device_init(&cdc_ecm_dev, "u0"); - eth_device_linkchange(&cdc_ecm_dev, RT_FALSE); + eth_device_linkchange(&cdc_ecm_dev, RT_TRUE); + dhcpd_start("u0"); } void usbd_cdc_ecm_data_recv_done(uint32_t len) @@ -439,10 +440,6 @@ static void usbd_event_handler(uint8_t busid, uint8_t event) case USBD_EVENT_SUSPEND: break; case USBD_EVENT_CONFIGURED: -#ifdef RT_USING_LWIP - eth_device_linkchange(&cdc_ecm_dev, RT_TRUE); - dhcpd_start("u0"); -#endif break; case USBD_EVENT_SET_REMOTE_WAKEUP: break; diff --git a/demo/cdc_rndis_template.c b/demo/cdc_rndis_template.c index c52f1aae..ff952641 100644 --- a/demo/cdc_rndis_template.c +++ b/demo/cdc_rndis_template.c @@ -249,7 +249,8 @@ void rndis_lwip_init(void) eth_device_init(&rndis_dev, "u0"); - eth_device_linkchange(&rndis_dev, RT_FALSE); + eth_device_linkchange(&rndis_dev, RT_TRUE); + dhcpd_start("u0"); } void usbd_rndis_data_recv_done(uint32_t len) @@ -412,10 +413,6 @@ static void usbd_event_handler(uint8_t busid, uint8_t event) case USBD_EVENT_SUSPEND: break; case USBD_EVENT_CONFIGURED: -#ifdef RT_USING_LWIP - eth_device_linkchange(&rndis_dev, RT_TRUE); - dhcpd_start("u0"); -#endif break; case USBD_EVENT_SET_REMOTE_WAKEUP: break; @@ -439,7 +436,7 @@ void cdc_rndis_init(uint8_t busid, uintptr_t reg_base) #else usbd_desc_register(busid, cdc_rndis_descriptor); #endif - usbd_add_interface(busid, usbd_rndis_init_intf(&intf0, CDC_OUT_EP, CDC_IN_EP, CDC_INT_EP, mac)); - usbd_add_interface(busid, usbd_rndis_init_intf(&intf1, CDC_OUT_EP, CDC_IN_EP, CDC_INT_EP, mac)); + usbd_add_interface(busid, usbd_rndis_init_intf(&intf0, CDC_OUT_EP, CDC_IN_EP, CDC_INT_EP, (uint8_t *)mac)); + usbd_add_interface(busid, usbd_rndis_init_intf(&intf1, CDC_OUT_EP, CDC_IN_EP, CDC_INT_EP, (uint8_t *)mac)); usbd_initialize(busid, reg_base, usbd_event_handler); }