From e2014397228f870bcd26691c1413afe4d987cbec Mon Sep 17 00:00:00 2001
From: sakumisu <1203593632@qq.com>
Date: Tue, 19 Dec 2023 21:38:55 +0800
Subject: [PATCH] create lwip rx thread by user

---
 cherryusb_config_template.h | 14 ---------
 class/cdc/usbh_cdc_ecm.c    |  9 ++----
 class/cdc/usbh_cdc_ecm.h    |  2 +-
 class/wireless/usbh_rndis.c |  7 +----
 class/wireless/usbh_rndis.h |  2 +-
 demo/usb_host.c             | 59 +++++++++++++++++--------------------
 6 files changed, 33 insertions(+), 60 deletions(-)

diff --git a/cherryusb_config_template.h b/cherryusb_config_template.h
index fd429fda..891a243e 100644
--- a/cherryusb_config_template.h
+++ b/cherryusb_config_template.h
@@ -128,20 +128,6 @@
 #define CONFIG_USBHOST_MSC_TIMEOUT 5000
 #endif
 
-#ifndef CONFIG_USBHOST_RNDIS_PRIO
-#define CONFIG_USBHOST_RNDIS_PRIO 1
-#endif
-#ifndef CONFIG_USBHOST_RNDIS_STACKSIZE
-#define CONFIG_USBHOST_RNDIS_STACKSIZE 2048
-#endif
-
-#ifndef CONFIG_USBHOST_CDC_ECM_PRIO
-#define CONFIG_USBHOST_CDC_ECM_PRIO 1
-#endif
-#ifndef CONFIG_USBHOST_CDC_ECM_STACKSIZE
-#define CONFIG_USBHOST_CDC_ECM_STACKSIZE 2048
-#endif
-
 /* ================ USB Device Port Configuration ================*/
 
 //#define USBD_IRQHandler USBD_IRQHandler
diff --git a/class/cdc/usbh_cdc_ecm.c b/class/cdc/usbh_cdc_ecm.c
index 28451485..3d5d3631 100644
--- a/class/cdc/usbh_cdc_ecm.c
+++ b/class/cdc/usbh_cdc_ecm.c
@@ -222,7 +222,7 @@ static int usbh_cdc_ecm_disconnect(struct usbh_hubport *hport, uint8_t intf)
     return ret;
 }
 
-static void usbh_cdc_ecm_rx_thread(void *argument)
+void usbh_cdc_ecm_rx_thread(void *argument)
 {
     uint32_t g_cdc_ecm_rx_length;
     int ret;
@@ -276,9 +276,11 @@ find_class:
         } else {
         }
     }
+    // clang-format off
 delete:
     USB_LOG_INFO("Delete cdc ecm rx thread\r\n");
     usb_osal_thread_delete(NULL);
+    // clang-format on
 }
 
 err_t usbh_cdc_ecm_linkoutput(struct netif *netif, struct pbuf *p)
@@ -307,11 +309,6 @@ err_t usbh_cdc_ecm_linkoutput(struct netif *netif, struct pbuf *p)
     return ERR_OK;
 }
 
-void usbh_cdc_ecm_lwip_thread_init(struct netif *netif)
-{
-    usb_osal_thread_create("usbh_cdc_ecm_rx", CONFIG_USBHOST_RNDIS_STACKSIZE, CONFIG_USBHOST_CDC_ECM_PRIO, usbh_cdc_ecm_rx_thread, netif);
-}
-
 __WEAK void usbh_cdc_ecm_run(struct usbh_cdc_ecm *cdc_ecm_class)
 {
 }
diff --git a/class/cdc/usbh_cdc_ecm.h b/class/cdc/usbh_cdc_ecm.h
index 7d65da0b..5f2e6069 100644
--- a/class/cdc/usbh_cdc_ecm.h
+++ b/class/cdc/usbh_cdc_ecm.h
@@ -42,7 +42,7 @@ void usbh_cdc_ecm_run(struct usbh_cdc_ecm *cdc_ecm_class);
 void usbh_cdc_ecm_stop(struct usbh_cdc_ecm *cdc_ecm_class);
 
 err_t usbh_cdc_ecm_linkoutput(struct netif *netif, struct pbuf *p);
-void usbh_cdc_ecm_lwip_thread_init(struct netif *netif);
+void usbh_cdc_ecm_rx_thread(void *argument);
 
 #ifdef __cplusplus
 }
diff --git a/class/wireless/usbh_rndis.c b/class/wireless/usbh_rndis.c
index bfe6b594..ff246f16 100644
--- a/class/wireless/usbh_rndis.c
+++ b/class/wireless/usbh_rndis.c
@@ -422,7 +422,7 @@ static int usbh_rndis_disconnect(struct usbh_hubport *hport, uint8_t intf)
     return ret;
 }
 
-static void usbh_rndis_rx_thread(void *argument)
+void usbh_rndis_rx_thread(void *argument)
 {
     uint32_t g_rndis_rx_length;
     uint32_t pmg_offset;
@@ -547,11 +547,6 @@ err_t usbh_rndis_linkoutput(struct netif *netif, struct pbuf *p)
     return ERR_OK;
 }
 
-void usbh_rndis_lwip_thread_init(struct netif *netif)
-{
-    usb_osal_thread_create("usbh_rndis_rx", CONFIG_USBHOST_RNDIS_STACKSIZE, CONFIG_USBHOST_RNDIS_PRIO, usbh_rndis_rx_thread, netif);
-}
-
 __WEAK void usbh_rndis_run(struct usbh_rndis *rndis_class)
 {
 }
diff --git a/class/wireless/usbh_rndis.h b/class/wireless/usbh_rndis.h
index c55c113f..b2e8a436 100644
--- a/class/wireless/usbh_rndis.h
+++ b/class/wireless/usbh_rndis.h
@@ -45,7 +45,7 @@ void usbh_rndis_run(struct usbh_rndis *rndis_class);
 void usbh_rndis_stop(struct usbh_rndis *rndis_class);
 
 err_t usbh_rndis_linkoutput(struct netif *netif, struct pbuf *p);
-void usbh_rndis_lwip_thread_init(struct netif *netif);
+void usbh_rndis_rx_thread(void *argument);
 
 #ifdef __cplusplus
 }
diff --git a/demo/usb_host.c b/demo/usb_host.c
index e0a703e0..1928fb53 100644
--- a/demo/usb_host.c
+++ b/demo/usb_host.c
@@ -56,6 +56,7 @@ find_class:
     ret = usbh_submit_urb(&cdc_acm_class->bulkout_urb);
     if (ret < 0) {
         USB_LOG_RAW("bulk out error,ret:%d\r\n", ret);
+        goto find_class;
     } else {
         USB_LOG_RAW("send over:%d\r\n", cdc_acm_class->bulkout_urb.actual_length);
     }
@@ -460,7 +461,7 @@ void usbh_cdc_ecm_run(struct usbh_cdc_ecm *cdc_ecm_class)
     eth_device_init(&cdc_ecm_dev, "u0");
     eth_device_linkchange(&cdc_ecm_dev, RT_TRUE);
 
-    usbh_cdc_ecm_lwip_thread_init(cdc_ecm_dev.netif);
+    usb_osal_thread_create("usbh_cdc_ecm_rx", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_cdc_ecm_rx_thread, cdc_ecm_dev.netif);
 #else
     struct netif *netif = &g_cdc_ecm_netif;
 
@@ -476,7 +477,14 @@ void usbh_cdc_ecm_run(struct usbh_cdc_ecm *cdc_ecm_class)
     while (!netif_is_up(netif)) {
     }
 
-    usbh_cdc_ecm_lwip_thread_init(netif);
+    dhcp_handle1 = xTimerCreate((const char *)"dhcp1", (TickType_t)200, (UBaseType_t)pdTRUE, (void *const)netif, (TimerCallbackFunction_t)dhcp_timeout);
+    if (dhcp_handle1 == NULL) {
+        USB_LOG_ERR("timer creation failed! \r\n");
+        while (1) {
+        }
+    }
+
+    usb_osal_thread_create("usbh_cdc_ecm_rx", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_cdc_ecm_rx_thread, netif);
 #if LWIP_DHCP
     dhcp_start(netif);
     xTimerStart(dhcp_handle1, 0);
@@ -608,7 +616,7 @@ void usbh_rndis_run(struct usbh_rndis *rndis_class)
     eth_device_init(&rndis_dev, "u1");
     eth_device_linkchange(&rndis_dev, RT_TRUE);
 
-    usbh_rndis_lwip_thread_init(rndis_dev.netif);
+    usb_osal_thread_create("usbh_rndis_rx", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_rndis_rx_thread, rndis_dev.netif);
     timer_init(rndis_class);
 #else
     struct netif *netif = &g_rndis_netif;
@@ -625,7 +633,14 @@ void usbh_rndis_run(struct usbh_rndis *rndis_class)
     while (!netif_is_up(netif)) {
     }
 
-    usbh_rndis_lwip_thread_init(netif);
+    dhcp_handle2 = xTimerCreate((const char *)"dhcp2", (TickType_t)200, (UBaseType_t)pdTRUE, (void *const)netif, (TimerCallbackFunction_t)dhcp_timeout);
+    if (dhcp_handle2 == NULL) {
+        USB_LOG_ERR("timer creation failed! \r\n");
+        while (1) {
+        }
+    }
+
+    usb_osal_thread_create("usbh_rndis_rx", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_rndis_rx_thread, netif);
     timer_init(rndis_class);
 
 #if LWIP_DHCP
@@ -692,6 +707,10 @@ void usbh_msc_stop(struct usbh_msc *msc_class)
 
 void usbh_audio_run(struct usbh_audio *audio_class)
 {
+#if TEST_USBH_AUDIO
+#error "if you want to use iso, please contact with me"
+    usb_osal_thread_create("usbh_audio", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_audio_thread, NULL);
+#endif
 }
 
 void usbh_audio_stop(struct usbh_audio *audio_class)
@@ -700,6 +719,10 @@ void usbh_audio_stop(struct usbh_audio *audio_class)
 
 void usbh_video_run(struct usbh_video *video_class)
 {
+#if TEST_USBH_VIDEO
+#error "if you want to use iso, please contact with me"
+    usb_osal_thread_create("usbh_video", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_video_thread, NULL);
+#endif
 }
 
 void usbh_video_stop(struct usbh_video *video_class)
@@ -708,40 +731,12 @@ void usbh_video_stop(struct usbh_video *video_class)
 
 void usbh_class_test(void)
 {
-#if TEST_USBH_AUDIO
-#error "if you want to use iso, please contact with me"
-    usb_osal_thread_create("usbh_audio", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_audio_thread, NULL);
-#endif
-#if TEST_USBH_VIDEO
-#error "if you want to use iso, please contact with me"
-    usb_osal_thread_create("usbh_video", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_video_thread, NULL);
-#endif
-
 #ifdef __RTTHREAD__
     /* do nothing */
 #else
 #if TEST_USBH_CDC_ECM || TEST_USBH_RNDIS
-    struct netif *netif;
     /* Initialize the LwIP stack */
     tcpip_init(NULL, NULL);
-#if TEST_USBH_CDC_ECM
-    netif = &g_cdc_ecm_netif;
-    dhcp_handle1 = xTimerCreate((const char *)"dhcp1", (TickType_t)200, (UBaseType_t)pdTRUE, (void *const)netif, (TimerCallbackFunction_t)dhcp_timeout);
-    if (dhcp_handle1 == NULL) {
-        USB_LOG_ERR("timer creation failed! \r\n");
-        while (1) {
-        }
-    }
-#endif
-#if TEST_USBH_RNDIS
-    netif = &g_rndis_netif;
-    dhcp_handle2 = xTimerCreate((const char *)"dhcp2", (TickType_t)200, (UBaseType_t)pdTRUE, (void *const)netif, (TimerCallbackFunction_t)dhcp_timeout);
-    if (dhcp_handle2 == NULL) {
-        USB_LOG_ERR("timer creation failed! \r\n");
-        while (1) {
-        }
-    }
-#endif
 #endif
 #endif
 }