[Commit-gnuradio] r10680 - in gnuradio/branches/developers/pcreekmore/quantization/usrp: firmware/include fpga/sdr_lib fpga/toplevel/usrp_std host/lib/legacy

[pcreekmore]

Author: pcreekmore
Date: 2009-03-24 20:39:08 -0600 (Tue, 24 Mar 2009)
New Revision: 10680

Modified:
   
gnuradio/branches/developers/pcreekmore/quantization/usrp/firmware/include/fpga_regs_standard.h
   
gnuradio/branches/developers/pcreekmore/quantization/usrp/firmware/include/fpga_regs_standard.v
   
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/sdr_lib/rx_buffer.v
   
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/sdr_lib/rx_chain.v
   
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/usrp_std/config.vh
   
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
   
gnuradio/branches/developers/pcreekmore/quantization/usrp/host/lib/legacy/usrp_standard.cc
Log:
*Updated rx_chain.v with CIC removal option fix.
*Fixed host-side libraries and includes to permit selection of new quantization 
options.

Modified: 
gnuradio/branches/developers/pcreekmore/quantization/usrp/firmware/include/fpga_regs_standard.h
===================================================================
--- 
gnuradio/branches/developers/pcreekmore/quantization/usrp/firmware/include/fpga_regs_standard.h
     2009-03-24 22:29:33 UTC (rev 10679)
+++ 
gnuradio/branches/developers/pcreekmore/quantization/usrp/firmware/include/fpga_regs_standard.h
     2009-03-25 02:39:08 UTC (rev 10680)
@@ -176,11 +176,12 @@
 //   B  Q  WIDTH  SHIFT
 //   0  1    16     0
 //   0  1     8     8
+//   0  1     4     X
+//   0  1     2     X
+//   0  1     1     X
 
+// 12 would take a bit more work, since we need to know packet alignment.
 
-// Possible future values of WIDTH = {4, 2, 1}
-// 12 takes a bit more work, since we need to know packet alignment.
-
 // ------------------------------------------------------------------------
 // FIXME register numbers 50 to 63 are available
 

Modified: 
gnuradio/branches/developers/pcreekmore/quantization/usrp/firmware/include/fpga_regs_standard.v
===================================================================
--- 
gnuradio/branches/developers/pcreekmore/quantization/usrp/firmware/include/fpga_regs_standard.v
     2009-03-24 22:29:33 UTC (rev 10679)
+++ 
gnuradio/branches/developers/pcreekmore/quantization/usrp/firmware/include/fpga_regs_standard.v
     2009-03-25 02:39:08 UTC (rev 10680)
@@ -148,11 +148,12 @@
 //   B  Q  WIDTH  SHIFT
 //   0  1    16     0
 //   0  1     8     8
+//   0  1     4     X
+//   0  1     2     X
+//   0  1     1     X
 
+// 12 would take a bit more work, since we need to know packet alignment.
 
-// Possible future values of WIDTH = {4, 2, 1}
-// 12 takes a bit more work, since we need to know packet alignment.
-
 // ------------------------------------------------------------------------
 // FIXME register numbers 50 to 63 are available
 

Modified: 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/sdr_lib/rx_buffer.v
===================================================================
--- 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/sdr_lib/rx_buffer.v
  2009-03-24 22:29:33 UTC (rev 10679)
+++ 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/sdr_lib/rx_buffer.v
  2009-03-25 02:39:08 UTC (rev 10680)
@@ -134,7 +134,6 @@
    always @(posedge rxclk)
      if (rxstrobe)
        begin
-         //ch_0_buff0 <= 16'd0;
          ch_0_buff0 <= ch_0;
          ch_0_buff1 <= ch_0_buff0;
          ch_0_buff2 <= ch_0_buff1;
@@ -144,7 +143,6 @@
          ch_0_buff6 <= ch_0_buff5;
          ch_0_buff7 <= ch_0_buff6;
 
-         //ch_1_buff0 <= 16'd1;
          ch_1_buff0 <= ch_1;
          ch_1_buff1 <= ch_1_buff0;
          ch_1_buff2 <= ch_1_buff1;
@@ -154,35 +152,29 @@
          ch_1_buff6 <= ch_1_buff5;
          ch_1_buff7 <= ch_1_buff6;
 
-         //ch_2_buff0 <= 16'd2;
          ch_2_buff0 <= ch_2;
          ch_2_buff1 <= ch_2_buff0;
          ch_2_buff2 <= ch_2_buff1;
          ch_2_buff3 <= ch_2_buff2;
 
-         //ch_3_buff0 <= 16'd3;
          ch_3_buff0 <= ch_3;
          ch_3_buff1 <= ch_3_buff0;
          ch_3_buff2 <= ch_3_buff1;
          ch_3_buff3 <= ch_3_buff2;
 
-         //ch_4_buff0 <= 16'd4;
          ch_4_buff0 <= ch_4;
          ch_4_buff1 <= ch_4_buff0;
          ch_4_buff2 <= ch_4_buff1;
          ch_4_buff3 <= ch_4_buff2;
 
-         //ch_5_buff0 <= 16'd5;
          ch_5_buff0 <= ch_5;
          ch_5_buff1 <= ch_5_buff0;
          ch_5_buff2 <= ch_5_buff1;
          ch_5_buff3 <= ch_5_buff2;
 
-         //ch_6_buff0 <= 16'd6;
          ch_6_buff0 <= ch_6;
          ch_6_buff1 <= ch_6_buff0;
          
-         //ch_7_buff0 <= 16'd7;
          ch_7_buff0 <= ch_7;
          ch_7_buff1 <= ch_7_buff0;
        end

Modified: 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/sdr_lib/rx_chain.v
===================================================================
--- 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/sdr_lib/rx_chain.v
   2009-03-24 22:29:33 UTC (rev 10679)
+++ 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/sdr_lib/rx_chain.v
   2009-03-25 02:39:08 UTC (rev 10680)
@@ -69,19 +69,20 @@
      ( .clock(clock),.reset(reset),.enable(enable),
        
.rate(decim_rate),.strobe_in(sample_strobe),.strobe_out(decimator_strobe),
        .signal_in(bb_i),.signal_out(hb_in_i) );
+   assign hb_strobe_in = decimator_strobe;
 `else
    assign hb_in_i = bb_i;
-   assign decimator_strobe = sample_strobe;
+   assign hb_strobe_in = sample_strobe;
 `endif
    
 `ifdef RX_HB_ON
    halfband_decim hbd_i_0
      ( .clock(clock),.reset(reset),.enable(enable),
-       .strobe_in(decimator_strobe),.strobe_out(hb_strobe),
+       .strobe_in(hb_strobe_in),.strobe_out(hb_strobe),
        .data_in(hb_in_i),.data_out(i_out),.debugctrl(debugctrl) );
 `else
    assign i_out = hb_in_i;
-   assign hb_strobe = decimator_strobe;
+   assign hb_strobe = hb_strobe_in;
 `endif
    
 `ifdef RX_CIC_ON
@@ -96,7 +97,7 @@
 `ifdef RX_HB_ON
    halfband_decim hbd_q_0
      ( .clock(clock),.reset(reset),.enable(enable),
-       .strobe_in(decimator_strobe),.strobe_out(),
+       .strobe_in(hb_strobe_in),.strobe_out(),
        .data_in(hb_in_q),.data_out(q_out) );   
 `else
    assign q_out = hb_in_q;

Modified: 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/usrp_std/config.vh
===================================================================
--- 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/usrp_std/config.vh
  2009-03-24 22:29:33 UTC (rev 10679)
+++ 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/usrp_std/config.vh
  2009-03-25 02:39:08 UTC (rev 10680)
@@ -34,7 +34,7 @@
 //`include "../include/common_config_1rxhb_1tx.vh"
 
 // Uncomment this for 2 rx channels (w/ halfband) & 2 transmit channels
-  `include "../include/common_config_2rxhb_2tx.vh"
+//`include "../include/common_config_2rxhb_2tx.vh"
 
 // Uncomment this for 4 rx channels (w/o halfband) & 0 transmit channels
 //`include "../include/common_config_4rx_0tx.vh"
@@ -45,6 +45,9 @@
 // Uncomment this for multi with 2 rx channels (w/o halfband) & 0 transmit 
channels
 //`include "../include/common_config_2rx_0tx.vh"
 
+// Uncomment this for 4 rx channels (w/o halfband or CIC) & 0 transmit channels
+  `include "../include/purdue_config_maxBW.vh"
+
 // Add other "known to fit" configurations here...
 
 // ====================================================================

Modified: 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
===================================================================
--- 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
       2009-03-24 22:29:33 UTC (rev 10679)
+++ 
gnuradio/branches/developers/pcreekmore/quantization/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
       2009-03-25 02:39:08 UTC (rev 10680)
@@ -409,4 +409,6 @@
 set_global_assignment -name VERILOG_FILE ../../sdr_lib/sign_extend.v
 set_global_assignment -name PARTITION_COLOR 2147039 -section_id Top
 set_global_assignment -name LL_ROOT_REGION ON -section_id "Root Region"
-set_global_assignment -name LL_MEMBER_STATE LOCKED -section_id "Root Region"
\ No newline at end of file
+set_global_assignment -name LL_MEMBER_STATE LOCKED -section_id "Root Region"
+set_global_assignment -name VERILOG_INCLUDE_FILE 
../include/common_config_4rx_0tx_noCIC.vh
+set_global_assignment -name VERILOG_INCLUDE_FILE 
../include/purdue_config_maxBW.vh
\ No newline at end of file

Modified: 
gnuradio/branches/developers/pcreekmore/quantization/usrp/host/lib/legacy/usrp_standard.cc
===================================================================
--- 
gnuradio/branches/developers/pcreekmore/quantization/usrp/host/lib/legacy/usrp_standard.cc
  2009-03-24 22:29:33 UTC (rev 10679)
+++ 
gnuradio/branches/developers/pcreekmore/quantization/usrp/host/lib/legacy/usrp_standard.cc
  2009-03-25 02:39:08 UTC (rev 10680)
@@ -693,7 +693,7 @@
   int width =  usrp_standard_rx::format_width(format);
   int want_q = usrp_standard_rx::format_want_q(format);
 
-  if (!(width == 8 || width == 16))    // FIXME add other widths when valid
+  if (!(width == 1 || width == 2 || width == 4 || width == 8 || width == 16))
     return false;
 
   if (!want_q)         // FIXME remove check when the rest of the code can 
handle I only