summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2009-04-27 22:13:33 +0000
committerjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2009-04-27 22:13:33 +0000
commit8575074ce0c6cfca9114bfc9e73bb790d09645c8 (patch)
tree6b34c20a3fa35a5c4fc71fc2d1faf39aba698d50
parent0d440394746183c2ed2f39c7665cbf7b67a1764a (diff)
downloaduhd-8575074ce0c6cfca9114bfc9e73bb790d09645c8.tar.gz
uhd-8575074ce0c6cfca9114bfc9e73bb790d09645c8.tar.bz2
uhd-8575074ce0c6cfca9114bfc9e73bb790d09645c8.zip
Fix swapped signals.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10926 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--top/u2_rev3_iad/dsp_core_rx.v3
-rw-r--r--top/u2_rev3_iad/dsp_core_tb.v2
2 files changed, 3 insertions, 2 deletions
diff --git a/top/u2_rev3_iad/dsp_core_rx.v b/top/u2_rev3_iad/dsp_core_rx.v
index 0ad823cac..2882464ba 100644
--- a/top/u2_rev3_iad/dsp_core_rx.v
+++ b/top/u2_rev3_iad/dsp_core_rx.v
@@ -117,7 +117,8 @@ module dsp_core_rx
.xo(i_cordic),.yo(q_cordic),.zo() );
// Reconstruct original decimation rate from standard firmware settings
- assign decim_rate = enable_hb1 ? (enable_hb2 ? {cic_decim,2'b0} : {1'b0,cic_decim,1'b0 }) :
+ assign decim_rate = enable_hb2 ? (enable_hb1 ? {cic_decim,2'b0} :
+ {1'b0,cic_decim,1'b0 }) :
cic_decim;
cic_strober #(.WIDTH(10)) // Convenient reuse of strobe generator
diff --git a/top/u2_rev3_iad/dsp_core_tb.v b/top/u2_rev3_iad/dsp_core_tb.v
index 6b4c1669b..4d5a5b537 100644
--- a/top/u2_rev3_iad/dsp_core_tb.v
+++ b/top/u2_rev3_iad/dsp_core_tb.v
@@ -175,7 +175,7 @@ module dsp_core_tb;
set_rx_muxctrl(1);
set_ddc_freq(0);
set_rx_scale_iq(1243, 1243);
- set_decim(1, 1, 10);
+ set_decim(0, 1, 3);
#100000 $finish;
end