r602 - cpu/x86/pc/olpc

Author: wmb
Date: 2007-09-11 19:13:15 +0200 (Tue, 11 Sep 2007)
New Revision: 602

Modified:
   cpu/x86/pc/olpc/resume.bth
   cpu/x86/pc/olpc/suspend.fth
Log:
OLPC - Added sci-wakeup and lid-wakeup for suspend/resume testing.

Modified: cpu/x86/pc/olpc/resume.bth
===================================================================
--- cpu/x86/pc/olpc/resume.bth	2007-09-11 16:48:47 UTC (rev 601)
+++ cpu/x86/pc/olpc/resume.bth	2007-09-11 17:13:15 UTC (rev 602)
@@ -274,6 +274,7 @@

\ The caller chooses the wakeup conditions, so we don't do it here
    \ h# 0100.ffff h# 1840 port-wl   \ Enable Power button wakeup, clear status bits
+   h# ffff.ffff h# 1858 port-wl   \ Clear all status bits

wbinvd                                 \ Flush the cache
    h# 00ff.ff00  h# 2000.0018 bitclr-msr  \ Set refresh to 0, disabling GX refresh

Modified: cpu/x86/pc/olpc/suspend.fth
===================================================================
--- cpu/x86/pc/olpc/suspend.fth	2007-09-11 16:48:47 UTC (rev 601)
+++ cpu/x86/pc/olpc/suspend.fth	2007-09-11 17:13:15 UTC (rev 602)
@@ -15,11 +15,27 @@

code ax-call  ( ax-value dst -- )  bx pop  ax pop  bx call  c;

+: lid-wakeup
+   h#  400 h# c8 gpio!  \ Clear positive edge status bit
+   h#  400 h# cc gpio!  \ Clear negative edge status bit
+   h# 185c pl@  h# 4000.0000 or  h# 185c pl!
+;
+
+: sci-wakeup
+   h#  800 h# c8 gpio!  \ Clear positive edge status bit
+   h#  800 h# cc gpio!  \ Clear negative edge status bit
+   h# 185c pl@  h# 8000.0000 or  h# 185c pl!
+;
+
 : s3
    \ Enable wakeup from power button, also clearing
    \ any status bits in the low half of the register.
    h# 1840 pl@  h# 100.0000 or  h# 1840 pl!

+   h# ffff.ffff h# 1858 pl!  \ Clear PME status bits
+   h#      ffff h# c8 gpio!  \ Clear positive edge status bits
+   h#      ffff h# cc gpio!  \ Clear negative edge status bits
+
 \  sum-forth
    [ also dev /mmu ]  pdir-va  h# f0000 ax-call  [ previous definitions ]
 \  sum-forth