[Hackndev-commit] SF.net SVN: hackndev: [1339] linux4palm/linux/trunk/arch/arm/mach-pxa/ palmtx/palmtx_battery.c

[<mis...@us...>]

Revision: 1339
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1339&view=rev
Author:   miska_tx
Date:     2007-09-24 08:59:23 -0700 (Mon, 24 Sep 2007)

Log Message:
-----------
PalmTX: Battery cleanups.
Signed-off-by: Michal Hrusecky <Mic...@se...>

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c	2007-09-24 15:12:00 UTC (rev 1338)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c	2007-09-24 15:59:23 UTC (rev 1339)
@@ -66,6 +66,11 @@
     return PALMTX_BAT_MAX_VOLTAGE; /* mV */
 }
 
+static int palmtx_ac_is_connected (void){
+	/* when charger is plugged in, then status is ONLINE */
+	return GET_PALMTX_GPIO(POWER_DETECT)||(!GET_PALMTX_GPIO(USB_DETECT_N));
+}
+
 /*
  This formula is based on battery life of my battery 1100mAh. Original battery in Zire72 is Li-On 920mAh
  V_batt = ADCSEL_BMON * 1,889 + 767,8 [mV]
@@ -97,19 +102,14 @@
 
 int palmtx_battery_get_status(struct power_supply *b)
 {
-        int ac_connected  = GET_PALMTX_GPIO(POWER_DETECT);
-        int usb_connected = !GET_PALMTX_GPIO(USB_DETECT_N);
-
-        if ( (ac_connected || usb_connected) &&
+        if ( palmtx_ac_is_connected() &&
         ( ( bat.current_voltage > bat.previous_voltage ) ||
-        (bat.current_voltage <= PALMTX_BAT_MAX_VOLTAGE) ) )
+        (bat.current_voltage <= palmtx_battery_max_voltage(b)) ) )
                 return POWER_SUPPLY_STATUS_CHARGING;
         else
                 return POWER_SUPPLY_STATUS_NOT_CHARGING;
 }
 
-int tmp;
-
 static int palmtx_battery_get_property(struct power_supply *b,
                                 enum power_supply_property psp,
                                 union power_supply_propval *val)
@@ -204,10 +204,6 @@
     .shutdown	= palmtx_wm97xx_shutdown
 };
 
-static int palmtx_ac_is_connected (void){
-	/* when charger is plugged in, then status is ONLINE */
-	return GET_PALMTX_GPIO(POWER_DETECT)||(!GET_PALMTX_GPIO(USB_DETECT_N));
-}
 
 #if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.