openfirmware

openfirmware@openfirmware.info

3007 discussions

r1618 - cpu/x86/pc/olpc/via dev/mmc/sdhci
by svn＠openfirmware.info 16 Dec '09

16 Dec '09

Author: wmb Date: 2009-12-16 01:42:29 +0100 (Wed, 16 Dec 2009) New Revision: 1618 Modified: cpu/x86/pc/olpc/via/fsupdate.fth dev/mmc/sdhci/sdhci.fth dev/mmc/sdhci/sdmmc.fth Log: Fsupdate - check for output device too small for image and for zblocks line mismatch. Modified: cpu/x86/pc/olpc/via/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth 2009-12-15 23:32:49 UTC (rev 1617) +++ cpu/x86/pc/olpc/via/fsupdate.fth 2009-12-16 00:42:29 UTC (rev 1618) @@ -51,13 +51,26 @@ file ! ( ) ; +: ?compare-spec-line ( -- ) + secure-fsupdate? if + data-buffer /spec-maxline filefd read-line ( len end? error? ) + " Spec line read error" ?nand-abort ( len end? ) + 0= " Spec line too long" ?nand-abort ( len ) + data-buffer swap ( adr len ) + source $= 0= " Spec line mismatch" ?nand-abort ( ) + then +; + vocabulary nand-commands also nand-commands definitions : zblocks: ( "eblock-size" "#eblocks" ... -- ) + ?compare-spec-line get-hex# to /nand-block get-hex# to #image-eblocks open-nand + " size" $call-nand #image-eblocks /nand-block um* d< + " Image size is larger than output device" ?nand-abort #image-eblocks show-init get-inflater \ Separate the two buffers by enough space for both the compressed @@ -71,8 +84,9 @@ : zblocks-end: ( -- ) \ Asynchronous writes - " write-blocks-finish" $call-nand drop - #image-eblocks erase-gap + " write-blocks-end" $call-nand ( error? ) + " Write error" ?nand-abort +\ #image-eblocks erase-gap ; : data: ( "filename" -- ) @@ -83,11 +97,6 @@ true " " ?nand-abort then to filefd linefeed filefd force-line-delimiter - \ Eat the initial "zblocks:" line - load-base /spec-maxline filefd read-line ( len not-eof? error? ) - " Read error on .zd file" ?nand-abort ( len not-eof? ) - 0= " Premature EOF on .zd file" ?nand-abort ( len ) - drop ( ) true to secure-fsupdate? ; @@ -97,17 +106,9 @@ ; : get-zdata ( comprlen -- ) - secure-fsupdate? if - data-buffer /spec-maxline filefd read-line ( len end? error? ) - " Spec line read error" ?nand-abort ( len end? ) - 0= " Spec line too long" ?nand-abort ( len ) - data-buffer swap ( adr len ) - source $= 0= " Spec line mismatch" ?nand-abort ( ) + ?compare-spec-line - filefd ( ih ) - else ( ) - source-id ( ih ) - then ( ih ) + secure-fsupdate? if filefd else source-id then ( ih ) >r data-buffer /nand-block + over r@ fgets ( comprlen #read r: ih ) <> " Short read of zdata file" ?nand-abort ( r: ih ) @@ -178,7 +179,8 @@ ( eblock# ) \ Asynchronous writes - data-buffer over nand-pages/block * nand-pages/block " write-blocks-start" $call-nand ( eblock# ) + data-buffer over nand-pages/block * nand-pages/block " write-blocks-start" $call-nand ( eblock# error? ) + " Write error" ?nand-abort ( eblock# ) \ data-buffer over nand-pages/block * nand-pages/block " write-blocks" $call-nand ( eblock# #written ) \ nand-pages/block <> " Write error" ?nand-abort ( eblock# ) swap-buffers ( eblock# ) Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2009-12-15 23:32:49 UTC (rev 1617) +++ dev/mmc/sdhci/sdhci.fth 2009-12-16 00:42:29 UTC (rev 1618) @@ -691,9 +691,29 @@ 0 instance value writing? +: .card-error ( value -- ) + dup h# 8000.0000 and if ." Address out of range (past end?)" cr then + dup h# 4000.0000 and if ." Misaligned address" cr then + dup h# 2000.0000 and if ." Block length error" cr then + dup h# 1000.0000 and if ." Erase sequence error" cr then + dup h# 0800.0000 and if ." Invalid erase block error" cr then + dup h# 0400.0000 and if ." Write protect violation" cr then +\ dup h# 0200.0000 and if ." Card is locked" cr then \ Status, not error + dup h# 0100.0000 and if ." Lock/Unlock failed" cr then + dup h# 0080.0000 and if ." Command CRC error" cr then + dup h# 0040.0000 and if ." Illegal command " cr then + dup h# 0020.0000 and if ." Card ECC failed" cr then + dup h# 0010.0000 and if ." Card controller error" cr then + dup h# 0008.0000 and if ." General error" cr then + dup h# 0001.0000 and if ." CIS/CSD overwrite" cr then + dup h# 0000.8000 and if ." Write-protected blocks skipped" cr then + dup h# 0000.0008 and if ." Authentication sequence error" cr then + drop +; + \ This is the correct way to wait for programming complete. -: wait-write-done ( -- ) - writing? 0= if exit then ( limit ) +: wait-write-done ( -- error? ) + writing? 0= if false exit then ( limit ) get-msecs d# 1000 + ( limit ) begin get-status dup 9 rshift h# f and 7 = while ( limit status ) @@ -704,11 +724,13 @@ then repeat ( limit status ) nip ( status ) - dup h# fff9.8008 and if ( status ) - cr ." SD Error - status = " . cr - noop + dup h# fdf9.8008 and if ( status ) + cr ." SD Error - status = " dup . cr + .card-error + true else drop + false then false to writing? @@ -806,7 +828,7 @@ : detach-card ( -- ) wait-dma-done - intstat-on wait-write-done intstat-off + intstat-on wait-write-done drop intstat-off card-clock-off card-power-off \ unmap-regs @@ -843,28 +865,34 @@ : detach-sdio-card ( -- ) ; +: r/w-blocks-end ( -- error? ) + wait-dma-done + intstat-on wait-write-done intstat-off +; + : r/w-blocks-finish ( -- actual ) wait-dma-done dma-len /block / ; -: r/w-blocks-start ( addr block# #blocks in? -- ) +: r/w-blocks-start ( addr block# #blocks in? -- error? ) wait-dma-done - over 0= if 2drop 2drop 0 exit then \ Prevents hangs + over 0= if 2drop 2drop false exit then \ Prevents hangs intstat-on >r ( addr block# #blocks r: in? ) rot dma-setup ( block# r: in? ) - wait-write-done + wait-write-done if true exit then address-shift lshift r> if read-multiple else write-multiple true to writing? then true to dma? + false ; : r/w-blocks ( addr block# #blocks in? -- actual ) - r/w-blocks-start r/w-blocks-finish + r/w-blocks-start if -1 exit then r/w-blocks-finish ; : r/w-ioblocks ( reg# function# inc? addr len blksz in? -- actual ) @@ -874,7 +902,7 @@ 2dup tuck 1- + swap / to io-#blocks ( reg# function# inc? addr len blksz r: in? ) 4 pick write-blksz ( reg# function# inc? addr len r: in? ) iodma-setup ( reg# function# inc? r: in? ) - wait-write-done + wait-write-done if -1 exit then r> if ( reg# function# inc? ) io-read-blocks else Modified: dev/mmc/sdhci/sdmmc.fth =================================================================== --- dev/mmc/sdhci/sdmmc.fth 2009-12-15 23:32:49 UTC (rev 1617) +++ dev/mmc/sdhci/sdmmc.fth 2009-12-16 00:42:29 UTC (rev 1618) @@ -34,11 +34,11 @@ \ Asynchronous write. Completes on the next call to \ write-blocks-start, write-blocks-finish, or close. \ (Don't do other read/write operations in between.) -: write-blocks-start ( adr block# #blocks -- ) +: write-blocks-start ( adr block# #blocks -- error? ) false " r/w-blocks-start" $call-parent ; -: write-blocks-finish ( -- #written ) - false " r/w-blocks-finish" $call-parent +: write-blocks-end ( -- error? ) + false " r/w-blocks-end" $call-parent ; : dma-alloc ( size -- vadr ) " dma-alloc" $call-parent ;

1 0

r1617 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 15 Dec '09

15 Dec '09

Author: wmb Date: 2009-12-16 00:32:49 +0100 (Wed, 16 Dec 2009) New Revision: 1617 Modified: cpu/x86/pc/olpc/via/runin.fth Log: Via manufacturing tests - further eliminated the second call to NTP during .clocks. Modified: cpu/x86/pc/olpc/via/runin.fth =================================================================== --- cpu/x86/pc/olpc/via/runin.fth 2009-12-15 22:33:41 UTC (rev 1616) +++ cpu/x86/pc/olpc/via/runin.fth 2009-12-15 23:32:49 UTC (rev 1617) @@ -183,18 +183,20 @@ ; d# 4 constant rtc-threshold +0 value ntp-seconds +0 value rtc-seconds : .clocks ( -- ) - ntp>time&date time&date - ." RTC: " .date space .time cr ." NTP: " .date space .time cr + ." RTC: " rtc-seconds unix-seconds> .date space .time ." UTC" cr + ." NTP: " ntp-seconds unix-seconds> .date space .time ." UTC" cr ; : verify-rtc-date ( -- ) \ XXX check RTC power lost bit ." Getting time from NTP server .. " begin ntp-timestamp while ." Retry " repeat ( d.timestamp ) - ntp>time&date >unix-seconds ( ntp-seconds ) - time&date >unix-seconds ( ntp-seconds rtc-seconds ) - - ( lost-seconds ) + ntp>time&date >unix-seconds to ntp-seconds + time&date >unix-seconds to rtc-seconds + ntp-seconds rtc-seconds - ( lost-seconds ) dup rtc-threshold > if ( lost-seconds ) page show-fail ( lost-seconds ) ." Clock lost " .d ." seconds since SMT" cr ( )

1 0

r1616 - ofw/inet
by svn＠openfirmware.info 15 Dec '09

15 Dec '09

Author: wmb Date: 2009-12-15 23:33:41 +0100 (Tue, 15 Dec 2009) New Revision: 1616 Modified: ofw/inet/sntp.fth Log: SNTP - added data format commentary to the source code. Modified: ofw/inet/sntp.fth =================================================================== --- ofw/inet/sntp.fth 2009-12-15 22:33:07 UTC (rev 1615) +++ ofw/inet/sntp.fth 2009-12-15 22:33:41 UTC (rev 1616) @@ -7,12 +7,42 @@ d# 123 constant ntp-port# h# 30 constant /sntp-request +\ Data format: +\ 00: LLvvvmmm.TTTTTTTT.pppppppp.PPPPPPPP +\ 04: Estimated Error +\ 08: Estimated Drift Rate +\ 0c: Reference Clock Identifier +\ 10: Reference Timestamp (64-bits) +\ 18: Originate Timestamp (64-bits) +\ 20: Receive Timestamp (64-bits) +\ 28: Transmit Timestamp (64-bits) +\ +\ LL is Leap Indicator +\ 00 normal +\ 01 +1 leap second at end of month +\ 10 -1 leap second at end of month +\ 11 reserved +\ vvv is version number +\ mmm is mode +\ TTTTTTTT is Reference Clock Type +\ 0 means stop asking me +\ 1 means primary reference (e.g. radio clock) +\ 2 means secondary reference using NTP +\ 3 means secondary reference using some other protocol +\ 4 means wristwatch +\ pppppppp is Poll +\ PPPPPPPP is precision - signed integer exponent of 2 + + : send-sntp-request ( -- ) /sntp-request " allocate-udp" $call-ip >r r@ /sntp-request erase 3 3 lshift \ SNTP version 3 3 or \ Client request r@ c! + \ The various SNTP RFCs say that the source port can be dynamically + \ assigned, but in my testing, servers only reply when port 123 + \ is both src and dst. r@ /sntp-request ntp-port# ntp-port# " send-udp-packet" $call-ip r> /sntp-request " free-udp" $call-ip ;

1 0

r1615 - ofw/inet
by svn＠openfirmware.info 15 Dec '09

15 Dec '09

Author: wmb Date: 2009-12-15 23:33:07 +0100 (Tue, 15 Dec 2009) New Revision: 1615 Modified: ofw/inet/ippkg.fth ofw/inet/netload.fth ofw/inet/tcp.fth Log: TCP - changed local port number assignment to use the IANA recommended range. Also added a local port number assignment method for UDP. Modified: ofw/inet/ippkg.fth =================================================================== --- ofw/inet/ippkg.fth 2009-12-15 22:28:30 UTC (rev 1614) +++ ofw/inet/ippkg.fth 2009-12-15 22:33:07 UTC (rev 1615) @@ -62,6 +62,7 @@ call-tftp: oc-checksum ( n adr len -- n' ) call-tftp: link-mtu ( -- n ) call-tftp: max-ip-payload ( -- n ) +call-tftp: alloc-udp-port ( -- port# ) finish-device device-end Modified: ofw/inet/netload.fth =================================================================== --- ofw/inet/netload.fth 2009-12-15 22:28:30 UTC (rev 1614) +++ ofw/inet/netload.fth 2009-12-15 22:33:07 UTC (rev 1615) @@ -374,7 +374,24 @@ use-nfs? if nfs-read else tftpread then ; +h# c123 value next-udp-local-port +true value first-time? +: ?init-udp-local-port ( -- ) + first-time? if +[ifdef] random-long + random-long h# 3fff and h# c000 + to next-udp-local-port +[then] + false to first-time? + then +; + headers +: alloc-udp-port ( -- port ) + next-udp-local-port 1+ ( port ) + \ Stay within the IANA-recommended dynamic port range + dup h# 10000 = if drop h# c000 then ( port' ) + dup to next-udp-local-port ( port ) +; : next-xid ( -- id ) rpc-xid 1+ dup to rpc-xid ; : allocate-packet ( len -- adr ) allocate-udp ; : free-packet ( len -- adr ) free-udp ; @@ -477,6 +494,7 @@ configure s-all my-self to obp-tftp-ih \ Publish so IP redirector can attach to us + ?init-udp-local-port true ; Modified: ofw/inet/tcp.fth =================================================================== --- ofw/inet/tcp.fth 2009-12-15 22:28:30 UTC (rev 1614) +++ ofw/inet/tcp.fth 2009-12-15 22:33:07 UTC (rev 1615) @@ -231,12 +231,13 @@ then ; -h# 555 value next-tcp-local-port +h# c999 value next-tcp-local-port -: alloc-next-tcp-local-port ( -- port ) - next-tcp-local-port 1+ ( port ) - h# ffff and h# 555 max ( port ) - dup to next-tcp-local-port ( port ) +: alloc-tcp-port ( -- port ) + next-tcp-local-port 1+ ( port ) + \ Stay within the IANA-recommended dynamic port range + dup h# 10000 = if drop h# c000 then ( port' ) + dup to next-tcp-local-port ( port ) ; \ send sequence variables @@ -2342,7 +2343,7 @@ first-time? if false to first-time? [ifdef] random-long - random-long h# f000 mod h# 555 + to next-tcp-local-port + random-long h# 3fff and h# c000 + to next-tcp-local-port [then] " next-xid" $call-parent to tcp_iss @@ -2355,7 +2356,7 @@ ['] protocol-tick d# 500 alarm - alloc-next-tcp-local-port to my-tcp-port + alloc-tcp-port to my-tcp-port true to alive? true

1 0

r1614 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 15 Dec '09

15 Dec '09

Author: wmb Date: 2009-12-15 23:28:30 +0100 (Tue, 15 Dec 2009) New Revision: 1614 Modified: cpu/x86/pc/olpc/via/runin.fth Log: Via manufacturing tests - Set MD tag from RTC not NTP, thus avoiding multiple NTP queries. Modified: cpu/x86/pc/olpc/via/runin.fth =================================================================== --- cpu/x86/pc/olpc/via/runin.fth 2009-12-15 16:01:37 UTC (rev 1613) +++ cpu/x86/pc/olpc/via/runin.fth 2009-12-15 22:28:30 UTC (rev 1614) @@ -161,7 +161,7 @@ pop-base ; : make-md-tag ( -- ) - ntp>time&date ( s m h d m y ) format-date " MD" put-ascii-tag + time&date ( s m h d m y ) format-date " MD" put-ascii-tag ; : inject-tags ( -- ) get-mfg-data

1 0

r1613 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 15 Dec '09

15 Dec '09

Author: wmb Date: 2009-12-15 17:01:37 +0100 (Tue, 15 Dec 2009) New Revision: 1613 Modified: cpu/x86/pc/olpc/via/runin.fth Log: Via manufacturing tests - fixed stack cleanup error in runin.fth:handle-tag Modified: cpu/x86/pc/olpc/via/runin.fth =================================================================== --- cpu/x86/pc/olpc/via/runin.fth 2009-12-15 08:53:07 UTC (rev 1612) +++ cpu/x86/pc/olpc/via/runin.fth 2009-12-15 16:01:37 UTC (rev 1613) @@ -54,9 +54,11 @@ 0 0 2value response$ +: final-filename$ ( -- adr len ) board#$ " %s.txt" sprintf ; + \ Send the board number as the request and return the response data : final-tag-exchange ( -- ) - board#$ " %s.txt" sprintf open-temp-file + final-filename$ open-temp-file sn$ " SN:" put-key+value " Request" submit-file " Response" get-response to response$ @@ -118,7 +120,7 @@ 2dup find-tag if ( value$ key$ old-value$ ) \ Tag already exists, check it 2over " KA" $= 0= if ?-null then ( value$ key$ old-value$' ) 2>r 2over 2r@ $= if ( value$ key$ r: old-value$' ) - 2drop 2drop r> 2drop ( ) + 2drop 2drop 2r> 2drop ( ) else ( value$ key$ r: old-value$' ) type ." tag changed!" cr ( value$ r: old-value$' ) ." Old: " r> show-tag cr ( value$ )

1 0

r1612 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 15 Dec '09

15 Dec '09

Author: wmb Date: 2009-12-15 09:53:07 +0100 (Tue, 15 Dec 2009) New Revision: 1612 Modified: cpu/x86/pc/olpc/via/runin.fth Log: Via manufacturing tests - corrected error in clock display, commented out call to "verify-rtc-date" until factory NTP servers get synced, reordered "warning !" vs "device-end" for proper nesting. Modified: cpu/x86/pc/olpc/via/runin.fth =================================================================== --- cpu/x86/pc/olpc/via/runin.fth 2009-12-15 05:26:00 UTC (rev 1611) +++ cpu/x86/pc/olpc/via/runin.fth 2009-12-15 08:53:07 UTC (rev 1612) @@ -183,7 +183,7 @@ d# 4 constant rtc-threshold : .clocks ( -- ) ntp>time&date time&date - ." RTC: " .clock ." NTP: " .clock + ." RTC: " .date space .time cr ." NTP: " .date space .time cr ; : verify-rtc-date ( -- ) \ XXX check RTC power lost bit @@ -265,7 +265,7 @@ get-info - verify-rtc-date +\ verify-rtc-date ." Getting final tags .. " cifs-connect final-tag-exchange cifs-disconnect @@ -329,9 +329,8 @@ confirm-selftest? ; - -device-end - warning ! +device-end + after-runin

1 0

r1611 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 15 Dec '09

15 Dec '09

Author: wmb Date: 2009-12-15 06:26:00 +0100 (Tue, 15 Dec 2009) New Revision: 1611 Added: cpu/x86/pc/olpc/via/help.fth Modified: cpu/x86/pc/olpc/via/fw.bth Log: OLPC trac 9882 - updated help command for XO-1.5 Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-12-15 05:02:15 UTC (rev 1610) +++ cpu/x86/pc/olpc/via/fw.bth 2009-12-15 05:26:00 UTC (rev 1611) @@ -348,12 +348,12 @@ fload ${BP}/cpu/x86/pc/olpc/setwp.fth -fload ${BP}/cpu/x86/pc/olpc/help.fth +fload ${BP}/cpu/x86/pc/olpc/via/help.fth \ Help for common user tasks fload ${BP}/cpu/x86/pc/olpc/gui.fth fload ${BP}/cpu/x86/pc/olpc/via/suspend.fth \ Suspend/resume setup -fload ${BP}/cpu/x86/pc/olpc/via/switches.fth \ Lid and ebook switches -fload ${BP}/cpu/x86/pc/olpc/via/leds.fth \ LEDs +fload ${BP}/cpu/x86/pc/olpc/via/switches.fth \ Lid and ebook switches +fload ${BP}/cpu/x86/pc/olpc/via/leds.fth \ LEDs fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools fload ${BP}/cpu/x86/pc/olpc/disptest.fth Added: cpu/x86/pc/olpc/via/help.fth =================================================================== --- cpu/x86/pc/olpc/via/help.fth (rev 0) +++ cpu/x86/pc/olpc/via/help.fth 2009-12-15 05:26:00 UTC (rev 1611) @@ -0,0 +1,33 @@ +purpose: Basic help for OLPC OFW + +warning @ warning off +: help ( -- ) + blue-letters ." UPDATES:" black-letters mcr + ." flash u:\q2c18.rom Rewrite the firmware from USB key" mcr + ." flash ext:\q2c18.rom Rewrite the firmware from external SD file" mcr + ." fs-update u:\boot\os51.zd Rewrite the OS on internal SD from USB key" mcr + blue-letters ." DIRECTORY LISTING:" black-letters mcr + ." dir u:\ List USB key root directory" mcr + ." dir u:\boot\ List USB key /boot directory" mcr + ." dir int:\boot\*.zip List .zip files in internal SD /boot directory" mcr + blue-letters ." BOOTING:" black-letters mcr + ." boot Load the OS from list of default locations" mcr + ." 'printenv boot-device' shows the list" mcr + ." boot <cmdline> Load the OS, passing <cmdline> to kernel" mcr + ." boot u:\boot\vmlinuz Load the OS from a specific location" mcr + blue-letters ." CONFIGURATION VARIABLES FOR BOOTING:" black-letters mcr + ." boot-device Kernel or boot script path. Example: ext:\boot\olpc.fth" mcr + ." boot-file Default cmdline. Example: console=ttyS0,115200" mcr + ." ramdisk initrd pathname. Example: disk:\boot\initrd.imz" mcr + blue-letters ." MANAGING CONFIGURATION VARIABLES:" black-letters mcr + ." printenv [ <name> ] Show configuration variables" mcr + ." setenv <name> <value> Set configuration variable" mcr + ." editenv <name> Edit configuration variable" mcr + blue-letters ." DIAGNOSTICS:" black-letters mcr + ." test <device-name> Test device. Example: test mouse" mcr + ." test-all Test all devices that have test routines" mcr + ." menu Graphical interface to selftests" mcr + blue-letters ." More information: " black-letters mcr + green-letters ." http://wiki.laptop.org/go/OFW_FAQ" black-letters cr +; +warning !

1 0

r1610 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 15 Dec '09

15 Dec '09

Author: wmb Date: 2009-12-15 06:02:15 +0100 (Tue, 15 Dec 2009) New Revision: 1610 Modified: cpu/x86/pc/olpc/via/copynand.fth cpu/x86/pc/olpc/via/fsupdate.fth Log: OLPC trac 9873 - fixed secure reflash. Modified: cpu/x86/pc/olpc/via/copynand.fth =================================================================== --- cpu/x86/pc/olpc/via/copynand.fth 2009-12-15 05:01:14 UTC (rev 1609) +++ cpu/x86/pc/olpc/via/copynand.fth 2009-12-15 05:02:15 UTC (rev 1610) @@ -1,7 +1,7 @@ \ See license at end of file purpose: Copy a file onto the NAND FLASH -0 value fileih +0 value filefd 0 value nandih h# 20000 value /nand-block @@ -14,7 +14,7 @@ : $call-nand ( ?? method$ -- ?? ) nandih $call-method ; : close-image-file ( -- ) - fileih ?dup if 0 to fileih close-dev then + filefd ?dup if 0 to filefd close-file drop then ; : close-nand ( -- ) nandih ?dup if 0 to nandih close-dev then @@ -32,11 +32,6 @@ then ; -: ?key-stop ( -- ) - key? dup if key drop then ( stop? ) - " Stopped by keystroke" ?nand-abort -; - : set-nand-vars ( -- ) " size" $call-nand /nand-page um/mod nip to #nand-pages ; @@ -49,35 +44,6 @@ h# 100 buffer: image-name-buf : image-name$ ( -- adr len ) image-name-buf count ; -: get-img-filename ( -- ) safe-parse-word image-name-buf place ; - -: open-img ( "devspec" -- ) - image-name$ open-dev to fileih - fileih 0= " Can't open NAND image file" ?nand-abort - " size" fileih $call-method ( d.size ) - - 2dup h# 20000 um/mod swap if 1+ then ( d.size #eblocks ) - nip nip ( #eblocks ) - - to #image-eblocks - - #image-eblocks 0= " Image file is empty" ?nand-abort -; - -: read-image-block ( -- ) - load-base /nand-block " read" fileih $call-method ( len ) - dup /nand-block <> if ( len ) - load-base over + /nand-page rot - h# ff fill - else - drop - then -; - -: check-mem-hash ( record# -- ) - drop \ XXX -; - - defer show-init ( #eblocks -- ) ' drop to show-init Modified: cpu/x86/pc/olpc/via/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth 2009-12-15 05:01:14 UTC (rev 1609) +++ cpu/x86/pc/olpc/via/fsupdate.fth 2009-12-15 05:02:15 UTC (rev 1610) @@ -44,6 +44,13 @@ : swap-buffers ( -- ) data-buffer dma-buffer to data-buffer to dma-buffer ; +: force-line-delimiter ( delimiter fd -- ) + file @ ( delim fd fd' ) + swap file ! ( delim fd' ) + swap line-delimiter c! ( fd' ) + file ! ( ) +; + vocabulary nand-commands also nand-commands definitions @@ -71,7 +78,16 @@ : data: ( "filename" -- ) safe-parse-word fn-buf place " ${DN}${PN}\${CN}${FN}" expand$ image-name-buf place - open-img + image-name$ r/o open-file if + drop ." Can't open " image-name$ type cr + true " " ?nand-abort + then to filefd + linefeed filefd force-line-delimiter + \ Eat the initial "zblocks:" line + load-base /spec-maxline filefd read-line ( len not-eof? error? ) + " Read error on .zd file" ?nand-abort ( len not-eof? ) + 0= " Premature EOF on .zd file" ?nand-abort ( len ) + drop ( ) true to secure-fsupdate? ; @@ -82,13 +98,13 @@ : get-zdata ( comprlen -- ) secure-fsupdate? if - data-buffer /spec-maxline fileih read-line ( len end? error? ) + data-buffer /spec-maxline filefd read-line ( len end? error? ) " Spec line read error" ?nand-abort ( len end? ) 0= " Spec line too long" ?nand-abort ( len ) data-buffer swap ( adr len ) source $= 0= " Spec line mismatch" ?nand-abort ( ) - fileih ( ih ) + filefd ( ih ) else ( ) source-id ( ih ) then ( ih ) @@ -181,9 +197,7 @@ safe-parse-word r/o open-file ( fd ) abort" Can't open file" ( fd ) - file @ ( fd fd' ) - over file ! linefeed line-delimiter c! ( fd fd' ) - file ! ( fd ) + linefeed over force-line-delimiter ( fd ) t( ( fd ) also nand-commands ( fd ) @@ -217,7 +231,7 @@ show-done ?all-written close-nand-ihs - )t-hms + )t-hms cr ; : fs-update-from-list ( devlist$ -- )

1 0

r1609 - ofw/inet
by svn＠openfirmware.info 15 Dec '09

15 Dec '09

Author: wmb Date: 2009-12-15 06:01:14 +0100 (Tue, 15 Dec 2009) New Revision: 1609 Modified: ofw/inet/tcp.fth Log: TCP - randomize local port numbers to prevent reuse. Modified: ofw/inet/tcp.fth =================================================================== --- ofw/inet/tcp.fth 2009-12-15 04:16:21 UTC (rev 1608) +++ ofw/inet/tcp.fth 2009-12-15 05:01:14 UTC (rev 1609) @@ -2341,6 +2341,10 @@ first-time? if false to first-time? + [ifdef] random-long + random-long h# f000 mod h# 555 + to next-tcp-local-port + [then] + " next-xid" $call-parent to tcp_iss then

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware