r554 - cpu/x86/pc/olpc dev/olpc/cafenand

Author: wmb
Date: 2007-08-16 22:58:17 +0200 (Thu, 16 Aug 2007)
New Revision: 554

Modified:
   cpu/x86/pc/olpc/nandstat.fth
   dev/olpc/cafenand/badblock.fth
Log:
Graphical copy-nand - fixed some stack bugs in the support routines.

Modified: cpu/x86/pc/olpc/nandstat.fth
===================================================================
--- cpu/x86/pc/olpc/nandstat.fth	2007-08-16 20:53:50 UTC (rev 553)
+++ cpu/x86/pc/olpc/nandstat.fth	2007-08-16 20:58:17 UTC (rev 554)
@@ -50,14 +50,14 @@
    h# ff h# ff 0 rgb>565   ( #eblocks color )
    0  rot 0  ?do           ( color eblock# )
       dup nand-pages/block * " block-bad?" $call-nand  0=  if  ( color eblock# )
-         2dup swap show-state
-         1
-      else
-         0
-      then
-      swap 1+ swap
-   +loop
-   drop
+         2dup swap show-state  ( color eblock# )
+         1                     ( color eblock# increment )
+      else                     ( color eblock# )
+         0                     ( color eblock# increment )
+      then                     ( color eblock# increment )
+      swap 1+ swap             ( color eblock#' increment )
+   +loop                       ( color eblock#' )
+   2drop
 ;

: gshow-written  ( eblock# -- )  0 h# ff 0 rgb>565  show-state  ;

Modified: dev/olpc/cafenand/badblock.fth
===================================================================
--- dev/olpc/cafenand/badblock.fth	2007-08-16 20:53:50 UTC (rev 553)
+++ dev/olpc/cafenand/badblock.fth	2007-08-16 20:58:17 UTC (rev 554)
@@ -307,8 +307,8 @@
             i pages/eblock / over execute
             i erase-block
          then
-      pages/eblock +loop
-      exit
+      pages/eblock +loop                ( 'show-bad 'show-erased )
+      2drop  exit
    then                                 ( 'show-bad 'show-erased )
    \ If there is no existing bad block table, make one from factory info
    make-bbt