Changeset 2186

Timestamp:

Apr 13, 2011 11:37:18 PM (2 years ago)

Author:

wmb

Message:

OLPC fsupdate - changed the error checking to work correctly for .zd and .zsp files that write block 0 last.

File:

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

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

@@ -9 +9 @@
 ;
 
-0 value last-eblock#
-: erase-eblock  ( eblock# -- )
-   \ XXX
-   to last-eblock#
-;
+0 value #eblocks-written
 
 : ?all-written  ( -- )
-   last-eblock# 1+ #image-eblocks <>  if
+   #eblocks-written #image-eblocks <>  if
       cr
       red-letters
       ." WARNING: The file specified " #image-eblocks .d
-      ." chunks but wrote only " last-eblock# 1+ .d ." chunks" cr
+      ." chunks but wrote only " #eblocks-written .d ." chunks" cr
       black-letters
    then
@@ -27 +23 @@
 0 value secure-fsupdate?
 d# 128 constant /spec-maxline
-
-: erase-gap  ( end-block -- )
-   dup last-eblock# >  if
-      last-eblock# 1+  ?do  i erase-eblock  loop
-   else
-      drop
-   then
-;
 
 \ We simultaneously DMA one data buffer onto NAND while unpacking the
@@ -88 +76 @@
    " write-blocks-end" $call-nand   ( error? )
    " Write error" ?nand-abort
-\   #image-eblocks erase-gap
    hdd-led-off
    release-inflater
@@ -112 +99 @@
 
 : erase-all  ( -- )
-   #image-eblocks  0  ?do  i erase-eblock  loop
    #image-eblocks show-writing
 ;
@@ -215 +201 @@
 \  then
 
-   dup to last-eblock#                   ( eblock# )
-   show-written                          ( )
+   show-written                             ( )
+   #eblocks-written 1+ to #eblocks-written  ( )
    show-temperature
    hdd-led-toggle