September 2009 - openfirmware - mail.coreboot.org

r1361 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Sept. 14, 2009

Sept. 14, 2009

Author: wmb Date: 2009-09-14 09:45:46 +0200 (Mon, 14 Sep 2009) New Revision: 1361 Modified: cpu/x86/pc/olpc/via/ioinit.fth Log: Via - don't debounce the power button as doing so causes the short pulse length to be missed. Debouncing is unnecessary anyway since the signal is generated cleanly by the EC. Modified: cpu/x86/pc/olpc/via/ioinit.fth =================================================================== --- cpu/x86/pc/olpc/via/ioinit.fth 2009-09-14 07:41:55 UTC (rev 1360) +++ cpu/x86/pc/olpc/via/ioinit.fth 2009-09-14 07:45:46 UTC (rev 1361) @@ -194,7 +194,9 @@ 71 ff 11 mreg \ SVID backdoor 72 ff 37 mreg \ SVID backdoor 73 ff 33 mreg \ SVID backdoor +[ifdef] demo-board \ No need to debounce on XO as the signal comes from the EC 80 20 20 mreg \ Debounce power button +[then] 81 08 08 mreg \ 32-bit ACPI timer \ 81 08 00 mreg \ 24-bit ACPI timer - why? 82 0f 0a mreg \ Direct SCI to IRQ 10 (0xa)

1 0

r1360 - cpu/x86/pc/olpc/via dev ofw/wifi
by svn＠openfirmware.info Sept. 14, 2009

Sept. 14, 2009

Author: wmb Date: 2009-09-14 09:41:55 +0200 (Mon, 14 Sep 2009) New Revision: 1360 Modified: cpu/x86/pc/olpc/via/devices.fth dev/libertas.fth ofw/wifi/eapol.fth Log: Via - fixed issues with "test /wlan" 1) It failed to display any scan results after the first time, because a variable was unitialized 2) The scan result was too long to comprehend - switched to an abbreviated format that shows just signal, SSID, and channel. Modified: cpu/x86/pc/olpc/via/devices.fth =================================================================== --- cpu/x86/pc/olpc/via/devices.fth 2009-09-10 08:48:44 UTC (rev 1359) +++ cpu/x86/pc/olpc/via/devices.fth 2009-09-14 07:41:55 UTC (rev 1360) @@ -234,6 +234,14 @@ fload ${BP}/dev/via/spi/bbspi.fth \ Tethered SPI FLASH programming fload ${BP}/cpu/x86/pc/olpc/via/boardrev.fth \ Board revision decoding +warning @ warning off +: wlan-reset ( -- ) + h# 4c acpi-l@ ( old ) + dup h# 800 invert and h# 4c acpi-l! ( old ) + d# 10 ms ( old ) + h# 800 or h# 4c acpi-l! ( ) +; +warning ! : cpu-mhz ( -- n ) " /cpu@0" find-package drop ( phandle ) @@ -246,7 +254,6 @@ 3drop ; -[ifdef] use-wlan stand-init: Wireless reset \ Hit the reset on the Marvell wireless. It sometimes (infrequently) \ fails to enumerate after a power-cycle, and reset seems to fix it. @@ -254,7 +261,6 @@ \ takes about 200 mS, so we are okay. atest? 0= if wlan-reset then ; -[then] fload ${BP}/cpu/x86/pc/olpc/mfgdata.fth \ Manufacturing data fload ${BP}/cpu/x86/pc/olpc/mfgtree.fth \ Manufacturing data in device tree Modified: dev/libertas.fth =================================================================== --- dev/libertas.fth 2009-09-10 08:48:44 UTC (rev 1359) +++ dev/libertas.fth 2009-09-14 07:41:55 UTC (rev 1360) @@ -19,6 +19,7 @@ : do-associate ( -- flag ) " do-associate" $call-supplicant ; : process-eapol ( adr len -- ) " process-eapol" $call-supplicant ; : .scan ( adr -- ) " .scan" $call-supplicant ; +: .ssids ( adr -- ) " .ssids" $call-supplicant ; defer load-all-fw ( -- error? ) ' false to load-all-fw defer ?process-eapol ['] 2drop to ?process-eapol @@ -557,7 +558,7 @@ \ Reset \ ========================================================================= -: reset-wlan ( -- ) " wlan-reset" evaluate ; +: reset-wlan ( -- ) " wlan-reset" evaluate ds-not-ready set-driver-state ; : marvel-get-hw-spec ( -- true | adr false ) d# 38 h# 03 ( CMD_GET_HW_SPEC ) prepare-cmd @@ -1578,6 +1579,7 @@ : open ( -- ok? ) my-args parse-args set-parent-channel + " " set-ssid \ Instance buffers aren't necessarily initially 0 opencount @ 0= if init-buf /inbuf /outbuf setup-bus-io if free-buf false exit then @@ -1693,7 +1695,8 @@ (scan) if ." Failed to scan" true cr else ( adr len ) - drop .scan false +\ drop .scan false + drop .ssids false then close Modified: ofw/wifi/eapol.fth =================================================================== --- ofw/wifi/eapol.fth 2009-09-10 08:48:44 UTC (rev 1359) +++ ofw/wifi/eapol.fth 2009-09-14 07:41:55 UTC (rev 1360) @@ -521,6 +521,33 @@ loop drop ( ) ; +: .ie-short ( adr -- ) + dup c@ ( adr ie ) + case + 0 of ." SSID: " dup 2 + swap 1+ c@ type 2 spaces endof + 3 of ." Channel: " 2 + c@ .d endof + ( default ) nip + endcase +; + +: .ap-ssid ( adr -- ) + ." RSSI: " dup 8 + c@ .d + dup le-w@ swap 2 + swap d# 19 /string ( adr' len' ) + begin dup 0> while ( adr len ) + over .ie-short ( adr len ) + over 1+ c@ 2 + /string ( adr' len' ) + repeat 2drop ( ) +; + +: .ssids ( adr -- ) + dup 3 + ( 'ap ) + swap 2 + c@ ( 'ap #ap ) + 0 ?do ( 'ap ) + dup .ap-ssid cr ( 'ap ) + dup le-w@ + 2 + ( 'ap' ) + loop drop ( ) +; + \ ======================================================================= \ Associate

1 0

r1359 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Sept. 10, 2009

Sept. 10, 2009

Author: wmb Date: 2009-09-10 10:48:44 +0200 (Thu, 10 Sep 2009) New Revision: 1359 Modified: cpu/x86/pc/olpc/via/versions.fth Log: Q3A11 Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-09-10 08:40:07 UTC (rev 1358) +++ cpu/x86/pc/olpc/via/versions.fth 2009-09-10 08:48:44 UTC (rev 1359) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 10a +macro: FW_MINOR 11 \ The EC microcode macro: EC_VERSION 1_9_9

1 0

r1358 - dev
by svn＠openfirmware.info Sept. 10, 2009

Sept. 10, 2009

Author: wmb Date: 2009-09-10 10:40:07 +0200 (Thu, 10 Sep 2009) New Revision: 1358 Modified: dev/ps2mouse.fth Log: ps2mouse driver - last version's timeout was too long, also fixed a problem with the open-count logic. Modified: dev/ps2mouse.fth =================================================================== --- dev/ps2mouse.fth 2009-09-10 08:21:31 UTC (rev 1357) +++ dev/ps2mouse.fth 2009-09-10 08:40:07 UTC (rev 1358) @@ -38,17 +38,15 @@ 0 instance variable #retries : cmd? ( cmd -- error? ) - #retries off dup put-get-data ( cmd response ) begin ( cmd response ) case ( cmd response ) h# fa of drop false exit endof \ ACK h# fe of ( cmd ) \ RESEND - try again - 1 #retries +! ( cmd ) - #retries @ d# 300 > if ( cmd ) + -1 #retries +! ( cmd ) + #retries @ 0< if ( cmd ) drop true exit then ( cmd ) - 1 ms ( cmd ) dup put-get-data ( cmd response ) endof ( cmd response ) @@ -59,7 +57,7 @@ endcase ( cmd new-response ) again ; -: cmd ( cmd -- ) cmd? drop ; +: cmd ( cmd -- ) d# 20 #retries ! cmd? drop ; \ : cmd ( cmd -- ) " put-get-data" $call-parent ?ack ; @@ -292,6 +290,7 @@ : identify ( -- true | char false ) \ h# f2 ['] read1 catch dup if nip then + 3 #retries ! h# f2 cmd? if true exit then apex-timeout timed-read ; @@ -328,22 +327,21 @@ : open ( -- flag ) 1 set-port - open-count 1+ to open-count + open-count 0<> if true exit then - open-count 1 <> if true exit then - \ The "force" argument causes the open to succeed even if no mouse \ is present - my-args [char] , left-parse-string 2swap 2drop " force" $= if - true exit - then + my-args [char] , left-parse-string 2swap 2drop " force" $= 0= if - find-mouse if false exit then + find-mouse if false exit then - \ Reset the mouse and check the response codes - h# ff read2 0<> swap h# aa <> or if false exit then + \ Reset the mouse and check the response codes + h# ff read2 0<> swap h# aa <> or if false exit then - remote-mode + remote-mode + then + + open-count 1+ to open-count true ; : close ( -- )

1 0

r1357 - dev
by svn＠openfirmware.info Sept. 10, 2009

Sept. 10, 2009

Author: wmb Date: 2009-09-10 10:21:31 +0200 (Thu, 10 Sep 2009) New Revision: 1357 Modified: dev/ps2mouse.fth Log: ps2mouse driver - timeout after 300 mS of cmd retries. Modified: dev/ps2mouse.fth =================================================================== --- dev/ps2mouse.fth 2009-09-10 08:07:14 UTC (rev 1356) +++ dev/ps2mouse.fth 2009-09-10 08:21:31 UTC (rev 1357) @@ -36,15 +36,24 @@ : put-get-data ( cmd -- data ) " put-get-data" $call-parent ; : send-cmd ( cmd -- ) " put-data" $call-parent ; +0 instance variable #retries : cmd? ( cmd -- error? ) + #retries off dup put-get-data ( cmd response ) begin ( cmd response ) case ( cmd response ) h# fa of drop false exit endof \ ACK - h# fe of dup put-get-data endof \ RESEND - try again + h# fe of ( cmd ) \ RESEND - try again + 1 #retries +! ( cmd ) + #retries @ d# 300 > if ( cmd ) + drop true exit + then ( cmd ) + 1 ms ( cmd ) + dup put-get-data ( cmd response ) + endof ( cmd response ) d# 10 timed-read if ( cmd response ) - 2drop true exit + 2drop true exit then ( cmd response new-response ) swap ( cmd new-response response ) endcase ( cmd new-response )

1 0

r1356 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Sept. 10, 2009

Sept. 10, 2009

Author: wmb Date: 2009-09-10 10:07:14 +0200 (Thu, 10 Sep 2009) New Revision: 1356 Modified: cpu/x86/pc/olpc/via/romreset.bth cpu/x86/pc/olpc/via/startcominit.fth Log: Via early startup - 1) Fixed version sensing via EC - needed to enable I/O decoding for the special EC port 2) Moved the startup delay to exactly the required point, just before the first CMOS access 3) Restore a couple of registers in D17F7 that are killed during S3. Modified: cpu/x86/pc/olpc/via/romreset.bth =================================================================== --- cpu/x86/pc/olpc/via/romreset.bth 2009-09-10 08:04:30 UTC (rev 1355) +++ cpu/x86/pc/olpc/via/romreset.bth 2009-09-10 08:07:14 UTC (rev 1356) @@ -92,8 +92,6 @@ fload ${BP}/cpu/x86/pc/olpc/via/startcacheasram.fth - d# 40000 wait-us \ This delay is empirically necessary - minimum is 36000 - about 50 ms - \ cache_as_ram_auto.c: amd64_main() 01 004f config-wb \ Enable device 0 multiple functions @@ -114,8 +112,6 @@ cominit #) call [then] - carret report - linefeed report char + report h# 1d port80 @@ -127,17 +123,24 @@ long-offsets on acpi-io-base 4 + port-rw \ Get APCI Status register - d# 10 # ax shr 7 # ax and 1 # ax cmp <> if \ Wakeup from S3 + d# 10 # ax shr 7 # ax and 1 # ax cmp <> if \ Type 1 is wakeup from S3 + \ Not wakeup from S3 \ This turns an OS reboot into a real cold start - from coreboot h# 380 config-rb ax ax or 0<> if \ C-page shadowing not on yet 6 h# cf9 port-wb \ Force a full system reset char X report begin hlt again then + carret report linefeed report char F report fload ${BP}/cpu/x86/pc/olpc/via/demodram.fth then + \ This must be done in both the power-up and resume-from-S3 cases, + \ since the registers in D17F7 lose state during S3. + total-size 8f60 config-wb \ DRAM Bank 7 ending address - controls DMA upstream + 0388 config-rb ax bx mov 8fe5 config-setup bx ax mov al dx out \ Copy Low Top from RO reg 88 to SB Low Top e5 + fload ${BP}/cpu/x86/pc/olpc/via/startgfxinit.fth 0 [if] \ Fire up C Forth @@ -171,6 +174,10 @@ fload ${BP}/cpu/x86/pc/olpc/via/ioinit.fth \ XXX need to move startcpuspeed to here + \ Cache is now setup normally, backed by memory + \ Setup a small stack for subroutine calls + h# 10.0000 # esp mov + acpi-io-base 4 + port-rw \ Get APCI Status register ax bx mov d# 10 # ax shr 7 # ax and 1 # ax cmp = if \ Wakeup from S3 @@ -192,9 +199,6 @@ char x report then \ Not a wakeup from S3 - \ Cache is now setup normally, backed by memory - h# 20.0000 # esp mov - char o report h# 1e port80 Modified: cpu/x86/pc/olpc/via/startcominit.fth =================================================================== --- cpu/x86/pc/olpc/via/startcominit.fth 2009-09-10 08:04:30 UTC (rev 1355) +++ cpu/x86/pc/olpc/via/startcominit.fth 2009-09-10 08:07:14 UTC (rev 1356) @@ -34,6 +34,24 @@ 4e 18 18 mreg \ Enable ports 74/75 for CMOS RAM access - 10 res be like Phx end-table + \ Configure the I/O decoding to enable access to the EC + \ Do this outside the if..then so the setup is consistent in all cases + d# 17 0 devfunc + 59 ff 1c mreg \ Keyboard (ports 60,64) and ports 62,66 on LPC bus (EC) + 5c ff 68 mreg \ High byte (68) of PCS0 + 5d ff 00 mreg \ High byte (00) of PCS0 + 64 0f 07 mreg \ PCS0 size is 8 bytes - to include 68 and 6c + 66 01 01 mreg \ PCS0 Enable + 67 10 10 mreg \ PCS0 to LPC Bus + end-table + + \ This delay is empirically necessary before reading CMOS - minimum is 36000 - about 50 ms + \ Before the delay has elapsed, the CMOS RAM returns 0 instead of the stored value. + d# 40000 wait-us + + \ As an optimization to avoid long waits for the EC to respond, read the board ID + \ that is cached in CMOS RAM. This might not in fact be an optimization in light + \ of the above delay ... h# 83 # al mov al h# 74 # out h# 75 # al in \ check byte - should be ~board-id al ah mov ah not \ ~check byte in AH h# 82 # al mov al h# 74 # out h# 75 # al in \ board-id in AL

1 0

r1355 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Sept. 10, 2009

Sept. 10, 2009

Author: wmb Date: 2009-09-10 10:04:30 +0200 (Thu, 10 Sep 2009) New Revision: 1355 Modified: cpu/x86/pc/olpc/via/devices.fth cpu/x86/pc/olpc/via/fw.bth Log: Via - fixed fsdisk and net aliases for use with fs-update Modified: cpu/x86/pc/olpc/via/devices.fth =================================================================== --- cpu/x86/pc/olpc/via/devices.fth 2009-09-10 08:02:28 UTC (rev 1354) +++ cpu/x86/pc/olpc/via/devices.fth 2009-09-10 08:04:30 UTC (rev 1355) @@ -364,6 +364,18 @@ " usb-keyboard" " /usb@10,4/keyboard" ?report-device \ USB 2 (keyboard behind a hub) ; +\ If there is a USB ethernet adapter, use it as the default net device. +\ We can't use ?report-device here because we already have net aliased +\ to /usb/wlan, and ?report-device won't override an existing alias. +: report-net ( -- ) + " /usb/ethernet" 2dup locate-device 0= if ( name$ phandle ) + drop ( name$ ) + " net" 2swap $devalias ( ) + else ( name$ ) + 2drop ( ) + then +; + [ifdef] Later \ Add support for DC-couple microphone input [then] Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-09-10 08:02:28 UTC (rev 1354) +++ cpu/x86/pc/olpc/via/fw.bth 2009-09-10 08:04:30 UTC (rev 1355) @@ -470,7 +470,7 @@ fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth [then] fload ${BP}/cpu/x86/pc/olpc/via/fsupdate.fth -devalias fsdisk /sd/disk:0 +devalias fsdisk int:0 fload ${BP}/ofw/inet/sntp.fth : olpc-ntp-servers ( -- ) @@ -641,8 +641,6 @@ ['] false to interrupt-auto-boot? probe-usb " probe+" do-drop-in - report-disk - report-keyboard setup-smbios \ Must be done after build-date is defined via do-drop-in

1 0

r1354 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Sept. 10, 2009

Sept. 10, 2009

Author: wmb Date: 2009-09-10 10:02:28 +0200 (Thu, 10 Sep 2009) New Revision: 1354 Modified: cpu/x86/pc/olpc/via/resume.bth Log: Via S3 support - save and restore PCI config registers - BARs, enables, IRQs - during S3 from OFW. Modified: cpu/x86/pc/olpc/via/resume.bth =================================================================== --- cpu/x86/pc/olpc/via/resume.bth 2009-09-10 08:00:00 UTC (rev 1353) +++ cpu/x86/pc/olpc/via/resume.bth 2009-09-10 08:02:28 UTC (rev 1354) @@ -107,6 +107,66 @@ rdtsc eax h# 10 #) mov edx h# 14 #) mov [then] + \ D12F0 SDIO + h# 6010 config-rl ax stos \ BAR0 + h# 6014 config-rl ax stos \ BAR1 + h# 6018 config-rl ax stos \ BAR2 + h# 603c config-rb al stos \ IRQ + h# 6004 config-rw op: ax stos \ Enables + h# 0000 h# 6004 config-ww \ Disable + + \ D15F0 EIDE + h# 7810 config-rl ax stos \ BAR0 + h# 7814 config-rl ax stos \ BAR1 + h# 7818 config-rl ax stos \ BAR2 + h# 781c config-rl ax stos \ BAR3 + h# 7820 config-rl ax stos \ BAR4 + h# 783c config-rb al stos \ IRQ + h# 780d config-rb al stos \ Latency timer + h# 7804 config-rw op: ax stos \ Enables + h# 0000 h# 7804 config-ww \ Disable + + \ D16F0 UHCI 0,1 + h# 8020 config-rl ax stos \ IO Base + h# 803c config-rb al stos \ IRQ + h# 800d config-rb al stos \ Latency timer + h# 8004 config-rw op: ax stos \ Enables + h# 0000 h# 8004 config-ww \ Disable + + \ D16F1 UHCI 2,3 + h# 8120 config-rl ax stos \ IO Base + h# 813c config-rb al stos \ IRQ + h# 810d config-rb al stos \ Latency timer + h# 8104 config-rw op: ax stos \ Enables + h# 0000 h# 8104 config-ww \ Disable + + \ D16F2 UHCI 4,5 + h# 8220 config-rl ax stos \ IO Base + h# 823c config-rb al stos \ IRQ + h# 820d config-rb al stos \ Latency timer + h# 8204 config-rw op: ax stos \ Enables + h# 0000 h# 8204 config-ww \ Disable + + \ D16F4 EHCI + h# 8410 config-rl ax stos \ BAR + h# 843c config-rb al stos \ IRQ + h# 840d config-rb al stos \ Latency timer + h# 8404 config-rw op: ax stos \ Enables + h# 0000 h# 8404 config-ww \ Disable + + \ D17F0 Bus Control and Power Management + h# 88d2 config-rb al stos \ SMBUS clock divisor + + \ D17F7 South-North Module Interface Control + h# 8f0d config-rb al stos \ Latency timer + + \ D20F0 HD Audio + h# a010 config-rl ax stos \ BAR + h# a03c config-rb al stos \ IRQ + h# a00d config-rb al stos \ Latency timer + h# a004 config-rw op: ax stos \ Enables + h# 0000 h# a004 config-ww \ Disable + \ This is where Geode saves msrs \ This is where Geode handles the DCON \ This is where Geode saves the GPIO setup @@ -331,9 +391,60 @@ h# 29 resume-progress - \ AC97 - \ Codec + \ D12F0 SDIO + h# 6010 config-setup ax lods ax dx out \ BAR0 + h# 6014 config-setup ax lods ax dx out \ BAR1 + h# 6018 config-setup ax lods ax dx out \ BAR2 + h# 603c config-setup al lods al dx out \ IRQ + h# 6004 config-setup op: ax lods op: ax dx out \ Enables + \ D15F0 EIDE + h# 7810 config-setup ax lods ax dx out \ BAR0 + h# 7814 config-setup ax lods ax dx out \ BAR1 + h# 7818 config-setup ax lods ax dx out \ BAR2 + h# 781c config-setup ax lods ax dx out \ BAR3 + h# 7820 config-setup ax lods ax dx out \ BAR4 + h# 783c config-setup al lods al dx out \ IRQ + h# 780d config-setup al lods al dx out \ Latency timer + h# 7804 config-setup op: ax lods op: ax dx out \ Enables + h# 0000 h# 7804 config-ww \ Disable + + \ D16F0 UHCI 0,1 + h# 8020 config-setup ax lods ax dx out \ IO Base + h# 803c config-setup al lods al dx out \ IRQ + h# 800d config-setup al lods al dx out \ Latency timer + h# 8004 config-setup op: ax lods op: ax dx out \ Enables + + \ D16F1 UHCI 2,3 + h# 8120 config-setup ax lods ax dx out \ IO Base + h# 813c config-setup al lods al dx out \ IRQ + h# 810d config-setup al lods al dx out \ Latency timer + h# 8104 config-setup op: ax lods op: ax dx out \ Enables + + \ D16F2 UHCI 4,5 + h# 8220 config-setup ax lods ax dx out \ IO Base + h# 823c config-setup al lods al dx out \ IRQ + h# 820d config-setup al lods al dx out \ Latency timer + h# 8204 config-setup op: ax lods op: ax dx out \ Enables + + \ D16F4 EHCI + h# 8410 config-setup ax lods ax dx out \ BAR + h# 843c config-setup al lods al dx out \ IRQ + h# 840d config-setup al lods al dx out \ Latency timer + h# 8404 config-setup op: ax lods op: ax dx out \ Enables + + \ D17F0 Bus Control and Power Management + h# 88d2 config-setup al lods al dx out \ SMBUS clock divisor + + \ D17F7 South-North Module Interface Control + h# 8f0d config-setup al lods al dx out \ Latency timer + + \ D20F0 HD Audio + h# a010 config-setup ax lods ax dx out \ BAR + h# a03c config-setup al lods al dx out \ IRQ + h# a00d config-setup al lods al dx out \ Latency timer + h# a004 config-setup op: ax lods op: ax dx out \ Enables + \ h# 8000 h# 4000.0000 or h# 1440 pl! \ Fail-safe delay \ Turn on USB power

1 0

r1353 - dev/usb2/device/net
by svn＠openfirmware.info Sept. 10, 2009

Sept. 10, 2009

Author: wmb Date: 2009-09-10 10:00:00 +0200 (Thu, 10 Sep 2009) New Revision: 1353 Modified: dev/usb2/device/net/ethernet.fth Log: USB Ethernet driver - removed a warning message that is confusing. Modified: dev/usb2/device/net/ethernet.fth =================================================================== --- dev/usb2/device/net/ethernet.fth 2009-09-10 07:57:22 UTC (rev 1352) +++ dev/usb2/device/net/ethernet.fth 2009-09-10 08:00:00 UTC (rev 1353) @@ -106,7 +106,7 @@ r@ c@ r@ 1+ c@ bwjoin ( data-adr length ) r@ 2+ c@ r> 3 + c@ bwjoin ( data-adr length ~length ) over + h# ffff <> if ( data-adr length ) - ." Bad length in USB Ethernet" cr + \ ." Bad length in USB Ethernet" cr \ We got out of sync so we must discard the entire buffer \ Return data-adr 0 drop 0

1 0

r1352 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Sept. 10, 2009

Sept. 10, 2009

Author: wmb Date: 2009-09-10 09:57:22 +0200 (Thu, 10 Sep 2009) New Revision: 1352 Modified: cpu/x86/pc/olpc/via/usb.fth Log: Via USB - fixed usb-quiet, added devalias net /usb/wlan, call report-{net,disk} in probe-usb. Modified: cpu/x86/pc/olpc/via/usb.fth =================================================================== --- cpu/x86/pc/olpc/via/usb.fth 2009-09-05 09:09:26 UTC (rev 1351) +++ cpu/x86/pc/olpc/via/usb.fth 2009-09-10 07:57:22 UTC (rev 1352) @@ -41,6 +41,8 @@ pwd$ $nopage-show-devs then ; +devalias net /usb/wlan + : probe-usb ( -- ) ." USB2 devices:" cr " /" ['] (probe-usb2) scan-subtree @@ -49,6 +51,10 @@ ." USB1 devices:" cr " /" ['] (probe-usb1) scan-subtree " /" ['] (show-usb1) scan-subtree + + report-disk + report-net + report-keyboard ; alias p2 probe-usb @@ -90,8 +96,10 @@ : usb-quiet ( -- ) [ ' go-hook behavior compile, ] \ Chain to old behavior - " usb1" " reset-usb" execute-device-method drop - " usb2" " reset-usb" execute-device-method drop + " /usb@10,0" " reset-usb" execute-device-method drop + " /usb@10,1" " reset-usb" execute-device-method drop + " /usb@10,2" " reset-usb" execute-device-method drop + " /usb@10,4" " reset-usb" execute-device-method drop ; ' usb-quiet to go-hook

1 0