Author: titmuss
Date: Mon Feb 4 06:35:54 2008
New Revision: 1785
URL: http://svn.slimdevices.com?rev=1785&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1784): titmuss | 2008-02-04 14:35:32 +0000
Bug: 6871
Description:
Tweak required battery level on system power on.
Modified:
trunk/ (props changed)
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/char/jive/jive_mgmt.c
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Feb 4 06:35:54 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1778
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1784
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/char/jive/jive_mgmt.c
URL:
http://svn.slimdevices.com/trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/char/jive/jive_mgmt.c?rev=1785&root=Jive&r1=1784&r2=1785&view=diff
==============================================================================
---
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/char/jive/jive_mgmt.c
(original)
+++
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/char/jive/jive_mgmt.c
Mon Feb 4 06:35:54 2008
@@ -114,8 +114,10 @@
/* Number of battery samples */
#define N_BATTERY_SAMPLES 6
-/* Minimum battery flat to boot (see bug 5374): 20% 3.61 volts */
-#define BATTERY_FLAT_LEVEL 812
+/* Minimum battery level to boot. This will be equivalent to 10%
+ * capacity at full load.
+ */
+#define BATTERY_FLAT_LEVEL 845
#define RAW(var) (*(volatile unsigned int __force *)var)
@@ -577,7 +579,11 @@
/* Called from logo.c to determine if the battery is flat during boot */
bool jive_is_battery_flat(void) {
- battery_flat = (get_battery() < BATTERY_FLAT_LEVEL);
+ int bat = get_battery();
+ battery_flat = (bat < BATTERY_FLAT_LEVEL);
+
+ printk("battery flat? %s (level=%d)\n", battery_flat?"yes":"no", bat);
+
return battery_flat;
}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
