Fixes #932
---
src/org/sigrok/androidutils/UsbSupplicant.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/org/sigrok/androidutils/UsbSupplicant.java
b/src/org/sigrok/androidutils/UsbSupplicant.java
index 0f219a8..b33a0c3 100644
--- a/src/org/sigrok/androidutils/UsbSupplicant.java
+++ b/src/org/sigrok/androidutils/UsbSupplicant.java
@@ -106,7 +106,7 @@ public class UsbSupplicant
for (int i = 0; i < count; i++) {
String name = parser.getAttributeName(i);
// All attribute values are ints
- int value =
Integer.parseInt(parser.getAttributeValue(i));
+ int value = parseAttribute(name,
parser.getAttributeValue(i));
if ("vendor-id".equals(name)) {
vendorId = value;
@@ -124,6 +124,15 @@ public class UsbSupplicant
deviceClass, deviceSubclass,
deviceProtocol);
}
+ private static int parseAttribute(String name, String value) {
+ // vendor-id and product-id are in hexadecimal format
+ if("vendor-id".equals(name) ||
"product-id".equals(name)) {
+ return Integer.parseInt(value, 16);
+ } else {
+ return Integer.parseInt(value);
+ }
+ }
+
private boolean matches(int clasz, int subclass, int protocol) {
return ((mClass == -1 || clasz == mClass) &&
(mSubclass == -1 || subclass ==
mSubclass) &&
--
2.11.0
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
