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 /firmware/usbstack/usb_storage.c | |
| parent | e1b01d460838737e7d3017b09c55eb5a521b1a17 (diff) | |
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
Diffstat (limited to 'firmware/usbstack/usb_storage.c')
| -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) state = WAITING_FOR_COMMAND; #if CONFIG_CPU == IMX31L || CONFIG_USBOTG == USBOTG_ISP1583 || \ - defined(CPU_TCC77X) || defined(CPU_TCC780X) + defined(CPU_TCC77X) || defined(CPU_TCC780X) || defined(BOOTLOADER) static unsigned char _transfer_buffer[BUFFER_SIZE*2] USB_DEVBSS_ATTR __attribute__((aligned(32))); tb.transfer_buffer = (void *)_transfer_buffer; @@ -412,10 +412,10 @@ void usb_storage_init_connection(void) tb.transfer_buffer = (void *)UNCACHED_ADDR((unsigned int)(audio_buffer + 31) & 0xffffffe0); invalidate_icache(); +#endif #ifdef USB_USE_RAMDISK ramdisk_buffer = tb.transfer_buffer + BUFFER_SIZE*2; #endif -#endif usb_drv_recv(ep_out, tb.transfer_buffer, 1024); } |