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

usb-drv-as3525v2: fixes

Browse source 
- don't use *_dcache_range() on uncached memory
- remove unused struct endpoint->buffer
- use correct *_dcache_range() in usb_drv_transfer() for each direction
- halve FIFO size

sometimes mounts / sometimes fails

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28031 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-09-08 00:29:22 +00:00
parent 03d391d57a
commit b72237a403
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,6 @@ struct usb_endpoint
bool busy; /* true is a transfer is pending */ bool busy; /* true is a transfer is pending */
int status; /* completion status (0 for success) */ int status; /* completion status (0 for success) */
struct wakeup complete; /* wait object */ struct wakeup complete; /* wait object */
void *buffer; /* buffer address */
}; };
/* state of EP0 (to correctly schedule setup packet enqueing) */ /* state of EP0 (to correctly schedule setup packet enqueing) */
@ -213,7 +212,6 @@ static void prepare_setup_ep0(void)
{ {
logf("usb-drv: prepare EP0"); logf("usb-drv: prepare EP0");
/* setup DMA */ /* setup DMA */
clean_dcache_range((void*)&ep0_setup_pkt, sizeof ep0_setup_pkt); /* force write back */
DOEPDMA(0) = (unsigned long)AS3525_PHYSICAL_ADDR(&__ep0_setup_pkt); /* virtual address=physical address */ DOEPDMA(0) = (unsigned long)AS3525_PHYSICAL_ADDR(&__ep0_setup_pkt); /* virtual address=physical address */
/* Setup EP0 OUT with the following parameters: /* Setup EP0 OUT with the following parameters:
@ -389,8 +387,8 @@ static void core_dev_init(void)
} }
/* Setup FIFOs */ /* Setup FIFOs */
GRXFSIZ = 1024; GRXFSIZ = 512;
GNPTXFSIZ = MAKE_FIFOSIZE_DATA(1024, 1024); GNPTXFSIZ = MAKE_FIFOSIZE_DATA(512, 512);
/* Setup interrupt masks for endpoints */ /* Setup interrupt masks for endpoints */
/* Setup interrupt masks */ /* Setup interrupt masks */
@ -527,7 +525,6 @@ static void handle_ep_int(int ep, bool dir_in)
logf("len=%d reg=%ld xfer=%d", endpoint->len, logf("len=%d reg=%ld xfer=%d", endpoint->len,
(DOEPTSIZ(ep) & DEPTSIZ_xfersize_bits), (DOEPTSIZ(ep) & DEPTSIZ_xfersize_bits),
transfered); transfered);
invalidate_dcache_range(endpoint->buffer, transfered);
/* handle EP0 state if necessary, /* handle EP0 state if necessary,
* this is a ack if length is 0 */ * this is a ack if length is 0 */
if(ep == 0) if(ep == 0)
@ -767,7 +764,10 @@ static int usb_drv_transfer(int ep, void *ptr, int len, bool dir_in, bool blocki
{ {
DEPDMA = (unsigned long)AS3525_PHYSICAL_ADDR(ptr); DEPDMA = (unsigned long)AS3525_PHYSICAL_ADDR(ptr);
DEPTSIZ = (nb_packets << DEPTSIZ_pkcnt_bitp) | len; DEPTSIZ = (nb_packets << DEPTSIZ_pkcnt_bitp) | len;
clean_dcache_range(ptr, len); if(dir_in)
clean_dcache_range(ptr, len);
else
invalidate_dcache_range(ptr, len);
} }
logf("pkt=%d dma=%lx", nb_packets, DEPDMA); logf("pkt=%d dma=%lx", nb_packets, DEPDMA);