diff --git a/system/CherryUSB/Kconfig b/system/CherryUSB/Kconfig index 63614327dd..7f7862ba47 100644 --- a/system/CherryUSB/Kconfig +++ b/system/CherryUSB/Kconfig @@ -53,6 +53,8 @@ if PKG_USING_CHERRYUSB bool "musb_sunxi" config PKG_CHERRYUSB_DEVICE_MUSB_BK bool "musb_bk" + config PKG_CHERRYUSB_DEVICE_MUSB_SIFLI + bool "musb_sifli" config PKG_CHERRYUSB_DEVICE_MUSB_CUSTOM bool "musb_custom" config PKG_CHERRYUSB_DEVICE_CHIPIDEA_MCX @@ -139,49 +141,110 @@ if PKG_USING_CHERRYUSB prompt "Enable chardev for cdc acm device" default n + config CONFIG_USBDEV_REQUEST_BUFFER_LEN + int + prompt "Set device control transfer max buffer size" + default 512 + + config CONFIG_USBDEV_MSC_MAX_BUFSIZE + int + prompt "Set usb msc device max buffer size" + default 512 + help + Set the maximum buffer size for usb msc device, it is used to transfer data. + you can change it to a larger value if you need larger speed but must be a power of blocksize. + + config CONFIG_USBDEV_RNDIS_USING_LWIP + bool + prompt "Enable usb rndis device with lwip for lan" + default n + + config CONFIG_USBDEV_CDC_ECM_USING_LWIP + bool + prompt "Enable usb cdc ecm device with lwip for lan" + default n + choice - prompt "Select usb device template" + prompt "Select usb device template, please select class driver first" default PKG_CHERRYUSB_DEVICE_TEMPLATE_NONE config PKG_CHERRYUSB_DEVICE_TEMPLATE_NONE - bool "none (Implement it yourself)" + bool + prompt "none (Implement it yourself)" config PKG_CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM - bool "cdc_acm" + bool + prompt "cdc_acm" + depends on PKG_CHERRYUSB_DEVICE_CDC_ACM config PKG_CHERRYUSB_DEVICE_TEMPLATE_MSC - bool "msc_ram" + bool + prompt "msc_ram" + depends on PKG_CHERRYUSB_DEVICE_MSC config PKG_CHERRYUSB_DEVICE_TEMPLATE_MSC_BLKDEV - bool "msc_blkdev" + bool + prompt "msc_blkdev" + depends on PKG_CHERRYUSB_DEVICE_MSC config PKG_CHERRYUSB_DEVICE_TEMPLATE_HID_KEYBOARD - bool "hid_keyboard" + bool + prompt "hid_keyboard" + depends on PKG_CHERRYUSB_DEVICE_HID config PKG_CHERRYUSB_DEVICE_TEMPLATE_HID_MOUSE - bool "hid_mouse" + bool + prompt "hid_mouse" + depends on PKG_CHERRYUSB_DEVICE_HID config PKG_CHERRYUSB_DEVICE_TEMPLATE_HID_CUSTOM - bool "hid_custom" + bool + prompt "hid_custom" + depends on PKG_CHERRYUSB_DEVICE_HID config PKG_CHERRYUSB_DEVICE_TEMPLATE_VIDEO - bool "video" + bool + prompt "video" + depends on PKG_CHERRYUSB_DEVICE_VIDEO config PKG_CHERRYUSB_DEVICE_TEMPLATE_AUDIO_V1_MIC_SPEAKER - bool "audio_v1_mic_speaker_multichan" + bool + prompt "audio_v1_mic_speaker_multichan" + depends on PKG_CHERRYUSB_DEVICE_AUDIO config PKG_CHERRYUSB_DEVICE_TEMPLATE_AUDIO_V2_MIC_SPEAKER - bool "audio_v2_mic_speaker_multichan" + bool + prompt "audio_v2_mic_speaker_multichan" + depends on PKG_CHERRYUSB_DEVICE_AUDIO config PKG_CHERRYUSB_DEVICE_TEMPLATE_CDC_RNDIS - bool "cdc_rndis" + bool + prompt "cdc_rndis" + depends on PKG_CHERRYUSB_DEVICE_CDC_RNDIS config PKG_CHERRYUSB_DEVICE_TEMPLATE_CDC_ECM - bool "cdc_ecm" + bool + prompt "cdc_ecm" + depends on PKG_CHERRYUSB_DEVICE_CDC_ECM config PKG_CHERRYUSB_DEVICE_TEMPLATE_CDC_NCM - bool "cdc_ncm" + bool + prompt "cdc_ncm" + depends on PKG_CHERRYUSB_DEVICE_CDC_NCM config PKG_CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM_MSC - bool "cdc_acm_msc" + bool + prompt "cdc_acm_msc" + depends on PKG_CHERRYUSB_DEVICE_CDC_ACM && PKG_CHERRYUSB_DEVICE_MSC config PKG_CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM_MSC_HID - bool "cdc_acm_msc_hid" + bool + prompt "cdc_acm_msc_hid" + depends on PKG_CHERRYUSB_DEVICE_CDC_ACM && PKG_CHERRYUSB_DEVICE_MSC && PKG_CHERRYUSB_DEVICE_HID config PKG_CHERRYUSB_DEVICE_TEMPLATE_WINUSBV1 - bool "winusbv1" + bool + prompt "winusbv1" config PKG_CHERRYUSB_DEVICE_TEMPLATE_WINUSBV2_CDC - bool "winusbv2_cdc" + bool + prompt "winusbv2_cdc" + depends on PKG_CHERRYUSB_DEVICE_CDC_ACM config PKG_CHERRYUSB_DEVICE_TEMPLATE_WINUSBV2_HID - bool "winusbv2_hid" + bool + prompt "winusbv2_hid" + depends on PKG_CHERRYUSB_DEVICE_HID config PKG_CHERRYUSB_DEVICE_TEMPLATE_ADB - bool "adb" + bool + prompt "adb" + depends on PKG_CHERRYUSB_DEVICE_ADB config PKG_CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM_CHARDEV - bool "cdc_acm_chardev" + bool + prompt "cdc_acm_chardev" + depends on PKG_CHERRYUSB_DEVICE_CDC_ACM_CHARDEV endchoice config CONFIG_USBDEV_MSC_BLOCK_DEV_NAME @@ -233,6 +296,8 @@ if PKG_USING_CHERRYUSB bool "musb_sunxi" config PKG_CHERRYUSB_HOST_MUSB_BK bool "musb_bk" + config PKG_CHERRYUSB_HOST_MUSB_SIFLI + bool "musb_sifli" config PKG_CHERRYUSB_HOST_MUSB_CUSTOM bool "musb_custom" config PKG_CHERRYUSB_HOST_PUSB2 @@ -345,6 +410,26 @@ if PKG_USING_CHERRYUSB config CONFIG_USBHOST_PLATFORM_RTL8152 bool + config CONFIG_USBHOST_PSC_PRIO + int + prompt "Set hubport change thread priority, 0 is the max priority" + default 0 + + config CONFIG_USBHOST_PSC_STACKSIZE + int + prompt "Set hubport change thread stacksize" + default 4096 + + config CONFIG_USBHOST_REQUEST_BUFFER_LEN + int + prompt "Set host control transfer max buffer size" + default 512 + + config CONFIG_USBHOST_CONTROL_TRANSFER_TIMEOUT + int + prompt "Set host control transfer timeout, unit is ms" + default 500 + config RT_LWIP_PBUF_POOL_BUFSIZE int "The size of each pbuf in the pbuf pool" range 1500 2000 @@ -355,23 +440,23 @@ if PKG_USING_CHERRYUSB depends on RT_CHERRYUSB_HOST_MSC default "/" - config PKG_CHERRYUSB_HOST_TEMPLATE - bool - prompt "Use usb host template" - default n - - if PKG_CHERRYUSB_HOST_TEMPLATE - config TEST_USBH_CDC_ACM + menu "Select USB host template, please select class driver first" + config CONFIG_TEST_USBH_CDC_ACM int - prompt "demo for test cdc acm" + prompt "demo for test cdc acm, cannot enable this demo, we have used serial framework instead" default 0 depends on PKG_CHERRYUSB_HOST_CDC_ACM - config TEST_USBH_HID + config CONFIG_TEST_USBH_HID int prompt "demo for test hid" default 0 depends on PKG_CHERRYUSB_HOST_HID - endif + config CONFIG_TEST_USBH_MSC + int + prompt "demo for test msc, cannot enable this demo, we have used dfs instead" + default 0 + depends on PKG_CHERRYUSB_HOST_MSC + endmenu endif config PKG_CHERRYUSB_PATH @@ -386,18 +471,14 @@ if PKG_USING_CHERRYUSB config PKG_USING_CHERRYUSB_LATEST_VERSION bool "latest" + config PKG_USING_CHERRYUSB_V010501 + bool "v1.5.1" config PKG_USING_CHERRYUSB_V010500 bool "v1.5.0" config PKG_USING_CHERRYUSB_V010403 bool "v1.4.3" - config PKG_USING_CHERRYUSB_V010402 - bool "v1.4.2" - config PKG_USING_CHERRYUSB_V010400 - bool "v1.4.0" config PKG_USING_CHERRYUSB_V010301 bool "v1.3.1" - config PKG_USING_CHERRYUSB_V010300 - bool "v1.3.0" config PKG_USING_CHERRYUSB_V010200 bool "v1.2.0" config PKG_USING_CHERRYUSB_V001002 @@ -407,12 +488,10 @@ if PKG_USING_CHERRYUSB config PKG_CHERRYUSB_VER string default "latest" if PKG_USING_CHERRYUSB_LATEST_VERSION + default "v1.5.1" if PKG_USING_CHERRYUSB_V010501 default "v1.5.0" if PKG_USING_CHERRYUSB_V010500 default "v1.4.3" if PKG_USING_CHERRYUSB_V010403 - default "v1.4.2" if PKG_USING_CHERRYUSB_V010402 - default "v1.4.0" if PKG_USING_CHERRYUSB_V010400 default "v1.3.1" if PKG_USING_CHERRYUSB_V010301 - default "v1.3.0" if PKG_USING_CHERRYUSB_V010300 default "v1.2.0" if PKG_USING_CHERRYUSB_V010200 default "v0.10.2" if PKG_USING_CHERRYUSB_V001002 endif diff --git a/system/CherryUSB/package.json b/system/CherryUSB/package.json index aa2ba80c84..d5a99d00f3 100644 --- a/system/CherryUSB/package.json +++ b/system/CherryUSB/package.json @@ -25,6 +25,11 @@ "filename": "Null for git package", "VER_SHA": "master" }, + { + "version": "v1.5.1", + "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.5.1.zip", + "filename": "CherryUSB-1.5.1.zip" + }, { "version": "v1.5.0", "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.5.0.zip", @@ -35,26 +40,11 @@ "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.4.3.zip", "filename": "CherryUSB-1.4.3.zip" }, - { - "version": "v1.4.2", - "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.4.2.zip", - "filename": "CherryUSB-1.4.2.zip" - }, - { - "version": "v1.4.0", - "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.4.0.zip", - "filename": "CherryUSB-1.4.0.zip" - }, { "version": "v1.3.1", "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.3.1.zip", "filename": "CherryUSB-1.3.1.zip" }, - { - "version": "v1.3.0", - "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.3.0.zip", - "filename": "CherryUSB-1.3.0.zip" - }, { "version": "v1.2.0", "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.2.0.zip",