merge 19488 back from the 3.1 branch

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

5 files changed, 14 insertions, 8 deletions

diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 5577d632ea..e47f149618 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -1,3 +1,4 @@
+test_codec.c
 /* plugins common to all models */
 battery_bench.c
 chessclock.c
@@ -152,3 +153,7 @@ superdom.c
 #endif /* m:robe 500 */
 
 md5sum.c
+
+#ifdef GIGABEAT_F
+gigabeat_flash.c
+#endif
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;
         }
     }
diff --git a/manual/getting_started/ipod_install.tex b/manual/getting_started/ipod_install.tex
index 06bcbe8ea4..f53263b9ab 100644
--- a/manual/getting_started/ipod_install.tex
+++ b/manual/getting_started/ipod_install.tex
@@ -1,6 +1,6 @@
 % $Id$ %
 
-\opt{ipodnano}{\warn{If your Nano has a stainless steel back and plastic front 
+\opt{ipodnano}{\warn{If your Nano has a stainless steel back and plastic front,  
 it is a 1st generation and is compatible with Rockbox.  If, on the other hand, 
 your Nano has a one-piece aluminum body it is a 2nd generation Nano and there 
 is currently no Rockbox port available.  Do not attempt to install the 
@@ -76,6 +76,7 @@ be certain that you do indeed have a supported iPod model. If you do, run
 ipodpatcher once more and try again. If you don't, then do not attempt to
 install again.}
 
+
 \item Your \dap{} will now automatically reconnect itself to your Mac. 
 Wait for it to connect, and then eject and unplug it in the normal way. 
 \note{You should unplug your ipod immediately after ejecting it to 
@@ -113,7 +114,7 @@ steps will assume you have saved it in your home directory.
 sufficient permission to perform raw disk access to your \dap{}.}
 
 \item If all has gone well, you should see some information displayed about
-your ipod and a message asking you if you wish to install the Rockbox
+your \dap{} and a message asking you if you wish to install the Rockbox
 bootloader. Press i followed by ENTER, and ipodpatcher will now install the
 bootloader. After a short time you should see the message ``[INFO] Bootloader
 installed successfully.'' Press ENTER again to exit ipodpatcher.