diff options
| author | Josh Blum <josh@joshknows.com> | 2010-07-05 10:11:54 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-07-05 10:11:54 -0700 |
| commit | 19f825a068b9d07d65a4ce0b4e91c1b3ac4a3bdb (patch) | |
| tree | 7c1140e764ea19aae346f3f4c9205ad2b24797b3 /fpga/usrp2/serdes | |
| parent | 8d2dc6300690f0bf6b104f39bd50b174b2e1785b (diff) | |
| parent | 36957538f291ed74867609046cfc816d3f13999a (diff) | |
| download | uhd-19f825a068b9d07d65a4ce0b4e91c1b3ac4a3bdb.tar.gz uhd-19f825a068b9d07d65a4ce0b4e91c1b3ac4a3bdb.tar.bz2 uhd-19f825a068b9d07d65a4ce0b4e91c1b3ac4a3bdb.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_fpga_merge
Diffstat (limited to 'fpga/usrp2/serdes')
| -rw-r--r-- | fpga/usrp2/serdes/serdes_rx.v | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fpga/usrp2/serdes/serdes_rx.v b/fpga/usrp2/serdes/serdes_rx.v index afefccaa1..b6688e858 100644 --- a/fpga/usrp2/serdes/serdes_rx.v +++ b/fpga/usrp2/serdes/serdes_rx.v @@ -260,12 +260,13 @@ module serdes_rx // Internal FIFO, size 9 is 2K, size 10 is 4K Bytes assign write = eop_i | (error_i & have_space) | (write_d & (state != CRC_CHECK)); - - fifo_2clock_cascade #(.WIDTH(35),.SIZE(FIFOSIZE)) serdes_rx_fifo + wire dummy; // avoid warning on unconnected pin + + fifo_2clock_cascade #(.WIDTH(36),.SIZE(FIFOSIZE)) serdes_rx_fifo (.arst(rst), - .wclk(ser_rx_clk),.datain({error_i,sop_i,eop_i,line_i}), + .wclk(ser_rx_clk),.datain({1'b0,error_i,sop_i,eop_i,line_i}), .src_rdy_i(write), .dst_rdy_o(have_space), .space(fifo_space), - .rclk(clk),.dataout({error_o,sop_o,eop_o,line_o}), + .rclk(clk),.dataout({dummy,error_o,sop_o,eop_o,line_o}), .src_rdy_o(wr_ready_o), .dst_rdy_i(wr_ready_i), .occupied(fifo_occupied) ); assign fifo_full = ~have_space; // Note -- in the wrong clock domain |