[Commit-gnuradio] r4446 - in gnuradio/branches/releases/3.0/usrp/fpga: rbf/rev2 rbf/rev4 sdr_lib toplevel/usrp_std

[jcorgan]

Author: jcorgan
Date: 2007-02-11 09:17:40 -0700 (Sun, 11 Feb 2007)
New Revision: 4446

Modified:
   gnuradio/branches/releases/3.0/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf
   gnuradio/branches/releases/3.0/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf
   gnuradio/branches/releases/3.0/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf
   gnuradio/branches/releases/3.0/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf
   gnuradio/branches/releases/3.0/usrp/fpga/sdr_lib/tx_buffer.v
   gnuradio/branches/releases/3.0/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
Log:
Applied changeset r4287 on trunk to release branch.

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

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

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

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

Modified: gnuradio/branches/releases/3.0/usrp/fpga/sdr_lib/tx_buffer.v
===================================================================
--- gnuradio/branches/releases/3.0/usrp/fpga/sdr_lib/tx_buffer.v        
2007-02-11 16:13:27 UTC (rev 4445)
+++ gnuradio/branches/releases/3.0/usrp/fpga/sdr_lib/tx_buffer.v        
2007-02-11 16:17:40 UTC (rev 4446)
@@ -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/branches/releases/3.0/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
===================================================================
--- gnuradio/branches/releases/3.0/usrp/fpga/toplevel/usrp_std/usrp_std.qsf     
2007-02-11 16:13:27 UTC (rev 4445)
+++ gnuradio/branches/releases/3.0/usrp/fpga/toplevel/usrp_std/usrp_std.qsf     
2007-02-11 16:17:40 UTC (rev 4446)
@@ -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 "5.1 SP2"
+set_global_assignment -name LAST_QUARTUS_VERSION 6.1
 
 # Pin & Location Assignments
 # ==========================