clean up

liteeth/__init__.py

@@ -1,6 +1,4 @@
 from liteeth.common import *
-from liteeth.generic.arbiter import Arbiter
-from liteeth.generic.dispatcher import Dispatcher
 from liteeth.mac import LiteEthMAC
 from liteeth.arp import LiteEthARP
 from liteeth.ip import LiteEthIP

liteeth/mac/__init__.py

@@ -37,7 +37,7 @@ class LiteEthMAC(Module, AutoCSR):
 				Record.connect(self.depacketizer.source, self.crossbar.master.sink)
 			]
 		elif interface == "wishbone":
-			self.submodules.interface = wishbone.LiteEthMACWishboneInterface(dw, 2, 2)
+			self.submodules.interface = LiteEthMACWishboneInterface(dw, 2, 2)
 			self.comb += [
 				Record.connect(self.interface.source, self.core.sink),
 				Record.connect(self.core.source, self.interface.sink)

liteeth/mac/core/__init__.py

@@ -1,5 +1,4 @@
 from liteeth.common import *
-from liteeth.mac.common import *
 from liteeth.mac.core import preamble, crc, last_be
 
 class LiteEthMACCore(Module, AutoCSR):

liteeth/mac/core/crc.py

@@ -1,5 +1,4 @@
 from liteeth.common import *
-from liteeth.mac.common import *
 
 class LiteEthMACCRCEngine(Module):
 	"""Cyclic Redundancy Check Engine

liteeth/mac/core/last_be.py

@@ -1,5 +1,4 @@
 from liteeth.common import *
-from liteeth.mac.common import *
 
 class LiteEthMACTXLastBE(Module):
 	def __init__(self, dw):

liteeth/mac/core/preamble.py

@@ -1,5 +1,4 @@
 from liteeth.common import *
-from liteeth.mac.common import *
 
 class LiteEthMACPreambleInserter(Module):
 	def __init__(self, dw):

liteeth/mac/frontend/sram.py

@@ -1,5 +1,4 @@
 from liteeth.common import *
-from liteeth.mac.common import *
 
 from migen.bank.description import *
 from migen.bank.eventmanager import *

liteeth/mac/frontend/wishbone.py

@@ -1,5 +1,4 @@
 from liteeth.common import *
-from liteeth.mac.common import *
 from liteeth.mac.frontend import sram
 
 from migen.bus import wishbone

liteeth/test/arp_tb.py

@@ -15,9 +15,9 @@ mac_address = 0x12345678abcd
 
 class TB(Module):
 	def __init__(self):
-		self.submodules.phy_model = phy.PHY(8, debug=True)
-		self.submodules.mac_model = mac.MAC(self.phy_model, debug=True, loopback=False)
-		self.submodules.arp_model = arp.ARP(self.mac_model, mac_address, ip_address, debug=True)
+		self.submodules.phy_model = phy.PHY(8, debug=False)
+		self.submodules.mac_model = mac.MAC(self.phy_model, debug=False, loopback=False)
+		self.submodules.arp_model = arp.ARP(self.mac_model, mac_address, ip_address, debug=False)
 
 		self.submodules.mac = LiteEthMAC(self.phy_model, dw=8, with_hw_preamble_crc=True)
 		self.submodules.arp = LiteEthARP(self.mac, mac_address, ip_address)

liteeth/test/mac_core_tb.py

@@ -12,7 +12,7 @@ from liteeth.test.model import phy, mac
 class TB(Module):
 	def __init__(self):
 		self.submodules.phy_model = phy.PHY(8, debug=False)
-		self.submodules.mac_model = mac.MAC(self.phy_model, debug=True, loopback=True)
+		self.submodules.mac_model = mac.MAC(self.phy_model, debug=False, loopback=True)
 		self.submodules.core = LiteEthMACCore(phy=self.phy_model, dw=8, with_hw_preamble_crc=True)
 
 		self.submodules.streamer = PacketStreamer(eth_phy_description(8), last_be=1)

liteeth/test/mac_wishbone_tb.py

@@ -115,7 +115,7 @@ class TB(Module):
 
 		while True:
 			for slot in range(2):
-				print("slot {}:".format(slot))
+				print("slot {}: ".format(slot), end="")
 				# fill tx memory
 				for i in range(length//4+1):
 					dat = int.from_bytes(tx_payload[4*i:4*(i+1)], "big")

liteeth/test/model/arp.py

@@ -1,7 +1,6 @@
-import math, binascii
+import math
 
 from liteeth.common import *
-from liteeth.mac.common import *
 from liteeth.test.common import *
 
 from liteeth.test.model import mac

liteeth/test/model/ip.py

@@ -1,7 +1,6 @@
-import math, binascii
+import math
 
 from liteeth.common import *
-from liteeth.mac.common import *
 from liteeth.test.common import *
 
 from liteeth.test.model import mac
@@ -91,7 +90,7 @@ if __name__ == "__main__":
 	packet = IPPacket(packet)
 	# check decoding
 	packet.decode()
-	print(packet)
+	#print(packet)
 	errors += verify_packet(packet, {})
 	# check encoding
 	packet.encode()

liteeth/test/model/mac.py

@@ -1,7 +1,6 @@
 import math, binascii
 
 from liteeth.common import *
-from liteeth.mac.common import *
 from liteeth.test.common import *
 
 def print_mac(s):

liteeth/test/model/phy.py

@@ -1,5 +1,4 @@
 from liteeth.common import *
-from liteeth.mac.common import *
 from liteeth.test.common import *
 
 def print_phy(s):