summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatt <matt@221aa14e-8319-0410-a670-987f0aec2ac5>2009-04-27 19:50:03 +0000
committermatt <matt@221aa14e-8319-0410-a670-987f0aec2ac5>2009-04-27 19:50:03 +0000
commit716c81a7acd60667802549c199d9bdec207af63a (patch)
treecc7846cb56bf8d462b4bfb628d375af0bf700304
parentb29ba40b81eb20cdb4ef92f99d1291d3d64ef5d2 (diff)
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.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10925 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--usrp2/firmware/lib/db_init.c4
-rw-r--r--usrp2/firmware/lib/db_rfx.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/usrp2/firmware/lib/db_init.c b/usrp2/firmware/lib/db_init.c
index f54fc0ae3e..925a34f399 100644
--- a/usrp2/firmware/lib/db_init.c
+++ b/usrp2/firmware/lib/db_init.c
@@ -267,8 +267,8 @@ db_init(void)
//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;
diff --git a/usrp2/firmware/lib/db_rfx.c b/usrp2/firmware/lib/db_rfx.c
index 3efb9f6643..785d9540d1 100644
--- a/usrp2/firmware/lib/db_rfx.c
+++ b/usrp2/firmware/lib/db_rfx.c
@@ -177,7 +177,7 @@ struct db_rfx_400_tx db_rfx_400_tx = {
//.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 @@ struct db_rfx_900_tx db_rfx_900_tx = {
//.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 @@ struct db_rfx_1200_tx db_rfx_1200_tx = {
//.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 @@ struct db_rfx_1800_tx db_rfx_1800_tx = {
//.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 @@ struct db_rfx_2400_tx db_rfx_2400_tx = {
//.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,