Sansa AMS: move OF size declaration in model specific config

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

6 files changed, 17 insertions, 6 deletions

diff --git a/firmware/export/config-c200v2.h b/firmware/export/config-c200v2.h
index b47ba73610..775a39fc4c 100644
--- a/firmware/export/config-c200v2.h
+++ b/firmware/export/config-c200v2.h
@@ -145,6 +145,9 @@
 /* Define this if you have a PortalPlayer PP5024 */
 #define CONFIG_CPU AS3525
 
+/* Define how much SD sectors are reserved for OF */
+#define AMS_OF_SIZE 0x5000  /* TODO : check */
+
 /* Define this if you want to use the PP5024 i2c interface */
 #define CONFIG_I2C I2C_AS3525
 
diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h
index e038ffbcdc..37b1a3185a 100644
--- a/firmware/export/config-clip.h
+++ b/firmware/export/config-clip.h
@@ -152,6 +152,9 @@
 /* Define this if you have a AMS AS3525 SoC */
 #define CONFIG_CPU AS3525
 
+/* Define how much SD sectors are reserved for OF */
+#define AMS_OF_SIZE 0x5000
+
 /* Define this if you want to use the AS3525 i2c interface */
 #define CONFIG_I2C I2C_AS3525
 
diff --git a/firmware/export/config-e200v2.h b/firmware/export/config-e200v2.h
index 9ee8572fbd..cc66b73249 100644
--- a/firmware/export/config-e200v2.h
+++ b/firmware/export/config-e200v2.h
@@ -155,6 +155,9 @@
 /* Define this if you have an AMS AS3525*/
 #define CONFIG_CPU AS3525
 
+/* Define how much SD sectors are reserved for OF */
+#define AMS_OF_SIZE 0xF000
+
 /* Define this if you want to use the AS2525 i2c interface */
 #define CONFIG_I2C I2C_AS3525
 
diff --git a/firmware/export/config-fuze.h b/firmware/export/config-fuze.h
index 4f943580a7..a30f95e5b0 100644
--- a/firmware/export/config-fuze.h
+++ b/firmware/export/config-fuze.h
@@ -160,6 +160,9 @@
 /* Define this if you have an AMS AS3525*/
 #define CONFIG_CPU AS3525
 
+/* Define how much SD sectors are reserved for OF */
+#define AMS_OF_SIZE 0xF000
+
 /* Define this if you want to use the AS2525 i2c interface */
 #define CONFIG_I2C I2C_AS3525
 
diff --git a/firmware/export/config-m200v4.h b/firmware/export/config-m200v4.h
index 9ce5605a62..16b704cea4 100644
--- a/firmware/export/config-m200v4.h
+++ b/firmware/export/config-m200v4.h
@@ -105,6 +105,9 @@
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
 
+/* Define how much SD sectors are reserved for OF */
+#define AMS_OF_SIZE 0x5000
+
 #define CONFIG_I2C I2C_AS3525
 
 #define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */
diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c
index 342be613c5..6d6b275fba 100644
--- a/firmware/target/arm/as3525/ata_sd_as3525.c
+++ b/firmware/target/arm/as3525/ata_sd_as3525.c
@@ -24,7 +24,7 @@
 
 /* TODO: Find the real capacity of >2GB models (will be useful for USB) */
 
-#include "config.h" /* for HAVE_MULTIVOLUME */
+#include "config.h" /* for HAVE_MULTIVOLUME & AMS_OF_SIZE */
 #include "fat.h"
 #include "thread.h"
 #include "hotswap.h"
@@ -632,11 +632,7 @@ static int sd_transfer_sectors(IF_MV2(int drive,) unsigned long start,
 
     /* skip SanDisk OF */
     if (drive == INTERNAL_AS3525)
-#if defined(SANSA_E200V2) || defined(SANSA_FUZE)
-        start += 0xf000;
-#else
-        start += 0x5000;
-#endif
+        start += AMS_OF_SIZE;
 
     mutex_lock(&sd_mtx);
 #ifndef BOOTLOADER