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

usb-s3c6400x.c: Fix memory corruption bug (closes FS#12310)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30906 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sparmann 2011-11-06 00:56:26 +00:00
parent 052231748f
commit 33d6bd61b5
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,11 @@ struct ep_type
} ; } ;
static struct ep_type endpoints[USB_NUM_ENDPOINTS]; static struct ep_type endpoints[USB_NUM_ENDPOINTS];
static struct usb_ctrlrequest ctrlreq USB_DEVBSS_ATTR; static union
{
unsigned char data[64];
struct usb_ctrlrequest req;
} ctrlreq USB_DEVBSS_ATTR;
int usb_drv_port_speed(void) int usb_drv_port_speed(void)
{ {
@ -70,7 +74,7 @@ static void reset_endpoints(int reinit)
DOEPCTL0 = 0x8000; /* EP0 OUT ACTIVE */ DOEPCTL0 = 0x8000; /* EP0 OUT ACTIVE */
DOEPTSIZ0 = 0x20080040; /* EP0 OUT Transfer Size: DOEPTSIZ0 = 0x20080040; /* EP0 OUT Transfer Size:
64 Bytes, 1 Packet, 1 Setup Packet */ 64 Bytes, 1 Packet, 1 Setup Packet */
DOEPDMA0 = &ctrlreq; DOEPDMA0 = &ctrlreq.data;
DOEPCTL0 |= 0x84000000; /* EP0 OUT ENABLE CLEARNAK */ DOEPCTL0 |= 0x84000000; /* EP0 OUT ENABLE CLEARNAK */
if (reinit) if (reinit)
{ {
@ -243,14 +247,14 @@ void INT_USB_FUNC(void)
invalidate_dcache(); invalidate_dcache();
if (i == 0) if (i == 0)
{ {
if (ctrlreq.bRequest == 5) if (ctrlreq.req.bRequest == 5)
{ {
/* Already set the new address here, /* Already set the new address here,
before passing the packet to the core. before passing the packet to the core.
See below (usb_drv_set_address) for details. */ See below (usb_drv_set_address) for details. */
DCFG = (DCFG & ~0x7F0) | (ctrlreq.wValue << 4); DCFG = (DCFG & ~0x7F0) | (ctrlreq.req.wValue << 4);
} }
usb_core_control_request(&ctrlreq); usb_core_control_request(&ctrlreq.req);
} }
else panicf("USB: SETUP done on OUT EP%d!?", i); else panicf("USB: SETUP done on OUT EP%d!?", i);
} }
@ -258,7 +262,7 @@ void INT_USB_FUNC(void)
if (!i) if (!i)
{ {
DOEPTSIZ0 = 0x20080040; DOEPTSIZ0 = 0x20080040;
DOEPDMA0 = &ctrlreq; DOEPDMA0 = &ctrlreq.data;
DOEPCTL0 |= 0x84000000; DOEPCTL0 |= 0x84000000;
} }
DOEPINT(i) = epints; DOEPINT(i) = epints;