Hardware/liteeth
1
0
Fork 0
mirror of https://github.com/enjoy-digital/liteeth.git synced 2025-01-03 03:43:37 -05:00
Code Issues Projects Releases Packages Wiki Activity

liteeth_gen: Move MAC/IP address configuration to Config section and add dynamic UDP port support.

Browse source
This commit is contained in:
Florent Kermarrec 2022-01-26 10:53:23 +01:00
parent e0124748aa
commit 2beec096b4
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
liteeth/gen.py
View file

@ -129,6 +129,7 @@ _io = [
),
# UDP
("udp_port", 0, Pins(16)),
("udp_sink", 0,
# Control
Subsignal("valid", Pins(1)),
@ -260,16 +261,31 @@ class MACCore(PHYCore):
class UDPCore(PHYCore):
def __init__(self, platform, core_config):
# Config -----------------------------------------------------------------------------------
# MAC Address.
mac_address = core_config.get("mac_address", None)
# Get MAC Address from IOs when not specified.
if mac_address is None:
mac_address = platform.request("mac_address")
# IP Address.
ip_address = core_config.get("ip_address", None)
# Get IP Address from IOs when not specified.
if ip_address is None:
ip_address = platform.request("ip_address")
# UDP Port.
port = core_config.get("port", None)
# Get UDP Port from IOs when not specified.
if port is None:
port = Signal()
port = platform.request("udp_port")
# PHY --------------------------------------------------------------------------------------
PHYCore.__init__(self, platform, core_config)
# Core -------------------------------------------------------------------------------------
mac_address = core_config.get("mac_address", None)
if mac_address is None:
mac_address = platform.request("mac_address") # Get MAC Address from IOs when not specified.
ip_address = core_config.get("ip_address", None)
if ip_address is None:
ip_address = platform.request("ip_address") # Get IP Address from IOs when not specified.
self.submodules.core = LiteEthUDPIPCore(self.ethphy,
mac_address = mac_address,
ip_address = ip_address,
@ -277,8 +293,9 @@ class UDPCore(PHYCore):
)
# UDP --------------------------------------------------------------------------------------
udp_port = self.core.udp.crossbar.get_port(core_config["port"], 8)
# XXX avoid manual connect
udp_port = self.core.udp.crossbar.get_port(port, 8)
# Connect UDP Sink IOs to UDP Port.
udp_sink = self.platform.request("udp_sink")
self.comb += [
# Control
@ -296,6 +313,8 @@ class UDPCore(PHYCore):
udp_port.sink.data.eq(udp_sink.data),
udp_port.sink.error.eq(udp_sink.error)
]
# Connect UDP Port to UDP Source IOs.
udp_source = self.platform.request("udp_source")
self.comb += [
# Control