diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2009-05-23 15:19:11 +0000 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2009-05-23 15:19:11 +0000 |
| commit | 7a8c615de3444e6341ccbdf9f6ef545802707184 (patch) | |
| tree | 1d6c473021042742d9f31e2c9779d6a420b55e13 /firmware/export/config.h | |
| parent | ee1b6aa237152bbde9f27518de85b58b6fdbf2b2 (diff) | |
swap bootloader and non-bootloader cases around to avoid an ugly #ifndef
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21058 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export/config.h')
| -rw-r--r-- | firmware/export/config.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 5366e41752..163b59cd03 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -772,18 +772,7 @@ Lyre prototype 1*/ #endif /* CONFIG_USBOTG */ /* define the class drivers to enable */ -#ifndef BOOTLOADER - -//#define USB_ENABLE_SERIAL -#define USB_ENABLE_STORAGE - -#ifdef USB_HAS_INTERRUPT -#define USB_ENABLE_HID -#else -#define USB_ENABLE_CHARGING_ONLY -#endif - -#else /* BOOTLOADER */ +#ifdef BOOTLOADER /* enable usb storage for targets that do bootloader usb */ #if (defined(TOSHIBA_GIGABEAT_S) || \ @@ -793,6 +782,16 @@ Lyre prototype 1*/ #define USB_ENABLE_STORAGE #endif +#else /* BOOTLOADER */ + +//#define USB_ENABLE_SERIAL + +#ifdef USB_HAS_INTERRUPT +#define USB_ENABLE_HID +#else +#define USB_ENABLE_CHARGING_ONLY +#endif + #endif /* BOOTLOADER */ #endif /* HAVE_USBSTACK */ |