Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

usb-s3c6400: make isr more clear

Browse source 
DIEPINT_timeout and DOEPINT_setup are the same bit
Use separate cases so the code is more clear

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31242 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2011-12-14 06:30:16 +00:00
parent 845cd59e3f
commit 26b31f1a17
1 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
firmware/target/arm/usb-s3c6400x.c
View file

@ -163,7 +163,7 @@ static void usb_reset(void)
reset_endpoints(1); reset_endpoints(1);
} }
static void handle_ep_int(int out) static void handle_ep_int(bool out)
{ {
static const uint8_t eps[2][3] = { /* IN */ {0, 1, 3}, /* OUT */ {0, 2, 4}}; static const uint8_t eps[2][3] = { /* IN */ {0, 1, 3}, /* OUT */ {0, 2, 4}};
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
@ -186,37 +186,36 @@ static void handle_ep_int(int out)
semaphore_release(&endpoints[ep].complete); semaphore_release(&endpoints[ep].complete);
} }
} }
if (epints & DEPINT_ahberr) if (epints & DEPINT_ahberr)
panicf("USB: AHB error on EP%d (dir %d)", ep, out); panicf("USB: AHB error on EP%d (dir %d)", ep, out);
if (epints & DIEPINT_timeout)
if (!out && (epints & DIEPINT_timeout))
{ {
if (!out) if (endpoints[ep].busy)
{ {
if (endpoints[ep].busy) endpoints[ep].busy = false;
{ endpoints[ep].rc = 1;
endpoints[ep].busy = false; endpoints[ep].done = true;
endpoints[ep].rc = 1; semaphore_release(&endpoints[ep].complete);
endpoints[ep].done = true;
semaphore_release(&endpoints[ep].complete);
}
}
else
{ /* DOEPINT_setup */
invalidate_dcache();
if (ep == 0)
{
if (ctrlreq.header.bRequest == 5)
{
/* Already set the new address here,
before passing the packet to the core.
See below (usb_drv_set_address) for details. */
DCFG = (DCFG & ~(DCFG_devadr_bits << DCFG_devadr_bitp)) | (ctrlreq.header.wValue << DCFG_devadr_bitp);
}
usb_core_control_request(&ctrlreq.header);
}
else panicf("USB: SETUP done on OUT EP%d!?", ep);
} }
} }
if (out && (epints & DOEPINT_setup))
{
invalidate_dcache();
if (ep != 0)
panicf("USB: SETUP done on OUT EP%d!?", ep);
/* Set the new address here, before passing the packet to the core.
See usb_drv_set_address() for details. */
if (ctrlreq.header.bRequest == USB_REQ_SET_ADDRESS)
DCFG = (DCFG & ~(DCFG_devadr_bits << DCFG_devadr_bitp))
| (ctrlreq.header.wValue << DCFG_devadr_bitp);
usb_core_control_request(&ctrlreq.header);
}
/* Make sure EP0 OUT is set up to accept the next request */ /* Make sure EP0 OUT is set up to accept the next request */
if (out && ep == 0) if (out && ep == 0)
{ {