URL
https://opencores.org/ocsvn/ethmac/ethmac/trunk
Subversion Repositories ethmac
Compare Revisions
- This comparison shows the changes necessary to convert path
/
- from Rev 243 to Rev 244
- ↔ Reverse comparison
Rev 243 → Rev 244
/trunk/rtl/verilog/eth_top.v
41,6 → 41,9
// CVS Revision History |
// |
// $Log: not supported by cvs2svn $ |
// Revision 1.37 2002/11/13 22:25:36 tadejm |
// All modules are reset with wb_rst instead of the r_Rst. Exception is MII module. |
// |
// Revision 1.36 2002/10/18 17:04:20 tadejm |
// Changed BIST scan signals. |
// |
346,7 → 349,6
wire RegCs; // Connected to registers |
wire [31:0] RegDataOut; // Multiplexed to wb_dat_o |
wire r_RecSmall; // Receive small frames |
wire r_Rst; // Reset |
wire r_LoopBck; // Loopback |
wire r_TxEn; // Tx Enable |
wire r_RxEn; // Rx Enable |
411,7 → 413,6
assign CsMiss = wb_stb_i & wb_cyc_i & DWord & wb_adr_i[11]; // 0x800 - 0xfFF |
assign temp_wb_ack_o = RegCs | BDAck; |
assign temp_wb_dat_o = (RegCs & ~wb_we_i)? RegDataOut : BD_WB_DAT_O; |
//assign temp_wb_err_o = wb_stb_i & wb_cyc_i & (~DWord | BDCs & r_Rst | CsMiss); |
assign temp_wb_err_o = wb_stb_i & wb_cyc_i & (~DWord | CsMiss); |
|
`ifdef ETH_REGISTERED_OUTPUTS |
452,7 → 453,7
.Cs(RegCs), .Clk(wb_clk_i), .Reset(wb_rst_i), |
.DataOut(RegDataOut), .r_RecSmall(r_RecSmall), |
.r_Pad(r_Pad), .r_HugEn(r_HugEn), .r_CrcEn(r_CrcEn), |
.r_DlyCrcEn(r_DlyCrcEn), .r_Rst(r_Rst), .r_FullD(r_FullD), |
.r_DlyCrcEn(r_DlyCrcEn), .r_FullD(r_FullD), |
.r_ExDfrEn(r_ExDfrEn), .r_NoBckof(r_NoBckof), .r_LoopBck(r_LoopBck), |
.r_IFG(r_IFG), .r_Pro(r_Pro), .r_Iam(), |
.r_Bro(r_Bro), .r_NoPre(r_NoPre), .r_TxEn(r_TxEn), |
/trunk/rtl/verilog/eth_registers.v
41,6 → 41,9
// CVS Revision History |
// |
// $Log: not supported by cvs2svn $ |
// Revision 1.21 2002/09/10 10:35:23 mohor |
// Ethernet debug registers removed. |
// |
// Revision 1.20 2002/09/04 18:40:25 mohor |
// ETH_TXCTRL and ETH_RXCTRL registers added. Interrupts related to |
// the control frames connected. |
137,7 → 140,7
|
module eth_registers( DataIn, Address, Rw, Cs, Clk, Reset, DataOut, |
r_RecSmall, r_Pad, r_HugEn, r_CrcEn, r_DlyCrcEn, |
r_Rst, r_FullD, r_ExDfrEn, r_NoBckof, r_LoopBck, r_IFG, |
r_FullD, r_ExDfrEn, r_NoBckof, r_LoopBck, r_IFG, |
r_Pro, r_Iam, r_Bro, r_NoPre, r_TxEn, r_RxEn, |
TxB_IRQ, TxE_IRQ, RxB_IRQ, RxE_IRQ, Busy_IRQ, |
r_IPGT, r_IPGR1, r_IPGR2, r_MinFL, r_MaxFL, r_MaxRet, |
174,7 → 177,6
output r_HugEn; |
output r_CrcEn; |
output r_DlyCrcEn; |
output r_Rst; |
output r_FullD; |
output r_ExDfrEn; |
output r_NoBckof; |
651,7 → 653,7
assign r_HugEn = MODEROut[14]; |
assign r_CrcEn = MODEROut[13]; |
assign r_DlyCrcEn = MODEROut[12]; |
assign r_Rst = MODEROut[11]; |
// assign r_Rst = MODEROut[11]; This signal is not used any more |
assign r_FullD = MODEROut[10]; |
assign r_ExDfrEn = MODEROut[9]; |
assign r_NoBckof = MODEROut[8]; |