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

USB AMSv2: only read endpoint interrupt status register once

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28041 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-09-08 05:04:48 +00:00
parent 1752dfda1b
commit 8e0ff81d6f
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -466,9 +466,10 @@ static void handle_ep_int(int ep, bool dir_in)
struct usb_endpoint *endpoint = &endpoints[ep][dir_in]; struct usb_endpoint *endpoint = &endpoints[ep][dir_in];
if(dir_in) if(dir_in)
{ {
if(DIEPINT(ep) & DIEPINT_ahberr) unsigned long sts = DIEPINT(ep);
if(sts & DIEPINT_ahberr)
panicf("usb-drv: ahb error on EP%d IN", ep); panicf("usb-drv: ahb error on EP%d IN", ep);
if(DIEPINT(ep) & DIEPINT_xfercompl) if(sts & DIEPINT_xfercompl)
{ {
if(endpoint->busy) if(endpoint->busy)
{ {
@ -487,7 +488,7 @@ static void handle_ep_int(int ep, bool dir_in)
wakeup_signal(&endpoint->complete); wakeup_signal(&endpoint->complete);
} }
} }
if(DIEPINT(ep) & DIEPINT_timeout) if(sts & DIEPINT_timeout)
{ {
panicf("usb-drv: timeout on EP%d IN", ep); panicf("usb-drv: timeout on EP%d IN", ep);
if(endpoint->busy) if(endpoint->busy)
@ -501,13 +502,14 @@ static void handle_ep_int(int ep, bool dir_in)
} }
} }
/* clear interrupts */ /* clear interrupts */
DIEPINT(ep) = DIEPINT(ep); DIEPINT(ep) = sts;
} }
else else
{ {
if(DOEPINT(ep) & DOEPINT_ahberr) unsigned long sts = DOEPINT(ep);
if(sts & DOEPINT_ahberr)
panicf("usb-drv: ahb error on EP%d OUT", ep); panicf("usb-drv: ahb error on EP%d OUT", ep);
if(DOEPINT(ep) & DOEPINT_xfercompl) if(sts & DOEPINT_xfercompl)
{ {
logf("usb-drv: xfer complete on EP%d OUT", ep); logf("usb-drv: xfer complete on EP%d OUT", ep);
if(endpoint->busy) if(endpoint->busy)
@ -527,7 +529,7 @@ static void handle_ep_int(int ep, bool dir_in)
wakeup_signal(&endpoint->complete); wakeup_signal(&endpoint->complete);
} }
} }
if(DOEPINT(ep) & DOEPINT_setup) if(sts & DOEPINT_setup)
{ {
logf("usb-drv: setup on EP%d OUT", ep); logf("usb-drv: setup on EP%d OUT", ep);
if(ep != 0) if(ep != 0)
@ -553,7 +555,7 @@ static void handle_ep_int(int ep, bool dir_in)
} }
} }
/* clear interrupts */ /* clear interrupts */
DOEPINT(ep) = DOEPINT(ep); DOEPINT(ep) = sts;
} }
} }