Changeset 3194

Timestamp:

Aug 17, 2012 7:27:24 PM (9 months ago)

Author:

wmb

Message:

OLPC - made a new word $call-dcon to break the assumption that the DCON driver is part of the screen node. It is implemented differently on different platforms, depending on the actual location of the DCON driver. For old platforms, it's equivalent to $call-screen .

Location:

cpu

Files:

• arm/mmp2/dramrecal.fth (modified) (2 diffs)
• arm/olpc/build-fw.fth (modified) (3 diffs)
• x86/pc/olpc/fw.bth (modified) (1 diff)
• x86/pc/olpc/gui.fth (modified) (2 diffs)
• x86/pc/olpc/via/fw.bth (modified) (1 diff)

cpu/arm/mmp2/dramrecal.fth

@@ -768 +768 @@
       dcon-freeze
    else
-      " dcon-suspend" $call-screen
+      " dcon-suspend" $call-dcon
    then
    " sleep" $call-screen
@@ -794 +794 @@
       dcon-unfreeze
    else
-      " dcon-resume" $call-screen
+      " dcon-resume" $call-dcon
    then
 ;

cpu/arm/olpc/build-fw.fth

@@ -42 +42 @@
 : install-abort  ( -- )  ['] poll-tty d# 100 alarm  ;
 
+0 value dcon-ih
+: $call-dcon  ( ... -- ... )   dcon-ih $call-method  ;
+
 0 value keyboard-ih
 
@@ -172 +175 @@
 
 : olpc-reset-all  ( -- )
-   " screen" " dcon-off" ['] execute-device-method catch if
-      2drop 2drop
-   then
+   " dcon-off" $call-dcon
    ec-power-cycle
    begin  wfi  again
@@ -511 +512 @@
 
 : console-start  ( -- )
+   " /dcon" open-dev to dcon-ih
    install-mux-io
    cursor-off

cpu/x86/pc/olpc/fw.bth

@@ -305 +305 @@
    time&date .date space .time  ."  UTC" cr
 ;
+
+\ The DCON methods are in the screen node on this system
+: $call-dcon  ( ... -- ... )   screen-ih $call-method  ;
 
 fload ${BP}/cpu/x86/pc/olpc/banner.fth

cpu/x86/pc/olpc/gui.fth

@@ -356 +356 @@
 ;
 
-: frozen?  ( -- flag )  " vga?" $call-screen 0=  ;
-: dcon-freeze    ( -- )  0 " set-source" $call-screen d# 30 ms  ;
-: dcon-unfreeze  ( -- )  1 " set-source" $call-screen d# 30 ms  ;
+: frozen?  ( -- flag )  " vga?" $call-dcon 0=  ;
+: dcon-freeze    ( -- )  0 " set-source" $call-dcon d# 30 ms  ;
+: dcon-unfreeze  ( -- )  1 " set-source" $call-dcon d# 30 ms  ;
 
 \ === Stuff moved from security.fth ===
@@ -381 +381 @@
    background-rgb  rgb>565  progress-xy ?adjust d# 500 d# 100  " fill-rectangle" $call-screen
    d# 588 d# 638 set-icon-xy  " bigdot" show-icon
-   " vga?" $call-screen  0=  if  dcon-unfreeze dcon-freeze  then
+   frozen?  if  dcon-unfreeze dcon-freeze  then
 ;
 

cpu/x86/pc/olpc/via/fw.bth

@@ -359 +359 @@
 
 fload ${BP}/cpu/x86/pc/olpc/setwp.fth
+
+\ The DCON methods are in the screen node on this system
+: $call-dcon  ( ... -- ... )   screen-ih $call-method  ;
 
 fload ${BP}/cpu/x86/pc/olpc/via/help.fth     \ Help for common user tasks