chipmunkmc/edl
1
0
Fork 0
mirror of https://github.com/bkerler/edl.git synced 2024-11-14 19:14:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix cmd issues with newer sm83xx

Browse source
This commit is contained in:
Bjoern Kerler 2021-12-19 00:28:54 +01:00
parent de18ba842c
commit 880f88f2c9
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
edlclient/Library/firehose.py
View file

@ -216,7 +216,7 @@ class firehose(metaclass=LogBase):
resp = {"value": "NAK"} resp = {"value": "NAK"}
status = False status = False
if not skipresponse: if not skipresponse:
while b"<response" not in rdata: while b"<response value" not in rdata:
try: try:
tmp = self.cdc.read(self.cfg.MaxXMLSizeInBytes) tmp = self.cdc.read(self.cfg.MaxXMLSizeInBytes)
if tmp == b"" in rdata: if tmp == b"" in rdata:
@ -581,9 +581,9 @@ class firehose(metaclass=LogBase):
show_progress = progbar.show_progress show_progress = progbar.show_progress
usb_read = self.cdc.read usb_read = self.cdc.read
progbar.show_progress(prefix="Read", pos=0, total=total, display=display) progbar.show_progress(prefix="Read", pos=0, total=total, display=display)
wMaxPacketSize = self.cdc.EP_IN.wMaxPacketSize
while bytestoread > 0: while bytestoread > 0:
data = usb_read(min(wMaxPacketSize, bytestoread)) size=min(self.cfg.MaxPayloadSizeToTargetInBytes, bytestoread)
data = usb_read(size)
wr.write(data) wr.write(data)
bytestoread -= len(data) bytestoread -= len(data)
show_progress(prefix="Read", pos=total - bytestoread, total=total, display=display) show_progress(prefix="Read", pos=total - bytestoread, total=total, display=display)
@ -704,8 +704,8 @@ class firehose(metaclass=LogBase):
sectors += 1 sectors += 1
if sectors == 0: if sectors == 0:
return None, None return None, None
if sectors > 34: if sectors > 64:
sectors = 34 sectors = 64
data = self.cmd_read_buffer(lun, 0, sectors, False) data = self.cmd_read_buffer(lun, 0, sectors, False)
if data == b"": if data == b"":
return None, None return None, None
@ -766,6 +766,7 @@ class firehose(metaclass=LogBase):
f"ZLPAwareHost=\"{str(self.cfg.ZLPAwareHost)}\" " + \ f"ZLPAwareHost=\"{str(self.cfg.ZLPAwareHost)}\" " + \
f"SkipStorageInit=\"{str(int(self.cfg.SkipStorageInit))}\" " + \ f"SkipStorageInit=\"{str(int(self.cfg.SkipStorageInit))}\" " + \
f"SkipWrite=\"{str(int(self.cfg.SkipWrite))}\" " + \ f"SkipWrite=\"{str(int(self.cfg.SkipWrite))}\" " + \
f"Verbose=\"True\" " + \
f"MaxPayloadSizeToTargetInBytes=\"{str(self.cfg.MaxPayloadSizeToTargetInBytes)}\"/>" + \ f"MaxPayloadSizeToTargetInBytes=\"{str(self.cfg.MaxPayloadSizeToTargetInBytes)}\"/>" + \
"</data>" "</data>"
''' '''

6
edlclient/Library/usblib.py
View file

@ -398,14 +398,16 @@ class UsbClass(metaclass=LogBase):
self.verify_data(bytearray(command), "TX:") self.verify_data(bytearray(command), "TX:")
return True return True
def read(self, length=0x80, timeout=None): def read(self, length=None, timeout=None):
if length is None:
length=self.EP_IN.wMaxPacketSize
if self.loglevel==logging.DEBUG: if self.loglevel==logging.DEBUG:
self.debug(inspect.currentframe().f_back.f_code.co_name + ":" + hex(length)) self.debug(inspect.currentframe().f_back.f_code.co_name + ":" + hex(length))
tmp = bytearray() tmp = bytearray()
extend = tmp.extend extend = tmp.extend
if timeout is None: if timeout is None:
timeout = self.timeout timeout = self.timeout
buffer = self.buffer buffer = self.buffer[:length]
ep_read = self.EP_IN.read ep_read = self.EP_IN.read
while len(tmp) == 0: while len(tmp) == 0:
try: try: