[openfirmware] r1091 - cpu/x86/pc/olpc

Author: wmb
Date: 2009-01-28 23:55:52 +0100 (Wed, 28 Jan 2009)
New Revision: 1091

Modified:
   cpu/x86/pc/olpc/fw.bth
   cpu/x86/pc/olpc/gui.fth
   cpu/x86/pc/olpc/security.fth
Log:
OLPC - fixed bugs in new pretty boot default.

Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth	2009-01-28 19:06:46 UTC (rev 1090)
+++ cpu/x86/pc/olpc/fw.bth	2009-01-28 22:55:52 UTC (rev 1091)
@@ -619,7 +619,9 @@
    ?usb-keyboard
    auto-boot

-   unfreeze visible
+   frozen?            ( frozen? )
+   unfreeze visible   ( frozen? )
+   if  banner  then  \ Reissue banner if it was suppressed

blue-letters ." Type 'help' for more information." black-letters
    cr cr

Modified: cpu/x86/pc/olpc/gui.fth
===================================================================
--- cpu/x86/pc/olpc/gui.fth	2009-01-28 19:06:46 UTC (rev 1090)
+++ cpu/x86/pc/olpc/gui.fth	2009-01-28 22:55:52 UTC (rev 1091)
@@ -390,6 +390,7 @@
 ;
 ' (?show-device) to ?show-device

+: 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  ;

@@ -439,10 +440,10 @@
 ;

: show-dev-icon  ( devname$ -- )
-   next-icon-xy                               ( devname$ )
-   2dup to icon-xy                            ( devname$ )
-   2dup image-width 0 d+  to next-icon-xy     ( devname$ )
-   2dup  d# 5 d# 77 d+  to next-dot-xy        ( devname$ )
+   next-icon-xy                               ( devname$ x y )
+   2dup to icon-xy                            ( devname$ x y )
+   2dup image-width 0 d+  to next-icon-xy     ( devname$ x y )
+   d# 5 d# 77 d+  to next-dot-xy              ( devname$ )
    show-icon                                  ( )
 ;

Modified: cpu/x86/pc/olpc/security.fth
===================================================================
--- cpu/x86/pc/olpc/security.fth	2009-01-28 19:06:46 UTC (rev 1090)
+++ cpu/x86/pc/olpc/security.fth	2009-01-28 22:55:52 UTC (rev 1091)
@@ -4,7 +4,9 @@
 \ Specs at http://wiki.laptop.org/go/Firmware_Security

: ?unfreeze  ( -- )
-   game-key@ button-check and  if  visible banner  unfreeze  then
+   game-key@ button-check and  if
+     frozen?  if  unfreeze  visible banner  then
+   then
 ;

true value debug-security?
@@ -37,8 +39,8 @@
       ." Use power button to power off" cr
       begin halt again
    else
-      ." Powering off in 10 seconds" cr
-      d# 10000 ms  power-off
+      ." Powering off in 30 seconds" cr
+      d# 30000 ms  power-off
    then
 ;

@@ -873,7 +875,6 @@
          has-developer-key?  if             ( list$ )
             2drop                           ( )
             true to security-off?
-            visible unfreeze
             show-unlock
             true exit
          then                               ( list$ )