[commit] r3612 - cpu/arm/olpc cpu/x86/pc/olpc dev/olpc/dcon

[repository service]

Author: quozl
Date: Fri Mar 15 07:39:11 2013
New Revision: 3612
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3612

Log:
OLPC - rename dcon-screen-freeze to video-save, to fit with existing XO-1 and XO-1.5 words with same function.  Relates to r3514.  Reorder XO-1 build to use video-save in display test.

Modified:
   cpu/arm/olpc/prefw.fth
   cpu/arm/olpc/suspend.fth
   cpu/x86/pc/olpc/disptest.fth
   cpu/x86/pc/olpc/fw.bth
   cpu/x86/pc/olpc/gui.fth
   dev/olpc/dcon/mmp2dcon.fth

Modified: cpu/arm/olpc/prefw.fth
==============================================================================
--- cpu/arm/olpc/prefw.fth	Fri Mar 15 07:30:04 2013	(r3611)
+++ cpu/arm/olpc/prefw.fth	Fri Mar 15 07:39:11 2013	(r3612)
@@ -221,7 +221,6 @@
 true value user-mode?

fload ${BP}/ofw/gui/loadmenu.fth
-\ fload ${BP}/ofw/gui/insticon.fth

\ Marvell MMP low-level stuff
 fload ${BP}/cpu/arm/mmp2/pmua.fth

Modified: cpu/arm/olpc/suspend.fth
==============================================================================
--- cpu/arm/olpc/suspend.fth	Fri Mar 15 07:30:04 2013	(r3611)
+++ cpu/arm/olpc/suspend.fth	Fri Mar 15 07:39:11 2013	(r3612)
@@ -132,7 +132,7 @@
 0 value sleep-mask
 : screen-sleep
    sleep-mask 1 and  if            \ DCON power down
-      dcon-screen-freeze
+      dcon-video-save
    else
       " dcon-suspend" $call-dcon
       " sleep" $call-screen
@@ -157,7 +157,7 @@
    sleep-mask 2 and  0=  if  keyboard-power-on   then 
    " clr-ack" $call-ec
    sleep-mask 1 and  if            \ DCON power up
-      dcon-screen-unfreeze
+      dcon-video-restore
    else
       " wake" $call-screen
       " dcon-resume" $call-dcon

Modified: cpu/x86/pc/olpc/disptest.fth
==============================================================================
--- cpu/x86/pc/olpc/disptest.fth	Fri Mar 15 07:30:04 2013	(r3611)
+++ cpu/x86/pc/olpc/disptest.fth	Fri Mar 15 07:39:11 2013	(r3612)
@@ -173,9 +173,9 @@
 ;
 : wait  ( -- )
    hold-time
-   [ifdef] dcon-screen-freeze  dcon-screen-freeze  [then]
+   dcon-video-save
    hold-time
-   [ifdef] dcon-screen-unfreeze  dcon-screen-unfreeze  [then]
+   dcon-video-restore
    hold-time2
 ;

Modified: cpu/x86/pc/olpc/fw.bth
==============================================================================
--- cpu/x86/pc/olpc/fw.bth	Fri Mar 15 07:30:04 2013	(r3611)
+++ cpu/x86/pc/olpc/fw.bth	Fri Mar 15 07:39:11 2013	(r3612)
@@ -314,8 +314,6 @@
 fload ${BP}/cpu/x86/pc/olpc/testitems.fth

false value smt-test?  false value final-test?
-fload ${BP}/cpu/x86/pc/olpc/disptest.fth
-\ fload ${BP}/ofw/gui/insticon.fth

: setup-for-linux  ( -- )
    [ ' linux-hook behavior compile, ]    \ Chain to old behavior
@@ -346,6 +344,7 @@
 fload ${BP}/cpu/x86/pc/olpc/help.fth
 fload ${BP}/cpu/x86/pc/olpc/gui.fth
 fload ${BP}/cpu/x86/pc/olpc/suspend.fth      \ Suspend/resume setup
+fload ${BP}/cpu/x86/pc/olpc/disptest.fth
 dev /keyboard
 fload ${BP}/dev/olpc/keyboard/selftest.fth   \ Keyboard diagnostic
 device-end

Modified: cpu/x86/pc/olpc/gui.fth
==============================================================================
--- cpu/x86/pc/olpc/gui.fth	Fri Mar 15 07:30:04 2013	(r3611)
+++ cpu/x86/pc/olpc/gui.fth	Fri Mar 15 07:39:11 2013	(r3612)
@@ -359,8 +359,8 @@
 : dcon-freeze    ( -- )  " dcon-freeze"   $call-dcon  ;
 : dcon-unfreeze  ( -- )  " dcon-unfreeze" $call-dcon  ;
 : wait-output    ( -- )  " wait-output"   $call-dcon  ;
-: dcon-screen-freeze    ( -- )  " screen-freeze"   $call-dcon  ;
-: dcon-screen-unfreeze  ( -- )  " screen-unfreeze" $call-dcon  ;
+: dcon-video-save     ( -- )  " video-save"    $call-dcon  ;
+: dcon-video-restore  ( -- )  " video-restore" $call-dcon  ;

\ === Stuff moved from security.fth ===

Modified: dev/olpc/dcon/mmp2dcon.fth
==============================================================================
--- dev/olpc/dcon/mmp2dcon.fth	Fri Mar 15 07:30:04 2013	(r3611)
+++ dev/olpc/dcon/mmp2dcon.fth	Fri Mar 15 07:39:11 2013	(r3612)
@@ -164,12 +164,12 @@
 : dcon-freeze  ( -- )  0 set-source  ;
 : dcon-unfreeze  ( -- )  1 set-source  ;

-: screen-freeze  ( -- )
+: video-save  ( -- )
    dcon-freeze
    " sleep" $call-screen
 ;

-: screen-unfreeze ( -- )
+: video-restore  ( -- )
    wait-output                  \ Wait for the DCON to reach the scan line
    " wake" $call-screen         \ Enable video signal from SoC
    d# 42 ms                     \ Synchronisation delay determined empirically
@@ -311,9 +311,9 @@
    invisible
    " gvsr" $call-screen
    begin
-      " screen-freeze" $call-dcon
+      " video-save" $call-dcon
       d# 25 ms
-      " screen-unfreeze" $call-dcon
+      " video-restore" $call-dcon
       key?
    until  key drop
    visible