diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-27 10:32:14 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-27 22:10:38 -0700 |
| commit | 270e9eccad8644352f5ae07df8b6acb55b115361 (patch) | |
| tree | 0b6aaee8221fc2c12d9b084e42179e1a2d9633f0 /core/display.h | |
| parent | bb067b6ee4828fc2444395d4cfda80831c4721bb (diff) | |
| download | subsurface-270e9eccad8644352f5ae07df8b6acb55b115361.tar.gz | |
Make device enumeration use the device transport data
This removes some special-case code for Uemis, replacing it with simply
passing in the device transport information.
This makes device enumeration work for the Garmin Descent (if it is
listed by libdivecomputer as a USB storage device, that is).
I don't actually do any of the libdivecomputer parsing yet, and only
have a stub for the Garmin Descent, but now the directory selection
works with that stub. The actual download obviously does not.
[Dirk Hohndel: removed obsolete FIXME from code]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/display.h')
| -rw-r--r-- | core/display.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/display.h b/core/display.h index b5b6a3938..67feee854 100644 --- a/core/display.h +++ b/core/display.h @@ -2,6 +2,8 @@ #ifndef DISPLAY_H #define DISPLAY_H +#include "libdivecomputer.h" + #ifdef __cplusplus extern "C" { #endif @@ -44,11 +46,7 @@ extern int is_default_dive_computer(const char *, const char *); typedef void (*device_callback_t)(const char *name, void *userdata); -#define DC_TYPE_SERIAL 1 -#define DC_TYPE_UEMIS 2 -#define DC_TYPE_OTHER 3 - -int enumerate_devices(device_callback_t callback, void *userdata, int dc_type); +int enumerate_devices(device_callback_t callback, void *userdata, unsigned int transport); extern const char *default_dive_computer_vendor; extern const char *default_dive_computer_product; |