From 938ef22c02c4c12c301084b33f7d1f7920a0a8f8 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Wed, 24 Sep 2008 21:09:46 +0000 Subject: 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. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18631 a1c6a512-1295-4272-9138-f99709370657 --- firmware/usb.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/firmware/usb.c b/firmware/usb.c index 8bd11e4..62ee656 100644 --- a/firmware/usb.c +++ b/firmware/usb.c @@ -48,14 +48,12 @@ #include "logf.h" /* 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(CREATIVE_ZVx) && defined(HAVE_USBSTACK)) #define USB_FULL_INIT #endif -extern void dbg_ports(void); /* NASTY! defined in apps/ */ - #ifdef HAVE_LCD_BITMAP bool do_screendump_instead_of_usb = false; #if defined(USB_FULL_INIT) && defined(BOOTLOADER) @@ -122,18 +120,7 @@ static void usb_slave_mode(bool on) rc = ata_init(); 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); - } rc = disk_mount_all(); if (rc <= 0) /* no partition */ -- cgit v1.1