[Commit-gnuradio] r9102 - usrp2/trunk/fpga/serdes

[matt]

Author: matt
Date: 2008-07-31 20:32:47 -0600 (Thu, 31 Jul 2008)
New Revision: 9102

Modified:
   usrp2/trunk/fpga/serdes/serdes.v
Log:
pass fifo information to outside world, don't send ser_rx_clk to flow control 
because retiming is now done in the receive block


Modified: usrp2/trunk/fpga/serdes/serdes.v
===================================================================
--- usrp2/trunk/fpga/serdes/serdes.v    2008-08-01 02:30:22 UTC (rev 9101)
+++ usrp2/trunk/fpga/serdes/serdes.v    2008-08-01 02:32:47 UTC (rev 9102)
@@ -13,6 +13,9 @@
      input ser_rx_clk, input [15:0] ser_r, input ser_rklsb, input ser_rkmsb,
      output [31:0] wr_dat_o, output wr_write_o, output wr_done_o, output 
wr_error_o,
      input wr_ready_i, input wr_full_i,
+
+     output [15:0] tx_occupied, output tx_full, output tx_empty,
+     output [15:0] rx_occupied, output rx_full, output rx_empty,
      
      output [31:0] debug0, 
      output [31:0] debug1);
@@ -27,6 +30,7 @@
       
.rd_dat_i(rd_dat_i),.rd_read_o(rd_read_o),.rd_done_o(rd_done_o),.rd_error_o(rd_error_o),
       .rd_sop_i(rd_sop_i),.rd_eop_i(rd_eop_i),
       .inhibit_tx(inhibit_tx), .send_xon(send_xon), .send_xoff(send_xoff), 
.sent(sent),
+      .fifo_occupied(tx_occupied),.fifo_full(tx_full),.fifo_empty(tx_empty),
       .debug(debug_tx) );
    
    serdes_rx #(.FIFOSIZE(RXFIFOSIZE)) serdes_rx
@@ -35,12 +39,12 @@
       
.wr_dat_o(wr_dat_o),.wr_write_o(wr_write_o),.wr_done_o(wr_done_o),.wr_error_o(wr_error_o),
       .wr_ready_i(wr_ready_i),.wr_full_i(wr_full_i),
       .fifo_space(fifo_space), .xon_rcvd(xon_rcvd), .xoff_rcvd(xoff_rcvd),
+      .fifo_occupied(rx_occupied),.fifo_full(rx_full),.fifo_empty(rx_empty),
       .debug(debug_rx) );
 
    serdes_fc_tx serdes_fc_tx
      (.clk(clk),.rst(rst),
-      .ser_rx_clk(ser_rx_clk),.xon_rcvd(xon_rcvd),.xoff_rcvd(xoff_rcvd),
-      .inhibit_tx(inhibit_tx) );
+      .xon_rcvd(xon_rcvd),.xoff_rcvd(xoff_rcvd),.inhibit_tx(inhibit_tx) );
 
    serdes_fc_rx #(.LWMARK(32),.HWMARK(128)) serdes_fc_rx
      (.clk(clk),.rst(rst),