diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-17 15:57:04 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-04-24 17:54:08 -0700 |
| commit | acc343834ae416aa4a17a0cd508c8ddf31f8281d (patch) | |
| tree | a55bf94f0fa82cc56f1a2fd87afb2f84a2510fcb /core/configuredivecomputer.cpp | |
| parent | 13f5c75ac49d88bd1d1f45e798a5e75b6426aa81 (diff) | |
| download | subsurface-acc343834ae416aa4a17a0cd508c8ddf31f8281d.tar.gz | |
Actually tie in the new libdivecomputer IO model to open the dive computer device
This creates a new libdivecomputer_device_open() helper, and makes
downloading and configuration use it to open the dive computer device
using the proper protocol.
The IRDA case was tested by Sébastien Dugué - I had initially left it
undone believing that "nobody uses IRDA".
Reported-and-tested-by: Sébastien Dugué <sebastien.dugue.subsurface@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'core/configuredivecomputer.cpp')
| -rw-r--r-- | core/configuredivecomputer.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/configuredivecomputer.cpp b/core/configuredivecomputer.cpp index 6fef1eb21..ae0c882f5 100644 --- a/core/configuredivecomputer.cpp +++ b/core/configuredivecomputer.cpp @@ -635,11 +635,7 @@ QString ConfigureDiveComputer::dc_open(device_data_t *data) fprintf(data->libdc_logfile, "built with libdivecomputer v%s\n", dc_version(NULL)); } - if (data->bluetooth_mode) { -#if defined(BT_SUPPORT) - rc = ble_packet_open(&data->iostream, data->context, data->devname, data); -#endif - } + rc = divecomputer_device_open(data); if (rc != DC_STATUS_SUCCESS) { report_error(errmsg(rc)); |