summaryrefslogtreecommitdiffstats
path: root/firmware/usbstack
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-01-15 08:19:30 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-01-15 08:19:30 +0000
commit3a1127785b9f29e526b2ab845efe0a313699c459 (patch)
treec16f2071dcdd1f1388b0216643a8f4a979023b9f /firmware/usbstack
parent53db95417dc919a50e55b6f6b1f9852e1bdf8816 (diff)
downloadrockbox-3a1127785b9f29e526b2ab845efe0a313699c459.tar.gz
rockbox-3a1127785b9f29e526b2ab845efe0a313699c459.tar.bz2
rockbox-3a1127785b9f29e526b2ab845efe0a313699c459.zip
Bootloader USB mode for PP502x. Enable only on GoGear SA9200 for the time being. Add HAVE_BOOTLOADER_USB_MODE to config if BOOTLOADER is defined to enable it. Clean up some kernel stuff a little to support it. Mess up a bunch of other stuff (hopefully not too badly).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29053 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/usbstack')
-rw-r--r--firmware/usbstack/usb_storage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index 1ff3b1ec4c..d8d6817ad2 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -451,8 +451,8 @@ void usb_storage_init_connection(void)
/* prime rx endpoint. We only need room for commands */
state = WAITING_FOR_COMMAND;
-#if CONFIG_CPU == IMX31L || defined(CPU_TCC77X) || defined(CPU_TCC780X) || \
- defined(BOOTLOADER) || CONFIG_CPU == DM320
+#if (CONFIG_CPU == IMX31L || defined(CPU_TCC77X) || defined(CPU_TCC780X) || \
+ defined(BOOTLOADER) || CONFIG_CPU == DM320) && !defined(CPU_PP502x)
static unsigned char _cbw_buffer[MAX_CBW_SIZE]
USB_DEVBSS_ATTR __attribute__((aligned(32)));
cbw_buffer = (void *)_cbw_buffer;