diff options
| author | sakimisu <[email protected]> | 2023-05-24 20:28:08 +0800 |
|---|---|---|
| committer | sakimisu <[email protected]> | 2023-05-24 20:58:12 +0800 |
| commit | 00546b64b7dbccaac52e48e003ae461a34354c41 (patch) | |
| tree | 980afd0a8551b0b57afdd4d57233f6e294103683 | |
| parent | a26d8b602c8db34c941f054f9a03760a408de84c (diff) | |
update demo repo url
26 files changed, 12 insertions, 899 deletions
@@ -133,18 +133,20 @@ USB basic concepts and how the CherryUSB Device stack is implemented, see [Cherr | Manufacturer | CHIP or Series | USB IP| Repo Url |Corresponds to master version| |:--------------------:|:------------------:|:-----:|:--------:|:---------------------------:| -|Bouffalolab | BL702/BL616/BL808 | bouffalolab/ehci|[bl_mcu_sdk](https://github.com/CherryUSB/cherryusb_bouffalolab)| latest | +|Bouffalolab | BL702/BL616/BL808 | bouffalolab/ehci|[bouffalo_sdk](https://github.com/CherryUSB/cherryusb_bouffalolab)| latest | |ST | STM32F103C8T6 | fsdev |[stm32f103_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/stm32/usb_device/stm32f103c8t6)|latest | |ST | STM32F4 | dwc2 |[stm32f429_device_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/stm32/usb_device/stm32f429igt6) [stm32f429_host_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/stm32/usb_host/stm32f429igt6)|latest | |ST | STM32H7 | dwc2 |[stm32h743_device_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/stm32/usb_device/stm32h743vbt6) [stm32h743_host_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/stm32/usb_host/stm32h743xih6)|latest | -|HPMicro | HPM6750 | hpm/ehci |[hpm_repo](https://github.com/CherryUSB/cherryusb_hpmicro)|v0.7.0 | +|HPMicro | HPM6750 | hpm/ehci |[hpm_sdk](https://github.com/CherryUSB/cherryusb_hpmicro)|v0.7.0 | |Essemi | ES32F36xx | musb |[es32f369_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/es32)|latest | |AllwinnerTech | F1C100S | musb |[cherryusb_rtt_f1c100s](https://github.com/CherryUSB/cherryusb_rtt_f1c100s)|latest | -|Phytium | e2000 | xhci |[phytium _repo](https://gitee.com/phytium_embedded/phytium-free-rtos-sdk)|latest | -|Raspberry pi | rp2040 | rp2040 |[rp2040_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/rp2040)|latest | +|Phytium | e2000 | xhci |[phytium_repo](https://gitee.com/phytium_embedded/phytium-free-rtos-sdk)|latest | +|Raspberry pi | rp2040 | rp2040 |[pico-examples](https://github.com/CherryUSB/pico-examples)|latest | |WCH | CH32V307/ch58x | ch32_usbfs/ch32_usbhs/ch58x |[wch_repo](https://github.com/CherryUSB/cherryusb_wch)|latest | |Nordicsemi | Nrf52840 | nrf5x |[nrf5x_repo](https://github.com/CherryUSB/cherryusb_nrf5x)|latest | |Espressif | esp32s3 | dwc2 |[esp32_repo](https://github.com/CherryUSB/cherryusb_esp32)|latest | +|Bekencorp | BK72xx | musb |[armino](https://github.com/CherryUSB/armino)|v0.7.0 | +|Sophgo | cv18xx | dwc2 |[cvi_alios_open](https://github.com/CherryUSB/cvi_alios_open)|latest | |Nuvoton | Nuc442 | nuvoton |[nuc442_repo](https://github.com/CherryUSB/cherryusb_nuc442)|v0.4.1 | |Geehy | APM32E10x APM32F0xx| fsdev |[apm32_repo](https://github.com/CherryUSB/cherryusb_apm32)|v0.4.1 | diff --git a/README_zh.md b/README_zh.md index e3da0b4a..7033668e 100644 --- a/README_zh.md +++ b/README_zh.md @@ -132,18 +132,20 @@ USB 基本知识点与 CherryUSB Device 协议栈是如何编写的，参考 [Ch | 厂商 | 芯片或者系列 | USB IP| 仓库链接 | 对应 master 版本 | |:--------------------:|:------------------:|:-----:|:--------:|:---------------------------:| -|Bouffalolab | BL702/BL616/BL808 | bouffalolab/ehci|[bl_mcu_sdk](https://github.com/CherryUSB/cherryusb_bouffalolab)| latest | +|Bouffalolab | BL702/BL616/BL808 | bouffalolab/ehci|[bouffalo_sdk](https://github.com/CherryUSB/cherryusb_bouffalolab)| latest | |ST | STM32F103C8T6 | fsdev |[stm32f103_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/stm32/usb_device/stm32f103c8t6)|latest | |ST | STM32F4 | dwc2 |[stm32f429_device_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/stm32/usb_device/stm32f429igt6) [stm32f429_host_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/stm32/usb_host/stm32f429igt6)|latest | |ST | STM32H7 | dwc2 |[stm32h743_device_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/stm32/usb_device/stm32h743vbt6) [stm32h743_host_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/stm32/usb_host/stm32h743xih6)|latest | -|HPMicro | HPM6750 | hpm/ehci |[hpm_repo](https://github.com/CherryUSB/cherryusb_hpmicro)|v0.7.0 | +|HPMicro | HPM6750 | hpm/ehci |[hpm_sdk](https://github.com/CherryUSB/cherryusb_hpmicro)|v0.7.0 | |Essemi | ES32F36xx | musb |[es32f369_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/es32)|latest | |AllwinnerTech | F1C100S | musb |[cherryusb_rtt_f1c100s](https://github.com/CherryUSB/cherryusb_rtt_f1c100s)|latest | -|Phytium | e2000 | xhci |[phytium _repo](https://gitee.com/phytium_embedded/phytium-free-rtos-sdk)|latest | -|Raspberry pi | rp2040 | rp2040 |[rp2040_repo](https://github.com/sakumisu/CherryUSB/tree/master/demo/rp2040)|latest | +|Phytium | e2000 | xhci |[phytium_repo](https://gitee.com/phytium_embedded/phytium-free-rtos-sdk)|latest | +|Raspberry pi | rp2040 | rp2040 |[pico-examples](https://github.com/CherryUSB/pico-examples)|latest | |WCH | CH32V307/ch58x | ch32_usbfs/ch32_usbhs/ch58x |[wch_repo](https://github.com/CherryUSB/cherryusb_wch)|latest | |Nordicsemi | Nrf52840 | nrf5x |[nrf5x_repo](https://github.com/CherryUSB/cherryusb_nrf5x)|latest | |Espressif | esp32s3 | dwc2 |[esp32_repo](https://github.com/CherryUSB/cherryusb_esp32)|latest | +|Bekencorp | BK72xx | musb |[armino](https://github.com/CherryUSB/armino)|v0.7.0 | +|Sophgo | cv18xx | dwc2 |[cvi_alios_open](https://github.com/CherryUSB/cvi_alios_open)|latest | |Nuvoton | Nuc442 | nuvoton |[nuc442_repo](https://github.com/CherryUSB/cherryusb_nuc442)|v0.4.1 | |Geehy | APM32E10x APM32F0xx| fsdev |[apm32_repo](https://github.com/CherryUSB/cherryusb_apm32)|v0.4.1 | diff --git a/demo/rp2040/cherryusb/CMakeLists.txt b/demo/rp2040/cherryusb/CMakeLists.txt deleted file mode 100644 index 270650c7..00000000 --- a/demo/rp2040/cherryusb/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(device)
\ No newline at end of file diff --git a/demo/rp2040/cherryusb/device/CMakeLists.txt b/demo/rp2040/cherryusb/device/CMakeLists.txt deleted file mode 100644 index e56c2b55..00000000 --- a/demo/rp2040/cherryusb/device/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -include_directories(${CMAKE_CURRENT_LIST_DIR} - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/audio - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/cdc - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/dfu - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/hid - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/hub - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/midi - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/msc - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/mtp - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/printer - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/vendor - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/video - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/wireless - - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/common - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/core - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/demo - ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/port/rp2040 - ${CMAKE_CURRENT_LIST_DIR}../../ -) - - -add_library(cherryusblib STATIC) -target_sources(cherryusblib PRIVATE ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/port/rp2040/usb_dc_rp2040.c) -target_sources(cherryusblib PRIVATE ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/audio/usbd_audio.c) -target_sources(cherryusblib PRIVATE ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/cdc/usbd_cdc.c) -target_sources(cherryusblib PRIVATE ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/dfu/usbd_dfu.c) -target_sources(cherryusblib PRIVATE ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/hid/usbd_hid.c) -target_sources(cherryusblib PRIVATE ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/msc/usbd_msc.c) -# target_sources(cherryusblib PRIVATE ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/mtp/usbd_mtp.c) -target_sources(cherryusblib PRIVATE ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/printer/usbd_printer.c) -target_sources(cherryusblib PRIVATE ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/video/usbd_video.c) -# target_sources(cherryusblib PRIVATE ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/class/wireless/usbd_rndis.c) -target_sources(cherryusblib PRIVATE ${CMAKE_CURRENT_LIST_DIR}../../../../pico-sdk/lib/CherryUSB/core/usbd_core.c) - -add_subdirectory(cdc_acm) -add_subdirectory(cdc_msc) -add_subdirectory(cdc_multitude) -add_subdirectory(dfu) -add_subdirectory(hid_cdc_msc) -add_subdirectory(hid_custom) -add_subdirectory(hid_kbd) -add_subdirectory(hid_mouse) -add_subdirectory(msc_ram) -add_subdirectory(uvc) - diff --git a/demo/rp2040/cherryusb/device/cdc_acm/CMakeLists.txt b/demo/rp2040/cherryusb/device/cdc_acm/CMakeLists.txt deleted file mode 100644 index 9cc159e9..00000000 --- a/demo/rp2040/cherryusb/device/cdc_acm/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -get_filename_component(project_name ${CMAKE_CURRENT_LIST_DIR} NAME) - -add_executable(${project_name} -main.c -) - -# pull in common dependencies -target_link_libraries(${project_name} PRIVATE pico_stdlib cherryusblib hardware_resets hardware_irq) -# create map/bin/hex file etc. -pico_add_extra_outputs(${project_name}) - -# add url via pico_set_program_url -example_auto_set_url(${project_name})
\ No newline at end of file diff --git a/demo/rp2040/cherryusb/device/cdc_acm/main.c b/demo/rp2040/cherryusb/device/cdc_acm/main.c deleted file mode 100644 index 827991e2..00000000 --- a/demo/rp2040/cherryusb/device/cdc_acm/main.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "pico/stdlib.h" -#include "pico/time.h" -#include "usbd_core.h" -#include <stdio.h> -#include <string.h> - -/** - * - */ -#include "cdc_acm_template.c" - -int main(void) { - stdio_init_all(); - printf("CherryUSB device cdc acm example\n"); - extern void cdc_acm_init(void); - cdc_acm_init(); - - // Wait until configured - while (!usb_device_is_configured()) { - tight_loop_contents(); - } - - // Everything is interrupt driven so just loop here - while (1) { - extern void cdc_acm_data_send_with_dtr_test(void); - cdc_acm_data_send_with_dtr_test(); - } - return 0; -} diff --git a/demo/rp2040/cherryusb/device/cdc_msc/CMakeLists.txt b/demo/rp2040/cherryusb/device/cdc_msc/CMakeLists.txt deleted file mode 100644 index 9cc159e9..00000000 --- a/demo/rp2040/cherryusb/device/cdc_msc/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -get_filename_component(project_name ${CMAKE_CURRENT_LIST_DIR} NAME) - -add_executable(${project_name} -main.c -) - -# pull in common dependencies -target_link_libraries(${project_name} PRIVATE pico_stdlib cherryusblib hardware_resets hardware_irq) -# create map/bin/hex file etc. -pico_add_extra_outputs(${project_name}) - -# add url via pico_set_program_url -example_auto_set_url(${project_name})
\ No newline at end of file diff --git a/demo/rp2040/cherryusb/device/cdc_msc/main.c b/demo/rp2040/cherryusb/device/cdc_msc/main.c deleted file mode 100644 index b316e8b3..00000000 --- a/demo/rp2040/cherryusb/device/cdc_msc/main.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "pico/stdlib.h" -#include "pico/time.h" -#include "usbd_core.h" -#include <stdio.h> -#include <string.h> - -/** - * - */ -#include "cdc_acm_msc_template.c" - -int main(void) { - stdio_init_all(); - printf("CherryUSB device cdc msc example\n"); - extern void cdc_acm_msc_init(void); - cdc_acm_msc_init(); - - // Wait until configured - while (!usb_device_is_configured()) { - tight_loop_contents(); - } - - // Everything is interrupt driven so just loop here - while (1) { - extern void cdc_acm_data_send_with_dtr_test(void); - cdc_acm_data_send_with_dtr_test(); - } - return 0; -} diff --git a/demo/rp2040/cherryusb/device/cdc_multitude/CMakeLists.txt b/demo/rp2040/cherryusb/device/cdc_multitude/CMakeLists.txt deleted file mode 100644 index a512d138..00000000 --- a/demo/rp2040/cherryusb/device/cdc_multitude/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -get_filename_component(project_name ${CMAKE_CURRENT_LIST_DIR} NAME) - -add_executable(${project_name} -main.c -) - -# pull in common dependencies -target_link_libraries(${project_name} PRIVATE pico_stdlib cherryusblib hardware_resets hardware_irq) - - -# create map/bin/hex file etc. -pico_add_extra_outputs(${project_name}) - -# add url via pico_set_program_url -example_auto_set_url(${project_name})
\ No newline at end of file diff --git a/demo/rp2040/cherryusb/device/cdc_multitude/main.c b/demo/rp2040/cherryusb/device/cdc_multitude/main.c deleted file mode 100644 index 3a3d9f6a..00000000 --- a/demo/rp2040/cherryusb/device/cdc_multitude/main.c +++ /dev/null @@ -1,26 +0,0 @@ -#include "pico/stdlib.h" -#include "usbd_core.h" -#include <stdio.h> -#include <string.h> - -/** - * - */ -#include "cdc_acm_multi_template.c" - -int main(void) { - stdio_init_all(); - printf("CherryUSB device cdc acm multitude example\n"); - extern void cdc_acm_multi_init(void); - cdc_acm_multi_init(); - - // Wait until configured - while (!usb_device_is_configured()) { - tight_loop_contents(); - } - - // Everything is interrupt driven so just loop here - while (1) { - } - return 0; -} diff --git a/demo/rp2040/cherryusb/device/dfu/CMakeLists.txt b/demo/rp2040/cherryusb/device/dfu/CMakeLists.txt deleted file mode 100644 index d08fdde0..00000000 --- a/demo/rp2040/cherryusb/device/dfu/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -get_filename_component(project_name ${CMAKE_CURRENT_LIST_DIR} NAME) - -add_executable(${project_name} -main.c -) - -# pull in common dependencies -target_link_libraries(${project_name} PRIVATE pico_stdlib cherryusblib hardware_resets hardware_irq) - -target_compile_definitions(cherryusblib INTERFACE -DUSBD_DFU_XFER_SIZE=1024) -target_compile_definitions(cherryusblib INTERFACE -DCONFIG_USBDEV_REQUEST_BUFFER_LEN=1024) - -# create map/bin/hex file etc. -pico_add_extra_outputs(${project_name}) - -# add url via pico_set_program_url -example_auto_set_url(${project_name})
\ No newline at end of file diff --git a/demo/rp2040/cherryusb/device/dfu/main.c b/demo/rp2040/cherryusb/device/dfu/main.c deleted file mode 100644 index 05794752..00000000 --- a/demo/rp2040/cherryusb/device/dfu/main.c +++ /dev/null @@ -1,57 +0,0 @@ -#include "pico/stdlib.h" -#include "usbd_core.h" -#include <stdio.h> -#include <string.h> - -/** - * - */ -#include "dfu_with_st_tool_template.c" - -uint8_t *dfu_read_flash(uint8_t *src, uint8_t *dest, uint32_t len) { - uint32_t i = 0; - uint8_t *psrc = src; - - for (i = 0; i < len; i++) { - dest[i] = *psrc++; - } - /* Return a valid address to avoid HardFault */ - return (uint8_t *)(dest); -} - -uint16_t dfu_write_flash(uint8_t *src, uint8_t *dest, uint32_t len) { - printf("dfu write flash -- src_add:%08x -- dest_add:%08x -- len:%d\r\n", src, - dest, len); - - return 0; -} - -uint16_t dfu_erase_flash(uint32_t add) { - /** - * The length of erasure needs to be consistent with USBD_DFU_XFER_SIZE equal - * If you want to modify USBD_DFU_XFER_SIZE, please pay attention to the - * CONFIG_USBDEV_REQUEST_BUFFER_LEN in the usb_config.h file - * CONFIG_USBDEV_REQUEST_BUFFER_LEN need >= USBD_DFU_XFER_SIZE - */ - printf("dfu erase flash start add:%08x\r\n", add); - return 0; -} - -void dfu_leave(void) { printf("dfu leave\r\n"); } - -int main(void) { - stdio_init_all(); - printf("CherryUSB device dfu example\n"); - extern void dfu_flash_init(void); - dfu_flash_init(); - - // Wait until configured - while (!usb_device_is_configured()) { - tight_loop_contents(); - } - - // Everything is interrupt driven so just loop here - while (1) { - } - return 0; -} diff --git a/demo/rp2040/cherryusb/device/hid_cdc_msc/CMakeLists.txt b/demo/rp2040/cherryusb/device/hid_cdc_msc/CMakeLists.txt deleted file mode 100644 index 9cc159e9..00000000 --- a/demo/rp2040/cherryusb/device/hid_cdc_msc/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -get_filename_component(project_name ${CMAKE_CURRENT_LIST_DIR} NAME) - -add_executable(${project_name} -main.c -) - -# pull in common dependencies -target_link_libraries(${project_name} PRIVATE pico_stdlib cherryusblib hardware_resets hardware_irq) -# create map/bin/hex file etc. -pico_add_extra_outputs(${project_name}) - -# add url via pico_set_program_url -example_auto_set_url(${project_name})
\ No newline at end of file diff --git a/demo/rp2040/cherryusb/device/hid_cdc_msc/main.c b/demo/rp2040/cherryusb/device/hid_cdc_msc/main.c deleted file mode 100644 index 3ca6f175..00000000 --- a/demo/rp2040/cherryusb/device/hid_cdc_msc/main.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "pico/stdlib.h" -#include "pico/time.h" -#include "usbd_core.h" -#include <stdio.h> -#include <string.h> - -/** - * - */ -#include "cdc_acm_hid_msc_template.c" - -int main(void) { - stdio_init_all(); - printf("CherryUSB device hid cdc msc composite example\n"); - extern void cdc_acm_hid_msc_descriptor_init(void); - cdc_acm_hid_msc_descriptor_init(); - - // Wait until configured - while (!usb_device_is_configured()) { - tight_loop_contents(); - } - - // Everything is interrupt driven so just loop here - while (1) { - } - return 0; -} diff --git a/demo/rp2040/cherryusb/device/hid_custom/CMakeLists.txt b/demo/rp2040/cherryusb/device/hid_custom/CMakeLists.txt deleted file mode 100644 index 9cc159e9..00000000 --- a/demo/rp2040/cherryusb/device/hid_custom/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -get_filename_component(project_name ${CMAKE_CURRENT_LIST_DIR} NAME) - -add_executable(${project_name} -main.c -) - -# pull in common dependencies -target_link_libraries(${project_name} PRIVATE pico_stdlib cherryusblib hardware_resets hardware_irq) -# create map/bin/hex file etc. -pico_add_extra_outputs(${project_name}) - -# add url via pico_set_program_url -example_auto_set_url(${project_name})
\ No newline at end of file diff --git a/demo/rp2040/cherryusb/device/hid_custom/main.c b/demo/rp2040/cherryusb/device/hid_custom/main.c deleted file mode 100644 index ccb366c0..00000000 --- a/demo/rp2040/cherryusb/device/hid_custom/main.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "pico/stdlib.h" -#include "pico/time.h" -#include "usbd_core.h" -#include <stdio.h> -#include <string.h> - -/** - * - */ -#include "hid_custom_inout_template.c" - -int main(void) { - stdio_init_all(); - printf("CherryUSB device hid custom example\n"); - extern void hid_custom_keyboard_init(void); - hid_custom_keyboard_init(); - - // Wait until configured - while (!usb_device_is_configured()) { - tight_loop_contents(); - } - - // Everything is interrupt driven so just loop here - while (1) { - extern void hid_custom_test(void); - hid_custom_test(); - } - return 0; -} diff --git a/demo/rp2040/cherryusb/device/hid_kbd/CMakeLists.txt b/demo/rp2040/cherryusb/device/hid_kbd/CMakeLists.txt deleted file mode 100644 index 9cc159e9..00000000 --- a/demo/rp2040/cherryusb/device/hid_kbd/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -get_filename_component(project_name ${CMAKE_CURRENT_LIST_DIR} NAME) - -add_executable(${project_name} -main.c -) - -# pull in common dependencies -target_link_libraries(${project_name} PRIVATE pico_stdlib cherryusblib hardware_resets hardware_irq) -# create map/bin/hex file etc. -pico_add_extra_outputs(${project_name}) - -# add url via pico_set_program_url -example_auto_set_url(${project_name})
\ No newline at end of file diff --git a/demo/rp2040/cherryusb/device/hid_kbd/main.c b/demo/rp2040/cherryusb/device/hid_kbd/main.c deleted file mode 100644 index 9cbfeda2..00000000 --- a/demo/rp2040/cherryusb/device/hid_kbd/main.c +++ /dev/null @@ -1,33 +0,0 @@ -#include "pico/stdlib.h" -#include "pico/time.h" -#include "usbd_core.h" -#include <stdio.h> -#include <string.h> - -/** - * - */ -#include "hid_keyboard_template.c" - -int main(void) { - stdio_init_all(); - printf("CherryUSB device hid keyboard example\n"); - extern void hid_keyboard_init(void); - hid_keyboard_init(); - - // Wait until configured - while (!usb_device_is_configured()) { - tight_loop_contents(); - } - - // Everything is interrupt driven so just loop here - while (1) { - extern void hid_keyboard_test(void); - hid_keyboard_test(); - sleep_ms(1); - uint8_t sendbuffer[8] = {0}; - usbd_ep_start_write(HID_INT_EP, sendbuffer, 8); - sleep_ms(2000); - } - return 0; -} diff --git a/demo/rp2040/cherryusb/device/hid_mouse/CMakeLists.txt b/demo/rp2040/cherryusb/device/hid_mouse/CMakeLists.txt deleted file mode 100644 index 9cc159e9..00000000 --- a/demo/rp2040/cherryusb/device/hid_mouse/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -get_filename_component(project_name ${CMAKE_CURRENT_LIST_DIR} NAME) - -add_executable(${project_name} -main.c -) - -# pull in common dependencies -target_link_libraries(${project_name} PRIVATE pico_stdlib cherryusblib hardware_resets hardware_irq) -# create map/bin/hex file etc. -pico_add_extra_outputs(${project_name}) - -# add url via pico_set_program_url -example_auto_set_url(${project_name})
\ No newline at end of file diff --git a/demo/rp2040/cherryusb/device/hid_mouse/main.c b/demo/rp2040/cherryusb/device/hid_mouse/main.c deleted file mode 100644 index 66c99428..00000000 --- a/demo/rp2040/cherryusb/device/hid_mouse/main.c +++ /dev/null @@ -1,33 +0,0 @@ -#include "pico/stdlib.h" -#include "pico/time.h" -#include "usbd_core.h" -#include <stdio.h> -#include <string.h> - -/** - * - */ -#include "hid_mouse_template.c" - -int main(void) { - stdio_init_all(); - printf("CherryUSB device hid mouse example\n"); - extern void hid_mouse_init(void); - hid_mouse_init(); - - // Wait until configured - while (!usb_device_is_configured()) { - tight_loop_contents(); - } - - // Everything is interrupt driven so just loop here - while (1) { - extern void hid_mouse_test(void); - hid_mouse_test(); - sleep_ms(1); - uint8_t zero_data[4] = {0}; - usbd_ep_start_write(HID_INT_EP, zero_data, 4); - sleep_ms(2000); - } - return 0; -} diff --git a/demo/rp2040/cherryusb/device/msc_ram/CMakeLists.txt b/demo/rp2040/cherryusb/device/msc_ram/CMakeLists.txt deleted file mode 100644 index 9cc159e9..00000000 --- a/demo/rp2040/cherryusb/device/msc_ram/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -get_filename_component(project_name ${CMAKE_CURRENT_LIST_DIR} NAME) - -add_executable(${project_name} -main.c -) - -# pull in common dependencies -target_link_libraries(${project_name} PRIVATE pico_stdlib cherryusblib hardware_resets hardware_irq) -# create map/bin/hex file etc. -pico_add_extra_outputs(${project_name}) - -# add url via pico_set_program_url -example_auto_set_url(${project_name})
\ No newline at end of file diff --git a/demo/rp2040/cherryusb/device/msc_ram/main.c b/demo/rp2040/cherryusb/device/msc_ram/main.c deleted file mode 100644 index 6477f457..00000000 --- a/demo/rp2040/cherryusb/device/msc_ram/main.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "pico/stdlib.h" -#include "pico/time.h" -#include "usbd_core.h" -#include <stdio.h> -#include <string.h> - -/** - * - */ -#include "msc_ram_template.c" - -int main(void) { - stdio_init_all(); - printf("CherryUSB device msc ram example\n"); - extern void msc_ram_init(void); - msc_ram_init(); - - // Wait until configured - while (!usb_device_is_configured()) { - tight_loop_contents(); - } - - // Everything is interrupt driven so just loop here - while (1) { - } - return 0; -} diff --git a/demo/rp2040/cherryusb/device/uvc/CMakeLists.txt b/demo/rp2040/cherryusb/device/uvc/CMakeLists.txt deleted file mode 100644 index 9cc159e9..00000000 --- a/demo/rp2040/cherryusb/device/uvc/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -get_filename_component(project_name ${CMAKE_CURRENT_LIST_DIR} NAME) - -add_executable(${project_name} -main.c -) - -# pull in common dependencies -target_link_libraries(${project_name} PRIVATE pico_stdlib cherryusblib hardware_resets hardware_irq) -# create map/bin/hex file etc. -pico_add_extra_outputs(${project_name}) - -# add url via pico_set_program_url -example_auto_set_url(${project_name})
\ No newline at end of file diff --git a/demo/rp2040/cherryusb/device/uvc/cherryusb_uvc_demo.c b/demo/rp2040/cherryusb/device/uvc/cherryusb_uvc_demo.c deleted file mode 100644 index 022cd949..00000000 --- a/demo/rp2040/cherryusb/device/uvc/cherryusb_uvc_demo.c +++ /dev/null @@ -1,228 +0,0 @@ -#include "usbd_core.h" -#include "usbd_video.h" -#include "pic_data.h" - -#define VIDEO_IN_EP 0x81 - -#ifdef CONFIG_USB_HS -#define MAX_PAYLOAD_SIZE 1024 // for high speed with one transcations every one micro frame -#define VIDEO_PACKET_SIZE (unsigned int)(((MAX_PAYLOAD_SIZE / 1)) | (0x00 << 11)) - -// #define MAX_PAYLOAD_SIZE 2048 // for high speed with two transcations every one micro frame -// #define VIDEO_PACKET_SIZE (unsigned int)(((MAX_PAYLOAD_SIZE / 2)) | (0x01 << 11)) - -// #define MAX_PAYLOAD_SIZE 3072 // for high speed with three transcations every one micro frame -// #define VIDEO_PACKET_SIZE (unsigned int)(((MAX_PAYLOAD_SIZE / 3)) | (0x02 << 11)) - -#else -#define MAX_PAYLOAD_SIZE 1023 -#define VIDEO_PACKET_SIZE (unsigned int)(((MAX_PAYLOAD_SIZE / 1)) | (0x00 << 11)) -#endif - -#define WIDTH (unsigned int)(640) -#define HEIGHT (unsigned int)(480) - -#define CAM_FPS (30) -#define INTERVAL (unsigned long)(10000000 / CAM_FPS) -#define MIN_BIT_RATE (unsigned long)(WIDTH * HEIGHT * 16 * CAM_FPS) //16 bit -#define MAX_BIT_RATE (unsigned long)(WIDTH * HEIGHT * 16 * CAM_FPS) -#define MAX_FRAME_SIZE (unsigned long)(WIDTH * HEIGHT * 2) - -#define USB_VIDEO_DESC_SIZ (unsigned long)(9 + \ - 8 + \ - 9 + \ - 13 + \ - 18 + \ - 9 + \ - 12 + \ - 9 + \ - 14 + \ - 11 + \ - 38 + \ - 9 + \ - 7) - -#define VC_TERMINAL_SIZ (unsigned int)(13 + 18 + 12 + 9) -#define VS_HEADER_SIZ (unsigned int)(13 + 1 + 11 + 38) - -#define USBD_VID 0xffff -#define USBD_PID 0xffff -#define USBD_MAX_POWER 100 -#define USBD_LANGID_STRING 1033 - -const uint8_t video_descriptor[] = { - USB_DEVICE_DESCRIPTOR_INIT(USB_2_0, 0x00, 0x00, 0x00, USBD_VID, USBD_PID, 0x0001, 0x01), - USB_CONFIG_DESCRIPTOR_INIT(USB_VIDEO_DESC_SIZ, 0x02, 0x01, USB_CONFIG_BUS_POWERED, USBD_MAX_POWER), - VIDEO_VC_DESCRIPTOR_INIT(0x00, 0, 0x0100, VC_TERMINAL_SIZ, 48000000, 0x02), - VIDEO_VS_DESCRIPTOR_INIT(0x01, 0x00, 0x00), - VIDEO_VS_HEADER_DESCRIPTOR_INIT(0x01, VS_HEADER_SIZ, VIDEO_IN_EP, 1, 0x00), - VIDEO_VS_FORMAT_MJPEG_DESCRIPTOR_INIT(0x01, 0x01), - VIDEO_VS_FRAME_MJPEG_DESCRIPTOR_INIT(0x01, WIDTH, HEIGHT, MIN_BIT_RATE, MAX_BIT_RATE, MAX_FRAME_SIZE, INTERVAL, 0x00, DBVAL(INTERVAL), DBVAL(INTERVAL), DBVAL(0)), - VIDEO_VS_DESCRIPTOR_INIT(0x01, 0x01, 0x01), - /* 1.2.2.2 Standard VideoStream Isochronous Video Data Endpoint Descriptor */ - 0x07, /* bLength */ - USB_DESCRIPTOR_TYPE_ENDPOINT, /* bDescriptorType: ENDPOINT */ - 0x81, /* bEndpointAddress: IN endpoint 2 */ - 0x01, /* bmAttributes: Isochronous transfer type. Asynchronous synchronization type. */ - WBVAL(VIDEO_PACKET_SIZE), /* wMaxPacketSize */ - 0x01, /* bInterval: One frame interval */ - - /////////////////////////////////////// - /// string0 descriptor - /////////////////////////////////////// - USB_LANGID_INIT(USBD_LANGID_STRING), - /////////////////////////////////////// - /// string1 descriptor - /////////////////////////////////////// - 0x14, /* bLength */ - USB_DESCRIPTOR_TYPE_STRING, /* bDescriptorType */ - 'C', 0x00, /* wcChar0 */ - 'h', 0x00, /* wcChar1 */ - 'e', 0x00, /* wcChar2 */ - 'r', 0x00, /* wcChar3 */ - 'r', 0x00, /* wcChar4 */ - 'y', 0x00, /* wcChar5 */ - 'U', 0x00, /* wcChar6 */ - 'S', 0x00, /* wcChar7 */ - 'B', 0x00, /* wcChar8 */ - /////////////////////////////////////// - /// string2 descriptor - /////////////////////////////////////// - 0x26, /* bLength */ - USB_DESCRIPTOR_TYPE_STRING, /* bDescriptorType */ - 'C', 0x00, /* wcChar0 */ - 'h', 0x00, /* wcChar1 */ - 'e', 0x00, /* wcChar2 */ - 'r', 0x00, /* wcChar3 */ - 'r', 0x00, /* wcChar4 */ - 'y', 0x00, /* wcChar5 */ - 'U', 0x00, /* wcChar6 */ - 'S', 0x00, /* wcChar7 */ - 'B', 0x00, /* wcChar8 */ - ' ', 0x00, /* wcChar9 */ - 'U', 0x00, /* wcChar10 */ - 'V', 0x00, /* wcChar11 */ - 'C', 0x00, /* wcChar12 */ - ' ', 0x00, /* wcChar13 */ - 'D', 0x00, /* wcChar14 */ - 'E', 0x00, /* wcChar15 */ - 'M', 0x00, /* wcChar16 */ - 'O', 0x00, /* wcChar17 */ - /////////////////////////////////////// - /// string3 descriptor - /////////////////////////////////////// - 0x16, /* bLength */ - USB_DESCRIPTOR_TYPE_STRING, /* bDescriptorType */ - '2', 0x00, /* wcChar0 */ - '0', 0x00, /* wcChar1 */ - '2', 0x00, /* wcChar2 */ - '1', 0x00, /* wcChar3 */ - '0', 0x00, /* wcChar4 */ - '3', 0x00, /* wcChar5 */ - '1', 0x00, /* wcChar6 */ - '0', 0x00, /* wcChar7 */ - '0', 0x00, /* wcChar8 */ - '0', 0x00, /* wcChar9 */ -#ifdef CONFIG_USB_HS - /////////////////////////////////////// - /// device qualifier descriptor - /////////////////////////////////////// - 0x0a, - USB_DESCRIPTOR_TYPE_DEVICE_QUALIFIER, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x40, - 0x01, - 0x00, -#endif - 0x00 -}; - -void usbd_configure_done_callback(void) -{ - /* no out ep, so do nothing */ -} - -volatile bool tx_flag = 0; -volatile bool iso_tx_busy = false; - -void usbd_video_open(uint8_t intf) -{ - tx_flag = 1; - iso_tx_busy = false; -} -void usbd_video_close(uint8_t intf) -{ - tx_flag = 0; -} - -void usbd_video_iso_callback(uint8_t ep, uint32_t nbytes) -{ - iso_tx_busy = false; -} - -static struct usbd_endpoint video_in_ep = { - .ep_cb = usbd_video_iso_callback, - .ep_addr = VIDEO_IN_EP -}; - -void video_init(void) -{ - usbd_desc_register(video_descriptor); - usbd_add_interface(usbd_video_alloc_intf(CAM_FPS, MAX_FRAME_SIZE, MAX_PAYLOAD_SIZE)); - usbd_add_interface(usbd_video_alloc_intf(CAM_FPS, MAX_FRAME_SIZE, MAX_PAYLOAD_SIZE)); - usbd_add_endpoint(&video_in_ep); - - usbd_initialize(); -} - -USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t packet_buffer[10 * 1024]; - -extern uint32_t chey_board_millis(void); - -void video_task(void) -{ - static uint32_t start_ms = 0; - static uint32_t already_sent = 0; - static uint32_t packets = 0; - - if (tx_flag) { - uint32_t out_len; - packets = usbd_video_mjpeg_payload_fill((uint8_t *)jpeg_data, sizeof(jpeg_data), packet_buffer, &out_len); - - if (!already_sent) { - already_sent = 1; - start_ms = chey_board_millis(); - iso_tx_busy = true; - usbd_ep_start_write(VIDEO_IN_EP, &packet_buffer[0 * MAX_PAYLOAD_SIZE], MAX_PAYLOAD_SIZE); - while (iso_tx_busy) { - } - } - - for (uint16_t i = 1; i < packets; i++) { - while ((chey_board_millis() - start_ms) < (INTERVAL / 1000000)) { - } - start_ms += (INTERVAL / 1000000); - - if (i == (packets - 1)) { - iso_tx_busy = true; - usbd_ep_start_write(VIDEO_IN_EP, &packet_buffer[i * MAX_PAYLOAD_SIZE], out_len - (packets - 1) * MAX_PAYLOAD_SIZE); - while (iso_tx_busy) { - } - } else { - iso_tx_busy = true; - usbd_ep_start_write(VIDEO_IN_EP, &packet_buffer[i * MAX_PAYLOAD_SIZE], MAX_PAYLOAD_SIZE); - while (iso_tx_busy) { - } - } - } - already_sent = 0; - } else { - start_ms = 0; - already_sent = 0; - packets = 0; - } -}
\ No newline at end of file diff --git a/demo/rp2040/cherryusb/device/uvc/main.c b/demo/rp2040/cherryusb/device/uvc/main.c deleted file mode 100644 index 851d9304..00000000 --- a/demo/rp2040/cherryusb/device/uvc/main.c +++ /dev/null @@ -1,33 +0,0 @@ -#include "pico/stdlib.h" -#include "pico/time.h" -#include "usbd_core.h" -#include <stdio.h> -#include <string.h> - -uint32_t chey_board_millis(void) { - return to_ms_since_boot(get_absolute_time()); -} - -/** - * - */ -#include "cherryusb_uvc_demo.c" - -int main(void) { - stdio_init_all(); - printf("CherryUSB device uvc example\n"); - extern void video_init(void); - video_init(); - - // Wait until configured - while (!usb_device_is_configured()) { - tight_loop_contents(); - } - - // Everything is interrupt driven so just loop here - while (1) { - extern void video_task(void); - video_task(); - } - return 0; -} diff --git a/demo/rp2040/cherryusb/usb_config.h b/demo/rp2040/cherryusb/usb_config.h deleted file mode 100644 index 0d5326be..00000000 --- a/demo/rp2040/cherryusb/usb_config.h +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Copyright (c) 2022, sakumisu - * - * SPDX-License-Identifier: Apache-2.0 - */ -#ifndef CHERRYUSB_CONFIG_H -#define CHERRYUSB_CONFIG_H - -#define CHERRYUSB_VERSION 0x000700 - -/* ================ USB common Configuration ================ */ - -#define CONFIG_USB_PRINTF(...) printf(__VA_ARGS__) - -#define usb_malloc(size) malloc(size) -#define usb_free(ptr) free(ptr) - -#ifndef CONFIG_USB_DBG_LEVEL -#define CONFIG_USB_DBG_LEVEL USB_DBG_INFO -#endif - -/* Enable print with color */ -#define CONFIG_USB_PRINTF_COLOR_ENABLE - -/* data align size when use dma */ -#ifndef CONFIG_USB_ALIGN_SIZE -#define CONFIG_USB_ALIGN_SIZE 4 -#endif - -/* attribute data into no cache ram */ -// #define USB_NOCACHE_RAM_SECTION __attribute__((section(".noncacheable"))) -#define USB_NOCACHE_RAM_SECTION -/* ================= USB Device Stack Configuration ================ */ - -/* Ep0 max transfer buffer, specially for receiving data from ep0 out */ -#ifndef CONFIG_USBDEV_REQUEST_BUFFER_LEN -#define CONFIG_USBDEV_REQUEST_BUFFER_LEN 1024 -#endif - -/* Setup packet log for debug */ -// #define CONFIG_USBDEV_SETUP_LOG_PRINT - -/* Check if the input descriptor is correct */ -// #define CONFIG_USBDEV_DESC_CHECK - -/* Enable test mode */ -// #define CONFIG_USBDEV_TEST_MODE - -#ifndef CONFIG_USBDEV_MSC_BLOCK_SIZE -#define CONFIG_USBDEV_MSC_BLOCK_SIZE 512 -#endif - -#ifndef CONFIG_USBDEV_MSC_MANUFACTURER_STRING -#define CONFIG_USBDEV_MSC_MANUFACTURER_STRING "" -#endif - -#ifndef CONFIG_USBDEV_MSC_PRODUCT_STRING -#define CONFIG_USBDEV_MSC_PRODUCT_STRING "" -#endif - -#ifndef CONFIG_USBDEV_MSC_VERSION_STRING -#define CONFIG_USBDEV_MSC_VERSION_STRING "0.01" -#endif - -// #define CONFIG_USBDEV_MSC_THREAD - -#ifdef CONFIG_USBDEV_MSC_THREAD -#ifndef CONFIG_USBDEV_MSC_STACKSIZE -#define CONFIG_USBDEV_MSC_STACKSIZE 2048 -#endif - -#ifndef CONFIG_USBDEV_MSC_PRIO -#define CONFIG_USBDEV_MSC_PRIO 4 -#endif -#endif - -#ifndef CONFIG_USBDEV_AUDIO_VERSION -#define CONFIG_USBDEV_AUDIO_VERSION 0x0100 -#endif - -#ifndef CONFIG_USBDEV_AUDIO_MAX_CHANNEL -#define CONFIG_USBDEV_AUDIO_MAX_CHANNEL 8 -#endif - -#ifndef CONFIG_USBDEV_RNDIS_RESP_BUFFER_SIZE -#define CONFIG_USBDEV_RNDIS_RESP_BUFFER_SIZE 128 -#endif - -#ifndef CONFIG_USBDEV_RNDIS_ETH_MAX_FRAME_SIZE -#define CONFIG_USBDEV_RNDIS_ETH_MAX_FRAME_SIZE 1536 -#endif - -#ifndef CONFIG_USBDEV_RNDIS_VENDOR_ID -#define CONFIG_USBDEV_RNDIS_VENDOR_ID 0x0000ffff -#endif - -#ifndef CONFIG_USBDEV_RNDIS_VENDOR_DESC -#define CONFIG_USBDEV_RNDIS_VENDOR_DESC "CherryUSB" -#endif - -/* ================ USB HOST Stack Configuration ================== */ - -#define CONFIG_USBHOST_MAX_RHPORTS 1 -#define CONFIG_USBHOST_MAX_EXTHUBS 1 -#define CONFIG_USBHOST_MAX_EHPORTS 4 -#define CONFIG_USBHOST_MAX_INTERFACES 6 -#define CONFIG_USBHOST_MAX_INTF_ALTSETTINGS 1 -#define CONFIG_USBHOST_MAX_ENDPOINTS 4 - -#define CONFIG_USBHOST_DEV_NAMELEN 16 - -#ifndef CONFIG_USBHOST_PSC_PRIO -#define CONFIG_USBHOST_PSC_PRIO 4 -#endif -#ifndef CONFIG_USBHOST_PSC_STACKSIZE -#define CONFIG_USBHOST_PSC_STACKSIZE 2048 -#endif - -//#define CONFIG_USBHOST_GET_STRING_DESC - -/* Ep0 max transfer buffer */ -#define CONFIG_USBHOST_REQUEST_BUFFER_LEN 512 - -#ifndef CONFIG_USBHOST_CONTROL_TRANSFER_TIMEOUT -#define CONFIG_USBHOST_CONTROL_TRANSFER_TIMEOUT 500 -#endif - -#ifndef CONFIG_USBHOST_MSC_TIMEOUT -#define CONFIG_USBHOST_MSC_TIMEOUT 5000 -#endif - -/* ================ USB Device Port Configuration ================*/ - -//#define USBD_IRQHandler USBD_IRQHandler -//#define USB_BASE (0x40080000UL) -//#define USB_NUM_BIDIR_ENDPOINTS 4 - -// #define USBD_IRQHandler USB_IRQHandler -// #define USB_BASE (0x40000C00U) - - - -/* ================ USB Host Port Configuration ==================*/ - -#define CONFIG_USBHOST_PIPE_NUM 10 - -/* ================ EHCI Configuration ================ */ - -#define CONFIG_USB_EHCI_HCCR_BASE (0x20072000) -#define CONFIG_USB_EHCI_HCOR_BASE (0x20072000 + 0x10) -#define CONFIG_USB_EHCI_FRAME_LIST_SIZE 1024 -// #define CONFIG_USB_EHCI_INFO_ENABLE -// #define CONFIG_USB_ECHI_HCOR_RESERVED_DISABLE -// #define CONFIG_USB_EHCI_CONFIGFLAG -// #define CONFIG_USB_EHCI_PORT_POWER - -#endif |