hal/hald/linux2 acpi.c,1.28,1.29

[Danny Kukawka]

Update of /cvs/hal/hal/hald/linux2
In directory gabe:/tmp/cvs-serv30686/hald/linux2

Modified Files:
	acpi.c 
Log Message:
2005-08-11  Danny Kukawka <danny.kukawka at web.de>

        * hald/linux2/acpi.c: (battery_refresh_poll): Normalise
        battery.reporting.last_full with voltage_current instead of
        voltage_design because battery.charge_level.last_full is a changing and
        not a static value like voltage_design, which is a "marketing assurance".



Index: acpi.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/acpi.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- acpi.c	11 Aug 2005 06:51:21 -0000	1.28
+++ acpi.c	11 Aug 2005 06:57:53 -0000	1.29
@@ -129,14 +129,8 @@
 	} else if (strcmp (reporting_unit, "mAh") == 0) {
 		voltage_current = hal_device_property_get_int (d, 
 					"battery.voltage.current");
-		voltage_design = hal_device_property_get_int (d, 
-					"battery.voltage.design");
-		/* 
-		 * we really want battery.voltage.last_full, but ACPI doesn't provide it 
-		 * we can use battery.voltage.last_full ~= battery.voltage.design
-		 */
 		mwh_current = reporting_current * voltage_current;
-		mwh_lastfull = reporting_lastfull * voltage_design;
+		mwh_lastfull = reporting_lastfull * voltage_current;
 		mwh_rate = reporting_rate * voltage_current;
 	} else {
 		/*