From 30ea13b36b184254eb7fe4bd4c9e239afe54c51a Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Tue, 29 Aug 2017 21:01:07 +0200 Subject: [PATCH] Remove the obsolete transport function With the support for multiple transports per device, the dc_descriptor_get_transport() function became obsolete because it does support only a single transport type. Applications should use the new dc_descriptor_get_transports() function instead. --- include/libdivecomputer/descriptor.h | 3 --- src/descriptor.c | 18 ------------------ src/libdivecomputer.symbols | 1 - 3 files changed, 22 deletions(-) diff --git a/include/libdivecomputer/descriptor.h b/include/libdivecomputer/descriptor.h index 64babfb..a2b4495 100644 --- a/include/libdivecomputer/descriptor.h +++ b/include/libdivecomputer/descriptor.h @@ -49,9 +49,6 @@ dc_descriptor_get_type (dc_descriptor_t *descriptor); unsigned int dc_descriptor_get_model (dc_descriptor_t *descriptor); -dc_transport_t -dc_descriptor_get_transport (dc_descriptor_t *descriptor); - unsigned int dc_descriptor_get_transports (dc_descriptor_t *descriptor); diff --git a/src/descriptor.c b/src/descriptor.c index 59cbef1..948a9f3 100644 --- a/src/descriptor.c +++ b/src/descriptor.c @@ -503,24 +503,6 @@ dc_descriptor_get_model (dc_descriptor_t *descriptor) return descriptor->model; } -dc_transport_t -dc_descriptor_get_transport (dc_descriptor_t *descriptor) -{ - if (descriptor == NULL) - return DC_TRANSPORT_NONE; - - if (descriptor->type == DC_FAMILY_ATOMICS_COBALT) - return DC_TRANSPORT_USB; - else if (descriptor->type == DC_FAMILY_SUUNTO_EONSTEEL) - return DC_TRANSPORT_USBHID; - else if (descriptor->type == DC_FAMILY_UWATEC_G2) - return DC_TRANSPORT_USBHID; - else if (descriptor->type == DC_FAMILY_UWATEC_SMART) - return DC_TRANSPORT_IRDA; - else - return DC_TRANSPORT_SERIAL; -} - unsigned int dc_descriptor_get_transports (dc_descriptor_t *descriptor) { diff --git a/src/libdivecomputer.symbols b/src/libdivecomputer.symbols index 4433a68..9573b73 100644 --- a/src/libdivecomputer.symbols +++ b/src/libdivecomputer.symbols @@ -32,7 +32,6 @@ dc_descriptor_get_vendor dc_descriptor_get_product dc_descriptor_get_type dc_descriptor_get_model -dc_descriptor_get_transport dc_descriptor_get_transports dc_iostream_get_transport