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

[eb]

Author: eb
Date: 2007-12-15 00:03:04 -0700 (Sat, 15 Dec 2007)
New Revision: 7190

Modified:
   usrp2/trunk/firmware/lib/ad9777_regs.h
   usrp2/trunk/firmware/lib/u2_init.c
Log:
working tx output, 1x interp

Modified: usrp2/trunk/firmware/lib/ad9777_regs.h
===================================================================
--- usrp2/trunk/firmware/lib/ad9777_regs.h      2007-12-15 06:41:53 UTC (rev 
7189)
+++ usrp2/trunk/firmware/lib/ad9777_regs.h      2007-12-15 07:03:04 UTC (rev 
7190)
@@ -58,6 +58,13 @@
 #define        R4_CP_400uA     (0x03 | R4_CP_MANUAL)
 #define        R4_CP_800uA     (0x07 | R4_CP_MANUAL)
 
+#define R5_I_FINE_GAIN(g)    (g)               // 8-bits
+#define R6_I_COARSE_GAIN(g)  ((g) & 0xf)       // low 4-bits
+
+#define        R9_Q_FINE_GAIN(g)    (g)                // 8-bits
+#define        R10_Q_COARSE_GAIN(g) ((g) & 0xf)        // low 4-bits
+
+
 // FIXME more registers for offset and gain control...
 
 

Modified: usrp2/trunk/firmware/lib/u2_init.c
===================================================================
--- usrp2/trunk/firmware/lib/u2_init.c  2007-12-15 06:41:53 UTC (rev 7189)
+++ usrp2/trunk/firmware/lib/u2_init.c  2007-12-15 07:03:04 UTC (rev 7190)
@@ -78,9 +78,15 @@
   ad9777_write_reg(2, 0);
   ad9777_write_reg(3, 0);
   ad9777_write_reg(4, 0);
-  for (i = 5; i < 12; i++)     // gain and offset regs
-    ad9777_write_reg(i, 0);
-
+  ad9777_write_reg(5, R5_I_FINE_GAIN(0));
+  ad9777_write_reg(6, R6_I_COARSE_GAIN(0xf));
+  ad9777_write_reg(7, 0);      // I dac offset
+  ad9777_write_reg(8, 0);
+  ad9777_write_reg(9,  R9_Q_FINE_GAIN(0));
+  ad9777_write_reg(10, R10_Q_COARSE_GAIN(0xf));
+  ad9777_write_reg(11, 0);     // Q dac offset
+  ad9777_write_reg(12, 0);
+  
   // Set up serdes
   //output_regs->serdes_ctrl = (SERDES_ENABLE | SERDES_LOOPEN | SERDES_RXEN);
   output_regs->serdes_ctrl = (SERDES_ENABLE | SERDES_RXEN);