summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsakumisu <[email protected]>2025-05-20 18:46:18 +0800
committersakumisu <[email protected]>2025-05-20 18:46:18 +0800
commit5fed8b7d0539e37100d91381a8b46847364ecd4d (patch)
tree99cfc6b0987f48661ba438bab6c07b9dd1ee1612
parent45ccc810d296f1a5ffadc50aa56bce3f2c39f7c8 (diff)
update: sync code from rtthread master
Signed-off-by: sakumisu <[email protected]>
-rw-r--r--SConscript4
-rw-r--r--port/pusb2/rt-thread/usb_config.h1
-rw-r--r--port/pusb2/rt-thread/usb_dc_glue_phytium.c5
3 files changed, 9 insertions, 1 deletions
diff --git a/SConscript b/SConscript
index b0086044..82de1c05 100644
--- a/SConscript
+++ b/SConscript
@@ -106,6 +106,8 @@ if GetDepend(['PKG_CHERRYUSB_DEVICE']):
if GetDepend(['ARCH_ARM_CORTEX_A']):
LIBPATH = [cwd + '/port/pusb2']
LIBS = ['libpusb2_dc_a32_softfp_neon.a']
+ if GetDepend(['PKG_CHERRYUSB_DEVICE_NRF5X']):
+ src += Glob('port/nrf5x/usb_dc_nrf5x.c')
if GetDepend(['PKG_CHERRYUSB_DEVICE_CDC_ACM']):
src += Glob('class/cdc/usbd_cdc_acm.c')
@@ -123,7 +125,7 @@ if GetDepend(['PKG_CHERRYUSB_DEVICE']):
src += Glob('class/cdc/usbd_cdc_ecm.c')
if GetDepend(['PKG_CHERRYUSB_DEVICE_CDC_NCM']):
src += Glob('class/cdc/usbd_cdc_ncm.c')
- if GetDepend(['PKG_CHERRYUSB_USING_DFU']):
+ if GetDepend(['PKG_CHERRYUSB_DEVICE_DFU']):
src += Glob('class/dfu/usbd_dfu.c')
if GetDepend(['PKG_CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM']):
diff --git a/port/pusb2/rt-thread/usb_config.h b/port/pusb2/rt-thread/usb_config.h
index 2a42c478..ec8faa2e 100644
--- a/port/pusb2/rt-thread/usb_config.h
+++ b/port/pusb2/rt-thread/usb_config.h
@@ -12,6 +12,7 @@
#define CHERRYUSB_CONFIG_H
#include "rtconfig.h"
+#include <rtthread.h>
/* ================ USB common Configuration ================ */
diff --git a/port/pusb2/rt-thread/usb_dc_glue_phytium.c b/port/pusb2/rt-thread/usb_dc_glue_phytium.c
index fdcf3004..49088d95 100644
--- a/port/pusb2/rt-thread/usb_dc_glue_phytium.c
+++ b/port/pusb2/rt-thread/usb_dc_glue_phytium.c
@@ -86,4 +86,9 @@ void *usb_sys_malloc_align(size_t align, size_t size)
}
return buf;
+}
+
+int usbd_set_remote_wakeup(uint8_t busid)
+{
+ return -1;
} \ No newline at end of file