chipmunkmc/edl
1
0
Fork 0
mirror of https://github.com/bkerler/edl.git synced 2024-12-18 03:43:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #438 from NextAlone/master

Browse source 
feat: usb device serial number support in memory dump mode
This commit is contained in:
Bjoern Kerler 2023-09-20 15:17:53 +02:00 committed by GitHub
commit 356ab5e3a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
edl
View file

@ -15,7 +15,7 @@ Usage:
edl [--gpt-num-part-entries=number] [--gpt-part-entry-size=number] [--gpt-part-entry-start-lba=number] [--portname=portname] [--serial] edl [--gpt-num-part-entries=number] [--gpt-part-entry-size=number] [--gpt-part-entry-start-lba=number] [--portname=portname] [--serial]
edl [--memory=memtype] [--skipstorageinit] [--maxpayload=bytes] [--sectorsize==bytes] [--portname=portname] [--serial] edl [--memory=memtype] [--skipstorageinit] [--maxpayload=bytes] [--sectorsize==bytes] [--portname=portname] [--serial]
edl server [--tcpport=portnumber] [--loader=filename] [--debugmode] [--skipresponse] [--vid=vid] [--pid=pid] [--devicemodel=value] [--skipstorageinit] [--portname=portname] [--serial] edl server [--tcpport=portnumber] [--loader=filename] [--debugmode] [--skipresponse] [--vid=vid] [--pid=pid] [--devicemodel=value] [--skipstorageinit] [--portname=portname] [--serial]
edl memorydump [--partitions=partnames] [--debugmode] [--vid=vid] [--pid=pid] [--portname=portname] [--serial] edl memorydump [--partitions=partnames] [--debugmode] [--vid=vid] [--pid=pid] [--portname=portname] [--serial] [--serial_number=serial_number]
edl printgpt [--memory=memtype] [--lun=lun] [--sectorsize==bytes] [--loader=filename] [--debugmode] [--skipresponse] [--vid=vid] [--pid=pid] [--skipstorageinit] [--portname=portname] [--serial] edl printgpt [--memory=memtype] [--lun=lun] [--sectorsize==bytes] [--loader=filename] [--debugmode] [--skipresponse] [--vid=vid] [--pid=pid] [--skipstorageinit] [--portname=portname] [--serial]
edl gpt <directory> [--memory=memtype] [--lun=lun] [--genxml] [--loader=filename] [--skipresponse] [--debugmode] [--vid=vid] [--pid=pid] [--skipstorageinit] [--portname=portname] [--serial] edl gpt <directory> [--memory=memtype] [--lun=lun] [--genxml] [--loader=filename] [--skipresponse] [--debugmode] [--vid=vid] [--pid=pid] [--skipstorageinit] [--portname=portname] [--serial]
edl r <partitionname> <filename> [--memory=memtype] [--sectorsize==bytes] [--lun=lun] [--loader=filename] [--skipresponse] [--debugmode] [--vid=vid] [--pid=pid] [--skipstorageinit] [--portname=portname] [--serial] edl r <partitionname> <filename> [--memory=memtype] [--sectorsize==bytes] [--lun=lun] [--loader=filename] [--skipresponse] [--debugmode] [--vid=vid] [--pid=pid] [--skipstorageinit] [--portname=portname] [--serial]
@ -192,6 +192,7 @@ class main(metaclass=LogBase):
self.sahara = None self.sahara = None
self.vid = None self.vid = None
self.pid = None self.pid = None
self.serial_number = None
def doconnect(self, loop) -> dict: def doconnect(self, loop) -> dict:
while not self.cdc.connected: while not self.cdc.connected:
@ -288,7 +289,9 @@ class main(metaclass=LogBase):
if self.serial: if self.serial:
self.cdc = serial_class(loglevel=self.__logger.level, portconfig=portconfig) self.cdc = serial_class(loglevel=self.__logger.level, portconfig=portconfig)
else: else:
self.cdc = usb_class(portconfig=portconfig, loglevel=self.__logger.level) if args["--serial_number"]:
self.serial_number = args["--serial_number"]
self.cdc = usb_class(portconfig=portconfig, loglevel=self.__logger.level, serial_number=self.serial_number)
self.sahara = sahara(self.cdc, loglevel=self.__logger.level) self.sahara = sahara(self.cdc, loglevel=self.__logger.level)

7
edlclient/Library/Connection/usblib.py
View file

@ -66,8 +66,9 @@ CDC_CMDS = {
class usb_class(DeviceClass): class usb_class(DeviceClass):
def __init__(self, loglevel=logging.INFO, portconfig=None, devclass=-1): def __init__(self, loglevel=logging.INFO, portconfig=None, devclass=-1, serial_number=None):
super().__init__(loglevel, portconfig, devclass) super().__init__(loglevel, portconfig, devclass)
self.serial_number = serial_number
self.load_windows_dll() self.load_windows_dll()
self.EP_IN = None self.EP_IN = None
self.EP_OUT = None self.EP_OUT = None
@ -219,9 +220,13 @@ class usb_class(DeviceClass):
for dev in devices: for dev in devices:
for usbid in self.portconfig: for usbid in self.portconfig:
if dev.idProduct == usbid[1] and dev.idVendor == usbid[0]: if dev.idProduct == usbid[1] and dev.idVendor == usbid[0]:
if self.serial_number is not None:
if dev.serial_number != self.serial_number:
continue
self.device = dev self.device = dev
self.vid = dev.idVendor self.vid = dev.idVendor
self.pid = dev.idProduct self.pid = dev.idProduct
self.serial_number = dev.serial_number
self.interface = usbid[2] self.interface = usbid[2]
break break
if self.device is not None: if self.device is not None: