Line 39... |
Line 39... |
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
//
|
//
|
// CVS Revision History
|
// CVS Revision History
|
//
|
//
|
// $Log: not supported by cvs2svn $
|
// $Log: not supported by cvs2svn $
|
|
// Revision 1.17 2002/02/16 07:15:27 mohor
|
|
// Testbench fixed, code simplified, unused signals removed.
|
|
//
|
// Revision 1.16 2002/02/15 13:49:39 mohor
|
// Revision 1.16 2002/02/15 13:49:39 mohor
|
// RxAbort is connected differently.
|
// RxAbort is connected differently.
|
//
|
//
|
// Revision 1.15 2002/02/15 11:38:26 mohor
|
// Revision 1.15 2002/02/15 11:38:26 mohor
|
// Changes that were lost when updating from 1.11 to 1.14 fixed.
|
// Changes that were lost when updating from 1.11 to 1.14 fixed.
|
Line 126... |
Line 129... |
|
|
// WISHBONE slave
|
// WISHBONE slave
|
wb_adr_i, wb_sel_i, wb_we_i, wb_cyc_i, wb_stb_i, wb_ack_o, wb_err_o,
|
wb_adr_i, wb_sel_i, wb_we_i, wb_cyc_i, wb_stb_i, wb_ack_o, wb_err_o,
|
wb_ack_i,
|
wb_ack_i,
|
|
|
`ifdef WISHBONE_DMA
|
`ifdef EXTERNAL_DMA
|
wb_req_o, wb_nd_o, wb_rd_o,
|
wb_req_o, wb_nd_o, wb_rd_o,
|
`else
|
`else
|
// WISHBONE master
|
// WISHBONE master
|
m_wb_adr_o, m_wb_sel_o, m_wb_we_o,
|
m_wb_adr_o, m_wb_sel_o, m_wb_we_o,
|
m_wb_dat_o, m_wb_dat_i, m_wb_cyc_o,
|
m_wb_dat_o, m_wb_dat_i, m_wb_cyc_o,
|
Line 168... |
Line 171... |
input wb_we_i; // WISHBONE write enable input
|
input wb_we_i; // WISHBONE write enable input
|
input wb_cyc_i; // WISHBONE cycle input
|
input wb_cyc_i; // WISHBONE cycle input
|
input wb_stb_i; // WISHBONE strobe input
|
input wb_stb_i; // WISHBONE strobe input
|
output wb_ack_o; // WISHBONE acknowledge output
|
output wb_ack_o; // WISHBONE acknowledge output
|
|
|
`ifdef WISHBONE_DMA
|
`ifdef EXTERNAL_DMA
|
// DMA
|
// DMA
|
output [1:0] wb_req_o; // DMA request output
|
output [1:0] wb_req_o; // DMA request output
|
output [1:0] wb_nd_o; // DMA force new descriptor output
|
output [1:0] wb_nd_o; // DMA force new descriptor output
|
output wb_rd_o; // DMA restart descriptor output
|
output wb_rd_o; // DMA restart descriptor output
|
`else
|
`else
|
Line 565... |
Line 568... |
|
|
|
|
|
|
|
|
// Connecting WishboneDMA module
|
// Connecting WishboneDMA module
|
`ifdef WISHBONE_DMA
|
`ifdef EXTERNAL_DMA
|
eth_wishbonedma wishbone
|
eth_wishbonedma wishbone
|
`else
|
`else
|
eth_wishbone wishbone
|
eth_wishbone wishbone
|
`endif
|
`endif
|
(
|
(
|
Line 580... |
Line 583... |
.WB_ADR_I(wb_adr_i[9:2]), .WB_SEL_I(wb_sel_i), .WB_WE_I(wb_we_i),
|
.WB_ADR_I(wb_adr_i[9:2]), .WB_SEL_I(wb_sel_i), .WB_WE_I(wb_we_i),
|
.BDCs(BDCs), .WB_ACK_O(BDAck),
|
.BDCs(BDCs), .WB_ACK_O(BDAck),
|
|
|
.Reset(wb_rst_i),
|
.Reset(wb_rst_i),
|
|
|
`ifdef WISHBONE_DMA
|
`ifdef EXTERNAL_DMA
|
.WB_REQ_O(wb_req_o), .WB_ND_O(wb_nd_o), .WB_RD_O(wb_rd_o),
|
.WB_REQ_O(wb_req_o), .WB_ND_O(wb_nd_o), .WB_RD_O(wb_rd_o),
|
.WB_ACK_I(wb_ack_i),
|
.WB_ACK_I(wb_ack_i),
|
`else
|
`else
|
// WISHBONE master
|
// WISHBONE master
|
.m_wb_adr_o(m_wb_adr_o), .m_wb_sel_o(m_wb_sel_o), .m_wb_we_o(m_wb_we_o),
|
.m_wb_adr_o(m_wb_adr_o), .m_wb_sel_o(m_wb_sel_o), .m_wb_we_o(m_wb_we_o),
|
Line 610... |
Line 613... |
.MRxClk(mrx_clk_pad_i), .RxData(RxData), .RxValid(RxValid),
|
.MRxClk(mrx_clk_pad_i), .RxData(RxData), .RxValid(RxValid),
|
.RxStartFrm(RxStartFrm), .RxEndFrm(RxEndFrm),
|
.RxStartFrm(RxStartFrm), .RxEndFrm(RxEndFrm),
|
.Busy_IRQ(Busy_IRQ), .RxF_IRQ(RxF_IRQ), .RxB_IRQ(RxB_IRQ),
|
.Busy_IRQ(Busy_IRQ), .RxF_IRQ(RxF_IRQ), .RxB_IRQ(RxB_IRQ),
|
.TxE_IRQ(TxE_IRQ), .TxB_IRQ(TxB_IRQ),
|
.TxE_IRQ(TxE_IRQ), .TxB_IRQ(TxB_IRQ),
|
|
|
`ifdef WISHBONE_DMA
|
`ifdef EXTERNAL_DMA
|
`else
|
`else
|
.RxAbort(RxAbort),
|
.RxAbort(RxAbort),
|
`endif
|
`endif
|
|
|
.InvalidSymbol(InvalidSymbol), .LatchedCrcError(LatchedCrcError), .RxLength(RxByteCnt),
|
.InvalidSymbol(InvalidSymbol), .LatchedCrcError(LatchedCrcError), .RxLength(RxByteCnt),
|