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/unix.c | |
| 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/unix.c')
| -rw-r--r-- | core/unix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/unix.c b/core/unix.c index 48fd3f467..1d92a1ad3 100644 --- a/core/unix.c +++ b/core/unix.c @@ -100,7 +100,7 @@ const char *system_default_filename(void) return path; } -int enumerate_devices(device_callback_t callback, void *userdata, int dc_type) +int enumerate_devices(device_callback_t callback, void *userdata, unsigned int transport) { int index = -1, entries = 0; DIR *dp = NULL; @@ -110,7 +110,7 @@ int enumerate_devices(device_callback_t callback, void *userdata, int dc_type) char *line = NULL; char *fname; size_t len; - if (dc_type != DC_TYPE_UEMIS) { + if (transport & DC_TRANSPORT_SERIAL) { const char *dirname = "/dev"; #ifdef __OpenBSD__ const char *patterns[] = { @@ -153,7 +153,7 @@ int enumerate_devices(device_callback_t callback, void *userdata, int dc_type) closedir(dp); } #ifdef __linux__ - if (dc_type != DC_TYPE_SERIAL) { + if (transport & DC_TRANSPORT_USBSTORAGE) { int num_uemis = 0; file = fopen("/proc/mounts", "r"); if (file == NULL) |