Bladeren bron

update(demo/usb_host): remove ununsed net class

sakumisu 1 jaar geleden
bovenliggende
commit
e2877d3fe0
1 gewijzigde bestanden met toevoegingen van 10 en 816 verwijderingen
  1. 10 816
      demo/usb_host.c

+ 10 - 816
demo/usb_host.c

@@ -31,24 +31,13 @@
 #ifndef TEST_USBH_VIDEO
 #define TEST_USBH_VIDEO 0
 #endif
-#ifndef TEST_USBH_CDC_ECM
-#define TEST_USBH_CDC_ECM 0
-#endif
-#ifndef TEST_USBH_CDC_NCM
-#define TEST_USBH_CDC_NCM 0
-#endif
-#ifndef TEST_USBH_CDC_RNDIS
-#define TEST_USBH_CDC_RNDIS 0
-#endif
-#ifndef TEST_USBH_ASIX
-#define TEST_USBH_ASIX 0
-#endif
-#ifndef TEST_USBH_RTL8152
-#define TEST_USBH_RTL8152 0
+
+#if defined(TEST_USBH_CDC_ECM) || defined(TEST_USBH_CDC_RNDIS) || defined(TEST_USBH_ASIX) || defined(TEST_USBH_RTL8152)
+#error we have move those class implements into platform/none/usbh_lwip.c, and you should call tcpip_init(NULL, NULL) in your app
 #endif
 
 #if TEST_USBH_CDC_ACM
-USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t cdc_buffer[512];
+USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t cdc_buffer[4096];
 
 #if TEST_USBH_CDC_SPEED
 #define TEST_LEN   (16 * 1024)
@@ -96,12 +85,10 @@ static void usbh_cdc_acm_thread(void *argument)
         USB_LOG_RAW("per packet len:%d, out speed:%f MB/S\r\n", test_len[j], (test_len[j] * TEST_COUNT / 1024 / 1024) * 1000 / ((float)time_ms));
     }
 #endif
-    memset(cdc_buffer, 0, 512);
+    memset(cdc_buffer, 0x55, 4096);
 
-    const uint8_t data1[10] = { 0x02, 0x00, 0x00, 0x00, 0x02, 0x02, 0x08, 0x14 };
-
-    memcpy(cdc_buffer, data1, 10);
-    usbh_bulk_urb_fill(&cdc_acm_class->bulkout_urb, cdc_acm_class->hport, cdc_acm_class->bulkout, cdc_buffer, 10, 3000, NULL, NULL);
+    /* for common, we use timeout with 0xffffffff, this is just a test */
+    usbh_bulk_urb_fill(&cdc_acm_class->bulkout_urb, cdc_acm_class->hport, cdc_acm_class->bulkout, cdc_buffer, sizeof(cdc_buffer), 3000, NULL, NULL);
     ret = usbh_submit_urb(&cdc_acm_class->bulkout_urb);
     if (ret < 0) {
         USB_LOG_RAW("bulk out error,ret:%d\r\n", ret);
@@ -110,6 +97,7 @@ static void usbh_cdc_acm_thread(void *argument)
         USB_LOG_RAW("send over:%d\r\n", cdc_acm_class->bulkout_urb.actual_length);
     }
 
+    /* we can change cdc_acm_class->bulkin->wMaxPacketSize with 4096 for testing zlp, default is ep mps  */
     usbh_bulk_urb_fill(&cdc_acm_class->bulkin_urb, cdc_acm_class->hport, cdc_acm_class->bulkin, cdc_buffer, cdc_acm_class->bulkin->wMaxPacketSize, 0xffffffff, usbh_cdc_acm_callback, cdc_acm_class);
     ret = usbh_submit_urb(&cdc_acm_class->bulkin_urb);
     if (ret < 0) {
@@ -264,786 +252,6 @@ delete:
 }
 #endif
 
-#if 0
-void usbh_videostreaming_parse_mjpeg(struct usbh_urb *urb, struct usbh_videostreaming *stream)
-{
-    struct usbh_iso_frame_packet *iso_packet;
-    uint32_t num_of_iso_packets;
-    uint8_t data_offset;
-    uint32_t data_len;
-    uint8_t header_len = 0;
-
-    num_of_iso_packets = urb->num_of_iso_packets;
-    iso_packet = urb->iso_packet;
-
-    for (uint32_t i = 0; i < num_of_iso_packets; i++) {
-        /*
-            uint8_t frameIdentifier : 1U;
-            uint8_t endOfFrame      : 1U;
-            uint8_t presentationTimeStamp    : 1U;
-            uint8_t sourceClockReference : 1U;
-            uint8_t reserved             : 1U;
-            uint8_t stillImage           : 1U;
-            uint8_t errorBit             : 1U;
-            uint8_t endOfHeader          : 1U;
-        */
-        if (iso_packet[i].actual_length == 0) { /* skip no data */
-            continue;
-        }
-
-        header_len = iso_packet[i].transfer_buffer[0];
-
-        if ((header_len > 12) || (header_len == 0)) { /* do not be illegal */
-            while (1) {
-            }
-        }
-        if (iso_packet[i].transfer_buffer[1] & (1 << 6)) { /* error bit, re-receive */
-            stream->bufoffset = 0;
-            continue;
-        }
-
-        if ((stream->bufoffset == 0) && ((iso_packet[i].transfer_buffer[header_len] != 0xff) || (iso_packet[i].transfer_buffer[header_len + 1] != 0xd8))) {
-            stream->bufoffset = 0;
-            continue;
-        }
-
-        data_offset = header_len;
-        data_len = iso_packet[i].actual_length - header_len;
-
-        /** do something here */
-
-        stream->bufoffset += data_len;
-
-        if (iso_packet[i].transfer_buffer[1] & (1 << 1)) {
-            if ((iso_packet[i].transfer_buffer[iso_packet[i].actual_length - 2] != 0xff) || (iso_packet[i].transfer_buffer[iso_packet[i].actual_length - 1] != 0xd9)) {
-                stream->bufoffset = 0;
-                continue;
-            }
-
-            /** do something here */
-
-            if (stream->video_one_frame_callback) {
-                stream->video_one_frame_callback(stream);
-            }
-            stream->bufoffset = 0;
-        }
-    }
-    /** do something here */
-}
-
-void usbh_videostreaming_parse_yuyv2(struct usbh_urb *urb, struct usbh_videostreaming *stream)
-{
-    struct usbh_iso_frame_packet *iso_packet;
-    uint32_t num_of_iso_packets;
-    uint8_t data_offset;
-    uint32_t data_len;
-    uint8_t header_len = 0;
-
-    num_of_iso_packets = urb->num_of_iso_packets;
-    iso_packet = urb->iso_packet;
-
-    for (uint32_t i = 0; i < num_of_iso_packets; i++) {
-        /*
-            uint8_t frameIdentifier : 1U;
-            uint8_t endOfFrame      : 1U;
-            uint8_t presentationTimeStamp    : 1U;
-            uint8_t sourceClockReference : 1U;
-            uint8_t reserved             : 1U;
-            uint8_t stillImage           : 1U;
-            uint8_t errorBit             : 1U;
-            uint8_t endOfHeader          : 1U;
-        */
-
-        if (iso_packet[i].actual_length == 0) { /* skip no data */
-            continue;
-        }
-
-        header_len = iso_packet[i].transfer_buffer[0];
-
-        if ((header_len > 12) || (header_len == 0)) { /* do not be illegal */
-            while (1) {
-            }
-        }
-        if (iso_packet[i].transfer_buffer[1] & (1 << 6)) { /* error bit, re-receive */
-            stream->bufoffset = 0;
-            continue;
-        }
-
-        data_offset = header_len;
-        data_len = iso_packet[i].actual_length - header_len;
-
-        /** do something here */
-
-        stream->bufoffset += data_len;
-
-        if (iso_packet[i].transfer_buffer[1] & (1 << 1)) {
-            /** do something here */
-
-            if (stream->video_one_frame_callback && (stream->bufoffset == stream->buflen)) {
-                stream->video_one_frame_callback(stream);
-            }
-            stream->bufoffset = 0;
-        }
-    }
-
-    /** do something here */
-}
-#endif
-
-#if TEST_USBH_CDC_ECM || TEST_USBH_CDC_NCM || TEST_USBH_CDC_RNDIS || TEST_USBH_ASIX || TEST_USBH_RTL8152
-#include "netif/etharp.h"
-#include "lwip/netif.h"
-#include "lwip/pbuf.h"
-#include "lwip/tcpip.h"
-#if LWIP_DHCP
-#include "lwip/dhcp.h"
-#include "lwip/prot/dhcp.h"
-#endif
-
-#ifdef __RTTHREAD__
-
-#include <rtthread.h>
-#include <rtdevice.h>
-#include <netif/ethernetif.h>
-
-#else
-#include "FreeRTOS.h"
-#include "task.h"
-#include "semphr.h"
-#include "timers.h"
-
-TimerHandle_t dhcp_handle;
-
-static void dhcp_timeout(TimerHandle_t xTimer)
-{
-    struct netif *netif = (struct netif *)pvTimerGetTimerID(xTimer);
-    struct dhcp *dhcp;
-
-    if (netif_is_up(netif)) {
-        dhcp = netif_dhcp_data(netif);
-
-        if (dhcp && (dhcp->state == DHCP_STATE_BOUND)) {
-            USB_LOG_INFO("IPv4 Address     : %s\r\n", ipaddr_ntoa(&netif->ip_addr));
-            USB_LOG_INFO("IPv4 Subnet mask : %s\r\n", ipaddr_ntoa(&netif->netmask));
-            USB_LOG_INFO("IPv4 Gateway     : %s\r\n\r\n", ipaddr_ntoa(&netif->gw));
-
-            xTimerStop(xTimer, 0);
-        }
-    }
-}
-#endif
-#endif
-
-#if TEST_USBH_CDC_ECM
-#include "usbh_cdc_ecm.h"
-
-struct netif g_cdc_ecm_netif;
-
-#ifdef __RTTHREAD__
-static struct eth_device cdc_ecm_dev;
-
-static rt_err_t rt_usbh_cdc_ecm_control(rt_device_t dev, int cmd, void *args)
-{
-    struct usbh_cdc_ecm *cdc_ecm_class = (struct usbh_cdc_ecm *)dev->user_data;
-
-    switch (cmd) {
-        case NIOCTL_GADDR:
-
-            /* get mac address */
-            if (args)
-                rt_memcpy(args, cdc_ecm_class->mac, 6);
-            else
-                return -RT_ERROR;
-
-            break;
-
-        default:
-            break;
-    }
-
-    return RT_EOK;
-}
-
-static rt_err_t rt_usbh_cdc_ecm_eth_tx(rt_device_t dev, struct pbuf *p)
-{
-    return usbh_cdc_ecm_linkoutput(NULL, p);
-}
-#endif
-
-static err_t usbh_cdc_ecm_if_init(struct netif *netif)
-{
-    LWIP_ASSERT("netif != NULL", (netif != NULL));
-
-    netif->mtu = 1500;
-    netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP | NETIF_FLAG_UP;
-    netif->state = NULL;
-    netif->name[0] = 'E';
-    netif->name[1] = 'X';
-    netif->output = etharp_output;
-    netif->linkoutput = usbh_cdc_ecm_linkoutput;
-    return ERR_OK;
-}
-
-void usbh_cdc_ecm_run(struct usbh_cdc_ecm *cdc_ecm_class)
-{
-#ifdef __RTTHREAD__
-    memset(&cdc_ecm_dev, 0, sizeof(struct eth_device));
-
-    cdc_ecm_dev.parent.control = rt_usbh_cdc_ecm_control;
-    cdc_ecm_dev.eth_rx = NULL;
-    cdc_ecm_dev.eth_tx = rt_usbh_cdc_ecm_eth_tx;
-    cdc_ecm_dev.parent.user_data = cdc_ecm_class;
-
-    eth_device_init(&cdc_ecm_dev, "u0");
-    eth_device_linkchange(&cdc_ecm_dev, RT_TRUE);
-
-    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;
-
-    netif->hwaddr_len = 6;
-    memcpy(netif->hwaddr, cdc_ecm_class->mac, 6);
-
-    IP4_ADDR(&cdc_ecm_class->ipaddr, 0, 0, 0, 0);
-    IP4_ADDR(&cdc_ecm_class->netmask, 0, 0, 0, 0);
-    IP4_ADDR(&cdc_ecm_class->gateway, 0, 0, 0, 0);
-
-    netif = netif_add(netif, &cdc_ecm_class->ipaddr, &cdc_ecm_class->netmask, &cdc_ecm_class->gateway, NULL, usbh_cdc_ecm_if_init, tcpip_input);
-    netif_set_default(netif);
-    while (!netif_is_up(netif)) {
-    }
-
-    dhcp_handle = xTimerCreate((const char *)"dhcp", (TickType_t)200, (UBaseType_t)pdTRUE, (void *const)netif, (TimerCallbackFunction_t)dhcp_timeout);
-    if (dhcp_handle == 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_handle, 0);
-#endif
-#endif
-}
-
-void usbh_cdc_ecm_stop(struct usbh_cdc_ecm *cdc_ecm_class)
-{
-#ifdef __RTTHREAD__
-    eth_device_deinit(&cdc_ecm_dev);
-#else
-    struct netif *netif = &g_cdc_ecm_netif;
-#if LWIP_DHCP
-    dhcp_stop(netif);
-    dhcp_cleanup(netif);
-    xTimerStop(dhcp_handle, 0);
-    xTimerDelete(dhcp_handle, 0);
-#endif
-    netif_set_down(netif);
-    netif_remove(netif);
-#endif
-}
-#endif
-
-#if TEST_USBH_CDC_NCM
-#include "usbh_cdc_ncm.h"
-
-struct netif g_cdc_ncm_netif;
-
-#ifdef __RTTHREAD__
-static struct eth_device cdc_ncm_dev;
-
-static rt_err_t rt_usbh_cdc_ncm_control(rt_device_t dev, int cmd, void *args)
-{
-    struct usbh_cdc_ncm *cdc_ncm_class = (struct usbh_cdc_ncm *)dev->user_data;
-
-    switch (cmd) {
-        case NIOCTL_GADDR:
-
-            /* get mac address */
-            if (args)
-                rt_memcpy(args, cdc_ncm_class->mac, 6);
-            else
-                return -RT_ERROR;
-
-            break;
-
-        default:
-            break;
-    }
-
-    return RT_EOK;
-}
-
-static rt_err_t rt_usbh_cdc_ncm_eth_tx(rt_device_t dev, struct pbuf *p)
-{
-    return usbh_cdc_ncm_linkoutput(NULL, p);
-}
-#endif
-
-static err_t usbh_cdc_ncm_if_init(struct netif *netif)
-{
-    LWIP_ASSERT("netif != NULL", (netif != NULL));
-
-    netif->mtu = 1500;
-    netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP | NETIF_FLAG_UP;
-    netif->state = NULL;
-    netif->name[0] = 'E';
-    netif->name[1] = 'X';
-    netif->output = etharp_output;
-    netif->linkoutput = usbh_cdc_ncm_linkoutput;
-    return ERR_OK;
-}
-
-void usbh_cdc_ncm_run(struct usbh_cdc_ncm *cdc_ncm_class)
-{
-#ifdef __RTTHREAD__
-    memset(&cdc_ncm_dev, 0, sizeof(struct eth_device));
-
-    cdc_ncm_dev.parent.control = rt_usbh_cdc_ncm_control;
-    cdc_ncm_dev.eth_rx = NULL;
-    cdc_ncm_dev.eth_tx = rt_usbh_cdc_ncm_eth_tx;
-    cdc_ncm_dev.parent.user_data = cdc_ncm_class;
-
-    eth_device_init(&cdc_ncm_dev, "u1");
-    eth_device_linkchange(&cdc_ncm_dev, RT_TRUE);
-
-    usb_osal_thread_create("usbh_cdc_ncm_rx", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_cdc_ncm_rx_thread, cdc_ncm_dev.netif);
-#else
-    struct netif *netif = &g_cdc_ncm_netif;
-
-    netif->hwaddr_len = 6;
-    memcpy(netif->hwaddr, cdc_ncm_class->mac, 6);
-
-    IP4_ADDR(&cdc_ncm_class->ipaddr, 0, 0, 0, 0);
-    IP4_ADDR(&cdc_ncm_class->netmask, 0, 0, 0, 0);
-    IP4_ADDR(&cdc_ncm_class->gateway, 0, 0, 0, 0);
-
-    netif = netif_add(netif, &cdc_ncm_class->ipaddr, &cdc_ncm_class->netmask, &cdc_ncm_class->gateway, NULL, usbh_cdc_ncm_if_init, tcpip_input);
-    netif_set_default(netif);
-    while (!netif_is_up(netif)) {
-    }
-
-    dhcp_handle = xTimerCreate((const char *)"dhcp", (TickType_t)200, (UBaseType_t)pdTRUE, (void *const)netif, (TimerCallbackFunction_t)dhcp_timeout);
-    if (dhcp_handle == NULL) {
-        USB_LOG_ERR("timer creation failed! \r\n");
-        while (1) {
-        }
-    }
-
-    usb_osal_thread_create("usbh_cdc_ncm_rx", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_cdc_ncm_rx_thread, netif);
-#if LWIP_DHCP
-    dhcp_start(netif);
-    xTimerStart(dhcp_handle, 0);
-#endif
-#endif
-}
-
-void usbh_cdc_ncm_stop(struct usbh_cdc_ncm *cdc_ncm_class)
-{
-#ifdef __RTTHREAD__
-    eth_device_deinit(&cdc_ncm_dev);
-#else
-    struct netif *netif = &g_cdc_ncm_netif;
-#if LWIP_DHCP
-    dhcp_stop(netif);
-    dhcp_cleanup(netif);
-    xTimerStop(dhcp_handle, 0);
-    xTimerDelete(dhcp_handle, 0);
-#endif
-    netif_set_down(netif);
-    netif_remove(netif);
-#endif
-}
-#endif
-
-#if TEST_USBH_CDC_RNDIS
-#include "usbh_rndis.h"
-
-struct netif g_rndis_netif;
-
-#ifdef __RTTHREAD__
-
-static struct eth_device rndis_dev;
-
-static rt_timer_t keep_timer = RT_NULL;
-
-static void rndis_dev_keepalive_timeout(void *parameter)
-{
-    struct usbh_rndis *rndis_class = (struct usbh_rndis *)parameter;
-    usbh_rndis_keepalive(rndis_class);
-}
-
-static void timer_init(struct usbh_rndis *rndis_class)
-{
-    keep_timer = rt_timer_create("keep",
-                                 rndis_dev_keepalive_timeout,
-                                 rndis_class,
-                                 5000,
-                                 RT_TIMER_FLAG_PERIODIC |
-                                     RT_TIMER_FLAG_SOFT_TIMER);
-
-    rt_timer_start(keep_timer);
-}
-
-static rt_err_t rt_usbh_rndis_control(rt_device_t dev, int cmd, void *args)
-{
-    struct usbh_rndis *rndis_class = (struct usbh_rndis *)dev->user_data;
-
-    switch (cmd) {
-        case NIOCTL_GADDR:
-
-            /* get mac address */
-            if (args)
-                rt_memcpy(args, rndis_class->mac, 6);
-            else
-                return -RT_ERROR;
-
-            break;
-
-        default:
-            break;
-    }
-
-    return RT_EOK;
-}
-
-static rt_err_t rt_usbh_rndis_eth_tx(rt_device_t dev, struct pbuf *p)
-{
-    return usbh_rndis_linkoutput(NULL, p);
-}
-
-#else
-TimerHandle_t timer_handle;
-
-static void rndis_dev_keepalive_timeout(TimerHandle_t xTimer)
-{
-    struct usbh_rndis *rndis_class = (struct usbh_rndis *)pvTimerGetTimerID(xTimer);
-    usbh_rndis_keepalive(rndis_class);
-}
-
-void timer_init(struct usbh_rndis *rndis_class)
-{
-    timer_handle = xTimerCreate((const char *)NULL, (TickType_t)5000, (UBaseType_t)pdTRUE, (void *const)rndis_class, (TimerCallbackFunction_t)rndis_dev_keepalive_timeout);
-    if (NULL != timer_handle) {
-        xTimerStart(timer_handle, 0);
-    } else {
-        USB_LOG_ERR("timer creation failed! \r\n");
-        for (;;) {
-            ;
-        }
-    }
-}
-#endif
-
-static err_t usbh_rndis_if_init(struct netif *netif)
-{
-    LWIP_ASSERT("netif != NULL", (netif != NULL));
-
-    netif->mtu = 1500;
-    netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP | NETIF_FLAG_UP;
-    netif->state = NULL;
-    netif->name[0] = 'E';
-    netif->name[1] = 'X';
-    netif->output = etharp_output;
-    netif->linkoutput = usbh_rndis_linkoutput;
-    return ERR_OK;
-}
-
-void usbh_rndis_run(struct usbh_rndis *rndis_class)
-{
-#ifdef __RTTHREAD__
-    memset(&rndis_dev, 0, sizeof(struct eth_device));
-
-    rndis_dev.parent.control = rt_usbh_rndis_control;
-    rndis_dev.eth_rx = NULL;
-    rndis_dev.eth_tx = rt_usbh_rndis_eth_tx;
-    rndis_dev.parent.user_data = rndis_class;
-
-    eth_device_init(&rndis_dev, "u2");
-    eth_device_linkchange(&rndis_dev, RT_TRUE);
-
-    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;
-
-    netif->hwaddr_len = 6;
-    memcpy(netif->hwaddr, rndis_class->mac, 6);
-
-    IP4_ADDR(&rndis_class->ipaddr, 0, 0, 0, 0);
-    IP4_ADDR(&rndis_class->netmask, 0, 0, 0, 0);
-    IP4_ADDR(&rndis_class->gateway, 0, 0, 0, 0);
-
-    netif = netif_add(netif, &rndis_class->ipaddr, &rndis_class->netmask, &rndis_class->gateway, NULL, usbh_rndis_if_init, tcpip_input);
-    netif_set_default(netif);
-    while (!netif_is_up(netif)) {
-    }
-
-    dhcp_handle = xTimerCreate((const char *)"dhcp2", (TickType_t)200, (UBaseType_t)pdTRUE, (void *const)netif, (TimerCallbackFunction_t)dhcp_timeout);
-    if (dhcp_handle == 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
-    dhcp_start(netif);
-    xTimerStart(dhcp_handle, 0);
-#endif
-#endif
-}
-
-void usbh_rndis_stop(struct usbh_rndis *rndis_class)
-{
-#ifdef __RTTHREAD__
-    eth_device_deinit(&rndis_dev);
-    // rt_timer_stop(keep_timer);
-    // rt_timer_delete(keep_timer);
-#else
-    struct netif *netif = &g_rndis_netif;
-#if LWIP_DHCP
-    dhcp_stop(netif);
-    dhcp_cleanup(netif);
-    xTimerStop(dhcp_handle, 0);
-    xTimerDelete(dhcp_handle, 0);
-#endif
-    netif_set_down(netif);
-    netif_remove(netif);
-    // xTimerStop(timer_handle, 0);
-    // xTimerDelete(timer_handle, 0);
-#endif
-}
-#endif
-
-#if TEST_USBH_ASIX
-#include "usbh_asix.h"
-
-struct netif g_asix_netif;
-
-#ifdef __RTTHREAD__
-static struct eth_device asix_dev;
-
-static rt_err_t rt_usbh_asix_control(rt_device_t dev, int cmd, void *args)
-{
-    struct usbh_asix *asix_class = (struct usbh_asix *)dev->user_data;
-
-    switch (cmd) {
-        case NIOCTL_GADDR:
-
-            /* get mac address */
-            if (args)
-                rt_memcpy(args, asix_class->mac, 6);
-            else
-                return -RT_ERROR;
-
-            break;
-
-        default:
-            break;
-    }
-
-    return RT_EOK;
-}
-
-static rt_err_t rt_usbh_asix_eth_tx(rt_device_t dev, struct pbuf *p)
-{
-    return usbh_asix_linkoutput(NULL, p);
-}
-#endif
-
-static err_t usbh_asix_if_init(struct netif *netif)
-{
-    LWIP_ASSERT("netif != NULL", (netif != NULL));
-
-    netif->mtu = 1500;
-    netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP | NETIF_FLAG_UP;
-    netif->state = NULL;
-    netif->name[0] = 'E';
-    netif->name[1] = 'X';
-    netif->output = etharp_output;
-    netif->linkoutput = usbh_asix_linkoutput;
-    return ERR_OK;
-}
-
-void usbh_asix_run(struct usbh_asix *asix_class)
-{
-#ifdef __RTTHREAD__
-    memset(&asix_dev, 0, sizeof(struct eth_device));
-
-    asix_dev.parent.control = rt_usbh_asix_control;
-    asix_dev.eth_rx = NULL;
-    asix_dev.eth_tx = rt_usbh_asix_eth_tx;
-    asix_dev.parent.user_data = asix_class;
-
-    eth_device_init(&asix_dev, "u3");
-    eth_device_linkchange(&asix_dev, RT_TRUE);
-
-    usb_osal_thread_create("usbh_asix_rx", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_asix_rx_thread, asix_dev.netif);
-#else
-    struct netif *netif = &g_asix_netif;
-
-    netif->hwaddr_len = 6;
-    memcpy(netif->hwaddr, asix_class->mac, 6);
-
-    IP4_ADDR(&asix_class->ipaddr, 0, 0, 0, 0);
-    IP4_ADDR(&asix_class->netmask, 0, 0, 0, 0);
-    IP4_ADDR(&asix_class->gateway, 0, 0, 0, 0);
-
-    netif = netif_add(netif, &asix_class->ipaddr, &asix_class->netmask, &asix_class->gateway, NULL, usbh_asix_if_init, tcpip_input);
-    netif_set_default(netif);
-    while (!netif_is_up(netif)) {
-    }
-
-    dhcp_handle = xTimerCreate((const char *)"dhcp", (TickType_t)200, (UBaseType_t)pdTRUE, (void *const)netif, (TimerCallbackFunction_t)dhcp_timeout);
-    if (dhcp_handle == NULL) {
-        USB_LOG_ERR("timer creation failed! \r\n");
-        while (1) {
-        }
-    }
-
-    usb_osal_thread_create("usbh_asix_rx", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_asix_rx_thread, netif);
-#if LWIP_DHCP
-    dhcp_start(netif);
-    xTimerStart(dhcp_handle, 0);
-#endif
-#endif
-}
-
-void usbh_asix_stop(struct usbh_asix *asix_class)
-{
-#ifdef __RTTHREAD__
-    eth_device_deinit(&asix_dev);
-#else
-    struct netif *netif = &g_asix_netif;
-#if LWIP_DHCP
-    dhcp_stop(netif);
-    dhcp_cleanup(netif);
-    xTimerStop(dhcp_handle, 0);
-    xTimerDelete(dhcp_handle, 0);
-#endif
-    netif_set_down(netif);
-    netif_remove(netif);
-#endif
-}
-#endif
-
-#if TEST_USBH_RTL8152
-#include "usbh_rtl8152.h"
-
-struct netif g_rtl8152_netif;
-
-#ifdef __RTTHREAD__
-static struct eth_device rtl8152_dev;
-
-static rt_err_t rt_usbh_rtl8152_control(rt_device_t dev, int cmd, void *args)
-{
-    struct usbh_rtl8152 *rtl8152_class = (struct usbh_rtl8152 *)dev->user_data;
-
-    switch (cmd) {
-        case NIOCTL_GADDR:
-
-            /* get mac address */
-            if (args)
-                rt_memcpy(args, rtl8152_class->mac, 6);
-            else
-                return -RT_ERROR;
-
-            break;
-
-        default:
-            break;
-    }
-
-    return RT_EOK;
-}
-
-static rt_err_t rt_usbh_rtl8152_eth_tx(rt_device_t dev, struct pbuf *p)
-{
-    return usbh_rtl8152_linkoutput(NULL, p);
-}
-#endif
-
-static err_t usbh_rtl8152_if_init(struct netif *netif)
-{
-    LWIP_ASSERT("netif != NULL", (netif != NULL));
-
-    netif->mtu = 1500;
-    netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP | NETIF_FLAG_UP;
-    netif->state = NULL;
-    netif->name[0] = 'E';
-    netif->name[1] = 'X';
-    netif->output = etharp_output;
-    netif->linkoutput = usbh_rtl8152_linkoutput;
-    return ERR_OK;
-}
-
-void usbh_rtl8152_run(struct usbh_rtl8152 *rtl8152_class)
-{
-#ifdef __RTTHREAD__
-    memset(&rtl8152_dev, 0, sizeof(struct eth_device));
-
-    rtl8152_dev.parent.control = rt_usbh_rtl8152_control;
-    rtl8152_dev.eth_rx = NULL;
-    rtl8152_dev.eth_tx = rt_usbh_rtl8152_eth_tx;
-    rtl8152_dev.parent.user_data = rtl8152_class;
-
-    eth_device_init(&rtl8152_dev, "u4");
-    eth_device_linkchange(&rtl8152_dev, RT_TRUE);
-
-    usb_osal_thread_create("usbh_rtl8152_rx", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_rtl8152_rx_thread, rtl8152_dev.netif);
-#else
-    struct netif *netif = &g_rtl8152_netif;
-
-    netif->hwaddr_len = 6;
-    memcpy(netif->hwaddr, rtl8152_class->mac, 6);
-
-    IP4_ADDR(&rtl8152_class->ipaddr, 0, 0, 0, 0);
-    IP4_ADDR(&rtl8152_class->netmask, 0, 0, 0, 0);
-    IP4_ADDR(&rtl8152_class->gateway, 0, 0, 0, 0);
-
-    netif = netif_add(netif, &rtl8152_class->ipaddr, &rtl8152_class->netmask, &rtl8152_class->gateway, NULL, usbh_rtl8152_if_init, tcpip_input);
-    netif_set_default(netif);
-    while (!netif_is_up(netif)) {
-    }
-
-    dhcp_handle = xTimerCreate((const char *)"dhcp", (TickType_t)200, (UBaseType_t)pdTRUE, (void *const)netif, (TimerCallbackFunction_t)dhcp_timeout);
-    if (dhcp_handle == NULL) {
-        USB_LOG_ERR("timer creation failed! \r\n");
-        while (1) {
-        }
-    }
-
-    usb_osal_thread_create("usbh_rtl8152_rx", 2048, CONFIG_USBHOST_PSC_PRIO + 1, usbh_rtl8152_rx_thread, netif);
-#if LWIP_DHCP
-    dhcp_start(netif);
-    xTimerStart(dhcp_handle, 0);
-#endif
-#endif
-}
-
-void usbh_rtl8152_stop(struct usbh_rtl8152 *rtl8152_class)
-{
-#ifdef __RTTHREAD__
-    eth_device_deinit(&rtl8152_dev);
-#else
-    struct netif *netif = &g_rtl8152_netif;
-#if LWIP_DHCP
-    dhcp_stop(netif);
-    dhcp_cleanup(netif);
-    xTimerStop(dhcp_handle, 0);
-    xTimerDelete(dhcp_handle, 0);
-#endif
-    netif_set_down(netif);
-    netif_remove(netif);
-#endif
-}
-#endif
-
 void usbh_cdc_acm_run(struct usbh_cdc_acm *cdc_acm_class)
 {
 #if TEST_USBH_CDC_ACM
@@ -1066,7 +274,6 @@ void usbh_hid_stop(struct usbh_hid *hid_class)
 {
 }
 
-#ifndef __RTTHREAD__
 void usbh_msc_run(struct usbh_msc *msc_class)
 {
 #if TEST_USBH_MSC
@@ -1077,24 +284,11 @@ void usbh_msc_run(struct usbh_msc *msc_class)
 void usbh_msc_stop(struct usbh_msc *msc_class)
 {
 }
-#endif
 
 #if TEST_USBH_AUDIO
-#error "if you want to use iso, please contact with me"
+#error "commercial charge"
 #endif
 
 #if TEST_USBH_VIDEO
-#error "if you want to use iso, please contact with me"
+#error "commercial charge"
 #endif
-
-void usbh_class_test(void)
-{
-#ifdef __RTTHREAD__
-    /* do nothing */
-#else
-#if TEST_USBH_CDC_ECM || TEST_USBH_CDC_NCM || TEST_USBH_CDC_RNDIS || TEST_USBH_ASIX || TEST_USBH_RTL8152
-    /* Initialize the LwIP stack */
-    tcpip_init(NULL, NULL);
-#endif
-#endif
-}