Changeset 4446

Show
Ignore:
Timestamp:
02/11/07 09:17:40
Author:
jcorgan
Message:

Applied changeset r4287 on trunk to release branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • gnuradio/branches/releases/3.0/usrp/fpga/sdr_lib/tx_buffer.v

    r3534 r4446  
    6767       end 
    6868     else 
    69        if((load_next != channels) & !tx_empty
     69       if(load_next != channels
    7070         begin 
    7171            load_next <= #1 load_next + 4'd1; 
    7272            case(load_next) 
    73               4'd0 : tx_i_0 <= #1 fifodata; 
    74               4'd1 : tx_q_0 <= #1 fifodata; 
    75               4'd2 : tx_i_1 <= #1 fifodata; 
    76               4'd3 : tx_q_1 <= #1 fifodata; 
    77               4'd4 : tx_i_2 <= #1 fifodata; 
    78               4'd5 : tx_q_2 <= #1 fifodata; 
    79               4'd6 : tx_i_3 <= #1 fifodata; 
    80               4'd7 : tx_q_3 <= #1 fifodata; 
     73              4'd0 : tx_i_0 <= #1 tx_empty ? 16'd0 : fifodata; 
     74              4'd1 : tx_q_0 <= #1 tx_empty ? 16'd0 : fifodata; 
     75              4'd2 : tx_i_1 <= #1 tx_empty ? 16'd0 : fifodata; 
     76              4'd3 : tx_q_1 <= #1 tx_empty ? 16'd0 : fifodata; 
     77              4'd4 : tx_i_2 <= #1 tx_empty ? 16'd0 : fifodata; 
     78              4'd5 : tx_q_2 <= #1 tx_empty ? 16'd0 : fifodata; 
     79              4'd6 : tx_i_3 <= #1 tx_empty ? 16'd0 : fifodata; 
     80              4'd7 : tx_q_3 <= #1 tx_empty ? 16'd0 : fifodata; 
    8181            endcase // case(load_next) 
    82          end // if ((load_next != channels) & !tx_empty
     82         end // if (load_next != channels
    8383       else if(txstrobe & (load_next == channels)) 
    8484         begin 
  • gnuradio/branches/releases/3.0/usrp/fpga/toplevel/usrp_std/usrp_std.qsf

    r3091 r4446  
    2828set_global_assignment -name ORIGINAL_QUARTUS_VERSION 3.0 
    2929set_global_assignment -name PROJECT_CREATION_TIME_DATE "00:14:04  JULY 13, 2003" 
    30 set_global_assignment -name LAST_QUARTUS_VERSION "5.1 SP2" 
     30set_global_assignment -name LAST_QUARTUS_VERSION 6.1 
    3131 
    3232# Pin & Location Assignments