summaryrefslogtreecommitdiff
path: root/firmware/powermgmt.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/powermgmt.c')
-rw-r--r--firmware/powermgmt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 86fadff2a2..6e0c03c94a 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -492,7 +492,7 @@ static int runcurrent(void)
492{ 492{
493 int current; 493 int current;
494 494
495#if MEM == 8 && !defined(HAVE_MMC) 495#if MEM == 8 && !(defined(ARCHOS_ONDIOSP) || defined(ARCHOS_ONDIOFM))
496 /* assuming 192 kbps, the running time is 22% longer with 8MB */ 496 /* assuming 192 kbps, the running time is 22% longer with 8MB */
497 current = (CURRENT_NORMAL*100/122); 497 current = (CURRENT_NORMAL*100/122);
498#else 498#else
@@ -1059,7 +1059,7 @@ static void power_thread(void)
1059 /* initialize the voltages for the exponential filter */ 1059 /* initialize the voltages for the exponential filter */
1060 avgbat = battery_adc_voltage() + 15; 1060 avgbat = battery_adc_voltage() + 15;
1061 1061
1062#ifndef HAVE_MMC /* this adjustment is only needed for HD based */ 1062#ifdef HAVE_DISK_STORAGE /* this adjustment is only needed for HD based */
1063 /* The battery voltage is usually a little lower directly after 1063 /* The battery voltage is usually a little lower directly after
1064 turning on, because the disk was used heavily. Raise it by 5% */ 1064 turning on, because the disk was used heavily. Raise it by 5% */
1065#ifdef HAVE_CHARGING 1065#ifdef HAVE_CHARGING
@@ -1067,7 +1067,7 @@ static void power_thread(void)
1067#endif 1067#endif
1068 avgbat += (percent_to_volt_discharge[battery_type][6] - 1068 avgbat += (percent_to_volt_discharge[battery_type][6] -
1069 percent_to_volt_discharge[battery_type][5]) / 2; 1069 percent_to_volt_discharge[battery_type][5]) / 2;
1070#endif /* not HAVE_MMC */ 1070#endif /* HAVE_DISK_STORAGE */
1071 1071
1072 avgbat = avgbat * BATT_AVE_SAMPLES; 1072 avgbat = avgbat * BATT_AVE_SAMPLES;
1073 battery_millivolts = avgbat / BATT_AVE_SAMPLES; 1073 battery_millivolts = avgbat / BATT_AVE_SAMPLES;