USB driver: update to public rev 4

Change-Id: Icecde3b08876a939db3f170ba9a4b23260df336f

diff --git a/host/windows/usb/android_winusb.inf b/host/windows/usb/android_winusb.inf
index 63b4bea..47cf2f7 100755 (executable)
--- a/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@ -6,7 +6,7 @@ Signature           = "$Windows NT$"
 Class               = AndroidUsbDeviceClass\r
 ClassGuid           = {3F966BD9-FA04-4ec5-991C-D326973B5128}\r
 Provider            = %ProviderName%\r
-DriverVer           = 08/11/2009,2.0.0010.00002\r
+DriverVer           = 12/06/2010,4.0.0000.00000\r
 CatalogFile.NTx86   = androidwinusb86.cat\r
 CatalogFile.NTamd64 = androidwinusba64.cat\r
 \r
@@ -43,26 +43,6 @@ HKR,,Icon,,-1
 %SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_4E11\r
 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4E12&MI_01\r
 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4E22&MI_01\r
-;\r
-; Dell's Mini5\r
-%SingleAdbInterface%        = USB_Install, USB\VID_413C&PID_B007\r
-%CompositeAdbInterface%     = USB_Install, USB\VID_413C&PID_B007&MI_01\r
-;\r
-; Samsung SPH-M900, GT-I5700, SCH-R880\r
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_681C\r
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_681C&MI_01\r
-; Samsung GT-I7500\r
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6601\r
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6601&MI_01\r
-; Samsung GT-I5500\r
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6882\r
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6882&MI_01\r
-; Samsung SHW-M100S\r
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6850\r
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6850&MI_01\r
-; Samsung SHW-M110S\r
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_681D\r
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_681D&MI_01\r
 \r
 [Google.NTamd64]\r
 ; HTC Dream\r
@@ -82,29 +62,6 @@ HKR,,Icon,,-1
 %SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_4E11\r
 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4E12&MI_01\r
 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4E22&MI_01\r
-;\r
-; Dell's Mini5\r
-%SingleAdbInterface%        = USB_Install, USB\VID_413C&PID_B007\r
-%CompositeAdbInterface%     = USB_Install, USB\VID_413C&PID_B007&MI_01\r
-;\r
-; Samsung SPH-M900, GT-I5700, SCH-R880\r
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_681C\r
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_681C&MI_01\r
-; Samsung GT-I7500\r
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6601\r
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6601&MI_01\r
-; Samsung GT-I5500\r
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6882\r
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6882&MI_01\r
-; Samsung SHW-M100S\r
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6850\r
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6850&MI_01\r
-; Samsung SHW-M110S\r
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_681D\r
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_681D&MI_01\r
-=======\r
-%CompositeAdbInterface%     = USB_Install, USB\VID_413C&PID_B007&MI_01\r
->>>>>>> 4e75b80a\r
 \r
 [USB_Install]\r
 Include = winusb.inf\r
@@ -125,7 +82,7 @@ ServiceBinary   = %12%\WinUSB.sys
 KmdfService = WINUSB, WinUSB_Install\r
 \r
 [WinUSB_Install]\r
-KmdfLibraryVersion  = 1.7\r
+KmdfLibraryVersion  = 1.9\r
 \r
 [USB_Install.HW]\r
 AddReg  = Dev_AddReg\r
@@ -138,11 +95,11 @@ AddReg    = CoInstallers_AddReg
 CopyFiles = CoInstallers_CopyFiles\r
 \r
 [CoInstallers_AddReg]\r
-HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01007.dll,WdfCoInstaller","WinUSBCoInstaller.dll"\r
+HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01009.dll,WdfCoInstaller","WinUSBCoInstaller2.dll"\r
 \r
 [CoInstallers_CopyFiles]\r
-WinUSBCoInstaller.dll\r
-WdfCoInstaller01007.dll\r
+WinUSBCoInstaller2.dll\r
+WdfCoInstaller01009.dll\r
 \r
 [DestinationDirs]\r
 CoInstallers_CopyFiles=11\r
@@ -152,12 +109,12 @@ CoInstallers_CopyFiles=11
 2 = %DISK_NAME%,,,\amd64\r
 \r
 [SourceDisksFiles.x86]\r
-WinUSBCoInstaller.dll  = 1\r
-WdfCoInstaller01007.dll = 1\r
+WinUSBCoInstaller2.dll  = 1\r
+WdfCoInstaller01009.dll = 1\r
 \r
 [SourceDisksFiles.amd64]\r
-WinUSBCoInstaller.dll  = 2\r
-WdfCoInstaller01007.dll = 2\r
+WinUSBCoInstaller2.dll  = 2\r
+WdfCoInstaller01009.dll = 2\r
 \r
 [Strings]\r
 ProviderName                = "Google, Inc."\r