diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/buffer.h | 5 | ||||
-rw-r--r-- | firmware/export/config/ipodvideo.h | 13 | ||||
-rw-r--r-- | firmware/target/arm/ipod/app.lds | 4 |
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 @@ | |||
24 | #include "config.h" | 24 | #include "config.h" |
25 | /* defined in linker script */ | 25 | /* defined in linker script */ |
26 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 26 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
27 | #if defined(IPOD_VIDEO) | ||
28 | extern unsigned char *audiobufend_lds[]; | ||
29 | unsigned char *audiobufend; | ||
30 | #else | ||
27 | extern unsigned char audiobufend[]; | 31 | extern unsigned char audiobufend[]; |
32 | #endif | ||
28 | #else | 33 | #else |
29 | extern unsigned char *audiobufend; | 34 | extern unsigned char *audiobufend; |
30 | #endif | 35 | #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 @@ | |||
136 | #define HAVE_HEADPHONE_DETECTION | 136 | #define HAVE_HEADPHONE_DETECTION |
137 | 137 | ||
138 | /* Type of mobile power */ | 138 | /* Type of mobile power */ |
139 | #if (MEM==32) /* this is the 30GB-model */ | 139 | #define BATTERY_CAPACITY_DEFAULT 400 /* default battery capacity for the */ |
140 | # define BATTERY_CAPACITY_DEFAULT 400 /* default battery capacity for the 30GB model */ | 140 | /* 30GB model. 60/80GB would have 600 */ |
141 | # define BATTERY_CAPACITY_MIN 300 /* min. capacity selectable */ | 141 | #define BATTERY_CAPACITY_MIN 300 /* min. capacity selectable */ |
142 | # define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */ | 142 | #define BATTERY_CAPACITY_MAX 1400 /* max. capacity selectable */ |
143 | #else /* these are the 60/80GB-models */ | ||
144 | # define BATTERY_CAPACITY_DEFAULT 600 /* default battery capacity for the 60/80GB model */ | ||
145 | # define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ | ||
146 | # define BATTERY_CAPACITY_MAX 1400 /* max. capacity selectable */ | ||
147 | #endif | ||
148 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | 143 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ |
149 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 144 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
150 | 145 | ||
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 | |||
192 | 192 | ||
193 | .audiobufend ENDAUDIOADDR (NOLOAD) : | 193 | .audiobufend ENDAUDIOADDR (NOLOAD) : |
194 | { | 194 | { |
195 | #ifdef IPOD_VIDEO | ||
196 | audiobufend_lds = .; | ||
197 | #else | ||
195 | audiobufend = .; | 198 | audiobufend = .; |
199 | #endif | ||
196 | _audiobufend = .; | 200 | _audiobufend = .; |
197 | } > DRAM | 201 | } > DRAM |
198 | 202 | ||