diff options
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 @@ | |||
29 | #include "gcc_extensions.h" | 29 | #include "gcc_extensions.h" |
30 | #include "../kernel-internal.h" | 30 | #include "../kernel-internal.h" |
31 | #include "lcd.h" | 31 | #include "lcd.h" |
32 | #ifdef USE_ROCKBOX_USB | 32 | #ifdef HAVE_BOOTLOADER_USB_MODE |
33 | #include "usb.h" | 33 | #include "usb.h" |
34 | #include "sysfont.h" | 34 | #include "sysfont.h" |
35 | #endif /* USE_ROCKBOX_USB */ | 35 | #endif /* HAVE_BOOTLOADER_USB_MODE */ |
36 | #include "backlight.h" | 36 | #include "backlight.h" |
37 | #include "button-target.h" | 37 | #include "button-target.h" |
38 | #include "common.h" | 38 | #include "common.h" |
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | void show_logo(void); | 47 | void show_logo(void); |
48 | 48 | ||
49 | #ifdef USE_ROCKBOX_USB | 49 | #ifdef HAVE_BOOTLOADER_USB_MODE |
50 | static void usb_mode(void) | 50 | static void usb_mode(void) |
51 | { | 51 | { |
52 | if(usb_detect() != USB_INSERTED) | 52 | if(usb_detect() != USB_INSERTED) |
@@ -73,7 +73,7 @@ static void usb_mode(void) | |||
73 | reset_screen(); | 73 | reset_screen(); |
74 | lcd_update(); | 74 | lcd_update(); |
75 | } | 75 | } |
76 | #endif /* USE_ROCKBOX_USB */ | 76 | #endif /* HAVE_BOOTLOADER_USB_MODE */ |
77 | 77 | ||
78 | void main(void) NORETURN_ATTR; | 78 | void main(void) NORETURN_ATTR; |
79 | void main(void) | 79 | void main(void) |
@@ -122,7 +122,7 @@ void main(void) | |||
122 | 122 | ||
123 | filesystem_init(); | 123 | filesystem_init(); |
124 | 124 | ||
125 | #ifdef USE_ROCKBOX_USB | 125 | #ifdef HAVE_BOOTLOADER_USB_MODE |
126 | usb_init(); | 126 | usb_init(); |
127 | 127 | ||
128 | /* Enter USB mode if USB is plugged and SELECT button is pressed */ | 128 | /* Enter USB mode if USB is plugged and SELECT button is pressed */ |
@@ -131,11 +131,11 @@ void main(void) | |||
131 | if(usb_detect() == USB_INSERTED) | 131 | if(usb_detect() == USB_INSERTED) |
132 | usb_mode(); | 132 | usb_mode(); |
133 | } | 133 | } |
134 | #endif /* USE_ROCKBOX_USB */ | 134 | #endif /* HAVE_BOOTLOADER_USB_MODE */ |
135 | 135 | ||
136 | while((ret = disk_mount_all()) <= 0) | 136 | while((ret = disk_mount_all()) <= 0) |
137 | { | 137 | { |
138 | #ifdef USE_ROCKBOX_USB | 138 | #ifdef HAVE_BOOTLOADER_USB_MODE |
139 | error(EDISK, ret, false); | 139 | error(EDISK, ret, false); |
140 | usb_mode(); | 140 | usb_mode(); |
141 | #else | 141 | #else |
@@ -150,7 +150,7 @@ void main(void) | |||
150 | 150 | ||
151 | while((ret = load_firmware(loadbuffer, BOOTFILE, buffer_size)) <= EFILE_EMPTY) | 151 | while((ret = load_firmware(loadbuffer, BOOTFILE, buffer_size)) <= EFILE_EMPTY) |
152 | { | 152 | { |
153 | #ifdef USE_ROCKBOX_USB | 153 | #ifdef HAVE_BOOTLOADER_USB_MODE |
154 | error(EBOOTFILE, ret, false); | 154 | error(EBOOTFILE, ret, false); |
155 | usb_mode(); | 155 | usb_mode(); |
156 | #else | 156 | #else |