diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-16 18:14:59 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-04-24 17:54:08 -0700 |
| commit | 13f5c75ac49d88bd1d1f45e798a5e75b6426aa81 (patch) | |
| tree | 8f8e4021f34dca2551aca707f41b8ef3c509d444 /core/btdiscovery.cpp | |
| parent | c07faa90f33fac895e8a0b3326adb298a1845063 (diff) | |
| download | subsurface-13f5c75ac49d88bd1d1f45e798a5e75b6426aa81.tar.gz | |
Convert our custom IO model to new libdivecomputer IO model
This converts our old custom IO model to the new model that
libdivecomputer introduced. This is partly based on Jef's rough patch
to make things build, with further work by me.
The FTDI code is temporarily disabled here, because it will need to be
integrated with the new way of opening devices.
The ble_serial code goes away entirely, since now libdivecomputer knows
about BLE transport natively, and doesn't need to have any serial
wrapper around it.
Signed-off-by: Jef Driesen <jef@libdivecomputer.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'core/btdiscovery.cpp')
| -rw-r--r-- | core/btdiscovery.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp index 254088ec1..5fa6a7c80 100644 --- a/core/btdiscovery.cpp +++ b/core/btdiscovery.cpp @@ -127,9 +127,7 @@ BTDiscovery *BTDiscovery::instance() } #if defined(BT_SUPPORT) -#if defined(SSRF_CUSTOM_IO) extern void addBtUuid(QBluetoothUuid uuid); -#endif extern QHash<QString, QStringList> productList; extern QStringList vendorList; @@ -151,7 +149,6 @@ QString markBLEAddress(const QBluetoothDeviceInfo *device) void BTDiscovery::btDeviceDiscovered(const QBluetoothDeviceInfo &device) { -#if defined(SSRF_CUSTOM_IO) btPairedDevice this_d; this_d.address = markBLEAddress(&device); this_d.name = device.name(); @@ -173,7 +170,6 @@ void BTDiscovery::btDeviceDiscovered(const QBluetoothDeviceInfo &device) #endif btDeviceDiscoveredMain(this_d); -#endif } void BTDiscovery::btDeviceDiscoveredMain(const btPairedDevice &device) |