From add253ca9eee79f97de5bfd25a456102f49bef86 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 18 Jun 2017 15:50:37 +0900 Subject: Convert to new libdivecomputer custom IO model Instead of being "custom serial", it's a IO model that allows serial or packet modes, independently of each other (ie you can have a bluetooth device that does serial over BT rfcomm and packet-based communication over BLE GATT with the same serial operations that describe both cases). Signed-off-by: Linus Torvalds --- core/configuredivecomputer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/configuredivecomputer.cpp') 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 } -- cgit v1.2.3-70-g09d2