hackndev-commit

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

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

Revision: 1071
          http://svn.sourceforge.net/hackndev/?rev=1071&view=rev
Author:   miska_tx
Date:     2007-06-24 11:42:17 -0700 (Sun, 24 Jun 2007)

Log Message:
-----------
Fixed some small errors in PalmTX battery (#fidef -> #ifdef ;-) )

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-06-24 18:01:19 UTC (rev 1070)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c	2007-06-24 18:42:17 UTC (rev 1071)
@@ -262,7 +262,7 @@
     /* register battery to APM layer */
     bat.battery_registered = 0;
 
-#fidef CONFIG_POWER_SUPPLY
+#ifdef CONFIG_POWER_SUPPLY
     if(power_supply_register(NULL, &palmtx_battery)) {
 	printk(KERN_ERR "palmtx_ac97_probe: could not register battery class\n");
     }
@@ -287,7 +287,7 @@
 static void __exit palmtx_wm97xx_exit(void)
 {
 /* TODO - recover APM callback to original state */
-#fidef CONFIG_POWER_SUPPLY
+#ifdef CONFIG_POWER_SUPPLY
     power_supply_unregister(&palmtx_battery);
 #endif
     driver_unregister(&palmtx_wm97xx_driver);


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

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

[<mar...@us...>]

Revision: 1274
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1274&view=rev
Author:   marex_z71
Date:     2007-08-25 21:37:17 -0700 (Sat, 25 Aug 2007)

Log Message:
-----------
PalmTX: remove bloated code from palmtx_battery

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-08-26 01:16:28 UTC (rev 1273)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c	2007-08-26 04:37:17 UTC (rev 1274)
@@ -100,7 +100,7 @@
 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);
+        int usb_connected = !GET_PALMTX_GPIO(USB_DETECT_N);
 
         if ( (ac_connected || usb_connected) &&
         ( ( bat.current_voltage > bat.previous_voltage ) ||
@@ -208,13 +208,7 @@
 
 static int palmtx_ac_is_connected (void){
 	/* when charger is plugged in, then status is ONLINE */
-	int ret = ((GET_GPIO(GPIO_NR_PALMTX_POWER_DETECT))||(!GET_GPIO(GPIO_NR_PALMTX_USB_DETECT)));;
-	if (ret) 
-		ret = 1;
-	else 
-		ret = 0;
-
-	return ret;
+	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.

[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.