diff options
author | Michael Giacomelli <giac2000@hotmail.com> | 2010-03-16 16:03:48 +0000 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2010-03-16 16:03:48 +0000 |
commit | 74bd14fa72e15be3b480d619c7b8ae60b7ab21b0 (patch) | |
tree | c7939031a2a3e29d2edba5a2608c52fade81c305 /firmware | |
parent | 04937cb20760ee38237c9d016f87a4c2c8d390b5 (diff) | |
download | rockbox-74bd14fa72e15be3b480d619c7b8ae60b7ab21b0.tar.gz rockbox-74bd14fa72e15be3b480d619c7b8ae60b7ab21b0.zip |
Remove some old archos code that caused runtime estimation to be off on AMS players while not actually working on Archos.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25220 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/config/archosrecorder.h | 6 | ||||
-rw-r--r-- | firmware/powermgmt.c | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/firmware/export/config/archosrecorder.h b/firmware/export/config/archosrecorder.h index ef9f523c49..505a039afe 100644 --- a/firmware/export/config/archosrecorder.h +++ b/firmware/export/config/archosrecorder.h | |||
@@ -80,7 +80,11 @@ | |||
80 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | 80 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ |
81 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 81 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
82 | 82 | ||
83 | #define CURRENT_NORMAL 145 /* usual current in mA */ | 83 | if MEM < 8 |
84 | #define CURRENT_NORMAL 145 /* usual current in mA */ | ||
85 | #else | ||
86 | #define CURRENT_NORMAL 145 *100 / 122 /* assuming 192 kbps, the running time is 22% longer with 8MB */ | ||
87 | #endif | ||
84 | #define CURRENT_RECORD 35 /* additional recording current */ | 88 | #define CURRENT_RECORD 35 /* additional recording current */ |
85 | #define CURRENT_USB 500 /* usual current in mA in USB mode */ | 89 | #define CURRENT_USB 500 /* usual current in mA in USB mode */ |
86 | 90 | ||
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 74564bd1a2..f8c3995e1a 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -371,12 +371,7 @@ static int runcurrent(void) | |||
371 | { | 371 | { |
372 | int current; | 372 | int current; |
373 | 373 | ||
374 | #if MEM == 8 && !(defined(ARCHOS_ONDIOSP) || defined(ARCHOS_ONDIOFM)) | ||
375 | /* assuming 192 kbps, the running time is 22% longer with 8MB */ | ||
376 | current = CURRENT_NORMAL*100 / 122; | ||
377 | #else | ||
378 | current = CURRENT_NORMAL; | 374 | current = CURRENT_NORMAL; |
379 | #endif /* MEM == 8 */ | ||
380 | 375 | ||
381 | #ifndef BOOTLOADER | 376 | #ifndef BOOTLOADER |
382 | if (usb_inserted() | 377 | if (usb_inserted() |