From 70944027c50375cda040587980fa2e92e985f536 Mon Sep 17 00:00:00 2001 From: sakumisu <1203593632@qq.com> Date: Mon, 12 Aug 2024 22:27:57 +0800 Subject: chore: update cmake and kconfig --- CMakeLists.txt | 147 +++++++++++++++++++++++++ Kconfig | 314 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ Kconfig.cherryusb | 312 ----------------------------------------------------- cherryusb.cmake | 9 +- 4 files changed, 467 insertions(+), 315 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 Kconfig delete mode 100644 Kconfig.cherryusb diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..57fd38bd --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,147 @@ +cmake_minimum_required(VERSION 3.15) + +if(DEFINED ENV{BL_SDK_BASE}) +set(CONFIG_CHERRYUSB_DEVICE 1) +set(CONFIG_CHERRYUSB_DEVICE_CDC 1) +set(CONFIG_CHERRYUSB_DEVICE_HID 1) +set(CONFIG_CHERRYUSB_DEVICE_MSC 1) +set(CONFIG_CHERRYUSB_DEVICE_VIDEO 1) +set(CONFIG_CHERRYUSB_DEVICE_DCD "bl") + +set(CONFIG_CHERRYUSB_HOST 1) +set(CONFIG_CHERRYUSB_HOST_CDC_ACM 1) +set(CONFIG_CHERRYUSB_HOST_CDC_ECM 1) +set(CONFIG_CHERRYUSB_HOST_CDC_NCM 1) +set(CONFIG_CHERRYUSB_HOST_HID 1) +set(CONFIG_CHERRYUSB_HOST_MSC 1) +set(CONFIG_CHERRYUSB_HOST_VIDEO 1) +set(CONFIG_CHERRYUSB_HOST_AUDIO 1) +set(CONFIG_CHERRYUSB_HOST_CDC_RNDIS 1) +set(CONFIG_CHERRYUSB_HOST_BLUETOOTH 1) +set(CONFIG_CHERRYUSB_HOST_ASIX 1) +set(CONFIG_CHERRYUSB_HOST_RTL8152 1) +set(CONFIG_CHERRYUSB_HOST_CH34X 1) +set(CONFIG_CHERRYUSB_HOST_CP210X 1) +set(CONFIG_CHERRYUSB_HOST_FTDI 1) +set(CONFIG_CHERRYUSB_HOST_PL2303 1) +set(CONFIG_CHERRYUSB_OSAL "freertos") +set(CONFIG_CHERRYUSB_HOST_HCD "ehci_bouffalo") + +include(cherryusb.cmake) + +sdk_generate_library(cherryusb) +sdk_add_include_directories(${cherryusb_incs}) +sdk_library_add_sources(${cherryusb_srcs}) + +sdk_library_add_sources(platform/none/usbh_lwip.c) + +elseif(DEFINED ENV{HPM_SDK_BASE}) +set(CONFIG_CHERRYUSB_HOST 1) +set(CONFIG_CHERRYUSB_HOST_CDC_ACM 1) +set(CONFIG_CHERRYUSB_HOST_CDC_ECM 1) +set(CONFIG_CHERRYUSB_HOST_CDC_NCM 1) +set(CONFIG_CHERRYUSB_HOST_HID 1) +set(CONFIG_CHERRYUSB_HOST_MSC 1) +set(CONFIG_CHERRYUSB_HOST_VIDEO 1) +set(CONFIG_CHERRYUSB_HOST_AUDIO 1) +set(CONFIG_CHERRYUSB_HOST_CDC_RNDIS 1) +# set(CONFIG_CHERRYUSB_HOST_BLUETOOTH 1) +set(CONFIG_CHERRYUSB_HOST_ASIX 1) +set(CONFIG_CHERRYUSB_HOST_RTL8152 1) +set(CONFIG_CHERRYUSB_HOST_CH34X 1) +set(CONFIG_CHERRYUSB_HOST_CP210X 1) +set(CONFIG_CHERRYUSB_HOST_FTDI 1) +set(CONFIG_CHERRYUSB_HOST_PL2303 1) +set(CONFIG_CHERRYUSB_HOST_BL616 1) +set(CONFIG_CHERRYUSB_OSAL "freertos") +set(CONFIG_CHERRYUSB_HOST_HCD "ehci_hpm") + +include(cherryusb.cmake) + +sdk_inc(${cherryusb_incs}) +sdk_src(${cherryusb_srcs}) + +sdk_src(platform/none/usbh_lwip.c) + +elseif(ESP_PLATFORM) + +set(CONFIG_CHERRYUSB_DEVICE_DCD "dwc2_esp") +set(CONFIG_CHERRYUSB_HOST_HCD "dwc2_esp") +set(CONFIG_CHERRYUSB_OSAL "idf") + +include(cherryusb.cmake) + +set(ldfragments "osal/idf/linker.lf") + +idf_component_register(SRCS ${cherryusb_srcs} + INCLUDE_DIRS ${cherryusb_incs} + PRIV_REQUIRES usb + LDFRAGMENTS ${ldfragments} +) + +if(CONFIG_CHERRYUSB_HOST) + target_linker_script(${COMPONENT_LIB} INTERFACE "osal/idf/usbh_class_info.ld") + + # 强制链接器不删除符号 + if(CONFIG_CHERRYUSB_HOST_CDC_ACM) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u cdc_acm_class_info") + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u cdc_data_class_info") + endif() + if(CONFIG_CHERRYUSB_HOST_HID) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u hid_custom_class_info") + endif() + if(CONFIG_CHERRYUSB_HOST_MSC) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u msc_class_info") + endif() + if(CONFIG_CHERRYUSB_HOST_CDC_ECM) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u cdc_ecm_class_info") + endif() + if(CONFIG_CHERRYUSB_HOST_CDC_RNDIS) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u rndis_class_info") + endif() + if(CONFIG_CHERRYUSB_HOST_CDC_NCM) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u cdc_ncm_class_info") + endif() + if(CONFIG_CHERRYUSB_HOST_VIDEO) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u video_ctrl_class_info") + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u video_streaming_class_info") + endif() + if(CONFIG_CHERRYUSB_HOST_AUDIO) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u audio_ctrl_intf_class_info") + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u audio_streaming_intf_class_info") + endif() + if(CONFIG_CHERRYUSB_HOST_BLUETOOTH) + if(CONFIG_USBHOST_BLUETOOTH_HCI_H4) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u bluetooth_h4_nrf_class_info") + else() + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u bluetooth_class_info") + endif() + endif() + if(CONFIG_CHERRYUSB_HOST_ASIX) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u asix_class_info") + endif() + if(CONFIG_CHERRYUSB_HOST_RTL8152) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u rtl8152_class_info") + endif() + if(CONFIG_CHERRYUSB_HOST_FTDI) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u ftdi_class_info") + endif() + if(CONFIG_CHERRYUSB_HOST_CH34X) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u ch34x_class_info") + endif() + if(CONFIG_CHERRYUSB_HOST_CP210X) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u cp210x_class_info") + endif() + if(CONFIG_CHERRYUSB_HOST_PL2303) + target_link_libraries(${COMPONENT_LIB} INTERFACE "-u pl2303_class_info") + endif() +endif() + +if(CONFIG_CHERRYUSB) + set_source_files_properties("class/audio/usbd_audio.c" + PROPERTIES COMPILE_FLAGS + -Wno-maybe-uninitialized) + include(package_manager) + cu_pkg_define_version(${CMAKE_CURRENT_LIST_DIR}) +endif() +endif() \ No newline at end of file diff --git a/Kconfig b/Kconfig new file mode 100644 index 00000000..a630e73c --- /dev/null +++ b/Kconfig @@ -0,0 +1,314 @@ +# Kconfig file for CherryUSB +menuconfig CHERRYUSB + bool "Using CherryUSB" + default n + +if CHERRYUSB + + menuconfig CHERRYUSB_DEVICE + bool "Enable usb device mode" + default n + + if CHERRYUSB_DEVICE + choice + prompt "Select usb device speed" + default CHERRYUSB_DEVICE_SPEED_FS + config CHERRYUSB_DEVICE_SPEED_FS + bool "FS" + config CHERRYUSB_DEVICE_SPEED_HS + bool "HS" + config CHERRYUSB_DEVICE_SPEED_AUTO + bool "AUTO" + endchoice + + choice + prompt "Select usb device ip, and some ip need config in usb_config.h, please check" + default CHERRYUSB_DEVICE_CUSTOM + config CHERRYUSB_DEVICE_CUSTOM + bool "CUSTOM (Implement it yourself)" + config CHERRYUSB_DEVICE_FSDEV + bool "fsdev" + config CHERRYUSB_DEVICE_DWC2_ST + bool "dwc2_st" + config CHERRYUSB_DEVICE_DWC2_ESP + bool "dwc2_esp" + config CHERRYUSB_DEVICE_DWC2_AT + bool "dwc2_at" + config CHERRYUSB_DEVICE_DWC2_GD + bool "dwc2_gd" + config CHERRYUSB_DEVICE_DWC2_HC + bool "dwc2_hc" + config CHERRYUSB_DEVICE_DWC2_CUSTOM + bool "dwc2_custom" + config CHERRYUSB_DEVICE_MUSB_ES + bool "musb_es" + config CHERRYUSB_DEVICE_MUSB_SUNXI + bool "musb_sunxi" + config CHERRYUSB_DEVICE_MUSB_BK + bool "musb_bk" + config CHERRYUSB_DEVICE_MUSB_CUSTOM + bool "musb_custom" + config CHERRYUSB_DEVICE_BL + bool "bouffalo" + config CHERRYUSB_DEVICE_HPM + bool "hpm" + config CHERRYUSB_DEVICE_AIC + bool "aic" + config CHERRYUSB_DEVICE_CH32 + bool "ch32" + config CHERRYUSB_DEVICE_PUSB2 + bool "pusb2" + endchoice + + config CHERRYUSB_DEVICE_CDC_ACM + bool + prompt "Enable usb cdc acm device" + default n + + config CHERRYUSB_DEVICE_HID + bool + prompt "Enable usb hid device" + default n + + config CHERRYUSB_DEVICE_MSC + bool + prompt "Enable usb msc device" + default n + + config CHERRYUSB_DEVICE_AUDIO + bool + prompt "Enable usb audio device" + default n + + config CHERRYUSB_DEVICE_VIDEO + bool + prompt "Enable usb video device" + default n + + config CHERRYUSB_DEVICE_CDC_RNDIS + bool + prompt "Enable usb cdc rndis device" + default n + + config CHERRYUSB_DEVICE_CDC_ECM + bool + prompt "Enable usb cdc ecm device" + default n + + config CHERRYUSB_DEVICE_CDC_NCM + bool + prompt "Enable usb cdc ncm device" + default n + + config CHERRYUSB_DEVICE_DFU + bool + prompt "Enable usb dfu device" + default n + + choice + prompt "Select usb device template" + default CHERRYUSB_DEVICE_TEMPLATE_NONE + config CHERRYUSB_DEVICE_TEMPLATE_NONE + bool "none (Implement it yourself)" + config CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM + bool "cdc_acm" + config CHERRYUSB_DEVICE_TEMPLATE_MSC + bool "msc" + config CHERRYUSB_DEVICE_TEMPLATE_HID_KEYBOARD + bool "hid_keyboard" + config CHERRYUSB_DEVICE_TEMPLATE_HID_MOUSE + bool "hid_mouse" + config CHERRYUSB_DEVICE_TEMPLATE_HID_CUSTOM + bool "hid_custom" + config CHERRYUSB_DEVICE_TEMPLATE_VIDEO + bool "video" + config CHERRYUSB_DEVICE_TEMPLATE_AUDIO_V1_MIC_SPEAKER + bool "audio_v1_mic_speaker_multichan" + config CHERRYUSB_DEVICE_TEMPLATE_AUDIO_V2_MIC_SPEAKER + bool "audio_v2_mic_speaker_multichan" + config CHERRYUSB_DEVICE_TEMPLATE_CDC_RNDIS + bool "cdc_rndis" + config CHERRYUSB_DEVICE_TEMPLATE_CDC_ECM + bool "cdc_ecm" + config CHERRYUSB_DEVICE_TEMPLATE_CDC_NCM + bool "cdc_ncm" + config CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM_MSC + bool "cdc_acm_msc" + config CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM_MSC_HID + bool "cdc_acm_msc_hid" + config CHERRYUSB_DEVICE_TEMPLATE_WINUSBV1 + bool "winusbv1" + config CHERRYUSB_DEVICE_TEMPLATE_WINUSBV2_CDC + bool "winusbv2_cdc" + config CHERRYUSB_DEVICE_TEMPLATE_WINUSBV2_HID + bool "winusbv2_hid" + endchoice + + endif + + menuconfig CHERRYUSB_HOST + bool "Enable usb host mode" + default n + + if CHERRYUSB_HOST + choice + prompt "Select usb host ip, and some ip need config in usb_config.h, please check" + default CHERRYUSB_HOST_CUSTOM + config CHERRYUSB_HOST_CUSTOM + bool "CUSTOM (Implement it yourself)" + config CHERRYUSB_HOST_EHCI_BL + bool "ehci_bouffalo" + config CHERRYUSB_HOST_EHCI_HPM + bool "ehci_hpm" + config CHERRYUSB_HOST_EHCI_AIC + bool "ehci_aic" + config CHERRYUSB_HOST_EHCI_NUVOTON_NUC980 + bool "ehci_nuvoton_nuc980" + config CHERRYUSB_HOST_EHCI_NUVOTON_MA35D0 + bool "ehci_nuvoton_ma35d0" + config CHERRYUSB_HOST_EHCI_CUSTOM + bool "ehci_custom" + config CHERRYUSB_HOST_DWC2_ST + bool "dwc2_st" + config CHERRYUSB_HOST_DWC2_ESP + bool "dwc2_esp" + config CHERRYUSB_HOST_DWC2_HC + bool "dwc2_hc" + config CHERRYUSB_HOST_DWC2_CUSTOM + bool "dwc2_custom" + config CHERRYUSB_HOST_MUSB_ES + bool "musb_es" + config CHERRYUSB_HOST_MUSB_SUNXI + bool "musb_sunxi" + config CHERRYUSB_HOST_MUSB_BK + bool "musb_bk" + config CHERRYUSB_HOST_MUSB_CUSTOM + bool "musb_custom" + config CHERRYUSB_HOST_PUSB2 + bool "pusb2" + config CHERRYUSB_HOST_XHCI_PHYTIUM + bool "xhci_phytium" + config CHERRYUSB_HOST_XHCI_CUSTOM + bool "xhci" + endchoice + + config CHERRYUSB_HOST_CDC_ACM + bool + prompt "Enable usb cdc acm driver" + default n + + config CHERRYUSB_HOST_HID + bool + prompt "Enable usb hid driver" + default n + + config CHERRYUSB_HOST_MSC + bool + prompt "Enable usb msc driver" + default n + + config CHERRYUSB_HOST_CDC_ECM + bool + prompt "Enable usb cdc ecm driver" + select USBHOST_PLATFORM_CDC_ECM + default n + + config CHERRYUSB_HOST_CDC_RNDIS + bool + prompt "Enable usb rndis driver" + select USBHOST_PLATFORM_CDC_RNDIS + default n + + config CHERRYUSB_HOST_CDC_NCM + bool + prompt "Enable usb cdc ncm driver" + select USBHOST_PLATFORM_CDC_NCM + default n + + config CHERRYUSB_HOST_VIDEO + bool + prompt "Enable usb video driver, it is commercial charge" + default n + + config CHERRYUSB_HOST_AUDIO + bool + prompt "Enable usb audio driver, it is commercial charge" + default n + + config CHERRYUSB_HOST_BLUETOOTH + bool + prompt "Enable usb bluetooth driver" + default n + + config CHERRYUSB_HOST_ASIX + bool + prompt "Enable usb asix driver" + select USBHOST_PLATFORM_ASIX + default n + + config CHERRYUSB_HOST_RTL8152 + bool + prompt "Enable usb rtl8152 driver" + select USBHOST_PLATFORM_RTL8152 + default n + + config CHERRYUSB_HOST_FTDI + bool + prompt "Enable usb ftdi driver" + default n + + config CHERRYUSB_HOST_CH34X + bool + prompt "Enable usb ch34x driver" + default n + + config CHERRYUSB_HOST_CP210X + bool + prompt "Enable usb cp210x driver" + default n + + config CHERRYUSB_HOST_PL2303 + bool + prompt "Enable usb pl2303 driver" + default n + + config USBHOST_PLATFORM_CDC_ECM + bool + + config USBHOST_PLATFORM_CDC_RNDIS + bool + + config USBHOST_PLATFORM_CDC_NCM + bool + + config USBHOST_PLATFORM_ASIX + bool + + config USBHOST_PLATFORM_RTL8152 + bool + + config CHERRYUSB_HOST_TEMPLATE + bool + prompt "Use usb host template" + default n + + if CHERRYUSB_HOST_TEMPLATE + config TEST_USBH_CDC_ACM + int + prompt "demo for test cdc acm" + default 0 + depends on CHERRYUSB_HOST_CDC_ACM + config TEST_USBH_HID + int + prompt "demo for test hid" + default 0 + depends on CHERRYUSB_HOST_HID + config TEST_USBH_MSC + int + prompt "demo for test msc" + default 0 + depends on CHERRYUSB_HOST_MSC + endif + endif + +endif diff --git a/Kconfig.cherryusb b/Kconfig.cherryusb deleted file mode 100644 index 0e36e73b..00000000 --- a/Kconfig.cherryusb +++ /dev/null @@ -1,312 +0,0 @@ -# Kconfig file for CherryUSB -menuconfig CHERRYUSB - bool "Using CherryUSB" - default n - -if CHERRYUSB - - menuconfig CHERRYUSB_DEVICE - bool "Enable usb device mode" - default n - - if CHERRYUSB_DEVICE - choice - prompt "Select usb device speed" - default CHERRYUSB_DEVICE_SPEED_FS - config CHERRYUSB_DEVICE_SPEED_FS - bool "FS" - config CHERRYUSB_DEVICE_SPEED_HS - bool "HS" - config CHERRYUSB_DEVICE_SPEED_AUTO - bool "AUTO" - endchoice - - choice - prompt "Select usb device ip, and some ip need config in usb_config.h, please check" - default CHERRYUSB_DEVICE_CUSTOM - config CHERRYUSB_DEVICE_CUSTOM - bool "CUSTOM (Implement it yourself)" - config CHERRYUSB_DEVICE_FSDEV - bool "fsdev" - config CHERRYUSB_DEVICE_DWC2_ST - bool "dwc2_st" - config CHERRYUSB_DEVICE_DWC2_ESP - bool "dwc2_esp" - config CHERRYUSB_DEVICE_DWC2_AT - bool "dwc2_at" - config CHERRYUSB_DEVICE_DWC2_GD - bool "dwc2_gd" - config CHERRYUSB_DEVICE_DWC2_HC - bool "dwc2_hc" - config CHERRYUSB_DEVICE_DWC2_CUSTOM - bool "dwc2_custom" - config CHERRYUSB_DEVICE_MUSB_ES - bool "musb_es" - config CHERRYUSB_DEVICE_MUSB_SUNXI - bool "musb_sunxi" - config CHERRYUSB_DEVICE_MUSB_BK - bool "musb_bk" - config CHERRYUSB_DEVICE_MUSB_CUSTOM - bool "musb_custom" - config CHERRYUSB_DEVICE_BL - bool "bouffalo" - config CHERRYUSB_DEVICE_HPM - bool "hpm" - config CHERRYUSB_DEVICE_AIC - bool "aic" - config CHERRYUSB_DEVICE_CH32 - bool "ch32" - config CHERRYUSB_DEVICE_PUSB2 - bool "pusb2" - endchoice - - config CHERRYUSB_DEVICE_CDC_ACM - bool - prompt "Enable usb cdc acm device" - default n - - config CHERRYUSB_DEVICE_HID - bool - prompt "Enable usb hid device" - default n - - config CHERRYUSB_DEVICE_MSC - bool - prompt "Enable usb msc device" - default n - - config CHERRYUSB_DEVICE_AUDIO - bool - prompt "Enable usb audio device" - default n - - config CHERRYUSB_DEVICE_VIDEO - bool - prompt "Enable usb video device" - default n - - config CHERRYUSB_DEVICE_CDC_RNDIS - bool - prompt "Enable usb cdc rndis device" - default n - - config CHERRYUSB_DEVICE_CDC_ECM - bool - prompt "Enable usb cdc ecm device" - default n - - config CHERRYUSB_DEVICE_CDC_NCM - bool - prompt "Enable usb cdc ncm device" - default n - - config CHERRYUSB_DEVICE_DFU - bool - prompt "Enable usb dfu device" - default n - - choice - prompt "Select usb device template" - default CHERRYUSB_DEVICE_TEMPLATE_NONE - config CHERRYUSB_DEVICE_TEMPLATE_NONE - bool "none (Implement it yourself)" - config CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM - bool "cdc_acm" - config CHERRYUSB_DEVICE_TEMPLATE_MSC - bool "msc" - config CHERRYUSB_DEVICE_TEMPLATE_HID_KEYBOARD - bool "hid_keyboard" - config CHERRYUSB_DEVICE_TEMPLATE_HID_MOUSE - bool "hid_mouse" - config CHERRYUSB_DEVICE_TEMPLATE_HID_CUSTOM - bool "hid_custom" - config CHERRYUSB_DEVICE_TEMPLATE_VIDEO - bool "video" - config CHERRYUSB_DEVICE_TEMPLATE_AUDIO_V1_MIC_SPEAKER - bool "audio_v1_mic_speaker_multichan" - config CHERRYUSB_DEVICE_TEMPLATE_AUDIO_V2_MIC_SPEAKER - bool "audio_v2_mic_speaker_multichan" - config CHERRYUSB_DEVICE_TEMPLATE_CDC_RNDIS - bool "cdc_rndis" - config CHERRYUSB_DEVICE_TEMPLATE_CDC_ECM - bool "cdc_ecm" - config CHERRYUSB_DEVICE_TEMPLATE_CDC_NCM - bool "cdc_ncm" - config CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM_MSC - bool "cdc_acm_msc" - config CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM_MSC_HID - bool "cdc_acm_msc_hid" - config CHERRYUSB_DEVICE_TEMPLATE_WINUSBV1 - bool "winusbv1" - config CHERRYUSB_DEVICE_TEMPLATE_WINUSBV2_CDC - bool "winusbv2_cdc" - config CHERRYUSB_DEVICE_TEMPLATE_WINUSBV2_HID - bool "winusbv2_hid" - endchoice - - endif - - menuconfig CHERRYUSB_HOST - bool "Enable usb host mode" - default n - - if CHERRYUSB_HOST - choice - prompt "Select usb host ip, and some ip need config in usb_config.h, please check" - default CHERRYUSB_HOST_CUSTOM - config CHERRYUSB_HOST_CUSTOM - bool "CUSTOM (Implement it yourself)" - config CHERRYUSB_HOST_EHCI_BL - bool "ehci_bouffalo" - config CHERRYUSB_HOST_EHCI_HPM - bool "ehci_hpm" - config CHERRYUSB_HOST_EHCI_AIC - bool "ehci_aic" - config CHERRYUSB_HOST_EHCI_NUVOTON_NUC980 - bool "ehci_nuvoton_nuc980" - config CHERRYUSB_HOST_EHCI_NUVOTON_MA35D0 - bool "ehci_nuvoton_ma35d0" - config CHERRYUSB_HOST_EHCI_CUSTOM - bool "ehci_custom" - config CHERRYUSB_HOST_DWC2_ST - bool "dwc2_st" - config CHERRYUSB_HOST_DWC2_ESP - bool "dwc2_esp" - config CHERRYUSB_HOST_DWC2_HC - bool "dwc2_hc" - config CHERRYUSB_HOST_DWC2_CUSTOM - bool "dwc2_custom" - config CHERRYUSB_HOST_MUSB_ES - bool "musb_es" - config CHERRYUSB_HOST_MUSB_SUNXI - bool "musb_sunxi" - config CHERRYUSB_HOST_MUSB_BK - bool "musb_bk" - config CHERRYUSB_HOST_MUSB_CUSTOM - bool "musb_custom" - config CHERRYUSB_HOST_PUSB2 - bool "pusb2" - config CHERRYUSB_HOST_XHCI - bool "xhci" - endchoice - - config CHERRYUSB_HOST_CDC_ACM - bool - prompt "Enable usb cdc acm driver" - default n - - config CHERRYUSB_HOST_HID - bool - prompt "Enable usb hid driver" - default n - - config CHERRYUSB_HOST_MSC - bool - prompt "Enable usb msc driver" - default n - - config CHERRYUSB_HOST_CDC_ECM - bool - prompt "Enable usb cdc ecm driver" - select USBHOST_PLATFORM_CDC_ECM - default n - - config CHERRYUSB_HOST_CDC_RNDIS - bool - prompt "Enable usb rndis driver" - select USBHOST_PLATFORM_CDC_RNDIS - default n - - config CHERRYUSB_HOST_CDC_NCM - bool - prompt "Enable usb cdc ncm driver" - select USBHOST_PLATFORM_CDC_NCM - default n - - config CHERRYUSB_HOST_VIDEO - bool - prompt "Enable usb video driver, it is commercial charge" - default n - - config CHERRYUSB_HOST_AUDIO - bool - prompt "Enable usb audio driver, it is commercial charge" - default n - - config CHERRYUSB_HOST_BLUETOOTH - bool - prompt "Enable usb bluetooth driver" - default n - - config CHERRYUSB_HOST_ASIX - bool - prompt "Enable usb asix driver" - select USBHOST_PLATFORM_ASIX - default n - - config CHERRYUSB_HOST_RTL8152 - bool - prompt "Enable usb rtl8152 driver" - select USBHOST_PLATFORM_RTL8152 - default n - - config CHERRYUSB_HOST_FTDI - bool - prompt "Enable usb ftdi driver" - default n - - config CHERRYUSB_HOST_CH34X - bool - prompt "Enable usb ch34x driver" - default n - - config CHERRYUSB_HOST_CP210X - bool - prompt "Enable usb cp210x driver" - default n - - config CHERRYUSB_HOST_PL2303 - bool - prompt "Enable usb pl2303 driver" - default n - - config USBHOST_PLATFORM_CDC_ECM - bool - - config USBHOST_PLATFORM_CDC_RNDIS - bool - - config USBHOST_PLATFORM_CDC_NCM - bool - - config USBHOST_PLATFORM_ASIX - bool - - config USBHOST_PLATFORM_RTL8152 - bool - - config CHERRYUSB_HOST_TEMPLATE - bool - prompt "Use usb host template" - default n - - if CHERRYUSB_HOST_TEMPLATE - config TEST_USBH_CDC_ACM - int - prompt "demo for test cdc acm" - default 0 - depends on CHERRYUSB_HOST_CDC_ACM - config TEST_USBH_HID - int - prompt "demo for test hid" - default 0 - depends on CHERRYUSB_HOST_HID - config TEST_USBH_MSC - int - prompt "demo for test msc" - default 0 - depends on CHERRYUSB_HOST_MSC - endif - endif - -endif diff --git a/cherryusb.cmake b/cherryusb.cmake index 644d8003..a95deece 100644 --- a/cherryusb.cmake +++ b/cherryusb.cmake @@ -122,6 +122,9 @@ if(CONFIG_CHERRYUSB_HOST) if(CONFIG_CHERRYUSB_HOST_CDC_ECM) list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/class/cdc/usbh_cdc_ecm.c) endif() + if(CONFIG_CHERRYUSB_HOST_CDC_RNDIS) + list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/class/wireless/usbh_rndis.c) + endif() if(CONFIG_CHERRYUSB_HOST_CDC_NCM) list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/class/cdc/usbh_cdc_ncm.c) endif() @@ -152,9 +155,6 @@ if(CONFIG_CHERRYUSB_HOST) if(CONFIG_CHERRYUSB_HOST_AUDIO) list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/class/audio/usbh_audio.c) endif() - if(CONFIG_CHERRYUSB_HOST_CDC_RNDIS) - list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/class/wireless/usbh_rndis.c) - endif() if(CONFIG_CHERRYUSB_HOST_BLUETOOTH) list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/class/wireless/usbh_bluetooth.c) @@ -264,5 +264,8 @@ if(DEFINED CONFIG_CHERRYUSB_OSAL) list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/osal/usb_osal_rtthread.c) elseif("${CONFIG_CHERRYUSB_OSAL}" STREQUAL "yoc") list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/osal/usb_osal_yoc.c) + elseif("${CONFIG_CHERRYUSB_OSAL}" STREQUAL "idf") + list(APPEND cherryusb_incs ${CMAKE_CURRENT_LIST_DIR}/osal/idf) + list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/osal/idf/usb_osal_idf.c) endif() endif() \ No newline at end of file -- cgit v1.3.1