Changeset 3408

Timestamp:

Nov 2, 2012 9:25:58 PM (7 months ago)

Author:

wmb

Message:

OLPC - Converted some GPIO numbers to symbolic names in unused test code for wakeups.

File:

• cpu/arm/mmp2/wakeups.fth (modified) (3 diffs)

cpu/arm/mmp2/wakeups.fth

@@ -12 +12 @@
 \ How to wakeup from SP:
 : setup-key-wakeup  ( -- )
-   d# 24 d# 15 do  h# b0 i af!  loop  \ Wake SoC on game keys
+   rotate-gpio# 8 bounds do  h# b0 i af!  loop  \ Wake SoC on game keys
 [ifdef] soc-kbd-clk-gpio#
    h# 220 soc-kbd-clk-gpio# af!  \ Wake SoC on KBD CLK falling edge
@@ -31 +31 @@
 
 : gpio-wakeup?  ( gpio# -- flag )
-   h# 019800 over 5 rshift la+ l@  ( gpio# mask )
+   h# 019800 over 5 rshift la+ io@ ( gpio# mask )
    swap h# 1f and                  ( mask bit# )
    1 swap lshift  and  0<>         ( flag )
@@ -39 +39 @@
 \ So perhaps the interrupt handler didn't fire
 : rotate-wakeup? ( -- flag )  d#  15 gpio-wakeup?   ;
-: kbd-wakeup?    ( -- flag )  d#  71 gpio-wakeup?   ;
-: tpd-wakeup?    ( -- flag )  d# 160 gpio-wakeup?   ;
+: kbd-wakeup?    ( -- flag )  soc-kbd-clk-gpio# gpio-wakeup?   ;
+: tpd-wakeup?    ( -- flag )  soc-tpd-clk-gpio# gpio-wakeup?   ;
 
 string-array wakeup-bit-names