[Commit-gnuradio] r7953 - usrp2/trunk/fpga/sdr_lib

[matt]

Author: matt
Date: 2008-03-06 14:54:11 -0700 (Thu, 06 Mar 2008)
New Revision: 7953

Modified:
   usrp2/trunk/fpga/sdr_lib/cic_dec_shifter.v
Log:
allow for decimate by 1, 2, and 3


Modified: usrp2/trunk/fpga/sdr_lib/cic_dec_shifter.v
===================================================================
--- usrp2/trunk/fpga/sdr_lib/cic_dec_shifter.v  2008-03-06 21:53:18 UTC (rev 
7952)
+++ usrp2/trunk/fpga/sdr_lib/cic_dec_shifter.v  2008-03-06 21:54:11 UTC (rev 
7953)
@@ -36,6 +36,8 @@
       input [7:0] rate;
       case(rate)
        // Exact Cases -- N*log2(rate)
+       8'd1 : bitgain = 0;
+       8'd2 : bitgain = 4;
        8'd4 : bitgain = 8;
        8'd8 : bitgain = 12;
        8'd16 : bitgain = 16;
@@ -44,6 +46,7 @@
        8'd128 : bitgain = 28;
        
        // Nearest without overflow -- ceil(N*log2(rate))
+       8'd3 : bitgain = 7;
        8'd5 : bitgain = 10;
        8'd6 : bitgain = 11;
        8'd7 : bitgain = 12;
@@ -73,6 +76,9 @@
    
    always @(posedge clock)
      case(shift)
+       5'd0  : signal_out <= signal_in[0+bw-1:0];
+       5'd4  : signal_out <= signal_in[4+bw-1:4];
+       5'd7  : signal_out <= signal_in[7+bw-1:7];
        5'd8  : signal_out <= signal_in[8+bw-1:8];
        5'd10 : signal_out <= signal_in[10+bw-1:10];
        5'd11 : signal_out <= signal_in[11+bw-1:11];