[Commit-gnuradio] r10759 - gnuradio/trunk/usrp2/fpga/simple_gemac

[matt]

Author: matt
Date: 2009-04-03 16:34:15 -0600 (Fri, 03 Apr 2009)
New Revision: 10759

Modified:
   gnuradio/trunk/usrp2/fpga/simple_gemac/simple_gemac.v
   gnuradio/trunk/usrp2/fpga/simple_gemac/simple_gemac_tb.v
Log:
made pause enabling a pin so we can set it


Modified: gnuradio/trunk/usrp2/fpga/simple_gemac/simple_gemac.v
===================================================================
--- gnuradio/trunk/usrp2/fpga/simple_gemac/simple_gemac.v       2009-04-03 
21:37:27 UTC (rev 10758)
+++ gnuradio/trunk/usrp2/fpga/simple_gemac/simple_gemac.v       2009-04-03 
22:34:15 UTC (rev 10759)
@@ -6,7 +6,7 @@
    input GMII_RX_CLK, input GMII_RX_DV, input GMII_RX_ER, input [7:0] GMII_RXD,
 
    // Flow Control Interface
-   input pause_req, input [15:0] pause_time,
+   input pause_req, input [15:0] pause_time, input pause_en,
 
    // RX Client Interface
    output rx_clk, output [7:0] rx_data, output rx_valid, output rx_error, 
output rx_ack,
@@ -16,7 +16,6 @@
    );
 
    localparam SGE_IFG               = 8'd12;  // 12 should be the absolute 
minimum
-   localparam SGE_RESPECT_FLOW_CTRL  = 1'b1;  // stop sending if other side 
requests
 
    wire rst_rxclk, rst_txclk;   
    oneshot_2clk tx_rst_1shot 
(.clk_in(tx_clk),.in(reset),.clk_out(tx_clk),.out(rst_txclk));  // FIXME clocks
@@ -51,7 +50,7 @@
 
    flow_ctrl_tx flow_ctrl_tx
      (.rst(rst_txclk), .tx_clk(tx_clk),
-      .tx_pause_en(SGE_RESPECT_FLOW_CTRL),
+      .tx_pause_en(pause_en),
       .pause_quanta(pause_quanta_rcvd), // 16 bit value
       .pause_quanta_val(pause_rcvd),
       .pause_apply(pause_apply),

Modified: gnuradio/trunk/usrp2/fpga/simple_gemac/simple_gemac_tb.v
===================================================================
--- gnuradio/trunk/usrp2/fpga/simple_gemac/simple_gemac_tb.v    2009-04-03 
21:37:27 UTC (rev 10758)
+++ gnuradio/trunk/usrp2/fpga/simple_gemac/simple_gemac_tb.v    2009-04-03 
22:34:15 UTC (rev 10759)
@@ -36,7 +36,7 @@
       .GMII_TX_ER(GMII_TX_ER), .GMII_TXD(GMII_TXD),
       .GMII_RX_CLK(GMII_RX_CLK), .GMII_RX_DV(GMII_RX_DV),  
       .GMII_RX_ER(GMII_RX_ER), .GMII_RXD(GMII_RXD),
-      .pause_req(pause_req), .pause_time(pause_time),
+      .pause_req(pause_req), .pause_time(pause_time), .pause_en(1),
       .rx_clk(rx_clk), .rx_data(rx_data),
       .rx_valid(rx_valid), .rx_error(rx_error), .rx_ack(rx_ack),
       .tx_clk(tx_clk), .tx_data(tx_data), 
@@ -178,7 +178,7 @@
      end
    
    // Tests: Send and recv flow control, send and receive good packets, RX CRC 
err, RX_ER, RX overrun, TX underrun
-   // Still need to test: ?
+   // Still need to test: CRC errors on Pause Frames
    
    always @(posedge clk)
      if(rx_ll_src_rdy2 & rx_ll_dst_rdy2)