[Commit-gnuradio] r7420 - usrp2/trunk/firmware/lib

[eb]

Author: eb
Date: 2008-01-13 14:51:47 -0700 (Sun, 13 Jan 2008)
New Revision: 7420

Modified:
   usrp2/trunk/firmware/lib/eth_mac.c
   usrp2/trunk/firmware/lib/ethernet.c
Log:
cleaned up ethernet initialization code

Modified: usrp2/trunk/firmware/lib/eth_mac.c
===================================================================
--- usrp2/trunk/firmware/lib/eth_mac.c  2008-01-13 21:43:20 UTC (rev 7419)
+++ usrp2/trunk/firmware/lib/eth_mac.c  2008-01-13 21:51:47 UTC (rev 7420)
@@ -59,7 +59,7 @@
 void 
 eth_mac_init(const u2_mac_addr_t *src)
 {
-  eth_mac->miimoder = 16;      // divider from CPU clock (33MHz / 16 ~= 2MHz)
+  eth_mac->miimoder = 25;      // divider from CPU clock (50MHz/25 = 2MHz)
 
   eth_mac_set_addr(src);
 
@@ -69,10 +69,6 @@
 
   eth_mac->fc_lwmark = 400;            // there is currently 1024 lines in the 
fifo
   eth_mac->fc_hwmark = 800;
-
-  eth_mac->tx_pause_en = 1;            // pay attn to pause frames sent to us
-  eth_mac->pause_quanta_set = 38;      // a bit more than 1 max frame 16kb/512 
+ fudge
-  eth_mac->pause_frame_send_en = 1;    // enable sending pause frames
 }
 
 int

Modified: usrp2/trunk/firmware/lib/ethernet.c
===================================================================
--- usrp2/trunk/firmware/lib/ethernet.c 2008-01-13 21:43:20 UTC (rev 7419)
+++ usrp2/trunk/firmware/lib/ethernet.c 2008-01-13 21:51:47 UTC (rev 7420)
@@ -158,7 +158,6 @@
 void
 ethernet_init(void)
 {
-  // FIXME get MAC address from EEPROM
   eth_mac_init(ethernet_mac_addr());
 
   ed_state.link_state = LS_UNKNOWN;
@@ -167,14 +166,17 @@
   // initialize MAC registers
   eth_mac->tx_hwmark = 0x1e;
   eth_mac->tx_lwmark = 0x19;
-  eth_mac->pause_frame_send_en = 1;
-  // eth_mac->pause_quanta_set = XXX;
-  eth_mac->tx_pause_en = 1;
-  // eth_mac->rx_hwmark = xxx;
-  // eth_mac->rx_lwmark = xxx;
+
   eth_mac->crc_chk_en = 1;
   eth_mac->rx_max_length = 2048;
 
+  // configure PAUSE frame stuff
+  eth_mac->tx_pause_en = 1;            // pay attn to pause frames sent to us
+
+  eth_mac->pause_quanta_set = 38;      // a bit more than 1 max frame 16kb/512 
+ fudge
+  eth_mac->pause_frame_send_en = 1;    // enable sending pause frames
+
+
   // setup PHY to interrupt on changes
 
   unsigned mask =