diff options
| author | Matt Ettus <matt@ettus.com> | 2010-07-12 13:01:43 -0700 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-07-12 13:01:43 -0700 |
| commit | 75f82d4fdb3ff6dec0d858468f4779a7b081ef2b (patch) | |
| tree | e0a5df37704e882ce89519651cc0f9c37af31144 | |
| parent | 3f2ffe6c55e3def5689a1a3b043a3421680d85d5 (diff) | |
| parent | 36957538f291ed74867609046cfc816d3f13999a (diff) | |
| download | uhd-75f82d4fdb3ff6dec0d858468f4779a7b081ef2b.tar.gz uhd-75f82d4fdb3ff6dec0d858468f4779a7b081ef2b.tar.bz2 uhd-75f82d4fdb3ff6dec0d858468f4779a7b081ef2b.zip | |
Merge branch 'master' into u2p
* master:
fix bug which caused serdes fifo to disappear
| -rw-r--r-- | usrp2/serdes/serdes_rx.v | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usrp2/serdes/serdes_rx.v b/usrp2/serdes/serdes_rx.v index afefccaa1..b6688e858 100644 --- a/usrp2/serdes/serdes_rx.v +++ b/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 |