diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-07-07 11:47:48 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-07-07 21:41:22 -0700 |
| commit | fa69a1b7d5655cef790f4bf78f43d322ba78e3d3 (patch) | |
| tree | 9004394c20b9732b74fc24622cb9dc9cabad2035 /libdivecomputer.c | |
| parent | fe8605ed5b31d6dc6be485e3c58006410667c26d (diff) | |
| download | subsurface-fa69a1b7d5655cef790f4bf78f43d322ba78e3d3.tar.gz | |
Allow to compile Subsurface with upstream libdivecomputer
This will create an inconsistent build that has some UI features implying
BT support but those will be non-functional. I don't think this is the
right thing to do - either fail to build with a decent message or really
remove the BT support.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'libdivecomputer.c')
| -rw-r--r-- | libdivecomputer.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libdivecomputer.c b/libdivecomputer.c index e308c132d..edefaab14 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -924,6 +924,7 @@ const char *do_libdivecomputer_import(device_data_t *data) err = translate("gettextFromC", "Unable to open %s %s (%s)"); +#if defined(SSRF_CUSTOM_SERIAL) if (data->bluetooth_mode) { dc_serial_t *serial_device; @@ -935,6 +936,9 @@ const char *do_libdivecomputer_import(device_data_t *data) } } else { +#else + { +#endif rc = dc_device_open(&data->device, data->context, data->descriptor, data->devname); if (rc != DC_STATUS_SUCCESS && subsurface_access(data->devname, R_OK | W_OK) != 0) @@ -982,11 +986,19 @@ dc_status_t libdc_buffer_parser(struct dive *dive, device_data_t *data, unsigned rc = uwatec_smart_parser_create (&parser, data->context, data->descriptor->model, 0, 0); break; case DC_FAMILY_HW_OSTC: +#if defined(SSRF_CUSTOM_SERIAL) rc = hw_ostc_parser_create (&parser, data->context, data->deviceid, 0); +#else + rc = hw_ostc_parser_create (&parser, data->context, data->deviceid); +#endif break; case DC_FAMILY_HW_FROG: case DC_FAMILY_HW_OSTC3: +#if defined(SSRF_CUSTOM_SERIAL) rc = hw_ostc_parser_create (&parser, data->context, data->deviceid, 1); +#else + rc = hw_ostc_parser_create (&parser, data->context, data->deviceid); +#endif break; default: report_error("Device type not handled!"); |