September 2008 - openfirmware - mail.coreboot.org

r940 - cpu/x86/pc/olpc/build
by svn＠openfirmware.info Sept. 16, 2008

Sept. 16, 2008

Author: wmb Date: 2008-09-17 07:34:55 +0200 (Wed, 17 Sep 2008) New Revision: 940 Modified: cpu/x86/pc/olpc/build/ Log: svn - ignore some more build artifact files. Property changes on: cpu/x86/pc/olpc/build ___________________________________________________________________ Modified: svn:ignore - build ofw.elf builton.fth *.rom *.bin *.version forth sourceurl *.md5 *.public *.stamp *.aml + build ofw.elf builton.fth *.rom *.bin *.version forth sourceurl *.md5 *.public *.stamp *.aml *.dsl

1 0

r939 - ofw/fs/fatfs
by svn＠openfirmware.info Sept. 15, 2008

Sept. 15, 2008

Author: wmb Date: 2008-09-15 23:16:42 +0200 (Mon, 15 Sep 2008) New Revision: 939 Modified: ofw/fs/fatfs/fdisk2.fth Log: fdisk2.fth - Fixed the disk partitioning/formatting utility to work with partitions larger than 2 GiB. Modified: ofw/fs/fatfs/fdisk2.fth =================================================================== --- ofw/fs/fatfs/fdisk2.fth 2008-09-12 22:55:08 UTC (rev 938) +++ ofw/fs/fatfs/fdisk2.fth 2008-09-15 21:16:42 UTC (rev 939) @@ -149,7 +149,7 @@ fat32? to type32? dup type32? compute-cluster-size swap 2>r ( R: spc #mbytes ) 1 h# 40 h# 20 ( #hid-sec #heads sec/trk ) ( R: spc #mbytes ) - r> d# 1024 * d# 1024 * /sector / ( #hid-sec #heads sec/trk #secs ) ( R: spc ) + r> h# 10.0000 /sector /* ( #hid-sec #heads sec/trk #secs ) ( R: spc ) dup r@ / swap >r ( #hid-sec #heads sec/trk #clusters ) ( R: spc #secs ) type32? if 4 *

1 0

r938 - dev/geode
by svn＠openfirmware.info Sept. 12, 2008

Sept. 12, 2008

Author: wmb Date: 2008-09-13 00:55:08 +0200 (Sat, 13 Sep 2008) New Revision: 938 Modified: dev/geode/acpi.fth Log: Geode - allow power-off to work after suspend/resume. Modified: dev/geode/acpi.fth =================================================================== --- dev/geode/acpi.fth 2008-09-12 22:39:21 UTC (rev 937) +++ dev/geode/acpi.fth 2008-09-12 22:55:08 UTC (rev 938) @@ -24,6 +24,7 @@ \ This turns off the main CPU, but the EC stays on. : gx-power-off ( -- ) + h# 8000 0 acpi-l! \ Clear WAK_FLAG; it prevents power-off \ Enable all of these controls with 0 delay pm-enable h# 10 pm! \ PM_SCLK pm-enable h# 20 pm! \ PM_IN_SLPCTL

1 0

r937 - cpu/x86/pc/olpc
by svn＠openfirmware.info Sept. 12, 2008

Sept. 12, 2008

Author: wmb Date: 2008-09-13 00:39:21 +0200 (Sat, 13 Sep 2008) New Revision: 937 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC trac 8313 - further improvements in save-nand speed and UI. Also need the previous checkin. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-09-12 22:37:48 UTC (rev 936) +++ cpu/x86/pc/olpc/fw.bth 2008-09-12 22:39:21 UTC (rev 937) @@ -326,7 +326,6 @@ fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic fload ${BP}/dev/olpc/touchpad/touchpad.fth \ Touchpad diagnostic fload ${BP}/cpu/x86/pc/olpc/copynand.fth -fload ${BP}/cpu/x86/pc/olpc/nandstat.fth \ fload ${BP}/cpu/x86/pc/olpc/carousel.fth \ Carouseled NAND writing fload ${BP}/cpu/x86/pc/olpc/crypto.fth \ Cryptographic image validation fload ${BP}/cpu/x86/pc/olpc/lzip.fth \ Access zip images from memory

1 0

r936 - cpu/x86/pc/olpc dev/olpc/cafenand ofw/fs/fatfs ofw/fs/jffs2
by svn＠openfirmware.info Sept. 12, 2008

Sept. 12, 2008

Author: wmb Date: 2008-09-13 00:37:48 +0200 (Sat, 13 Sep 2008) New Revision: 936 Added: dev/olpc/cafenand/lbanand.fth Modified: cpu/x86/pc/olpc/copynand.fth dev/olpc/cafenand/badblock.fth dev/olpc/cafenand/cafenand.bth dev/olpc/cafenand/cafenand.fth dev/olpc/cafenand/methods.fth dev/olpc/cafenand/selftest.fth ofw/fs/fatfs/device.fth ofw/fs/fatfs/fdisk2.fth ofw/fs/fatfs/makefs.fth ofw/fs/jffs2/jffs2.fth Log: OLPC - support LBA-NAND Flash devices. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2008-09-12 22:34:01 UTC (rev 935) +++ cpu/x86/pc/olpc/copynand.fth 2008-09-12 22:37:48 UTC (rev 936) @@ -55,7 +55,7 @@ " /nandflash" open-dev to nandih nandih 0= " Can't open NAND FLASH device" ?nand-abort " erase-size" $call-nand to /nand-block - " block-size" $call-nand to /nand-page + " page-size" $call-nand to /nand-page " size" $call-nand /nand-page um/mod nip to #nand-pages /nand-block /nand-page / to nand-pages/block " start-scan" $call-nand @@ -220,6 +220,269 @@ defer show-done ' cr to show-done +: written? ( adr len -- flag ) h# ffffffff lskip 0<> ; + + +d# 24 d# 24 2value ulhc + +d# 22 constant status-line + +8 constant glyph-w +8 constant glyph-h + +9 constant grid-w +9 constant grid-h + +d# 128 value #cols +: xy+ ( x1 y1 x2 y2 -- x3 y3 ) rot + -rot + swap ; +: xy* ( x y w h -- x*w y*h ) rot * >r * r> ; + +0 value nand-block-limit + +: do-fill ( color x y w h -- ) " fill-rectangle" $call-screen ; + +\ States: 0:erased 1:bad 2:waiting for write 3:written + +: >loc ( eblock# -- x y ) #cols /mod grid-w grid-h xy* ulhc xy+ ; + +: show-state ( eblock# state -- ) swap >loc glyph-w glyph-h do-fill ; + +dev screen : erase-screen erase-screen ; dend + +h# 80 h# 80 h# 80 rgb>565 constant bbt-color \ gray + 0 0 0 rgb>565 constant erased-color \ black +h# ff 0 0 rgb>565 constant bad-color \ red + 0 0 h# ff rgb>565 constant clean-color \ blue +h# ff h# ff 0 rgb>565 constant pending-color \ yellow + 0 h# ff 0 rgb>565 constant written-color \ green + 0 h# ff h# ff rgb>565 constant strange-color \ cyan +h# ff h# ff h# ff rgb>565 constant starting-color \ white + +: gshow-init ( #eblocks -- ) + #nand-pages nand-pages/block / to nand-block-limit + + cursor-off " erase-screen" $call-screen + + " bbt0" $call-nand nand-pages/block / bbt-color show-state + " bbt1" $call-nand nand-pages/block / bbt-color show-state + + starting-color ( #eblocks color ) + swap 0 ?do i over show-state loop + drop + 0 status-line at-xy +; + +: gshow-erasing ( #eblocks -- ) drop ." Erasing " ; + +: gshow-erased ( eblock# -- ) erased-color show-state ; +: gshow-bad ( eblock# -- ) bad-color show-state ; +: gshow-bbt-block ( eblock# -- ) bbt-color show-state ; +: gshow-clean ( eblock# -- ) clean-color show-state ; +: gshow-strange ( eblock# -- ) strange-color show-state ; + +: gshow-cleaning ( -- ) d# 26 status-line at-xy ." Cleanmarkers" cr ; +: gshow-done ( -- ) cursor-on ; + +: gshow-pending ( eblock# -- ) pending-color show-state ; + +: gshow-writing ( #eblocks -- ) + ." Writing " + 0 swap 0 ?do ( eblock# ) + dup nand-pages/block * " block-bad?" $call-nand 0= if ( eblock# ) + dup show-pending ( eblock# ) + 1 ( eblock# increment ) + else ( eblock# ) + 0 ( eblock# increment ) + then ( eblock# increment ) + swap 1+ swap ( eblock#' increment ) + +loop ( eblock#' ) + drop +; + +: show-eblock# ( eblock# -- ) d# 20 status-line at-xy .x ; +: gshow-written ( eblock# -- ) + dup written-color show-state + show-eblock# +; + +: gshow + ['] gshow-init to show-init + ['] gshow-erasing to show-erasing + ['] gshow-erased to show-erased + ['] gshow-bad to show-bad + ['] gshow-bbt-block to show-bbt-block + ['] gshow-clean to show-clean + ['] gshow-cleaning to show-cleaning + ['] gshow-pending to show-pending + ['] gshow-writing to show-writing + ['] gshow-written to show-written + ['] gshow-strange to show-strange + ['] gshow-done to show-done +; + +gshow + +\ 0 - marked bad block : show-bad +\ 1 - unreadable block : show-bad +\ 2 - jffs2 w/ summary: show-written +\ 3 - jffs2 w/o summary: show-pending +\ 4 - clean : show-clean +\ 5 - non-jffs2 data : show-strange +\ 6 - erased : show-erased +\ 7 - primary bad-block-table : show-bbt-block +\ 8 - secondary bad-block-table : show-bbt-block +: show-status ( status eblock# -- ) + swap case + 0 of show-bad endof + 1 of show-bad endof + 2 of show-written endof + 3 of show-pending endof + 4 of show-clean endof + 5 of show-strange endof + 6 of show-erased endof + 7 of show-bbt-block endof + 8 of show-bbt-block endof + endcase +; + +0 value nand-map +0 value working-page +: classify-block ( page# -- status ) + to working-page + + \ Check for block marked bad in bad-block table + working-page " block-bad?" $call-nand if 0 exit then + + \ Try to read the first few bytes + load-base 4 working-page 0 " pio-read" $call-nand + + \ Check for a JFFS2 node at the beginning + load-base w@ h# 1985 = if + \ Look for a summary node + load-base 4 working-page h# 3f + h# 7fc " pio-read" $call-nand + load-base " "(85 18 85 02)" comp if 3 else 2 then + exit + then + + \ Check for non-erased, non-JFFS2 data + load-base l@ h# ffff.ffff <> if 5 exit then + + \ Check for various signatures in the OOB area + working-page " read-oob" $call-nand d# 14 + ( adr ) + + \ .. Cleanmarker + dup " "(85 19 03 20 08 00 00 00)" comp 0= if drop 4 exit then + + \ .. Bad block tables +\ These can't happen because the BBT table blocks are marked "bad" +\ so they get filtered out at the top of this routine. +\ dup " Bbt0" comp 0= if drop 7 exit then +\ dup " 1tbB" comp 0= if drop 8 exit then + drop + + \ See if the whole thing is really completely erased + load-base working-page nand-pages/block ( adr block# #blocks ) + " read-blocks" $call-nand nand-pages/block <> if 1 exit then + + \ Not completely erased + load-base /nand-block written? if 5 exit then + + \ Erased + 6 +; + +0 value current-block +0 value examine-done? + +string-array status-descriptions + ," Marked bad in Bad Block Table" \ 0 + ," Read error" \ 1 + ," JFFS2 data with summary" \ 2 + ," JFFS2 data, no summary" \ 3 + ," Clean (erased with JFFS2 cleanmarker)" \ 4 + ," Dirty, with non-JFFS2 data" \ 5 + ," Erased, no cleanmarker" \ 6 + ," Primary Bad Block Table" \ 7 + ," Secondary Bad Block Table" \ 8 +end-string-array + +: show-block-status ( block# -- ) + dup show-eblock# + nand-map + c@ status-descriptions count type kill-line +; + +: cell-border ( block# color -- ) + swap >loc ( color x y ) + -1 -1 xy+ + 3dup grid-w 1 do-fill ( color x y ) + 3dup grid-w 0 xy+ 1 grid-h do-fill ( color x y ) + 3dup 0 1 xy+ 1 grid-h do-fill ( color x y ) + 1 grid-h xy+ grid-w 1 do-fill +; +: lowlight ( block# -- ) background-rgb rgb>565 cell-border ; +: highlight ( block# -- ) 0 cell-border ; +: point-block ( block# -- ) + current-block lowlight + to current-block + current-block highlight +; +: +block ( offset -- ) + current-block + nand-block-limit mod ( new-block ) + point-block + current-block show-block-status +; + +: process-key ( char -- ) + case + h# 9b of endof + [char] A of #cols negate +block endof \ up + [char] B of #cols +block endof \ down + [char] C of 1 +block endof \ right + [char] D of -1 +block endof \ left + [char] ? of #cols 8 * negate +block endof \ page up + [char] / of #cols 8 * +block endof \ page down + [char] K of 8 +block endof \ page right + [char] H of -8 +block endof \ page left + h# 1b of d# 20 ms key? 0= if true to examine-done? then endof + endcase +; + +: examine-nand ( -- ) + 0 status-line 1- at-xy red-letters ." Arrows, fn Arrows to move, Esc to exit" black-letters cr + 0 to current-block + current-block highlight + false to examine-done? + begin key process-key examine-done? until + current-block lowlight +; + +: (scan-nand) ( -- ) + nand-map 0= if + #nand-pages nand-pages/block / alloc-mem to nand-map + then + + " usable-page-limit" $call-nand + dup nand-pages/block / show-init ( page-limit ) + + 7 " bbt0" $call-nand nand-pages/block / nand-map + c! + 8 " bbt1" $call-nand nand-pages/block / nand-map + c! + + 0 ?do + i classify-block ( status ) + i nand-pages/block / ( status eblock# ) + 2dup nand-map + c! ( status eblock# ) + show-status + nand-pages/block +loop ( ) + + show-done +; + +: scan-nand ( -- ) + open-nand (scan-nand) close-nand-ihs + examine-nand +; + + : >eblock# ( page# -- eblock# ) nand-pages/block / ; : copy-nand ( "devspec" -- ) @@ -326,13 +589,6 @@ close-nand-ihs ; - -: written? ( adr len -- flag ) - false -rot bounds ?do ( flag ) - i @ -1 <> if 0= leave then ( flag ) - /n +loop ( flag ) -; - true value dump-oob? : make-new-file ( devspec$ -- fileih ) 2dup ['] $delete catch if 2drop then ( name$ ) @@ -388,42 +644,70 @@ fileih 0= " Can't open output" ?nand-abort ; -: (dump-nand) ( "devspec" -- ) - open-nand - get-img-filename +: dump-eblock? ( block# -- flag ) + \ Dump JFFS2 w/summary (2), JFFS2 w/o summary (3), non JFFS2 data (5) + nand-map + c@ dup 2 = over 3 = or swap 5 = or +; - dump-oob? 0= if alloc-crc-buf then - image-name$ open-dump-file +: eblock>file ( -- ) + load-base /nand-block " write" fileih $call-method + /nand-block <> " Write to dump file failed" ?nand-abort + load-base /nand-block $crc #image-eblocks >crc l! + #image-eblocks 1+ to #image-eblocks +; - 0 to #image-eblocks +: fastdump-nand ( -- ) + \ The stack is empty at the end of each line unless otherwise noted + (scan-nand) + cursor-off + d# 20 status-line at-xy ." " + + " usable-page-limit" $call-nand >eblock# 0 do + i dump-eblock? if + i point-block + i show-eblock# + load-base i nand-pages/block * nand-pages/block " read-pages" $call-nand ( #read ) + nand-pages/block <> " Read failed" ?nand-abort + eblock>file + then + loop + show-done +; + +: slowdump-nand ( -- ) \ The stack is empty at the end of each line unless otherwise noted - dump-oob? if #nand-pages else " usable-page-limit" $call-nand then - 0 do + #nand-pages 0 do (cr i >eblock# . - load-base i nand-pages/block " read-blocks" $call-nand + load-base i nand-pages/block " read-pages" $call-nand ( #read ) nand-pages/block = if load-base /nand-block written? if ." w" - load-base /nand-block " write" fileih $call-method - /nand-block <> " Write to dump file failed" ?nand-abort - dump-oob? if - i nand-pages/block bounds ?do - i " read-oob" $call-nand h# 40 ( adr len ) - " write" fileih $call-method drop - h# 40 <> " Write of OOB data failed" ?nand-abort - i pad ! pad 4 " write" fileih $call-method - 4 <> " Write of eblock number failed" ?nand-abort - loop - else - load-base /nand-block $crc #image-eblocks >crc l! - then - #image-eblocks 1+ to #image-eblocks + eblock>file + i nand-pages/block bounds ?do + i " read-oob" $call-nand h# 40 ( adr len ) + " write" fileih $call-method + h# 40 <> " Write of OOB data failed" ?nand-abort + i pad ! pad 4 " write" fileih $call-method + 4 <> " Write of eblock number failed" ?nand-abort + loop else ." s" then then nand-pages/block +loop +; + +: (dump-nand) ( "devspec" -- ) + open-nand + get-img-filename + + alloc-crc-buf + image-name$ open-dump-file + + 0 to #image-eblocks + + dump-oob? if slowdump-nand else fastdump-nand then cr ." Done" cr close-image-file Modified: dev/olpc/cafenand/badblock.fth =================================================================== --- dev/olpc/cafenand/badblock.fth 2008-09-12 22:34:01 UTC (rev 935) +++ dev/olpc/cafenand/badblock.fth 2008-09-12 22:37:48 UTC (rev 936) @@ -247,7 +247,7 @@ external \ Assumes that the page range doesn't cross an erase block boundary -: read-blocks ( adr page# #pages -- #read ) +: read-pages ( adr page# #pages -- #read ) over block-bad? if 3drop 0 exit then rot >r 2dup r> -rot ( page# #pages adr page# #pages ) @@ -261,7 +261,7 @@ drop nip ; -: write-blocks ( adr page# #pages -- #written ) +: write-pages ( adr page# #pages -- #written ) over block-bad? if 3drop 0 exit then over >r dup >r ( adr page# #pages r: page# #pages ) @@ -279,12 +279,9 @@ tuck bounds ?do i erase-block pages/eblock +loop ; -: block-size ( -- n ) /page ; +: page-size ( -- n ) /page ; +: erase-size ( -- n ) /eblock ; -: erase-size ( -- n ) /eblock ; - -: max-transfer ( -- n ) /eblock ; - : dma-alloc ( len -- adr ) " dma-alloc" $call-parent ; : dma-free ( adr len -- ) " dma-free" $call-parent ; Modified: dev/olpc/cafenand/cafenand.bth =================================================================== --- dev/olpc/cafenand/cafenand.bth 2008-09-12 22:34:01 UTC (rev 935) +++ dev/olpc/cafenand/cafenand.bth 2008-09-12 22:37:48 UTC (rev 936) @@ -14,6 +14,8 @@ fload ${BP}/dev/olpc/cafenand/configure.fth fload ${BP}/dev/olpc/cafenand/badblock.fth fload ${BP}/dev/olpc/cafenand/redboot.fth +\ : lba-nand? 0 ; : lba-close ; +fload ${BP}/dev/olpc/cafenand/lbanand.fth fload ${BP}/dev/olpc/cafenand/methods.fth fload ${BP}/dev/olpc/cafenand/selftest.fth Modified: dev/olpc/cafenand/cafenand.fth =================================================================== --- dev/olpc/cafenand/cafenand.fth 2008-09-12 22:34:01 UTC (rev 935) +++ dev/olpc/cafenand/cafenand.fth 2008-09-12 22:37:48 UTC (rev 936) @@ -61,8 +61,15 @@ : clr-ints ( -- ) h# ffff.ffff h# 10 cl! ; -\ Wait not busy - XXX need timeout -: ctrl-wait ( -- ) begin h# c cl@ h# 8000.0000 and 0= until ; +: wait-ready ( -- ) + get-msecs d# 1000 + begin ( target-time ) + h# c cl@ h# 4000.0000 and if ( target-time ) + drop exit + then ( target-time ) + dup get-msecs - 0< ( target-time reached? ) + until ( target-time ) + drop +; \ Bit 19 in the command (0) register is reserved according to the \ version of the CaFe chip spec that we have, but Jerry Zheng says @@ -211,6 +218,15 @@ 0 instance value dma-buf-pa 0 instance value dma-buf-va defer do-lmove + +: alloc-dma-buf ( -- ) + /dma-buf " dma-alloc" $call-parent to dma-buf-va + dma-buf-va /dma-buf false " dma-map-in" $call-parent to dma-buf-pa +; +: set-lmove ( -- ) + " lmove" $find 0= if ['] move then to do-lmove +; + h# 10 buffer: syndrome-buf : syndrome ( -- adr ) 8 0 do h# 50 i wa+ cw@ i syndrome-buf array! loop @@ -291,10 +307,10 @@ : erase-block ( page# -- ) (erase-block) drop ; -: read-id ( -- adr ) 8 0 0 h# c420.0090 0 generic-read ; +: read-id ( -- adr ) 8 0 0 h# c400.0090 0 generic-read ; : send-reset-cmd ( -- ) - ctrl-wait + wait-ready h# 8000.00ff 0 cmd wait-cmd \ NAND Reset command ; Added: dev/olpc/cafenand/lbanand.fth =================================================================== --- dev/olpc/cafenand/lbanand.fth (rev 0) +++ dev/olpc/cafenand/lbanand.fth 2008-09-12 22:37:48 UTC (rev 936) @@ -0,0 +1,356 @@ +\ dev /nandflash + +: sectors>bytes ( #sectors #bytes -- ) 9 lshift ; + +: lba-get-sectors ( sector# #sectors -- true | adr false ) + tuck set-page ( #sectors ) + sectors>bytes dup h# 18 cl! ( #bytes ) + dma-buf-pa h# 44 cl! ( #bytes ) + 0 h# 48 cl! ( #bytes ) + h# a000.0000 or h# 40 cl! ( ) + read-cmd h# 0000.0130 cmd wait-dma ( ) + + dma-buf-va false +; + +: lba-write-sectors ( adr sector# #sectors -- error? ) \ Size is fixed + write-enable ( adr sector# #sectors) + tuck set-page ( adr #sectors ) + sectors>bytes ( adr #bytes ) + dup false dma-setup ( ) + h# e220.0080 h# 0000.0110 cmd wait-cmd ( ) \ No ECC, write cmd + wait-write-done ( error? ) +\ dma-release +; + +: read57 ( len page# offset -- adr ) read-cmd h# 157 generic-read ; +: dummy57 ( page# offset -- ) set-page dma-off h# e020.0000 h# 157 cmd wait-cmd ; +: dummy-read ( page# offset -- ) set-page dma-off h# e000.0000 h# 120 cmd wait-cmd ; +: pnr>bcm ( -- ) h# fc00 0 dummy-read ; +h# ffff value vfp-password +: set-vfp-password ( new-password -- ) + dup >r ( r: new-password ) + wbsplit vfp-password wbsplit ( npw0 npw1 opw0 opw1 r: new-pw ) + swap >r ( npw0 npw1 opw1 r: new-pw opw0 ) + -rot 0 bljoin h# 21 r> bwjoin ( page offset r: new-pw ) + dummy57 ( r: new-pw + r> to vfp-password +; +: mdp>vfp ( -- ) + vfp-password wbsplit ( pw0 pw1 ) + h# be rot bwjoin ( page=pw1 offset=pw0|be ) + dummy57 +; +: read-lba-id ( -- adr ) 5 0 0 h# c400.0092 0 generic-read ; +: bcm>pnr ( -- ) ( XXX This is a variant of the write command) ; +: 5c@ ( adr -- d ) + >r r@ c@ r@ 1+ c@ r@ 2+ c@ r@ 3 + c@ bljoin r> c@ +; +: le-w@ ( adr -- w ) dup c@ swap 1+ c@ bwjoin ; +: mdp-size ( -- #sectors ) 5 0 h# b0 read57 5c@ ; +: vfp-size ( -- #sectors ) 2 0 h# b5 read57 le-w@ ; +: ex-vfp-sizev ( -- param type ) 2 0 h# 10b8 read57 dup 1+ c@ swap c@ ; +: ex-vfp-size ( -- param type ) 2 0 h# b7 read57 dup 1+ c@ swap c@ ; +: set-vfp-size ( size -- ) + wbsplit swap abort" Bad alignment for VFP size" ( size.hi ) + ?dup if ( size.hi ) + dup invert ( size.hi ~size.hi ) + h# ff swap 0 ( size.hi ~size.lo ~size.hi 0 ) + bljoin h# 22 ( page offset ) + else ( ) + h# dfdf20 h# 2022 ( page offset ) + then ( page offset ) + dummy57 +; +: set-ex-vfp-size ( type param -- ) + over invert ( type param /type ) + swap invert ( type param /type /param ) + 0 bljoin ( type page# ) + h# 24 rot bljoin ( page# offset ) + dummy57 +; + +: set-protocol1 ( param -- ) 0 h# a2 rot bwjoin dummy57 ; +: get-protocol1 ( -- param ) 1 0 h# b2 read57 c@ ; +: 512-byte-transfers ( -- ) 1 set-protocol1 ; +: 2048-byte-transfers ( -- ) 4 set-protocol1 ; +: set-protocol2 ( param -- ) 0 h# a3 rot bwjoin dummy57 ; +: get-protocol2 ( -- param ) 1 0 h# b3 read57 c@ ; +: set-min-busy ( param -- ) 0 h# a4 rot bwjoin dummy57 ; +: get-min-busy ( -- param ) 1 0 h# b4 read57 c@ ; +: get-max-busy ( -- read write flush ) + 6 0 h# b9 read57 >r r@ le-w@ r@ 2+ le-w@ r> 4 + le-w@ +; +: power-down ( -- ) 0 h# ba dummy57 ; +: power-up ( -- ) 0 h# bb dummy57 ; +: fast-writing ( -- ) 0 h# bc dummy57 ; +: slow-writing ( -- ) 0 h# bd dummy57 ; +: start-free-sectors ( -- ) 0 h# 5e dummy57 ; +: free-sectors ( sector# #sectors -- ) + set-page ( ) + h# e020.0080 h# 0000.0110 cmd wait-cmd ( ) \ No ECC, write cmd (no data transfer) +; +: end-free-sectors ( -- ) 0 h# 5f dummy57 ; +: read-attributes ( which -- adr ) + 0 h# 9e dummy57 ( which ) + d# 512 swap 1 read-cmd h# 0000.0130 generic-read ( adr ) + 0 h# 9f dummy57 ( adr ) +; +: unique-id ( -- adr ) 0 read-attributes ; +: firmware-version ( -- adr ) h# 10 read-attributes ; +: hardware-version ( -- adr ) h# 20 read-attributes ; +: cache-flush ( -- ) h# 8020.00f9 0 cmd wait-cmd wait-ready ; +: pnr-mode ( -- ) h# 8020.00fd 0 cmd wait-cmd wait-ready ; +: lba-mode ( -- ) h# 8020.00fc 0 cmd wait-cmd wait-ready ; + +: setup ( -- ) + alloc-dma-buf + set-lmove + + h# 24 cl@ h# ff00 invert and h# 1000 or h# 24 cl! + h# 28 cl@ h# ff000000 invert and h# f0000000 or h# 28 cl! + h# 7fff.ffff to chip-boundary + + lba-mode + 2 set-protocol1 \ 2048-byte max transfer size + h# 200 to /page +; + +\ The deblocker converts a block/record-oriented interface to a byte-oriented +\ interface, using internal buffering. Disk and tape devices are usually +\ block or record oriented, but the OBP external interface is byte-oriented, +\ in order to be independent of particular device block sizes. + +0 instance value deblocker +: init-deblocker ( -- okay? ) + " " " deblocker" $open-package to deblocker + deblocker if + true + else + ." Can't open deblocker package" cr false + then +; + + +\ Label package routines - used for partitions + +0 instance value offset-low \ Offset to start of partition +0 instance value offset-high + +0 instance value label-package +true value report-failure + +\ Sets offset-low and offset-high, reflecting the starting location of the +\ partition specified by the "my-args" string. + +: init-label-package ( -- okay? ) + 0 to offset-high 0 to offset-low + my-args " disk-label" $open-package to label-package + label-package dup if + 0 0 " offset" label-package $call-method to offset-high to offset-low + else + report-failure if + ." Can't open disk label package" cr + then + then +; + +: block-size ( -- n ) h# 200 ; + +: max-transfer ( -- n ) h# 800 ; +\ : max-transfer ( -- n ) h# 200 ; + +: read-blocks ( adr block# #blocks -- #read ) + dup >r lba-get-sectors if ( adr r: #blocks ) + r> 2drop 0 ( #read ) + else ( adr dma-adr r: #blocks ) + swap r@ sectors>bytes do-lmove ( r: #blocks ) + r> ( #read ) + then +; +: write-blocks ( adr block# #blocks -- #written ) + dup >r lba-write-sectors if r> drop 0 else r> then +; + +: #blocks ( -- u ) mdp-size drop ; + +: lba-nand? ( -- false | open-ok? true ) + read-lba-id c@ dup 0= swap h# ff = or if false exit then + + setup + + init-deblocker 0= if false true exit then + + init-label-package 0= if + deblocker close-package false true exit + then + + true true +; + +: lba-close ( -- ) + label-package if label-package close-package then + deblocker if deblocker close-package then + cache-flush +; + +: seek ( offset.low offset.high -- okay? ) + offset-low offset-high d+ " seek" deblocker $call-method +; + +: read ( addr len -- actual-len ) " read" deblocker $call-method ; +: write ( addr len -- actual-len ) " write" deblocker $call-method ; +: load ( addr -- size ) " load" label-package $call-method ; + +: lba-size? ( -- false | d.size true ) + label-package if + " size" label-package $call-method ( d.size ) + true + else + false + then +; + +\ dend + +\ begin-select /nandflash +\ setup + + +[ifdef] notdef + +PNR - Pure NAND Read (raw mode) - first 256 2K pages (512 KiB) - power-on state + +VFP - Vendor Firmware Partition - 8 MBytes + +MDP - Multimedia Data Partition - enter mode with FC command + +BCM - Boot Code Maintenance - used for writing to PNR partition + + + +sequence feature (1) + +00 00 02 00 01 00 30 data data length can be select 512 or 528 (2048 or 2112) OOB data is dummy + +sequence feature (2) + +Type A + +00 00 02 00 01 00 30 <sector data> 00 <dummy address 5 bytes> 30 <sector data> ... + reading command setup + +Type B + +00 00 02 00 01 00 30 <sector data> f8 <sector data> ... + +VFD/MDP mode - OOB is ignored on write, dummy on read +PNR access mode boot area (the first 256 2K pages - 512 KiB) - OOB is read/write + + +Low-level driver init: + +Select transfer mode (whether to send dummy address and command for each data transfer - mode A or mode B) + +Disable ECC + +Select data length - 512 / 528, 2048 / 2112 + + +-- +Device comes up in raw NAND mode + +Mode changes puts it in MDP mode or VFP mode + +VFP mode is for program code +MDP mode is for data + +---- +Commands: +PNR mode: + Boot mode 1: + Page read (sequential) - <00> {00} {00} {page#0} {page#1} {page#2} <30> RDY {page data} ({Dummy page address}) + Page number reset to 0 - <ff> RDY + Boot mode 2: + Page read (sequential) - <00> {AD0} {AD1} {page#0} {page#1} {page#2} <30> RDY {page data} ({Dummy page address}) + Reset (noop) - <ff> RDY + Boot mode 3: + Page read (sequential) - <00> {xx} {xx} {xx} {xx} {xx} <30> {page data} + Reset (noop) - <ff> RDY + + Enter LBA mode - <fc> RDY 0020.00fc 0 0 >cmd + Enter PNR mode - <fd> RDY 0020.00fd 0 0 >cmd + + Enter BCM mode - <00> {xx} {xx} {xx} {FC} {xx} <30> RDY + + +LBA mode: + Sector Read Type A - <00> {cnt0} {cnt1} {sec#0} {sec#1} {sec#2} <30> RDY {data} (repeat all w dummy page address ...) + Retransmit - {prevdata} <31> RDY <00> {dummy 5-byte page address} <30> RDY {data} + Sector Read Type B - <00> {cnt0} {cnt1} {sec#0} {sec#1} {sec#2} <30> RDY {data} (<f8> {data} ...) + Retransmit - {prevdata} <31> RDY {data} + Sector Read Type C - <00> {cnt0} {cnt1} {sec#0} {sec#1} {sec#2} <30> RDY {data} ({data} ...) + Retransmit - {prevdata} RDY <31> RDY {data} + + Sector Write Type A - <80> {cnt0} {cnt1} {sec#0} {sec#1} {sec#2} <10> RDY {data} (repeat all w dummy page address ...) + Sector Write Type B - <80> {cnt0} {cnt1} {sec#0} {sec#1} {sec#2} <10> RDY {data} (<80> {data} <10> RDY ...) + + Switch to PNR partition in BCM mode - <00> {BF} {xx} {xx} {xx} {xx} <57> RDY + + Get MDP size - <00> {B0} {xx} {xx} {xx} {xx} <57> RDY {5 bytes LSB .. MSB} (total #sectors in MDP) + Get VFP size - <00> {B5} {xx} {xx} {xx} {xx} <57> RDY {2 bytes LSB .. MSB} (total #sectors in VFP) + Set VFP size - <00> {22} {SZ0} {SZ1} {/SZ0} {/SZ1} <57> RDY (clears VFP and MDP data) + Get EX_VFP size variation - <00> {B8} {10} {xx} {xx} {xx} <57> RDY {capacity_type, capacity_parameter} + Set EX_VFP size - <00> {24} {type} {param} {/type} {/param} <57> RDY + Get EX_VFP size - <00> {B7} {xx} {xx} {xx} {xx} <57> RDY {model_type, capacity_parameter} + + Set VFP Password - <00> {21} {OldPW1} {OldPW2} {PW1} {PW2} <57> RDY + + Set protocol 1 - <00> {A2} {param} {xx} {xx} {xx} <57> RDY (param is N in (512+16)*N } + Get protocol 1 - <00> {B2} {xx} {xx} {xx} {xx} <57> RDY {param 1 byte} (param is N in (512+16)*N) + + Set protocol 2 - <00> {A3} {param} {xx} {xx} {xx} <57> RDY (param is A,B,C select} + Get protocol 2 - <00> {B3} {xx} {xx} {xx} {xx} <57> RDY {param 1 byte} (param is A,B,C select) + + Set Min busy time - <00> {A4} {param} {xx} {xx} {xx} <57> RDY + Get Min busy time - <00> {B4} {xx} {xx} {xx} {xx} <57> RDY {param 1 byte} + Get Max busy time - <00> {B9} {xx} {xx} {xx} {xx} <57> RDY {read 2 bytes LE} {write 2 bytes LE} {flush 2 bytes LE} + + Power Down - <00> {BA} {xx} {xx} {xx} {xx} <57> RDY + Power Up - <00> {BB} {xx} {xx} {xx} {xx} <57> RDY + + High Speed Write Mode On - <00> {BC} {xx} {xx} {xx} {xx} <57> RDY + High Speed Write Mode Off - <00> {BD} {xx} {xx} {xx} {xx} <57> RDY + + Set Garbage Address Area - <00> {E5} {xx} {xx} {xx} {xx} <57> RDY (<80> {seccnt0, 1 secaddr0, 1, 2} <10> RDY) ... <00> <5f> {xx} {xx} {xx} {xx} <57> RDY + Cache Flush before power down - <F9> RDY + Vendor Option - <00> {8A} {vendor_code 98} {ven_def0} {ven_def1} {ven_def2} <57> RDY {ven_def 3-7} + +BCM Mode: + Read PNP Page - <00> {00} {00} {page#} {00} {00} <30> RDY {2112 bytes} + Write partial PNP Page - <80> {col_adr0} {col_adr1} {page#} {len0} {len1} <30> RDY {up to 2112 bytes} <10> RDY + Cache Flush in BCM mode - <00> {xx} {xx} {xx} {F9} {xx} <30> RDY + Device Reboot in BCM mode - <80> {xx} {xx} {xx} {FD} {xx} <10> RDY (back to PNR read mode) + Set Boot Mode 1 - <00> {xx} {xx} {xx} {11} {xx} <30> RDY + Set Boot Mode 2 - <00> {xx} {xx} {xx} {22} {xx} <30> RDY + Set Boot Mode 3 - <00> {xx} {xx} {xx} {33} {xx} <30> RDY + Set Reboot Mode FD - <00> {xx} {xx} {xx} {AD} {xx} <30> RDY + Set Reboot Mode FD/FF - <00> {xx} {xx} {xx} {AF} {xx} <30> RDY + Get persistent modes - <00> {xx} {xx} {xx} {99} {xx} <30> RDY [boot_mode_value-11/22/33, reboot_mode-AD/AD] + + +All Modes: + Read ID 1 (fake ID) - <90> {00} {5 ID bytes} (emulated SLC 4Gbit ID) + Read ID 2 (real ID) - <92> {00} {5 ID bytes} (LBA-ID + + Switch to MDP partition - <FC> RDY + Switch to VFP partition - <00> {BE} {PW0} {PW1} {xx} {xx} <57> RDY (PW: password - default FF) + + Unique ID - <00> {9E} {xx} {xx} {xx} {xx} <57> RDY <00> {01} {00} {00} {00} {00} <30> RDY {ID data} <00> {9F} {xx} {xx} {xx} {xx} <57> RDY + Firmware version - <00> {9E} {xx} {xx} {xx} {xx} <57> RDY <00> {01} {00} {10} {00} {00} <30> RDY {FW version} <00> {9F} {xx} {xx} {xx} {xx} <57> RDY + Firmware version - <00> {9E} {xx} {xx} {xx} {xx} <57> RDY <00> {01} {00} {20} {00} {00} <30> RDY {FW version} <00> {9F} {xx} {xx} {xx} {xx} <57> RDY + + R/W Terminate - <fb> RDY (must first wait for RDY except for read types A&B) + + Device Reboot to PNR mode - <FD> RDY (<FF> RDY) +[then] Modified: dev/olpc/cafenand/methods.fth =================================================================== --- dev/olpc/cafenand/methods.fth 2008-09-12 22:34:01 UTC (rev 935) +++ dev/olpc/cafenand/methods.fth 2008-09-12 22:37:48 UTC (rev 936) @@ -41,6 +41,7 @@ : close ( -- ) \ Leave the timing registers set so the OS driver can get the \ right values from them. + lba-close soft-reset timing-configure unmap-regs dma-buf-va ?dup if dma-buf-va dma-buf-pa /dma-buf " dma-map-out" $call-parent @@ -48,7 +49,10 @@ then ; -: size ( -- d ) partition-size /page um* ; +: size ( -- d ) + lba-size? if exit then + partition-size /page um* +; : $set-partition ( $ -- error? ) dup 0= if 2drop false exit then ( $ ) @@ -66,15 +70,14 @@ : open ( -- okay? ) map-regs init + lba-nand? if exit then 0 to partition# 0 to partition-start configure-all if false exit then - /dma-buf dma-alloc to dma-buf-va - dma-buf-va /dma-buf false " dma-map-in" $call-parent to dma-buf-pa + alloc-dma-buf + set-lmove - " lmove" $find 0= if ['] move then to do-lmove - get-bbt usable-page-limit to partition-size read-partmap Modified: dev/olpc/cafenand/selftest.fth =================================================================== --- dev/olpc/cafenand/selftest.fth 2008-09-12 22:34:01 UTC (rev 935) +++ dev/olpc/cafenand/selftest.fth 2008-09-12 22:37:48 UTC (rev 936) @@ -56,7 +56,7 @@ then ; : read-eblock ( adr page# -- error? ) - pages/eblock read-blocks pages/eblock <> + pages/eblock read-pages pages/eblock <> dup if ." SAVE" cr then ; : write-eblock ( adr page# -- error? ) @@ -64,7 +64,7 @@ over /eblock erased? if ( adr page# ) 2drop false else ( adr page# ) - pages/eblock write-blocks pages/eblock <> + pages/eblock write-pages pages/eblock <> dup if ." RESTORE" cr then then ; Modified: ofw/fs/fatfs/device.fth =================================================================== --- ofw/fs/fatfs/device.fth 2008-09-12 22:34:01 UTC (rev 935) +++ ofw/fs/fatfs/device.fth 2008-09-12 22:37:48 UTC (rev 936) @@ -121,73 +121,78 @@ then ; -\ This version of read-bpb implements Microsoft's recommended -\ method for determining whether a filesystem is FAT-16 or FAT-32. +\ This BPB parser implements Microsoft's recommended method +\ for determining whether a filesystem is FAT-16 or FAT-32. variable nsects -: ?read-bpb ( -- ) - /sector 0= if \ Read bpb if necessary - init-sector-size - find-bpb - bp_media c@ media c! - bp_bps lew@ bps w@ <> if - ." WARNING: BPB sector size differs from device sector size" cr - then - bp_bps lew@ bps w! - bp_spc c@ spc c! - bp_spf lew@ ?dup 0= if bp_bspf lel@ then spf l! - bp_nsects lew@ ?dup 0= if bp_xnsects lel@ then nsects l! +: bpb>device ( -- ) + bp_media c@ media c! + bp_bps lew@ bps w! + bp_spc c@ spc c! + bp_spf lew@ ?dup 0= if bp_bspf lel@ then spf l! + bp_nsects lew@ ?dup 0= if bp_xnsects lel@ then nsects l! - bp_ndirs lew@ /dirent * /sector 1- + /sector / #dir-sectors w! + bp_ndirs lew@ /dirent * /sector 1- + /sector / #dir-sectors w! - \ nsects is TotSec - \ #dir-sectors is RootDirSectors + \ nsects is TotSec + \ #dir-sectors is RootDirSectors - \ Sector number where the FAT starts. - \ bp_nhid is the number of sectors before the BPB sector. - \ bp_res is the number of sectors from the BPT sector to the - \ first FAT sector. + \ Sector number where the FAT starts. + \ bp_nhid is the number of sectors before the BPB sector. + \ bp_res is the number of sectors from the BPT sector to the + \ first FAT sector. - \ If the underlying disk driver handles partition offsets, - \ we don't need to handle bp_nhid here. - bp_res lew@ ( bp_nhid lel@ + ) - dup fat-sector0 w! ( #resv-sectors ) - spf l@ bp_nfats c@ * + ( #early-sectors ) - dup dir-sector0 w! ( #early-sectors ) - #dir-sectors w@ + cl-sector0 l! ( ) + \ If the underlying disk driver handles partition offsets, + \ we don't need to handle bp_nhid here. + bp_res lew@ ( bp_nhid lel@ + ) + dup fat-sector0 w! ( #resv-sectors ) + spf l@ bp_nfats c@ * + ( #early-sectors ) + dup dir-sector0 w! ( #early-sectors ) + #dir-sectors w@ + cl-sector0 l! ( ) - \ cl-sector0 is FirstDataSector + \ cl-sector0 is FirstDataSector - nsects l@ #dir-sectors w@ - spc c@ / ( #clusters ) - dup d# 65525 >= if ( #clusters ) - drop fat32 fat-type c! - 0 dir-sector0 w! - bp_rdirclus lel@ rdirclus l! - bp_fsinfos lew@ dup read-fsinfo fsinfos w! - else - d# 4085 >= if fat16 else fat12 then fat-type c! - 0 fsinfo ! 0 fssector ! false fsinfos-dirty c! - 0 fsinfos w! 0 rdirclus l! - then + nsects l@ #dir-sectors w@ - spc c@ / ( #clusters ) + dup d# 65525 >= if ( #clusters ) + drop fat32 fat-type c! + 0 dir-sector0 w! + bp_rdirclus lel@ rdirclus l! + bp_fsinfos lew@ dup read-fsinfo fsinfos w! + else + d# 4085 >= if fat16 else fat12 then fat-type c! + 0 fsinfo ! 0 fssector ! false fsinfos-dirty c! + 0 fsinfos w! 0 rdirclus l! + then - \ The number of clusters is limited both by space for clusters numbers - \ in the FAT and by disk space for storage of the actual clusters. - \ It would be silly to waste disk space by making the FAT too small, - \ but I am paranoid so I check both limits. + \ The number of clusters is limited both by space for clusters numbers + \ in the FAT and by disk space for storage of the actual clusters. + \ It would be silly to waste disk space by making the FAT too small, + \ but I am paranoid so I check both limits. - \ Calculate the number of clusters the FAT can represent - spf l@ /sector * bytes>cl-entries ( #clusters ) + \ Calculate the number of clusters the FAT can represent + spf l@ /sector * bytes>cl-entries ( #clusters ) - \ Compare it with the number of clusters for which there is disk space - nsects l@ - cl-sector0 l@ - spc c@ / 2 + min 1- - max-cl# l! - free-bpb + \ Compare it with the number of clusters for which there is disk space + nsects l@ + cl-sector0 l@ - spc c@ / 2 + min 1- + max-cl# l! +; +: ?read-bpb ( -- ) + /sector 0= if \ Read bpb if necessary + init-sector-size + find-bpb + bp_bps lew@ bps w@ <> if + ." WARNING: BPB sector size differs from device sector size" cr + then + bpb>device + + init-fat-cache + \ Start with the root directory as the current working directory rdirclus @ dv_cwd-cl l! - init-fat-cache + free-bpb then ; Modified: ofw/fs/fatfs/fdisk2.fth =================================================================== --- ofw/fs/fatfs/fdisk2.fth 2008-09-12 22:34:01 UTC (rev 935) +++ ofw/fs/fatfs/fdisk2.fth 2008-09-12 22:37:48 UTC (rev 936) @@ -143,7 +143,9 @@ ; false value type32? : init-bpb ( #mbytes type name$ -- ) - string2 pack >r " :1,<NoFile>" r@ $cat r> count select-dev + ." Initializing file system ..." cr + + string2 pack >r " :1//fat-file-system:<NoFile>" r@ $cat r> count select-dev fat32? to type32? dup type32? compute-cluster-size swap 2>r ( R: spc #mbytes ) 1 h# 40 h# 20 ( #hid-sec #heads sec/trk ) ( R: spc #mbytes ) @@ -175,7 +177,7 @@ \ We don't bother with the cylinder/head/sector numbers, because they \ rarely matter anymore, and we don't have a good way to find them. - 1 h# 1c6 +buf le-l! \ Begin the partition at logical block 1 + h# 10 h# 1c6 +buf le-l! \ Begin the partition at logical block 16 dup >r ( #mbytes ) d# 2048 * ( #blocks ) h# 1ca +buf le-l! Modified: ofw/fs/fatfs/makefs.fth =================================================================== --- ofw/fs/fatfs/makefs.fth 2008-09-12 22:34:01 UTC (rev 935) +++ ofw/fs/fatfs/makefs.fth 2008-09-12 22:37:48 UTC (rev 936) @@ -72,7 +72,9 @@ dup alloc-mem dup bpb ! over erase r@ if set-params32 else set-params16 then + bpb>device r> r> ( fat32? bps ) + bpb @ over 1- + h# aa over c! 1- h# 55 swap c! 0 1 bpb @ write-sectors ( fat32? bps error? ) rot if \ Write file system info sector @@ -92,6 +94,7 @@ bpb @ rot free-mem if "CaW ". ." sector 0" abort then + 0 bps w! \ Force reread ?read-bpb \ Now read back the BIOS parameter block \ Clear the FATs. (0 means "free cluster") Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2008-09-12 22:34:01 UTC (rev 935) +++ ofw/fs/jffs2/jffs2.fth 2008-09-12 22:37:48 UTC (rev 936) @@ -143,7 +143,7 @@ \ Partial reads invalidate the cache dup pages/eblock <> if -1 to have-eblock# then ( page# #pages ) - block-buf -rot " read-blocks" $call-parent ( #read ) + block-buf -rot " read-pages" $call-parent ( #read ) ; : read-pages ( page# #pages -- error? ) tuck (read-pages) <> ; : read-eblock ( eblock# -- ) @@ -1468,7 +1468,7 @@ jffs2-magic over w! \ magic ( pad-adr r: page# ) padding-type over wa1+ w! \ nodetype ( pad-adr r: page# ) dup 8 crc swap 2 j! \ crc ( r: page# ) - block-buf r> 1 " write-blocks" $call-parent ( ) + block-buf r> 1 " write-pages" $call-parent ( ) 1 <> dup if ." JFFS2: write failed" then ( error? ) ; @@ -1515,7 +1515,7 @@ : set-sizes ( -- ) -1 to file-size - " block-size" $call-parent to /page + " page-size" $call-parent to /page " erase-size" ['] $call-parent ( adr len xt ) catch if 2drop h# 20000 then ( n )

1 0

r935 - ofw/fs/ext2fs
by svn＠openfirmware.info Sept. 12, 2008

Sept. 12, 2008

Author: wmb Date: 2008-09-13 00:34:01 +0200 (Sat, 13 Sep 2008) New Revision: 935 Modified: ofw/fs/ext2fs/sb.fth Log: Ext2 filesystem - reverted to "read" and "write" method access now that the deblocker has been fixed to eliminate unnecessary reads. Modified: ofw/fs/ext2fs/sb.fth =================================================================== --- ofw/fs/ext2fs/sb.fth 2008-09-12 22:27:47 UTC (rev 934) +++ ofw/fs/ext2fs/sb.fth 2008-09-12 22:34:01 UTC (rev 935) @@ -66,21 +66,16 @@ ; : write-ublocks ( adr len dev-block# -- error? ) -\ ublock um* " seek" $call-parent ?dup if exit then ( adr len ) -\ tuck " write" $call-parent <> - partition-offset + swap ublock 1- + 9 rshift ( adr block# #blocks ) - dup >r " write-blocks" $call-parent r> <> + ublock um* " seek" $call-parent ?dup if exit then ( adr len ) + tuck " write" $call-parent <> ; : put-super-block ( -- error? ) super-block /super-block super-block# write-ublocks ; : read-ublocks ( adr len dev-block# -- error? ) - partition-offset + swap ublock 1- + 9 rshift ( adr block# #blocks ) - dup >r " read-blocks" $call-parent r> <> - -\ ublock um* " seek" $call-parent ?dup if exit then ( adr len ) -\ tuck " read" $call-parent <> + ublock um* " seek" $call-parent ?dup if exit then ( adr len ) + tuck " read" $call-parent <> ; : get-super-block ( -- error? )

1 0

r934 - forth/kernel
by svn＠openfirmware.info Sept. 12, 2008

Sept. 12, 2008

Author: wmb Date: 2008-09-13 00:27:47 +0200 (Sat, 13 Sep 2008) New Revision: 934 Modified: forth/kernel/kernel.fth Log: OLPC trac 8139 - Performance improvement in deblocker - don't read data into buffer if the data is going to be overwritten. Modified: forth/kernel/kernel.fth =================================================================== --- forth/kernel/kernel.fth 2008-09-12 22:23:45 UTC (rev 933) +++ forth/kernel/kernel.fth 2008-09-12 22:27:47 UTC (rev 934) @@ -2061,13 +2061,16 @@ then ; +: align-byte# ( d.byte# -- d.aln-byte# ) fid @ alignop @ execute ; +: byte#-aligned? ( d.byte# -- flag ) 2dup align-byte# d= ; + \ An implementation factor which \ fills the buffer with a block from the current file. The block will \ be chosen so that the file address "d.byte#" is somewhere within that \ block. : fillbuf ( d.byte# -- ) - fid @ alignop @ execute ( d.byte# ) \ Aligns position to a buffer boundary + align-byte# ( d.byte# ) \ Aligns position to a buffer boundary 2dup fstart 2! ( d.byte# ) fid @ seekop @ execute ( ) bfbase @ bflimit @ over - ( adr #bytes-to-read ) @@ -2080,8 +2083,40 @@ \ returns the address within the buffer corresponding to the \ selected position "d.byte#" within the current file. +: bufaddr> ( bufaddr -- d.byte# ) bfbase @ - s>d fstart 2@ d+ ; : >bufaddr ( d.byte# -- bufaddr ) fstart 2@ d- drop bfbase @ + ; +\ This is called from fputs to open up space in the buffer for block-sized +\ chunks, avoiding prefills that would be completely overwritten. +: prefill? ( endaddr curaddr -- endaddr curraddr flag ) + + \ If the current buffer pointer is not block-aligned, must prefill + bfcurrent @ bufaddr> byte#-aligned? 0= if true exit then ( end curr ) + + 2dup - 0 align-byte# drop ( end curr aln-size ) + + \ If the incoming data won't fill a block, must prefill + ?dup 0= if true exit then ( end curr aln-size ) + + \ If there is still space in the buffer, just open it up for copyin + bflimit @ bfend @ - ?dup if ( end curr aln-len buffer-avail ) + min bfend +! false exit + then ( end curr aln-len ) + + \ Save current on stack because ?flushbuf clears it + bfcurrent @ ( end curr aln-len current ) + + \ The buffer is full; clear out its old contents + ?flushbuf ( end curr aln-len ) + + \ Advance the file pointer to the new buffer starting position + bufaddr> fstart 2! ( end curr aln-len ) + + bfbase @ + bflimit @ umin bfend ! ( end curr ) \ Room for new bytes + bfbase @ dup bftop ! bfcurrent ! ( end curr ) \ No valid bytes yet + false +; + \ An implementation factor which \ advances to the next block in the file. This is used when accesses \ to the file are sequential (the most common case). @@ -2352,8 +2387,16 @@ over bfend @ bfbase @ - u>= or if ( d.byte# offset ) \ Not in buffer \ Flush the buffer and get the one containing the desired byte. - drop ?flushbuf 2dup fillbuf ( d.byte# ) - >bufaddr ( bufaddr ) + drop ?flushbuf ( d.byte# ) + 2dup byte#-aligned? if ( d.byte# ) + \ If the new offset is on a block boundary, don't read yet, + \ because the next op could be a large write that fills the buffer. + fstart 2! ( ) + bfbase @ dup bftop ! dup bfend ! ( bufaddr ) + else + 2dup fillbuf ( d.byte# ) + >bufaddr ( bufaddr ) + then ( bufaddr ) else \ The desired byte is already in the buffer. nip nip bfbase @ + ( bufaddr ) @@ -2429,13 +2472,14 @@ \ Writes count bytes from memory starting at "adr" to the current file : fputs ( adr count fd -- ) file @ >r file ! - over + swap ( endaddr startaddr ) - begin copyin 2dup u> - while - \ Here there should be some code to see if there are enough remaining - \ bytes in the request to justify bypassing the file buffer and writing - \ directly from the user's buffer. 'Enough' = more than one file buffer - sync bfcurrent @ shortseek ( endaddr curraddr ) + over + swap ( endaddr startaddr ) + begin copyin 2dup u> while ( endaddr curraddr ) + sync ( endaddr curraddr ) + \ Prefill? tries to avoid unnecessary reads by opening up space + \ in the buffer for chunks that will completely fill a block. + prefill? if ( endaddr curraddr ) + bfcurrent @ shortseek ( endaddr curraddr ) + then repeat 2drop r> file !

1 0

r933 - ofw/inet
by svn＠openfirmware.info Sept. 12, 2008

Sept. 12, 2008

Author: wmb Date: 2008-09-13 00:23:45 +0200 (Sat, 13 Sep 2008) New Revision: 933 Modified: ofw/inet/dhcp.fth Log: OLPC trac 8450 - ask explicitly for several DHCP parameters. Modified: ofw/inet/dhcp.fth =================================================================== --- ofw/inet/dhcp.fth 2008-09-12 20:54:20 UTC (rev 932) +++ ofw/inet/dhcp.fth 2008-09-12 22:23:45 UTC (rev 933) @@ -155,9 +155,22 @@ \ Options common to discover, inform, and request messages : other-parameters ( -- ) set-vendor-class + + + \ Parameter request list + \ h# 01 - 1 Subnet mask + \ h# 03 - 3 Router IP address + \ h# 06 - 6 Name Server IP address + \ h# 0c - 12 Client name + \ h# 0f - 15 Domain name + \ h# 11 - 17 Root path + \ h# 1c - 28 Broadcast IP address + \ h# 2b - 43 Vendor options + \ h# 36 - 54 Server IP address + " "(01 03 06 0c 0f 11 1c 2b 36)" d# 55 +option + \ Later: Add requested IP address if we know it \ Later: Add requested IP lease time if we have a preference - \ Later: Add parameter request list if we care \ Later: Add maximum message size if we should need to ; : use-ip-broadcast ( -- ) broadcast-ip-addr set-dest-ip ; @@ -288,11 +301,37 @@ ; partial-headers -\ For now we'll take the first offer we get. +\ wanted? is the DHCP offer filter. Many environments have multiple DHCP +\ servers, some giving incomplete information. You can set wanted? to +\ require specific characteristics in the offer data. +\ A better approach would be to collect several offers within a time period +\ and choose the best among them, stopping early if a "perfect" offer arrives. + \ The default value of wanted? accepts the first DHCPOFFER that is received defer wanted? ( -- flag ) ' true to wanted? +\ This filter accepts offers that specify a router +: router? ( -- flag ) + 3 find-option dup if nip nip then +; + +\ This filter accepts offers that specify a name server +: ns? ( -- flag ) + 6 find-option dup if nip nip then +; + +: router+ns? ( -- flag ) router? ns? and ; + +: adaptive-wanted? ( -- flag ) + backoff case + d# 8000 of router+ns? exit endof + d# 16000 of router? exit endof + endcase + true +; +' adaptive-wanted? to wanted? \ By default, we accept all DHCP offers + \ This filter rejects offers whose siaddr field is empty, (Microsoft's \ DHCP server doesn't fill in siaddr), since we are hosed if we don't know \ which server to use. @@ -304,9 +343,9 @@ " The DHCP 'siaddr' field is empty" .dhcp-msg then ; -' true to wanted? \ By default, we accept all DHCP offers \ ' (wanted?) to wanted? + \ Another plausible criterion for choosing a particular offer might be: \ If a vendor class identifier is supplied, reject offers that do \ not return that identifier, instead waiting for an offer from a

1 0

r932 - cpu/x86/pc/olpc
by svn＠openfirmware.info Sept. 12, 2008

Sept. 12, 2008

Author: wmb Date: 2008-09-12 22:54:20 +0200 (Fri, 12 Sep 2008) New Revision: 932 Modified: cpu/x86/pc/olpc/lxmsrs.fth Log: OLPC trac 8089 - enable PRNG noise generator in AES unit. Modified: cpu/x86/pc/olpc/lxmsrs.fth =================================================================== --- cpu/x86/pc/olpc/lxmsrs.fth 2008-09-12 00:48:18 UTC (rev 931) +++ cpu/x86/pc/olpc/lxmsrs.fth 2008-09-12 20:54:20 UTC (rev 932) @@ -170,6 +170,7 @@ \ AES \ msr: 5800.2002 00000007.00000007. \ SMI mask - default is all off \ msr: 5800.2004 00000000.00000015. \ Clock gating - default + msr: 5800.2006 00000000.00000503. \ AES control - Random number generator noise, LFSR output \ chipsetinit(nb);

1 0

r931 - dev/olpc/touchpad
by svn＠openfirmware.info Sept. 11, 2008

Sept. 11, 2008

Author: wmb Date: 2008-09-12 02:48:18 +0200 (Fri, 12 Sep 2008) New Revision: 931 Modified: dev/olpc/touchpad/touchpad.fth Log: OLPC touchpad selftest - added support for standard mouse mode for use with Synaptics touchpad. Modified: dev/olpc/touchpad/touchpad.fth =================================================================== --- dev/olpc/touchpad/touchpad.fth 2008-09-11 08:57:08 UTC (rev 930) +++ dev/olpc/touchpad/touchpad.fth 2008-09-12 00:48:18 UTC (rev 931) @@ -19,6 +19,25 @@ ; +h# f800.f800 constant red +h# 07e0.07e0 constant green +h# 001f.001f constant blue +h# ffe0.ffe0 constant yellow +h# f81f.f81f constant magenta +h# 07ff.07ff constant cyan +h# ffff.ffff constant white +h# 0000.0000 constant black + +variable pixcolor + +h# 4 value y-offset +0 value fbadr +0 value maxx +0 value maxy +0 value /line +2 value /pixel + + \ This program depends on the following routines from the \ existing Open Firmware mouse driver: @@ -70,16 +89,16 @@ \ "identify" command; the response (for a mouse-like device) is 0x00 : alps-prefix ( -- ) 3 0 do h# f2 read1 drop loop ; -variable mode +variable mode \ 0 - unknown 1 - GS 2 - PT 3 - mouse \ Ref: 5.2.10 (3) of Hybrid-GP2B-T-1.pdf : gs-only ( -- ) - mode @ 1 = if exit then + mode @ dup 1 = swap 3 = or if exit then alps-prefix mouse1:1 \ f2 f2 f2 e6 1 mode ! ; : pt-only ( -- ) - mode @ 2 = if exit then + mode @ dup 2 = swap 3 = or if exit then alps-prefix mouse2:1 \ f2 f2 f2 e7 2 mode ! ; @@ -88,7 +107,14 @@ \ : simultaneous-mode ( -- ) alps-prefix 2 set-resolution ; \ Put the device into advanced mode and enable it -: start ( -- ) 0 mode ! setup advanced-mode stream-on ; +: start ( -- ) + setup + olpc-touchpad? if + 0 mode ! advanced-mode stream-on + else + remote-mode 3 mode ! + then +; \ I have been unable to get this to work. The response is always \ 64 0 <something>, which doesn't agree with the spec. @@ -237,7 +263,7 @@ h# ff of decode-gs true exit endof \ h# eb of decode-simultaneous exit endof h# aa of - 0 d# 28 at-xy red-screen white-letters + 0 d# 26 at-xy red-screen white-letters ." Unexpected touchpad reset" white-screen black-letters cr @@ -256,10 +282,30 @@ again ; +variable mouse-x +variable mouse-y + +: clipx ( delta -- x ) mouse-x @ + 0 max maxx min dup mouse-x ! ; +: clipy ( delta -- y ) mouse-y @ + 0 max maxy min dup mouse-y ! ; + \ Try to receive a GS-format packet. If one arrives within \ 20 milliseconds, return true and the decoded information. \ Otherwise return false. : pad? ( -- false | x y z tap? true ) + mode @ 3 = if + poll-event if ( dx dy buttons ) + >r ( dx dy ) + swap clipx swap negate clipy 0 ( x y z ) + 0 r@ 1 and or ( x y z tap ) + r> 4 and 0<> 2 and or ( x y z tap' ) + 8 or ( x y z tap' ) + true + else + false + then + exit + then + poll-touchpad 0= if false exit then gx @ gy @ gz @ taps @ 2 lshift switches @ or true @@ -295,31 +341,13 @@ key? until ; -h# f800.f800 constant red -h# 07e0.07e0 constant green -h# 001f.001f constant blue -h# ffe0.ffe0 constant yellow -h# f81f.f81f constant magenta -h# 07ff.07ff constant cyan -h# ffff.ffff constant white -h# 0000.0000 constant black - -variable pixcolor - -h# 4 value y-offset -0 value fbadr -0 value maxx -0 value maxy -0 value /line -2 value /pixel - : button ( color x -- ) maxy d# 50 - d# 200 d# 30 " fill-rectangle" $call-screen ; : background ( -- ) fbadr maxy 2+ /line * erase - 0 d# 30 at-xy ." Touchpad test. Both buttons clears screen. Type a key to exit" cr - 0 d# 20 at-xy ." Pressure: " + 0 d# 27 at-xy ." Touchpad test. Both buttons clears screen. Type a key to exit" cr + mode @ 3 <> if 0 d# 20 at-xy ." Pressure: " then ; : track-init ( -- ) screen-ih package( @@ -330,7 +358,13 @@ : show-up ( x y z -- ) 3drop d# 10 d# 20 at-xy ." UP " ; -: show-pressure ( -- ) push-decimal d# 10 d# 20 at-xy 3 u.r pop-base ; +: show-pressure ( z -- ) + mode @ 3 = if + drop + else + push-decimal d# 10 d# 20 at-xy 3 u.r pop-base + then +; : dot ( x y -- ) y-offset + maxy min /line * ( x line-adr )

1 0

r930 - cpu/x86/pc/olpc
by svn＠openfirmware.info Sept. 11, 2008

Sept. 11, 2008

Author: wmb Date: 2008-09-11 10:57:08 +0200 (Thu, 11 Sep 2008) New Revision: 930 Modified: cpu/x86/pc/olpc/addrs.fth cpu/x86/pc/olpc/gxearly.fth cpu/x86/pc/olpc/gxmsrs.fth cpu/x86/pc/olpc/probemem.fth cpu/x86/pc/olpc/vsapci.fth Log: OLPC trac 8426 - fixed B2 bricking by E-series firmware. The problem was caused by incorrect MSR setting for the memory that's mapped high for OFW's use. The MSRs were set correctly for LX CPUs, but not for GXs. Modified: cpu/x86/pc/olpc/addrs.fth =================================================================== --- cpu/x86/pc/olpc/addrs.fth 2008-09-09 23:12:37 UTC (rev 929) +++ cpu/x86/pc/olpc/addrs.fth 2008-09-11 08:57:08 UTC (rev 930) @@ -17,8 +17,9 @@ dropin-base h# 20 + constant ResetBase \ Location of "reset" dropin in ROM -h# ec0.0000 constant fw-pa +h# ec0.0000 value fw-pa \ Changed in probemem.fth h# 20.0000 constant /fw-ram +h# 40.0000 constant /fw-area [then] [ifdef] linuxbios-loaded Modified: cpu/x86/pc/olpc/gxearly.fth =================================================================== --- cpu/x86/pc/olpc/gxearly.fth 2008-09-09 23:12:37 UTC (rev 929) +++ cpu/x86/pc/olpc/gxearly.fth 2008-09-11 08:57:08 UTC (rev 930) @@ -39,24 +39,27 @@ \ Some of these don't really have to be set here, and could be \ moved to the big table of MSR values, except that the table \ slammer is dumb and can't handle conditionals. - 20000000.000fff00. 10000020 set-msr \ memory - 0..fffff + 20000000.000fff80. 10000020 set-msr \ memory - 0..7ffff + 20000000.080fffe0. 10000026 set-msr \ memory - 80000..9ffff (a0000..bffff is for VGA) + 20000000.0c0fffc0. 10000027 set-msr \ memory - c0000..fffff + ffbff000.ff800100. 1817 set-msr \ Region config - OFW area cacheable 1030 port-rl 4 bitand 0<> if \ 128 MiB - 25fff002.1077e000. 1808 set-msr - 2c7be040.400fffe0. 10000026 set-msr - 20000007.7df00100. 10000028 set-msr \ Top of memory - 20a7e0fd.7fffd000. 10000029 set-msr \ Frame buffer - 10075012.00003400. 20000018 set-msr - 20000007.7df00100. 40000029 set-msr \ top of memory. - 077df000.00100130. 50002019 set-msr + 25fff002.10780000. 1808 set-msr + 20000007.7ff00100. 10000028 set-msr \ Range - Top of memory at 07ff.ffff, fbsize + 20a800fd.7fffd000. 10000029 set-msr \ Range Offset - Frame buffer at PA fd00.0000 maps to RAM at 0780.0000, fbsize + 207c00ff.bffff800. 1000002b set-msr \ Range Offset - OFW area ff80.0000 maps to RAM at 0740.0000, fbsize + 10075012.00003400. 20000018 set-msr \ Refresh/SDRAM - DIMM 0 size 128 MB + 20000007.7ff00100. 40000029 set-msr \ Top of memory for DMA - 77ff.0000, fbsize + 077ff000.00100130. 50002019 set-msr \ Memory Region 1 config - top at 77ff.0000, PF, WC, fbsize else \ 256 MiB - 25fff002.10f7e000. 1808 set-msr - 2cfbe040.400fffe0. 10000026 set-msr - 2000000f.7df00100. 10000028 set-msr \ Top of memory - 2127e0fd.7fffd000. 10000029 set-msr \ Frame buffer - 10076013.00003400. 20000018 set-msr - 2000000f.7df00100. 40000029 set-msr \ top of memory. - 0f7df000.00100130. 50002019 set-msr + 25fff002.10f80000. 1808 set-msr + 2000000f.7ff00100. 10000028 set-msr \ Range - Top of memory at 0fff.ffff, fbsize + 212800fd.7fffd000. 10000029 set-msr \ Range Offset - Frame buffer at PA fd00.0000 maps to RAM at 0f80.0000, fbsize + 20fc00ff.bffff800. 1000002b set-msr \ Range Offset - OFW area ff80.0000 maps to RAM at 0f40.0000, fbsize + 10076013.00003400. 20000018 set-msr \ Refresh/SDRAM - DIMM 0 size 128 MB + 2000000f.7ff00100. 40000029 set-msr \ Top of memory for DMA - f7ff.0000, fbsize + 0f7ff000.00100130. 50002019 set-msr \ Memory Region 1 config - top at f7ff.0000, PF, WC, fbsize then \ 20000019 rmsr \ SDRAM timing and mode program Modified: cpu/x86/pc/olpc/gxmsrs.fth =================================================================== --- cpu/x86/pc/olpc/gxmsrs.fth 2008-09-09 23:12:37 UTC (rev 929) +++ cpu/x86/pc/olpc/gxmsrs.fth 2008-09-11 08:57:08 UTC (rev 930) @@ -52,7 +52,7 @@ \ msr: 4000.0027 000000ff.fff00000. \ Unmapped - default \ msr: 4000.0028 000000ff.fff00000. \ Unmapped - default \ msr: 4000.0029 20000007.7df00100. \ 10.0000 - 0f7d.f000 High RAM - Memsize dependent -msr: 4000.002a 200000fd.7fffd000. \ frame buffer - fd00.0000 .. fd7f.ffff, route to GLIU0 +msr: 4000.002a 200000fd.7fffd000. \ frame buffer - fd00.0000 .. fd7f.ffff, route to GLIU0, fbsize \ msr: 4000.002d 20000000.f0000003. \ 000f.0000 - 000f.ffff expansion ROM; XXX - no expansion ROM msr: 4000.0080 00000000.00000001. \ Route coherency snoops from GLIU1 to GLIU0 msr: 4000.0083 00000000.0000ff00. \ Disable SMIs Modified: cpu/x86/pc/olpc/probemem.fth =================================================================== --- cpu/x86/pc/olpc/probemem.fth 2008-09-09 23:12:37 UTC (rev 929) +++ cpu/x86/pc/olpc/probemem.fth 2008-09-11 08:57:08 UTC (rev 930) @@ -35,6 +35,8 @@ : release-range ( start-adr end-adr -- ) over - release ; : probe ( -- ) + system-ram /fw-area - to fw-pa + 0 total-ram reg \ Report extant memory \ Put h# 10.0000-1f.ffff and 28.0000-memsize in pool, Modified: cpu/x86/pc/olpc/vsapci.fth =================================================================== --- cpu/x86/pc/olpc/vsapci.fth 2008-09-09 23:12:37 UTC (rev 929) +++ cpu/x86/pc/olpc/vsapci.fth 2008-09-11 08:57:08 UTC (rev 930) @@ -154,7 +154,7 @@ create gxfb-hdr \ All R/O except cmd/stat and cache line size ' gxfb-cmd-reg token, ' >hdr-value token, - ff000000 , ffffc000 , ffffc000 , ffffc000 , + ff800000 , ffffc000 , ffffc000 , ffffc000 , 0 , 0 , 0 , 0 , 30100b , 2200002 , 3000000 , 8 ,

1 0

r929 - cpu/x86/pc/olpc
by svn＠openfirmware.info Sept. 9, 2008

Sept. 9, 2008

Author: wmb Date: 2008-09-10 01:12:37 +0200 (Wed, 10 Sep 2008) New Revision: 929 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2E17 (Q2E16 was built from svn 927) Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-09-09 22:34:45 UTC (rev 928) +++ cpu/x86/pc/olpc/versions.fth 2008-09-09 23:12:37 UTC (rev 929) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 15 +macro: FW_MINOR 17 \ The EC microcode macro: EC_VERSION e15

1 0

r928 - cpu/x86/pc/olpc
by svn＠openfirmware.info Sept. 9, 2008

Sept. 9, 2008

Author: wmb Date: 2008-09-10 00:34:45 +0200 (Wed, 10 Sep 2008) New Revision: 928 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC trac 8379 - the screen wasn't freezing (pretty boot) in secure mode. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2008-09-09 02:22:38 UTC (rev 927) +++ cpu/x86/pc/olpc/security.fth 2008-09-09 22:34:45 UTC (rev 928) @@ -56,7 +56,7 @@ : show-going ( -- ) background-rgb rgb>565 progress-xy d# 500 d# 100 " fill-rectangle" $call-screen d# 588 d# 638 to icon-xy " bigdot" show-icon - dcon-unfreeze + " vga?" $call-screen 0= if dcon-unfreeze dcon-freeze then ; : show-x ( -- ) " x" show-icon ; : show-sad ( -- )

1 0

r927 - cpu/x86/pc/olpc
by svn＠openfirmware.info Sept. 8, 2008

Sept. 8, 2008

Author: wmb Date: 2008-09-09 04:22:38 +0200 (Tue, 09 Sep 2008) New Revision: 927 Modified: cpu/x86/pc/olpc/mfgdata.fth Log: OLPC - formatting tweaks to 2-column mfg data display Modified: cpu/x86/pc/olpc/mfgdata.fth =================================================================== --- cpu/x86/pc/olpc/mfgdata.fth 2008-09-09 01:55:47 UTC (rev 926) +++ cpu/x86/pc/olpc/mfgdata.fth 2008-09-09 02:22:38 UTC (rev 927) @@ -77,27 +77,31 @@ : $tag-printable? ( adr len -- flag ) ?-null \ Ignore trailing null - bounds ?do i c@ printable? 0= if false unloop exit then loop + bounds ?do i c@ bl h# 7f within 0= if false unloop exit then loop true ; : wrapped-cdump ( adr len -- ) lmargin @ >r rmargin @ >r tabstops @ >r - 4 lmargin ! d# 78 rmargin ! 3 tabstops ! + 4 lmargin ! d# 71 rmargin ! 3 tabstops ! + dup >r + blue-letters bounds ?do 3 .tab i c@ <# u# u# u#> type loop + black-letters + r> d# 10 > if cr then r> tabstops ! r> rmargin ! r> lmargin ! ; : .mfg-data ( -- ) - 0 lmargin ! d# 78 rmargin ! d# 44 tabstops ! + 0 lmargin ! d# 78 rmargin ! d# 42 tabstops ! ??cr mfg-data-top ( adr ) begin another-tag? while ( adr' data$ tname-adr ) over 4 + .tab 2 type 2 spaces ( adr' data$ ) - 2dup $tag-printable? if ?-null type else wrapped-cdump cr then + 2dup $tag-printable? if ?-null type else wrapped-cdump then exit? if drop exit then repeat drop

1 0

r926 - cpu/x86
by svn＠openfirmware.info Sept. 8, 2008

Sept. 8, 2008

Author: wmb Date: 2008-09-09 03:55:47 +0200 (Tue, 09 Sep 2008) New Revision: 926 Modified: cpu/x86/kerncode.fth Log: Added bskip and lskip primitives to speed up bitmap searching for ext2. Modified: cpu/x86/kerncode.fth =================================================================== --- cpu/x86/kerncode.fth 2008-09-08 23:30:08 UTC (rev 925) +++ cpu/x86/kerncode.fth 2008-09-09 01:55:47 UTC (rev 926) @@ -551,6 +551,31 @@ dx di mov c; +\ Skip initial occurrences of bvalue, returning the residual length +code bskip ( adr len bvalue -- residue ) + di dx mov + ax pop \ BX: compare value + cx pop \ CX: Length + di pop \ SI: address + cld repz byte scas + <> if cx inc then + dx di mov + cx push +c; + +\ Skip initial occurrences of lvalue, returning the residual length +code lskip ( adr len lvalue -- residue ) + di dx mov + ax pop \ BX: compare value + cx pop \ CX: Length + 2 # cx shr \ Convert CX to longword count + di pop \ SI: address + cld repz scas + <> if cx inc then + dx di mov + 2 # cx shl cx push +c; + code noop (s -- ) c; code n->l (s n.unsigned -- l ) c;

1 0

r925 - cpu/x86/pc/olpc
by svn＠openfirmware.info Sept. 8, 2008

Sept. 8, 2008

Author: wmb Date: 2008-09-09 01:30:08 +0200 (Tue, 09 Sep 2008) New Revision: 925 Modified: cpu/x86/pc/olpc/mfgdata.fth Log: OLPC - format manufacturing data in 2 columns so it all fits on one screen. Modified: cpu/x86/pc/olpc/mfgdata.fth =================================================================== --- cpu/x86/pc/olpc/mfgdata.fth 2008-09-08 21:42:22 UTC (rev 924) +++ cpu/x86/pc/olpc/mfgdata.fth 2008-09-08 23:30:08 UTC (rev 925) @@ -76,16 +76,29 @@ ; : $tag-printable? ( adr len -- flag ) - dup if 2dup + 1- c@ 0= if 1- then then \ Ignore trailing null + ?-null \ Ignore trailing null bounds ?do i c@ printable? 0= if false unloop exit then loop true ; +: wrapped-cdump ( adr len -- ) + lmargin @ >r rmargin @ >r tabstops @ >r + 4 lmargin ! d# 78 rmargin ! 3 tabstops ! + bounds ?do + 3 .tab i c@ <# u# u# u#> type + loop + r> tabstops ! r> rmargin ! r> lmargin ! +; + : .mfg-data ( -- ) + 0 lmargin ! d# 78 rmargin ! d# 44 tabstops ! + ??cr mfg-data-top ( adr ) begin another-tag? while ( adr' data$ tname-adr ) - 2 type 3 spaces ( adr' data$ ) - 2dup $tag-printable? if type else cdump then cr + over 4 + .tab + 2 type 2 spaces ( adr' data$ ) + 2dup $tag-printable? if ?-null type else wrapped-cdump cr then + exit? if drop exit then repeat drop ;

1 0

r924 - in clients/lib: . x86
by svn＠openfirmware.info Sept. 8, 2008

Sept. 8, 2008

Author: wmb Date: 2008-09-08 23:42:22 +0200 (Mon, 08 Sep 2008) New Revision: 924 Modified: clients/lib/stdio.h clients/lib/x86/makefile Log: Client library: Define the stdio buffer as unsigned char instead of char to prevent sign extension of character values in the fgetc return value. Modified: clients/lib/stdio.h =================================================================== --- clients/lib/stdio.h 2008-09-07 19:23:04 UTC (rev 923) +++ clients/lib/stdio.h 2008-09-08 21:42:22 UTC (rev 924) @@ -5,8 +5,8 @@ int bufc; int readonly; int dirty; - char *inbufp; - char buf[128]; + unsigned char *inbufp; + unsigned char buf[128]; } FILE; extern FILE *stdin; Modified: clients/lib/x86/makefile =================================================================== --- clients/lib/x86/makefile 2008-09-07 19:23:04 UTC (rev 923) +++ clients/lib/x86/makefile 2008-09-08 21:42:22 UTC (rev 924) @@ -45,7 +45,7 @@ clean: - rm *~ *.o hello* *.a + rm -f *~ *.o hello* *.a dist:

1 0

r923 - ofw/fs/ext2fs
by svn＠openfirmware.info Sept. 7, 2008

Sept. 7, 2008

Author: wmb Date: 2008-09-07 21:23:04 +0200 (Sun, 07 Sep 2008) New Revision: 923 Modified: ofw/fs/ext2fs/bitmap.fth ofw/fs/ext2fs/blocks.fth ofw/fs/ext2fs/dir.fth ofw/fs/ext2fs/layout.fth ofw/fs/ext2fs/methods.fth ofw/fs/ext2fs/sb.fth Log: EXT2 file system - major edit to fix bugs and performance problems for writing. Modified: ofw/fs/ext2fs/bitmap.fth =================================================================== --- ofw/fs/ext2fs/bitmap.fth 2008-09-04 23:43:37 UTC (rev 922) +++ ofw/fs/ext2fs/bitmap.fth 2008-09-07 19:23:04 UTC (rev 923) @@ -3,6 +3,8 @@ decimal +\ Group descriptor access + 0 instance value gd-modified? : gd-update ( -- ) true to gd-modified? ; @@ -10,116 +12,163 @@ : inode-bitmap ( group# -- block# ) group-desc 4 + le-l@ ; : inode-table ( group# -- block# ) group-desc 8 + le-l@ ; : free-blocks ( group# -- n ) group-desc h# 0c + le-w@ ; -: free-inodes ( group# -- n ) group-desc h# 0e + le-w@ ; : free-blocks+! ( n group# -- ) - group-desc h# 0c + - tuck le-w@ + swap le-w! gd-update + group-desc h# 0c + + tuck le-w@ + 0 max swap le-w! gd-update ; -: free-inodes+! ( n group# -- ) +: free-inodes ( group# -- n ) group-desc h# 0e + le-w@ ; +: free-inodes+! ( n inode# -- ) group-desc h# 0e + tuck le-w@ + swap le-w! gd-update ; -\ find the lowest clear bit in a byte -: find-low ( byte -- bit ) - 1 8 0 do - 2dup and 0= if - drop i leave - then - 2* - loop - nip 1+ -; -\ find the first clear bit in a bitmap -: first-free ( map len -- n ) - -1 -rot 0 ?do ( byte map ) - dup i + c@ h# ff <> if - nip i swap leave - then - loop ( byte map ) - over 0< if 2drop 0 exit then - - over + c@ find-low ( byte bit ) - swap 8* + -; +[ifdef] 386-assembler +code find-low-zero ( n -- bit# ) + ax pop + cx cx xor + clc + begin + cx inc + 1 # ax rcr + no-carry? until + cx dec + cx push +c; +[else] +create lowbits + 8 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ 0-f + 4 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ 10-1f -: (find-free-block) ( group# -- n ) - block-bitmap block - fpg 8 / bsize min \ XXX stay in this block - first-free -; -: find-free-block ( -- n ) - 0 - #groups 0 ?do - drop - i (find-free-block) dup ?leave - loop - dup 0= abort" no free blocks found" -; + 5 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ 20-2f + 4 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ 30-3f -: (find-free-inode) ( group# -- n ) - inode-bitmap block - ipg 8 / bsize min \ XXX stay in this block - first-free + 6 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ 40-4f + 4 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ 50-5f + + 5 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ 20-2f + 4 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ 30-3f + + 7 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ 80-8f + 4 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ 90-9f + + 5 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ a0-af + 4 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ b0-bf + + 6 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ c0-cf + 4 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ d0-df + + 5 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ e0-ef + 4 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, 3 c, 0 c, 1 c, 0 c, 2 c, 0 c, 1 c, 0 c, \ f0-ff + +: find-low-zero ( byte -- bit# ) invert h# ff and lowbits + c@ ; +[then] + +\ Find the first clear bit in a bitmap, set it if found +: first-free ( len block# -- false | block#-in-group true ) + block swap ( map len ) + + 2dup h# ff bskip dup 0= if ( map len 0 ) + 3drop false exit + then ( map len residue ) + - ( map byte# ) + tuck + dup c@ dup find-low-zero ( byte# adr byte bit# ) + + \ Set the bit we just found + >r 1 r@ lshift or ( byte# adr byte' r: bit# ) + swap c! \ Write back to map ( byte# r: bit# ) + + 8* r> + ( block#-in-group ) + update ( block#-in-group ) + true ; -: find-free-inode ( -- n ) - 0 - #groups 0 ?do - drop - i (find-free-inode) dup ?leave - loop - dup 0= abort" no free inodes found" -; : bitup ( n adr -- mask adr' ) over 3 rshift + ( n adr' ) 1 rot 7 and lshift ( adr' mask ) swap ; -: block-bit ( block# -- n adr ) 1- fpg /mod block-bitmap block bitup ; -: block-free? ( block# -- set? ) block-bit c@ and 0= ; -: set-block-bit ( block# -- ) block-bit cset update ; -: clr-block-bit ( block# -- ) block-bit creset update ; + +: clear-bit? ( bit# block# -- cleared? ) + block bitup ( mask adr' ) + tuck c@ ( adr mask byte ) + 2dup and 0= if \ Already free ( adr mask byte ) + 3drop false exit + then ( adr mask byte ) + swap invert and ( adr byte' ) + swap c! ( ) + update ( ) + true +; + : free-block ( block# -- ) - dup block-free? if drop exit then - - dup clr-block-bit ( block# ) - 1 swap 1- fpg / ( 1 group# ) - free-blocks+! + datablock0 - bpg /mod ( bit# group# ) + tuck block-bitmap ( group# bit# block# ) + clear-bit? if ( group# ) + 1 swap free-blocks+! + else ( group# ) + drop + then ; -: alloc-block ( -- block# ) - find-free-block dup set-block-bit ( block# ) - dup block bsize erase update ( block# ) - dup 1- fpg / ( block# group# ) - -1 swap free-blocks+! + +: alloc-block ( -- block# ) + #groups 0 ?do ( ) + i free-blocks if ( ) + bpg 3 rshift bsize min ( len ) \ XXX stay in this block + i block-bitmap ( len block# ) + first-free if ( block#-in-group ) + -1 i free-blocks+! ( block#-in-group ) + i bpg * + datablock0 + ( block# ) + dup buffer bsize erase update ( block# ) + unloop exit + else + \ The allocation bitmap disagrees with the free block count, + \ so fix the free block count to prevent thrashing. + i free-blocks negate i free-blocks+! + then + then + loop + true abort" no free blocks found" ; -: inode-bit ( inode# -- n adr ) 1- ipg /mod inode-bitmap block bitup ; -: inode-free? ( inode# -- set? ) inode-bit c@ and 0= ; -: set-inode-bit ( inode# -- ) inode-bit cset update ; -: clr-inode-bit ( inode# -- ) inode-bit creset update ; : free-inode ( inode# -- ) - dup inode-free? if drop exit then - - dup clr-inode-bit - 1 swap 1- ipg / ( 1 group# ) - free-inodes+! + 1- ipg /mod ( bit# group# ) + tuck inode-bitmap ( group# bit# block# ) + clear-bit? if ( group# ) + 1 swap free-inodes+! + else ( group# ) + drop + then ; -: alloc-inode ( -- inode# ) - find-free-inode dup set-inode-bit ( inode# ) - dup inode /inode erase update ( inode# ) - dup 1- ipg / ( inode# group# ) - -1 swap free-inodes+! + +: alloc-inode ( -- inode# ) + #groups 0 ?do + ipg 3 rshift bsize min ( len ) \ XXX stay in this block + i inode-bitmap ( len block# ) + first-free if ( inode#-in-group ) + -1 i free-inodes+! ( inode#-in-group ) + i ipg * + 1+ ( inode# ) + dup inode /inode erase update ( inode# ) + unloop exit + then + loop + true abort" no free inodes found" ; + : update-sb ( -- ) 0 #groups 0 ?do i free-inodes + loop total-free-inodes! 0 #groups 0 ?do i free-blocks + loop total-free-blocks! put-super-block abort" failed to update superblock " gds /gds gds-block# write-ublocks abort" failed to update group descriptors " ; + : update-gds ( -- ) gd-modified? if - #groups 1 do 0 group-desc i fpg * 2 + block bsize move update loop + \ Copy group descriptors to backup locations + #groups 1 do + 0 group-desc ( gd0-adr ) + i bpg * 2+ block ( gd0-adr gdn-adr ) + bsize move update ( ) + loop false to gd-modified? update-sb then Modified: ofw/fs/ext2fs/blocks.fth =================================================================== --- ofw/fs/ext2fs/blocks.fth 2008-09-04 23:43:37 UTC (rev 922) +++ ofw/fs/ext2fs/blocks.fth 2008-09-07 19:23:04 UTC (rev 923) @@ -66,7 +66,10 @@ dup dirty? if ( buffer# ) false over dirty! dup >buffer swap blk# ( buffer-adr block# ) - dup 3 < if dup . ." attempt to corrupt superblock or group desciptor" abort then + dup gds-fs-block# <= if + dup . ." attempt to corrupt superblock or group descriptor" abort + then + bbug? if ." W " dup . cr then write-fs-block abort" write error " else drop Modified: ofw/fs/ext2fs/dir.fth =================================================================== --- ofw/fs/ext2fs/dir.fth 2008-09-04 23:43:37 UTC (rev 922) +++ ofw/fs/ext2fs/dir.fth 2008-09-07 19:23:04 UTC (rev 923) @@ -18,12 +18,31 @@ \ **** Return the address of the current directory entry : dirent ( -- adr ) dir-block# block diroff @ + ; +\ Dirent fields: +\ 00.l inode +\ 04.w offset to next dirent +\ 06.b name length +\ 07.b flags? +\ 08.s name string +: >reclen ( name-length -- record-length ) 8 + 4 round-up ; + +: dirent-inode@ ( -- n ) dirent int@ ; +: dirent-inode! ( n -- ) dirent int! ; +: dirent-len@ ( -- n ) dirent la1+ short@ ; +: dirent-len! ( n -- ) dirent la1+ short! ; +: dirent-nameadr ( -- adr ) dirent la1+ 2 wa+ ; +: dirent-namelen@ ( -- b ) dirent la1+ wa1+ c@ ; +: dirent-namelen! ( b -- ) dirent la1+ wa1+ c! ; +: dirent-type@ ( -- b ) dirent la1+ wa1+ ca1+ c@ ; +: dirent-type! ( b -- ) dirent la1+ wa1+ ca1+ c! ; +: dirent-reclen ( -- n ) dirent-namelen@ >reclen ; + : lblk#++ ( -- ) lblk# 1+ to lblk# ; \ **** Select the next directory entry : next-dirent ( -- end? ) - dirent la1+ short@ dup diroff +! totoff +! + dirent-len@ dup diroff +! totoff +! totoff @ file-size >= if true exit then diroff @ bsize = if lblk#++ get-dirblk if true exit then @@ -34,12 +53,12 @@ \ **** From directory, get handle of the file or subdir that it references \ For Unix, file handle is the inode # -: file-handle ( -- i# ) dirent int@ ; +: file-handle ( -- i# ) dirent-inode@ ; \ **** From directory, get name of file : file-name ( -- adr len ) dirent la1+ wa1+ dup wa1+ ( len-adr name-adr ) - swap short@ h# ff and ( adr len ) + swap c@ ( adr len ) ; \ @@ -59,53 +78,92 @@ update r> drop ; -: >reclen ( name-length -- record-length ) 8 + 4 round-up ; + +\ On entry: +\ current-dir @ is the inode of the directory file +\ dir-block# is the physical block number of the first directory block +\ diroff @ is 0 +\ On successful exit: +\ dir-block# is the physical block number of the current directory block +\ diroff @ is the within-block offset of the new dirent +: no-dir-space? ( #needed -- true | offset-to-next false ) + begin ( #needed ) + dirent-inode@ if ( #needed ) + dup dirent-len@ dirent-reclen - <= if ( #needed ) + \ Carve space out of active dirent + drop ( ) + dirent-len@ dirent-reclen - ( offset-to-next ) + dirent-reclen dup dirent-len! diroff +! ( offset-to-next ) + false exit + then + else ( #needed ) + dup dirent-len@ <= if ( #needed ) + \ Reuse deleted-but-present dirent + drop ( ) + dirent-len@ ( offset-to-next ) + false exit + then ( #needed ) + then ( #needed ) + next-dirent ( #needed ) + until ( #needed ) + drop true +; + \ a directory entry needs 8+n 4-aligned bytes, where n is the name length \ the last entry has a larger size; it points to the end of the block -: (last-dirent) ( -- penultimate-offset last-offset ) - diroff off 0 0 - begin ( previous' last' ) - nip diroff @ ( previous last ) - dirent la1+ short@ ( previous last rec-len ) - dup diroff @ + bsize < ( previous last rec-len not-end? ) - over dirent la1+ wa1+ short@ >reclen = and ( previous last rec-len not-end? ) - while ( previous last rec-len ) - diroff +! ( previous last ) - repeat ( previous last rec-len ) - drop +: (last-dirent) ( -- penultimate-offset ) + diroff off 0 + begin ( last ) + dirent-len@ ( last rec-len ) + dup diroff @ + bsize < ( last rec-len not-end? ) +\ over dirent-reclen = and ( last rec-len not-end? ) + while ( last rec-len ) + nip diroff @ swap ( last' rec-len ) + diroff +! ( last ) + repeat ( last ) + drop ( last ) ; : last-dirent ( -- free-bytes ) file-size bsize /mod swap 0= if 1- then to lblk# ( ) lblk# >pblk# to dir-block# - (last-dirent) 2drop - dirent la1+ dup short@ swap wa1+ short@ >reclen - + (last-dirent) drop + dirent-len@ dirent-reclen - ; : set-dirent ( name$ rec-len inode# -- ) dirent int! ( name$ rec-len ) - dirent la1+ short! ( name$ ) - dup dirent la1+ wa1+ short! - dirent la1+ 2 wa+ swap move + dirent-len! ( name$ ) + dup dirent-namelen! ( name$ ) + \ XXX set actual file type here if EXT2_FEATURE_INCOMPAT_FILETYPE + 0 dirent-type! ( name$ ) + dirent-nameadr swap move ( ) update ; +: to-previous-dirent ( -- ) + diroff @ ( this ) + 0 diroff ! ( this ) + begin ( this ) + dup diroff @ dirent-len@ + <> ( this not-found? ) + while ( this ) + dirent-len@ diroff +! ( this ) + repeat ( this ) + diroff @ swap - totoff +! ( ) +; + \ delete directory entry at diroff : del-dirent ( -- error? ) - diroff @ >r - (last-dirent) dup r@ = if ( prev last ) - \ current entry is the last - r> 2drop ( prev ) - diroff @ 0= abort" delete this block in directory" \ XXX last is also first - dirent bsize diroff @ - erase ( prev ) - else ( prev last ) - nip ( last ) - r> diroff ! ( last ) - dirent dup la1+ wa1+ short@ >reclen ( last dirent oldlen ) - rot over - -rot ( last' dirent oldlen ) - 2dup + -rot ( last' nextent dirent reclen ) - diroff @ + bsize swap - move ( last' ) - then ( last ) - dup diroff ! - bsize swap - dirent la1+ short! + diroff @ if + \ Not first dirent in block; coalesce with previous + dirent-len@ ( deleted-len ) + to-previous-dirent ( deleted-len ) + dirent-len@ + dirent-len! ( ) + dirent dirent-reclen + ( adr ) + dirent-len@ dirent-reclen - erase ( ) + else + \ First dirent in block; zap its inode + 0 dirent-inode! + + then update false ; @@ -113,19 +171,16 @@ : ($create) ( name$ mode -- error? ) >r ( name$ ) \ check for room in the directory, and expand it if necessary - dup >reclen last-dirent tuck < if ( name$ free ) - - \ there is room. update previous entry, and point to new entry - dirent la1+ wa1+ short@ >reclen ( name$ free old-len ) - dup dirent la1+ short! diroff +! ( name$ free ) - else ( name$ free ) + dup >reclen no-dir-space? if ( name$ new-reclen ) \ doesn't fit, allocate more room - drop bsize ( name$ bsize ) + bsize ( name$ bsize ) append-block lblk#++ get-dirblk drop then ( name$ rec-len ) + + \ At this point dirent points to the place for the new dirent alloc-inode set-dirent false ( error? ) - r> file-handle init-inode + r> dirent-inode@ init-inode ; \ On entry: @@ -138,7 +193,9 @@ \ totoff @ is the overall offset of the directory entry that matches name$ : lookup ( name$ -- not-found? ) begin - 2dup file-name $= if 2drop false exit then + dirent-inode@ if \ inode=0 for a deleted dirent at the beginning of a block + 2dup file-name $= if 2drop false exit then + then next-dirent until 2drop true @@ -257,7 +314,7 @@ r> to inode# ; -\ Linux sometimes leaves a deleted file in the directory with an inode of 0 +\ Deleted files at the beginning of a directory block have inode=0 : next-file-info ( id -- false | id' s m h d m y len attributes name$ true ) dup if begin Modified: ofw/fs/ext2fs/layout.fth =================================================================== --- ofw/fs/ext2fs/layout.fth 2008-09-04 23:43:37 UTC (rev 922) +++ ofw/fs/ext2fs/layout.fth 2008-09-07 19:23:04 UTC (rev 923) @@ -221,19 +221,20 @@ \ **** Allocate memory for necessary data structures : allocate-buffers ( -- error? ) - /super-block alloc-mem is super-block + init-io + /super-block do-alloc is super-block get-super-block ?dup if - super-block /super-block free-mem exit + super-block /super-block do-free exit then - /gds alloc-mem is gds + /gds do-alloc is gds gds /gds gds-block# read-ublocks dup if - gds /gds free-mem - super-block /super-block free-mem exit + gds /gds do-free + super-block /super-block do-free exit then bsize /buf-hdr + dup to /buffer - #bufs * alloc-mem is block-bufs + #bufs * do-alloc is block-bufs empty-buffers bsize /l / dup to #ind-blocks1 ( #ind-blocks1 ) @@ -242,9 +243,9 @@ ; : release-buffers ( -- ) - gds /gds free-mem - block-bufs /buffer #bufs * free-mem - super-block /super-block free-mem + gds /gds do-free + block-bufs /buffer #bufs * do-free + super-block /super-block do-free ; \ LICENSE_BEGIN Modified: ofw/fs/ext2fs/methods.fth =================================================================== --- ofw/fs/ext2fs/methods.fth 2008-09-04 23:43:37 UTC (rev 922) +++ ofw/fs/ext2fs/methods.fth 2008-09-07 19:23:04 UTC (rev 923) @@ -7,6 +7,8 @@ external +: free-bytes ( -- d ) total-free-blocks bsize um* ; + : $create ( name$ -- error? ) o# 100666 ($create) ; @@ -103,7 +105,7 @@ \ XXX I am sceptical about this line. dup 0> if lblk#++ then ( actual ) true to modified? - flush \ XXX kludge for tests +\ flush \ XXX kludge for tests ; : $ext2fsopen ( adr len mode -- false | fid fmode size align close seek write read true ) Modified: ofw/fs/ext2fs/sb.fth =================================================================== --- ofw/fs/ext2fs/sb.fth 2008-09-04 23:43:37 UTC (rev 922) +++ ofw/fs/ext2fs/sb.fth 2008-09-07 19:23:04 UTC (rev 923) @@ -8,6 +8,8 @@ 1024 constant /super-block h# ef53 constant fs-magic +0 instance partition-offset + 0 instance value super-block 0 instance value gds @@ -20,9 +22,11 @@ \ superblock data : +sbl ( index -- value ) super-block swap la+ int@ ; : +sbw ( index -- value ) super-block swap wa+ short@ ; +: datablock0 ( -- n ) 5 +sbl ; : logbsize ( -- n ) 6 +sbl 1+ ; : bsize ( -- n ) 1024 6 +sbl lshift ; \ 1024 : /frag ( -- n ) 1024 7 +sbl lshift ; \ 1024 +: bpg ( -- n ) 8 +sbl ; \ h#2000 blocks_per_group : fpg ( -- n ) 9 +sbl ; \ h#2000 frags_per_group : ipg ( -- n ) 10 +sbl ; \ h#790 inodes_per_group : magic ( -- n ) 28 +sbw ; @@ -36,31 +40,49 @@ \ : total-inodes ( -- n ) 0 +sbl ; : total-blocks ( -- n ) 1 +sbl ; -\ : total-free-blocks ( -- n ) 3 +sbl ; +: total-free-blocks ( -- n ) 3 +sbl ; \ : total-free-inodes ( -- n ) 4 +sbl ; \ : total-free-blocks+! ( -- n ) 3 +sbl + super-block 3 la+ int! ; \ : total-free-inodes+! ( -- n ) 4 +sbl + super-block 4 la+ int! ; : total-free-blocks! ( -- n ) super-block 3 la+ int! ; : total-free-inodes! ( -- n ) super-block 4 la+ int! ; -: #groups ( -- n ) total-blocks fpg ceiling ; +: #groups ( -- n ) total-blocks bpg ceiling ; \ Don't write to a disk that uses extensions we don't understand : unknown-extensions? ( -- unsafe? ) - 0 super-block h# 54 + h# 14 bounds do i l@ or 4 +loop 0<> + 24 +sbl 4 and if ." ext3 journal needs recovery" cr then + + 23 +sbl h# ffffffff invert and \ Accept all compat extensions + 24 +sbl h# 00000002 invert and or \ Incompatible - accept FILETYPE + 25 +sbl h# 00000001 invert and or \ RO - accept SPARSE_SUPER ; +: do-alloc ( adr len -- ) " dma-alloc" $call-parent ; +: do-free ( adr len -- ) " dma-free" $call-parent ; + +: init-io ( -- ) + " offset-low" $call-parent " offset-high" $call-parent + ublock um/mod nip to partition-offset +; + : write-ublocks ( adr len dev-block# -- error? ) - ublock um* " seek" $call-parent ?dup if exit then ( adr len ) - tuck " write" $call-parent <> +\ ublock um* " seek" $call-parent ?dup if exit then ( adr len ) +\ tuck " write" $call-parent <> + partition-offset + swap ublock 1- + 9 rshift ( adr block# #blocks ) + dup >r " write-blocks" $call-parent r> <> ; : put-super-block ( -- error? ) super-block /super-block super-block# write-ublocks ; : read-ublocks ( adr len dev-block# -- error? ) - ublock um* " seek" $call-parent ?dup if exit then ( adr len ) - tuck " read" $call-parent <> + partition-offset + swap ublock 1- + 9 rshift ( adr block# #blocks ) + dup >r " read-blocks" $call-parent r> <> + +\ ublock um* " seek" $call-parent ?dup if exit then ( adr len ) +\ tuck " read" $call-parent <> ; + : get-super-block ( -- error? ) super-block /super-block super-block# read-ublocks ?dup if exit then @@ -73,11 +95,13 @@ magic fs-magic <> ; -: gds-block# ( -- dev-block# ) +: gds-fs-block# ( -- fs-block# ) bsize d# 1024 = if 2 else 1 then ( logical block# ) - bsize ublock / * ( dev-block# ) ; -: /gds ( -- size ) #groups h# 20 * ; +: gds-block# ( -- dev-block# ) + gds-fs-block# bsize ublock / * ( dev-block# ) +; +: /gds ( -- size ) #groups h# 20 * ublock round-up ; : group-desc ( group# -- adr ) h# 20 * gds + ; : gpimin ( group -- block# ) group-desc 2 la+ int@ ; : blkstofrags ( #blocks -- #frags ) ; \ XXX is this needed?

1 0

r922 - cpu/x86/pc/olpc
by svn＠openfirmware.info Sept. 4, 2008

Sept. 4, 2008

Author: wmb Date: 2008-09-05 01:43:37 +0200 (Fri, 05 Sep 2008) New Revision: 922 Modified: cpu/x86/pc/olpc/rtcwake.fth Log: OLPC - moved RTC alarm functions into RTC node. Modified: cpu/x86/pc/olpc/rtcwake.fth =================================================================== --- cpu/x86/pc/olpc/rtcwake.fth 2008-09-03 04:56:11 UTC (rev 921) +++ cpu/x86/pc/olpc/rtcwake.fth 2008-09-04 23:43:37 UTC (rev 922) @@ -1,54 +1,67 @@ purpose: Suspend/resume test with RTC wakeup \ See license at end of file -: enable-rtc-irq ( -- ) h# a1 pc@ h# fe and h# a1 pc! ; -: disable-rtc-irq ( -- ) h# a1 pc@ 1 or h# a1 pc! ; - \ Must agree with lxmsrs.fth h# 3d constant cmos-alarm-day \ Offset of day alarm in CMOS h# 3e constant cmos-alarm-month \ Offset of month alarm in CMOS h# 32 constant cmos-century \ Offset of century byte in CMOS dev /rtc - cmos-alarm-day " alarm_day" integer-property - cmos-alarm-month " alarm_month" integer-property - cmos-century " century" integer-property -dend -false value enable-rtc-irq? +cmos-alarm-day " alarm_day" integer-property +cmos-alarm-month " alarm_month" integer-property +cmos-century " century" integer-property -: rtc-handler ( -- ) h# c cmos@ drop ." R" ; \ Clear RTC interrupt flags +\ There are a couple of reasons why you might not want to enable the IRQ: +\ a) It might be shared with the timer IRQ so it is already enabled +\ b) When using the alarm to wakeup from sleep, the IRQ might be unnecessary. -: enable-rtc-alarm ( -- ) +0 value alarm-irq +false value enable-alarm-irq? + +defer alarm-hook ' noop to alarm-hook + +: disable-alarm ( -- ) + enable-alarm-irq? if alarm-irq disable-interrupt then + h# b cmos@ h# 20 invert and h# b cmos! +; + +: rtc-handler ( -- ) + disable-alarm + h# c cmos@ drop \ Clear RTC interrupt flags + alarm-hook +; + +: enable-alarm ( -- ) ['] rtc-handler 8 interrupt-handler! - - enable-rtc-irq? if enable-rtc-irq then + enable-alarm-irq? if alarm-irq disable-interrupt then h# c cmos@ drop \ Clear RTC interrupt flags h# b cmos@ h# 20 or h# b cmos! ; -: disable-rtc-alarm ( -- ) - disable-rtc-irq - h# b cmos@ h# 20 invert and h# b cmos! -; -: bcd-cmos! ( binary -- ) " bcd!" clock-node @ $call-method ; -: set-rtc-alarm ( secs -- ) - disable-rtc-alarm + +: set-alarm ( [ handler-xt ] secs -- ) \ No handler-xt if secs is 0 + disable-alarm + ?dup 0= if exit then ( handler-xt secs ) + swap to alarm-hook ( secs ) now ( secs s m h ) d# 60 * d# 60 * swap d# 60 * + + + ( s ) d# 60 /mod d# 60 /mod d# 24 mod ( s m h ) h# c0 cmos-alarm-month cmos! ( s m h ) \ Any day h# c0 cmos-alarm-day cmos! ( s m h ) \ Any month - 5 bcd-cmos! 3 bcd-cmos! 1 bcd-cmos! ( ) - enable-rtc-alarm + 5 bcd! 3 bcd! 1 bcd! ( ) + enable-alarm ; + +dend + +: show-rtc-wake ." R" ; + d# 1 constant rtc-alarm-delay : pm-sleep-rtc ( -- ) - false to enable-rtc-irq? \ Spec says that IRQ is not necessary - rtc-alarm-delay set-rtc-alarm - h# 400.0000 0 acpi-l! \ Enable RTC SCI + 0 acpi-l@ h# 400.0000 or 0 acpi-l! \ Enable RTC SCI + ['] show-rtc-wake rtc-alarm-delay " set-alarm" clock-node @ $call-method s - disable-rtc-alarm - 0 0 acpi-l! \ Disable RTC SCI + 0 acpi-l@ h# 400.0000 invert and 0 acpi-l! \ Disable RTC SCI ; : rtc-wackup 0

1 0

r921 - cpu/x86/pc/olpc
by svn＠openfirmware.info Sept. 2, 2008

Sept. 2, 2008

Author: wmb Date: 2008-09-03 06:56:11 +0200 (Wed, 03 Sep 2008) New Revision: 921 Modified: cpu/x86/pc/olpc/resume.bth Log: olpc/resume.bth - Fixed an incorrect comment; no substantive impact. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2008-09-03 04:55:22 UTC (rev 920) +++ cpu/x86/pc/olpc/resume.bth 2008-09-03 04:56:11 UTC (rev 921) @@ -276,7 +276,7 @@ h# 613c config-rb al stos \ SDHCI IRQ h# 6210 config-rl ax stos \ Camera BAR - h# 6204 config-rw ax stos \ SDHCI enables + h# 6204 config-rw ax stos \ Camera enables \ Other state we might want to save: \ ISA DMA Controller

1 0

r920 - in clients: emacs/x86 lib/x86
by svn＠openfirmware.info Sept. 2, 2008

Sept. 2, 2008

Author: wmb Date: 2008-09-03 06:55:22 +0200 (Wed, 03 Sep 2008) New Revision: 920 Modified: clients/emacs/x86/Makefile clients/lib/x86/start.s Log: Client library cleanups - eliminated unused symbols in start.s, changed CFLAGS in emacs makefile to match lib/ compiler options. Modified: clients/emacs/x86/Makefile =================================================================== --- clients/emacs/x86/Makefile 2008-09-03 04:52:06 UTC (rev 919) +++ clients/emacs/x86/Makefile 2008-09-03 04:55:22 UTC (rev 920) @@ -9,7 +9,9 @@ HLIBDIR=$(BP)/clients/lib LIBDIR=$(HLIBDIR)/x86 -CFLAGS= -I. -I$(SRCDIR) -I$(HLIBDIR) +INCS=-I. -I$(SRCDIR) -I$(HLIBDIR) +MODES=-g -m32 -fno-builtin -fno-stack-limit -fno-stack-protector +CFLAGS= $(INCS) $(MODES) CC= gcc LFLAGS= -T emacs.lds -N -e _start Modified: clients/lib/x86/start.s =================================================================== --- clients/lib/x86/start.s 2008-09-03 04:52:06 UTC (rev 919) +++ clients/lib/x86/start.s 2008-09-03 04:55:22 UTC (rev 920) @@ -35,8 +35,6 @@ #L1: # leave ret -Lfe1: - .size _start,Lfe1-_start .globl call_firmware .type call_firmware,@function @@ -47,8 +45,6 @@ call *%ebx pop %ebx ret -Lfe2: - .size _call_firmware,Lfe2-_call_firmware # LICENSE_BEGIN # Copyright (c) 2006 FirmWorks

1 0

r919 - in cpu/x86/pc: . olpc
by svn＠openfirmware.info Sept. 2, 2008

Sept. 2, 2008

Author: wmb Date: 2008-09-03 06:52:06 +0200 (Wed, 03 Sep 2008) New Revision: 919 Added: cpu/x86/pc/olpc/help.fth Modified: cpu/x86/pc/linux.fth cpu/x86/pc/olpc/fw.bth Log: OLPC trac 8280 - set lines/page based on the number of lines on the screen. Modified: cpu/x86/pc/linux.fth =================================================================== --- cpu/x86/pc/linux.fth 2008-09-02 22:45:08 UTC (rev 918) +++ cpu/x86/pc/linux.fth 2008-09-03 04:52:06 UTC (rev 919) @@ -283,47 +283,6 @@ ." More information: http://firmworks.com/QuickRef.html" cr ; -d# 34 to default-#lines - -warning @ warning off -: help ( -- ) - blue-letters ." UPDATES:" black-letters mcr - ." flash u:\q2c18.rom Rewrite the firmware from USB key" mcr - ." flash nand:\q2c18.rom Rewrite the firmware from NAND file" mcr - ." copy-nand u:\boot\nand290.img Rewrite the OS on NAND from USB key" mcr - 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 nand:\boot\ List NAND FLASH /boot directory" mcr - ." dir nand:\boot\*.rom List .rom files in NAND FLASH /boot directory" mcr - 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 - mcr - blue-letters ." CONFIGURATION VARIABLES FOR BOOTING:" black-letters mcr - ." boot-device Kernel or boot script path. Example: nand:\boot\olpc.fth" mcr - ." boot-file Default cmdline. Example: console=ttyS0,115200" mcr - ." ramdisk initrd pathname. Example: disk:\boot\initrd.imz" mcr - 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 - 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 - mcr - ." More information: " - green-letters ." http://wiki.laptop.org/go/OFW_FAQ" black-letters cr -; -warning ! - - \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-09-02 22:45:08 UTC (rev 918) +++ cpu/x86/pc/olpc/fw.bth 2008-09-03 04:52:06 UTC (rev 919) @@ -314,7 +314,13 @@ vpci-devices-on \ Do this after quieting USB ; ' setup-for-linux to linux-hook +: screen-#lines ( -- n ) + screen-ih 0= if default-#lines exit then + screen-ih package( #lines )package +; +' screen-#lines to lines/page +fload ${BP}/cpu/x86/pc/olpc/help.fth fload ${BP}/cpu/x86/pc/olpc/gui.fth fload ${BP}/cpu/x86/pc/olpc/suspend.fth \ Suspend/resume setup fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic Added: cpu/x86/pc/olpc/help.fth =================================================================== --- cpu/x86/pc/olpc/help.fth (rev 0) +++ cpu/x86/pc/olpc/help.fth 2008-09-03 04:52:06 UTC (rev 919) @@ -0,0 +1,32 @@ +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 nand:\q2c18.rom Rewrite the firmware from NAND file" mcr + ." copy-nand u:\boot\nand290.img Rewrite the OS on NAND 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 nand:\boot\*.rom List .rom files in NAND FLASH /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: nand:\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 + blue-letters ." More information: " black-letters mcr + green-letters ." http://wiki.laptop.org/go/OFW_FAQ" black-letters cr +; +warning !

1 0

r918 - cpu/x86/pc/neptune dev/geode
by svn＠openfirmware.info Sept. 2, 2008

Sept. 2, 2008

Author: wmb Date: 2008-09-03 00:45:08 +0200 (Wed, 03 Sep 2008) New Revision: 918 Modified: cpu/x86/pc/neptune/banner.fth cpu/x86/pc/neptune/devices.fth dev/geode/msr.fth Log: Neptune - auto-detect PCI, CPU, and memory speeds in stand-init. Modified: cpu/x86/pc/neptune/banner.fth =================================================================== --- cpu/x86/pc/neptune/banner.fth 2008-09-02 21:20:06 UTC (rev 917) +++ cpu/x86/pc/neptune/banner.fth 2008-09-02 22:45:08 UTC (rev 918) @@ -3,25 +3,13 @@ headerless -: geode-print-pll ( -- ) - ." Geode CPU Speed " - h# 4c00.0014 rdmsr swap drop - h# 3E and 2/ - 1 + d# 66 * 2/ decimal . cr - - ." GeodeLink Speed " - h# 4c00.0014 rdmsr swap drop - h# FFF and 7 >> - 1 + d# 66 * 2/ decimal . cr - - ." PCI Speed " - h# 4c00.0014 rdmsr drop - 1 7 << and - 0= if d# 33 . else d# 66 . then cr - - hex +: show-speeds ( -- ) + \ Round so the numbers come out the way they are conventionally cited + ." CPU " cpu-speed d# 1,000,000 rounded-/ .d ." MHz, " + ." Memory " gl-speed d# 1,000,000 / .d ." MHz, " + ." PCI " pci-speed d# 1,000,000 / .d ." MHz" cr ; -' geode-print-pll to banner-extras +' show-speeds to banner-extras : .rom ( -- ) ." OpenFirmware " @@ -34,8 +22,7 @@ ; : (xbanner-basics) ( -- ) - ?spaces cpu-model type ." , " .memory cr - ?spaces .rom cr + ?spaces cpu-model type ." , " .memory ." , " .rom cr ; ' (xbanner-basics) to banner-basics Modified: cpu/x86/pc/neptune/devices.fth =================================================================== --- cpu/x86/pc/neptune/devices.fth 2008-09-02 21:20:06 UTC (rev 917) +++ cpu/x86/pc/neptune/devices.fth 2008-09-02 22:45:08 UTC (rev 918) @@ -26,11 +26,9 @@ \ Use the CPU chip's Time Stamp Counter for timing; it does just what we want fload ${BP}/cpu/x86/tsc.fth -\ d# 366,666 to ms-factor \ XXX is this right???? -\ d# 367 to us-factor stand-init: - d# 366,666,667 " AMD,Geode LX" + cpu-speed " AMD,Geode LX" " /cpu" find-device ( cpu-clock-hz model$ ) " model" string-property ( cpu-clock-hz ) @@ -300,7 +298,7 @@ stand-init: PCI properties " /pci" find-device - d# 66,666,667 " clock-frequency" integer-property + pci-speed " clock-frequency" integer-property dend ; @@ -339,6 +337,7 @@ \ XXX perhaps report subordinate version info? " Neptune" model " Dave Neptune" " banner-name" string-property + gl-speed " clock-frequency" integer-property dend " /openprom" find-device Modified: dev/geode/msr.fth =================================================================== --- dev/geode/msr.fth 2008-09-02 21:20:06 UTC (rev 917) +++ dev/geode/msr.fth 2008-09-02 22:45:08 UTC (rev 918) @@ -81,6 +81,23 @@ : usb-base-off ( msr# -- ) 0. rot msr! ; : usb-kel-off ( msr# -- ) 0. rot msr! ; +: pci-speed ( -- hz ) + h# 4c00.0014 rdmsr drop ( low ) + 1 7 << and if d# 66,666,667 else d# 33,333,333 then +; +: gl-speed ( -- hz ) + pci-speed ( hz ) + h# 4c00.0014 rdmsr nip >r ( hz r: high ) + r@ 6 rshift 1 and if 2/ then ( hz' r: high ) + r> 7 rshift h# 1f and 1+ * ( hz' ) +; +: cpu-speed ( -- hz ) + pci-speed ( hz ) + h# 4c00.0014 rdmsr nip >r ( hz r: high ) + r@ 1 and if 2/ then ( hz' r: high ) + r> 1 rshift h# 1f and 1+ * ( hz' ) +; + \ LICENSE_BEGIN \ Copyright (c) 2008 FirmWorks \

1 0

r917 - cpu/x86/pc/neptune
by svn＠openfirmware.info Sept. 2, 2008

Sept. 2, 2008

Author: wmb Date: 2008-09-02 23:20:06 +0200 (Tue, 02 Sep 2008) New Revision: 917 Modified: cpu/x86/pc/neptune/devices.fth Log: Neptune - open RTC node at startup. Modified: cpu/x86/pc/neptune/devices.fth =================================================================== --- cpu/x86/pc/neptune/devices.fth 2008-09-02 21:18:48 UTC (rev 916) +++ cpu/x86/pc/neptune/devices.fth 2008-09-02 21:20:06 UTC (rev 917) @@ -186,11 +186,9 @@ 8 encode-int 0 encode-int encode+ " interrupts" property 2 encode-int " device#" property end-package -0 [if] \ XXX check me stand-init: RTC " /rtc" open-dev clock-node ! ; -[then] fload ${BP}/cpu/x86/pc/cpunode.fth fload ${BP}/cpu/x86/k6cputest.fth \ Burnin test for K6 CPU

1 0

r916 - clients/lib
by svn＠openfirmware.info Sept. 2, 2008

Sept. 2, 2008

Author: wmb Date: 2008-09-02 23:18:48 +0200 (Tue, 02 Sep 2008) New Revision: 916 Modified: clients/lib/printf.c Log: Client library - support printf field width specifiers. Modified: clients/lib/printf.c =================================================================== --- clients/lib/printf.c 2008-09-02 21:18:01 UTC (rev 915) +++ clients/lib/printf.c 2008-09-02 21:18:48 UTC (rev 916) @@ -40,30 +40,39 @@ } STATIC int -printbase(ULONG x, int base) +printbase(ULONG x, int base, int fieldlen, char padchar, int upcase) { - static char itoa[] = "0123456789abcdef"; + static char lc_digits[] = "0123456789abcdef"; + static char uc_digits[] = "0123456789ABCDEF"; ULONG j; - char buf[16], *s = buf; + char buf[32], *s = buf; int n = 0; - if (x == 0) { - putchar('0'); - n++; - return (n); + memset(buf, 32, 0); + + if (base == 10 && (LONG) x < 0) { + *s++ = '-'; + x = -x; } - memset(buf, 16, 0); - while (x) { + + do { j = x % base; - *s++ = itoa[j]; + *s++ = upcase ? uc_digits[j] : lc_digits[j]; x -= j; x /= base; + } while (x); + +cvtdone: + for (fieldlen -= (s-buf); fieldlen > 0; --fieldlen) { + putchar(padchar); + n++; } for (--s; s >= buf; --s) { putchar(*s); n++; } + return (n); } @@ -73,6 +82,8 @@ ULONG x; char c, *s; int n = 0; + int fieldlen; + char padchar; while (c = *fmt++) { if (c != '%') { @@ -80,23 +91,43 @@ n++; continue; } - switch (c = *fmt++) { + if ((c = *fmt++) == '\0') + goto out; + + if (c == '.') // Ignore the numeric grouping flag + if ((c = *fmt++) == '\0') + goto out; + + padchar = ' '; + if (c == '0') { + padchar = c; + if ((c = *fmt++) == '\0') + goto out; + } + + fieldlen = 0; + while (c >= '0' && c <= '9') { + fieldlen = (fieldlen * 10) + (c - '0'); + if ((c = *fmt++) == '\0') + goto out; + } + + switch (c) { case 'x': x = va_arg(args, ULONG); - n += printbase(x, 16); + n += printbase(x, 16, fieldlen, padchar, 0); break; + case 'X': + x = va_arg(args, ULONG); + n += printbase(x, 16, fieldlen, padchar, 1); + break; case 'o': x = va_arg(args, ULONG); - n += printbase(x, 8); + n += printbase(x, 8, fieldlen, padchar, 0); break; case 'd': x = va_arg(args, ULONG); - if ((LONG) x < 0) { - putchar('-'); - n++; - x = -x; - } - n += printbase(x, 10); + n += printbase(x, 10, fieldlen, padchar, 0); break; case 'c': c = va_arg(args, int); @@ -116,6 +147,7 @@ break; } } +out: return(n); }

1 0