openfirmware November 2009

openfirmware@openfirmware.info

4 participants
78 discussions

r1517 - dev
by svn＠openfirmware.info 26 Nov '09

26 Nov '09

Author: wmb Date: 2009-11-26 01:31:26 +0100 (Thu, 26 Nov 2009) New Revision: 1517 Added: dev/nullscreen.fth dev/ramdisk.fth Log: Checked in ramdisk driver and null screen driver. Added: dev/nullscreen.fth =================================================================== --- dev/nullscreen.fth (rev 0) +++ dev/nullscreen.fth 2009-11-26 00:31:26 UTC (rev 1517) @@ -0,0 +1,37 @@ +\ See license at end of file +purpose: Null driver that no-ops some screen primitives, for testing + +dev /null +: graphmem load-base ; +: erase-screen ; +: fill-rectangle 4drop drop ; +: draw-rectangle 4drop drop ; +: draw-transparent-rectangle 4drop drop ; +true value vga? +: set-source to vga? ; +dend +devalias screen //null + +\ LICENSE_BEGIN +\ Copyright (c) 2009 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 Added: dev/ramdisk.fth =================================================================== --- dev/ramdisk.fth (rev 0) +++ dev/ramdisk.fth 2009-11-26 00:31:26 UTC (rev 1517) @@ -0,0 +1,77 @@ +\ See license at end of file +purpose: Block-method additions to subrange.fth device to make a RAMdisk device + +0 0 " b000000" " /" begin-package + " ramdisk" device-name + h# 3800000 constant /device + +external +\ /device must be defined externally as the length of the subrange +\ my-space is the base of the subrange +my-address my-space /device reg + +0 value offset \ seek pointer + +: clip-size ( adr len -- adr actual ) + offset + /device min offset - ( adr actual ) +; +: update-ptr ( actual -- actual ) dup offset + to offset ; + +external +: open ( -- flag ) 0 to offset true ; +: close ( -- ) ; + +: seek ( d.offset -- status ) + 0<> over /device u> or if drop true exit then \ Seek offset too large + to offset + false +; +: read ( adr len -- actual ) + clip-size ( adr actual ) + tuck offset my-space + -rot move ( actual ) + update-ptr +; +: write ( adr len -- actual ) + clip-size ( adr actual ) + tuck offset my-space + swap move ( actual ) + update-ptr +; +: size ( -- d ) /device 0 ; + + +h# 200 value block-size +: #blocks ( -- n ) /device block-size / ; +: read-blocks ( adr block# #blocks -- actual-#blocks ) + swap block-size um* seek if 2drop 0 exit then ( adr #blocks ) + block-size * read block-size * +; +: write-blocks ( adr block# #blocks -- actual-#blocks ) + swap block-size um* seek if 2drop 0 exit then ( adr #blocks ) + block-size * write block-size * +; + +end-package + +\ LICENSE_BEGIN +\ Copyright (c) 2009 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

1 0

r1516 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 26 Nov '09

26 Nov '09

Author: wmb Date: 2009-11-26 01:22:40 +0100 (Thu, 26 Nov 2009) New Revision: 1516 Added: cpu/x86/pc/olpc/via/Makefile-565 Log: Checked in makefile for image file format conversion. Added: cpu/x86/pc/olpc/via/Makefile-565 =================================================================== --- cpu/x86/pc/olpc/via/Makefile-565 (rev 0) +++ cpu/x86/pc/olpc/via/Makefile-565 2009-11-26 00:22:40 UTC (rev 1516) @@ -0,0 +1,17 @@ +PNG := $(wildcard *.png) +C565 := $(patsubst %.png,%.565,$(PNG)) + +all: $(C565) + +%.565: %.bmp + forth ../../bmp24rgb565.fth -s "bmp24rgb565 $< $@" + +%.bmp: %.png + convert -background white -layers flatten $< tmp.png + convert -type truecolor tmp.png $@ + rm tmp.png + +clean: + -rm *.565 *.log tmp.png + +#.TEMPORARY: tmp.png

1 0

r1515 - dev
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 23:27:54 +0100 (Wed, 25 Nov 2009) New Revision: 1515 Added: dev/am29lv008b.fth dev/en29lv800.fth Log: Added drivers for some FLASH ROM variants. Added: dev/am29lv008b.fth =================================================================== --- dev/am29lv008b.fth (rev 0) +++ dev/am29lv008b.fth 2009-11-25 22:27:54 UTC (rev 1515) @@ -0,0 +1,210 @@ +purpose: Flash ROM programming for AMD 29LV008B and relatives - untested +copyright: Copyright 1996-2001 FirmWorks All Rights Reserved + +\ This file depends on an environment-specific file containing +\ /flash, fctl!, fdata!, fc@ and enable-flash-writes +\ There is a simple user interface to these primitive routines +\ in pkg/flash/flash.fth + +hex +10.0000 value /flash +d# 19 value #sectors +defer enable-flash-writes ' noop to enable-flash-writes +defer fctl! +defer fdata! + +\ magic numbers +h# 5555 constant addr0 +h# 2aaa constant addr1 + +create bb-sectors 0 l, h# 4000 l, h# 6000 l, h# 8000 l, + h# 1.0000 l, h# 2.0000 l, h# 3.0000 l, h# 4.0000 l, + h# 5.0000 l, h# 6.0000 l, h# 7.0000 l, h# 8.0000 l, + h# 9.0000 l, h# a.0000 l, h# b.0000 l, h# c.0000 l, + h# d.0000 l, h# e.0000 l, h# f.0000 l, + +create bt-sectors 0 l, + h# 1.0000 l, h# 2.0000 l, h# 3.0000 l, h# 4.0000 l, + h# 5.0000 l, h# 6.0000 l, h# 7.0000 l, h# 8.0000 l, + h# 9.0000 l, h# a.0000 l, h# b.0000 l, h# c.0000 l, + h# d.0000 l, h# e.0000 l, + h# f.0000 l, h# f.8000 l, h# f.a000 l, h# f.c000 l, + +defer sector-map ' bb-sectors to sector-map +: sector>offset ( sector -- offset ) /l * sector-map + l@ ; +: sector>size ( sector -- size ) + dup 1+ #sectors = if /flash else dup 1+ sector>offset then + swap sector>offset - +; +: offset>sector ( offset -- sector ) + #sectors 1- #sectors 0 do + over i sector>offset i sector>size + u< if drop i leave then + loop nip +; +: offset+len>sectors ( offset len -- end#+1 start# ) + over offset>sector -rot + + 1- offset>sector 1+ swap +; + +\ the command sequence +: unlock-write ( -- ) h# aa addr0 fctl! h# 55 addr1 fctl! ; +: flashmode ( n -- ) addr0 fctl! ; + +\ normal mode, acts like a ROM +: read-mode ( -- ) h# f0 flashmode ; + +\ note side effect: writes stay enabled! +: autoselect-mode ( -- ) + enable-flash-writes + unlock-write h# 90 flashmode +; + +\ these need to recognize more cases. What are the numbers? +: .fl-manuf ( n -- ) + case + 1 of ." AMD " endof + h# 1f of ." ATMEL" endof + h# 89 of ." Intel " endof + dup . + endcase +; +: .fl-dev ( n -- ) + case + h# 37 of ." 29LV008BB " endof + h# 3e of ." 29LV008BT " endof + dup . + endcase +; +: flash-type ( -- device-type manufacturer ) + autoselect-mode 1 fc@ 0 fc@ read-mode +; +: .flash-type ( -- ) flash-type .fl-manuf .fl-dev ; +: .flash ( -- ) .flash-type ; +: (?programmable) ( -- ) + flash-type 1 = if + case + h# 37 of ['] bb-sectors to sector-map endof + h# 3e of ['] bt-sectors to sector-map endof + ( default ) + collect( + ." Unsupported Flash device type: " .flash + ." This firmware can currently program AMD 29LV008B devices." + )collect alert + abort + endcase + then +; +' (?programmable) to ?programmable + +: .flash-protection ( -- ) + autoselect-mode + #sectors 0 do + ." sector " i .d + i sector>offset ." offset = " 8 u.r + i sector>size ." size = " 8 u.r + i sector>offset 2 + fc@ if ." protected" else ." unprotected" then + cr + loop + read-mode +; +: ?partial-protected ( offset len -- ) + 2dup + /flash > if + collect( + ." Image is too big." cr + )collect alert + abort + then + ['] (?programmable) catch if 2drop abort then + autoselect-mode + offset+len>sectors ?do + i sector>offset 2 + fc@ if + read-mode + collect( + ." Cannot program flash." cr + ." Sector " i .d ." is protected." cr + )collect alert + abort + then + loop + read-mode +; + +: clear-status ( -- ) f0 flashmode ; +\ wait until done, check for errors +: data-poll ( n a -- hung? ) + begin + 2dup fc@ xor h# 80 and while ( n a ) \ busy? + dup fc@ h# 20 and if ( n a ) \ error? + fc@ xor h# 80 and abort" write failed " \ abort on still busy + exit \ okay + then + repeat 2drop +; + +: sector-erase ( sector -- ) + enable-flash-writes + unlock-write h# 80 flashmode \ setup + unlock-write dup sector>offset h# 30 over fctl! + swap sector>size + 1- h# ff swap ['] data-poll catch drop + read-mode +; +: sector-erase-suspend ( -- ) b0 addr0 fctl! ; +: sector-erase-resume ( -- ) 30 addr0 fctl! ; +: partial-erase ( offset len -- ) + offset+len>sectors ?do i sector-erase loop +; +: chip-erase ( -- ) + enable-flash-writes + unlock-write h# 80 flashmode \ setup + unlock-write h# 10 flashmode \ chip erase + h# ff /flash 1- ['] data-poll catch drop + read-mode +; +' chip-erase to erase-flash + +: write-byte ( n a -- ) + 2dup unlock-write h# a0 flashmode + fdata! + ['] data-poll catch if clear-status then +; +: write-bytes ( source-address dest-offset length -- ) + 0 ?do over i + c@ over i + write-byte loop + 2drop read-mode +; + +: verify-bytes ( source-address dest-offset length -- ) + 0 ?do + over i + c@ over i + fc@ <> if + ." erify failed. At " dup i + dup . ." got " fc@ . + ." expected " over i + c@ . abort + then + loop 2drop +; +' verify-bytes to verify-flash + +: verify-erase ( sector# -- error? ) + dup sector>offset swap sector>size bounds ?do + i fc@ h# ff <> if + ." erase error at " i . ." got " i fc@ . cr + true leave + then + loop false +; +: program-sector ( address length sector -- ) + dup push-decimal 1 .r pop-base ." E" + dup sector-erase ( address length sector ) + dup verify-erase if ( address length sector ) + dup sector-erase dup verify-erase abort" Erase failure" + then ( address length sector ) + dup sector>offset -rot sector>size min ( address sector-addr length' ) + bs emit ." W" + 3dup write-bytes ( address sector-addr length' ) + bs emit ." V" ( address sector-addr length' ) + verify-bytes ( ) + space +; + +0 value start-sector +: (program-flash) ( address length -- ) start-sector sector>offset swap write-bytes ; +' (program-flash) to program-flash + Added: dev/en29lv800.fth =================================================================== --- dev/en29lv800.fth (rev 0) +++ dev/en29lv800.fth 2009-11-25 22:27:54 UTC (rev 1515) @@ -0,0 +1,215 @@ +purpose: Flash ROM programming for EON EN29LV800 - untested +\ See license at end of file + +\ This file depends on an environment-specific file containing +\ /flash, fctl!, fdata!, fc@ and enable-flash-writes + +hex +10.0000 to /flash +d# 19 value #sectors +defer enable-flash-writes ' noop to enable-flash-writes +defer fctl! +defer fdata! + +\ magic numbers +h# 5555 constant addr0 +h# 2aaa constant addr1 + +create bb-sectors 0 l, h# 4000 l, h# 6000 l, h# 8000 l, + h# 1.0000 l, h# 2.0000 l, h# 3.0000 l, h# 4.0000 l, + h# 5.0000 l, h# 6.0000 l, h# 7.0000 l, h# 8.0000 l, + h# 9.0000 l, h# a.0000 l, h# b.0000 l, h# c.0000 l, + h# d.0000 l, h# e.0000 l, h# f.0000 l, + +create bt-sectors 0 l, + h# 1.0000 l, h# 2.0000 l, h# 3.0000 l, h# 4.0000 l, + h# 5.0000 l, h# 6.0000 l, h# 7.0000 l, h# 8.0000 l, + h# 9.0000 l, h# a.0000 l, h# b.0000 l, h# c.0000 l, + h# d.0000 l, h# e.0000 l, + h# f.0000 l, h# f.8000 l, h# f.a000 l, h# f.c000 l, + +defer sector-map ' bb-sectors to sector-map +: sector>offset ( sector -- offset ) /l * sector-map + l@ ; +: sector>size ( sector -- size ) + dup 1+ #sectors = if /flash else dup 1+ sector>offset then + swap sector>offset - +; +: offset>sector ( offset -- sector ) + #sectors 1- #sectors 0 do + over i sector>offset i sector>size + u< if drop i leave then + loop nip +; +: offset+len>sectors ( offset len -- end#+1 start# ) + over offset>sector -rot + + 1- offset>sector 1+ swap +; + +\ the command sequence +: unlock-write ( -- ) h# aa addr0 fctl! h# 55 addr1 fctl! ; +: flashmode ( n -- ) addr0 fctl! ; + +\ normal mode, acts like a ROM +: read-mode ( -- ) h# f0 flashmode ; + +\ note side effect: writes stay enabled! +: autoselect-mode ( -- ) + enable-flash-writes + unlock-write h# 90 flashmode +; + +\ these need to recognize more cases. What are the numbers? +: .fl-manuf ( n -- ) + case + 1 of ." AMD " endof + 1c of ." EON " endof + h# 1f of ." ATMEL" endof + h# 89 of ." Intel " endof + dup . + endcase +; +: .fl-dev ( n -- ) + case + h# 37 of ." 29LV008BB " endof + h# 3e of ." 29LV008BT " endof + h# da of ." 29LV800bt " endof + h# 5b of ." 29LV800bb " endof + dup . + endcase +; +: flash-type ( -- device-type manufacturer ) + autoselect-mode 1 fc@ 0 fc@ read-mode +; +: .flash-type ( -- ) flash-type .fl-manuf .fl-dev ; +: .flash ( -- ) .flash-type ; +: (?programmable) ( -- ) + flash-type 1 = if + case + h# 37 of ['] bb-sectors to sector-map endof + h# 3e of ['] bt-sectors to sector-map endof + h# da of ['] bt-sectors to sector-map endof + h# 5b of ['] bb-sectors to sector-map endof + ( default ) + collect( + ." Unsupported Flash device type: " .flash + ." This firmware can currently program 29LV008B and 29LV800 devices." + )collect alert + abort + endcase + then +; +' (?programmable) to ?programmable + +: .flash-protection ( -- ) + autoselect-mode + #sectors 0 do + ." sector " i .d + i sector>offset ." offset = " 8 u.r + i sector>size ." size = " 8 u.r + i sector>offset 2 + fc@ if ." protected" else ." unprotected" then + cr + loop + read-mode +; +: ?partial-protected ( offset len -- ) + 2dup + /flash > if + collect( + ." Image is too big." cr + )collect alert + abort + then + ['] (?programmable) catch if 2drop abort then + autoselect-mode + offset+len>sectors ?do + i sector>offset 2 + fc@ if + read-mode + collect( + ." Cannot program flash." cr + ." Sector " i .d ." is protected." cr + )collect alert + abort + then + loop + read-mode +; + +: clear-status ( -- ) f0 flashmode ; +\ wait until done, check for errors +: data-poll ( n a -- hung? ) + begin + 2dup fc@ xor h# 80 and while ( n a ) \ busy? + dup fc@ h# 20 and if ( n a ) \ error? + fc@ xor h# 80 and abort" write failed " \ abort on still busy + exit \ okay + then + repeat 2drop +; + +: sector-erase ( sector -- ) + enable-flash-writes + unlock-write h# 80 flashmode \ setup + unlock-write dup sector>offset h# 30 over fctl! + swap sector>size + 1- h# ff swap ['] data-poll catch drop + read-mode +; +' sector-erase to flash-erase-block + +: sector-erase-suspend ( -- ) b0 addr0 fctl! ; +: sector-erase-resume ( -- ) 30 addr0 fctl! ; +: partial-erase ( offset len -- ) + offset+len>sectors ?do i sector-erase loop +; +: chip-erase ( -- ) + enable-flash-writes + unlock-write h# 80 flashmode \ setup + unlock-write h# 10 flashmode \ chip erase + h# ff /flash 1- ['] data-poll catch drop + read-mode +; +\ ' chip-erase to erase-flash + +: write-byte ( n a -- ) + 2dup unlock-write h# a0 flashmode + fdata! + ['] data-poll catch if clear-status then +; +: (flash-write) ( source-address length dest-offset -- ) + rot 0 ?do over i + c@ over i + write-byte loop ( src dst ) + 2drop read-mode +; +' (flash-write) to flash-write + +: (flash-verify) ( source-address length dest-offset -- ) + rot 0 ?do ( src dst ) + over i + c@ over i + fc@ <> if ( src dst ) + ." Verify failed. At " dup i + dup . ." got " fc@ . + ." expected " over i + c@ . abort + then ( src dst ) + loop 2drop ( ) +; +' (flash-verify to flash-verify + +: verify-erase ( sector# -- error? ) + dup sector>offset swap sector>size bounds ?do + i fc@ h# ff <> if + ." erase error at " i . ." got " i fc@ . cr + true leave + then + loop false +; +: program-sector ( address length sector -- ) + dup push-decimal 1 .r pop-base ." E" + dup sector-erase ( address length sector ) + dup verify-erase if ( address length sector ) + dup sector-erase dup verify-erase abort" Erase failure" + then ( address length sector ) + dup sector>offset -rot sector>size min ( address sector-addr length' ) + bs emit ." W" + 3dup write-bytes ( address sector-addr length' ) + bs emit ." V" ( address sector-addr length' ) + verify-bytes ( ) + space +; + +0 value start-sector +: (program-flash) ( address length -- ) start-sector sector>offset swap write-bytes ; +' (program-flash) to program-flash

1 0

r1514 - dev/usb2/device/userial
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 23:25:53 +0100 (Wed, 25 Nov 2009) New Revision: 1514 Added: dev/usb2/device/userial/userial.fth Log: Added USB userial.fth driver. Added: dev/usb2/device/userial/userial.fth =================================================================== --- dev/usb2/device/userial/userial.fth (rev 0) +++ dev/usb2/device/userial/userial.fth 2009-11-25 22:25:53 UTC (rev 1514) @@ -0,0 +1,63 @@ +\ See license at end of file +purpose: userial driver - see http://www.tty1.net/userial/ + +0 instance value inbuf +0 instance value outbuf +0 instance value inbuf2 + +: alloc-buffers ( -- ) + h# 10 dma-alloc to inbuf + h# 10 alloc-mem to inbuf2 + h# 10 dma-alloc to outbuf +; +: free-buffers ( -- ) + inbuf h# 10 dma-free + inbuf2 h# 10 free-mem + outbuf h# 10 dma-free +; + +: open ( -- flag ) + device set-target + configuration set-config if + ." userial: set-config failed" cr + false exit + then + alloc-buffers + inbuf h# 10 bulk-in-pipe begin-bulk-in + true +; +: received? ( -- false | adr len true ) + bulk-in? if drop restart-bulk-in false exit then ( actual ) + \ Workaround for a deficiency, since fixed, in UHCI get-actual + dup h# 800 = if ( null-data-code ) + drop restart-bulk-in ( ) + inbuf2 0 true ( adr 0 true ) + exit + then ( actual ) + dup if ( actual ) + >r ( r: actual ) + inbuf inbuf2 r@ move ( r: actual ) + restart-bulk-in ( r: actual ) + inbuf2 r> true ( adr len true ) + then ( false | adr len true ) +; +: write ( adr len -- actual ) + tuck begin dup while ( len adr rem ) + 2dup h# 10 min tuck ( len adr rem this adr this ) + outbuf swap move ( len adr rem this ) + outbuf over ( len adr rem this outbuf this ) + bulk-out-pipe bulk-out if ( len adr rem this ) + drop nip ( len rem ) + - ( actual ) + exit + then ( len adr rem this ) + /string ( len adr' rem' ) + repeat ( len adr' rem' ) + nip - ( actual ) +; +: cmd ( adr len -- ) + write drop " "n" write drop +; +: res ( -- ) + begin received? while type repeat +;

1 0

r1513 - dev/usb2/device
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 23:25:30 +0100 (Wed, 25 Nov 2009) New Revision: 1513 Added: dev/usb2/device/userial/ Log: Added USB userial driver.

1 0

r1512 - dev/usb2/hcd/ehci
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 23:22:46 +0100 (Wed, 25 Nov 2009) New Revision: 1512 Modified: dev/usb2/hcd/ehci/bulk.fth Log: Corrected a few stack comments in ehci/bulk.fth. No functional change. Modified: dev/usb2/hcd/ehci/bulk.fth =================================================================== --- dev/usb2/hcd/ehci/bulk.fth 2009-11-25 22:20:48 UTC (rev 1511) +++ dev/usb2/hcd/ehci/bulk.fth 2009-11-25 22:22:46 UTC (rev 1512) @@ -30,7 +30,7 @@ : toggle-bulk-in-data ( -- ) bulk-in-pipe target di-in-data-toggle ; : toggle-bulk-out-data ( -- ) bulk-out-pipe target di-out-data-toggle ; -: qtd-fixup-bulk-in-data ( qtd -- data ) +: qtd-fixup-bulk-in-data ( qtd -- ) usb-error USB_ERR_STALL and if drop bulk-in-pipe h# 80 or unstall-pipe TD_TOGGLE_DATA0 @@ -39,9 +39,9 @@ then bulk-in-data! ; -: fixup-bulk-in-data ( qh -- data ) >hcqh-overlay qtd-fixup-bulk-in-data ; +: fixup-bulk-in-data ( qh -- ) >hcqh-overlay qtd-fixup-bulk-in-data ; -: fixup-bulk-out-data ( qh -- data ) +: fixup-bulk-out-data ( qh -- ) usb-error USB_ERR_STALL and if drop bulk-out-pipe unstall-pipe TD_TOGGLE_DATA0 @@ -470,7 +470,7 @@ usb-error ( actual usberr ) my-bulk-qtd map-out-bptrs ( actual usberr ) - my-bulk-qh dup fixup-bulk-in-data ( actual usberr ) + my-bulk-qh dup fixup-bulk-in-data ( actual usberr qh ) remove-qh ( actual usberr ) ;

1 0

r1511 - cpu/x86
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 23:20:48 +0100 (Wed, 25 Nov 2009) New Revision: 1511 Modified: cpu/x86/acpitimer.fth cpu/x86/tsc.fth Log: Switch back to using ACPI timer for t( and )t, with improvements in its long-term timekeeping abilities. To prevent rollover on long t( .. )t runs, you must call t-update from time to time. Modified: cpu/x86/acpitimer.fth =================================================================== --- cpu/x86/acpitimer.fth 2009-11-25 22:18:33 UTC (rev 1510) +++ cpu/x86/acpitimer.fth 2009-11-25 22:20:48 UTC (rev 1511) @@ -31,16 +31,53 @@ [ifdef] use-acpi-timing \ Timing tools -variable timestamp1 -: t( ( -- ) acpi-timer@ timestamp1 ! ; -: ))t1 ( -- ticks ) acpi-timer@ timestamp1 @ - ; +2variable timestamp +0 value timer-high +: get-timer ( -- d ) + \ First handle the case where we have aleady rolled over + 0 acpi-w@ 1 and if \ Rollover bit changed + 1 0 acpi-w! \ Clear indication + acpi-timer@ timer-high ( timer.low timer.high ) + over 0>= if ( timer.low timer.high ) + 1+ dup to timer-high ( timer.low timer.high' ) + then ( timer.low timer.high ) + exit + then ( ) + + acpi-timer@ timer-high ( timer.low timer.high ) + 0 acpi-w@ 1 and 0= if exit then \ We are done if rollover bit didn't change + 1 0 acpi-w! ( timer.low timer.high ) + \ Otherwise we must start over, to ensure that low and high are consistent + + 2drop ( ) + acpi-timer@ timer-high ( timer.low timer.high ) + over 0>= if ( timer.low timer.high ) + 1+ dup to timer-high ( timer.low timer.high' ) + then ( timer.low timer.high ) +; +: du* ( ud.lo ud.hi u -- res.lo res.mid res.hi ) \ Ignores overflow to third cell + tuck um* 2>r ( ud.lo u r: res.mid0 res.hi0 ) + um* ( res.lo res.mid1 r: res.mid0 res.hi0 ) + 0 2r> d+ ( res.lo res.mid res.hi ) +; +: acpi-ticks>usecs ( d.ticks -- usec ) + d# 50 du* drop ( d.product ) \ The scale factor is 1000/3580 == 50/179 + d# 179 um/mod nip ( usecs ) +; + +\ If you are doing a long timing, call this periodically to handle rollover +: t-update ( -- ) 0 acpi-w@ 1 and if timer-high 1+ to timer-high then ; +: t( ( -- ) get-timer timestamp 2! ; +\ Subtracting 10 accounts for the time it takes to read the ACPI timer, +\ which is an I/O port and therefore slow to read +: ))t1 ( -- d.ticks ) get-timer timestamp 2@ d- d# 10. d- 0. dmax ; : )t ( -- ) - ))t1 d# 1000 d# 3580 */ ( microseconds ) + ))t1 acpi-ticks>usecs ( microseconds ) push-decimal <# u# u# u# [char] , hold u# u#s u#> type ." uS " pop-base ; -: ))t-sec ( -- sec ) ))t1 d# 3,580,000 / ; +: ))t-sec ( -- sec ) ))t1 d# 3,580,000 um/mod nip ; : )t-sec ( -- ) ))t-sec ( seconds ) push-decimal @@ -53,10 +90,7 @@ <# u# u#s u#> type ." :" <# u# u# u#> type ." :" <# u# u# u#> type pop-base ; -: )t-hms - ))t-sec d# 3,580,000 / ( seconds ) - .hms -; +: )t-hms ( -- ) ))t-sec .hms ; [then] \ LICENSE_BEGIN Modified: cpu/x86/tsc.fth =================================================================== --- cpu/x86/tsc.fth 2009-11-25 22:18:33 UTC (rev 1510) +++ cpu/x86/tsc.fth 2009-11-25 22:20:48 UTC (rev 1511) @@ -43,6 +43,7 @@ [ifdef] use-tsc-timing \ These are precise but inaccurate, as the TSC varies with clock throttling \ Timing tools 2variable timestamp +: t-update ; : t( ( -- ) tsc@ timestamp 2! ; : ))t ( -- d.ticks ) tsc@ timestamp 2@ d- ; : )t ( -- )

1 0

r1510 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 23:18:33 +0100 (Wed, 25 Nov 2009) New Revision: 1510 Modified: cpu/x86/pc/olpc/via/ cpu/x86/pc/olpc/via/config.fth cpu/x86/pc/olpc/via/fsupdate.fth cpu/x86/pc/olpc/via/romreset.bth cpu/x86/pc/olpc/via/smbus.fth cpu/x86/pc/olpc/via/versions.fth Log: svn ignore Property changes on: cpu/x86/pc/olpc/via ___________________________________________________________________ Added: svn:ignore + testicons Modified: cpu/x86/pc/olpc/via/config.fth =================================================================== --- cpu/x86/pc/olpc/via/config.fth 2009-11-25 21:38:32 UTC (rev 1509) +++ cpu/x86/pc/olpc/via/config.fth 2009-11-25 22:18:33 UTC (rev 1510) @@ -29,12 +29,12 @@ \ The disadvantage of the timestamp counter is that it changes speed with \ CPU throttling. The advantage is that it is 64 bits, so no rollover. create use-timestamp-counter \ Use CPU's timestamp counter for "ms" -create use-tsc-timing \ Use timestamp counter for t( .. )t +\ create use-tsc-timing \ Use timestamp counter for t( .. )t \ The advantage of the ACPI counter is that its speed is independent of \ CPU throttling. The disadvantage is that it is 32 bits, so it rolls \ over every 20 minutes or so, unless you extend it with an SMI handler. -\ create use-acpi-timing +create use-acpi-timing \ create use-acpi-delays create resident-packages Modified: cpu/x86/pc/olpc/via/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth 2009-11-25 21:38:32 UTC (rev 1509) +++ cpu/x86/pc/olpc/via/fsupdate.fth 2009-11-25 22:18:33 UTC (rev 1510) @@ -127,6 +127,7 @@ load-base to dma-buffer load-base /nand-block 4 * + to data-buffer /nand-block /nand-page / to nand-pages/block + t-update \ Handle possible timer rollover ; : zblocks-end: ( -- ) Modified: cpu/x86/pc/olpc/via/romreset.bth =================================================================== --- cpu/x86/pc/olpc/via/romreset.bth 2009-11-25 21:38:32 UTC (rev 1509) +++ cpu/x86/pc/olpc/via/romreset.bth 2009-11-25 22:18:33 UTC (rev 1510) @@ -76,7 +76,6 @@ [ifdef] debug-startup fload ${BP}/cpu/x86/pc/mmxdotcode.fth \ Memoryless numeric output fload ${BP}/cpu/x86/pc/dot.fth \ Numeric output subroutine -\ fload ${BP}/cpu/x86/pc/olpc/via/startinteract.fth \ emitpause subroutine [then] fload ${BP}/cpu/x86/pc/olpc/via/startusdelay.fth \ microsecond delay subroutine Modified: cpu/x86/pc/olpc/via/smbus.fth =================================================================== --- cpu/x86/pc/olpc/via/smbus.fth 2009-11-25 21:38:32 UTC (rev 1509) +++ cpu/x86/pc/olpc/via/smbus.fth 2009-11-25 22:18:33 UTC (rev 1510) @@ -12,7 +12,7 @@ : smb-hoststat@ ( -- byte ) 0 smb-reg@ ; \ Various status bits - busy bit is bit 0 : smb-hoststat! ( byte -- ) 0 smb-reg! ; \ Lots of Write 1 to Clear bits herein : smb-hostctl! ( byte -- ) 2 smb-reg! ; \ Write this register to start the transaction -: smb-hostcmd@ ( -- byte ) 2 smb-reg@ ; \ Reads reset the block data counter +: smb-hostctl@ ( -- byte ) 2 smb-reg@ ; \ Reads reset the block data counter : smb-hostcmd! ( byte -- ) 3 smb-reg! ; \ Send in protocol Command Field : smb-xmitadr! ( byte -- ) 4 smb-reg! ; \ Target address : smb-hostdata0! ( byte -- ) 5 smb-reg! ; \ Data0 out @@ -61,7 +61,7 @@ smbus-target smb-xmitadr! ( adr len offset ) smb-hostcmd! ( adr len ) \ Starting offset dup smb-hostdata0! ( adr len ) \ Length - smb-hostcmd@ drop ( adr len ) \ Reset block transfer counter + smb-hostctl@ drop ( adr len ) \ Reset block transfer counter bounds ?do i c@ smb-blockdata! loop ( ) \ Copy data to chip h# 34 smbus-cmd ( ) \ I2C block command ; @@ -70,7 +70,7 @@ smb-hostcmd! ( adr maxlen ) \ Starting offset h# 34 smbus-cmd ( adr maxlen ) \ I2C block command smb-hostdata0@ min ( adr actlen ) \ Number of bytes returned - smb-hostcmd@ drop ( adr actlen ) \ Reset block transfer counter + smb-hostctl@ drop ( adr actlen ) \ Reset block transfer counter tuck bounds ?do smb-blockdata@ i c! loop ( actlen ) \ Copy data from chip ; @@ -78,7 +78,7 @@ smbus-target smb-xmitadr! ( adr len offset ) smb-hostcmd! ( adr len ) \ Starting offset dup smb-hostdata0! ( adr len ) \ Length - smb-hostcmd@ drop ( adr len ) \ Reset block transfer counter + smb-hostctl@ drop ( adr len ) \ Reset block transfer counter bounds ?do i c@ smb-blockdata! loop ( ) \ Copy data to chip h# 14 smbus-cmd ( ) \ SMBus block command ; @@ -87,7 +87,7 @@ smb-hostcmd! ( adr maxlen ) \ Starting offset h# 14 smbus-cmd ( adr maxlen ) \ SMBus block command smb-hostdata0@ min ( adr actlen ) \ Number of bytes returned - smb-hostcmd@ drop ( adr actlen ) \ Reset block transfer counter + smb-hostctl@ drop ( adr actlen ) \ Reset block transfer counter tuck bounds ?do smb-blockdata@ i c! loop ( actlen ) \ Copy data from chip ; Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-11-25 21:38:32 UTC (rev 1509) +++ cpu/x86/pc/olpc/via/versions.fth 2009-11-25 22:18:33 UTC (rev 1510) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 16c +macro: FW_MINOR 16e \ The EC microcode macro: EC_VERSION 1_9_14

1 0

r1509 - cpu/x86/pc/olpc/via/build
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 22:38:32 +0100 (Wed, 25 Nov 2009) New Revision: 1509 Modified: cpu/x86/pc/olpc/via/build/ Log: svn ignore Property changes on: cpu/x86/pc/olpc/via/build ___________________________________________________________________ Modified: svn:ignore - *.txt *.public *.rom *.version tags sourceurl *.tag build builton.fth VIA.ROM *.bin memtest *.aml *.stamp + *.txt *.public *.rom *.version tags sourceurl *.tag build builton.fth VIA.ROM *.bin memtest *.aml *.stamp forth testicons

1 0

r1508 - forth/lib
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 22:28:25 +0100 (Wed, 25 Nov 2009) New Revision: 1508 Added: forth/lib/circle.fth Log: Checked in a rudimentary implementation of the midpoint circle algorithm. Added: forth/lib/circle.fth =================================================================== --- forth/lib/circle.fth (rev 0) +++ forth/lib/circle.fth 2009-11-25 21:28:25 UTC (rev 1508) @@ -0,0 +1,20 @@ +\ Midpoint circle algorithm - see http://en.wikipedia.org/wiki/Midpoint_circle_algorithm +decimal + +d# 12 constant radius + +radius value y +0 value x +3 radius 2* - value err + +: step ( -- ) + x . y . err . cr + err 0< if + x 2* 2* 6 + err + to err + else + x y - 2* 2* d# 10 + err + to err + y 1- to y + then + x 1+ to x +; +step step step step step step step step step

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware November 2009