Changeset 2869

Timestamp:

Feb 20, 2012 8:21:56 AM (15 months ago)

Author:

quozl

Message:

OLPC fs-verify - split for use by factory scripts, trim some comments

File:

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

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

@@ -8 +8 @@
    get-hex# to #image-eblocks
    open-nand
-   \   #image-eblocks  show-init
    /nand-block /nand-page / to nand-pages/block
 ;
 
 : zblocks-end:  ( -- )
-   \ XXX could check that everything else is erased ...
 ;
 
@@ -23 +21 @@
 
 : erase-all  ( -- )
-   \ XXX probably should set a flag saying that unspecified blocks are expected to be ff
 ;
 
-\ We simultaneously DMA one data buffer onto NAND while unpacking the
-\ next block of data into another. The buffers exchange roles after
-\ each block.
 load-base value data-buffer
 
@@ -49 +43 @@
    safe-parse-word hex-decode            ( eblock# hashname$ [ hash$ ] err? )
    " Malformed hash string" ?nand-abort  ( eblock# hashname$ hash$ )
-                                        
+
    verify-hash                           ( eblock# okay? )
-\   if  show-written  else  show-bad  then   ( )
    swap .d  if  (cr  else  cr  then
 ;
@@ -57 +50 @@
 previous definitions
 
-: fs-verify  ( "devspec" -- )
-   load-crypto  abort" Can't load hash routines"
+: $fs-verify  ( file$ -- )
+   load-crypto  abort" Can't load hash routines"  ( file$ )
 
-   false to secure-fsupdate?
-   safe-parse-word r/o open-file       ( fd )
-   abort" Can't open file"             ( fd )
+   false to secure-fsupdate?                      ( file$ )
+   r/o open-file  abort" Can't open file"         ( fd )
 
-   file @                              ( fd fd' )
-   over file !  linefeed line-delimiter c!  ( fd fd' )
-   file !                              ( fd )
+   file @                                         ( fd fd' )
+   over file !  linefeed line-delimiter c!        ( fd fd' )
+   file !                                         ( fd )
 
    t-hms(
-   also fs-verify-commands   
-   ['] include-file catch  ?dup  if    ( x error )
+   also fs-verify-commands
+   ['] include-file catch  ?dup  if               ( x error )
       nip .error
    then
@@ -78 +70 @@
    )t-hms
 ;
+
+: fs-verify  ( "devspec" -- )
+   safe-parse-word $fs-verify
+;
+
 [then]