Author: richard
Date: Fri May 29 10:09:35 2009
New Revision: 5936
URL: http://svn.slimdevices.com/jive?rev=5936&view=rev
Log:
r5...@harrypotter (orig r5918): richard | 2009-05-28 14:41:06 +0100
Bug: 11824
Description:
Revert wake up settings, as requested by Dean.
r5...@harrypotter (orig r5921): richard | 2009-05-28 18:33:03 +0100
Bug: 11980
Description:
Sometimes extra irq bits were being set on resume (IRQ_USBH in particular).
This would confuse
the battery checking and cause the controller to fully wake up. We now ignore
irq bits on wake up
if they were not from motion or keys.
r5...@harrypotter (orig r5922): richard | 2009-05-28 18:35:16 +0100
Bug: 12048
Description:
Don't show "Please wait" indefinitely, time out after 90 seconds.
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/suspend
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
7.4/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri May 29 10:09:35 2009
@@ -3,7 +3,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:5772
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:5922
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/suspend
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/suspend?rev=5936&r1=5935&r2=5936&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/suspend
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/suspend
Fri May 29 10:09:35 2009
@@ -9,9 +9,8 @@
CONFIG=`cat /sys/bus/i2c/devices/0-001c/config`
DURATION=`cat /sys/bus/i2c/devices/0-001c/duration`
THRESHOLD=`cat /sys/bus/i2c/devices/0-001c/threshold`
-echo "96" > /sys/bus/i2c/devices/0-001c/config
-echo "12" > /sys/bus/i2c/devices/0-001c/duration
-echo "10" > /sys/bus/i2c/devices/0-001c/threshold
+echo "4" > /sys/bus/i2c/devices/0-001c/duration
+echo "20" > /sys/bus/i2c/devices/0-001c/threshold
echo "1" > /sys/bus/i2c/devices/0-001c/resume
# Suspend
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb?rev=5936&r1=5935&r2=5936&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Fri May 29 10:09:35 2009
@@ -3,7 +3,7 @@
PRIORITY = "required"
LICENSE = "GPL"
-PR = "r33"
+PR = "r34"
SRC_URI = " \
file://85-mtd.rules \
Modified:
7.4/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c?rev=5936&r1=5935&r2=5936&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
(original)
+++ 7.4/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c Fri
May 29 10:09:35 2009
@@ -622,9 +622,10 @@
{
void __iomem *rtc_base = s3c_rtc_base;
unsigned int rtc_hour, alm_hour, alrm_en;
- int rtc_wakeup, bat_lvl, bat_flat;
+ int eint_wakeup, bat_lvl, bat_flat;
do {
+#if 1
/* set rtc alarm to wake up every hour */
rtc_hour = readb(rtc_base + S3C2410_RTCHOUR);
BCD_TO_BIN(rtc_hour);
@@ -635,13 +636,28 @@
writeb(BIN2BCD(alm_hour), rtc_base + S3C2410_ALMHOUR);
writeb(alrm_en, rtc_base + S3C2410_RTCALM);
+#else
+ /* every ten minute for testing */
+ rtc_hour = readb(rtc_base + S3C2410_RTCMIN);
+ BCD_TO_BIN(rtc_hour);
+
+ alm_hour = (rtc_hour + 10) % 60;
+ alrm_en = S3C2410_RTCALM_MINEN | S3C2410_RTCALM_ALMEN;
+ DBG("rtc_min=%d alm_min=%d\n", rtc_hour, alm_hour);
+
+ writeb(BIN2BCD(alm_hour), rtc_base + S3C2410_ALMMIN);
+ writeb(alrm_en, rtc_base + S3C2410_RTCALM);
+#endif
/* suspend */
s3c2410_pm_enter(state);
+ /* only wake up on EINT4_7 and EINT8_23 */
+#define WAKEUP_MASK ((1 << 4) | (1 << 5))
+
/* woken by rtc? */
- rtc_wakeup = (__raw_readl(S3C2410_SRCPND) == 0 &&
- __raw_readl(S3C2410_EINTPEND) == 0);
+ eint_wakeup = ((__raw_readl(S3C2410_SRCPND) & WAKEUP_MASK) !=
0);
+ DBG("eint_wakeup=%d %08x %08x\n", eint_wakeup,
__raw_readl(S3C2410_SRCPND), WAKEUP_MASK);
/* check battery */
bat_flat = jive_is_battery_flat(&bat_lvl);
@@ -650,7 +666,7 @@
if (bat_flat) {
kernel_power_off();
}
- } while (rtc_wakeup);
+ } while (!eint_wakeup);
}
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=5936&r1=5935&r2=5936&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Fri May 29 10:09:35 2009
@@ -1180,6 +1180,8 @@
-- wake up power state
self:wakeup('motion')
+ local t0 = Framework:getTicks()
+
while true do
local status = self.wireless:t_wpaStatus()
@@ -1215,6 +1217,23 @@
return
end
+
+ local t1 = Framework:getTicks()
+ if (t1 - t0) > 90000 then
+ log:info("failed to connect")
+
+ -- restart discovery
+ appletManager:callService("connectPlayer")
+
+ -- close popup
+ self.suspendPopup:hide()
+
+ self.suspendPopup = nil
+ self.suspendTask = nil
+
+ return
+ end
+
Task:yield(false)
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
