openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r3013 - in dev/usb2/hcd: . ehci
by repository service 19 Jun '12

19 Jun '12

Author: quozl Date: Tue Jun 19 04:17:19 2012 New Revision: 3013 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3013 Log: OLPC - dev/usb2, revert svn 3011 as it broke production use of USB scanners, reproduced also by me. Modified: dev/usb2/hcd/device.fth dev/usb2/hcd/ehci/probe.fth Modified: dev/usb2/hcd/device.fth ============================================================================== --- dev/usb2/hcd/device.fth Sat Jun 16 05:00:26 2012 (r3012) +++ dev/usb2/hcd/device.fth Tue Jun 19 04:17:19 2012 (r3013) @@ -391,30 +391,33 @@ \ Executed in root hub node context : get-str-descriptors ( -- ) - language ( lang ) - dup d# 14 dev-desc@ v$-desc-buf get-string to /v$-desc-buf - dup d# 15 dev-desc@ d$-desc-buf get-string to /d$-desc-buf - d# 16 dev-desc@ s$-desc-buf get-string to /s$-desc-buf + language ( lang ) + dup dev-desc-buf d# 14 + c@ v$-desc-buf get-string to /v$-desc-buf + dup dev-desc-buf d# 15 + c@ d$-desc-buf get-string to /d$-desc-buf + dev-desc-buf d# 16 + c@ s$-desc-buf get-string to /s$-desc-buf ; \ Executed in root hub node context : refresh-desc-bufs ( dev -- ) set-target - dev-desc-buf d# 18 get-dev-desc to /dev-desc-buf \ Refresh dev-desc-buf - cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf \ Refresh cfg-desc-buf + dev-desc-buf 12 get-dev-desc to /dev-desc-buf \ Refresh dev-desc-buf + cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf \ Refresh cfg-desc-buf get-str-descriptors ; \ Executed in root hub node context -: get-initial-descriptors ( -- ) - \ Re-read the full device descriptor to pick up the vendor info - dev-desc-buf d# 18 get-dev-desc drop ( ) - cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf ( ) +: get-initial-descriptors ( dev -- ) + dev-desc-buf /pipe0 get-dev-desc if ( dev ) + dev-desc-buf 7 + c@ 0 rot di-maxpayload! ( ) + else ( dev ) + drop ( ) + then ( ) + cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf ( ) ; \ Executed in hub node context (root hub or subordinate hub) - creates new child nodes via (make-device-node) : make-device-node ( port dev -- ) - " get-initial-descriptors" my-self $call-method ( port dev ) + dup " get-initial-descriptors" my-self $call-method ( port dev ) /cfg-desc-buf 0= if 2drop exit then ( port dev ) asso-class? if 1 else cfg-desc-buf 4 + c@ then ( port dev #intf ) 0 ?do ( port dev ) @@ -440,16 +443,6 @@ then ( port ) ; -: get-initial-dev-desc ( dev -- ) - dev-desc-buf d# 18 erase ( dev ) - dev-desc-buf d# 64 get-dev-desc 0= if ( dev ) - dev-desc-buf /pipe0 get-dev-desc 0= if ( dev ) - drop exit - then - then - 7 dev-desc@ 0 rot di-maxpayload! ( ) -; - \ Executed in the root hub node context : setup-new-node ( port speed hub-port hub-dev -- true | port dev xt false ) \ Allocate device number @@ -460,11 +453,7 @@ tuck di-speed! ( port dev ) 0 set-target ( port dev ) \ Address it as device 0 - - \ Some devices (e.g. Lexar USB-to-SD and at least one USB FLASH drive) fail - \ on set-address unless you first read the device descriptor from address 0. - dup get-initial-dev-desc ( port dev ) - + over reset-port ( port dev ) \ Some devices want to be reset here dup set-address if ( port dev ) \ Assign it usb addr dev ." Retrying with a delay" cr over reset-port d# 5000 ms Modified: dev/usb2/hcd/ehci/probe.fth ============================================================================== --- dev/usb2/hcd/ehci/probe.fth Sat Jun 16 05:00:26 2012 (r3012) +++ dev/usb2/hcd/ehci/probe.fth Tue Jun 19 04:17:19 2012 (r3013) @@ -7,16 +7,18 @@ 0 value port-speed : make-root-hub-node ( port -- ) + \ Some devices (e.g. Lexar USB-to-SD) fail unless you get the cfg desc from device 0 first 0 set-target \ First address it as device 0 ( port ) port-speed 0 di-speed! \ Use high speed for getting the device descriptor - dup reset-port ( port ) + dev-desc-buf h# 40 get-cfg-desc drop ( port ) + port-speed ( port speed ) \ hub-port and hub-dev route USB 1.1 transactions through USB 2.0 hubs over get-hub20-port get-hub20-dev ( port speed hub-port hub-dev ) \ Execute setup-new-node in root context and make-device-node in hub node context - setup-new-node if execute then ( ) + setup-new-node if execute then ( ) ; 0 instance value probe-error? \ Back channel to selftest

1 0

[commit] r3012 - cpu/arm/olpc/1.75
by repository service 16 Jun '12

16 Jun '12

Author: quozl Date: Sat Jun 16 05:00:26 2012 New Revision: 3012 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3012 Log: Q4D17 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Sat Jun 16 04:13:21 2012 (r3011) +++ cpu/arm/olpc/1.75/fw-version.fth Sat Jun 16 05:00:26 2012 (r3012) @@ -1,4 +1,4 @@ \ The overall firmware revision macro: FW_PREFIX Q4 macro: FW_MAJOR D -macro: FW_MINOR 16 +macro: FW_MINOR 17

1 0

[commit] r3011 - in dev/usb2/hcd: . ehci
by repository service 16 Jun '12

16 Jun '12

Author: quozl Date: Sat Jun 16 04:13:21 2012 New Revision: 3011 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3011 Log: OLPC - dev/usb2, read the device descriptor after reset and before set-address, instead of after set-address. Erase the device descriptor buffer before reading. #11931 Modified: dev/usb2/hcd/device.fth dev/usb2/hcd/ehci/probe.fth Modified: dev/usb2/hcd/device.fth ============================================================================== --- dev/usb2/hcd/device.fth Fri Jun 15 03:58:55 2012 (r3010) +++ dev/usb2/hcd/device.fth Sat Jun 16 04:13:21 2012 (r3011) @@ -391,33 +391,30 @@ \ Executed in root hub node context : get-str-descriptors ( -- ) - language ( lang ) - dup dev-desc-buf d# 14 + c@ v$-desc-buf get-string to /v$-desc-buf - dup dev-desc-buf d# 15 + c@ d$-desc-buf get-string to /d$-desc-buf - dev-desc-buf d# 16 + c@ s$-desc-buf get-string to /s$-desc-buf + language ( lang ) + dup d# 14 dev-desc@ v$-desc-buf get-string to /v$-desc-buf + dup d# 15 dev-desc@ d$-desc-buf get-string to /d$-desc-buf + d# 16 dev-desc@ s$-desc-buf get-string to /s$-desc-buf ; \ Executed in root hub node context : refresh-desc-bufs ( dev -- ) set-target - dev-desc-buf 12 get-dev-desc to /dev-desc-buf \ Refresh dev-desc-buf - cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf \ Refresh cfg-desc-buf + dev-desc-buf d# 18 get-dev-desc to /dev-desc-buf \ Refresh dev-desc-buf + cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf \ Refresh cfg-desc-buf get-str-descriptors ; \ Executed in root hub node context -: get-initial-descriptors ( dev -- ) - dev-desc-buf /pipe0 get-dev-desc if ( dev ) - dev-desc-buf 7 + c@ 0 rot di-maxpayload! ( ) - else ( dev ) - drop ( ) - then ( ) - cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf ( ) +: get-initial-descriptors ( -- ) + \ Re-read the full device descriptor to pick up the vendor info + dev-desc-buf d# 18 get-dev-desc drop ( ) + cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf ( ) ; \ Executed in hub node context (root hub or subordinate hub) - creates new child nodes via (make-device-node) : make-device-node ( port dev -- ) - dup " get-initial-descriptors" my-self $call-method ( port dev ) + " get-initial-descriptors" my-self $call-method ( port dev ) /cfg-desc-buf 0= if 2drop exit then ( port dev ) asso-class? if 1 else cfg-desc-buf 4 + c@ then ( port dev #intf ) 0 ?do ( port dev ) @@ -443,6 +440,16 @@ then ( port ) ; +: get-initial-dev-desc ( dev -- ) + dev-desc-buf d# 18 erase ( dev ) + dev-desc-buf d# 64 get-dev-desc 0= if ( dev ) + dev-desc-buf /pipe0 get-dev-desc 0= if ( dev ) + drop exit + then + then + 7 dev-desc@ 0 rot di-maxpayload! ( ) +; + \ Executed in the root hub node context : setup-new-node ( port speed hub-port hub-dev -- true | port dev xt false ) \ Allocate device number @@ -453,7 +460,11 @@ tuck di-speed! ( port dev ) 0 set-target ( port dev ) \ Address it as device 0 - over reset-port ( port dev ) \ Some devices want to be reset here + + \ Some devices (e.g. Lexar USB-to-SD and at least one USB FLASH drive) fail + \ on set-address unless you first read the device descriptor from address 0. + dup get-initial-dev-desc ( port dev ) + dup set-address if ( port dev ) \ Assign it usb addr dev ." Retrying with a delay" cr over reset-port d# 5000 ms Modified: dev/usb2/hcd/ehci/probe.fth ============================================================================== --- dev/usb2/hcd/ehci/probe.fth Fri Jun 15 03:58:55 2012 (r3010) +++ dev/usb2/hcd/ehci/probe.fth Sat Jun 16 04:13:21 2012 (r3011) @@ -7,18 +7,16 @@ 0 value port-speed : make-root-hub-node ( port -- ) - \ Some devices (e.g. Lexar USB-to-SD) fail unless you get the cfg desc from device 0 first 0 set-target \ First address it as device 0 ( port ) port-speed 0 di-speed! \ Use high speed for getting the device descriptor - dev-desc-buf h# 40 get-cfg-desc drop ( port ) - + dup reset-port ( port ) port-speed ( port speed ) \ hub-port and hub-dev route USB 1.1 transactions through USB 2.0 hubs over get-hub20-port get-hub20-dev ( port speed hub-port hub-dev ) \ Execute setup-new-node in root context and make-device-node in hub node context - setup-new-node if execute then ( ) + setup-new-node if execute then ( ) ; 0 instance value probe-error? \ Back channel to selftest

1 0

[commit] r3010 - cpu/x86/pc/olpc/via
by repository service 15 Jun '12

15 Jun '12

Author: quozl Date: Fri Jun 15 03:58:55 2012 New Revision: 3010 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3010 Log: Q3C07 Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Fri Jun 15 03:52:54 2012 (r3009) +++ cpu/x86/pc/olpc/via/fw-version.fth Fri Jun 15 03:58:55 2012 (r3010) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 06 +macro: FW_MINOR 07

1 0

[commit] r3009 - dev/usb2/device/net
by repository service 15 Jun '12

15 Jun '12

Author: quozl Date: Fri Jun 15 03:52:54 2012 New Revision: 3009 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3009 Log: OLPC - revert svn 2950 and svn 2954 as they are affecting mass production Modified: dev/usb2/device/net/ax8817x.fth dev/usb2/device/net/common.fth dev/usb2/device/net/ethernet.fth Modified: dev/usb2/device/net/ax8817x.fth ============================================================================== --- dev/usb2/device/net/ax8817x.fth Wed Jun 13 07:33:36 2012 (r3008) +++ dev/usb2/device/net/ax8817x.fth Fri Jun 15 03:52:54 2012 (r3009) @@ -179,11 +179,6 @@ d# 10 ms \ Just in case the link status bit isn't ready just yet ; -: ax-stop-phy ( -- ) - ax88772? if - h# 40 ax-sw-reset \ Power off internal PHY, reset external one (08 == 0) - then -; : select-phy ( -- ) ax88772? if \ Linksys USB200M uses the built-in PHY, DLink DUB-E100 uses an external one @@ -241,8 +236,6 @@ ; : ax-start-phy ( -- ) - select-phy - ax-init-mii ax-auto-neg-wait ; : ax-promiscuous ( -- ) rx-ctl@ 1 or rx-ctl! ; @@ -297,9 +290,11 @@ ax-toggle-gpio ax-get-phyid + select-phy ax-stop-mac ax-get-mac-address 2drop ax-set-ipg + ax-init-mii ; : ax-loopback{ ( -- ) @@ -321,7 +316,6 @@ ['] ax-link-up? to link-up? ['] ax-start-mac to start-mac ['] ax-start-phy to start-phy - ['] ax-stop-phy to stop-phy ['] ax-stop-mac to stop-mac ['] ax-get-mac-address to get-mac-address ['] ax-mii@ to mii@ Modified: dev/usb2/device/net/common.fth ============================================================================== --- dev/usb2/device/net/common.fth Wed Jun 13 07:33:36 2012 (r3008) +++ dev/usb2/device/net/common.fth Fri Jun 15 03:52:54 2012 (r3009) @@ -23,7 +23,6 @@ defer unwrap-msg ( adr len -- adr' len' ) ' noop to unwrap-msg defer link-up? ( -- up? ) ' true to link-up? defer start-phy ( -- ) ' noop to start-phy -defer stop-phy ( -- ) ' noop to stop-phy defer start-mac ( -- ) ' noop to start-mac defer stop-mac ( -- ) ' noop to stop-mac defer mii{ ( -- ) ' noop to mii{ \ Acquire Modified: dev/usb2/device/net/ethernet.fth ============================================================================== --- dev/usb2/device/net/ethernet.fth Wed Jun 13 07:33:36 2012 (r3008) +++ dev/usb2/device/net/ethernet.fth Fri Jun 15 03:52:54 2012 (r3009) @@ -31,7 +31,6 @@ stop-mac end-bulk-in free-buf - stop-phy ; external @@ -42,7 +41,7 @@ : copy-packet ( adr len -- len' ) dup multi-packet? if 4 + then ( adr len len' ) - /outbuf > if ." USB Ethernet write packet too long" cr stop-net abort then ( adr len ) + /outbuf > if ." USB Ethernet write packet too long" cr stop-mac abort then ( adr len ) multi-packet? if ( adr len ) dup wbsplit ( adr len len.low len.high ) @@ -72,7 +71,7 @@ \ The data format is: \ length.leword ~length.leword data [ pad-to-even ] : extract-packet ( -- data-adr len ) - residue 4 < if ." Short residue from USB Ethernet" cr stop-net abort then + residue 4 < if ." Short residue from USB Ethernet" cr stop-mac abort then pkt-adr dup 4 + swap >r r@ c@ r@ 1+ c@ bwjoin ( data-adr length ) @@ -131,7 +130,7 @@ 0 ( adr 0 ) then ( adr ihandle|0 ) - dup 0= if ." Can't open obp-tftp support package" stop-net abort then + dup 0= if ." Can't open obp-tftp support package" stop-mac abort then ( adr ihandle ) >r @@ -186,7 +185,6 @@ link-up? 0= if ." Network not connected." cr - stop-phy true exit then

1 0

[commit] r3008 - cpu/x86/pc/olpc
by repository service 13 Jun '12

13 Jun '12

Author: quozl Date: Wed Jun 13 07:33:36 2012 New Revision: 3008 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3008 Log: Q2F12 Modified: cpu/x86/pc/olpc/versions.fth Modified: cpu/x86/pc/olpc/versions.fth ============================================================================== --- cpu/x86/pc/olpc/versions.fth Wed Jun 13 07:05:13 2012 (r3007) +++ cpu/x86/pc/olpc/versions.fth Wed Jun 13 07:33:36 2012 (r3008) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR F -macro: FW_MINOR 11ma +macro: FW_MINOR 12 \ The EC microcode macro: EC_VERSION 1_2_1

1 0

[commit] r3007 - cpu/x86/pc/olpc
by repository service 13 Jun '12

13 Jun '12

Author: quozl Date: Wed Jun 13 07:05:13 2012 New Revision: 3007 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3007 Log: OLPC - security, add visual response to escape key when in secure mode, without consuming keystroke, to improve usability for service and support (since it is otherwise difficult to tell if a laptop is secured, or the keyboard is broken). #11609 Modified: cpu/x86/pc/olpc/security.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Sat Jun 9 09:58:12 2012 (r3006) +++ cpu/x86/pc/olpc/security.fth Wed Jun 13 07:05:13 2012 (r3007) @@ -1304,6 +1304,12 @@ alternate? if " \boot-alt" else " \boot" then pn-buf place + key? if + pending-char c@ h# 1b = if + visible red-letters ." Secured, continuing" cancel cr + then + then + all-devices$ load-from-list if exit then \ Returns only if no images found " Boot failed" .security-failure

1 0

[commit] r3006 - ofw/core
by repository service 09 Jun '12

09 Jun '12

Author: wmb Date: Sat Jun 9 09:58:12 2012 New Revision: 3006 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3006 Log: OFW core - execute-device-method was using device-end, which sets the search order to a fixed value, inside of the wrapping code that modifies the search order reversibly. That's probably a holdover from some ancient behavior. Fixes OLPC trac #11926. Modified: ofw/core/ofwcore.fth Modified: ofw/core/ofwcore.fth ============================================================================== --- ofw/core/ofwcore.fth Sat Jun 9 05:53:59 2012 (r3005) +++ ofw/core/ofwcore.fth Sat Jun 9 09:58:12 2012 (r3006) @@ -2489,7 +2489,6 @@ else ( ??? ) close-chain true ( ??? true ) then ( false | ??? true ) - device-end ( false | ??? true ) r> push-device )package ( false | ??? true ) ;

1 0

[commit] r3005 - in cpu/arm: mmp2 olpc
by repository service 09 Jun '12

09 Jun '12

Author: quozl Date: Sat Jun 9 05:53:59 2012 New Revision: 3005 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3005 Log: OLPC XO-1.75 - banner, calculate and display actual processor core frequency instead of only displaying what the processor fuses say. Modified: cpu/arm/mmp2/clocks.fth cpu/arm/olpc/banner.fth cpu/arm/olpc/build-fw.fth Modified: cpu/arm/mmp2/clocks.fth ============================================================================== --- cpu/arm/mmp2/clocks.fth Thu Jun 7 08:05:24 2012 (r3004) +++ cpu/arm/mmp2/clocks.fth Sat Jun 9 05:53:59 2012 (r3005) @@ -38,6 +38,11 @@ h# 4000 h# 1024 +mpmu io-set \ APMU_PLL2 in PMUM_CGR_PJ h# 4000 h# 24 +mpmu io-set \ APMU_PLL2 in PMUM_CGR_SP ; +: pll2-ungated? ( -- flag ) + h# 4000 h# 1024 +mpmu io@ and +; +: pll2-fbdiv ( -- N ) h# 34 mpmu@ d# 10 rshift h# 1ff and 2+ ; +: pll2-refdiv ( -- M ) h# 34 mpmu@ d# 19 rshift h# 1f and 2+ ; : fccr@ ( -- n ) h# 05.0008 io@ ; : fccr! ( n -- ) h# 05.0008 io! ; @@ -45,11 +50,18 @@ d# 29 lshift ( field ) fccr@ h# e000.0000 invert and or fccr! ( ) ; +: pj4-clksel@ ( -- n ) + fccr@ h# e000.0000 and d# 29 rshift +; + : sp-clksel ( n -- ) d# 26 lshift ( field ) fccr@ h# 1c00.0000 invert and or fccr! ( ) ; + : pj4-cc! ( n -- ) h# 28.2804 io! ; +: pj4-cc@ ( -- n ) h# 28.2804 io@ ; +: pj4-clkdiv ( -- n ) pj4-cc@ h# 7 and ; : sp-cc! ( n -- ) h# 28.2800 io! ; \ cfraaADXBpP @@ -77,3 +89,14 @@ : pj4-910mhz ( -- ) set-pll2-910mhz 2 pj4-clksel o# 21742201100 pj4-cc! ; \ A 266, D 400, XP 400, B 400, P 910 : pj4-988mhz ( -- ) set-pll2-988mhz 2 pj4-clksel o# 21742201100 pj4-cc! ; \ A 266, D 400, XP 400, B 400, P 988 [then] + +: pj4-speed ( -- frequency ) + pj4-clksel@ + case + 0 of d# 400,000,000 pj4-clkdiv 1+ / endof ( hz ) + 1 of d# 800,000,000 endof ( hz ) + 2 of d# 26,000,000 pll2-fbdiv pll2-refdiv */ endof ( hz ) + endcase + d# 1,000,000 / ( mhz ) +; +\ FIXME: should be a property clock-frequency of /cpu@0 Modified: cpu/arm/olpc/banner.fth ============================================================================== --- cpu/arm/olpc/banner.fth Thu Jun 7 08:05:24 2012 (r3004) +++ cpu/arm/olpc/banner.fth Sat Jun 9 05:53:59 2012 (r3005) @@ -119,12 +119,10 @@ ; : .cpu-speed ( -- ) - rated-speed case - 0 of ." 800 MHz" endof - 1 of ." 910 MHz" endof - ." 1 GHz" - endcase + pj4-speed + dup d# 988 = if ." 1 GHz" else .d ." MHz" then ; + : .memory-brief ( -- ) memory-size dup d# 1024 / ?dup if ( mb gb ) nip " GiB" rot ( gb$ gb ) Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Thu Jun 7 08:05:24 2012 (r3004) +++ cpu/arm/olpc/build-fw.fth Sat Jun 9 05:53:59 2012 (r3005) @@ -567,6 +567,7 @@ then ; +fload ${BP}/cpu/arm/mmp2/clocks.fth fload ${BP}/cpu/arm/olpc/banner.fth \- olpc-cl3 devalias keyboard /ap-sp/keyboard @@ -966,8 +967,6 @@ \+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/testinstructions.fth \+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/testinstructions.fth -fload ${BP}/cpu/arm/mmp2/clocks.fth - : startup ( -- ) standalone? 0= if exit then

1 0

[commit] r3004 - dev/usb2/hcd/ehci
by repository service 07 Jun '12

07 Jun '12

Author: quozl Date: Thu Jun 7 08:05:24 2012 New Revision: 3004 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3004 Log: OLPC - probe all ports of the EHC during a test, regardless of whether they are in use. Remove fisheye test from default testing, because it is not used in manufacturing, and had been incorrectly used in the field to verify a port is working. No change to manufacturing tests. #11845. Modified: dev/usb2/hcd/ehci/probe.fth Modified: dev/usb2/hcd/ehci/probe.fth ============================================================================== --- dev/usb2/hcd/ehci/probe.fth Thu Jun 7 02:04:14 2012 (r3003) +++ dev/usb2/hcd/ehci/probe.fth Thu Jun 7 08:05:24 2012 (r3004) @@ -60,6 +60,7 @@ then ( #testable-ports ) ; +\ Port owned by usb 1.1 controller (2000) or device is present (1) : port-connected? ( port# -- flag ) portsc@ h# 2001 and ; : wait-connect ( port# -- error? ) begin ( port# ) @@ -153,29 +154,60 @@ open-count 0= if free-dma-buf unmap-regs then ; -: selftest ( -- error? ) - ehci-reg dup 0= if map-regs then +: .occupied ( port -- ) ." USB 2.0 port " u. ." in use" cr ; +: regs{ ( -- prev ) ehci-reg dup 0= if map-regs then ; +: }regs ( prev -- ) 0= if unmap-regs then ; +: fisheye ( -- ) + regs{ #testable-ports 0 ?do - i port-connected? if \ Port owned by usb 1.1 controller (2000) or device is present (1) - ." USB 2.0 port " i u. ." in use" cr + i port-connected? if + i .occupied else - diagnostic-mode? if - ." Please connect a device to USB port " i u. cr - i wait-connect if true unloop exit then - else - ." Fisheye pattern out to USB 2.0 port " i u. cr - i test-port-begin - d# 2,000 ms - i test-port-end - 0 i portsc! i reset-port i power-port - then + ." Fisheye pattern out to USB 2.0 port " i u. cr + i test-port-begin + d# 2,000 ms + i test-port-end + 0 i portsc! i reset-port i power-port + then + loop + }regs +; + +: thorough ( -- error? ) + #testable-ports 0 ?do + i port-connected? if + i .occupied + else + ." Please connect a device to USB port " i u. cr + i wait-connect if true unloop exit then + then + loop + false +; + +: sagacity ( -- error? ) + #testable-ports 0 ?do + ." USB port " i u. ." ... " + i port-connected? if + i wait-connect if true unloop exit then + else + ." Empty" cr then loop - 0= if unmap-regs then false ; +: selftest ( -- error? ) + regs{ ( prev ) + diagnostic-mode? if + thorough + else + sagacity + then ( prev error? ) + swap }regs ( error? ) +; + headers \ LICENSE_BEGIN

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware