Merged r5463:5504 from jcorgan/snd into trunk. Work in progress, adds digital loopback and receive to FPGA code. Host receive code is still debugging only.

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

4 files changed, 34 insertions, 14 deletions

diff --git a/gr-sounder/src/fpga/top/Makefile.am b/gr-sounder/src/fpga/top/Makefile.am
index 69f6fef9d..9498d4342 100644
--- a/gr-sounder/src/fpga/top/Makefile.am
+++ b/gr-sounder/src/fpga/top/Makefile.am
@@ -21,23 +21,43 @@
 
 include $(top_srcdir)/Makefile.common
 
+datadir = $(prefix)/share/usrp
+
 EXTRA_DIST =			\
 	config.vh		\
 	usrp_sounder.v		\
 	usrp_sounder.csf	\
 	usrp_sounder.esf	\
 	usrp_sounder.psf	\
-	usrp_sounder.qpf
+	usrp_sounder.qpf	\
+	$(RBFS)
+
+RBFS = 	usrp_sounder.rbf
+
+install-data-local:
+	@for file in $(RBFS); do \
+		echo "$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/rev2/$$file"; \
+		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/rev2/$$file; \
+		echo "$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/rev4/$$file"; \
+		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/rev4/$$file; \
+	done
+
+uninstall-local:
+	@for file in $(rbfs); do \
+		echo "$(RM) $(DESTDIR)$(datadir)/rev2/$$file"; \
+		$(RM) $(DESTDIR)$(datadir)/rev2/$$file; \
+		echo "$(RM) $(DESTDIR)$(datadir)/rev4/$$file"; \
+		$(RM) $(DESTDIR)$(datadir)/rev4/$$file; \
+	done
 
 MOSTLYCLEANFILES = 	\
 	db/*		\
 	*.rpt		\
 	*.summary	\
-	*.rbf		\
 	*.qws		\
 	*.smsg		\
 	*.done		\
 	*.pin		\
-	*.sof
-
+	*.sof		\
+	*~
 
diff --git a/gr-sounder/src/fpga/top/usrp_sounder.qsf b/gr-sounder/src/fpga/top/usrp_sounder.qsf
index bda317db6..5ff52583f 100755
--- a/gr-sounder/src/fpga/top/usrp_sounder.qsf
+++ b/gr-sounder/src/fpga/top/usrp_sounder.qsf
@@ -368,15 +368,16 @@ set_instance_assignment -name CLOCK_SETTINGS master_clk -to master_clk
 set_instance_assignment -name PARTITION_HIERARCHY no_file_for_top_partition -to | -section_id Top

 set_global_assignment -name PARTITION_NETLIST_TYPE SOURCE -section_id Top

 

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/sign_extend.v

+set_global_assignment -name VERILOG_FILE ../lib/strobe.v

 set_global_assignment -name VERILOG_FILE ../lib/lfsr_constants.v

-set_global_assignment -name VERILOG_FILE ../lib/sounder.v

 set_global_assignment -name VERILOG_FILE ../lib/lfsr.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/atr_delay.v

 set_global_assignment -name VERILOG_FILE ../lib/dac_interface.v

 set_global_assignment -name VERILOG_FILE ../lib/dacpll.v

 set_global_assignment -name VERILOG_FILE ../lib/sounder_rx.v

 set_global_assignment -name VERILOG_FILE ../lib/sounder_tx.v

+set_global_assignment -name VERILOG_FILE ../lib/sounder.v

+set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/atr_delay.v

+set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/sign_extend.v

 set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/rx_buffer.v

 set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/setting_reg.v

 set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/strobe_gen.v

diff --git a/gr-sounder/src/fpga/top/usrp_sounder.rbf b/gr-sounder/src/fpga/top/usrp_sounder.rbf
new file mode 100755
index 000000000..b6f494227
--- /dev/null
+++ b/gr-sounder/src/fpga/top/usrp_sounder.rbf
diff --git a/gr-sounder/src/fpga/top/usrp_sounder.v b/gr-sounder/src/fpga/top/usrp_sounder.v
index 05b71bbbd..bb6305691 100644
--- a/gr-sounder/src/fpga/top/usrp_sounder.v
+++ b/gr-sounder/src/fpga/top/usrp_sounder.v
@@ -103,14 +103,14 @@ module usrp_sounder
    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
    // Transmit Side
    
-   wire [15:0] tx_i, tx_q;
-   wire [15:0] tx_dac;
+   wire [13:0] tx_i, tx_q;
+   wire [13:0] tx_dac;
    
    dac_interface dac(.clk_i(clk64),.rst_i(tx_dsp_reset),.ena_i(enable_tx),
 		     .strobe_i(tx_sample_strobe),.tx_i_i(tx_i),.tx_q_i(tx_q),
 		     .tx_data_o(tx_dac),.tx_sync_o(TXSYNC_A));
 
-   assign tx_a = tx_dac[15:2];
+   assign tx_a = tx_dac;
 
    // Wedge DAC #2 at zero
    assign TXSYNC_B = 1'b0;
@@ -151,10 +151,9 @@ module usrp_sounder
 
    sounder sounder
      ( .clk_i(clk64),.saddr_i(serial_addr),.sdata_i(serial_data),.s_strobe_i(serial_strobe),
-       .tx_rst_i(tx_dsp_reset),.tx_enable_i(enable_tx),.tx_strobe_i(tx_sample_strobe),
-       .tx_dac_i_o(tx_i),.tx_dac_q_o(tx_q),
-       .rx_rst_i(rx_dsp_reset),.rx_enable_i(enable_rx),.rx_strobe_i(rx_sample_strobe),.rx_strobe_o(rx_strobe),
-       .rx_adc_i_i(rx_adc0_i),.rx_adc_q_i(rx_adc0_q),.rx_imp_i_o(rx_buf_i),.rx_imp_q_o(rx_buf_q)
+       .tx_strobe_i(tx_sample_strobe),.tx_dac_i_o(tx_i),.tx_dac_q_o(tx_q),
+       .rx_strobe_i(rx_sample_strobe),.rx_adc_i_i(rx_adc0_i),.rx_adc_q_i(rx_adc0_q),
+       .rx_strobe_o(rx_strobe),.rx_imp_i_o(rx_buf_i),.rx_imp_q_o(rx_buf_q)
        );