arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-30 11:28:21 +00:00
Code Issues Releases Wiki Activity

Reworked handling of DEVICE_IDS

Browse Source
This commit is contained in:
slush0 2016-06-27 15:54:24 +02:00
parent 97ce804cb7
commit 58fd1bb512
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
trezorlib/transport_hid.py
View File

@ -21,7 +21,7 @@ def enumerate():
if devices.get(serial_number) != None and devices[serial_number][0] == path: if devices.get(serial_number) != None and devices[serial_number][0] == path:
raise Exception("Two devices with the same path and S/N found. This is Mac, right? :-/") raise Exception("Two devices with the same path and S/N found. This is Mac, right? :-/")
if (vendor_id, product_id) in [ x[0:2] for x in DEVICE_IDS]: if (vendor_id, product_id) in DEVICE_IDS:
devices.setdefault(serial_number, [None, None]) devices.setdefault(serial_number, [None, None])
if interface_number == 0 or interface_number == -1: # normal link if interface_number == 0 or interface_number == -1: # normal link
devices[serial_number][0] = path devices[serial_number][0] = path
@ -38,9 +38,8 @@ def path_to_transport(path):
raise ConnectionError("Connection failed") raise ConnectionError("Connection failed")
# VID/PID found, let's find proper transport # VID/PID found, let's find proper transport
vid, pid = device['vendor_id'], device['product_id']
try: try:
transport = [ transport for (_vid, _pid, transport) in DEVICE_IDS if _vid == vid and _pid == pid ][0] transport = DEVICE_TRANSPORTS[(device['vendor_id'], device['product_id'])]
except IndexError: except IndexError:
raise Exception("Unknown transport for VID:PID %04x:%04x" % (vid, pid)) raise Exception("Unknown transport for VID:PID %04x:%04x" % (vid, pid))
@ -124,11 +123,17 @@ class HidTransportV2(_HidTransport, TransportV2):
pass pass
DEVICE_IDS = [ DEVICE_IDS = [
(0x534c, 0x0001, HidTransportV1), # TREZOR (0x534c, 0x0001), # TREZOR
(0x1209, 0x53C0, HidTransportV2), # TREZORv2 Bootloader (0x1209, 0x53C0), # TREZORv2 Bootloader
(0x1209, 0x53C1, HidTransportV2), # TREZORv2 (0x1209, 0x53C1), # TREZORv2
] ]
DEVICE_TRANSPORTS = {
(0x534c, 0x0001): HidTransportV1, # TREZOR
(0x1209, 0x53C0): HidTransportV2, # TREZORv2 Bootloader
(0x1209, 0x53C1): HidTransportV2, # TREZORv2
}
# Backward compatible wrapper, decides for proper transport # Backward compatible wrapper, decides for proper transport
# based on VID/PID of given path # based on VID/PID of given path
def HidTransport(device, *args, **kwargs): def HidTransport(device, *args, **kwargs):