diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2010-08-31 19:06:04 +0000 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2010-08-31 19:06:04 +0000 |
| commit | a1cf4ced837327c718061feedf96d512328f5cc8 (patch) | |
| tree | 2c51950d2c48715aede1e3d4d3e0a1a137885378 /apps | |
| parent | b9201e3c6fcfdcb2d1e14f5593fc0ff98af40290 (diff) | |
| download | rockbox-a1cf4ced837327c718061feedf96d512328f5cc8.zip rockbox-a1cf4ced837327c718061feedf96d512328f5cc8.tar.gz rockbox-a1cf4ced837327c718061feedf96d512328f5cc8.tar.bz2 rockbox-a1cf4ced837327c718061feedf96d512328f5cc8.tar.xz | |
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
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/debug_menu.c | 10 | ||||
| -rw-r--r-- | apps/main.c | 7 |
2 files changed, 11 insertions, 6 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index ba01147..c0a476d 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -1601,12 +1601,10 @@ static bool view_battery(void) lcd_putsf(0, 7, "Headphone: %s", headphone ? "connected" : "disconnected"); #ifdef IPOD_VIDEO - x = (adc_read(ADC_4066_ISTAT) * 2400) / -#if MEM == 64 - (1024 * 2); -#else - (1024 * 3); -#endif + if(probed_ramsize == 64) + x = (adc_read(ADC_4066_ISTAT) * 2400) / (1024 * 2); + else + x = (adc_read(ADC_4066_ISTAT) * 2400) / (1024 * 3); lcd_putsf(0, 8, "Ibat: %d mA", x); lcd_putsf(0, 9, "Vbat * Ibat: %d mW", x * y / 1000); #endif diff --git a/apps/main.c b/apps/main.c index ceaa85f..0c2f075 100644 --- a/apps/main.c +++ b/apps/main.c @@ -422,6 +422,13 @@ static void init(void) #endif system_init(); +#if defined(IPOD_VIDEO) + audiobufend=(unsigned char *)audiobufend_lds; + if(MEM==64 && probed_ramsize!=64) + { + audiobufend -= (32<<20); + } +#endif kernel_init(); #ifdef HAVE_ADJUSTABLE_CPU_FREQ |