[openfirmware] [commit] r2643 - cpu/arm/mmp2
repository service
svn at openfirmware.info
Sat Oct 22 12:40:07 CEST 2011
Author: wmb
Date: Sat Oct 22 12:40:07 2011
New Revision: 2643
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2643
Log:
OLPC XO-1.75 - Fixed a name collision with timers-off .
Modified:
cpu/arm/mmp2/dramrecal.fth
Modified: cpu/arm/mmp2/dramrecal.fth
==============================================================================
--- cpu/arm/mmp2/dramrecal.fth Sat Oct 22 07:20:13 2011 (r2642)
+++ cpu/arm/mmp2/dramrecal.fth Sat Oct 22 12:40:07 2011 (r2643)
@@ -677,7 +677,7 @@
: wlan-stay-on ( -- ) h# 140 d# 34 af! h# 140 d# 57 af! h# 140 d# 58 af! ;
0 value sleep-mask
-: screen-off
+: screen-sleep
sleep-mask 1 and if \ DCON power down
dcon-freeze
else
@@ -696,7 +696,7 @@
wlan-power-off
then \ saves 100 mW
;
-: screen-on ( -- )
+: screen-wake ( -- )
sleep-mask 4 and 0= if
wlan-power-on
" /wlan" " wake" execute-device-method drop
@@ -714,12 +714,12 @@
: stdin-idle-on ['] safe-idle to stdin-idle d# 15 enable-interrupt ;
: 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
h# f enable-interrupt \ Unblock timer interrupt
@@ -736,9 +736,9 @@
: str ( -- )
disable-interrupts
suspend-usb
- timers-off
+ timers-sleep
- screen-off
+ screen-sleep
stdin-idle-off
5 h# 38 mpmu! \ Use 32 kHz clock instead of VCXO for slow clock
@@ -779,8 +779,8 @@
\ idle_cfg &= (~PMUA_MOH_SRAM_PWRDWN);
stdin-idle-on
- screen-on
- timers-on
+ screen-wake
+ timers-wake
resume-usb
enable-interrupts
;
More information about the openfirmware
mailing list