[OpenBIOS] r732 - cpu/x86/pc/olpc

[svn at openbios.org]

Author: wmb
Date: 2007-11-16 22:48:09 +0100 (Fri, 16 Nov 2007)
New Revision: 732

Modified:
   cpu/x86/pc/olpc/fw.bth
   cpu/x86/pc/olpc/nandstat.fth
Log:
OLPC trac 4980 - fixed scan-nand display formatting glitches, and
added rocker-up to invoke scan-nand in secure mode.


Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth	2007-11-15 02:48:56 UTC (rev 731)
+++ cpu/x86/pc/olpc/fw.bth	2007-11-16 21:48:09 UTC (rev 732)
@@ -520,6 +520,9 @@
       ." Tests complete - powering off" cr  d# 5000 ms  power-off
    then
 ;
+: ?scan-nand  ( -- )
+   rocker-up game-key?  if  text-on  scan-nand   then
+;
 : ?fs-update  ( -- )
    button-check button-x or  button-o or  button-square or   ( mask )
    game-key-mask over and  =  if
@@ -562,6 +565,7 @@
    ['] false to interrupt-auto-boot?
    probe-usb
    interpreter-init
+   ?scan-nand
    ?diags
    ?fs-update
    secure-startup

Modified: cpu/x86/pc/olpc/nandstat.fth
===================================================================
--- cpu/x86/pc/olpc/nandstat.fth	2007-11-15 02:48:56 UTC (rev 731)
+++ cpu/x86/pc/olpc/nandstat.fth	2007-11-16 21:48:09 UTC (rev 732)
@@ -197,7 +197,7 @@
    3dup  0 1 xy+  1 grid-h do-fill            ( color x y )
    1 grid-h xy+  grid-w 1  do-fill
 ;
-: lowlight  ( block# -- )  h# ffff cell-border  ;
+: lowlight  ( block# -- )  h# c0 h# c0 h# c0 rgb>565 cell-border  ;
 : highlight  ( block# -- )  0 cell-border  ;
 : +block  ( offset -- )
    current-block +   nand-block-limit mod  ( new-block )
@@ -223,7 +223,7 @@
 ;
 
 : examine-nand  ( -- )
-   0 status-line 1+ at-xy  ." Arrows, fn Arrows to move, Esc to exit" cr
+   0 status-line 1- at-xy  red-letters ." Arrows, fn Arrows to move, Esc to exit" black-letters cr
    0 to current-block
    current-block highlight
    false to examine-done?
@@ -231,7 +231,6 @@
    current-block lowlight
 ;
 
-
 : scan-nand  ( -- )
    open-nand
    nand-map 0=  if