Bladeren bron

update: sync code from rtthread master

Signed-off-by: sakumisu <1203593632@qq.com>
sakumisu 7 maanden geleden
bovenliggende
commit
5fed8b7d05
3 gewijzigde bestanden met toevoegingen van 9 en 1 verwijderingen
  1. 3 1
      SConscript
  2. 1 0
      port/pusb2/rt-thread/usb_config.h
  3. 5 0
      port/pusb2/rt-thread/usb_dc_glue_phytium.c

+ 3 - 1
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']):

+ 1 - 0
port/pusb2/rt-thread/usb_config.h

@@ -12,6 +12,7 @@
 #define CHERRYUSB_CONFIG_H
 
 #include "rtconfig.h"
+#include <rtthread.h> 
 
 /* ================ USB common Configuration ================ */
 

+ 5 - 0
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;
 }