merge 19488 back from the 3.1 branch

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19538 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 6 insertions, 6 deletions

diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h
index 0a6164fbb6..40630bb75a 100644
--- a/firmware/export/config-clip.h
+++ b/firmware/export/config-clip.h
@@ -34,13 +34,13 @@
 #define HAVE_BUTTON_LIGHT
 
 /* define this if you have access to the quickscreen */
-#define HAVE_QUICKSCREEN
+//#define HAVE_QUICKSCREEN
 
 /* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
+//#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
-#define HAVE_TAGCACHE
+//#define HAVE_TAGCACHE
 
 /* LCD dimensions */
 #define LCD_WIDTH  128
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h
index edeb834ef7..9f825bb77b 100644
--- a/firmware/export/config-cowond2.h
+++ b/firmware/export/config-cowond2.h
@@ -8,7 +8,7 @@
 
 #define MODEL_NAME   "Cowon D2"
 
-#if 0
+#if 1
 #define HAVE_USBSTACK
 #define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0e21
diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c
index f71de7fdc0..1152448f97 100644
--- a/firmware/target/arm/as3525/ata_sd_as3525.c
+++ b/firmware/target/arm/as3525/ata_sd_as3525.c
@@ -601,10 +601,10 @@ static int sd_transfer_sectors(IF_MV2(int drive,) unsigned long start,
 
     if (card_info[drive].initialized <= 0)
     {
-        sd_init_card(drive);
+        int ret = sd_init_card(drive);
         if (!(card_info[drive].initialized))
         {
-            panicf("card not initialised");
+            panicf("card not initialised %d",ret);
             goto sd_transfer_error;
         }
     }