diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 15:50:37 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-22 08:43:47 -0700 |
| commit | add253ca9eee79f97de5bfd25a456102f49bef86 (patch) | |
| tree | 3f2d04b6786fb4e2b57d41bd1adef78bf5c2b5ff /core/libdivecomputer.h | |
| parent | fc8068c57446d6db54e8f32215d6aee6f295e28f (diff) | |
| download | subsurface-add253ca9eee79f97de5bfd25a456102f49bef86.tar.gz | |
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 <torvalds@linux-foundation.org>
Diffstat (limited to 'core/libdivecomputer.h')
| -rw-r--r-- | core/libdivecomputer.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/libdivecomputer.h b/core/libdivecomputer.h index 19f09fdfa..a618f49f2 100644 --- a/core/libdivecomputer.h +++ b/core/libdivecomputer.h @@ -11,8 +11,8 @@ #include <libdivecomputer/version.h> #include <libdivecomputer/device.h> #include <libdivecomputer/parser.h> -#ifdef SSRF_CUSTOM_SERIAL -#include <libdivecomputer/custom_serial.h> +#ifdef SSRF_CUSTOM_IO +#include <libdivecomputer/custom_io.h> #endif #include "dive.h" @@ -56,12 +56,12 @@ extern double progress_bar_fraction; extern char *logfile_name; extern char *dumpfile_name; -#if SSRF_CUSTOM_SERIAL +#if SSRF_CUSTOM_IO // WTF. this symbol never shows up at link time -//extern dc_custom_serial_t qt_serial_ops; +//extern dc_custom_io_t qt_serial_ops; // Thats why I've worked around it with a stupid helper returning it. -dc_custom_serial_t* get_qt_serial_ops(); -extern dc_custom_serial_t serial_ftdi_ops; +dc_custom_io_t* get_qt_serial_ops(); +extern dc_custom_io_t serial_ftdi_ops; #endif #ifdef __cplusplus |