diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-27 10:32:14 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-27 22:10:38 -0700 |
| commit | 270e9eccad8644352f5ae07df8b6acb55b115361 (patch) | |
| tree | 0b6aaee8221fc2c12d9b084e42179e1a2d9633f0 /core/downloadfromdcthread.cpp | |
| parent | bb067b6ee4828fc2444395d4cfda80831c4721bb (diff) | |
| download | subsurface-270e9eccad8644352f5ae07df8b6acb55b115361.tar.gz | |
Make device enumeration use the device transport data
This removes some special-case code for Uemis, replacing it with simply
passing in the device transport information.
This makes device enumeration work for the Garmin Descent (if it is
listed by libdivecomputer as a USB storage device, that is).
I don't actually do any of the libdivecomputer parsing yet, and only
have a stub for the Garmin Descent, but now the directory selection
works with that stub. The actual download obviously does not.
[Dirk Hohndel: removed obsolete FIXME from code]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/downloadfromdcthread.cpp')
| -rw-r--r-- | core/downloadfromdcthread.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/downloadfromdcthread.cpp b/core/downloadfromdcthread.cpp index da8c09f54..6f957579c 100644 --- a/core/downloadfromdcthread.cpp +++ b/core/downloadfromdcthread.cpp @@ -158,6 +158,7 @@ void fill_computer_list() mydescriptor->product = "Zurich"; mydescriptor->type = DC_FAMILY_NULL; mydescriptor->model = 0; + mydescriptor->transports = DC_TRANSPORT_USBSTORAGE; if (!vendorList.contains("Uemis")) vendorList.append("Uemis"); @@ -171,14 +172,15 @@ void fill_computer_list() qSort(vendorList); } -#define NUMTRANSPORTS 6 +#define NUMTRANSPORTS 7 static QString transportStringTable[NUMTRANSPORTS] = { QStringLiteral("SERIAL"), QStringLiteral("USB"), QStringLiteral("USBHID"), QStringLiteral("IRDA"), QStringLiteral("BT"), - QStringLiteral("BLE") + QStringLiteral("BLE"), + QStringLiteral("USBSTORAGE"), }; static QString getTransportString(unsigned int transport) |