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

[matt]

Author: matt
Date: 2009-04-27 13:50:03 -0600 (Mon, 27 Apr 2009)
New Revision: 10925

Modified:
   gnuradio/trunk/usrp2/firmware/lib/db_init.c
   gnuradio/trunk/usrp2/firmware/lib/db_rfx.c
Log:
somebody commented out the tx mux setting which prevented the xcvr2450 from 
working.  wrong values for rfx boards were not seen because of the above error.


Modified: gnuradio/trunk/usrp2/firmware/lib/db_init.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/lib/db_init.c 2009-04-27 16:46:07 UTC (rev 
10924)
+++ gnuradio/trunk/usrp2/firmware/lib/db_init.c 2009-04-27 19:50:03 UTC (rev 
10925)
@@ -267,8 +267,8 @@
   //printf("db_init: tx dbid = 0x%x\n", tx_dboard->dbid);
   set_gpio_mode(GPIO_TX_BANK, tx_dboard);
   tx_dboard->init(tx_dboard);
-  //m = determine_tx_mux_value(tx_dboard);
-  //dsp_tx_regs->tx_mux = m;
+  m = determine_tx_mux_value(tx_dboard);
+  dsp_tx_regs->tx_mux = m;
   //printf("tx_mux = 0x%x\n", m);
   tx_dboard->current_lo_offset = tx_dboard->default_lo_offset;
 

Modified: gnuradio/trunk/usrp2/firmware/lib/db_rfx.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/lib/db_rfx.c  2009-04-27 16:46:07 UTC (rev 
10924)
+++ gnuradio/trunk/usrp2/firmware/lib/db_rfx.c  2009-04-27 19:50:03 UTC (rev 
10925)
@@ -177,7 +177,7 @@
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   .base.is_quadrature = true,
-  .base.i_and_q_swapped = true,
+  .base.i_and_q_swapped = false,
   .base.spectrum_inverted = false,
   .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(12.5e6),
   .base.init = rfx_init_tx,
@@ -238,7 +238,7 @@
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   .base.is_quadrature = true,
-  .base.i_and_q_swapped = true,
+  .base.i_and_q_swapped = false,
   .base.spectrum_inverted = false,
   .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(12.5e6),
   .base.init = rfx_init_tx,
@@ -299,7 +299,7 @@
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   .base.is_quadrature = true,
-  .base.i_and_q_swapped = true,
+  .base.i_and_q_swapped = false,
   .base.spectrum_inverted = false,
   .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(12.5e6),
   .base.init = rfx_init_tx,
@@ -360,7 +360,7 @@
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   .base.is_quadrature = true,
-  .base.i_and_q_swapped = true,
+  .base.i_and_q_swapped = false,
   .base.spectrum_inverted = false,
   .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(12.5e6),
   .base.init = rfx_init_tx,
@@ -422,7 +422,7 @@
   //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
   .base.is_quadrature = true,
-  .base.i_and_q_swapped = true,
+  .base.i_and_q_swapped = false,
   .base.spectrum_inverted = false,
   .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(12.5e6),
   .base.init = rfx_init_tx,