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

soc/tools/litex_term: remove write_exact, use more bytes

This commit is contained in:
Florent Kermarrec 2016-02-19 00:20:10 +01:00
parent 4bdefbdfba
commit ed2e623994
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
litex/soc/tools/litex_term.py
View File

@ -32,8 +32,8 @@ else:
sfl_magic_len = 14 sfl_magic_len = 14
sfl_magic_req = "sL5DdSMmkekro\n" sfl_magic_req = bytes("sL5DdSMmkekro\n", "utf-8")
sfl_magic_ack = "z6IHG7cYDID6o\n" sfl_magic_ack = bytes("z6IHG7cYDID6o\n", "utf-8")
# General commands # General commands
sfl_cmd_abort = 0x00 sfl_cmd_abort = 0x00
@ -126,7 +126,7 @@ class LiteXTerm:
self.reader_alive = False self.reader_alive = False
self.writer_alive = False self.writer_alive = False
self.detect_magic_str = " "*len(sfl_magic_req) self.detect_magic_bytes = bytearray([0 for i in range(len(sfl_magic_req))])
def open(self, port, speed): def open(self, port, speed):
self.serial = serial.serial_for_url( self.serial = serial.serial_for_url(
@ -145,17 +145,11 @@ class LiteXTerm:
def close(self): def close(self):
self.serial.close() self.serial.close()
def write_exact(self, data):
if isinstance(data, str):
self.serial.write(bytes(data, "utf-8"))
else:
self.serial.write(serial.to_bytes(data))
def send_frame(self, frame): def send_frame(self, frame):
frame.encode() frame.encode()
retry = 1 retry = 1
while retry: while retry:
self.write_exact(frame.raw) self.serial.write(frame.raw)
# Get the reply from the device # Get the reply from the device
reply = self.serial.read().decode() reply = self.serial.read().decode()
if reply == sfl_ack_success: if reply == sfl_ack_success:
@ -208,16 +202,16 @@ class LiteXTerm:
self.send_frame(frame) self.send_frame(frame)
def detect_magic(self, data): def detect_magic(self, data):
if data is not "": if len(data):
self.detect_magic_str = self.detect_magic_str[1:] + data self.detect_magic_bytes = self.detect_magic_bytes[1:] + data
return self.detect_magic_str == sfl_magic_req return self.detect_magic_bytes == sfl_magic_req
else: else:
return False return False
def answer_magic(self): def answer_magic(self):
print("[TERM] Received firmware download request from the device.") print("[TERM] Received firmware download request from the device.")
if os.path.exists(self.kernel_image): if os.path.exists(self.kernel_image):
self.write_exact(sfl_magic_ack) self.serial.write(sfl_magic_ack)
self.upload(self.kernel_image, self.kernel_address) self.upload(self.kernel_image, self.kernel_address)
self.boot() self.boot()
print("[TERM] Done."); print("[TERM] Done.");
@ -233,7 +227,7 @@ class LiteXTerm:
sys.stdout.flush() sys.stdout.flush()
if self.kernel_image is not None: if self.kernel_image is not None:
if self.detect_magic(c): if self.detect_magic(bytes(c, "utf-8")):
self.answer_magic() self.answer_magic()
except serial.SerialException: except serial.SerialException: