3 files changed, 89 insertions, 5 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 711a7c0c56..fd0ec39f2f 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1129,14 +1129,14 @@ target/arm/as3525/powermgmt-as3525.c
 #ifndef SIMULATOR
 drivers/nand_id.c
 drivers/pcf50606.c
+target/arm/usb-tcc.c
 target/arm/tcc77x/system-tcc77x.c
 target/arm/tcc77x/kernel-tcc77x.c
 target/arm/tcc77x/timer-tcc77x.c
 target/arm/tcc77x/adc-tcc77x.c
-target/arm/tcc77x/powermgmt-tcc77x.c
-target/arm/usb-tcc.c
 target/arm/tcc77x/iaudio7/lcd-iaudio7.c
 target/arm/tcc77x/iaudio7/power-iaudio7.c
+target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c
 target/arm/tcc77x/iaudio7/button-iaudio7.c
 target/arm/tcc77x/iaudio7/ata2501.c
 #ifndef BOOTLOADER
diff --git a/firmware/target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c b/firmware/target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c
new file mode 100644
index 0000000000..e391ada10a
--- /dev/null
+++ b/firmware/target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c
@@ -0,0 +1,84 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id: powermgmt-cowond2.c 17847 2008-06-28 18:10:04Z bagder $
+ *
+ * Copyright (C) 2007 by Karl Kurbjun
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+#include "config.h"
+#include "adc.h"
+#include "powermgmt.h"
+#include "kernel.h"
+#include "pcf50606.h"
+
+unsigned short current_voltage = 5150;
+
+const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
+{
+    /* FIXME: calibrate value */
+    3380
+};
+
+const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
+{
+    /* FIXME: calibrate value */
+    3300
+};
+
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
+const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
+{
+    /* FIXME: calibrate values. Table is "inherited" from iPod-PCF / H100 */
+    { 4500, 4810, 4910, 4970, 5030, 5070, 5120, 5140, 5170, 5250, 5400 }
+};
+
+#if CONFIG_CHARGING
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
+const unsigned short percent_to_volt_charge[11] =
+{
+    /* FIXME: calibrate values. Table is "inherited" from iPod-PCF / H100 */
+    4760, 5440, 5510, 5560, 5610, 5640, 5660, 5760, 5820, 5840, 5850 /* NiMH */
+};
+#endif /* CONFIG_CHARGING */
+
+#define BATTERY_SCALE_FACTOR 6000
+/* full-scale ADC readout (2^10) in millivolt */
+
+/* Returns battery voltage from ADC [millivolts] */
+unsigned int battery_adc_voltage(void)
+{
+    static unsigned last_tick = 0;
+
+    if (0 == last_tick || TIME_BEFORE(last_tick+HZ, current_tick))
+    {
+        int adc_val, irq_status;
+        unsigned char buf[2];
+
+        irq_status = disable_irq_save();
+        pcf50606_write(PCF5060X_ADCC2, 0x1);
+        pcf50606_read_multiple(PCF5060X_ADCS1, buf, 2);
+        restore_interrupt(irq_status);
+
+        adc_val = (buf[0]<<2) | (buf[1] & 3); //ADCDAT1H+ADCDAT1L
+        current_voltage = (adc_val * BATTERY_SCALE_FACTOR) >> 10;
+
+        last_tick = current_tick;
+    }
+
+    return current_voltage;
+}
+
diff --git a/firmware/target/arm/tcc77x/system-tcc77x.c b/firmware/target/arm/tcc77x/system-tcc77x.c
index 38004851bd..0896026b55 100644
--- a/firmware/target/arm/tcc77x/system-tcc77x.c
+++ b/firmware/target/arm/tcc77x/system-tcc77x.c
@@ -99,12 +99,12 @@ static void gpio_init(void)
     GPIOD_FUNC = 0;
     GPIOE_FUNC = 0;
     GPIOA = 0x30;
-    GPIOB = 0x80000;
+    GPIOB = 0x00c00;
     GPIOC = 0;
     GPIOD = 0x180;
-    GPIOE = 0;
+    GPIOE = 0x80;
     GPIOA_DIR = 0x84b0;
-    GPIOB_DIR = 0x80800;
+    GPIOB_DIR = 0x80c00;
     GPIOC_DIR = 0x2000000;
     GPIOD_DIR = 0x3e3;
     GPIOE_DIR = 0x88;