diff options
| author | Josh Blum <josh@joshknows.com> | 2010-01-05 14:39:52 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-01-05 14:39:52 -0800 |
| commit | 6b0dc91d66eb56bb682295d07c97caf0f07da8b1 (patch) | |
| tree | 940850e3f2a8695eba30b73a43d589558bfc7ff8 /top/u2_core | |
| parent | f238468d299312ed562c6f711150f04b070818ed (diff) | |
| parent | 5c2e94296991891d973ad7bd99ee59cded3a5418 (diff) | |
| download | uhd-6b0dc91d66eb56bb682295d07c97caf0f07da8b1.tar.gz uhd-6b0dc91d66eb56bb682295d07c97caf0f07da8b1.tar.bz2 uhd-6b0dc91d66eb56bb682295d07c97caf0f07da8b1.zip | |
Merge branch 'udp' of http://gnuradio.org/git/matt into wip/usrp2
Conflicts:
usrp2/fpga/top/u2_rev3/Makefile
Diffstat (limited to 'top/u2_core')
| -rw-r--r-- | top/u2_core/u2_core.v | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/top/u2_core/u2_core.v b/top/u2_core/u2_core.v index f9ac07a55..ada0f66db 100644 --- a/top/u2_core/u2_core.v +++ b/top/u2_core/u2_core.v @@ -419,19 +419,30 @@ module u2_core // ///////////////////////////////////////////////////////////////////////// // Ethernet MAC Slave #6 - simple_gemac_wrapper #(.RXFIFOSIZE(11), .TXFIFOSIZE(6)) simple_gemac_wrapper + wire [18:0] rx_f19_data, tx_f19_data; + wire rx_f19_src_rdy, rx_f19_dst_rdy, rx_f36_src_rdy, rx_f36_dst_rdy; + + simple_gemac_wrapper19 #(.RXFIFOSIZE(11), .TXFIFOSIZE(6)) simple_gemac_wrapper19 (.clk125(clk_to_mac), .reset(wb_rst), .GMII_GTX_CLK(GMII_GTX_CLK), .GMII_TX_EN(GMII_TX_EN), .GMII_TX_ER(GMII_TX_ER), .GMII_TXD(GMII_TXD), .GMII_RX_CLK(GMII_RX_CLK), .GMII_RX_DV(GMII_RX_DV), .GMII_RX_ER(GMII_RX_ER), .GMII_RXD(GMII_RXD), .sys_clk(dsp_clk), - .rx_f36_data({wr2_flags,wr2_dat}), .rx_f36_src_rdy(wr2_ready_i), .rx_f36_dst_rdy(wr2_ready_o), - .tx_f36_data({rd2_flags,rd2_dat}), .tx_f36_src_rdy(rd2_ready_o), .tx_f36_dst_rdy(rd2_ready_i), + .rx_f19_data(rx_f19_data), .rx_f19_src_rdy(rx_f19_src_rdy), .rx_f19_dst_rdy(rx_f19_dst_rdy), + .tx_f19_data(tx_f19_data), .tx_f19_src_rdy(tx_f19_src_rdy), .tx_f19_dst_rdy(tx_f19_dst_rdy), .wb_clk(wb_clk), .wb_rst(wb_rst), .wb_stb(s6_stb), .wb_cyc(s6_cyc), .wb_ack(s6_ack), .wb_we(s6_we), .wb_adr(s6_adr), .wb_dat_i(s6_dat_o), .wb_dat_o(s6_dat_i), .mdio(MDIO), .mdc(MDC), .debug(debug_mac)); + + udp_wrapper #(.BASE(0)) udp_wrapper + (.clk(dsp_clk), .reset(dsp_rst), .clear(0), + .set_stb(set_stb), .set_addr(set_addr), .set_data(set_data), + .rx_f19_data(rx_f19_data), .rx_f19_src_rdy_i(rx_f19_src_rdy), .rx_f19_dst_rdy_o(rx_f19_dst_rdy), + .tx_f19_data(tx_f19_data), .tx_f19_src_rdy_o(tx_f19_src_rdy), .tx_f19_dst_rdy_i(tx_f19_dst_rdy), + .rx_f36_data({wr2_flags,wr2_dat}), .rx_f36_src_rdy_o(wr2_ready_i), .rx_f36_dst_rdy_i(wr2_ready_o), + .tx_f36_data({rd2_flags,rd2_dat}), .tx_f36_src_rdy_i(rd2_ready_o), .tx_f36_dst_rdy_o(rd2_ready_i) ); // ///////////////////////////////////////////////////////////////////////// // Settings Bus -- Slave #7 |