mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

android/usb: remove "autoselect driver" option for unknown VID/PIDs

Browse source 
Signed-off-by: Christof Arnosti <charno@charno.ch>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Christof Arnosti 2020-03-15 15:12:53 +01:00 • committed by Dirk Hohndel
parent ff2f199eed
commit 87e12029f9
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/serial_usb_android.cpp
View file

@ -305,7 +305,7 @@ android_usb_serial_device_descriptor getDescriptor(QAndroidJniObject usbDevice)
std::vector<android_usb_serial_device_descriptor> serial_usb_android_get_devices() std::vector<android_usb_serial_device_descriptor> serial_usb_android_get_devices()
{ {
std::vector<std::string> driverNames = { "", "CdcAcmSerialDriver", "Ch34xSerialDriver", "Cp21xxSerialDriver", "FtdiSerialDriver", "ProlificSerialDriver" }; std::vector<std::string> driverNames = { "CdcAcmSerialDriver", "Ch34xSerialDriver", "Cp21xxSerialDriver", "FtdiSerialDriver", "ProlificSerialDriver" };
// Get the current main activity of the application. // Get the current main activity of the application.
QAndroidJniObject activity = QtAndroid::androidActivity(); QAndroidJniObject activity = QtAndroid::androidActivity();
@ -333,10 +333,7 @@ std::vector<android_usb_serial_device_descriptor> serial_usb_android_get_devices
std::string ui = descriptor.uiRepresentation; std::string ui = descriptor.uiRepresentation;
for (std::string driverName : driverNames) { for (std::string driverName : driverNames) {
descriptor.className = driverName; descriptor.className = driverName;
if (driverName != "") descriptor.uiRepresentation = ui + " (" + driverName + ")";
descriptor.uiRepresentation = ui + " (" + driverName + ")";
else
descriptor.uiRepresentation = ui + " (autoselect driver)";
retval.push_back(descriptor); retval.push_back(descriptor);
} }
} }
@ -345,10 +342,9 @@ std::vector<android_usb_serial_device_descriptor> serial_usb_android_get_devices
} }
/* /*
* For testing and compatibility only, can be removed after the UI changes. Behaves exactly like the "old" * Open the USB Device described by androidUsbDevice
* implementation if only one device is attached.
*/ */
dc_status_t serial_usb_android_open(dc_iostream_t **iostream, dc_context_t *context, void *androidUsbDevice) dc_status_t serial_usb_android_open(dc_iostream_t **iostream, dc_context_t *context, /*android_usb_serial_device_descriptor*/ void *androidUsbDevice)
{ {
if (!androidUsbDevice) if (!androidUsbDevice)
return DC_STATUS_NODEVICE; return DC_STATUS_NODEVICE;