Mercurial > hg > ucis.core

diff USBLib/Communication/WinUsb/WinUsbDevice.cs @ 65:abe0d55a2201

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed some redundant USB communication code
author Ivo Smits <Ivo@UCIS.nl>
date Tue, 15 Oct 2013 16:19:45 +0200
parents 7e4dae99f919
children 2d16447eff12
line wrap: on
line diff
--- a/USBLib/Communication/WinUsb/WinUsbDevice.cs	Sun Oct 13 20:03:05 2013 +0200
+++ b/USBLib/Communication/WinUsb/WinUsbDevice.cs	Tue Oct 15 16:19:45 2013 +0200
@@ -80,16 +80,16 @@
 			if (InterfaceHandle.IsInvalid || InterfaceHandle.IsClosed) throw new Win32Exception(Marshal.GetLastWin32Error(), "Could not open interface");
 			InterfaceHandles = new SafeWinUsbInterfaceHandle[1] { InterfaceHandle };
 			foreach (LibUsbDotNet.Info.UsbConfigInfo ci in (new LibUsbDotNet.UsbDevice(this)).Configs) {
-				if (ci.Descriptor.ConfigID == Configuration) {
+				if (ci.Descriptor.ConfigurationValue == Configuration) {
 					foreach (LibUsbDotNet.Info.UsbInterfaceInfo ifinfo in ci.InterfaceInfoList) {
 						foreach (LibUsbDotNet.Info.UsbEndpointInfo epinfo in ifinfo.EndpointInfoList) {
-							int epidx = epinfo.Descriptor.EndpointID & 0x7F;
-							if ((epinfo.Descriptor.EndpointID & 0x80) != 0) {
+							int epidx = epinfo.Descriptor.EndpointAddress & 0x7F;
+							if ((epinfo.Descriptor.EndpointAddress & 0x80) != 0) {
 								if (EndpointToInterfaceIn.Length <= epidx) Array.Resize(ref EndpointToInterfaceIn, epidx + 1);
-								EndpointToInterfaceIn[epidx] = ifinfo.Descriptor.InterfaceID;
+								EndpointToInterfaceIn[epidx] = ifinfo.Descriptor.InterfaceNumber;
 							} else {
 								if (EndpointToInterfaceOut.Length <= epidx) Array.Resize(ref EndpointToInterfaceOut, epidx + 1);
-								EndpointToInterfaceOut[epidx] = ifinfo.Descriptor.InterfaceID;
+								EndpointToInterfaceOut[epidx] = ifinfo.Descriptor.InterfaceNumber;
 							}
 						}
 					}