diff options
| author | Josh Blum <josh@joshknows.com> | 2011-03-17 13:47:06 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-03-17 13:47:06 -0700 |
| commit | 2d906e6708469cbac63fac6dfd95391f0ecc1aec (patch) | |
| tree | d08fb4ecd184a5f09d6e2d4d37af933c6cd1edcf /fpga/usrp2/top | |
| parent | 31953ec55d038d75cfe9307bd38abdc953904b07 (diff) | |
| parent | 74979af6a089c67ac6579cb08040aec305032018 (diff) | |
| download | uhd-2d906e6708469cbac63fac6dfd95391f0ecc1aec.tar.gz uhd-2d906e6708469cbac63fac6dfd95391f0ecc1aec.tar.bz2 uhd-2d906e6708469cbac63fac6dfd95391f0ecc1aec.zip | |
Merge branch 'fpga_master' into next
Diffstat (limited to 'fpga/usrp2/top')
| -rw-r--r-- | fpga/usrp2/top/u1e/u1e_core.v | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fpga/usrp2/top/u1e/u1e_core.v b/fpga/usrp2/top/u1e/u1e_core.v index a5a477202..b3d71b4ab 100644 --- a/fpga/usrp2/top/u1e/u1e_core.v +++ b/fpga/usrp2/top/u1e/u1e_core.v @@ -152,7 +152,6 @@ module u1e_core .set_stb(set_stb),.set_addr(set_addr),.set_data(set_data), .sample_fifo_i(rx1_data), .sample_fifo_dst_rdy_o(rx1_dst_rdy), .sample_fifo_src_rdy_i(rx1_src_rdy), .data_o(vita_rx_data), .dst_rdy_i(vita_rx_dst_rdy), .src_rdy_o(vita_rx_src_rdy), - .fifo_occupied(), .fifo_full(), .fifo_empty(), .debug_rx(vrf_debug) ); fifo36_mux #(.prio(0)) mux_err_stream |