OpenBIOS August 2007

openbios@openbios.org

12 participants
103 discussions

r546 - dev/olpc/cafenand
by svn＠openbios.org 15 Aug '07

15 Aug '07

Author: wmb Date: 2007-08-15 05:30:45 +0200 (Wed, 15 Aug 2007) New Revision: 546 Modified: dev/olpc/cafenand/cafenand.fth Log: OLPC CaFe NAND driver - added commented-out code for random-read and random-write NAND commands, which might eventually be useful for diagnostics. Modified: dev/olpc/cafenand/cafenand.fth =================================================================== --- dev/olpc/cafenand/cafenand.fth 2007-08-15 03:28:22 UTC (rev 545) +++ dev/olpc/cafenand/cafenand.fth 2007-08-15 03:30:45 UTC (rev 546) @@ -96,6 +96,10 @@ h# 20.0070 1 0 >cmd constant read-status-cmd h# 0420.0000 0 5 >cmd constant read-cmd h# 0220.0080 0 6 >cmd constant write-cmd \ The 6 adds a dummy address cycle to meet tADR for Hynix +[ifdef] notdef +h# 0400.0005 0 2 >cmd constant random-read-cmd +h# 0200.0085 0 2 >cmd constant random-write-cmd +[then] : wait-mask ( bitmask -- ) begin dup h# 10 cl@ and until ( bitmask ) @@ -223,6 +227,26 @@ dma-buf-va rot /page do-lmove ( error? ) ; +[ifdef] notdef +: dma-read-buffer ( adr len offset -- ) + h# 1c cl! ( adr len ) \ Offset in internal chip buffer + dup h# 18 cl! ( adr len ) + dma-buf-pa h# 44 cl! ( adr len ) + 0 h# 48 cl! ( adr len) + dup h# a000.0000 or h# 40 cl! ( adr len ) + random-read-cmd h# 0800.01e0 cmd wait-dma ( adr len ) + dma-buf-va -rot do-lmove ( ) +; + +: dma-write-buffer ( adr len offset -- ) + write-enable ( adr len offset ) + h# 1c cl! ( adr len ) \ Offset in internal chip buffer + dup false dma-setup ( ) + random-write-cmd 0 cmd wait-cmd ( ) + dma-release ( ) +; +[then] + : dma-write-raw ( adr len page# offset -- ) write-enable ( adr len page# offset ) set-page ( adr len )

1 0

r545 - cpu/x86/pc/olpc
by svn＠openbios.org 15 Aug '07

15 Aug '07

Author: wmb Date: 2007-08-15 05:28:22 +0200 (Wed, 15 Aug 2007) New Revision: 545 Added: cpu/x86/pc/olpc/waveform.fth Log: waveform.fth - initial checkin of line drawing code, not included in build. Added: cpu/x86/pc/olpc/waveform.fth =================================================================== --- cpu/x86/pc/olpc/waveform.fth (rev 0) +++ cpu/x86/pc/olpc/waveform.fth 2007-08-15 03:28:22 UTC (rev 545) @@ -0,0 +1,175 @@ +dev screen + +9 constant wave-scale +1 d# 15 wave-scale - << 2+ constant wave-height + +: pitch* ( #lines -- #pixels ) bytes/line * ; +: wave-top ( -- adr ) + screen-height wave-height 2* - pitch* frame-buffer-adr + +; + +: wave0 ( -- ) screen-height wave-height - ; + +5 value fg +h# f value bg + +: pointat ( x y -- ) + bytes/line * swap wa+ frame-buffer-adr + fg swap w! +; + +variable curx variable cury +: moveto ( x y -- ) cury ! curx ! ; +: rmove ( dx dy -- ) cury +! curx +! ; +: point ( -- ) curx @ cury @ pointat ; + +2variable bump 2variable nobump +: bresenham ( incr reload -- ) + tuck dup 2/ ( reload incr reload delta ) + swap 0 do ( reload incr delta ) + point ( reload incr delta ) + over - dup 0< if ( reload incr delta' ) + 2 pick + ( reload incr delta' ) + bump ( reload incr delta var ) + else ( reload incr delta ) + nobump ( reload incr delta var ) + then ( reload incr delta ) + 2@ cury +! curx +! ( reload incr delta ) + loop ( reload incr delta ) + 3drop point ( ) +; + +: rline ( dx dy -- ) + dup 0< if ( dx dy- ) + negate ( dx |dy| ) + over 0< if ( dx- |dy| ) + swap negate swap ( |dx| |dy| ) + 2dup < if 0 -1 else swap -1 0 then -1 + else ( dx+ |dy| ) + 2dup < if 0 -1 else swap 1 0 then 1 + then ( incr reload nobump-xy bump-x ) + -1 ( incr reload nobump-xy bump-xy ) + else ( dx dy+ ) + over 0< if ( dx- dy+ ) + swap negate swap ( |dx| dy ) + 2dup < if 0 1 else swap -1 0 then -1 + else ( dx+ dy+ ) + 2dup < if 0 1 else swap 1 0 then 1 + then ( incr reload nobump-xy bump-x ) + 1 ( incr reload nobump-xy bump-xy ) + then ( incr reload nobump-xy bump-xy ) + bump 2! nobump 2! ( incr reload ) + bresenham ( ) +; + +0 [if] +\ Divide-and-conquer line drawing. Bresenham above is about twice +\ as fast, but this is less code. +: xy+ ( x1 y1 x2 y2 -- x3 y3 ) rot + >r + r> ; +: (rxline) ( x y dx dy -- ) + 2dup or if ( x y dx dy ) + swap 2/ swap 2/ ( x y dx/2 dy/2 ) + 2over 2over recurse ( x y dx/2 dy/2 ) + 2swap 2over xy+ 2dup pointat 2swap recurse ( ) + else ( x y dx dy ) + 4drop ( ) + then ( ) +; +: rxline ( dx dy -- ) curx @ cury @ 2swap (rxline) ; +[then] + +: lineto ( x y -- ) swap curx @ - swap cury @ - rline ; + + +1 [if] +\ Test for line drawing +d# 240 value gey0 d# 240 value gex0 +: godseye ( -- ) + gex0 0 do + i gey0 moveto + gex0 gey0 i - lineto + gex0 2* i - gey0 lineto + gex0 gey0 i + lineto + i gey0 lineto + 3 +loop +; +: godseye1 ( -- ) + gex0 0 do + i gey0 moveto + gex0 i - i ( x0-i i ) + negate 2dup rline ( x0-i -i ) + negate 2dup rline ( x0-i i ) + swap negate swap ( i-x0 i ) + 2dup rline ( x0-i -i ) + negate rline ( ) + 3 +loop +; +[then] + +: plot0 ( -- x y ) 0 screen-height 10 - ; +: clear-plot ( width height -- ) + 2>r + bg plot0 2r> ( bg plot0-xy wh ) + rot over - -rot ( bg plot0-xy' wh ) + fill-rectangle +; + +variable ylim variable ymin +1 value stretch +: clip-y ( value -- value' ) ymin @ - 0 max ylim @ min ; +: plot ( xt xmin xmax xscale ymin ymax -- ) + over - ylim ! ymin ! to stretch ( xt xmin xmax ) + over 3 pick execute clip-y ( xt xmin xmax y-at-xmin ) + plot0 2 pick - moveto ( xt xmin xmax y-at-xmin ) + -rot swap 1+ ?do ( xt last ) + i 2 pick execute clip-y ( xt last value ) + tuck - ( xt value delta ) + stretch swap rline ( xt value ) + loop ( xt last ) + 2drop ( ) +; + +: clear-waveform ( -- ) + bg + 0 wave0 wave-height - screen-width wave-height 2* + fill-rectangle +; +: waveform-start ( -- ) 0 wave0 moveto ; +: draw-wave ( adr ) + 0 swap ( last adr ) + screen-width 0 do ( last adr ) + tuck <w@ ( adr last this-unscaled ) + wave-scale >>a ( adr last this ) + tuck swap - ( adr this distance ) + 1 swap rline ( adr this ) + swap wa1+ ( this adr ) + loop ( last adr ) + 2drop +; +: waveform ( adr -- ) clear-waveform waveform-start draw-wave ; +: set-fg ( fg -- ) to fg ; +: set-bg ( bg -- ) to bg ; +: vgrid ( width height interval -- ) + rot 0 ?do ( height interval ) + i plot0 nip moveto ( height interval ) + 0 2 pick negate rline ( height interval ) + dup +loop ( height interval ) + 2drop ( ) +; +: hgrid ( width height interval -- ) + swap 0 ?do ( width interval ) + plot0 i - moveto ( width interval ) + over 0 rline ( width interval ) + dup +loop ( width interval ) + 2drop ( ) +; + +dend + +: $call-screen ( ? name$ -- ? ) stdout @ $call-method ; +: wave ( adr -- ) " waveform" $call-screen ; +: clear-plot ( width height -- ) " clear-plot" $call-screen ; +: lineplot ( xt xmin xmax xscale ymin ymax -- ) " plot" $call-screen ; +: set-fg ( fg -- ) " set-fg" $call-screen ; +: set-bg ( bg -- ) " set-bg" $call-screen ; +: vgrid ( width height interval -- ) " vgrid" $call-screen ; +: hgrid ( width height interval -- ) " hgrid" $call-screen ;

1 0

r544 - cpu/x86/pc/olpc/sdtools
by svn＠openbios.org 15 Aug '07

15 Aug '07

Author: wmb Date: 2007-08-15 05:27:30 +0200 (Wed, 15 Aug 2007) New Revision: 544 Added: cpu/x86/pc/olpc/sdtools/ecdump.fth Modified: cpu/x86/pc/olpc/sdtools/maketar cpu/x86/pc/olpc/sdtools/sd.fth Log: sdkit - added EC register dumping commands. Added: cpu/x86/pc/olpc/sdtools/ecdump.fth =================================================================== --- cpu/x86/pc/olpc/sdtools/ecdump.fth (rev 0) +++ cpu/x86/pc/olpc/sdtools/ecdump.fth 2007-08-15 03:27:30 UTC (rev 544) @@ -0,0 +1,33 @@ +: .3r space <# u# u# u#> type ; +: dump-ec ( adr len -- ) + dup h# 10 < if + over 4 u.r ." : " bounds do i ec@ .3r loop cr + else + bounds ?do + i 4 u.r ." : " + i h# 10 bounds ?do i ec@ .3r loop cr + h# 10 +loop + then +; +: dump-ec-regs ( -- ) +." GPIOO " fc00 4 dump-ec +." GPIOE " fc10 6 dump-ec +." GPIOD " fc20 6 dump-ec +." GPIOIN " fc30 7 dump-ec +." GPIOPU " fc40 6 dump-ec +." GPIOOD " fc50 4 dump-ec +." GPIOIE " fc60 7 dump-ec +." GPIOM " fc70 1 dump-ec +." KBC " fc80 7 dump-ec +." PWM " fe00 e dump-ec +." GPT " fe50 a dump-ec +." SPI " fea0 10 dump-ec +." WDT " fe80 6 dump-ec +." LPC " fe90 10 dump-ec +." PS2 " fee0 7 dump-ec +." EC " ff00 20 dump-ec +." GPWUEN " ff30 4 dump-ec +." GPWUPF " ff40 4 dump-ec +." GPWUPS " ff50 4 dump-ec +." GPWUEL " ff60 4 dump-ec +; Modified: cpu/x86/pc/olpc/sdtools/maketar =================================================================== --- cpu/x86/pc/olpc/sdtools/maketar 2007-08-15 03:26:50 UTC (rev 543) +++ cpu/x86/pc/olpc/sdtools/maketar 2007-08-15 03:27:30 UTC (rev 544) @@ -6,6 +6,6 @@ cp ../../../../../cpu/x86/pc/olpc/mfgdata.fth sdkit cp ../../../../../dev/olpc/dcon/dconsmb.fth sdkit cp ../../../../../dev/olpc/kb3700/ecio.fth sdkit -cp sd sd.fth dumpgamma.fth sdkit +cp sd sd.fth ecdump.fth dumpgamma.fth sdkit tar cfz sdkit.tgz sdkit # rm sdkit/* Modified: cpu/x86/pc/olpc/sdtools/sd.fth =================================================================== --- cpu/x86/pc/olpc/sdtools/sd.fth 2007-08-15 03:26:50 UTC (rev 543) +++ cpu/x86/pc/olpc/sdtools/sd.fth 2007-08-15 03:27:30 UTC (rev 544) @@ -66,6 +66,7 @@ defer spi-start defer spi@ defer spi! defer spi-out defer spi-reprogrammed 1 value spi-us \needs ec@ fload ecio.fth +\needs ec-range fload ecdump.fth \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks

1 0

r543 - cpu/x86/pc/olpc
by svn＠openbios.org 15 Aug '07

15 Aug '07

Author: wmb Date: 2007-08-15 05:26:50 +0200 (Wed, 15 Aug 2007) New Revision: 543 Modified: cpu/x86/pc/olpc/loaddropins.fth Log: OLPC loaddropins.fth - minor cleanup and space savings. Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-08-15 03:16:38 UTC (rev 542) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-08-15 03:26:50 UTC (rev 543) @@ -18,8 +18,8 @@ " ${BP}/dev/olpc/cafenand/build/cafenand.fc" " class050101" $add-deflated-dropin " ${BP}/dev/olpc/cafecamera/build/cafecamera.fc" " pci11ab,4102" $add-deflated-dropin - " ${BP}/dev/mmc/sdhci/build/sdhci.fc" " pci11ab,4101" $add-dropin - " ${BP}/dev/mmc/sdhci/build/sdmmc.fc" " sdmmc" $add-dropin + " ${BP}/dev/mmc/sdhci/build/sdhci.fc" " pci11ab,4101" $add-deflated-dropin + " ${BP}/dev/mmc/sdhci/build/sdmmc.fc" " sdmmc" $add-deflated-dropin " ${BP}/dev/geode/nandflash/build/nandflash.fc" " nand5536" $add-deflated-dropin " ${BP}/dev/geode/ac97/build/ac97.fc" " pci1022,2093" $add-deflated-dropin @@ -28,9 +28,6 @@ " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin -\ " ${BP}/ofw/linux/logos.bmp" " oslogo.bmp" $add-deflated-dropin -\ " ${BP}/ofw/linux/logom16e.bmp" " error.bmp" $add-deflated-dropin -\ " ${BP}/ofw/linux/logom16c.bmp" " timeout.bmp" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/olpclogo.565" " olpc.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " nandflash.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565" $add-deflated-dropin @@ -40,3 +37,8 @@ " ${BP}/cpu/x86/pc/olpc/images/sd.565" " sdmmc.565" $add-deflated-dropin " ${BP}/ofw/termemu/gallant.obf" " font" $add-deflated-dropin + +\ " /space/bios-crypto/bios_crypto.img" " crypto" $add-deflated-dropin +\ " /space/bios-crypto/bios_hash.img" " hasher" $add-deflated-dropin +\ " /space/bios-crypto/wmbtest256.public" " pubkey" $add-dropin \ Incompressible +\ " /space/bios-crypto/usb8388.bin.sig256" " usb8388.sig" $add-dropin \ Incompressible

1 0

r542 - dev/olpc/cafenand
by svn＠openbios.org 15 Aug '07

15 Aug '07

Author: wmb Date: 2007-08-15 05:16:38 +0200 (Wed, 15 Aug 2007) New Revision: 542 Modified: dev/olpc/cafenand/badblock.fth Log: CaFe NAND - support for graphical copy-nand progress reports. Modified: dev/olpc/cafenand/badblock.fth =================================================================== --- dev/olpc/cafenand/badblock.fth 2007-08-15 03:14:55 UTC (rev 541) +++ dev/olpc/cafenand/badblock.fth 2007-08-15 03:16:38 UTC (rev 542) @@ -5,7 +5,10 @@ 0 value bbt \ Bad block table address -: round-up ( n boundary -- n' ) over 1- + over / * ; +: round-up ( n boundary -- n' ) + tuck 1- + ( boundary n' ) + over / * +; : /bbt ( -- bytes ) \ Bytes per bad block table total-pages pages/eblock / 3 + 4 / ( bytes ) @@ -225,8 +228,8 @@ : map-resblock ( page# #pages -- page#' #pages ) swap pages/eblock /mod ( adr #pages offset eblock# ) - resmap swap na+ @ ( adr #pages offset res-page# ) - + swap ( adr page#' #pages ) + resmap swap na+ @ ( adr #pages offset res-eblock# ) + + pages/eblock * swap ( adr page#' #pages ) ; external @@ -292,23 +295,29 @@ make-bbt ; -\ Clear the device but honor the existing bad block table -: wipe ( -- ) +: .bn ( -- ) (cr . ; + +: (wipe) ( 'show-bad 'show-erased -- ) get-existing-bbt bbt if - usable-page-limit 0 ?do + usable-page-limit 0 ?do ( 'show-bad 'show-erased ) i block-bad? if -\ cr ." Skipping bad block" i .page-byte cr + i pages/eblock / 2 pick execute else - (cr i . + i pages/eblock / over execute i erase-block then pages/eblock +loop exit - then + then ( 'show-bad 'show-erased ) \ If there is no existing bad block table, make one from factory info make-bbt + 2drop ; + +\ Clear the device but honor the existing bad block table +: wipe ( -- ) ['] drop ['] .bn (wipe) ; + : show-bbt ( -- ) get-bbt total-pages 0 ?do @@ -369,22 +378,28 @@ : start-scan ( -- ) pages/eblock negate to scan-page# ; \ Must erase all (wipe) first -: copy-block ( adr -- error? ) - next-page# pages/eblock bounds ?do ( adr ) - dup i write-page if ( adr ) - drop true unloop exit ( true ) - then ( adr ) - /page + ( adr' ) - loop ( adr ) - drop false ( false ) +: copy-block ( adr -- page# error? ) + next-page# ( adr page# ) + tuck pages/eblock bounds ?do ( page# adr ) + dup i write-page if ( page# adr ) + drop true unloop exit ( page# true ) + then ( page# adr ) + /page + ( page# adr' ) + loop ( page# adr ) + drop false ( page# false ) ; -: put-cleanmarkers ( -- ) - begin (next-page#) 0= while ( page# ) - " "(85 19 03 20 08 00 00 00 00 00 00 00)" ( page# adr len ) - rot /page /ecc + write-bytes ( ) - repeat ( ) +: put-cleanmarker ( page# -- ) + " "(85 19 03 20 08 00 00 00 00 00 00 00)" ( page# adr len ) + rot /page /ecc + write-bytes ( ) ; +: put-cleanmarkers ( show-xt -- ) + begin (next-page#) 0= while ( show-xt page# ) + dup put-cleanmarker ( show-xt page# ) + pages/eblock / over execute ( show-xt ) + repeat ( show-xt ) + drop +; : read-next-block ( adr -- ) next-page# pages/eblock bounds ?do ( adr )

1 0

r541 - dev/usb2/device/wlan
by svn＠openbios.org 15 Aug '07

15 Aug '07

Author: wmb Date: 2007-08-15 05:14:55 +0200 (Wed, 15 Aug 2007) New Revision: 541 Modified: dev/usb2/device/wlan/usb8388.fth dev/usb2/device/wlan/wlan.fth Log: OLPC wireless LAN driver - added promiscuous mode. Modified: dev/usb2/device/wlan/usb8388.fth =================================================================== --- dev/usb2/device/wlan/usb8388.fth 2007-08-15 03:14:16 UTC (rev 540) +++ dev/usb2/device/wlan/usb8388.fth 2007-08-15 03:14:55 UTC (rev 541) @@ -661,6 +661,15 @@ enable-11d ; +: enable-promiscuous ( -- ) + mac-ctrl h# 80 or to mac-ctrl + set-mac-control +; +: disable-promiscuous ( -- ) + mac-ctrl h# 80 invert and to mac-ctrl + set-mac-control +; + : enable-multicast ( -- ) mac-ctrl h# 20 or to mac-ctrl set-mac-control Modified: dev/usb2/device/wlan/wlan.fth =================================================================== --- dev/usb2/device/wlan/wlan.fth 2007-08-15 03:14:16 UTC (rev 540) +++ dev/usb2/device/wlan/wlan.fth 2007-08-15 03:14:55 UTC (rev 541) @@ -52,6 +52,8 @@ true ; +false instance value use-promiscuous? + external \ Set to true to force open the driver without association. @@ -60,9 +62,11 @@ false instance value force-open? : parse-args ( $ -- ) + false to use-promiscuous? begin ?dup while ascii , left-parse-string 2dup " debug" $= if debug-on then + 2dup " promiscuous" $= if true to use-promiscuous? then " force" $= if true to force-open? then repeat drop ; @@ -87,6 +91,7 @@ then start-nic then + use-promiscuous? if enable-promiscuous else disable-promiscuous then opencount @ 1+ opencount ! true ;

1 0

r540 - dev/olpc/kb3700
by svn＠openbios.org 15 Aug '07

15 Aug '07

Author: wmb Date: 2007-08-15 05:14:16 +0200 (Wed, 15 Aug 2007) New Revision: 540 Modified: dev/olpc/kb3700/battery.fth Log: OLPC watch-battery - Minor formatting change to prevent line wrap Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2007-08-15 03:06:37 UTC (rev 539) +++ dev/olpc/kb3700/battery.fth 2007-08-15 03:14:16 UTC (rev 540) @@ -81,7 +81,7 @@ : .% ( n -- ) 2.d ." %" ; : .bat ( -- ) bat-status@ ( stat ) - ." AC: " dup h# 10 and if ." on " else ." off " then ( stat ) + ." AC:" dup h# 10 and if ." on " else ." off " then ( stat ) ." PCB: " pcb-temp 2.d ." C " dup 1 and if

1 0

r539 - cpu/x86/pc/olpc
by svn＠openbios.org 15 Aug '07

15 Aug '07

Author: wmb Date: 2007-08-15 05:06:37 +0200 (Wed, 15 Aug 2007) New Revision: 539 Added: cpu/x86/pc/olpc/boardrev.fth Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/fw.bth Log: OLPC - Split the board revision sensing code out into a separate file and rearranged the code that loads it. Also added a game to the early startup button sequence. Added: cpu/x86/pc/olpc/boardrev.fth =================================================================== --- cpu/x86/pc/olpc/boardrev.fth (rev 0) +++ cpu/x86/pc/olpc/boardrev.fth 2007-08-15 03:06:37 UTC (rev 539) @@ -0,0 +1,61 @@ +purpose: Determine the board revision based on hardware and EC info +\ See license at end of file + +0 value atest? +0 value board-revision + +\ Constructs a string like "B4" or "preB4" or "postB4" +: model-name$ ( -- model$ ) + board-revision h# 10 /mod ( minor major ) + swap dup 8 = if ( major minor ) + drop " " ( major prefix$ ) + else ( major minor ) + 8 < if " pre" else " post" then ( major prefix$ ) + then ( major prefix$ ) + push-hex + rot <# u# u# drop hold$ 0 u#> ( adr len ) + pop-base + 2dup + 2- 2 upper ( model$ ) \ Upper case for base model +; + +stand-init: board revision + kb3920? to atest? + atest? if + h# a18 + else + lx? if + board-id@ case + h# b2 of h# b30 endof \ preB3 + ( board-id ) dup h# 10 * 8 + swap \ E.g. b3 -> b38 + endcase + else + h# 4c00.0014 rdmsr drop ( RSTPLL-value ) + 4 rshift 7 and 0= if h# b28 else h# b18 then + then + then + to board-revision +; + +\ LICENSE_BEGIN +\ Copyright (c) 2007 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-08-15 03:02:48 UTC (rev 538) +++ cpu/x86/pc/olpc/devices.fth 2007-08-15 03:06:37 UTC (rev 539) @@ -243,27 +243,8 @@ fload ${BP}/dev/olpc/kb3700/ecio.fth \ I/O space access to EC chip -0 value atest? -0 value board-revision +fload ${BP}/cpu/x86/pc/olpc/boardrev.fth \ Board revision decoding - stand-init: board revision - kb3920? to atest? - atest? if - h# a18 - else - lx? if - board-id@ case - h# b2 of h# b30 endof \ preB3 - ( board-id ) dup h# 10 * 8 + swap \ E.g. b3 -> b38 - endcase - else - h# 4c00.0014 rdmsr drop ( RSTPLL-value ) - 4 rshift 7 and 0= if h# b28 else h# b18 then - then - then - to board-revision -; - stand-init: Quiet SCI sci-quiet ; @@ -327,6 +308,44 @@ fload ${BP}/cpu/x86/adpcm.fth \ ADPCM decoding +[ifdef] rom-loaded +fload ${BP}/cpu/x86/pc/olpc/gpioinit.fth +fload ${BP}/cpu/x86/pc/olpc/chipinit.fth +[then] + +warning @ warning off +: stand-init + stand-init + root-device + model-name$ 2dup model ( name$ ) + " OLPC " encode-bytes 2swap encode-string encode+ " banner-name" property + board-revision " board-revision-int" integer-property + \ The "1-" removes the null byte + " SN" find-tag if 1- else " Unknown" then " serial-number" string-property + +[ifndef] lx-devel + 8 ec-cmd " ec-version" integer-property + + " PQ2" h# fff0.0000 h# 1.0000 sindex dup 0>= if ( offset ) + h# fff0.0000 + cscount ( name ) + else + drop " UNKNOWN" + then + " ec-name" string-property +[then] + + dend + + " /openprom" find-device + h# ffff.ffc0 d# 16 " model" string-property + + " sourceurl" find-drop-in if " source-url" string-property then + dend +; +warning ! + +fload ${BP}/cpu/x86/pc/olpc/micin.fth \ Microphone input AC/DC coupling + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-08-15 03:02:48 UTC (rev 538) +++ cpu/x86/pc/olpc/fw.bth 2007-08-15 03:06:37 UTC (rev 539) @@ -214,54 +214,6 @@ fload ${BP}/cpu/x86/pc/olpc/devices.fth -[ifdef] rom-loaded -fload ${BP}/cpu/x86/pc/olpc/gpioinit.fth -fload ${BP}/cpu/x86/pc/olpc/chipinit.fth -[then] - -warning @ warning off -: stand-init - stand-init - root-device - board-revision case - h# a18 of " A1" " OLPC A-test" endof - h# b18 of " B1" " OLPC B1" endof - h# b28 of " B2" " OLPC B2" endof - h# b30 of " preB3" " OLPC preB3" endof - h# b38 of " B3" " OLPC B3" endof - h# b40 of " preB4" " OLPC preB4" endof - h# b48 of " B4" " OLPC B4" endof - ( default ) >r " ??" " OLPC ??" r> - endcase - encode-string " banner-name" property - model - board-revision " board-revision-int" integer-property - \ The "1-" removes the null byte - " SN" find-tag if 1- else " Unknown" then " serial-number" string-property - -[ifndef] lx-devel - 8 ec-cmd " ec-version" integer-property - - " PQ2" h# fff0.0000 h# 1.0000 sindex dup 0>= if ( offset ) - h# fff0.0000 + cscount ( name ) - else - drop " UNKNOWN" - then - " ec-name" string-property -[then] - - dend - - " /openprom" find-device - h# ffff.ffc0 d# 16 " model" string-property - - " sourceurl" find-drop-in if " source-url" string-property then - dend -; -warning ! - -fload ${BP}/cpu/x86/pc/olpc/micin.fth \ Microphone input AC/DC coupling - fload ${BP}/cpu/x86/pc/olpc/countdwn.fth \ Startup countdown fload ${BP}/dev/scsi/probscsi.fth \ probe-scsi and probe-scsi-all @@ -380,7 +332,10 @@ fload ${BP}/dev/olpc/touchpad/touchpad.fth \ Touchpad diagnostic fload ${BP}/dev/olpc/kb3700/battery.fth \ Battery status reports 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}/ofw/gui/ofpong.fth [then] \ Eliminate 4 second delay in install console for the case where @@ -412,7 +367,7 @@ fload ${BP}/ofw/inet/loadtcp.fth support-package: http - fload ${BP}/ofw/inet/http.fth \ HTTP client + fload ${BP}/ofw/inetv6/http.fth \ HTTP client end-support-package fload ${BP}/ofw/wifi/wifi-cfg.fth @@ -456,7 +411,7 @@ ; : fast-boot? ( -- flag ) [ifdef] rom-loaded - game-key-mask h# 100 and 0= + game-key-mask h# 120 and 0= [else] false [then] @@ -525,6 +480,9 @@ : ?start-sound ( -- ) game-key-mask h# 40 and if start-sound then ; +: ?games ( -- ) + game-key-mask h# 20 and if pong then +; : open-keyboard ( -- ) " keyboard" open-dev ?dup if set-stdin then ; @@ -563,6 +521,7 @@ probe-pci ?start-sound open-keyboard + ?games optional-startup interpreter-init [ifndef] lx-devel @@ -578,7 +537,9 @@ ; : newrom - " flash http:\\10.20.0.109\new.rom" eval + " flash http:\\10.20.0.104\new.rom" eval +\ " wifi media lab 802.11" eval +\ " flash http:\\18.85.46.172\new.rom" eval ; \ This helps with TeraTerm, which sends ESC-O as the arrow key prefix

1 0

r538 - ofw/gui
by svn＠openbios.org 15 Aug '07

15 Aug '07

Author: wmb Date: 2007-08-15 05:02:48 +0200 (Wed, 15 Aug 2007) New Revision: 538 Added: ofw/gui/ofpong.fth Log: Pong - initial checkin. Added: ofw/gui/ofpong.fth =================================================================== --- ofw/gui/ofpong.fth (rev 0) +++ ofw/gui/ofpong.fth 2007-08-15 03:02:48 UTC (rev 538) @@ -0,0 +1,572 @@ +\ Adapted from http://members.aol.com/plforth/ofpong/20020313/ofpong.txt +\ See also http://members.aol.com/plforth/ofpong/index.html +\ Originally from 1.0d1 MacHack '98 release of OFPong.of found in OFPONG.SIT. + +decimal + + 0 value erasecol +-1 value drawcol + +0 value key_left_up +0 value key_left_down +0 value key_right_up +0 value key_right_down +0 value key_esc +0 value key_off + +0 value grandseed +0 value glastupdate +0 value loopcount +0 value totalupdate + +0 value ballstop + +0 value ballx +0 value bally + +0 value balldx +0 value balldy + +0 value leftbaty +0 value rightbaty +0 value batdy + +0 value leftscore +0 value rightscore + +640 value screenw +480 value screenh + +20 value ballsize +ballsize 2 / value scoresize +ballsize 5 * value batsize +1000 value pscale + +0 value ball_limit_x +ballsize pscale * value ball_limit_lo_y +0 value ball_limit_hi_y + +ballsize pscale * value bat_limit_lo_y +0 value bat_limit_hi_y + +0 value hit_limit_left_lo_x +ballsize 2 * pscale * value hit_limit_left_hi_x +0 value hit_limit_right_lo_x +0 value hit_limit_right_hi_x + +ballsize pscale * value reflect_left_x +0 value reflect_right_x + +: initlimits + " dimensions" $call-screen to screenh to screenw + screenw ballsize - pscale * to ball_limit_x + screenh ballsize 2 * - pscale * to ball_limit_hi_y + screenh ballsize batsize + - pscale * to bat_limit_hi_y + screenw ballsize 3 * - pscale * to hit_limit_right_lo_x + screenw ballsize - pscale * to hit_limit_right_hi_x + + screenw ballsize 2 * - pscale * to reflect_right_x + get-msecs to grandseed +; + +: random ( -- n ) grandseed 16807 * 17 + abs to grandseed grandseed 1000 mod ; +: unscale ( n -- n ) pscale 2/ + pscale / ; +: calcbatx ( n -- x ) screenw ballsize 3 * - * ballsize + ; +: paintrect ( c pixx pixy pixw pixh -- ) " fill-rectangle" $call-screen ; + +\needs xy* : xy* ( x y w h -- x' y' ) rot * >r * r> ; + +\ Big digits for the score + +0 0 2value digitxy + +: rectcol ( x y w h c -- ) + -rot >r >r -rot ( c x y r: h w ) + scoresize dup xy* ( c x' y' r: h w ) + digitxy xy+ ( c base-xy r: h w ) + r> r> scoresize dup xy* ( c base-xy wh-scaled ) + paintrect +; + +: blackrect ( x y w h -- ) drawcol rectcol ; +: whiterect ( x y w h -- ) erasecol rectcol ; + +: drawblank ( -- ) 0 0 4 7 whiterect ; + +: drawzero ( -- ) + 0 0 1 7 blackrect + 1 0 2 1 blackrect + 1 6 2 1 blackrect + 3 0 1 7 blackrect + 1 3 2 1 whiterect +; + +: drawone ( -- ) + 3 0 1 7 blackrect + 0 0 3 7 whiterect +; + +: drawtwo ( -- ) + 0 0 4 1 blackrect + 3 1 1 2 blackrect + 0 3 4 1 blackrect + 0 4 1 2 blackrect + 0 6 4 1 blackrect + 0 1 1 2 whiterect + 3 4 1 2 whiterect +; + +: drawthree ( -- ) + 0 0 4 1 blackrect + 3 1 1 2 blackrect + 0 3 4 1 blackrect + 3 4 1 2 blackrect + 0 6 4 1 blackrect + 0 1 1 2 whiterect + 0 4 1 2 whiterect +; + +: drawfour ( -- ) + 0 0 1 3 blackrect + 0 3 3 1 blackrect + 3 0 1 7 blackrect + 1 0 2 1 whiterect + 0 4 3 3 whiterect +; + +: drawfive ( -- ) + 0 0 4 1 blackrect + 0 1 1 2 blackrect + 0 3 4 1 blackrect + 3 4 1 2 blackrect + 0 6 4 1 blackrect + 3 1 1 2 whiterect + 0 4 1 2 whiterect +; + +: drawsix ( -- ) + 0 0 1 7 blackrect + 1 3 2 1 blackrect + 1 6 2 1 blackrect + 3 3 1 4 blackrect + 1 0 3 3 whiterect +; + +: drawseven ( -- ) + 0 0 3 1 blackrect + 3 0 1 7 blackrect + 0 1 3 6 whiterect +; + +: draweight ( -- ) + 0 0 4 1 blackrect + 0 1 1 2 blackrect + 3 1 1 2 blackrect + 0 3 4 1 blackrect + 0 4 1 2 blackrect + 3 4 1 2 blackrect + 0 6 4 1 blackrect +; + +: drawnine ( -- ) + 0 0 1 4 blackrect + 1 0 2 1 blackrect + 1 3 2 1 blackrect + 3 0 1 7 blackrect + 0 4 3 3 whiterect +; + +: drawdigit ( x y n -- ) + -rot to digitxy ( n ) + case + 0 of drawzero endof + 1 of drawone endof + 2 of drawtwo endof + 3 of drawthree endof + 4 of drawfour endof + 5 of drawfive endof + 6 of drawsix endof + 7 of drawseven endof + 8 of draweight endof + 9 of drawnine endof + endcase +; + +: drawnumber ( startx starty num -- ) + abs 100 /mod drop 10 /mod ( startxy 1s 10s ) + swap >r >r ( startxy r: 10s 1s ) + 2dup r> drawdigit ( startxy r: 1s ) + scoresize 5 * 0 xy+ r> drawdigit ( ) +; + +\ Ball and bats + +: plotball ( x y -- ) + drawcol -rot swap unscale swap unscale ballsize ballsize paintrect +; +: eraseball ( x y -- ) + erasecol -rot swap unscale swap unscale ballsize ballsize paintrect +; +: plotbat ( x y -- ) + drawcol -rot swap swap unscale ballsize batsize paintrect +; +: erasebat ( x y -- ) + erasecol -rot swap swap unscale ballsize batsize paintrect +; + +: redraw ( -- ) + drawcol 0 0 screenw ballsize paintrect + drawcol 0 screenh ballsize - screenw ballsize paintrect + + drawcol screenw scoresize - 2/ ballsize 2* + scoresize screenh ballsize 4 * - paintrect + + ballsize 7 * ballsize 2* leftscore drawnumber + screenw ballsize 7 * 9 scoresize * + - ballsize 2* rightscore drawnumber + 0 calcbatx leftbaty plotbat + 1 calcbatx rightbaty plotbat + ballx bally plotball +; + +: drawboard ( -- ) + drawcol 0 0 screenw screenh paintrect + erasecol 0 0 screenw screenh paintrect + redraw +; + +: resetball ( -- ) + 500 to ballstop + screenw ballsize - 2 / pscale * ballx pscale mod + random + to ballx + screenh ballsize - 2 / pscale * bally pscale mod + random + to bally + + random screenw pscale * * 2000000 / to balldx + random screenh pscale * * 2000000 / to balldy + balldx screenw pscale * 3000 / + to balldx + balldy screenh pscale * 6000 / + to balldy + + random 500 < if balldx negate to balldx then + random 500 < if balldy negate to balldy then +; + +: initvalues ( -- ) + ballsize 2* pscale * to leftbaty + screenh ballsize 2 * - batsize - pscale * to rightbaty + + screenh pscale * 1000 / to batdy +; + +: doreset ( -- ) + resetball + 0 to leftscore + 0 to rightscore + drawboard +; + +\ Keyboard drivers; just receiving keys is usually not good enough; +\ the response is too slow. It is better to get up/down events or +\ poll key states if you can. + +[ifdef] olpc +\ This works with the FirmWorks pckbd driver. The key map below +\ is good for the OLPC keyboard. +: initkeys + ." Shift, Hand, Esc, Square" cr + d# 3000 ms + " stdin @ iselect ' get-scan 0 alarm iunselect" eval + false to key_left_up + false to key_left_down + false to key_right_up + false to key_right_down + false to key_esc + false to key_off +; +: restorekeys + " stdin @ iselect ' get-scan d# 10 alarm iunselect" eval +; +0 value e0-seen? +: scankeys + begin " get-data?" stdin @ $call-method while ( scancode ) + dup h# e0 = if + drop true to e0-seen? + else + dup h# 80 and 0= swap h# 7f and ( down? station ) + case + h# 65 of + e0-seen? if to key_right_up else to key_left_up then + endof \ game up + h# 66 of + e0-seen? if to key_right_down else to key_left_down then + endof \ game down + h# 69 of to key_esc endof \ lower left game button + h# 2a of to key_left_up endof \ shift-left + h# 5b of to key_left_down endof \ hand-left + h# 36 of to key_right_up endof \ shift-right + h# 5c of to key_right_down endof \ hand-right + h# 5d of to key_esc endof \ square + h# 1 of to key_off endof \ ESC scancode + nip + endcase + false to e0-seen? + then + repeat +; +[else] +\ This version uses "key" with normal ASCII. It is typically too slow +\ dup to limited keyboard repeat rate. +: initkeys ; +: restorekeys ; +: scankeys + false to key_left_up + false to key_left_down + false to key_right_up + false to key_right_down + false to key_esc + false to key_off + 0 to key_esc + key? if + key upc case + [char] A of true to key_left_up endof + [char] Z of true to key_left_down endof + [char] ' of true to key_right_up endof + [char] / of true to key_right_down endof + 27 of true to key_esc endof + 8 of true to key_off endof + endcase + then +; +[then] + +: moveball ( oldx oldy newx newy -- ) 2swap eraseball plotball ; + +: doupdateball ( delta -- ) + ballx swap bally swap + + dup + + balldx * ballx + to ballx + balldy * bally + to bally + + ballx 0< if + resetball + balldx abs negate to balldx + ballx ballsize 2 * pscale * + to ballx + rightscore 1 + to rightscore + rightscore 15 = if + -1 to ballstop + then + then + ballx ball_limit_x > if + resetball + balldx abs to balldx + ballx ballsize 2 * pscale * - to ballx + leftscore 1 + to leftscore + leftscore 15 = if + -1 to ballstop + then + then + + bally ball_limit_lo_y < if + balldy negate to balldy + ball_limit_lo_y 2 * bally - to bally + then + bally ball_limit_hi_y > if + balldy negate to balldy + ball_limit_hi_y 2 * bally - to bally + then + + balldx 0< if + ballx hit_limit_left_lo_x hit_limit_left_hi_x between if + bally leftbaty ballsize pscale * - leftbaty batsize pscale * + between if + + bally leftbaty < if + balldy abs negate to balldy + then + + bally leftbaty batsize ballsize - pscale * + > if + balldy abs to balldy + then + + ballx reflect_left_x > if + balldx abs random 50 / + to balldx + + leftbaty bally - unscale + dup 0 batsize between if + batsize 2 / - random * 2 / batsize / 25 / balldy + to balldy + else + drop + then + then + then + then + then + + balldx 0> if + ballx hit_limit_right_lo_x hit_limit_right_hi_x between if + bally rightbaty ballsize pscale * - rightbaty batsize pscale * + between if + + bally rightbaty < if + balldy abs negate to balldy + then + + bally rightbaty batsize ballsize - pscale * + > if + balldy abs to balldy + then + + ballx reflect_right_x < if + balldx abs random 50 / + negate to balldx + + rightbaty bally - unscale + dup 0 batsize between if + batsize 2 / - random * 2 / batsize / 25 / balldy + to balldy + else + drop + then + then + then + then + then + + bally ball_limit_lo_y < if + ball_limit_lo_y to bally + then + bally ball_limit_hi_y > if + ball_limit_hi_y to bally + then + + ballx bally moveball +; + +: updateball ( delta -- ) + ballstop 0= if + doupdateball + else + ballstop -1 = if + drop + else + ballstop swap - to ballstop + ballstop 0<= if + 0 to ballstop + then + then + then +; + +0 value batx +: movebatup ( oldp delta -- ) + 2dup >r >r ( oldp delta r: delta oldp ) + erasecol batx r> batsize + r@ + ballsize r> negate paintrect + + >r >r ( r: delta oldp ) + drawcol batx r> r@ + ballsize r> negate paintrect +; + +: movebatdown ( oldp delta -- ) + 2dup >r >r ( oldp delta r: delta oldp ) + erasecol batx r> ballsize r> paintrect + + >r >r ( r: delta oldp ) + drawcol batx r> batsize + ballsize r> paintrect +; + +: movebat ( n oldy newy -- ) + rot calcbatx to batx swap ( newy oldy ) + over unscale over unscale - ( newy oldy deltay ) + dup abs batsize < if ( newy oldy deltay ) + dup if ( newy oldy deltay ) + dup 0< if ( newy oldy deltay ) + swap unscale swap movebatup ( newy ) + else + swap unscale swap movebatdown ( newy ) + then ( newy ) + drop ( ) + else ( newy oldy deltay ) + 3drop ( ) + then ( ) + else ( newy oldy deltay ) + drop ( newy oldy ) + batx swap erasebat ( newy ) + batx swap plotbat ( ) + then +; + +: updatebats ( deltat -- ) + >r + 0 leftbaty 0 ( n oldy deltay ) + + over bat_limit_lo_y > if + key_left_up if batdy - then + then + + over bat_limit_hi_y < if + key_left_down if batdy + then + then + + r@ * ( n oldy deltay' ) \ Scale by the elapsed time + over + ( n oldy newy ) + dup to leftbaty ( n oldy newy ) + movebat + + 1 rightbaty 0 ( 1 right dy ) + + over bat_limit_lo_y > if + key_right_up if batdy - then + then + + over bat_limit_hi_y < if + key_right_down if batdy + then + then + + r> * over + + dup to rightbaty + movebat +; + +: initeverything ( -- ) + cr + 0 to loopcount + 0 to totalupdate + initlimits + initvalues + initkeys + doreset + get-msecs to glastupdate +; + +: doloop ( deltat -- ) + loopcount 1 + to loopcount + dup totalupdate + to totalupdate + + dup updatebats + dup updateball + redraw + + glastupdate + to glastupdate +; + +: pong ( -- ) + initeverything + begin + get-msecs glastupdate - + dup 0> if + dup 250 > if + drop + get-msecs to glastupdate + 250 + then + doloop + else + drop + then + scankeys + key_esc if doreset begin scankeys key_esc 0= until then + key_off until + restorekeys + h# ffff 0 0 screenw screenh paintrect + page +\ " Count:" type loopcount .d cr +\ " Avg millisec:" type totalupdate loopcount / .d cr +; + +hex + +\ pong

1 0

r537 - ofw/inetv6
by svn＠openbios.org 15 Aug '07

15 Aug '07

Author: wmb Date: 2007-08-15 05:02:27 +0200 (Wed, 15 Aug 2007) New Revision: 537 Modified: ofw/inetv6/tcpv6.fth Log: IPv6 stack - fixed a heap corruption bug that results from trying to checksum an IPv4 packet using IPv6 rules. This isn't the ultimate fix, but it helps. Modified: ofw/inetv6/tcpv6.fth =================================================================== --- ofw/inetv6/tcpv6.fth 2007-08-15 02:28:29 UTC (rev 536) +++ ofw/inetv6/tcpv6.fth 2007-08-15 03:02:27 UTC (rev 537) @@ -2497,8 +2497,7 @@ flush-writes flush-writesv6 alive? if tcp_outputv6 then - drain - drainv6 + use-ipv6? if drainv6 else drain then alive? if tcp_close then ;

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →