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
This commit is contained in:
Frank Gevaerts 2009-05-23 15:19:11 +00:00
parent ee1b6aa237
commit 7a8c615de3

View file

@ -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 */