[Commit-gnuradio] r10926 - gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad

[jcorgan]

Author: jcorgan
Date: 2009-04-27 16:13:33 -0600 (Mon, 27 Apr 2009)
New Revision: 10926

Modified:
   gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v
   gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/dsp_core_tb.v
Log:
Fix swapped signals.

Modified: gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v
===================================================================
--- gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v     2009-04-27 
19:50:03 UTC (rev 10925)
+++ gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v     2009-04-27 
22:13:33 UTC (rev 10926)
@@ -117,7 +117,8 @@
            .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

Modified: gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/dsp_core_tb.v
===================================================================
--- gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/dsp_core_tb.v     2009-04-27 
19:50:03 UTC (rev 10925)
+++ gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/dsp_core_tb.v     2009-04-27 
22:13:33 UTC (rev 10926)
@@ -175,7 +175,7 @@
         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