[Commit-gnuradio] r4287 - in gnuradio/trunk/usrp/fpga: rbf/rev2 rbf/rev4 sdr_lib toplevel/usrp_std

[eb]

Author: eb
Date: 2007-01-17 15:44:13 -0700 (Wed, 17 Jan 2007)
New Revision: 4287

Modified:
   gnuradio/trunk/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf
   gnuradio/trunk/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf
   gnuradio/trunk/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf
   gnuradio/trunk/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf
   gnuradio/trunk/usrp/fpga/sdr_lib/tx_buffer.v
   gnuradio/trunk/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
Log:
Applied patch from Brett Trotter that stuffs zeros into the head of
the tx signal processing pipeline when the Tx FIFO is empty.

This results in the DACs outputing zeros when there's no data, unless
the tx pipeline is disabled on the host.


Modified: gnuradio/trunk/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf
===================================================================
(Binary files differ)

Modified: gnuradio/trunk/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf
===================================================================
(Binary files differ)

Modified: gnuradio/trunk/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf
===================================================================
(Binary files differ)

Modified: gnuradio/trunk/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf
===================================================================
(Binary files differ)

Modified: gnuradio/trunk/usrp/fpga/sdr_lib/tx_buffer.v
===================================================================
--- gnuradio/trunk/usrp/fpga/sdr_lib/tx_buffer.v        2007-01-17 22:11:22 UTC 
(rev 4286)
+++ gnuradio/trunk/usrp/fpga/sdr_lib/tx_buffer.v        2007-01-17 22:44:13 UTC 
(rev 4287)
@@ -66,20 +66,20 @@
          load_next <= #1 4'd0;
        end
      else
-       if((load_next != channels) & !tx_empty)
+       if(load_next != channels)
         begin
            load_next <= #1 load_next + 4'd1;
            case(load_next)
-             4'd0 : tx_i_0 <= #1 fifodata;
-             4'd1 : tx_q_0 <= #1 fifodata;
-             4'd2 : tx_i_1 <= #1 fifodata;
-             4'd3 : tx_q_1 <= #1 fifodata;
-             4'd4 : tx_i_2 <= #1 fifodata;
-             4'd5 : tx_q_2 <= #1 fifodata;
-             4'd6 : tx_i_3 <= #1 fifodata;
-             4'd7 : tx_q_3 <= #1 fifodata;
+             4'd0 : tx_i_0 <= #1 tx_empty ? 16'd0 : fifodata;
+             4'd1 : tx_q_0 <= #1 tx_empty ? 16'd0 : fifodata;
+             4'd2 : tx_i_1 <= #1 tx_empty ? 16'd0 : fifodata;
+             4'd3 : tx_q_1 <= #1 tx_empty ? 16'd0 : fifodata;
+             4'd4 : tx_i_2 <= #1 tx_empty ? 16'd0 : fifodata;
+             4'd5 : tx_q_2 <= #1 tx_empty ? 16'd0 : fifodata;
+             4'd6 : tx_i_3 <= #1 tx_empty ? 16'd0 : fifodata;
+             4'd7 : tx_q_3 <= #1 tx_empty ? 16'd0 : fifodata;
            endcase // case(load_next)
-        end // if ((load_next != channels) & !tx_empty)
+        end // if (load_next != channels)
        else if(txstrobe & (load_next == channels))
         begin
            load_next <= #1 4'd0;

Modified: gnuradio/trunk/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
===================================================================
--- gnuradio/trunk/usrp/fpga/toplevel/usrp_std/usrp_std.qsf     2007-01-17 
22:11:22 UTC (rev 4286)
+++ gnuradio/trunk/usrp/fpga/toplevel/usrp_std/usrp_std.qsf     2007-01-17 
22:44:13 UTC (rev 4287)
@@ -27,7 +27,7 @@
 # ========================
 set_global_assignment -name ORIGINAL_QUARTUS_VERSION 3.0
 set_global_assignment -name PROJECT_CREATION_TIME_DATE "00:14:04  JULY 13, 
2003"
-set_global_assignment -name LAST_QUARTUS_VERSION "6.0 SP1"
+set_global_assignment -name LAST_QUARTUS_VERSION 6.1
 
 # Pin & Location Assignments
 # ==========================