Changeset 2643

Timestamp:

Oct 22, 2011 12:40:07 PM (19 months ago)

Author:

wmb

Message:

OLPC XO-1.75 - Fixed a name collision with timers-off .

File:

• cpu/arm/mmp2/dramrecal.fth (modified) (5 diffs)

cpu/arm/mmp2/dramrecal.fth

@@ -678 +678 @@
 
 0 value sleep-mask
-: screen-off
+: screen-sleep
    sleep-mask 1 and  if            \ DCON power down
       dcon-freeze
@@ -697 +697 @@
    then  \ saves 100 mW
 ;
-: screen-on  ( -- )
+: screen-wake  ( -- )
    sleep-mask 4 and  0=  if
       wlan-power-on
@@ -715 +715 @@
 : stdin-idle-off  ['] noop to stdin-idle  ( install-uart-io ) d# 15 disable-interrupt  ;
 
-: timers-off  ( -- )
+: timers-sleep  ( -- )
    0 h# 14048 io!    \ Disable interrupts from the tick timer
    7 h# 1407c io!    \ Clear any pending interrupts
    h# f disable-interrupt  \ Block timer interrupt
 ;
-: timers-on  ( -- )
+: timers-wake ( -- )
    1 h# 14048 io!    \ Enable interrupts from the tick timer
    7 h# 1407c io!    \ Clear any pending interrupts
@@ -737 +737 @@
    disable-interrupts
    suspend-usb
-   timers-off
-
-   screen-off
+   timers-sleep
+
+   screen-sleep
    stdin-idle-off
    5 h# 38 mpmu!    \ Use 32 kHz clock instead of VCXO for slow clock
@@ -780 +780 @@
    stdin-idle-on
 
-   screen-on
-   timers-on
+   screen-wake
+   timers-wake
    resume-usb
    enable-interrupts