diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-01-21 20:22:40 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-01-21 20:22:40 +0000 |
commit | f1c6c3a754a60227019d1b3e38eb721f2d696dc5 (patch) | |
tree | 16cf46fb50ca40573517dec8ad6883be580633d9 | |
parent | e1b01d460838737e7d3017b09c55eb5a521b1a17 (diff) | |
download | rockbox-f1c6c3a754a60227019d1b3e38eb721f2d696dc5.tar.gz rockbox-f1c6c3a754a60227019d1b3e38eb721f2d696dc5.zip |
USB storage driver:
* Move RAM disk buffer allocation #ifdef below
* Don't use the audio buffer for bootloaders
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19812 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/usbstack/usb_storage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c index e2d58cf0a9..f8d8f4b3ff 100644 --- a/firmware/usbstack/usb_storage.c +++ b/firmware/usbstack/usb_storage.c | |||
@@ -399,7 +399,7 @@ void usb_storage_init_connection(void) | |||
399 | state = WAITING_FOR_COMMAND; | 399 | state = WAITING_FOR_COMMAND; |
400 | 400 | ||
401 | #if CONFIG_CPU == IMX31L || CONFIG_USBOTG == USBOTG_ISP1583 || \ | 401 | #if CONFIG_CPU == IMX31L || CONFIG_USBOTG == USBOTG_ISP1583 || \ |
402 | defined(CPU_TCC77X) || defined(CPU_TCC780X) | 402 | defined(CPU_TCC77X) || defined(CPU_TCC780X) || defined(BOOTLOADER) |
403 | static unsigned char _transfer_buffer[BUFFER_SIZE*2] | 403 | static unsigned char _transfer_buffer[BUFFER_SIZE*2] |
404 | USB_DEVBSS_ATTR __attribute__((aligned(32))); | 404 | USB_DEVBSS_ATTR __attribute__((aligned(32))); |
405 | tb.transfer_buffer = (void *)_transfer_buffer; | 405 | tb.transfer_buffer = (void *)_transfer_buffer; |
@@ -412,10 +412,10 @@ void usb_storage_init_connection(void) | |||
412 | tb.transfer_buffer = | 412 | tb.transfer_buffer = |
413 | (void *)UNCACHED_ADDR((unsigned int)(audio_buffer + 31) & 0xffffffe0); | 413 | (void *)UNCACHED_ADDR((unsigned int)(audio_buffer + 31) & 0xffffffe0); |
414 | invalidate_icache(); | 414 | invalidate_icache(); |
415 | #endif | ||
415 | #ifdef USB_USE_RAMDISK | 416 | #ifdef USB_USE_RAMDISK |
416 | ramdisk_buffer = tb.transfer_buffer + BUFFER_SIZE*2; | 417 | ramdisk_buffer = tb.transfer_buffer + BUFFER_SIZE*2; |
417 | #endif | 418 | #endif |
418 | #endif | ||
419 | usb_drv_recv(ep_out, tb.transfer_buffer, 1024); | 419 | usb_drv_recv(ep_out, tb.transfer_buffer, 1024); |
420 | } | 420 | } |
421 | 421 | ||