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 /desktop-widgets/configuredivecomputerdialog.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 'desktop-widgets/configuredivecomputerdialog.cpp')
| -rw-r--r-- | desktop-widgets/configuredivecomputerdialog.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp index ed6c2d712..c23dfb8ab 100644 --- a/desktop-widgets/configuredivecomputerdialog.cpp +++ b/desktop-widgets/configuredivecomputerdialog.cpp @@ -398,11 +398,11 @@ static void fillDeviceList(const char *name, void *data) comboBox->addItem(name); } -void ConfigureDiveComputerDialog::fill_device_list(int dc_type) +void ConfigureDiveComputerDialog::fill_device_list(unsigned int transport) { int deviceIndex; ui.device->clear(); - deviceIndex = enumerate_devices(fillDeviceList, ui.device, dc_type); + deviceIndex = enumerate_devices(fillDeviceList, ui.device, transport); if (deviceIndex >= 0) ui.device->setCurrentIndex(deviceIndex); } @@ -1445,12 +1445,12 @@ void ConfigureDiveComputerDialog::on_DiveComputerList_currentRowChanged(int curr return; } - int dcType = DC_TYPE_SERIAL; + unsigned int transport = DC_TRANSPORT_SERIAL; if (selected_vendor == QString("Uemis")) - dcType = DC_TYPE_UEMIS; - fill_device_list(dcType); + transport = DC_TRANSPORT_USBSTORAGE; + fill_device_list(transport); } void ConfigureDiveComputerDialog::checkLogFile(int state) |