diff options
| author | sakumisu <[email protected]> | 2024-09-02 19:22:03 +0800 |
|---|---|---|
| committer | Rbb666 <[email protected]> | 2024-09-02 21:27:47 +0800 |
| commit | 2d266742e0c9c888bd1cb2e545e424c00f8cdda6 (patch) | |
| tree | 81f3fc5dbde8c26ddac75bfd7ee6ab4b77c3d0df /components | |
| parent | a40f2a62ef95e7decb8e6ae755827e80dee203bf (diff) | |
fix(cherryusb): fix build error
Diffstat (limited to 'components')
| -rw-r--r-- | components/drivers/usb/cherryusb/SConscript | 2 | ||||
| -rw-r--r-- | components/drivers/usb/cherryusb/class/msc/usbd_msc.c | 2 | ||||
| -rw-r--r-- | components/drivers/usb/cherryusb/port/ehci/usb_glue_ma35d0.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/components/drivers/usb/cherryusb/SConscript b/components/drivers/usb/cherryusb/SConscript index deec7435cb..baeec17889 100644 --- 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 index b562f47488..c791fd0c7e 100644 --- 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 index 76e621ef96..3e03bbd84c 100644 --- 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--; |