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) | |
download | rockbox-7a8c615de3444e6341ccbdf9f6ef545802707184.tar.gz rockbox-7a8c615de3444e6341ccbdf9f6ef545802707184.zip |
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*/ | |||
772 | #endif /* CONFIG_USBOTG */ | 772 | #endif /* CONFIG_USBOTG */ |
773 | 773 | ||
774 | /* define the class drivers to enable */ | 774 | /* define the class drivers to enable */ |
775 | #ifndef BOOTLOADER | 775 | #ifdef BOOTLOADER |
776 | |||
777 | //#define USB_ENABLE_SERIAL | ||
778 | #define USB_ENABLE_STORAGE | ||
779 | |||
780 | #ifdef USB_HAS_INTERRUPT | ||
781 | #define USB_ENABLE_HID | ||
782 | #else | ||
783 | #define USB_ENABLE_CHARGING_ONLY | ||
784 | #endif | ||
785 | |||
786 | #else /* BOOTLOADER */ | ||
787 | 776 | ||
788 | /* enable usb storage for targets that do bootloader usb */ | 777 | /* enable usb storage for targets that do bootloader usb */ |
789 | #if (defined(TOSHIBA_GIGABEAT_S) || \ | 778 | #if (defined(TOSHIBA_GIGABEAT_S) || \ |
@@ -793,6 +782,16 @@ Lyre prototype 1*/ | |||
793 | #define USB_ENABLE_STORAGE | 782 | #define USB_ENABLE_STORAGE |
794 | #endif | 783 | #endif |
795 | 784 | ||
785 | #else /* BOOTLOADER */ | ||
786 | |||
787 | //#define USB_ENABLE_SERIAL | ||
788 | |||
789 | #ifdef USB_HAS_INTERRUPT | ||
790 | #define USB_ENABLE_HID | ||
791 | #else | ||
792 | #define USB_ENABLE_CHARGING_ONLY | ||
793 | #endif | ||
794 | |||
796 | #endif /* BOOTLOADER */ | 795 | #endif /* BOOTLOADER */ |
797 | 796 | ||
798 | #endif /* HAVE_USBSTACK */ | 797 | #endif /* HAVE_USBSTACK */ |