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

Repair bootbox on the archoses (that bug went undetected for >2.5 years), and get rid of some old debug cruft in order to save space.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18631 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2008-09-24 21:09:46 +00:00
parent 93a87685c3
commit 938ef22c02
1 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
firmware/usb.c
View file

@ -48,14 +48,12 @@
#include "logf.h" #include "logf.h"
/* Conditions under which we want the entire driver */ /* Conditions under which we want the entire driver */
#if !defined(BOOTLOADER) || \ #if !defined(BOOTLOADER) || (CONFIG_CPU == SH7034) \
(defined(TOSHIBA_GIGABEAT_S) && defined(USE_ROCKBOX_USB) && defined(USB_STORAGE)) || \ (defined(TOSHIBA_GIGABEAT_S) && defined(USE_ROCKBOX_USB) && defined(USB_STORAGE)) || \
(defined(CREATIVE_ZVx) && defined(HAVE_USBSTACK)) (defined(CREATIVE_ZVx) && defined(HAVE_USBSTACK))
#define USB_FULL_INIT #define USB_FULL_INIT
#endif #endif
extern void dbg_ports(void); /* NASTY! defined in apps/ */
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
bool do_screendump_instead_of_usb = false; bool do_screendump_instead_of_usb = false;
#if defined(USB_FULL_INIT) && defined(BOOTLOADER) #if defined(USB_FULL_INIT) && defined(BOOTLOADER)
@ -122,18 +120,7 @@ static void usb_slave_mode(bool on)
rc = ata_init(); rc = ata_init();
if(rc) if(rc)
{
/* fixme: can we remove this? (already such in main.c) */
char str[32];
lcd_clear_display();
snprintf(str, 31, "ATA error: %d", rc);
lcd_puts(0, 0, str);
lcd_puts(0, 1, "Press ON to debug");
lcd_update();
while(!(button_get(true) & BUTTON_REL)) {};
dbg_ports();
panicf("ata: %d",rc); panicf("ata: %d",rc);
}
rc = disk_mount_all(); rc = disk_mount_all();
if (rc <= 0) /* no partition */ if (rc <= 0) /* no partition */