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