fix(cherryusb): fix build error

RT-Thread · Sep 2, 2024 · 2d26674 · 2d26674
1 parent a40f2a6
commit 2d26674
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/components/drivers/usb/cherryusb/SConscript b/components/drivers/usb/cherryusb/SConscript
@@ -84,7 +84,7 @@ if GetDepend(['RT_CHERRYUSB_DEVICE']):
             LIBS = ['libpusb2_dc_a32_softfp_neon.a']
 
     if GetDepend(['RT_CHERRYUSB_DEVICE_CDC_ACM']):
-        src += Glob('class/cdc/usbd_cdc.c')
+        src += Glob('class/cdc/usbd_cdc_acm.c')
     if GetDepend(['RT_CHERRYUSB_DEVICE_HID']):
         src += Glob('class/hid/usbd_hid.c')
     if GetDepend(['RT_CHERRYUSB_DEVICE_MSC']):

diff --git a/components/drivers/usb/cherryusb/class/msc/usbd_msc.c b/components/drivers/usb/cherryusb/class/msc/usbd_msc.c
@@ -537,6 +537,7 @@ static bool SCSI_read10(uint8_t busid, uint8_t **data, uint32_t *len)
     g_usbd_msc[busid].stage = MSC_DATA_IN;
 #if defined(CONFIG_USBDEV_MSC_THREAD)
     usb_osal_mq_send(g_usbd_msc[busid].usbd_msc_mq, MSC_DATA_IN);
+    return true;
 #elif defined(CONFIG_USBDEV_MSC_POLLING)
     chry_ringbuffer_write_byte(&g_usbd_msc[busid].msc_rb, MSC_DATA_IN);
     return true;
@@ -574,6 +575,7 @@ static bool SCSI_read12(uint8_t busid, uint8_t **data, uint32_t *len)
     g_usbd_msc[busid].stage = MSC_DATA_IN;
 #if defined(CONFIG_USBDEV_MSC_THREAD)
     usb_osal_mq_send(g_usbd_msc[busid].usbd_msc_mq, MSC_DATA_IN);
+    return true;
 #elif defined(CONFIG_USBDEV_MSC_POLLING)
     chry_ringbuffer_write_byte(&g_usbd_msc[busid].msc_rb, MSC_DATA_IN);
     return true;

diff --git a/components/drivers/usb/cherryusb/port/ehci/usb_glue_ma35d0.c b/components/drivers/usb/cherryusb/port/ehci/usb_glue_ma35d0.c
@@ -57,7 +57,7 @@ void usb_hc_low_level_init(struct usbh_bus *bus)
         SYS->MISCFCR0 &= ~SYS_MISCFCR0_UHOVRCURH_Msk;
         while (1) {
             rt_thread_mdelay(1);
-            if ((SYS->USBPMISCR & SYS_USBPMISCR_PHY0HSTCKSTB_Msk) &&)
+            if (SYS->USBPMISCR & SYS_USBPMISCR_PHY0HSTCKSTB_Msk)
                 break; /* both USB PHY0 and PHY1 clock 60MHz UTMI clock stable */
 
             timeout--;
@@ -88,7 +88,7 @@ void usb_hc_low_level_init(struct usbh_bus *bus)
         SYS->MISCFCR0 &= ~SYS_MISCFCR0_UHOVRCURH_Msk;
         while (1) {
             rt_thread_mdelay(1);
-            if ((SYS->USBPMISCR & SYS_USBPMISCR_PHY1HSTCKSTB_Msk))
+            if (SYS->USBPMISCR & SYS_USBPMISCR_PHY1HSTCKSTB_Msk)
                 break; /* both USB PHY0 and PHY1 clock 60MHz UTMI clock stable */
 
             timeout--;