Unify 32mb and 64mb ipod video builds - FS#11580

Since memory on 32mb ipod videos is mapped twice, a 64mb build still has codecs and plugins mapped in a usable area. This means that all that needs to be done to support 32mb and 64mb boards with the same build is to adjust audiobufend to avoid using more than the actually present RAM.



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

3 files changed, 13 insertions, 9 deletions

diff --git a/firmware/export/buffer.h b/firmware/export/buffer.h
index ae8886bffc..f0525edd68 100644
--- a/firmware/export/buffer.h
+++ b/firmware/export/buffer.h
@@ -24,7 +24,12 @@
 #include "config.h"
 /* defined in linker script */
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
+#if defined(IPOD_VIDEO)
+extern unsigned char *audiobufend_lds[];
+unsigned char *audiobufend;
+#else
 extern unsigned char audiobufend[];
+#endif
 #else
 extern unsigned char *audiobufend;
 #endif
diff --git a/firmware/export/config/ipodvideo.h b/firmware/export/config/ipodvideo.h
index e0c3bfb68e..82391d1f77 100644
--- a/firmware/export/config/ipodvideo.h
+++ b/firmware/export/config/ipodvideo.h
@@ -136,15 +136,10 @@
 #define HAVE_HEADPHONE_DETECTION
 
 /* Type of mobile power */
-#if (MEM==32)  /* this is the 30GB-model */
-# define BATTERY_CAPACITY_DEFAULT 400 /* default battery capacity for the 30GB model */
-# define BATTERY_CAPACITY_MIN     300 /* min. capacity selectable */
-# define BATTERY_CAPACITY_MAX    1000 /* max. capacity selectable */
-#else          /* these are the 60/80GB-models */
-# define BATTERY_CAPACITY_DEFAULT 600 /* default battery capacity for the 60/80GB model */
-# define BATTERY_CAPACITY_MIN     500 /* min. capacity selectable */
-# define BATTERY_CAPACITY_MAX    1400 /* max. capacity selectable */
-#endif
+#define BATTERY_CAPACITY_DEFAULT  400 /* default battery capacity for the   */
+                                      /* 30GB model. 60/80GB would have 600 */
+#define BATTERY_CAPACITY_MIN      300 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX     1400 /* max. capacity selectable */
 #define BATTERY_CAPACITY_INC       50 /* capacity increment */
 #define BATTERY_TYPES_COUNT         1 /* only one type */
 
diff --git a/firmware/target/arm/ipod/app.lds b/firmware/target/arm/ipod/app.lds
index ec26fdbe38..f8e6906a4c 100644
--- a/firmware/target/arm/ipod/app.lds
+++ b/firmware/target/arm/ipod/app.lds
@@ -192,7 +192,11 @@ SECTIONS
     
     .audiobufend ENDAUDIOADDR (NOLOAD) :
     {
+#ifdef IPOD_VIDEO
+        audiobufend_lds = .;
+#else
         audiobufend = .;
+#endif
         _audiobufend = .;
     } > DRAM