diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-06-22 17:41:21 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-06-22 17:41:21 -0700 |
| commit | d58de3716718207b9fe53fdd451c9d1e35bff38a (patch) | |
| tree | 7d0901e1d3d61366cad296c2440c541ea67867ff /core/configuredivecomputer.cpp | |
| parent | 83e56cbfa6935ae6ea53911d1bee478749142c77 (diff) | |
| parent | add253ca9eee79f97de5bfd25a456102f49bef86 (diff) | |
| download | subsurface-d58de3716718207b9fe53fdd451c9d1e35bff38a.tar.gz | |
Merge branch 'master' of git://github.com/torvalds/subsurface-for-dirk
Diffstat (limited to 'core/configuredivecomputer.cpp')
| -rw-r--r-- | core/configuredivecomputer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/configuredivecomputer.cpp b/core/configuredivecomputer.cpp index 730cec25b..2b6d3da16 100644 --- a/core/configuredivecomputer.cpp +++ b/core/configuredivecomputer.cpp @@ -632,14 +632,14 @@ QString ConfigureDiveComputer::dc_open(device_data_t *data) dc_context_set_logfunc(data->context, logfunc, fp); } -#if defined(SSRF_CUSTOM_SERIAL) +#if defined(SSRF_CUSTOM_IO) if (data->bluetooth_mode) { -#if defined(BT_SUPPORT) && defined(SSRF_CUSTOM_SERIAL) - rc = dc_context_set_custom_serial(data->context, get_qt_serial_ops()); +#if defined(BT_SUPPORT) && defined(SSRF_CUSTOM_IO) + rc = dc_context_set_custom_io(data->context, get_qt_serial_ops()); #endif #ifdef SERIAL_FTDI } else if (!strcmp(data->devname, "ftdi")) { - rc = dc_context_set_custom_serial(data->context, &serial_ftdi_ops); + rc = dc_context_set_custom_io(data->context, &serial_ftdi_ops); #endif } |