[bsp][nrf5x]added the cherryusb adapter for nrf52840

RT-Thread · Jan 24, 2025 · e182a22 · e182a22
1 parent cf199f5
commit e182a22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/bsp/nrf5x/nrf52840/board/port/SConscript b/bsp/nrf5x/nrf52840/board/port/SConscript
@@ -8,7 +8,7 @@ src = []
 path =  []
 
 if GetDepend(['RT_USING_CHERRYUSB']):
-    src += Glob('cherryusb/cherryusb_usbd_compostite_init.c')
+    src += Glob('cherryusb/cherryusb.c')
     path += [cwd + '/cherryusb']
 
 group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path)

diff --git a/...herryusb/cherryusb_usbd_compostite_init.c → ...nrf52840/board/port/cherryusb/cherryusb.c b/...herryusb/cherryusb_usbd_compostite_init.c → ...nrf52840/board/port/cherryusb/cherryusb.c
@@ -49,23 +49,22 @@ void usb_low_disable_irq(void)
 {
     NVIC_DisableIRQ(USBD_IRQn);
 }
+
 int cherryusb_protocol_stack_init(void)
 {
 #ifdef RT_CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM
     extern void cdc_acm_init(void);
     cdc_acm_init();
     rt_kprintf("cdc acm example started. \r\n");
-    nrf_delay_ms(5000);
 #elif defined RT_CHERRYUSB_DEVICE_TEMPLATE_MSC
     extern void msc_ram_init(void);
     msc_ram_init();
     rt_kprintf("msc ram example started. \r\n");
-    nrf_delay_ms(5000);
 #elif defined RT_CHERRYUSB_DEVICE_TEMPLATE_HID_KEYBOARD
     extern void hid_keyboard_init(uint8_t busid, uintptr_t reg_base);
     hid_keyboard_init(0,NULL);
     rt_kprintf("hid keyboard example started. \r\n");
-    // nrf_delay_ms(5000);
 #endif
 }
+
 INIT_APP_EXPORT(cherryusb_protocol_stack_init);