chipmunkmc/mtkclient
1
0
Fork 0
mirror of https://github.com/bkerler/mtkclient.git synced 2025-02-25 22:14:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve error output

Browse source
This commit is contained in:
Bjoern Kerler 2021-09-03 11:29:47 +02:00
parent 9cac0a38eb
commit 25cd4e2b6e
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
mtkclient/Library/mtk_daxflash.py
View file

@ -222,10 +222,14 @@ class DAXFlash(metaclass=LogBase):
def status(self):
status = None
bytestoread = 4 + 4 + 4
hdr = self.usbread(bytestoread)
magic, datatype, length = unpack("<III", hdr)
try:
hdr = self.usbread(bytestoread)
magic, datatype, length = unpack("<III", hdr)
except Exception as err:
self.error("Status error: "+str(err))
return -1
if magic != 0xFEEEEEEF:
self.error("Status error")
self.error("Status error: Wrong magic")
return -1
tmp = self.usbread(length)
try:
@ -300,8 +304,12 @@ class DAXFlash(metaclass=LogBase):
if self.send(self.Cmd.INIT_EXT_RAM):
status=self.status()
if status==0:
if self.send(pack("<I", len(emi))):
return self.send_param([emi])
try:
if self.send(pack("<I", len(emi))):
return self.send_param([emi])
except Exception as err:
self.error(f"Error on sending emi: {str(err)}")
return False
else:
self.error(f"Error on sending emi: {self.eh.status(status)}")
return False
@ -997,6 +1005,7 @@ class DAXFlash(metaclass=LogBase):
if self.daconfig.emi is None:
self.info("No preloader given. Searching for preloader")
found = False
self.info("Sending emi data ...")
for root, dirs, files in os.walk(os.path.join(self.pathconfig.get_loader_path(), 'Preloader')):
for file in files:
with open(os.path.join(root, file), "rb") as rf:
@ -1015,6 +1024,7 @@ class DAXFlash(metaclass=LogBase):
if not found:
self.warning("No preloader given. Operation may fail due to missing dram setup.")
else:
self.info("Sending emi data ...")
if not self.send_emi(self.daconfig.emi):
return False
elif connagent == b"preloader":