Author: richard
Date: Tue May 19 03:48:52 2009
New Revision: 5783
URL: http://svn.slimdevices.com/jive?rev=5783&view=rev
Log:
r5...@harrypotter (orig r5768): tom | 2009-05-18 15:24:59 +0100
Bug: N/A
Description:
Udate to ver 1.13, gives better error logging.
r5...@harrypotter (orig r5782): richard | 2009-05-19 11:48:27 +0100
r5...@harrypotter (orig r5730): richard | 2009-05-12 20:07:04 +0100
Bug: N/A
Description:
Wake all 24 hours of a day.
r5...@harrypotter (orig r5771): richard | 2009-05-18 22:33:21 +0100
Bug: 11824
Description:
Possible fix for crasher on resume.
r5...@harrypotter (orig r5772): bklaas | 2009-05-18 22:51:10 +0100
Bug: 12083
Description: if we are returning the bottom key, self.downCompleted is true
if we are returning the top key, self.upCompleted is true
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/DB.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/utils/coxpcall.lua
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue May 19 03:48:52 2009
@@ -3,8 +3,8 @@
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:5718
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:5723
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:5772
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:5782
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/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c?rev=5783&r1=5782&r2=5783&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
(original)
+++
7.4/branches/pango/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
Tue May 19 03:48:52 2009
@@ -120,7 +120,6 @@
SAVE_ITEM(S3C2410_DCLKCON),
};
-#define CONFIG_S3C2410_PM_DEBUG
#ifdef CONFIG_S3C2410_PM_DEBUG
#define SAVE_UART(va) \
@@ -626,11 +625,11 @@
int rtc_wakeup, bat_lvl, bat_flat;
do {
- /* set rtc alarm to wake up every three hours */
+ /* set rtc alarm to wake up every hour */
rtc_hour = readb(rtc_base + S3C2410_RTCHOUR);
BCD_TO_BIN(rtc_hour);
- alm_hour = (rtc_hour + 3) % 12;
+ alm_hour = (rtc_hour + 1) % 24;
alrm_en = S3C2410_RTCALM_HOUREN | S3C2410_RTCALM_ALMEN;
DBG("rtc_hour=%d alm_hour=%d\n", rtc_hour, alm_hour);
@@ -641,7 +640,8 @@
s3c2410_pm_enter(state);
/* woken by rtc? */
- rtc_wakeup = (__raw_readl(S3C2410_SRCPND) == 0);
+ rtc_wakeup = (__raw_readl(S3C2410_SRCPND) == 0 &&
+ __raw_readl(S3C2410_EINTPEND) == 0);
/* check battery */
bat_flat = jive_is_battery_flat(&bat_lvl);
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/DB.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/DB.lua?rev=5783&r1=5782&r2=5783&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/DB.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/DB.lua
Tue May 19 03:48:52 2009
@@ -305,6 +305,9 @@
for key = fromKey, toKey, step do
if not self.store[key] then
local thisChunkFrom = key * BLOCK_SIZE
+ if key == toKey then
+ self.upCompleted = true
+ end
return thisChunkFrom, BLOCK_SIZE
end
end
@@ -320,6 +323,9 @@
for key = fromKey, toKey, step do
if not self.store[key] then
local thisChunkFrom = key * BLOCK_SIZE
+ if key == toKey then
+ self.downCompleted = true
+ end
return thisChunkFrom, BLOCK_SIZE
end
end
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/utils/coxpcall.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/utils/coxpcall.lua?rev=5783&r1=5782&r2=5783&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/utils/coxpcall.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/utils/coxpcall.lua
Tue May 19 03:48:52 2009
@@ -5,16 +5,17 @@
-- be dealed without the usual Lua 5.0 pcall/xpcall issues with coroutines
-- yielding inside the call to pcall or xpcall.
--
--- Authors: Roberto Ierusalimschy and Andre Carregal
--- Contributors: Thomas Harning Jr., Ignacio Burgueño
+-- Authors: Roberto Ierusalimschy and Andre Carregal
+-- Contributors: Thomas Harning Jr., Ignacio Burgueño
--
-- Copyright 2005-2007 - Kepler Project (www.keplerproject.org)
--
--- $Id: coxpcall.lua,v 1.11 2007/12/14 20:34:46 mascarenhas Exp $
+-- -- $Id: coxpcall.lua,v 1.13 2008/05/19 19:20:02 mascarenhas Exp $
-------------------------------------------------------------------------------
local oldpcall, oldxpcall, unpack = pcall, xpcall, unpack
local coroutine = require("coroutine")
+local debug = require("jive.utils.debug")
module(...)
@@ -25,7 +26,7 @@
function handleReturnValue(err, co, status, ...)
if not status then
- return false, err(...)
+ return false, err(debug.traceback(co, (...)), ...)
end
if coroutine.status(co) == 'suspended' then
return performResume(err, co, coroutine.yield(...))
@@ -36,7 +37,7 @@
function performResume(err, co, ...)
return handleReturnValue(err, co, coroutine.resume(co, ...))
-end
+end
function coxpcall(f, err, ...)
local res, co = oldpcall(coroutine.create, f)
@@ -48,7 +49,7 @@
return performResume(err, co, ...)
end
-local function id(...)
+local function id(trace, ...)
return ...
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
