Merged r5566:5676 from jcorgan/snd into trunk, with minor changes. Component gr-sounder is now complete for recording impulse responses to a file.

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

3 files changed, 85 insertions, 43 deletions

diff --git a/gr-sounder/src/fpga/tb/sounder_tb.sav b/gr-sounder/src/fpga/tb/sounder_tb.sav
index 3a73a9445..25bc512bc 100644
--- a/gr-sounder/src/fpga/tb/sounder_tb.sav
+++ b/gr-sounder/src/fpga/tb/sounder_tb.sav
@@ -1,10 +1,12 @@
-*-24.753519 93900000 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
+*-29.807737 317080000 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
+@200
+-
 @28
-sounder_tb.uut.clk_i
-sounder_tb.rst
 sounder_tb.s_strobe
 @22
-sounder_tb.sdata[31:0]
+sounder_tb.saddr[6:0]
+@200
+-
 @28
 sounder_tb.uut.reset
 sounder_tb.uut.transmit
@@ -14,27 +16,42 @@ sounder_tb.uut.loopback
 -
 @22
 sounder_tb.uut.degree[4:0]
-sounder_tb.uut.len[15:0]
+sounder_tb.uut.mask[15:0]
+sounder_tb.uut.ampl[13:0]
+sounder_tb.uut.receiver.offset[5:0]
 @200
 -
-@28
+@8420
 sounder_tb.tx_dac_i[13:0]
+@28
+sounder_tb.tx_strobe
 @200
 -
-@22
-sounder_tb.fifo_strobe
-@8421
+@8420
 sounder_tb.fifo_i[15:0]
-@22
-sounder_tb.fifo_q[15:0]
+@28
+sounder_tb.fifo_strobe
 @200
 -
-@22
-sounder_tb.uut.transmitter.pn_code.pn_o
-sounder_tb.uut.receiver.pn_ref
+@28
+sounder_tb.uut.ref_strobe
+sounder_tb.uut.sum_strobe
 @200
 -
 @28
-sounder_tb.tx_strobe
+sounder_tb.clk
+sounder_tb.uut.transmitter.pn
+sounder_tb.uut.receiver.pn_ref
 @8420
+sounder_tb.uut.receiver.prod_i[31:0]
+sounder_tb.uut.receiver.scaled_i[31:0]
+@8421
 sounder_tb.uut.receiver.sum_i[31:0]
+@8420
+sounder_tb.uut.receiver.total_i[31:0]
+@200
+-
+@22
+sounder_tb.uut.master.len[16:0]
+@200
+-
diff --git a/gr-sounder/src/fpga/tb/sounder_tb.sh b/gr-sounder/src/fpga/tb/sounder_tb.sh
index 9bc714387..28efc8d31 100755
--- a/gr-sounder/src/fpga/tb/sounder_tb.sh
+++ b/gr-sounder/src/fpga/tb/sounder_tb.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 iverilog -y ../lib/ -y ../../../../usrp/fpga/sdr_lib 	        \
     sounder_tb.v -o sounder_tb 				     && \
-./sounder_tb                                       > sounder_tb.out  && \
-grep 'rst=0'         sounder_tb.out | grep 'clk=1' > sounder_tb.out2 && \
-grep 'tx_strobe=1'   sounder_tb.out2               > sounder_tb.out3
+./sounder_tb > sounder_tb.out  && \
+    grep 'r=0' sounder_tb.out | grep 'c=1' > sounder_tb.out2
     
diff --git a/gr-sounder/src/fpga/tb/sounder_tb.v b/gr-sounder/src/fpga/tb/sounder_tb.v
index 6a9eff0ea..0e0cb55c2 100644
--- a/gr-sounder/src/fpga/tb/sounder_tb.v
+++ b/gr-sounder/src/fpga/tb/sounder_tb.v
@@ -19,7 +19,7 @@
 //  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
 //
 
-`timescale 1ns/1ps
+`timescale 1ns/100ps
 
 `include "../lib/sounder.v"
 
@@ -30,6 +30,7 @@
 `define bmFR_MODE_LP            32'h0008
 
 `define FR_DEGREE		7'd65
+`define FR_AMPL                 7'd66
 
 module sounder_tb;
 
@@ -44,12 +45,11 @@ module sounder_tb;
    reg 	       s_strobe;
 
    // DAC bus
-   reg         tx_strobe;
+   wire        tx_strobe;
    wire [13:0] tx_dac_i;
    wire [13:0] tx_dac_q;
 
    // ADC bus
-   reg         rx_strobe;
    reg [15:0]  rx_adc_i;
    reg [15:0]  rx_adc_q;
    
@@ -64,14 +64,10 @@ module sounder_tb;
    
    sounder uut
      (.clk_i(clk),.saddr_i(saddr),.sdata_i(sdata),.s_strobe_i(s_strobe),
-      .tx_strobe_i(tx_strobe),.tx_dac_i_o(tx_dac_i),.tx_dac_q_o(tx_dac_q),
-      .rx_strobe_i(rx_strobe),.rx_adc_i_i(rx_adc_i),.rx_adc_q_i(rx_adc_q),
-      .rx_strobe_o(fifo_strobe),.rx_imp_i_o(fifo_i),.rx_imp_q_o(fifo_q));
+      .tx_strobe_o(tx_strobe),.tx_dac_i_o(tx_dac_i),.tx_dac_q_o(tx_dac_q),
+      .rx_strobe_o(fifo_strobe),.rx_adc_i_i(rx_adc_i),.rx_adc_q_i(rx_adc_q),
+      .rx_imp_i_o(fifo_i),.rx_imp_q_o(fifo_q));
 
-   // Drive tx_strobe @ half clock rate
-   always @(posedge clk)
-     tx_strobe <= ~tx_strobe;
-   
    // Start up initialization
    initial
      begin
@@ -81,8 +77,6 @@ module sounder_tb;
 	saddr = 0;
 	sdata = 0;
 	s_strobe = 0;
-	tx_strobe = 0;
-	rx_strobe = 1;
 	rx_adc_i = 0;
 	rx_adc_q = 0;
 	mode = 0;
@@ -101,9 +95,11 @@ module sounder_tb;
    
    initial
      begin
-	$monitor($time, " clk=%b rst=%b tx_strobe=%b fifo_strobe=%b phs=%x pn_o=%b pn_ref=%b fifo_i=%x fifo_q=", 
-		 clk, uut.reset, tx_strobe, fifo_strobe, uut.receiver.phase_strobe.count_o,
-		 uut.transmitter.pn, uut.receiver.pn_ref, fifo_i, fifo_q);
+	$monitor($time, " c=%b r=%b phs=%d txs=%b rfs=%b rxs=%b sms=%b pn=%b pnr=%b prd=%x sum=%x tot=%x",
+		 clk, rst, uut.master.phase, uut.tx_strobe_o, uut.ref_strobe, uut.rx_strobe_o, 
+		 uut.sum_strobe, uut.transmitter.pn, uut.receiver.pn_ref, uut.receiver.prod_i,
+		 uut.receiver.sum_i, uut.receiver.total_i);
+
 	$dumpfile("sounder_tb.vcd");
 	$dumpvars(0, sounder_tb);
      end
@@ -115,11 +111,11 @@ module sounder_tb;
       
       begin
 	 @(posedge clk);
-	 saddr <= regno;
-	 sdata <= value;
-	 s_strobe <= 1'b1;
+	 saddr <= #5 regno;
+	 sdata <= #5 value;
+	 s_strobe <= #5 1'b1;
 	 @(posedge clk);
-	 s_strobe <= 0;
+	 s_strobe <= #5 0;
       end
    endtask // write_cfg_register
    
@@ -141,6 +137,14 @@ module sounder_tb;
       end
    endtask // set_degree
    
+   // Set the PN amplitude
+   task set_amplitude;
+      input [13:0] ampl;
+      begin
+	 write_cfg_register(`FR_AMPL, ampl);
+      end
+   endtask // set_ampl
+   
    // Turn on or off the transmitter
    task enable_tx;
       input tx;
@@ -175,20 +179,24 @@ module sounder_tb;
    // Test transmitter functionality
    task test_tx;
       input [5:0] degree;
+      input [31:0] test_len;
       
       begin
 	 #20 set_reset(1);
 	 #20 set_degree(degree);
+	 #20 set_amplitude(14'h1000);
 	 #20 enable_tx(1);
+	 #20 enable_rx(0);
+	 #20 enable_lp(0);
 	 #20 set_reset(0);
-	 #(uut.len*20);		// One PN code period
-
+	 #(test_len);
       end
    endtask // test_tx
    
    // Test loopback functionality
    task test_lp;
       input [5:0] degree;
+      input [31:0] test_len;
       
       begin
 	 #20 set_reset(1);
@@ -197,16 +205,34 @@ module sounder_tb;
 	 #20 enable_rx(1);
 	 #20 enable_lp(1);
 	 #20 set_reset(0);
-	 #((uut.len+1)*uut.len*20*2);
+	 #(test_len);
       end
    endtask // test_lp
    
+   // Test receiver only functionality
+   task test_rx;
+      input [5:0] degree;
+      input [31:0] test_len;
+      
+      begin
+	 #20 set_reset(1);
+	 #20 set_degree(degree);
+	 #20 enable_tx(0);
+	 #20 enable_rx(1);
+	 #20 enable_lp(0);
+	 #20 set_reset(0);
+	 #(test_len);
+      end
+   endtask // test_rx
+   
    // Execute tests
    initial
      begin
-        // #20 test_tx(12);
-	#20 test_lp(12);
-	#100 $finish;
+        #20 test_tx(8,255*20);
+	#20 test_lp(8,255*255*20*5);
+	//#20 test_rx(8,255*255*20*5);
+	#500 $finish;
      end
+
 endmodule