diff options
| author | Matt Ettus <matt@ettus.com> | 2010-08-19 13:46:34 -0700 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-08-19 13:46:34 -0700 |
| commit | 05b1c0b5cf947e230a012f225cf51f0ea81132d2 (patch) | |
| tree | d6553618a5c3e997c40aff00c3f0aa0ae763d025 /usrp2/top | |
| parent | dea3792c63a3dfcf0885c9d2b8c529672b0ad443 (diff) | |
| parent | 12755e4e822441b73aad4ca3fdfbb157a3a86477 (diff) | |
| download | uhd-05b1c0b5cf947e230a012f225cf51f0ea81132d2.tar.gz uhd-05b1c0b5cf947e230a012f225cf51f0ea81132d2.tar.bz2 uhd-05b1c0b5cf947e230a012f225cf51f0ea81132d2.zip | |
Merge branch 'ise12_efifo_work' into efifo_merge
* ise12_efifo_work:
Regenerated FIFO with lower trigger level for almost full flag to reflect logic removed from nobl_fifo.
Conflicts:
usrp2/vrt/vita_tx_deframer.v
Diffstat (limited to 'usrp2/top')
| -rw-r--r-- | usrp2/top/u2_rev3/u2_core_udp.v | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usrp2/top/u2_rev3/u2_core_udp.v b/usrp2/top/u2_rev3/u2_core_udp.v index 62c03150e..291a8e74e 100644 --- a/usrp2/top/u2_rev3/u2_core_udp.v +++ b/usrp2/top/u2_rev3/u2_core_udp.v @@ -665,11 +665,12 @@ module u2_core .dataout(tx_data), .src_rdy_o(tx_src_rdy), .dst_rdy_i(tx_dst_rdy) ); -----/\----- EXCLUDED -----/\----- */ - ext_fifo #(.EXT_WIDTH(18),.INT_WIDTH(36),.DEPTH(19)) + ext_fifo #(.EXT_WIDTH(18),.INT_WIDTH(36),.RAM_DEPTH(19),.FIFO_DEPTH(8)) ext_fifo_i1 ( .int_clk(dsp_clk), .ext_clk(clk_to_mac), +// .ext_clk(wb_clk), .rst(dsp_rst), .RAM_D_pi(RAM_D_pi), .RAM_D_po(RAM_D_po), |