diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2015-01-08 22:30:22 +0100 |
|---|---|---|
| committer | Amaury Pouly <amaury.pouly@gmail.com> | 2015-01-08 22:30:22 +0100 |
| commit | 761e7987c8dec314800eb6a099aad139a12a12a9 (patch) | |
| tree | 1363a95bc8ef2e972c2fd60becfc9d7a795f37f6 /bootloader/sansa_as3525.c | |
| parent | 246026cfcc1485a29c173fc1b6ed7336f4c00f83 (diff) | |
usb: finally get rid of USE_ROCKBOX_USB in Sansa bootloader, use bootloader usb
For some reason, the bootloader and config files didn't define
HAVE_BOOTLOADER_USB_MODE, also remove the special cases in usb.c which they
implied.
Change-Id: I68c29be7d03627e64cac4ff7678e0c211e087a8c
Diffstat (limited to 'bootloader/sansa_as3525.c')
| -rw-r--r-- | bootloader/sansa_as3525.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c index 3558d01674..14cb2ab7a5 100644 --- a/bootloader/sansa_as3525.c +++ b/bootloader/sansa_as3525.c @@ -29,10 +29,10 @@ #include "gcc_extensions.h" #include "../kernel-internal.h" #include "lcd.h" -#ifdef USE_ROCKBOX_USB +#ifdef HAVE_BOOTLOADER_USB_MODE #include "usb.h" #include "sysfont.h" -#endif /* USE_ROCKBOX_USB */ +#endif /* HAVE_BOOTLOADER_USB_MODE */ #include "backlight.h" #include "button-target.h" #include "common.h" @@ -46,7 +46,7 @@ void show_logo(void); -#ifdef USE_ROCKBOX_USB +#ifdef HAVE_BOOTLOADER_USB_MODE static void usb_mode(void) { if(usb_detect() != USB_INSERTED) @@ -73,7 +73,7 @@ static void usb_mode(void) reset_screen(); lcd_update(); } -#endif /* USE_ROCKBOX_USB */ +#endif /* HAVE_BOOTLOADER_USB_MODE */ void main(void) NORETURN_ATTR; void main(void) @@ -122,7 +122,7 @@ void main(void) filesystem_init(); -#ifdef USE_ROCKBOX_USB +#ifdef HAVE_BOOTLOADER_USB_MODE usb_init(); /* Enter USB mode if USB is plugged and SELECT button is pressed */ @@ -131,11 +131,11 @@ void main(void) if(usb_detect() == USB_INSERTED) usb_mode(); } -#endif /* USE_ROCKBOX_USB */ +#endif /* HAVE_BOOTLOADER_USB_MODE */ while((ret = disk_mount_all()) <= 0) { -#ifdef USE_ROCKBOX_USB +#ifdef HAVE_BOOTLOADER_USB_MODE error(EDISK, ret, false); usb_mode(); #else @@ -150,7 +150,7 @@ void main(void) while((ret = load_firmware(loadbuffer, BOOTFILE, buffer_size)) <= EFILE_EMPTY) { -#ifdef USE_ROCKBOX_USB +#ifdef HAVE_BOOTLOADER_USB_MODE error(EBOOTFILE, ret, false); usb_mode(); #else |