yemai/CherryUSB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: idf config update

Browse Source
This commit is contained in:
sakumisu
2024-08-14 21:56:40 +08:00
parent 4b2000b405
commit 4a252c3f73
4 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -27,7 +27,7 @@ set(CONFIG_CHERRYUSB_HOST_PL2303 1)
set(CONFIG_CHERRYUSB_OSAL "freertos") set(CONFIG_CHERRYUSB_OSAL "freertos")
set(CONFIG_CHERRYUSB_HOST_HCD "ehci_bouffalo") set(CONFIG_CHERRYUSB_HOST_HCD "ehci_bouffalo")
include(cherryusb.cmake) include(${CMAKE_CURRENT_LIST_DIR}/cherryusb.cmake)
sdk_generate_library(cherryusb) sdk_generate_library(cherryusb)
sdk_add_include_directories(${cherryusb_incs}) sdk_add_include_directories(${cherryusb_incs})
@@ -56,7 +56,7 @@ set(CONFIG_CHERRYUSB_HOST_BL616 1)
set(CONFIG_CHERRYUSB_OSAL "freertos") set(CONFIG_CHERRYUSB_OSAL "freertos")
set(CONFIG_CHERRYUSB_HOST_HCD "ehci_hpm") set(CONFIG_CHERRYUSB_HOST_HCD "ehci_hpm")
include(cherryusb.cmake) include(${CMAKE_CURRENT_LIST_DIR}/cherryusb.cmake)
sdk_inc(${cherryusb_incs}) sdk_inc(${cherryusb_incs})
sdk_src(${cherryusb_srcs}) sdk_src(${cherryusb_srcs})
@@ -69,7 +69,7 @@ set(CONFIG_CHERRYUSB_DEVICE_DCD "dwc2_esp")
set(CONFIG_CHERRYUSB_HOST_HCD "dwc2_esp") set(CONFIG_CHERRYUSB_HOST_HCD "dwc2_esp")
set(CONFIG_CHERRYUSB_OSAL "idf") set(CONFIG_CHERRYUSB_OSAL "idf")
include(cherryusb.cmake) include(${CMAKE_CURRENT_LIST_DIR}/cherryusb.cmake)
set(ldfragments "osal/idf/linker.lf") set(ldfragments "osal/idf/linker.lf")

20
idf_component.yml
View File

@@ -1,5 +1,25 @@
version: "1.4.0"
description: CherryUSB is a tiny and portable USB Stack (device & host) for embedded system with USB IP description: CherryUSB is a tiny and portable USB Stack (device & host) for embedded system with USB IP
tags:
- usb
- usb-device
- usb-host
- cdc_acm
- cdc_ecm
- cdc_ncm
- hid
- msc
- rndis
- uvc
- uac
- winusb
url: https://github.com/cherry-embedded/CherryUSB url: https://github.com/cherry-embedded/CherryUSB
repository: https://github.com/cherry-embedded/CherryUSB.git repository: https://github.com/cherry-embedded/CherryUSB.git
documentation: https://cherryusb.readthedocs.io/ documentation: https://cherryusb.readthedocs.io/
issues: https://github.com/cherry-embedded/CherryUSB/issues issues: https://github.com/cherry-embedded/CherryUSB/issues
dependencies:
idf: ">=5.0"
targets:
- esp32s2
- esp32s3
- esp32p4

10
osal/idf/usb_config.h
View File

@@ -16,9 +16,6 @@
#define CONFIG_USB_PRINTF(...) esp_rom_printf(__VA_ARGS__) #define CONFIG_USB_PRINTF(...) esp_rom_printf(__VA_ARGS__)
#define usb_malloc(size) malloc(size)
#define usb_free(ptr) free(ptr)
#ifndef CONFIG_USB_DBG_LEVEL #ifndef CONFIG_USB_DBG_LEVEL
#define CONFIG_USB_DBG_LEVEL USB_DBG_INFO #define CONFIG_USB_DBG_LEVEL USB_DBG_INFO
#endif #endif
@@ -103,14 +100,10 @@
#define CONFIG_USBDEV_RNDIS_VENDOR_DESC "CherryUSB" #define CONFIG_USBDEV_RNDIS_VENDOR_DESC "CherryUSB"
#endif #endif
/******
#define CONFIG_USBDEV_RNDIS_USING_LWIP #define CONFIG_USBDEV_RNDIS_USING_LWIP
******/
/* ================ USB HOST Stack Configuration ================== */ /* ================ USB HOST Stack Configuration ================== */
// NOTE: Below configurations are removed to Kconfig, `idf.py menuconfig` to config them
/******
#define CONFIG_USBHOST_MAX_RHPORTS 1 #define CONFIG_USBHOST_MAX_RHPORTS 1
#define CONFIG_USBHOST_MAX_EXTHUBS 1 #define CONFIG_USBHOST_MAX_EXTHUBS 1
#define CONFIG_USBHOST_MAX_EHPORTS 4 #define CONFIG_USBHOST_MAX_EHPORTS 4
@@ -125,7 +118,6 @@
#define CONFIG_USBHOST_MAX_VIDEO_CLASS 1 #define CONFIG_USBHOST_MAX_VIDEO_CLASS 1
#define CONFIG_USBHOST_DEV_NAMELEN 16 #define CONFIG_USBHOST_DEV_NAMELEN 16
******/
#ifndef CONFIG_USBHOST_PSC_PRIO #ifndef CONFIG_USBHOST_PSC_PRIO
#define CONFIG_USBHOST_PSC_PRIO 0 #define CONFIG_USBHOST_PSC_PRIO 0
@@ -143,7 +135,7 @@
/* Ep0 max transfer buffer */ /* Ep0 max transfer buffer */
#ifndef CONFIG_USBHOST_REQUEST_BUFFER_LEN #ifndef CONFIG_USBHOST_REQUEST_BUFFER_LEN
#define CONFIG_USBHOST_REQUEST_BUFFER_LEN 512 #define CONFIG_USBHOST_REQUEST_BUFFER_LEN 2048
#endif #endif
#ifndef CONFIG_USBHOST_CONTROL_TRANSFER_TIMEOUT #ifndef CONFIG_USBHOST_CONTROL_TRANSFER_TIMEOUT

1
port/dwc2/usb_glue_esp.c
View File

@@ -8,6 +8,7 @@
#include "esp_intr_alloc.h" #include "esp_intr_alloc.h"
#include "esp_private/usb_phy.h" #include "esp_private/usb_phy.h"
#include "soc/periph_defs.h" #include "soc/periph_defs.h"
#include "freertos/FreeRTOS.h"
#include "usbd_core.h" #include "usbd_core.h"
#include "usbh_core.h" #include "usbh_core.h"