yemai/CherryUSB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed osal critical section protect adapt 64bits CPU.

Browse Source
This commit is contained in:
xieyangrun
2022-03-31 18:20:30 +08:00
committed by sakumisu
parent dfa977caa2
commit 322964f598
13 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SConscript
View File

@@ -45,7 +45,7 @@ if GetDepend(['PKG_CHERRYUSB_USING_DEVICE']):
CPPDEFINES += ['USB_BASE=0x40080000UL']
if GetDepend(['CHERRYUSB_USING_MUSB']):
src += Glob('port/musb/usb_dc_musb.c')
if GetDepend(['CHERRYUSB_USING_CDC_DEMO']):
if GetDepend(['CHERRYUSB_USING_CDC_DEMO']):
src += Glob('demo/cdc_acm_template.c')
# USB HOST

4
class/cdc/usbh_cdc_acm.c
View File

@@ -37,7 +37,7 @@ static uint32_t g_devinuse = 0;
static int usbh_cdc_acm_devno_alloc(struct usbh_cdc_acm *priv)
{
uint32_t flags;
size_t flags;
int devno;
flags = usb_osal_enter_critical_section();
@@ -68,7 +68,7 @@ static void usbh_cdc_acm_devno_free(struct usbh_cdc_acm *priv)
int devno = priv->minor;
if (devno >= 0 && devno < 32) {
uint32_t flags = usb_osal_enter_critical_section();
size_t flags = usb_osal_enter_critical_section();
g_devinuse &= ~(1 << devno);
usb_osal_leave_critical_section(flags);
}

4
class/hid/usbh_hid.c
View File

@@ -37,7 +37,7 @@ static uint32_t g_devinuse = 0;
static int usbh_hid_devno_alloc(struct usbh_hid *priv)
{
uint32_t flags;
size_t flags;
int devno;
flags = usb_osal_enter_critical_section();
@@ -68,7 +68,7 @@ static void usbh_hid_devno_free(struct usbh_hid *priv)
int devno = priv->minor;
if (devno >= 0 && devno < 32) {
uint32_t flags = usb_osal_enter_critical_section();
size_t size_t = usb_osal_enter_critical_section();
g_devinuse &= ~(1 << devno);
usb_osal_leave_critical_section(flags);
}

4
class/hub/usbh_hub.c
View File

@@ -57,7 +57,7 @@ static inline void usbh_hub_unregister(struct usbh_hub *hub)
static int usbh_hub_devno_alloc(struct usbh_hub *hub)
{
uint32_t flags;
size_t flags;
int devno;
flags = usb_osal_enter_critical_section();
@@ -88,7 +88,7 @@ static void usbh_hub_devno_free(struct usbh_hub *hub)
int devno = hub->index;
if (devno >= 2 && devno < 32) {
uint32_t flags = usb_osal_enter_critical_section();
size_t flags = usb_osal_enter_critical_section();
g_devinuse &= ~(1 << devno);
usb_osal_leave_critical_section(flags);
}

4
class/msc/usbh_msc.c
View File

@@ -38,7 +38,7 @@ static uint32_t g_devinuse = 0;
static int usbh_msc_devno_alloc(struct usbh_msc *priv)
{
uint32_t flags;
size_t flags;
int devno;
flags = usb_osal_enter_critical_section();
@@ -69,7 +69,7 @@ static void usbh_msc_devno_free(struct usbh_msc *priv)
int devno = priv->sdchar - 'a';
if (devno >= 0 && devno < 26) {
uint32_t flags = usb_osal_enter_critical_section();
size_t flags = usb_osal_enter_critical_section();
g_devinuse &= ~(1 << devno);
usb_osal_leave_critical_section(flags);
}

8
core/usbh_core.c
View File

@@ -171,7 +171,7 @@ void usbh_hport_activate(struct usbh_hubport *hport)
void usbh_hport_deactivate(struct usbh_hubport *hport)
{
uint32_t flags;
size_t flags;
/* Don't free the control pipe of root hub ports! */
if (hport->parent != NULL && hport->ep0 != NULL) {
@@ -674,7 +674,7 @@ static int usbh_portchange_wait(struct usbh_hubport **hport)
{
struct usbh_hubport *connport = NULL;
uint32_t recved_event;
uint32_t flags;
size_t flags;
int ret;
/* Loop until a change in connection state is detected */
@@ -775,7 +775,7 @@ static void usbh_portchange_detect_thread(void *argument)
void usbh_external_hport_connect(struct usbh_hubport *hport)
{
uint32_t flags;
size_t flags;
usbh_hport_activate(hport);
@@ -790,7 +790,7 @@ void usbh_external_hport_connect(struct usbh_hubport *hport)
void usbh_external_hport_disconnect(struct usbh_hubport *hport)
{
uint32_t flags;
size_t flags;
flags = usb_osal_enter_critical_section();

4
osal/usb_osal.h
View File

@@ -51,8 +51,8 @@ void usb_osal_event_delete(usb_osal_event_t event);
int usb_osal_event_recv(usb_osal_event_t event, uint32_t set, uint32_t *recved);
int usb_osal_event_send(usb_osal_event_t event, uint32_t set);
uint32_t usb_osal_enter_critical_section(void);
void usb_osal_leave_critical_section(uint32_t flag);
size_t usb_osal_enter_critical_section(void);
void usb_osal_leave_critical_section(size_t flag);
void usb_osal_msleep(uint32_t delay);

4
osal/usb_osal_freertos.c
View File

@@ -131,13 +131,13 @@ int usb_osal_event_send(usb_osal_event_t event, uint32_t set)
return (ret == pdPASS) ? 0 : -1;
}
uint32_t usb_osal_enter_critical_section(void)
size_t usb_osal_enter_critical_section(void)
{
taskENTER_CRITICAL();
return 1;
}
void usb_osal_leave_critical_section(uint32_t flag)
void usb_osal_leave_critical_section(size_t flag)
{
taskEXIT_CRITICAL();
}

6
osal/usb_osal_rtthread.c
View File

@@ -117,17 +117,17 @@ int usb_osal_event_send(usb_osal_event_t event, uint32_t set)
return ret;
}
uint32_t usb_osal_enter_critical_section(void)
size_t usb_osal_enter_critical_section(void)
{
return rt_hw_interrupt_disable();
}
void usb_osal_leave_critical_section(uint32_t flag)
void usb_osal_leave_critical_section(size_t flag)
{
rt_hw_interrupt_enable(flag);
}
void usb_osal_msleep(uint32_t delay)
{
rt_thread_mdelay(rt_tick_from_millisecond(delay));
rt_thread_mdelay(delay);
}

6
osal/usb_workq.c
View File

@@ -27,7 +27,7 @@
void usb_workqueue_submit(struct usb_workqueue *queue, struct usb_work *work, usb_worker_t worker, void *arg, uint32_t ticks)
{
uint32_t flags;
size_t flags;
flags = usb_osal_enter_critical_section();
usb_dlist_remove(&work->list);
work->worker = worker;
@@ -47,7 +47,7 @@ struct usb_workqueue g_lpworkq = { NULL };
static void usbh_hpwork_thread(void *argument)
{
struct usb_work *work;
uint32_t flags;
size_t flags;
int ret;
struct usb_workqueue *queue = (struct usb_workqueue *)argument;
while (1) {
@@ -70,7 +70,7 @@ static void usbh_hpwork_thread(void *argument)
static void usbh_lpwork_thread(void *argument)
{
struct usb_work *work;
uint32_t flags;
size_t flags;
int ret;
struct usb_workqueue *queue = (struct usb_workqueue *)argument;
while (1) {

6
port/ehci/usb_ehci.c
View File

@@ -1299,7 +1299,7 @@ errout_with_qh:
static int usb_ehci_ioc_setup(struct usb_ehci_epinfo_s *epinfo)
{
uint32_t flags;
size_t flags;
int ret = -ENODEV;
DEBUGASSERT(rhport && epinfo && !epinfo->iocwait);
@@ -1353,7 +1353,7 @@ static int usb_ehci_ioc_setup(struct usb_ehci_epinfo_s *epinfo)
#ifdef CONFIG_USBHOST_ASYNCH
static int usb_ehci_ioc_async_setup(struct usb_ehci_epinfo_s *epinfo, usbh_asynch_callback_t callback, void *arg)
{
uint32_t flags;
size_t flags;
int ret = -ENODEV;
DEBUGASSERT(rhport && epinfo && !epinfo->iocwait);
@@ -2536,7 +2536,7 @@ int usb_ep_cancel(usbh_epinfo_t ep)
void *arg;
#endif
uint32_t *bp;
uint32_t flags;
size_t flags;
bool iocwait;
int ret;

6
port/musb/usb_hc_musb.c
View File

@@ -302,7 +302,7 @@ static void usb_musb_chan_free(struct usb_musb_chan *chan)
static int usb_musb_chan_waitsetup(struct usb_musb_chan *chan)
{
uint32_t flags;
size_t flags;
int ret = -ENODEV;
flags = usb_osal_enter_critical_section();
@@ -346,7 +346,7 @@ static int usb_musb_chan_waitsetup(struct usb_musb_chan *chan)
#ifdef CONFIG_USBHOST_ASYNCH
static int usb_musb_chan_asynchsetup(struct usb_musb_chan *chan, usbh_asynch_callback_t callback, void *arg)
{
uint32_t flags;
size_t flags;
int ret = -ENODEV;
flags = usb_osal_enter_critical_section();
@@ -890,7 +890,7 @@ int usbh_ep_intr_async_transfer(usbh_epinfo_t ep, uint8_t *buffer, uint32_t bufl
int usb_ep_cancel(usbh_epinfo_t ep)
{
int ret;
uint32_t flags;
size_t flags;
struct usb_musb_chan *chan;
uint8_t chidx = (uint8_t)ep;
#ifdef CONFIG_USBHOST_ASYNCH

10
port/synopsys/usb_hc_synopsys.c
View File

@@ -147,7 +147,7 @@ static inline void usb_synopsys_chan_freeall(void)
static int usb_synopsys_chan_waitsetup(struct usb_synopsys_chan *chan)
{
uint32_t flags;
size_t flags;
int ret = -ENODEV;
flags = usb_osal_enter_critical_section();
@@ -191,7 +191,7 @@ static int usb_synopsys_chan_waitsetup(struct usb_synopsys_chan *chan)
#ifdef CONFIG_USBHOST_ASYNCH
static int usb_synopsys_chan_asynchsetup(struct usb_synopsys_chan *chan, usbh_asynch_callback_t callback, void *arg)
{
uint32_t flags;
size_t flags;
int ret = -ENODEV;
flags = usb_osal_enter_critical_section();
@@ -681,7 +681,7 @@ errout_with_mutex:
int usbh_ep_intr_transfer(usbh_epinfo_t ep, uint8_t *buffer, uint32_t buflen, uint32_t timeout)
{
uint32_t flags;
size_t flags;
uint32_t retries;
int ret;
struct usb_synopsys_chan *chan;
@@ -752,7 +752,7 @@ int usbh_ep_bulk_async_transfer(usbh_epinfo_t ep, uint8_t *buffer, uint32_t bufl
int usbh_ep_intr_async_transfer(usbh_epinfo_t ep, uint8_t *buffer, uint32_t buflen, usbh_asynch_callback_t callback, void *arg)
{
int ret;
uint32_t flags;
size_t flags;
struct usb_synopsys_chan *chan;
struct usb_synopsys_priv *priv = &g_usbhost;
uint8_t chidx = (uint8_t)ep;
@@ -785,7 +785,7 @@ int usbh_ep_intr_async_transfer(usbh_epinfo_t ep, uint8_t *buffer, uint32_t bufl
int usb_ep_cancel(usbh_epinfo_t ep)
{
int ret;
uint32_t flags;
size_t flags;
struct usb_synopsys_chan *chan;
struct usb_synopsys_priv *priv = &g_usbhost;
#ifdef CONFIG_USBHOST_ASYNCH