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

[matt]

Author: matt
Date: 2008-05-28 18:27:12 -0600 (Wed, 28 May 2008)
New Revision: 8520

Modified:
   usrp2/trunk/firmware/lib/u2_init.c
Log:
cleaned up 9510 controls, added in a define for boards with a hacked clock to 
do ethernet from the main oscillator


Modified: usrp2/trunk/firmware/lib/u2_init.c
===================================================================
--- usrp2/trunk/firmware/lib/u2_init.c  2008-05-28 20:36:04 UTC (rev 8519)
+++ usrp2/trunk/firmware/lib/u2_init.c  2008-05-29 00:27:12 UTC (rev 8520)
@@ -112,6 +112,8 @@
   }
   
 #define TEST_CLK 1
+#define REV2 1
+#define HACKED 0
 
   // Set up other clocks
   if(TEST_CLK) {
@@ -131,11 +133,19 @@
     ad9510_write_reg(0x4D, 0x80); // Bypass divider 2
   }
   
-#define REV2 1
-  if (REV2)
+  if(HACKED) {  // Using the indirect ETH Clk
+    ad9510_write_reg(0x41, 0x02); // Turn on output 5, LVDS
+    ad9510_write_reg(0x52, 0x11); // Div by 4
+    ad9510_write_reg(0x53, 0x0);
+  }
+  else if (REV2) {
     ad9510_write_reg(0x41, 0x01); // Turn off output 5 (phy_clk)
-  else
+    ad9510_write_reg(0x53, 0x80); // Bypass divider
+  }
+  else {
     ad9510_write_reg(0x40, 0x01); // Turn off output 4 (phy_clk)
+    ad9510_write_reg(0x51, 0x80); // Bypass divider
+  }
 
   ad9510_write_reg(0x42, 0x01); // Turn off output 6 (db_tx_clk)
   ad9510_write_reg(0x43, 0x01); // Turn off output 7 (db_rx_clk)
@@ -155,13 +165,8 @@
     ad9510_write_reg(0x53, 0x80); // Bypass Div #5
   }
 
-  ad9510_write_reg(0x52, 0x11);
-  ad9510_write_reg(0x53, 0x0);
   ad9510_write_reg(0x5A, 0x01); // Update Regs
 
-  // FIXME clean this up.
-  ad9510_write_reg(0x5A, 0x01); // Update Regs
-
   // Set up AD9777 DAC
   ad9777_write_reg(0, R0_1R);
   ad9777_write_reg(1, R1_INTERP_4X | R1_REAL_MIX);