diff options
| author | Matt Ettus <matt@ettus.com> | 2011-06-15 18:09:10 -0700 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2011-06-15 18:09:10 -0700 |
| commit | b65b99f6beea22c70b7f80ade2f0b0b7f2f962e0 (patch) | |
| tree | 56bfac8a793f547cb23c380464fa15fa574587ac /usrp2/gpmc | |
| parent | b986e58f4d8b202f37728b249cbc0d94e5a27b09 (diff) | |
| download | uhd-b65b99f6beea22c70b7f80ade2f0b0b7f2f962e0.tar.gz uhd-b65b99f6beea22c70b7f80ade2f0b0b7f2f962e0.tar.bz2 uhd-b65b99f6beea22c70b7f80ade2f0b0b7f2f962e0.zip | |
u1e: rearrange gpmc fifo
Diffstat (limited to 'usrp2/gpmc')
| -rw-r--r-- | usrp2/gpmc/gpmc_async.v | 16 | ||||
| -rw-r--r-- | usrp2/gpmc/new_read.v | 4 |
2 files changed, 3 insertions, 17 deletions
diff --git a/usrp2/gpmc/gpmc_async.v b/usrp2/gpmc/gpmc_async.v index 14bdd0fb0..911e08969 100644 --- a/usrp2/gpmc/gpmc_async.v +++ b/usrp2/gpmc/gpmc_async.v @@ -112,24 +112,12 @@ module gpmc_async .f36_datain(rx36_data), .f36_src_rdy_i(rx36_src_rdy), .f36_dst_rdy_o(rx36_dst_rdy), .f19_dataout({dummy,rx18_data}), .f19_src_rdy_o(rx18_src_rdy), .f19_dst_rdy_i(rx18_dst_rdy) ); - fifo_cascade #(.WIDTH(18), .SIZE(12)) rx_fifo - (.clk(fifo_clk), .reset(fifo_rst), .clear(clear_rx), - .datain(rx18_data), .src_rdy_i(rx18_src_rdy), .dst_rdy_o(rx18_dst_rdy), .space(rx_fifo_space), - .dataout(rx18b_data), .src_rdy_o(rx18b_src_rdy), .dst_rdy_i(rx18b_dst_rdy), .occupied()); - new_read new_read (.clk(fifo_clk), .reset(fifo_rst), .clear(clear_rx), - .data_i(rx18b_data), .src_rdy_i(rx18b_src_rdy), .dst_rdy_o(rx18b_dst_rdy), + .data_i(rx18_data), .src_rdy_i(rx18_src_rdy), .dst_rdy_o(rx18_dst_rdy), .EM_D(EM_D_fifo), .EM_NCS(EM_NCS4), .EM_NOE(EM_NOE), - .frame_len(rx_frame_len) ); + .have_packet(have_packet), .frame_len(rx_frame_len), .bus_error(bus_error_rx) ); - fifo_watcher fifo_watcher - (.clk(fifo_clk), .reset(fifo_rst), .clear(clear_rx), - .src_rdy1(rx18_src_rdy), .dst_rdy1(rx18_dst_rdy), .sof1(rx18_data[16]), .eof1(rx18_data[17]), - .src_rdy2(rx18b_src_rdy), .dst_rdy2(rx18b_dst_rdy), .sof2(rx18b_data[16]), .eof2(rx18b_data[17]), - .have_packet(rx_have_data), .length(rx_frame_len), .bus_error(bus_error_rx), - .debug(pkt_count)); - // //////////////////////////////////////////// // Control path on CS6 diff --git a/usrp2/gpmc/new_read.v b/usrp2/gpmc/new_read.v index 18615b46a..21ca09c75 100644 --- a/usrp2/gpmc/new_read.v +++ b/usrp2/gpmc/new_read.v @@ -30,14 +30,12 @@ module new_read .datain(data_i), .src_rdy_i(src_rdy_i), .dst_rdy_o(dst_rdy_o), .space(rx_fifo_space), .dataout(data_int), .src_rdy_o(src_rdy_int), .dst_rdy_i(dst_rdy_int), .occupied()); - /* fifo_watcher fifo_watcher (.clk(clk), .reset(reset), .clear(clear), - .src_rdy1(src_rdy_i & ~throttle), .dst_rdy1(dst_rdy_i), .sof1(data_i[16]), .eof1(data_i[17]), + .src_rdy1(src_rdy_i), .dst_rdy1(dst_rdy_i), .sof1(data_i[16]), .eof1(data_i[17]), .src_rdy2(src_rdy_int), .dst_rdy2(dst_rdy_int), .sof2(data_int[16]), .eof2(data_int[17]), .have_packet(have_packet), .length(frame_len), .bus_error(bus_error), .debug()); - */ // Synchronize the async control signals reg [1:0] cs_del, oe_del; |