diff options
| author | udoudou <[email protected]> | 2024-08-15 23:11:45 +0800 |
|---|---|---|
| committer | sakumisu <[email protected]> | 2024-08-16 00:18:30 +0800 |
| commit | 668e41491737393ffb62db5db30421c5d2ed0616 (patch) | |
| tree | 12b3f3dad1eb81c2b86df4fbba51d926169dd02f | |
| parent | 03f8711b205e934c205e13ee01732c2920a87531 (diff) | |
Fix IDF compilation error
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cherryusb.cmake | 2 | ||||
| -rw-r--r-- | port/dwc2/usb_glue_esp.c | 8 |
3 files changed, 5 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d4c5ace..1471bda7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,7 +141,5 @@ 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/cherryusb.cmake b/cherryusb.cmake index 91b6c3d2..f82dd86c 100644 --- a/cherryusb.cmake +++ b/cherryusb.cmake @@ -43,7 +43,7 @@ ${CMAKE_CURRENT_LIST_DIR}/class/vendor/wifi if(CONFIG_CHERRYUSB_DEVICE) list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/core/usbd_core.c) - if(CONFIG_CHERRYUSB_DEVICE_CDC) + if(CONFIG_CHERRYUSB_DEVICE_CDC_ACM) list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/class/cdc/usbd_cdc.c) endif() if(CONFIG_CHERRYUSB_DEVICE_HID) diff --git a/port/dwc2/usb_glue_esp.c b/port/dwc2/usb_glue_esp.c index c62c46c5..02740c15 100644 --- a/port/dwc2/usb_glue_esp.c +++ b/port/dwc2/usb_glue_esp.c @@ -50,12 +50,12 @@ void usb_dc_low_level_init(void) } // TODO: Check when to enable interrupt - ret = esp_intr_alloc(DEFAULT_USB_INTR_SOURCE, ESP_INTR_FLAG_LEVEL2, usb_dc_interrupt_cb, 0, &s_interrupt_handle); + ret = esp_intr_alloc(DEFAULT_USB_INTR_SOURCE, ESP_INTR_FLAG_LOWMED, usb_dc_interrupt_cb, 0, &s_interrupt_handle); if (ret != ESP_OK) { USB_LOG_ERR("USB Interrupt Init Failed!\r\n"); return; } - USB_LOG_INFO("cherryusb, version: 0x%06x\r\n", CHERRYUSB_VERSION); + USB_LOG_INFO("cherryusb, version: "CHERRYUSB_VERSION_STR"\r\n"); } void usb_dc_low_level_deinit(void) @@ -100,12 +100,12 @@ void usb_hc_low_level_init(struct usbh_bus *bus) } // TODO: Check when to enable interrupt - ret = esp_intr_alloc(DEFAULT_USB_INTR_SOURCE, ESP_INTR_FLAG_LEVEL2, usb_hc_interrupt_cb, 0, &s_interrupt_handle); + ret = esp_intr_alloc(DEFAULT_USB_INTR_SOURCE, ESP_INTR_FLAG_LOWMED, usb_hc_interrupt_cb, 0, &s_interrupt_handle); if (ret != ESP_OK) { USB_LOG_ERR("USB Interrupt Init Failed!\r\n"); return; } - USB_LOG_INFO("cherryusb, version: 0x%06x\r\n", CHERRYUSB_VERSION); + USB_LOG_INFO("cherryusb, version: "CHERRYUSB_VERSION_STR"\r\n"); } void usb_hc_low_level_deinit(struct usbh_bus *bus) |