Changeset 3612


Ignore:
Timestamp:
Mar 15, 2013, 7:39:11 AM (2 years ago)
Author:
quozl
Message:

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.

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • cpu/arm/olpc/prefw.fth

    r3333 r3612  
    222222
    223223fload ${BP}/ofw/gui/loadmenu.fth
    224 \ fload ${BP}/ofw/gui/insticon.fth
    225224
    226225\ Marvell MMP low-level stuff
  • cpu/arm/olpc/suspend.fth

    r3514 r3612  
    133133: screen-sleep
    134134   sleep-mask 1 and  if            \ DCON power down
    135       dcon-screen-freeze
     135      dcon-video-save
    136136   else
    137137      " dcon-suspend" $call-dcon
     
    158158   " clr-ack" $call-ec
    159159   sleep-mask 1 and  if            \ DCON power up
    160       dcon-screen-unfreeze
     160      dcon-video-restore
    161161   else
    162162      " wake" $call-screen
  • cpu/x86/pc/olpc/disptest.fth

    r3554 r3612  
    174174: wait  ( -- )
    175175   hold-time
    176    [ifdef] dcon-screen-freeze  dcon-screen-freeze  [then]
     176   dcon-video-save
    177177   hold-time
    178    [ifdef] dcon-screen-unfreeze  dcon-screen-unfreeze  [then]
     178   dcon-video-restore
    179179   hold-time2
    180180;
  • cpu/x86/pc/olpc/fw.bth

    r3575 r3612  
    315315
    316316false value smt-test?  false value final-test?
    317 fload ${BP}/cpu/x86/pc/olpc/disptest.fth
    318 \ fload ${BP}/ofw/gui/insticon.fth
    319317
    320318: setup-for-linux  ( -- )
     
    347345fload ${BP}/cpu/x86/pc/olpc/gui.fth
    348346fload ${BP}/cpu/x86/pc/olpc/suspend.fth      \ Suspend/resume setup
     347fload ${BP}/cpu/x86/pc/olpc/disptest.fth
    349348dev /keyboard
    350349fload ${BP}/dev/olpc/keyboard/selftest.fth   \ Keyboard diagnostic
  • cpu/x86/pc/olpc/gui.fth

    r3514 r3612  
    360360: dcon-unfreeze  ( -- )  " dcon-unfreeze" $call-dcon  ;
    361361: wait-output    ( -- )  " wait-output"   $call-dcon  ;
    362 : dcon-screen-freeze    ( -- )  " screen-freeze"   $call-dcon  ;
    363 : dcon-screen-unfreeze  ( -- )  " screen-unfreeze" $call-dcon  ;
     362: dcon-video-save     ( -- )  " video-save"    $call-dcon  ;
     363: dcon-video-restore  ( -- )  " video-restore" $call-dcon  ;
    364364
    365365\ === Stuff moved from security.fth ===
  • dev/olpc/dcon/mmp2dcon.fth

    r3543 r3612  
    165165: dcon-unfreeze  ( -- )  1 set-source  ;
    166166
    167 : screen-freeze  ( -- )
     167: video-save  ( -- )
    168168   dcon-freeze
    169169   " sleep" $call-screen
    170170;
    171171
    172 : screen-unfreeze ( -- )
     172: video-restore ( -- )
    173173   wait-output                  \ Wait for the DCON to reach the scan line
    174174   " wake" $call-screen         \ Enable video signal from SoC
     
    312312   " gvsr" $call-screen
    313313   begin
    314       " screen-freeze" $call-dcon
     314      " video-save" $call-dcon
    315315      d# 25 ms
    316       " screen-unfreeze" $call-dcon
     316      " video-restore" $call-dcon
    317317      key?
    318318   until  key drop
Note: See TracChangeset for help on using the changeset viewer.