[openfirmware] [commit] r2587 - cpu/arm/mmp2 cpu/arm/olpc/1.75 cpu/x86/pc/olpc dev
repository service
svn at openfirmware.info
Tue Oct 11 20:09:10 CEST 2011
Author: wmb
Date: Tue Oct 11 20:09:09 2011
New Revision: 2587
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2587
Log:
OLPC - changed the names of device methods "suspend" and "resume" to "sleep" and "wake", thus eliminating a name conflict with the global "resume" command - makes debugging easier.
Modified:
cpu/arm/mmp2/dramrecal.fth
cpu/arm/olpc/1.75/lcd.fth
cpu/arm/olpc/1.75/usb.fth
cpu/x86/pc/olpc/wlantest.fth
dev/libertas.fth
Modified: cpu/arm/mmp2/dramrecal.fth
==============================================================================
--- cpu/arm/mmp2/dramrecal.fth Mon Oct 10 18:35:23 2011 (r2586)
+++ cpu/arm/mmp2/dramrecal.fth Tue Oct 11 20:09:09 2011 (r2587)
@@ -681,7 +681,7 @@
else
" dcon-suspend" $call-screen
then
- " suspend" $call-screen
+ " sleep" $call-screen
" set-ack" $call-ec
\ 0 h# 54 pmua! \ Kill the SDIO 0 clocks - insignificant savings
@@ -690,18 +690,18 @@
sleep-mask 4 and if
wlan-stay-on
else
- " /wlan" " suspend" execute-device-method drop
+ " /wlan" " sleep" execute-device-method drop
wlan-power-off
then \ saves 100 mW
;
: screen-on ( -- )
sleep-mask 4 and 0= if
wlan-power-on
- " /wlan" " resume" execute-device-method drop
+ " /wlan" " wake" execute-device-method drop
then
sleep-mask 2 and 0= if keyboard-power-on then
" clr-ack" $call-ec
- " resume" $call-screen
+ " wake" $call-screen
sleep-mask 1 and if \ DCON power up
dcon-unfreeze
else
Modified: cpu/arm/olpc/1.75/lcd.fth
==============================================================================
--- cpu/arm/olpc/1.75/lcd.fth Mon Oct 10 18:35:23 2011 (r2586)
+++ cpu/arm/olpc/1.75/lcd.fth Tue Oct 11 20:09:09 2011 (r2587)
@@ -214,12 +214,12 @@
flush-cursor-bits ( )
;
0 value saved-mode
-: suspend ( -- )
+: sleep ( -- )
h# 190 lcd@ to saved-mode
0 h# 190 lcd!
lcd-clocks-off
;
-: resume ( -- )
+: wake ( -- )
lcd-clocks-on
saved-mode h# 190 lcd!
;
Modified: cpu/arm/olpc/1.75/usb.fth
==============================================================================
--- cpu/arm/olpc/1.75/usb.fth Mon Oct 10 18:35:23 2011 (r2586)
+++ cpu/arm/olpc/1.75/usb.fth Tue Oct 11 20:09:09 2011 (r2587)
@@ -22,8 +22,8 @@
\ Port 3 is left
\ Port 4 is right lower
" 3,4,2" " usb-hub-test-list" string-property
- : suspend ( -- ) true to first-open? ;
- : resume ( -- ) ;
+ : sleep ( -- ) true to first-open? ;
+ : wake ( -- ) ;
end-package
\ Turn on USB power after a delay, to ensure that USB devices are reset correctly on boot
@@ -126,7 +126,7 @@
: suspend-usb ( -- )
detach-usb-keyboard
- " /usb" " suspend" execute-device-method drop
+ " /usb" " sleep" execute-device-method drop
;
: has-children? ( devspec$ -- flag )
locate-device if false else child 0<> then
@@ -134,7 +134,7 @@
: any-usb-devices? ( -- flag ) " /usb/hub" has-children? ;
: resume-usb ( -- )
init-usb
- " /usb" " resume" execute-device-method drop
+ " /usb" " wake" execute-device-method drop
any-usb-devices? if
d# 2000 ms \ USB misses devices if you probe too soon
then
Modified: cpu/x86/pc/olpc/wlantest.fth
==============================================================================
--- cpu/x86/pc/olpc/wlantest.fth Mon Oct 10 18:35:23 2011 (r2586)
+++ cpu/x86/pc/olpc/wlantest.fth Tue Oct 11 20:09:09 2011 (r2587)
@@ -19,7 +19,7 @@
begin
" /wlan" open-dev >r
" autostart" r@ $call-method
- " sleep" r@ $call-method
+ " host-sleep-activate" r@ $call-method
r> close-dev
5 ms
s
Modified: dev/libertas.fth
==============================================================================
--- dev/libertas.fth Mon Oct 10 18:35:23 2011 (r2586)
+++ dev/libertas.fth Tue Oct 11 20:09:09 2011 (r2587)
@@ -604,8 +604,8 @@
ds-not-ready to driver-state
reset-host-bus
;
-: suspend ( -- ) reset-wlan ;
-: resume ( -- ) ;
+: sleep ( -- ) reset-wlan ;
+: wake ( -- ) ;
: marvel-get-hw-spec ( -- true | adr false )
d# 38 h# 03 ( CMD_GET_HW_SPEC ) prepare-cmd
@@ -1731,7 +1731,6 @@
: unicast-wakeup ( -- ) wake-on-unicast host-sleep-config ;
: broadcast-wakeup ( -- ) wake-on-unicast wake-on-broadcast or host-sleep-config ;
-: sleep ( -- ) host-sleep-activate ;
[ifdef] notdef
CMD_ACT_MESH_...
More information about the openfirmware
mailing list