OpenBIOS September 2007

openbios@openbios.org

3 participants
60 discussions

r608 - cpu/x86/pc/olpc
by svn＠openbios.org 17 Sep '07

17 Sep '07

Author: wmb Date: 2007-09-18 01:15:36 +0200 (Tue, 18 Sep 2007) New Revision: 608 Modified: cpu/x86/pc/olpc/copynand.fth cpu/x86/pc/olpc/nandstat.fth Log: save-nand now creates a .crc file . New "scan-nand" command. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2007-09-17 23:09:19 UTC (rev 607) +++ cpu/x86/pc/olpc/copynand.fth 2007-09-17 23:15:36 UTC (rev 608) @@ -15,12 +15,16 @@ 0 value crc-buf -: >crc ( index -- crc ) crc-buf swap la+ l@ ; +: >crc ( index -- 'crc ) crc-buf swap la+ ; + : $call-nand ( ?? method$ -- ?? ) nandih $call-method ; +: close-image-file ( -- ) + fileih ?dup if 0 to fileih close-dev then +; : close-nand-ihs ( -- ) - fileih ?dup if 0 to fileih close-dev 0 to #image-eblocks then + close-image-file nandih ?dup if 0 to nandih close-dev 0 to #nand-pages then crc-ih ?dup if 0 to crc-ih close-dev then #crc-records if @@ -118,7 +122,7 @@ ; : check-mem-crc ( record# -- ) - >crc ( crc ) + >crc l@ ( crc ) load-base /nand-block $crc ( crc actual-crc ) 2dup <> if cr ." CRC miscompare - expected " swap . ." got " . cr @@ -133,6 +137,9 @@ #crc-records if check-mem-crc else drop then ; +defer show-init ( #eblocks -- ) +' drop to show-init + defer show-erasing ( #blocks -- ) : (show-erasing) ( #blocks -- ) ." Erasing " . ." blocks" cr ; ' (show-erasing) to show-erasing @@ -151,17 +158,26 @@ ' drop to show-clean defer show-cleaning ( -- ) -: (show-cleaning) ( -- ) cr ." Cleanmarkers" cr ; +: (show-cleaning) ( -- ) cr ." Cleanmarkers" ; ' (show-cleaning) to show-cleaning defer show-writing ( #blocks -- ) : (show-writing) ." Writing " . ." blocks" cr ; ' (show-writing) to show-writing +defer show-pending ( block# -- ) +' drop to show-pending + defer show-written : (show-written) ( block# -- ) (cr . ; ' (show-written) to show-written +defer show-strange +' drop to show-strange + +defer show-done +' cr to show-done + : copy-nand ( "devspec" -- ) open-nand get-img-filename @@ -170,7 +186,9 @@ ['] noop to show-progress - #nand-pages nand-pages/block / show-erasing + #nand-pages nand-pages/block / dup show-init ( #eblocks ) + + show-erasing ( ) ['] show-bad ['] show-erased ['] show-bbt-block " (wipe)" $call-nand #image-eblocks show-writing @@ -185,6 +203,7 @@ show-cleaning ['] show-clean " put-cleanmarkers" $call-nand + show-done close-nand-ihs ; @@ -243,7 +262,7 @@ load-base " read-next-block" $call-nand ( ) - load-base /nand-block $crc i >crc ( actual-crc expected-crc ) + load-base /nand-block $crc i >crc l@ ( actual-crc expected-crc ) 2dup <> if ( actual-crc expected-crc ) cr ." CRC miscompare - expected " . ." got " . ( ) ." in NAND block starting at page " @@ -264,44 +283,101 @@ ; true value dump-oob? -: (dump-nand) ( "devspec" -- ) - open-nand - safe-parse-word ( name$ ) +: make-new-file ( devspec$ -- fileih ) + 2dup ['] $delete catch if 2drop then ( name$ ) + 2dup ['] $create-file catch if ( name$ x x ) + 2drop ( name$ ) + " Can't open a file. Try using the raw disk?" confirm if ( name$ ) + open-dev ( ih ) + else ( name$ ) + 2drop 0 ( ih=0 ) + then ( ih ) + else ( name$ ih ) + nip nip ( ih ) + then ( ih ) +; - cr ." Dumping to " 2dup type cr +: alloc-crc-buf ( -- ) + #nand-pages nand-pages/block / to #crc-records + #crc-records /l* alloc-mem to crc-buf +; - 2dup ['] $delete catch if 2drop then ( name$ ) - 2dup ['] $create-file catch if - 2drop - " Can't open a file. Try using the raw disk?" confirm if - open-file - else - 2drop 0 +: save-crcs ( -- ) + image-name$ crc-name-buf place + true + crc-name$ nip 4 >= if + crc-name$ + 4 - c@ [char] . = if + " crc" crc-name$ + 3 - swap move + drop false then - then - to fileih + then ( error? ) + " Filename needs a 3-character extension" ?nand-abort + crc-name$ ( name$ ) + ." CRC file is " 2dup type ( name$ ) + + make-new-file to crc-ih + + crc-ih 0= " Can't open CRC output file" ?nand-abort + + #image-eblocks 0 ?do + i >crc l@ + push-hex + <# newline hold u# u# u# u# u# u# u# u# u#> ( adr len ) + pop-base + " write" crc-ih $call-method 9 <> " CRC write failed" ?nand-abort + loop + +; +: open-dump-file ( devspec$ -- ) + cr ." Dumping to " 2dup type cr + + make-new-file to fileih + fileih 0= " Can't open output" ?nand-abort +; +: (dump-nand) ( "devspec" -- ) + open-nand + get-img-filename + + dump-oob? 0= if alloc-crc-buf then + image-name$ open-dump-file + + 0 to #image-eblocks + \ The stack is empty at the end of each line unless otherwise noted - #nand-pages 0 do - (cr i . + dump-oob? if #nand-pages else " usable-page-limit" $call-nand then + 0 do + (cr i nand-pages/block / . load-base i nand-pages/block " read-blocks" $call-nand nand-pages/block = if load-base /nand-block written? if - load-base /nand-block " write" fileih $call-method drop + ." 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 - i pad ! pad 4 " 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 + else + ." s" then then nand-pages/block +loop cr ." Done" cr + close-image-file + save-crcs + close-nand-ihs ; : dump-nand ( "devspec" -- ) true to dump-oob? (dump-nand) ; Modified: cpu/x86/pc/olpc/nandstat.fth =================================================================== --- cpu/x86/pc/olpc/nandstat.fth 2007-09-17 23:09:19 UTC (rev 607) +++ cpu/x86/pc/olpc/nandstat.fth 2007-09-17 23:15:36 UTC (rev 608) @@ -12,71 +12,250 @@ 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# -- ) #cols /mod grid-w grid-h xy* ulhc d+ ; +: >loc ( eblock# -- x y ) #cols /mod grid-w grid-h xy* ulhc xy+ ; -: show-state ( eblock# state -- ) - swap >loc glyph-w glyph-h " fill-rectangle" $call-screen -; +: 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 - 0 0 0 rgb>565 constant erased-color -h# ff 0 0 rgb>565 constant bad-color - 0 0 h# ff rgb>565 constant clean-color -h# ff h# ff 0 rgb>565 constant writing-color - 0 h# ff 0 rgb>565 constant written-color -h# ff h# ff h# ff rgb>565 constant starting-color +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-erasing ( #eblocks -- ) - cursor-off " erase-screen" $call-screen 0 status-line at-xy - ." Erasing " +: 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 ( -- ) ." Cleanmarkers" cr cursor-on ; +: 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 " - writing-color ( #eblocks color ) - 0 rot 0 ?do ( color eblock# ) - dup nand-pages/block * " block-bad?" $call-nand 0= if ( color eblock# ) - 2dup swap show-state ( color eblock# ) - 1 ( color eblock# increment ) - else ( color eblock# ) - 0 ( color eblock# increment ) - then ( color eblock# increment ) - swap 1+ swap ( color eblock#' increment ) - +loop ( color eblock#' ) - 2drop + 0 rot 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 ; -: gshow-written ( eblock# -- ) written-color show-state ; +: gshow-written ( eblock# -- ) + dup written-color show-state + d# 20 status-line at-xy .x +; : 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 load-base h# 100000 + /nand-block comp 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# -- ) + d# 20 status-line at-xy + dup .x + 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# -- ) h# ffff cell-border ; +: highlight ( block# -- ) 0 cell-border ; +: +block ( offset -- ) + current-block + nand-block-limit mod ( new-block ) + current-block lowlight + to current-block + current-block highlight + 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 ." Arrows, fn Arrows to move, Esc to exit" cr + 0 to current-block + current-block highlight + false to examine-done? + begin key process-key examine-done? until + current-block lowlight +; + + +: scan-nand ( -- ) + open-nand + nand-map 0= if + #nand-pages nand-pages/block / alloc-mem to nand-map + then + + \ Something to compare against + load-base h# 100000 + /nand-block h# ff fill + + " 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 + close-nand-ihs + + examine-nand +;

1 0

r607 - cpu/x86/pc/olpc/build
by svn＠openbios.org 17 Sep '07

17 Sep '07

Author: wmb Date: 2007-09-18 01:09:19 +0200 (Tue, 18 Sep 2007) New Revision: 607 Modified: cpu/x86/pc/olpc/build/ Log: svn ignore *.public in build/ Property changes on: cpu/x86/pc/olpc/build ___________________________________________________________________ Name: svn:ignore - build ofw.elf builton.fth *.rom *.bin *.version forth sourceurl *.md5 + build ofw.elf builton.fth *.rom *.bin *.version forth sourceurl *.md5 *.public

1 0

r606 - cpu/x86 dev/mmc/sdhci forth/lib ofw/confvar ofw/core
by svn＠openbios.org 17 Sep '07

17 Sep '07

Author: wmb Date: 2007-09-18 01:06:51 +0200 (Tue, 18 Sep 2007) New Revision: 606 Modified: cpu/x86/basefw.bth dev/mmc/sdhci/sdhci.bth dev/mmc/sdhci/sdhci.fth forth/lib/objects.fth ofw/confvar/loadcv.fth ofw/core/loadmore.fth Log: Added various ifdefs in the build process to accomodate building a stripped-down image for firmware recovery. Modified: cpu/x86/basefw.bth =================================================================== --- cpu/x86/basefw.bth 2007-09-17 22:52:04 UTC (rev 605) +++ cpu/x86/basefw.bth 2007-09-17 23:06:51 UTC (rev 606) @@ -22,7 +22,9 @@ \ fload ${BP}/forth/lib/showmsgs.fth \ List error messages fload ${BP}/ofw/core/ofwcore.fth \ Device tree and other OBP routines +[ifndef] no-tools fload ${BP}/ofw/core/ofwfw.fth \ FirmWorks enhancements +[then] fload ${BP}/ofw/core/memops.fth \ Call memory node methods fload ${BP}/ofw/core/mmuops.fth \ Call MMU node methods @@ -33,14 +35,18 @@ fload ${BP}/cpu/x86/vector.fth \ Interrupt vectors \ fload ${BP}/forth/lib/struct.fth fload ${BP}/cpu/x86/interrup.fth \ Enable and disable interrupts +[ifdef] pssave fload ${BP}/cpu/x86/catchexc.fth fload ${BP}/cpu/x86/ctrace.fth \ C stack backtrace +[then] +[ifdef] valid-adr? : mapped? ( adr -- flag ) " translate" mmu-node @ $call-method dup if nip nip then ; ' mapped? to valid-adr? +[then] fload ${BP}/cpu/x86/descr.fth \ Decode segment descriptors fload ${BP}/cpu/x86/dtacc.fth \ Descriptor table access words @@ -49,7 +55,9 @@ fload ${BP}/ofw/core/silentmd.fth \ NVRAM variable silent-mode? fload ${BP}/cpu/x86/call.fth \ Primitive subroutine calls +[ifndef] no-tools fload ${BP}/cpu/x86/centry.fth \ Low-level client entry and exit +[then] [ifdef] v2-compat fload ${BP}/cpu/x86/textops.fth \ S Machine code for 1-bit ops @@ -70,9 +78,11 @@ fload ${BP}/cpu/x86/regacc.fth \ Register access words +\ [ifndef] no-tools fload ${BP}/ofw/fcode/loadfcod.fth \ S Fcode interpreter fload ${BP}/ofw/fcode/regcodes.fth \ Register access words +\ [then] \ File system readers fload ${BP}/ofw/core/initprog.fth \ handle fcode and Forth source @@ -84,15 +94,18 @@ fload ${BP}/ofw/fs/fatfs/loadpkg.fth \ FAT file system reader end-support-package +[ifndef] no-tools support-package: iso9660-file-system fload ${BP}/ofw/fs/cdfs/loadpkg.fth \ ISO 9660 CD-ROM file system reader end-support-package +[then] support-package: disk-label fload ${BP}/ofw/disklabel/loadpkg.fth \ Disk label package end-support-package [then] +[ifndef] no-tools [ifdef] resident-packages fload ${BP}/ofw/fs/fatfs/fdisk2.fth \ Partition map administration [else] @@ -102,6 +115,7 @@ \ defines: init-nt-disk defines: $partition [then] +[then] [ifndef] no-heads resident dispose 0 0 set-transize \ true is suppress-transient Modified: dev/mmc/sdhci/sdhci.bth =================================================================== --- dev/mmc/sdhci/sdhci.bth 2007-09-17 22:52:04 UTC (rev 605) +++ dev/mmc/sdhci/sdhci.bth 2007-09-17 23:06:51 UTC (rev 606) @@ -9,6 +9,13 @@ FCode-version2 fload ${BP}/dev/mmc/sdhci/sdhci.fth + +init +new-device + " sdmmc" " $load-driver" eval drop +finish-device + + fload ${BP}/dev/mmc/sdhci/selftest.fth end0 Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2007-09-17 22:52:04 UTC (rev 605) +++ dev/mmc/sdhci/sdhci.fth 2007-09-17 23:06:51 UTC (rev 606) @@ -608,15 +608,9 @@ h# 7fff h# 60 cw! unmap-regs ; -init external -new-device - " sdmmc" " $load-driver" eval drop -finish-device - - \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: forth/lib/objects.fth =================================================================== --- forth/lib/objects.fth 2007-09-17 22:52:04 UTC (rev 605) +++ forth/lib/objects.fth 2007-09-17 23:06:51 UTC (rev 606) @@ -137,11 +137,13 @@ \ will not show the action name and its argument on separate lines \ if it happens to be near the end of a line. +[ifdef] install-decomp : .action ( ip -- ip' ) dup token@ .name ta1+ dup token@ .name ta1+ ; also hidden also ' to ' .action ' skip-(') install-decomp ' addr ' .action ' skip-(') install-decomp previous previous +[then] : ?has-action ( object-acf action-acf -- object-acf action-acf ) 2dup >body >action# >action-adr .object-error 2drop @@ -158,6 +160,7 @@ -level \ Exit temporary compile state, perhaps run word ; +[ifdef] object-definer : (object-definer) ( action-acf -- definer ) dup /n - @ ( action-acf #actions ) 1- /token * - /n - token@ ( last-action-acf ) @@ -170,6 +173,7 @@ until ; also hidden ' (object-definer) is object-definer previous +[then] \ action-compiler: to action-compiler: addr Modified: ofw/confvar/loadcv.fth =================================================================== --- ofw/confvar/loadcv.fth 2007-09-17 22:52:04 UTC (rev 605) +++ ofw/confvar/loadcv.fth 2007-09-17 23:06:51 UTC (rev 606) @@ -4,7 +4,9 @@ fload ${BP}/ofw/ppp/md5.fth fload ${BP}/ofw/confvar/conftype.fth \ Configuration variable base types fload ${BP}/ofw/confvar/nvramrcg.fth \ NVRAMRC (generic version) +[ifndef] no-tools fload ${BP}/ofw/confvar/nvalias.fth \ Persistent devaliases +[then] fload ${BP}/ofw/confvar/nvcache.fth \ NVRAM cache fload ${BP}/ofw/confvar/nameval.fth \ name=value config variable encoding \ LICENSE_BEGIN Modified: ofw/core/loadmore.fth =================================================================== --- ofw/core/loadmore.fth 2007-09-17 22:52:04 UTC (rev 605) +++ ofw/core/loadmore.fth 2007-09-17 23:06:51 UTC (rev 606) @@ -1,5 +1,6 @@ purpose: Load file for additional core routines +[ifndef] no-tools \ Load code to recognize client program header \ fload ${BP}/ofw/core/go.fth \ Initial program state @@ -9,11 +10,14 @@ \ fload ${BP}/ofw/core/dload.fth \ Diagnostic loading fload ${BP}/ofw/core/callback.fth \ Client callbacks +[then] fload ${BP}/ofw/core/deblock.fth \ Block-to-byte conversion package +[ifndef] no-tools fload ${BP}/ofw/core/dl.fth \ Diagnostic loading fload ${BP}/ofw/core/dlfcode.fth \ Serial line loading +[then] fload ${BP}/ofw/core/instcons.fth \ install-console

1 0

r605 - ofw/fs/fatfs
by svn＠openbios.org 17 Sep '07

17 Sep '07

Author: wmb Date: 2007-09-18 00:52:04 +0200 (Tue, 18 Sep 2007) New Revision: 605 Modified: ofw/fs/fatfs/fat.fth Log: FAT FS: Changed the search order for free clusters so the upward search happens before the downward one, thus eliminating severe FAT cache thrashing when creating large files, as with "save-nand". Modified: ofw/fs/fatfs/fat.fth =================================================================== --- ofw/fs/fatfs/fat.fth 2007-09-17 22:47:27 UTC (rev 604) +++ ofw/fs/fatfs/fat.fth 2007-09-17 22:52:04 UTC (rev 605) @@ -53,13 +53,22 @@ \ If the FAT cache has been modified since it was last written, flush it \ to disk. +: .sectors ( sector# #sectors -- ) + ." " . ." sectors starting at " . +; : ?flush-fat-cache ( -- ) fat-dirty w@ if - fat-sector @ #valid-sectors fat-cache @ write-sectors ( err? ) - if "CaW ". "FAT ". abort then + fat-sector @ #valid-sectors fat-cache @ write-sectors ( err? ) if + "CaW ". "FAT ". + fat-sector @ #valid-sectors .sectors + abort + then - fat-sector @ spf l@ + #valid-sectors fat-cache @ write-sectors ( err? ) - if "CaW ". ." alternate " "FAT ". abort then + fat-sector @ spf l@ + #valid-sectors fat-cache @ write-sectors if + "CaW ". ." alternate " "FAT ". + fat-sector @ spf l@ + #valid-sectors .sectors + abort + then false fat-dirty w! then @@ -172,11 +181,12 @@ fatc-start @ hint @ search-down if mark-cluster exit then then + \ Search up to the end of the disk ** 10/30/90 cpt: up to last cl (1+) + max-cl# l@ 1+ fatc-end @ search-up if mark-cluster exit then + \ Search down to the beginning of the disk 2 fatc-start @ search-down if mark-cluster exit then - \ Search up to the end of the disk ** 10/30/90 cpt: up to last cl (1+) - max-cl# l@ 1+ fatc-end @ search-up if mark-cluster exit then false ; : allocate-cluster ( hint-cluster# -- false | cluster# true )

1 0

r604 - ofw/fs/jffs2
by svn＠openbios.org 17 Sep '07

17 Sep '07

Author: wmb Date: 2007-09-18 00:47:27 +0200 (Tue, 18 Sep 2007) New Revision: 604 Modified: ofw/fs/jffs2/jffs2.fth Log: JFFS2: Changed a message from Unsupported nodetype 2006 to JFFS2 warning: Bad summary node in erase block 0xNNNN Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-09-17 22:44:57 UTC (rev 603) +++ ofw/fs/jffs2/jffs2.fth 2007-09-17 22:47:27 UTC (rev 604) @@ -697,6 +697,11 @@ endof [then] + summary-type of ( adr ) + ." JFFS2 warning: Bad summary node in erase block 0x" have-eblock# . cr + drop eb-end exit + endof ( adr nodetype ) + ( adr nodetype ) cr ." Unsupported nodetype " dup . cr

1 0

r603 - cpu/x86/Linux forth/wrapper
by svn＠openbios.org 17 Sep '07

17 Sep '07

Author: wmb Date: 2007-09-18 00:44:57 +0200 (Tue, 18 Sep 2007) New Revision: 603 Added: cpu/x86/Linux/graphdev.fth Modified: cpu/x86/Linux/Makefile forth/wrapper/wrapper.c Log: Added X graphics support, disabled by default. Modified: cpu/x86/Linux/Makefile =================================================================== --- cpu/x86/Linux/Makefile 2007-09-11 17:13:15 UTC (rev 602) +++ cpu/x86/Linux/Makefile 2007-09-17 22:44:57 UTC (rev 603) @@ -6,6 +6,7 @@ BP=../../.. CFLAGS = -O -g -m32 -DUNIX -D${OS} -DX86 +# CFLAGS += -DUSE_XCB WRTAIL = forth/wrapper WRDIR = ${BP}/${WRTAIL} Added: cpu/x86/Linux/graphdev.fth =================================================================== --- cpu/x86/Linux/graphdev.fth (rev 0) +++ cpu/x86/Linux/graphdev.fth 2007-09-17 22:44:57 UTC (rev 603) @@ -0,0 +1,42 @@ +purpose: Simulation of OFW graphics using X + +dev / new-device + " xgraphics" device-name + : open ( -- okay? ) d# 1200 d# 900 d# 392 syscall 2drop retval 0= ; + : close ( -- ) d# 396 syscall ; + + : fill-rectangle ( color565 x y w h -- ) d# 404 syscall 4drop drop ; +finish-device + +: get-color ( r g b -- color ) + d# 400 syscall 3drop retval +; + +: open-screen + " /xgraphics" open-dev to screen-ih +; + +0 value xred +0 value xgreen +0 value xblue +0 value xmagenta +0 value xblack +0 value xmagenta + +: demo ( -- ) + open-screen + + h# ff h# 00 h# 00 get-color to xred + h# 00 h# ff h# 00 get-color to xgreen + h# 00 h# 00 h# ff get-color to xblue + h# ff h# 00 h# ff get-color to xmagenta + 0 0 0 get-color to xblack + h# ff h# ff h# ff get-color to xmagenta + + d# 500 0 do i xred show-state loop + d# 1000 d# 500 do i xblue show-state loop + d# 1500 d# 1000 do i xgreen show-state loop + d# 2000 d# 1500 do i xmagenta show-state loop + + xblack d# 400 d# 300 d# 50 d# 60 " fill-rectangle" $call-screen +; Modified: forth/wrapper/wrapper.c =================================================================== --- forth/wrapper/wrapper.c 2007-09-11 17:13:15 UTC (rev 602) +++ forth/wrapper/wrapper.c 2007-09-17 22:44:57 UTC (rev 603) @@ -371,6 +371,10 @@ extern long dlopen(), dlsym(), dlerror(), dlclose(); #endif +#ifdef USE_XCB +extern long open_window(), close_window(), rgbcolor(), fill_rectangle(); +#endif + #ifdef JTAG #include "jtag.h" #endif @@ -493,7 +497,12 @@ #endif /* 376 380 384 388 */ - m_inflate, m_map, m_unmap, s_ioperm + m_inflate, m_map, m_unmap, s_ioperm, + +#ifdef USE_XCB + /* 392 396 400 404 */ + open_window, close_window, rgbcolor, fill_rectangle, +#endif }; /* * Function semantics:

1 0

r602 - cpu/x86/pc/olpc
by svn＠openbios.org 11 Sep '07

11 Sep '07

Author: wmb Date: 2007-09-11 19:13:15 +0200 (Tue, 11 Sep 2007) New Revision: 602 Modified: cpu/x86/pc/olpc/resume.bth cpu/x86/pc/olpc/suspend.fth Log: OLPC - Added sci-wakeup and lid-wakeup for suspend/resume testing. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-09-11 16:48:47 UTC (rev 601) +++ cpu/x86/pc/olpc/resume.bth 2007-09-11 17:13:15 UTC (rev 602) @@ -274,6 +274,7 @@ \ The caller chooses the wakeup conditions, so we don't do it here \ h# 0100.ffff h# 1840 port-wl \ Enable Power button wakeup, clear status bits + h# ffff.ffff h# 1858 port-wl \ Clear all status bits wbinvd \ Flush the cache h# 00ff.ff00 h# 2000.0018 bitclr-msr \ Set refresh to 0, disabling GX refresh Modified: cpu/x86/pc/olpc/suspend.fth =================================================================== --- cpu/x86/pc/olpc/suspend.fth 2007-09-11 16:48:47 UTC (rev 601) +++ cpu/x86/pc/olpc/suspend.fth 2007-09-11 17:13:15 UTC (rev 602) @@ -15,11 +15,27 @@ code ax-call ( ax-value dst -- ) bx pop ax pop bx call c; +: lid-wakeup + h# 400 h# c8 gpio! \ Clear positive edge status bit + h# 400 h# cc gpio! \ Clear negative edge status bit + h# 185c pl@ h# 4000.0000 or h# 185c pl! +; + +: sci-wakeup + h# 800 h# c8 gpio! \ Clear positive edge status bit + h# 800 h# cc gpio! \ Clear negative edge status bit + h# 185c pl@ h# 8000.0000 or h# 185c pl! +; + : s3 \ Enable wakeup from power button, also clearing \ any status bits in the low half of the register. h# 1840 pl@ h# 100.0000 or h# 1840 pl! + h# ffff.ffff h# 1858 pl! \ Clear PME status bits + h# ffff h# c8 gpio! \ Clear positive edge status bits + h# ffff h# cc gpio! \ Clear negative edge status bits + \ sum-forth [ also dev /mmu ] pdir-va h# f0000 ax-call [ previous definitions ] \ sum-forth

1 0

r601 - /
by svn＠openbios.org 11 Sep '07

11 Sep '07

Author: wmb Date: 2007-09-11 18:48:47 +0200 (Tue, 11 Sep 2007) New Revision: 601 Removed: branches/ Log: The branch is no longer needed, and the source for the builds that it created are archived elsewhere

1 0

r600 - cpu/x86/pc/olpc
by svn＠openbios.org 10 Sep '07

10 Sep '07

Author: wmb Date: 2007-09-11 00:24:49 +0200 (Tue, 11 Sep 2007) New Revision: 600 Modified: cpu/x86/pc/olpc/devices.fth Log: OLPC - Fixed an error in the assigned-addresses property of the display node. Nobody was using that property so the error had no practical impact. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-09-03 03:56:58 UTC (rev 599) +++ cpu/x86/pc/olpc/devices.fth 2007-09-10 22:24:49 UTC (rev 600) @@ -295,9 +295,9 @@ 0 0 encode-bytes h# 8200.0910 +i 0+i h# fd00.0000 +i 0+i h# 0080.0000 +i \ Frame buffer h# 8200.0914 +i 0+i h# fe00.0000 +i 0+i h# 0000.4000 +i \ GP - h# 8200.0918 +i 0+i h# fe40.0000 +i 0+i h# 0000.4000 +i \ DC - h# 8200.091c +i 0+i h# fe80.0000 +i 0+i h# 0000.4000 +i \ VP - h# 8200.0920 +i 0+i h# fec0.0000 +i 0+i h# 0000.4000 +i \ VIP (LX only) + h# 8200.0918 +i 0+i h# fe00.4000 +i 0+i h# 0000.4000 +i \ DC + h# 8200.091c +i 0+i h# fe00.8000 +i 0+i h# 0000.4000 +i \ VP + h# 8200.0920 +i 0+i h# fe00.c000 +i 0+i h# 0000.4000 +i \ VIP (LX only) " assigned-addresses" property end-package

1 0

r599 - cpu/x86/pc/olpc
by svn＠openbios.org 03 Sep '07

03 Sep '07

Author: wmb Date: 2007-09-03 05:56:58 +0200 (Mon, 03 Sep 2007) New Revision: 599 Modified: cpu/x86/pc/olpc/setwp.fth Log: Reset the system after clear-wp Modified: cpu/x86/pc/olpc/setwp.fth =================================================================== --- cpu/x86/pc/olpc/setwp.fth 2007-08-31 21:11:38 UTC (rev 598) +++ cpu/x86/pc/olpc/setwp.fth 2007-09-03 03:56:58 UTC (rev 599) @@ -27,6 +27,7 @@ : put-mfg-data ( -- ) spi-start spi-identify mfg-data-buf mfg-data-end-offset mfg-data-offset write-flash-range + spi-reprogrammed ; \ Find RAM address of tag, given FLASH address

1 0