From 943113459cae9f3174f8d12c35add851439ac1a2 Mon Sep 17 00:00:00 2001 From: Matt Ettus Date: Thu, 3 Mar 2011 11:00:12 -0800 Subject: u2/u2p: ll8 now all active high, removed extra shortfifo from eth wrapper --- usrp2/fifo/ll8_to_fifo19.v | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'usrp2/fifo') diff --git a/usrp2/fifo/ll8_to_fifo19.v b/usrp2/fifo/ll8_to_fifo19.v index 3c95c2374..71a8f5ac3 100644 --- a/usrp2/fifo/ll8_to_fifo19.v +++ b/usrp2/fifo/ll8_to_fifo19.v @@ -2,10 +2,10 @@ module ll8_to_fifo19 (input clk, input reset, input clear, input [7:0] ll_data, - input ll_sof_n, - input ll_eof_n, - input ll_src_rdy_n, - output ll_dst_rdy_n, + input ll_sof, + input ll_eof, + input ll_src_rdy, + output ll_dst_rdy, output [18:0] f19_data, output f19_src_rdy_o, @@ -18,13 +18,11 @@ module ll8_to_fifo19 ll8_shortfifo head_fifo (.clk(clk), .reset(reset), .clear(clear), - .datain(ll_data), .sof_i(~ll_sof_n), .eof_i(~ll_eof_n), - .error_i(0), .src_rdy_i(~ll_src_rdy_n), .dst_rdy_o(ll_dst_rdy), + .datain(ll_data), .sof_i(ll_sof), .eof_i(ll_eof), + .error_i(0), .src_rdy_i(ll_src_rdy), .dst_rdy_o(ll_dst_rdy), .dataout(ll_data_int), .sof_o(ll_sof_int), .eof_o(ll_eof_int), .error_o(), .src_rdy_o(ll_src_rdy_int), .dst_rdy_i(ll_dst_rdy_int)); - assign ll_dst_rdy_n = ~ll_dst_rdy; - // Actual ll8_to_fifo19 which could deadlock if not connected to a shortfifo localparam XFER_EMPTY = 0; localparam XFER_HALF = 1; -- cgit v1.2.3