From 80fe8fb331edd494ba53efb0879eb9d53031216e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 27 Aug 2018 11:19:30 -0700 Subject: Add support for opening a DC_TRANSPORT_USBSTORAGE stream This is part of the whole "let's support the notion of dive computers being exported as USB storage devices" push. With an older libdivecomputer, we'll just fall back on failing the operation, but we still want to support the generic notion of DC_TRANSPORT_USBSTORAGE since we have our own internal Uemis downloader. That one won't ever get to the open phase, since it's caught earlier. Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- core/libdivecomputer.c | 6 ++++++ core/libdivecomputer.h | 1 + 2 files changed, 7 insertions(+) diff --git a/core/libdivecomputer.c b/core/libdivecomputer.c index 9a5b30087..51fc6f8b8 100644 --- a/core/libdivecomputer.c +++ b/core/libdivecomputer.c @@ -1342,6 +1342,12 @@ dc_status_t divecomputer_device_open(device_data_t *data) return rc; } + if (transports & DC_TRANSPORT_USBSTORAGE) { + rc = dc_usb_storage_open(&data->iostream, context, data->devname); + if (rc == DC_STATUS_SUCCESS) + return rc; + } + return DC_STATUS_UNSUPPORTED; } diff --git a/core/libdivecomputer.h b/core/libdivecomputer.h index 050834195..e1964eb9a 100644 --- a/core/libdivecomputer.h +++ b/core/libdivecomputer.h @@ -15,6 +15,7 @@ // Even if we have an old libdivecomputer, Uemis uses this #ifndef DC_TRANSPORT_USBSTORAGE #define DC_TRANSPORT_USBSTORAGE (1 << 6) +#define dc_usb_storage_open(stream, context, devname) (DC_STATUS_UNSUPPORTED) #endif #include "dive.h" -- cgit v1.2.3-70-g09d2