Fix swapped signals.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10926 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v b/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v
index 0ad823cacc5c4b9a843068851b06148e95251040..2882464bab4f6d74b09f6ab8c946bf3e79acdd5f 100644 (file)
--- a/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v
+++ b/usrp2/fpga/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/usrp2/fpga/top/u2_rev3_iad/dsp_core_tb.v b/usrp2/fpga/top/u2_rev3_iad/dsp_core_tb.v
index 6b4c1669b8a8de249c685d51c37053337c734fa7..4d5a5b5378e22560b1799cd3fa3858faadb87ded 100644 (file)
--- a/usrp2/fpga/top/u2_rev3_iad/dsp_core_tb.v
+++ b/usrp2/fpga/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