openfirmware

openfirmware@openfirmware.info

3007 discussions

r1708 - cpu/x86/pc/olpc/via dev
by svn＠openfirmware.info 26 Jan '10

26 Jan '10

Author: wmb Date: 2010-01-26 18:20:42 +0100 (Tue, 26 Jan 2010) New Revision: 1708 Modified: cpu/x86/pc/olpc/via/copynand.fth cpu/x86/pc/olpc/via/fw.bth dev/logdev.fth Log: Turn off console logging while display grid maps, to avoid consuming large amounts of memory with boring messages. Modified: cpu/x86/pc/olpc/via/copynand.fth =================================================================== --- cpu/x86/pc/olpc/via/copynand.fth 2010-01-26 09:04:11 UTC (rev 1707) +++ cpu/x86/pc/olpc/via/copynand.fth 2010-01-26 17:20:42 UTC (rev 1708) @@ -75,6 +75,7 @@ d# 26 constant status-line : gshow-init ( #eblocks -- ) + suspend-logging dup set-grid-scale cursor-off " erase-screen" $call-screen @@ -87,7 +88,7 @@ : gshow-strange ( eblock# -- ) strange-color show-state ; -: gshow-done ( -- ) cursor-on ; +: gshow-done ( -- ) cursor-on resume-logging ; : gshow-pending ( eblock# -- ) pending-color show-state ; Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2010-01-26 09:04:11 UTC (rev 1707) +++ cpu/x86/pc/olpc/via/fw.bth 2010-01-26 17:20:42 UTC (rev 1708) @@ -356,6 +356,8 @@ fload ${BP}/cpu/x86/pc/olpc/via/leds.fth \ LEDs fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools +fload ${BP}/dev/logdev.fth + fload ${BP}/cpu/x86/pc/olpc/disptest.fth fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic fload ${BP}/dev/olpc/touchpad/touchpad.fth \ Touchpad diagnostic @@ -511,8 +513,6 @@ fload ${BP}/cpu/x86/pc/olpc/via/drawboard.fth fload ${BP}/cpu/x86/pc/olpc/via/drawboardtop.fth -fload ${BP}/dev/logdev.fth - fload ${BP}/ofw/inet/sntp.fth : olpc-ntp-servers ( -- ) " DHCP time 172.18.0.1 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org" Modified: dev/logdev.fth =================================================================== --- dev/logdev.fth 2010-01-26 09:04:11 UTC (rev 1707) +++ dev/logdev.fth 2010-01-26 17:20:42 UTC (rev 1708) @@ -75,6 +75,8 @@ log-ih add-output then ; +: suspend-logging ( -- ) log-ih if log-ih remove-output then ; +: resume-logging ( -- ) log-ih if log-ih add-output then ; : stop-logging ( -- ) log-ih if log-ih remove-output

1 0

r1707 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 26 Jan '10

26 Jan '10

Author: wmb Date: 2010-01-26 10:04:11 +0100 (Tue, 26 Jan 2010) New Revision: 1707 Modified: cpu/x86/pc/olpc/via/fw-version.fth Log: Q3A30 Modified: cpu/x86/pc/olpc/via/fw-version.fth =================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth 2010-01-26 09:03:28 UTC (rev 1706) +++ cpu/x86/pc/olpc/via/fw-version.fth 2010-01-26 09:04:11 UTC (rev 1707) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 29j +macro: FW_MINOR 30

1 0

r1706 - in cpu/x86/pc/olpc: . via
by svn＠openfirmware.info 26 Jan '10

26 Jan '10

Author: wmb Date: 2010-01-26 10:03:28 +0100 (Tue, 26 Jan 2010) New Revision: 1706 Modified: cpu/x86/pc/olpc/plot.fth cpu/x86/pc/olpc/via/drawboardtop.fth cpu/x86/pc/olpc/via/fw-version.fth cpu/x86/pc/olpc/via/fw.bth Log: XO-1.5 - Added line and curve drawing routines and vector board outline images. Modified: cpu/x86/pc/olpc/plot.fth =================================================================== --- cpu/x86/pc/olpc/plot.fth 2010-01-26 08:19:58 UTC (rev 1705) +++ cpu/x86/pc/olpc/plot.fth 2010-01-26 09:03:28 UTC (rev 1706) @@ -1,3 +1,4 @@ +dev screen : plot0 ( -- x y ) 0 screen-height 10 - ; : clear-plot ( width height -- ) 2>r @@ -71,3 +72,10 @@ : lineplot ( xt xmin xmax xscale ymin ymax -- ) " plot" $call-screen ; : vgrid ( width height interval -- ) " vgrid" $call-screen ; : hgrid ( width height interval -- ) " hgrid" $call-screen ; + +: setup-plot ( -- ) + h# ffff set-fg 0 set-bg + d# 1200 d# 900 clear-plot + d# 1200 d# 900 d# 100 hgrid + d# 1200 d# 900 d# 100 vgrid +; Modified: cpu/x86/pc/olpc/via/drawboardtop.fth =================================================================== --- cpu/x86/pc/olpc/via/drawboardtop.fth 2010-01-26 08:19:58 UTC (rev 1705) +++ cpu/x86/pc/olpc/via/drawboardtop.fth 2010-01-26 09:03:28 UTC (rev 1706) @@ -63,10 +63,10 @@ 564 259 18 18 boxat 570 269 moveto 573 273 lineto 578 263 lineto ; -: led0 518 348 led-symbol ; -: led1 491 348 led-symbol ; -: led2 72 348 led-symbol ; -: led3 99 348 led-symbol ; +: led0-top 518 348 led-symbol ; +: led1-top 491 348 led-symbol ; +: led2-top 72 348 led-symbol ; +: led3-top 99 348 led-symbol ; : mic-led 31 45 led-symbol ; : camera-led 569 45 led-symbol ; : wlan-conn 144 82 90 27 boxat ; @@ -95,10 +95,10 @@ x-but square-but check-but - led0 - led1 - led2 - led3 + led0-top + led1-top + led2-top + led3-top mic-led camera-led wlan-conn Modified: cpu/x86/pc/olpc/via/fw-version.fth =================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth 2010-01-26 08:19:58 UTC (rev 1705) +++ cpu/x86/pc/olpc/via/fw-version.fth 2010-01-26 09:03:28 UTC (rev 1706) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 29c +macro: FW_MINOR 29j Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2010-01-26 08:19:58 UTC (rev 1705) +++ cpu/x86/pc/olpc/via/fw.bth 2010-01-26 09:03:28 UTC (rev 1706) @@ -506,6 +506,11 @@ fload ${BP}/cpu/x86/pc/olpc/via/fsverify.fth devalias fsdisk int:0 +fload ${BP}/cpu/x86/pc/olpc/strokes.fth +fload ${BP}/cpu/x86/pc/olpc/plot.fth +fload ${BP}/cpu/x86/pc/olpc/via/drawboard.fth +fload ${BP}/cpu/x86/pc/olpc/via/drawboardtop.fth + fload ${BP}/dev/logdev.fth fload ${BP}/ofw/inet/sntp.fth

1 0

r1705 - in cpu/x86/pc/olpc: . via
by svn＠openfirmware.info 26 Jan '10

26 Jan '10

Author: wmb Date: 2010-01-26 09:19:58 +0100 (Tue, 26 Jan 2010) New Revision: 1705 Modified: cpu/x86/pc/olpc/nandcastui.fth cpu/x86/pc/olpc/via/fw.bth Log: Use new boot-as-call facility so that calling the nandblaster retains Forth execution state - useful for assembly test. Modified: cpu/x86/pc/olpc/nandcastui.fth =================================================================== --- cpu/x86/pc/olpc/nandcastui.fth 2010-01-26 08:18:17 UTC (rev 1704) +++ cpu/x86/pc/olpc/nandcastui.fth 2010-01-26 08:19:58 UTC (rev 1705) @@ -100,9 +100,11 @@ " boot rom:nb_rx ,,239.255.1.2" eval ; -: nb_rx +: nb-rx false to already-go? + boot-as-call( " boot rom:nb_rx ,,239.255.1.2" eval + )boot-as-call ; : ucastnand false to already-go? Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2010-01-26 08:18:17 UTC (rev 1704) +++ cpu/x86/pc/olpc/via/fw.bth 2010-01-26 08:19:58 UTC (rev 1705) @@ -498,6 +498,7 @@ ; ' olpc-ssids to default-ssids +fload ${BP}/cpu/x86/bootascall.fth fload ${BP}/cpu/x86/pc/olpc/nandcastui.fth fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth fload ${BP}/cpu/x86/pc/olpc/via/blockfifo.fth

1 0

r1704 - in dev/usb2: device/keyboard device/net device/serial device/storage device/userial device/wlan hcd hcd/uhci
by svn＠openfirmware.info 26 Jan '10

26 Jan '10

Author: wmb Date: 2010-01-26 09:18:17 +0100 (Tue, 26 Jan 2010) New Revision: 1704 Modified: dev/usb2/device/keyboard/kbd.fth dev/usb2/device/net/ethernet.fth dev/usb2/device/serial/uart.fth dev/usb2/device/storage/scsi.fth dev/usb2/device/userial/userial.fth dev/usb2/device/wlan/wlan.fth dev/usb2/hcd/control.fth dev/usb2/hcd/hcd-call.fth dev/usb2/hcd/uhci/control.fth Log: OLPC trac 9997 - Propagate several new method calls through hub nodes, add new "reset-bulk-toggles" method instead of doing it implicitly in set-config (because the bulk pipe numbers are not always known at set-config time, especially in probe-hub). Modified: dev/usb2/device/keyboard/kbd.fth =================================================================== --- dev/usb2/device/keyboard/kbd.fth 2010-01-26 08:00:30 UTC (rev 1703) +++ dev/usb2/device/keyboard/kbd.fth 2010-01-26 08:18:17 UTC (rev 1704) @@ -329,7 +329,7 @@ : setup-hardware? ( -- error? ) set-device device set-target - " reset?" $call-parent if + reset? if configuration set-config if ." Failed to set USB keyboard configuration" cr true exit Modified: dev/usb2/device/net/ethernet.fth =================================================================== --- dev/usb2/device/net/ethernet.fth 2010-01-26 08:00:30 UTC (rev 1703) +++ dev/usb2/device/net/ethernet.fth 2010-01-26 08:18:17 UTC (rev 1704) @@ -221,11 +221,12 @@ device set-target opencount @ 0= if - " reset?" $call-parent if + reset? if configuration set-config if ." Failed to set configuration" cr false exit then + bulk-in-pipe bulk-out-pipe reset-bulk-toggles init-nic then Modified: dev/usb2/device/serial/uart.fth =================================================================== --- dev/usb2/device/serial/uart.fth 2010-01-26 08:00:30 UTC (rev 1703) +++ dev/usb2/device/serial/uart.fth 2010-01-26 08:18:17 UTC (rev 1704) @@ -56,11 +56,12 @@ device set-target refcount @ 0= if - " reset?" $call-parent if + reset? if configuration set-config if ." Failed set serial port configuration" cr false exit then + bulk-in-pipe bulk-out-pipe reset-bulk-toggles then init-buf Modified: dev/usb2/device/storage/scsi.fth =================================================================== --- dev/usb2/device/storage/scsi.fth 2010-01-26 08:00:30 UTC (rev 1703) +++ dev/usb2/device/storage/scsi.fth 2010-01-26 08:18:17 UTC (rev 1704) @@ -183,10 +183,11 @@ 0 max max-lun min to lun set-device \ The device number may have changed if we recycled the node device set-target - " reset?" $call-parent if + reset? if configuration set-config if ." USB storage scsi layer: Failed to set configuration" cr then + bulk-in-pipe bulk-out-pipe reset-bulk-toggles then ; : set-timeout ( n -- ) bulk-timeout max set-bulk-in-timeout ; Modified: dev/usb2/device/userial/userial.fth =================================================================== --- dev/usb2/device/userial/userial.fth 2010-01-26 08:00:30 UTC (rev 1703) +++ dev/usb2/device/userial/userial.fth 2010-01-26 08:18:17 UTC (rev 1704) @@ -19,11 +19,12 @@ : open ( -- flag ) set-device device set-target - " reset?" $call-parent if + reset? if configuration set-config if ." userial: set-config failed" cr false exit then + bulk-in-pipe bulk-out-pipe reset-bulk-toggles then alloc-buffers inbuf h# 10 bulk-in-pipe begin-bulk-in Modified: dev/usb2/device/wlan/wlan.fth =================================================================== --- dev/usb2/device/wlan/wlan.fth 2010-01-26 08:00:30 UTC (rev 1703) +++ dev/usb2/device/wlan/wlan.fth 2010-01-26 08:18:17 UTC (rev 1704) @@ -68,11 +68,12 @@ my-args parse-args set-parent-channel opencount @ 0= if - " reset?" $call-parent if + reset? if configuration set-config if ." Failed to set USB configuration for wireless" cr false exit then + bulk-in-pipe bulk-out-pipe reset-bulk-toggles then init-buf /inbuf /outbuf setup-bus-io if free-buf false exit then Modified: dev/usb2/hcd/control.fth =================================================================== --- dev/usb2/hcd/control.fth 2010-01-26 08:00:30 UTC (rev 1703) +++ dev/usb2/hcd/control.fth 2010-01-26 08:18:17 UTC (rev 1704) @@ -76,11 +76,15 @@ 0 swap DR_IN or GET_STATUS control-get ; +\ Must be called after set-config for any device with bulk-in or +\ bulk-out pipes. Pass in 0 if one of the pipes is nonexistent. +: reset-bulk-toggles ( bulk-in-pipe bulk-out-pipe -- ) + ?dup if 0 swap target di-out-data! then + ?dup if 0 swap target di-in-data! then +; + : set-config ( cfg -- usberr ) >r 0 0 0 r> DR_DEVICE DR_OUT or SET_CONFIGURATION control-set - \ Setting the configuration initializes the endpoint's bulk data toggles - 0 bulk-out-pipe target di-out-data! - 0 bulk-in-pipe target di-in-data! ; : set-interface ( alt intf -- usberr ) Modified: dev/usb2/hcd/hcd-call.fth =================================================================== --- dev/usb2/hcd/hcd-call.fth 2010-01-26 08:00:30 UTC (rev 1703) +++ dev/usb2/hcd/hcd-call.fth 2010-01-26 08:18:17 UTC (rev 1704) @@ -70,7 +70,24 @@ " bulk-in-ready?" $call-parent ; +: begin-in-ring ( /buf #bufs pipe -- ) + " begin-in-ring" $call-parent +; +\ : end-in-ring " end-in-ring" $call-parent ; +: begin-out-ring ( /buf #bufs pipe -- ) + " begin-out-ring" $call-parent +; +: end-out-ring ( -- ) + " end-out-ring" $call-parent +; +: send-out ( adr len -- qtd ) + " send-out" $call-parent +; +: wait-out ( qtd -- error? ) + " wait-out" $call-parent +; + \ Interrupt pipe operations : begin-intr-in ( buf len pipe interval -- ) " begin-intr-in" $call-parent @@ -84,7 +101,16 @@ : end-intr-in ( -- ) " end-intr-in" $call-parent ; +: reset-bulk-toggles ( bulk-in-pipe bulk-out-pipe -- ) + " reset-bulk-toggles" $call-parent +; +: reset? ( -- flag ) + " reset?" $call-parent +; + + + headers \ LICENSE_BEGIN Modified: dev/usb2/hcd/uhci/control.fth =================================================================== --- dev/usb2/hcd/uhci/control.fth 2010-01-26 08:00:30 UTC (rev 1703) +++ dev/usb2/hcd/uhci/control.fth 2010-01-26 08:18:17 UTC (rev 1704) @@ -51,8 +51,10 @@ : alloc-control-qhtds ( extra-tds -- ) >r - my-maxpayload /my-buf over round-up swap / dup to my-#tds - dup if data-timeout else nodata-timeout then to timeout + my-maxpayload /my-buf ( maxpayload /buf ) + over round-up ( maxpayload /buf-rounded ) + swap / dup to my-#tds ( maxpayload #tds ) + dup if data-timeout else nodata-timeout then to timeout ( maxpayload #tds ) r> + alloc-qhtds to my-td to my-qh ;

1 0

r1703 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 26 Jan '10

26 Jan '10

Author: wmb Date: 2010-01-26 09:00:30 +0100 (Tue, 26 Jan 2010) New Revision: 1703 Added: cpu/x86/pc/olpc/via/thermaltest.fth Log: Checked in thermaltest.fth Added: cpu/x86/pc/olpc/via/thermaltest.fth =================================================================== --- cpu/x86/pc/olpc/via/thermaltest.fth (rev 0) +++ cpu/x86/pc/olpc/via/thermaltest.fth 2010-01-26 08:00:30 UTC (rev 1703) @@ -0,0 +1,45 @@ +: cool-ms ( ms -- ) + get-msecs + + begin stdin-idle dup get-msecs - 0< until + drop +; +: hot-ms ( ms -- ) + get-msecs + + begin stdin-idle dup get-msecs - 0< until + drop +; +0 value cool-temperature +0 value warm-temperature +0 value hot-temperature +0 value final-temperature +: thermal-run ( -- error? ) + ." Cooling down ... " + d# 30,000 cool-ms + cpu-temperature to cool-temperature + ." Warming up ... " + d# 1,000 hot-ms + cpu-temperature to warm-temperature + d# 30,000 hot-ms + cpu-temperature to hot-temperature + ." Final cooldown ... " + d# 1,000 cool-ms + + cpu-temperature to final-temperature + hot-temperature warm-temperature - dup d# 12 > if + ." Bad heat spreader - temperature rose " .d ." degrees" cr + true exit + then + final-temperature warm-temperature - dup d# 4 > if + ." Bad heat spreader - cooldown spread was " .d ." degrees" cr + true exit + then + false +; + +\ cool down for 30 seconds (good 54, bad 55) +\ hot for 1 second and measure temp - A (good is 62, bad is 65) +\ hot for 30 seconds and measure temp - B (good 71, bad 85) +\ error if B - A > 12 (good machine is 9, bad is 20) +\ cool for 1 second and measure temp - C +\ error if C-A > 4 (good machine is 1, bad is 10) +

1 0

r1702 - cpu/x86
by svn＠openfirmware.info 26 Jan '10

26 Jan '10

Author: wmb Date: 2010-01-26 08:15:41 +0100 (Tue, 26 Jan 2010) New Revision: 1702 Added: cpu/x86/bootascall.fth Log: Checked in bootascall.fth Added: cpu/x86/bootascall.fth =================================================================== --- cpu/x86/bootascall.fth (rev 0) +++ cpu/x86/bootascall.fth 2010-01-26 07:15:41 UTC (rev 1702) @@ -0,0 +1,121 @@ +\ See license at end of file +purpose: Return from "booted" programs as if they were Forth words + +variable rp-var +variable sp-var +rs-size buffer: rs-buf +ps-size buffer: ps-buf + +code save-forth-state ( -- ) + cld + \ Copy the entire Forth data stack and return stack areas to a save area. + + si bx mov \ Save SI + di dx mov \ Save UP + + \ Data Stack + esp 'user sp-var mov + + 'user sp0 si mov + 'user ps-buf di mov \ Address of data stack save area + ps-size # si sub \ Bottom of data stack area (in longwords) + + ps-size 4 / # cx mov \ Size of data stack area + rep movs + + dx di mov \ Restore DI + + \ Return Stack + + ebp 'user rp-var mov + + 'user rp0 si mov + 'user rs-buf di mov \ Address of return stack save area + rs-size # si sub \ Bottom of return stack area + + rs-size 4 / # cx mov \ Size of return stack area (in longwords) + rep movs + + dx di mov \ Restore DI + + bx si mov \ Restore SI +c; + +: undo-boot-return ( -- ) + ['] (quit) to user-interface +; + +code resume-forth-state ( -- ) + cli cld + + di dx mov \ Save UP + + \ Copy the entire Forth data stack and return stack areas to a save area. + + \ Data Stack (load si first because di is the user pointer!) + 'user sp-var esp mov \ Data stack pointer + + 'user ps-buf si mov \ Address of data stack save area + 'user sp0 di mov \ Top of data stack areas + ps-size # di sub \ Bottom of data stack area (in longwords) + + ps-size 4 / # cx mov \ Size of data stack area + rep movs + + dx di mov \ Restore UP + + \ Return Stack (load si first because di is the user pointer!) + + 'user rp-var ebp mov \ Return stack pointer + + 'user rs-buf si mov \ Address of return stack save area + 'user rp0 di mov \ Top of return stack area + rs-size # di sub \ Bottom of return stack area + + rs-size 4 / # cx mov \ Size of return stack area (in longwords) + rep movs + + dx di mov \ Restore UP + sti + + 0 [ebp] esi mov \ Pop the return stack into the interpreter pointer + 4 # ebp add +c; + +0 value saved-go-hook +: boot-as-call( ( -- ) + ps-buf drop rs-buf drop + ['] go-hook behavior to saved-go-hook + ['] save-forth-state to go-hook + ['] resume-forth-state to user-interface +; +: )boot-as-call ( -- ) + saved-go-hook to go-hook + ['] (quit) to user-interface +; +ps-buf drop rs-buf drop +: foo boot-as-call( emacs )boot-as-call cr ." Hello" cr ; + +\ LICENSE_BEGIN +\ Copyright (c) 2010 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

r1701 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 26 Jan '10

26 Jan '10

Author: wmb Date: 2010-01-26 04:35:01 +0100 (Tue, 26 Jan 2010) New Revision: 1701 Added: cpu/x86/pc/olpc/via/blockfifo.fth Log: Checked in blockfifo.fth Added: cpu/x86/pc/olpc/via/blockfifo.fth =================================================================== --- cpu/x86/pc/olpc/via/blockfifo.fth (rev 0) +++ cpu/x86/pc/olpc/via/blockfifo.fth 2010-01-26 03:35:01 UTC (rev 1701) @@ -0,0 +1,148 @@ +\ See license at end of file +purpose: Non-blocking writes to fsdisk for NANDblaster + +support-package: block-fifo +d# 10000 constant #queue +h# 4000 value /chunk +0 instance value chunks +0 instance value block#s +0 instance value this-#blocks +0 instance value read-index +0 instance value write-index +0 instance value max-depth +false instance value synchronous? + +: #queued ( -- n ) + write-index read-index - + dup 0< if #queue + then +; +: update-max ( -- ) + #queued max-depth max to max-depth +; + +: blocks/chunk ( -- n ) /chunk 9 rshift ; + +: >chunk ( i -- adr ) /chunk * chunks + ; +: +index ( i -- i' ) 1+ dup #queue = if drop 0 then ; + +: full? ( -- flag ) + write-index read-index = this-#blocks 0<> and +; +: empty? ( -- flag ) + write-index read-index = this-#blocks 0= and +; + +: ?write-error ( -- ) + if ( ) + ." disk-fifo: Write error at block " ( ) + block#s read-index na+ @ . cr ( ) + abort ( ) + then ( ) +; + +: ?start-write ( -- ) + empty? if exit then ( ) + + \ Start a new write + read-index >chunk ( adr ) + block#s read-index na+ @ ( adr block# ) + blocks/chunk ( adr block# #blocks ) + " write-blocks-start" $call-parent ?write-error ( ) + blocks/chunk to this-#blocks ( ) +; + +: open ( -- flag ) +\ #queue /chunk * alloc-mem to chunks + h# 200.0000 to chunks \ 32 M + #queue /n* alloc-mem to block#s + 0 to read-index + 0 to write-index + 0 to this-#blocks + true +; + +: size ( -- d.size ) " size" $call-parent ; + +: poll ( -- ) + this-#blocks if ( ) + " write-blocks-end?" $call-parent 0= if ( ) + exit \ Write still in progress ( -- ) + then ( error? ) + ?write-error ( ) + read-index +index to read-index ( ) + 0 to this-#blocks ( ) + then ( ) + + ?start-write +; + +: wait-available ( -- ) + full? if + ." WARNING: disk-fifo queue full" cr + begin poll full? 0= until + then +; + +: write-blocks ( adr block# #blocks -- actual ) + synchronous? if + " write-blocks" $call-parent + exit + then + + dup blocks/chunk <> if ( adr block# #blocks ) + ." disk-fifo: bad write length " dup . cr + 2drop + 0 exit + then ( adr block# #blocks ) + drop ( adr block# ) + wait-available ( adr block# ) + block#s write-index na+ ! ( adr ) + write-index >chunk /chunk move ( ) + write-index +index to write-index ( ) + update-max ( ) + poll ( ) + blocks/chunk ( actual ) +; + +: drain-queue ( -- ) + synchronous? 0= if + ." Max queue depth was " max-depth .d ." , current is " #queued .d cr + true to synchronous? + then + begin empty? 0= while poll repeat +; + +: close ( -- ) + drain-queue + block#s #queue /l* free-mem +; + +: read-blocks ( adr block# #blocks -- actual ) + drain-queue + " read-blocks" $call-parent +; +end-support-package + +\ LICENSE_BEGIN +\ Copyright (c) 2010 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

r1700 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 26 Jan '10

26 Jan '10

Author: wmb Date: 2010-01-26 04:15:32 +0100 (Tue, 26 Jan 2010) New Revision: 1700 Modified: cpu/x86/pc/olpc/via/usb.fth Log: OLPC trac 10003 - added extra delay on S3 resume when USB devices are attached. Modified: cpu/x86/pc/olpc/via/usb.fth =================================================================== --- cpu/x86/pc/olpc/via/usb.fth 2010-01-25 09:40:13 UTC (rev 1699) +++ cpu/x86/pc/olpc/via/usb.fth 2010-01-26 03:15:32 UTC (rev 1700) @@ -92,8 +92,20 @@ : suspend-usb ( -- ) detach-usb-keyboard ; +: has-children? ( devspec$ -- flag ) + locate-device if false else child 0<> then +; +: any-usb-devices? ( -- flag ) + " /usb" has-children? if true exit then + " /usb@10,2" has-children? if true exit then + " /usb@10,1" has-children? if true exit then + " /usb@10,0" has-children? if true exit then + false +; : resume-usb ( -- ) - d# 300 ms \ USB misses devices if you probe too soon + any-usb-devices? if + d# 2000 ms \ USB misses devices if you probe too soon + then silent-probe-usb attach-usb-keyboard ;

1 0

r1699 - ofw/fs/ext2fs
by svn＠openfirmware.info 25 Jan '10

25 Jan '10

Author: wmb Date: 2010-01-25 10:40:13 +0100 (Mon, 25 Jan 2010) New Revision: 1699 Modified: ofw/fs/ext2fs/methods.fth Log: OLPC trac 9999 - ext2 file system - Fixed rename problem introduced by svn 1648, and also made it possible to rename directories. Modified: ofw/fs/ext2fs/methods.fth =================================================================== --- ofw/fs/ext2fs/methods.fth 2010-01-25 08:37:51 UTC (rev 1698) +++ ofw/fs/ext2fs/methods.fth 2010-01-25 09:40:13 UTC (rev 1699) @@ -28,10 +28,15 @@ diroff off ; +0 value renaming? : $delete ( name$ -- error? ) $find-file if true exit then ( ) - wf-type dir-type = if true exit then + \ It's okay to delete a directory if it is a rename, because a + \ hardlinked copy has just been made + renaming? 0= if + wf-type dir-type = if true exit then + then dirent-unlink false @@ -39,23 +44,31 @@ : $delete! $delete ; \ XXX should these be different? : $hardlink ( old-name$ new-name$ -- error? ) - \ Error if the new name already exists - 2dup $find-file 0= if ( old-name$ new-name$ ) - 4drop true exit ( -- true ) - then ( old-name$ new-name$ ) - \ Save the current search context. The path part of the new name \ has already been parsed out and resolved. Resolving old-name$ changes \ the directory context, so we will need to restore the context for the \ new name to create its dirent. dirent-vars 2>r 2>r ( old-name$ new-name$ r: 4xVars ) + \ Error if the new name already exists + 2dup $find-file 0= if ( old-name$ new-name$ r: 4xVars ) + 2r> 2r> 4drop ( old-name$ new-name$ ) + 4drop true exit ( -- true ) + then ( old-name$ new-name$ ) + 2swap $find-file if ( new-name$ r: 4xVars ) - 2drop 2r> 2r> 4drop true exit + 2r> 2r> 4drop ( new-name$ ) + 2drop true exit ( -- true ) then ( new-name$ r: 4xVars ) - \ Hard links to directories mess up the filesystem tree - wf-type dir-type = if 2drop true exit then ( new-name$ r: 4xVars) + \ Hard links to directories mess up the filesystem tree, but they are + \ okay temporarily if we are renaming and will soon delete the old one + renaming? 0= if + wf-type dir-type = if ( new-name$ r: 4xVars ) + 2r> 2r> 4drop ( new-name$ ) + 2drop true exit ( -- true ) + then ( new-name$ r: 4xVars) + then 2r> 2r> restore-dirent ( new-name$ ) wf-inum new-dirent ( error? ) @@ -71,8 +84,13 @@ 2drop ( old-path$ new-name$ ) then ( old-path$ new-name$ ) - 2over 2swap $hardlink if 2drop true exit then ( old-name$ ) - $delete + true to renaming? ( old-path$ new-name$ ) + 2over 2swap $hardlink if ( old-path$ ) + false to renaming? ( old-path$ ) + 2drop true exit ( -- true ) + then ( old-name$ ) + $delete ( error? ) + false to renaming? ( old-path$ ) ; : $rmdir ( name$ -- error? )

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware