Changeset 3009


Ignore:
Timestamp:
Jun 15, 2012, 1:52:54 AM (3 years ago)
Author:
quozl
Message:

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

Location:
dev/usb2/device/net
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • dev/usb2/device/net/ax8817x.fth

    r2954 r3009  
    180180;
    181181
    182 : ax-stop-phy  ( -- )
    183    ax88772?  if
    184       h# 40 ax-sw-reset    \ Power off internal PHY, reset external one (08 == 0)
    185    then
    186 ;
    187182: select-phy  ( -- )
    188183   ax88772?  if
     
    242237
    243238: ax-start-phy  ( -- )
    244    select-phy
    245    ax-init-mii
    246239   ax-auto-neg-wait
    247240;
     
    298291   ax-toggle-gpio
    299292   ax-get-phyid
     293   select-phy
    300294   ax-stop-mac
    301295   ax-get-mac-address  2drop
    302296   ax-set-ipg
     297   ax-init-mii
    303298;
    304299
     
    322317   ['] ax-start-mac to start-mac
    323318   ['] ax-start-phy to start-phy
    324    ['] ax-stop-phy  to stop-phy
    325319   ['] ax-stop-mac  to stop-mac
    326320   ['] ax-get-mac-address to get-mac-address
  • dev/usb2/device/net/common.fth

    r2950 r3009  
    2424defer link-up?         ( -- up? )               ' true to link-up?
    2525defer start-phy        ( -- )                   ' noop to start-phy
    26 defer stop-phy         ( -- )                   ' noop to stop-phy
    2726defer start-mac        ( -- )                   ' noop to start-mac
    2827defer stop-mac         ( -- )                   ' noop to stop-mac
  • dev/usb2/device/net/ethernet.fth

    r2950 r3009  
    3232   end-bulk-in
    3333   free-buf
    34    stop-phy
    3534;
    3635
     
    4342: copy-packet  ( adr len -- len' )
    4443   dup multi-packet?  if  4 +  then   ( adr len len' )
    45    /outbuf >  if  ." USB Ethernet write packet too long" cr  stop-net abort  then  ( adr len )
     44   /outbuf >  if  ." USB Ethernet write packet too long" cr  stop-mac abort  then  ( adr len )
    4645
    4746   multi-packet?  if       ( adr len )
     
    7372\  length.leword  ~length.leword  data  [ pad-to-even ]
    7473: extract-packet  ( -- data-adr len )
    75    residue 4 <  if  ." Short residue from USB Ethernet" cr stop-net  abort  then
     74   residue 4 <  if  ." Short residue from USB Ethernet" cr stop-mac  abort  then
    7675
    7776   pkt-adr dup 4 +  swap >r
     
    132131   then                                 ( adr ihandle|0 )
    133132
    134    dup  0=  if  ." Can't open obp-tftp support package" stop-net abort  then
     133   dup  0=  if  ." Can't open obp-tftp support package" stop-mac abort  then
    135134                                        ( adr ihandle )
    136135
     
    187186   link-up? 0=  if
    188187      ." Network not connected." cr
    189       stop-phy
    190188      true exit
    191189   then
Note: See TracChangeset for help on using the changeset viewer.