Changeset 3009

Timestamp:

Jun 15, 2012 3:52:54 AM (11 months ago)

Author:

quozl

Message:

OLPC - revert svn 2950 and svn 2954 as they are affecting mass production

Location:

dev/usb2/device/net

Files:

• ax8817x.fth (modified) (4 diffs)
• common.fth (modified) (1 diff)
• ethernet.fth (modified) (5 diffs)

dev/usb2/device/net/ax8817x.fth

@@ -180 +180 @@
 ;
 
-: ax-stop-phy  ( -- )
-   ax88772?  if
-      h# 40 ax-sw-reset    \ Power off internal PHY, reset external one (08 == 0)
-   then
-;
 : select-phy  ( -- )
    ax88772?  if
@@ -242 +237 @@
 
 : ax-start-phy  ( -- )
-   select-phy
-   ax-init-mii
    ax-auto-neg-wait
 ;
@@ -298 +291 @@
    ax-toggle-gpio
    ax-get-phyid
+   select-phy
    ax-stop-mac
    ax-get-mac-address  2drop
    ax-set-ipg
+   ax-init-mii
 ;
 
@@ -322 +317 @@
    ['] 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

dev/usb2/device/net/common.fth

@@ -24 +24 @@
 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

dev/usb2/device/net/ethernet.fth

@@ -32 +32 @@
    end-bulk-in
    free-buf
-   stop-phy
 ;
 
@@ -43 +42 @@
 : 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 )
@@ -73 +72 @@
 \  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
@@ -132 +131 @@
    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 )
 
@@ -187 +186 @@
    link-up? 0=  if
       ." Network not connected." cr
-      stop-phy
       true exit
    then