Skip to content

Commit 44d92be

Browse files
committed
update(platform): remove net class weak api, check CONFIG_USBHOST_PLATFORM_* macro is defined or not in usbh_lwip.c
Signed-off-by: sakumisu <1203593632@qq.com>
1 parent d172c89 commit 44d92be

7 files changed

Lines changed: 16 additions & 50 deletions

File tree

class/cdc/usbh_cdc_ecm.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -306,16 +306,6 @@ int usbh_cdc_ecm_eth_output(uint32_t buflen)
306306
return usbh_submit_urb(&g_cdc_ecm_class.bulkout_urb);
307307
}
308308

309-
__WEAK void usbh_cdc_ecm_run(struct usbh_cdc_ecm *cdc_ecm_class)
310-
{
311-
(void)cdc_ecm_class;
312-
}
313-
314-
__WEAK void usbh_cdc_ecm_stop(struct usbh_cdc_ecm *cdc_ecm_class)
315-
{
316-
(void)cdc_ecm_class;
317-
}
318-
319309
const struct usbh_class_driver cdc_ecm_class_driver = {
320310
.driver_name = "cdc_ecm",
321311
.connect = usbh_cdc_ecm_connect,

class/cdc/usbh_cdc_ncm.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -386,16 +386,6 @@ int usbh_cdc_ncm_eth_output(uint32_t buflen)
386386
return usbh_submit_urb(&g_cdc_ncm_class.bulkout_urb);
387387
}
388388

389-
__WEAK void usbh_cdc_ncm_run(struct usbh_cdc_ncm *cdc_ncm_class)
390-
{
391-
(void)cdc_ncm_class;
392-
}
393-
394-
__WEAK void usbh_cdc_ncm_stop(struct usbh_cdc_ncm *cdc_ncm_class)
395-
{
396-
(void)cdc_ncm_class;
397-
}
398-
399389
const struct usbh_class_driver cdc_ncm_class_driver = {
400390
.driver_name = "cdc_ncm",
401391
.connect = usbh_cdc_ncm_connect,

class/vendor/net/usbh_asix.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -795,16 +795,6 @@ int usbh_asix_eth_output(uint32_t buflen)
795795
return usbh_submit_urb(&g_asix_class.bulkout_urb);
796796
}
797797

798-
__WEAK void usbh_asix_run(struct usbh_asix *asix_class)
799-
{
800-
(void)asix_class;
801-
}
802-
803-
__WEAK void usbh_asix_stop(struct usbh_asix *asix_class)
804-
{
805-
(void)asix_class;
806-
}
807-
808798
static const uint16_t asix_id_table[][2] = {
809799
{ 0x0B95, 0x772B },
810800
{ 0x0B95, 0x7720 },

class/vendor/net/usbh_rtl8152.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,16 +2251,6 @@ int usbh_rtl8152_eth_output(uint32_t buflen)
22512251
return usbh_submit_urb(&g_rtl8152_class.bulkout_urb);
22522252
}
22532253

2254-
__WEAK void usbh_rtl8152_run(struct usbh_rtl8152 *rtl8152_class)
2255-
{
2256-
(void)rtl8152_class;
2257-
}
2258-
2259-
__WEAK void usbh_rtl8152_stop(struct usbh_rtl8152 *rtl8152_class)
2260-
{
2261-
(void)rtl8152_class;
2262-
}
2263-
22642254
static const uint16_t rtl_id_table[][2] = {
22652255
{ 0x0BDA, 0x8152 },
22662256
{ 0, 0 },

class/wireless/usbh_rndis.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -578,16 +578,6 @@ int usbh_rndis_eth_output(uint32_t buflen)
578578
return usbh_submit_urb(&g_rndis_class.bulkout_urb);
579579
}
580580

581-
__WEAK void usbh_rndis_run(struct usbh_rndis *rndis_class)
582-
{
583-
(void)rndis_class;
584-
}
585-
586-
__WEAK void usbh_rndis_stop(struct usbh_rndis *rndis_class)
587-
{
588-
(void)rndis_class;
589-
}
590-
591581
static const struct usbh_class_driver rndis_class_driver = {
592582
.driver_name = "rndis",
593583
.connect = usbh_rndis_connect,

platform/lwip/usbh_lwip.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@
3030
#error TCPIP_THREAD_STACKSIZE must be >= 1024
3131
#endif
3232

33+
#if !defined(CONFIG_USBHOST_PLATFORM_CDC_ECM) && \
34+
!defined(CONFIG_USBHOST_PLATFORM_CDC_RNDIS) && \
35+
!defined(CONFIG_USBHOST_PLATFORM_CDC_NCM) && \
36+
!defined(CONFIG_USBHOST_PLATFORM_ASIX) && \
37+
!defined(CONFIG_USBHOST_PLATFORM_RTL8152)
38+
#error "Please enable at least one USB Ethernet platform in usb_config.h or Kconfig"
39+
#endif
40+
3341
// #define CONFIG_USBHOST_PLATFORM_CDC_ECM
3442
// #define CONFIG_USBHOST_PLATFORM_CDC_RNDIS
3543
// #define CONFIG_USBHOST_PLATFORM_CDC_NCM

platform/rtthread/usbh_lwip.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@
4848
#error RT_LWIP_TCPTHREAD_STACKSIZE must be >= 2048
4949
#endif
5050

51+
#if !defined(CONFIG_USBHOST_PLATFORM_CDC_ECM) && \
52+
!defined(CONFIG_USBHOST_PLATFORM_CDC_RNDIS) && \
53+
!defined(CONFIG_USBHOST_PLATFORM_CDC_NCM) && \
54+
!defined(CONFIG_USBHOST_PLATFORM_ASIX) && \
55+
!defined(CONFIG_USBHOST_PLATFORM_RTL8152)
56+
#error "Please enable at least one USB Ethernet platform in usb_config.h or Kconfig"
57+
#endif
58+
5159
// #define CONFIG_USBHOST_PLATFORM_CDC_ECM
5260
// #define CONFIG_USBHOST_PLATFORM_CDC_RNDIS
5361
// #define CONFIG_USBHOST_PLATFORM_CDC_NCM

0 commit comments

Comments
 (0)