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

[svn at openbios.org]

Author: wmb
Date: 2008-01-06 00:43:26 +0100 (Sun, 06 Jan 2008)
New Revision: 771

Modified:
   cpu/x86/pc/olpc/fw.bth
Log:
OLPC security - Guard some game-key functions against unexpected aborts,
just in case.


Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth	2008-01-05 23:41:28 UTC (rev 770)
+++ cpu/x86/pc/olpc/fw.bth	2008-01-05 23:43:26 UTC (rev 771)
@@ -512,19 +512,26 @@
 : ?games  ( -- )
    rocker-right game-key?  if
       ec-indexed-io-off
-      time&date 5drop 1 and  if  pong  else  life-demo  then
+      time&date 5drop 1 and  if
+         ['] pong guarded
+      else
+         ['] life-demo guarded
+      then
+      power-off
    then
 ;
 : ?diags  ( -- )
    rocker-left game-key?  if
       ec-indexed-io-off
-      text-on  " test-all" eval
+      text-on  " test-all" ['] eval guarded
       ." Tests complete - powering off" cr  d# 5000 ms  power-off
    then
 ;
 
 : ?scan-nand  ( -- )
-   rocker-up game-key?  if  ec-indexed-io-off  text-on  scan-nand   then
+   rocker-up game-key?  if
+      ec-indexed-io-off  text-on  ['] scan-nand guarded
+   then
 ;
 : ?fs-update  ( -- )
    button-check button-x or  button-o or  button-square or   ( mask )