Changeset 2999

Timestamp:

Jun 4, 2012 10:53:17 AM (12 months ago)

Author:

quozl

Message:

OLPC - keep menu active and display results after all tests completed. #11847

File:

• cpu/x86/pc/olpc/via/mfgtest.fth (modified) (5 diffs)

cpu/x86/pc/olpc/via/mfgtest.fth

@@ -50 +50 @@
 ;
 
-: mfg-test-result  ( error? -- )
+: mfg-test-result  ( return-code true | false -- )
    if               ( return-code )
       ?dup  if                                         ( return-code )
@@ -78 +78 @@
    flush-keyboard
 ;
-: (mfg-test-dev)  ( $ -- error? )
+: (mfg-test-dev)  ( $ -- return-code true | false )
    2dup locate-device  if                         ( $ )
       ." Can't find device node " type cr  exit   ( -- )
@@ -84 +84 @@
       drop                                        ( $ )
    then                                           ( $ )
-   " selftest" execute-device-method              ( error? )
+   " selftest" execute-device-method              ( return-code true | false )
 ;
 : mfg-test-dev  ( $ -- )
    scroller-on
    ??cr  ." Testing " 2dup type cr                ( $ )
-   (mfg-test-dev)
+   (mfg-test-dev)                                 ( return-code true | false )
    mfg-test-result
 ;
 : gfx-test-dev  ( $ -- )
-   (mfg-test-dev)
-   scroller-on
+   (mfg-test-dev)                                 ( return-code true | false )
+   scroller-on                                    ( return-code true | false )
    mfg-test-result
-;
-
-: overall  ( -- )
-   restore-scroller-bg
-   clear-screen
-   overall-fail?  if
-      ." Some tests failed." cr cr cr
-      red-screen
-   else
-      ." All automatic tests passed successfully." cr cr cr
-      green-screen
-   then
-   wait-return
-   cursor-off  scroller-off  gui-alerts  refresh
-   flush-keyboard
 ;
 
@@ -159 +144 @@
       stop?  if unloop exit  then
    loop
-   0 3 rc>sq set-current-sq \ quit-item
-   overall
+   overall-fail?  if
+      0 1  \ play-item
+   else
+      0 3  \ quit-item
+   then
+   set-default-selection
+   refresh
 ;
 
@@ -232 +222 @@
    stop?  if  menu-interact exit  then
    quit?  if  exit  then
-   0 3 rc>sq set-current-sq \ quit-item
-   pause-to-interact
+   menu-interact
 ;