3 files changed, 60 insertions, 23 deletions

diff --git a/firmware/target/arm/sandisk/powermgmt-target.h b/firmware/target/arm/sandisk/powermgmt-target.h
new file mode 100644
index 0000000000..aa6a0e0e3d
--- /dev/null
+++ b/firmware/target/arm/sandisk/powermgmt-target.h
@@ -0,0 +1,59 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2009 by Michael Sevakis
+ * Copyright (C) 2008 by Bertrik Sikken
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef POWERMGMT_TARGET_H
+#define POWERMGMT_TARGET_H
+
+#if defined(SANSA_C200)
+/* This configuration triggers a single charge cycle upon plugging and stops.
+ * The true voltage cannot be read accurately and so monitoring isn't really
+ * possible. The battery filter is still synced to have a proper reading
+ * when disconnecting. */
+#define BATT_FULL_VOLTAGE   5121 /* Won't read this high - force start */
+#define BATT_VAUTO_RECHARGE 0    /* Won't read this low - force one cycle */
+#define BATT_CHG_V          CHG_V_4_20V
+#define BATT_CHG_I          CHG_I_300MA
+#define CHARGER_TOTAL_TIMER (4*3600*2) /* 4 hours enough? */
+#define ADC_BATTERY         ADC_BVDD
+#elif defined(SANSA_E200)
+/* PREFERRED - Check if topped-off and monitor voltage while plugged. */
+#define BATT_FULL_VOLTAGE   4160
+#define BATT_VAUTO_RECHARGE 4100
+#define BATT_CHG_V          CHG_V_4_20V
+#define BATT_CHG_I          CHG_I_300MA
+#define CHARGER_TOTAL_TIMER (4*3600*2) /* 4 hours enough? */
+/* On e200 ADC_RTCSUP seems to represent battery voltage better than
+ * ADC_BVDD during charging (ADC_BVDD is way too high) and appears the
+ * same in normal use.
+ */
+#define ADC_BATTERY         ADC_RTCSUP
+#endif
+
+void powermgmt_init_target(void);
+void charging_algorithm_step(void);
+void charging_algorithm_close(void);
+
+/* We want to be able to reset the averaging filter */
+#define HAVE_RESET_BATTERY_FILTER
+
+#define BATT_AVE_SAMPLES 32
+
+#endif /*  POWERMGMT_TARGET_H */
diff --git a/firmware/target/arm/sandisk/sansa-c200/powermgmt-c200.c b/firmware/target/arm/sandisk/sansa-c200/powermgmt-c200.c
index 963e7218de..9d7a0e2965 100644
--- a/firmware/target/arm/sandisk/sansa-c200/powermgmt-c200.c
+++ b/firmware/target/arm/sandisk/sansa-c200/powermgmt-c200.c
@@ -38,8 +38,8 @@ const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
 const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
 {
  
+    /* NOTE: why is the top voltage 4237? That's just too high. */
     { 3286, 3679, 3734, 3764, 3788, 3824, 3886, 3950, 4014, 4098, 4237 },
-    
 };
 
 /* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
@@ -48,14 +48,3 @@ const unsigned short percent_to_volt_charge[11] =
     /* Sansa c200 has a 530 mAh LiPo battery */
     3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200
 };
-
-/* ADC should read 0x3ff=5.12V */
-#define BATTERY_SCALE_FACTOR 5125       
-/* full-scale ADC readout (2^10) in millivolt */
-
-/* Returns battery voltage from ADC [millivolts] */
-unsigned int battery_adc_voltage(void)
-{
-    return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10;
-}
-
diff --git a/firmware/target/arm/sandisk/sansa-e200/powermgmt-e200.c b/firmware/target/arm/sandisk/sansa-e200/powermgmt-e200.c
index 43f37463f8..144ca37ebf 100644
--- a/firmware/target/arm/sandisk/sansa-e200/powermgmt-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/powermgmt-e200.c
@@ -47,14 +47,3 @@ const unsigned short percent_to_volt_charge[11] =
     /* Sansa Li Ion 750mAH FIXME */
     3300, 3680, 3740, 3760, 3780, 3810, 3870, 3930, 3970, 4070, 4160
 };
-
-/* ADC should read 0x3ff=5.12V */
-#define BATTERY_SCALE_FACTOR 5125       
-/* full-scale ADC readout (2^10) in millivolt */
-
-/* Returns battery voltage from ADC [millivolts] */
-unsigned int battery_adc_voltage(void)
-{
-    return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10;
-}
-