devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

sansa AMS bootloader: build if USE_ROCKBOX_USB isn't defined

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27076 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-06-23 05:16:24 +00:00
parent 1ec821244a
commit 64d3a22ec0
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
bootloader/sansa_as3525.c
View file

@ -27,8 +27,10 @@
#include <inttypes.h> #include <inttypes.h>
#include "config.h" #include "config.h"
#include "lcd.h" #include "lcd.h"
#ifdef USE_ROCKBOX_USB
#include "usb.h" #include "usb.h"
#include "sysfont.h" #include "sysfont.h"
#endif /* USE_ROCKBOX_USB */
#include "backlight.h" #include "backlight.h"
#include "button-target.h" #include "button-target.h"
#include "common.h" #include "common.h"
@ -39,6 +41,7 @@
int show_logo(void); int show_logo(void);
#ifdef USE_ROCKBOX_USB
static void usb_mode(void) static void usb_mode(void)
{ {
if(usb_detect() != USB_INSERTED) if(usb_detect() != USB_INSERTED)
@ -65,6 +68,7 @@ static void usb_mode(void)
reset_screen(); reset_screen();
lcd_update(); lcd_update();
} }
#endif /* USE_ROCKBOX_USB */
void main(void) __attribute__((noreturn)); void main(void) __attribute__((noreturn));
void main(void) void main(void)
@ -111,20 +115,30 @@ void main(void)
if(ret < 0) if(ret < 0)
error(EATA, ret, true); error(EATA, ret, true);
#ifdef USE_ROCKBOX_USB
usb_init(); usb_init();
usb_start_monitoring(); usb_start_monitoring();
/* Enter USB mode if USB is plugged and SELECT button is pressed */ /* Enter USB mode if USB is plugged and SELECT button is pressed */
if(btn & BUTTON_SELECT && usb_detect() == USB_INSERTED) if(btn & BUTTON_SELECT && usb_detect() == USB_INSERTED)
usb_mode(); usb_mode();
#endif /* USE_ROCKBOX_USB */
while(!disk_init(IF_MV(0))) while(!disk_init(IF_MV(0)))
#ifdef USE_ROCKBOX_USB
usb_mode(); usb_mode();
#else
panicf("disk_init failed!");
#endif
while((ret = disk_mount_all()) <= 0) while((ret = disk_mount_all()) <= 0)
{ {
#ifdef USE_ROCKBOX_USB
error(EDISK, ret, false); error(EDISK, ret, false);
usb_mode(); usb_mode();
#else
error(EDISK, ret, true);
#endif
} }
printf("Loading firmware"); printf("Loading firmware");
@ -134,8 +148,12 @@ void main(void)
while((ret = load_firmware(loadbuffer, BOOTFILE, buffer_size)) < 0) while((ret = load_firmware(loadbuffer, BOOTFILE, buffer_size)) < 0)
{ {
#ifdef USE_ROCKBOX_USB
error(EBOOTFILE, ret, false); error(EBOOTFILE, ret, false);
usb_mode(); usb_mode();
#else
error(EBOOTFILE, ret, true);
#endif
} }
kernel_entry = (void*) loadbuffer; kernel_entry = (void*) loadbuffer;