Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

liteeth/mac/core: add with_padding option (enabled by default) and change with_hw_preamble_crc option to with_preamble_crc

This commit is contained in:
Florent Kermarrec 2015-03-19 14:50:53 +01:00
parent 6bdf60567c
commit 84b631c929
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
misoclib/com/liteeth/mac/core/__init__.py
View File

@ -4,7 +4,9 @@ from misoclib.com.liteeth.mac.core import gap, preamble, crc, padding, last_be
from misoclib.com.liteeth.phy.sim import LiteEthPHYSim from misoclib.com.liteeth.phy.sim import LiteEthPHYSim
class LiteEthMACCore(Module, AutoCSR): class LiteEthMACCore(Module, AutoCSR):
def __init__(self, phy, dw, endianness="big", with_hw_preamble_crc=True): def __init__(self, phy, dw, endianness="big",
with_preamble_crc=True,
with_padding=True):
if dw < phy.dw: if dw < phy.dw:
raise ValueError("Core data width({}) must be larger than PHY data width({})".format(dw, phy.dw)) raise ValueError("Core data width({}) must be larger than PHY data width({})".format(dw, phy.dw))
@ -24,9 +26,9 @@ class LiteEthMACCore(Module, AutoCSR):
if isinstance(phy, LiteEthPHYSim): if isinstance(phy, LiteEthPHYSim):
# In simulation, avoid CRC/Preamble to enable direct connection # In simulation, avoid CRC/Preamble to enable direct connection
# to the Ethernet tap. # to the Ethernet tap.
self._hw_preamble_crc = CSRStatus(reset=1) self._preamble_crc = CSRStatus(reset=1)
elif with_hw_preamble_crc: elif with_preamble_crc:
self._hw_preamble_crc = CSRStatus(reset=1) self._preamble_crc = CSRStatus(reset=1)
# Preamble insert/check # Preamble insert/check
preamble_inserter = preamble.LiteEthMACPreambleInserter(phy.dw) preamble_inserter = preamble.LiteEthMACPreambleInserter(phy.dw)
preamble_checker = preamble.LiteEthMACPreambleChecker(phy.dw) preamble_checker = preamble.LiteEthMACPreambleChecker(phy.dw)
@ -43,13 +45,14 @@ class LiteEthMACCore(Module, AutoCSR):
rx_pipeline += [preamble_checker, crc32_checker] rx_pipeline += [preamble_checker, crc32_checker]
# Padding # Padding
padding_inserter = padding.LiteEthMACPaddingInserter(phy.dw, 60) if with_padding:
padding_checker = padding.LiteEthMACPaddingChecker(phy.dw, 60) padding_inserter = padding.LiteEthMACPaddingInserter(phy.dw, 60)
self.submodules += RenameClockDomains(padding_inserter, "eth_tx") padding_checker = padding.LiteEthMACPaddingChecker(phy.dw, 60)
self.submodules += RenameClockDomains(padding_checker, "eth_rx") self.submodules += RenameClockDomains(padding_inserter, "eth_tx")
self.submodules += RenameClockDomains(padding_checker, "eth_rx")
tx_pipeline += [padding_inserter] tx_pipeline += [padding_inserter]
rx_pipeline += [padding_checker] rx_pipeline += [padding_checker]
# Delimiters # Delimiters
if dw != 8: if dw != 8:

2
software/libnet/microudp.c
View File

@ -12,7 +12,7 @@
#define ETHERTYPE_ARP 0x0806 #define ETHERTYPE_ARP 0x0806
#define ETHERTYPE_IP 0x0800 #define ETHERTYPE_IP 0x0800
#ifdef CSR_ETHMAC_HW_PREAMBLE_CRC_ADDR #ifdef CSR_ETHMAC_PREAMBLE_CRC_ADDR
#define HW_PREAMBLE_CRC #define HW_PREAMBLE_CRC
#endif #endif