Mercurial > hg > ucis.core

changeset 53:df5534af12e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Small improvements in USB device identification extraction
author Ivo Smits <Ivo@UCIS.nl>
date Wed, 02 Oct 2013 21:17:08 +0200
parents d4778c3232ad
children ba4e2cb031e0
files USBLib/Communication/WindowsUsbDeviceRegistry.cs
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/USBLib/Communication/WindowsUsbDeviceRegistry.cs	Tue Oct 01 00:24:39 2013 +0200
+++ b/USBLib/Communication/WindowsUsbDeviceRegistry.cs	Wed Oct 02 21:17:08 2013 +0200
@@ -18,18 +18,20 @@
 				hwid = hwids[0];
 			}
 			vendorID = productID = revision = interfaceID = -1;
-			foreach (String token in hwid.Split(new Char[] { '\\', '#', '&' }, StringSplitOptions.None)) {
+			String[] tokens = hwid.Split(new Char[] { '\\', '#', '&' }, StringSplitOptions.None);
+			Boolean isUSB = tokens.Length > 0 && tokens[0] == "USB";
+			foreach (String token in tokens) {
 				if (token.StartsWith("VID_", StringComparison.InvariantCultureIgnoreCase)) {
-					if (!Int32.TryParse(token.Substring(4), NumberStyles.HexNumber, null, out vendorID)) vendorID = -1;
+					if (vendorID == -1) if (!Int32.TryParse(token.Substring(4), NumberStyles.HexNumber, null, out vendorID)) vendorID = -1;
 				} else if (token.StartsWith("PID_", StringComparison.InvariantCultureIgnoreCase)) {
-					if (!Int32.TryParse(token.Substring(4), NumberStyles.HexNumber, null, out productID)) productID = -1;
+					if (productID == -1) if (!Int32.TryParse(token.Substring(4), NumberStyles.HexNumber, null, out productID)) productID = -1;
 				} else if (token.StartsWith("REV_", StringComparison.InvariantCultureIgnoreCase)) {
-					if (!Int32.TryParse(token.Substring(4), NumberStyles.Integer, null, out revision)) revision = -1;
+					if (revision == -1) if (!Int32.TryParse(token.Substring(4), NumberStyles.Integer, null, out revision)) revision = -1;
 				} else if (token.StartsWith("MI_", StringComparison.InvariantCultureIgnoreCase)) {
-					if (!Int32.TryParse(token.Substring(3), NumberStyles.HexNumber, null, out interfaceID)) interfaceID = -1;
+					if (interfaceID == -1) if (!Int32.TryParse(token.Substring(3), NumberStyles.HexNumber, null, out interfaceID)) interfaceID = -1;
 				}
 			}
-			return vendorID != -1 && productID != -1;
+			return isUSB && vendorID != -1 && productID != -1;
 		}
 
 		// Parsed out of the device ID