From 6b0a9251c07568991de182f84004bd88564a57da Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 21 Nov 2019 10:02:15 +0100 Subject: [PATCH] global: keep up to date with LiteX (update stream_packet import to packet) Retro-compatibily was ensure by LiteX but update it. --- liteeth/common.py | 2 +- liteeth/core/arp.py | 2 +- liteeth/core/icmp.py | 2 +- liteeth/core/ip.py | 2 +- liteeth/core/udp.py | 2 +- liteeth/crossbar.py | 2 +- liteeth/frontend/etherbone.py | 2 +- liteeth/mac/common.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/liteeth/common.py b/liteeth/common.py index ef8e08e..b1f5500 100644 --- a/liteeth/common.py +++ b/liteeth/common.py @@ -11,7 +11,7 @@ from litex.soc.interconnect import stream from litex.soc.interconnect.stream import EndpointDescription from litex.soc.interconnect.csr import * -from litex.soc.interconnect.stream_packet import Header, HeaderField +from litex.soc.interconnect.packet import Header, HeaderField class Port: diff --git a/liteeth/core/arp.py b/liteeth/core/arp.py index ce33d08..fe790e2 100644 --- a/liteeth/core/arp.py +++ b/liteeth/core/arp.py @@ -5,7 +5,7 @@ from liteeth.common import * from migen.genlib.misc import WaitTimer -from litex.soc.interconnect.stream_packet import Depacketizer, Packetizer +from litex.soc.interconnect.packet import Depacketizer, Packetizer _arp_table_layout = [ diff --git a/liteeth/core/icmp.py b/liteeth/core/icmp.py index 53d55b4..4445d89 100644 --- a/liteeth/core/icmp.py +++ b/liteeth/core/icmp.py @@ -3,7 +3,7 @@ from liteeth.common import * -from litex.soc.interconnect.stream_packet import Depacketizer, Packetizer +from litex.soc.interconnect.packet import Depacketizer, Packetizer # icmp tx diff --git a/liteeth/core/ip.py b/liteeth/core/ip.py index b041ec8..cb6caf8 100644 --- a/liteeth/core/ip.py +++ b/liteeth/core/ip.py @@ -4,7 +4,7 @@ from liteeth.common import * from liteeth.crossbar import LiteEthCrossbar -from litex.soc.interconnect.stream_packet import Depacketizer, Packetizer +from litex.soc.interconnect.packet import Depacketizer, Packetizer # ip crossbar diff --git a/liteeth/core/udp.py b/liteeth/core/udp.py index 32b49be..a79e034 100644 --- a/liteeth/core/udp.py +++ b/liteeth/core/udp.py @@ -5,7 +5,7 @@ from liteeth.common import * from liteeth.crossbar import LiteEthCrossbar from litex.soc.interconnect import stream -from litex.soc.interconnect.stream_packet import Depacketizer, Packetizer +from litex.soc.interconnect.packet import Depacketizer, Packetizer # udp crossbar diff --git a/liteeth/crossbar.py b/liteeth/crossbar.py index b053dbb..24e1a20 100644 --- a/liteeth/crossbar.py +++ b/liteeth/crossbar.py @@ -5,7 +5,7 @@ from collections import OrderedDict from liteeth.common import * -from litex.soc.interconnect.stream_packet import Arbiter, Dispatcher +from litex.soc.interconnect.packet import Arbiter, Dispatcher class LiteEthCrossbar(Module): diff --git a/liteeth/frontend/etherbone.py b/liteeth/frontend/etherbone.py index c744c89..f3daa3f 100644 --- a/liteeth/frontend/etherbone.py +++ b/liteeth/frontend/etherbone.py @@ -15,7 +15,7 @@ and introduces some limitations: from liteeth.common import * from litex.soc.interconnect import wishbone -from litex.soc.interconnect.stream_packet import * +from litex.soc.interconnect.packet import * # etherbone packet diff --git a/liteeth/mac/common.py b/liteeth/mac/common.py index 0edc644..e853395 100644 --- a/liteeth/mac/common.py +++ b/liteeth/mac/common.py @@ -4,7 +4,7 @@ from liteeth.common import * from liteeth.crossbar import LiteEthCrossbar -from litex.soc.interconnect.stream_packet import Depacketizer, Packetizer +from litex.soc.interconnect.packet import Depacketizer, Packetizer class LiteEthMACDepacketizer(Depacketizer):