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

tools/remote/comm_udp: revert try/except (was probably needed with CommUDP's max_length = 4).

This commit is contained in:
Florent Kermarrec 2020-11-09 16:36:04 +01:00
parent 5aa70d975c
commit 221ea4c31a
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
litex/tools/remote/comm_udp.py
View File

@ -22,7 +22,6 @@ class CommUDP:
return return
self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
self.socket.bind(("", self.port)) self.socket.bind(("", self.port))
self.socket.settimeout(1)
def close(self): def close(self):
if not hasattr(self, "socket"): if not hasattr(self, "socket"):
@ -41,22 +40,16 @@ class CommUDP:
packet.records = [record] packet.records = [record]
packet.encode() packet.encode()
try: self.socket.sendto(bytes(packet), (self.server, self.port))
self.socket.sendto(bytes(packet), (self.server, self.port))
datas, dummy = self.socket.recvfrom(8192) datas, dummy = self.socket.recvfrom(8192)
packet = EtherbonePacket(datas) packet = EtherbonePacket(datas)
packet.decode() packet.decode()
datas = packet.records.pop().writes.get_datas() datas = packet.records.pop().writes.get_datas()
if self.debug: if self.debug:
for i, value in enumerate(datas): for i, value in enumerate(datas):
print("read {:08x} @ {:08x}".format(value, addr + 4*i)) print("read {:08x} @ {:08x}".format(value, addr + 4*i))
return datas[0] if length is None else datas return datas[0] if length is None else datas
except Exception as ex:
print("commUDP read: exception ({})".format(ex))
self.close()
self.open()
return []
def write(self, addr, datas): def write(self, addr, datas):
datas = datas if isinstance(datas, list) else [datas] datas = datas if isinstance(datas, list) else [datas]
@ -69,14 +62,8 @@ class CommUDP:
packet.records = [record] packet.records = [record]
packet.encode() packet.encode()
try: self.socket.sendto(bytes(packet), (self.server, self.port))
self.socket.sendto(bytes(packet), (self.server, self.port))
if self.debug:
for i, value in enumerate(datas):
print("write {:08x} @ {:08x}".format(value, addr + 4*i))
except Exception as ex:
print("commUDP write: exception ({})".format(ex))
self.close()
self.open()
if self.debug:
for i, value in enumerate(datas):
print("write {:08x} @ {:08x}".format(value, addr + 4*i))