devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

as3525v2-usb: only call wakeup_signal when a thread is actually waiting

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29129 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Amaury Pouly 2011-01-24 15:03:56 +00:00
parent 01313d5039
commit 297ca4b1af
1 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

40
firmware/target/arm/as3525/usb-drv-as3525v2.c
View file

@ -276,8 +276,10 @@ static void reset_endpoints(void)
endpoints[ep][DIR_IN].busy = false; endpoints[ep][DIR_IN].busy = false;
endpoints[ep][DIR_IN].status = -1; endpoints[ep][DIR_IN].status = -1;
if(endpoints[ep][DIR_IN].wait) if(endpoints[ep][DIR_IN].wait)
{
endpoints[ep][DIR_IN].wait = false;
wakeup_signal(&endpoints[ep][DIR_IN].complete); wakeup_signal(&endpoints[ep][DIR_IN].complete);
endpoints[ep][DIR_IN].wait = false; }
if(DIEPCTL(ep) & DEPCTL_epena) if(DIEPCTL(ep) & DEPCTL_epena)
DIEPCTL(ep) = DEPCTL_snak; DIEPCTL(ep) = DEPCTL_snak;
else else
@ -290,8 +292,10 @@ static void reset_endpoints(void)
endpoints[ep][DIR_OUT].busy = false; endpoints[ep][DIR_OUT].busy = false;
endpoints[ep][DIR_OUT].status = -1; endpoints[ep][DIR_OUT].status = -1;
if(endpoints[ep][DIR_OUT].wait) if(endpoints[ep][DIR_OUT].wait)
{
endpoints[ep][DIR_OUT].wait = false;
wakeup_signal(&endpoints[ep][DIR_OUT].complete); wakeup_signal(&endpoints[ep][DIR_OUT].complete);
endpoints[ep][DIR_OUT].wait = false; }
if(DOEPCTL(ep) & DEPCTL_epena) if(DOEPCTL(ep) & DEPCTL_epena)
DOEPCTL(ep) = DEPCTL_snak; DOEPCTL(ep) = DEPCTL_snak;
else else
@ -318,17 +322,23 @@ static void cancel_all_transfers(bool cancel_ep0)
FOR_EACH_IN_EP_EX(cancel_ep0, i, ep) FOR_EACH_IN_EP_EX(cancel_ep0, i, ep)
{ {
endpoints[ep][DIR_IN].status = -1; endpoints[ep][DIR_IN].status = -1;
endpoints[ep][DIR_IN].wait = false;
endpoints[ep][DIR_IN].busy = false; endpoints[ep][DIR_IN].busy = false;
wakeup_signal(&endpoints[ep][DIR_IN].complete); if(endpoints[ep][DIR_IN].wait)
{
endpoints[ep][DIR_IN].wait = false;
wakeup_signal(&endpoints[ep][DIR_IN].complete);
}
DIEPCTL(ep) = (DIEPCTL(ep) & ~DEPCTL_usbactep) | DEPCTL_snak; DIEPCTL(ep) = (DIEPCTL(ep) & ~DEPCTL_usbactep) | DEPCTL_snak;
} }
FOR_EACH_OUT_EP_EX(cancel_ep0, i, ep) FOR_EACH_OUT_EP_EX(cancel_ep0, i, ep)
{ {
endpoints[ep][DIR_OUT].status = -1; endpoints[ep][DIR_OUT].status = -1;
endpoints[ep][DIR_OUT].wait = false;
endpoints[ep][DIR_OUT].busy = false; endpoints[ep][DIR_OUT].busy = false;
wakeup_signal(&endpoints[ep][DIR_OUT].complete); if(endpoints[ep][DIR_OUT].wait)
{
endpoints[ep][DIR_OUT].wait = false;
wakeup_signal(&endpoints[ep][DIR_OUT].complete);
}
DOEPCTL(ep) = (DOEPCTL(ep) & ~DEPCTL_usbactep) | DEPCTL_snak; DOEPCTL(ep) = (DOEPCTL(ep) & ~DEPCTL_usbactep) | DEPCTL_snak;
} }
@ -482,7 +492,11 @@ static void handle_ep_in_int(int ep)
handle_ep0_complete(endpoint->len == 0); handle_ep0_complete(endpoint->len == 0);
endpoint->len = size; endpoint->len = size;
usb_core_transfer_complete(ep, USB_DIR_IN, 0, transfered); usb_core_transfer_complete(ep, USB_DIR_IN, 0, transfered);
wakeup_signal(&endpoint->complete); if(endpoint->wait)
{
endpoint->wait = false;
wakeup_signal(&endpoint->complete);
}
} }
} }
if(sts & DIEPINT_timeout) if(sts & DIEPINT_timeout)
@ -495,7 +509,11 @@ static void handle_ep_in_int(int ep)
/* for safety, act as if no bytes as been transfered */ /* for safety, act as if no bytes as been transfered */
endpoint->len = 0; endpoint->len = 0;
usb_core_transfer_complete(ep, USB_DIR_IN, 1, 0); usb_core_transfer_complete(ep, USB_DIR_IN, 1, 0);
wakeup_signal(&endpoint->complete); if(endpoint->wait)
{
endpoint->wait = false;
wakeup_signal(&endpoint->complete);
}
} }
} }
/* clear interrupts */ /* clear interrupts */
@ -525,7 +543,11 @@ static void handle_ep_out_int(int ep)
if(ep == 0) if(ep == 0)
handle_ep0_complete(endpoint->len == 0); handle_ep0_complete(endpoint->len == 0);
usb_core_transfer_complete(ep, USB_DIR_OUT, 0, transfered); usb_core_transfer_complete(ep, USB_DIR_OUT, 0, transfered);
wakeup_signal(&endpoint->complete); if(endpoint->wait)
{
endpoint->wait = false;
wakeup_signal(&endpoint->complete);
}
} }
} }
if(sts & DOEPINT_setup) if(sts & DOEPINT_setup)