diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-03-14 18:11:46 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-03-16 07:58:20 -0700 |
| commit | ec3a968df9d8fc706fedb788959631e2ed84e04b (patch) | |
| tree | aaa56de98ae2a861aef1d9bc2ab78fe05f06f745 /core/libdivecomputer.c | |
| parent | 1495aa2dbf5366cc135c1ceb959c6a12abbb3e0b (diff) | |
| download | subsurface-ec3a968df9d8fc706fedb788959631e2ed84e04b.tar.gz | |
android/usb: pass in the UsbDevice when downloading
This finally allows us to download from not just the first device, but specifically
the device that the user picks.
Passing the object through a void pointer is not nice - but since this traverses
C code other solutions (like passing an index into the list) seemed even worse.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/libdivecomputer.c')
| -rw-r--r-- | core/libdivecomputer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/libdivecomputer.c b/core/libdivecomputer.c index 475a78ef0..bc0836c3c 100644 --- a/core/libdivecomputer.c +++ b/core/libdivecomputer.c @@ -1336,8 +1336,8 @@ dc_status_t divecomputer_device_open(device_data_t *data) return ftdi_open(&data->iostream, context); #endif #ifdef __ANDROID__ - if (!strcasecmp(data->devname, "usb-serial")) - return serial_usb_android_open(&data->iostream, context); + if (data->androidUsbDeviceDescriptor) + return serial_usb_android_open(&data->iostream, context, data->androidUsbDeviceDescriptor); #endif rc = dc_serial_open(&data->iostream, context, data->devname); if (rc == DC_STATUS_SUCCESS) |