Merge "USB Driver INF file for rev 4."

This commit is contained in:
Raphael Moll
2010-12-08 15:12:10 -08:00
committed by Android Code Review

View File

@@ -6,7 +6,7 @@ Signature = "$Windows NT$"
Class = AndroidUsbDeviceClass Class = AndroidUsbDeviceClass
ClassGuid = {3F966BD9-FA04-4ec5-991C-D326973B5128} ClassGuid = {3F966BD9-FA04-4ec5-991C-D326973B5128}
Provider = %ProviderName% Provider = %ProviderName%
DriverVer = 08/11/2009,2.0.0010.00002 DriverVer = 12/06/2010,4.0.0000.00000
CatalogFile.NTx86 = androidwinusb86.cat CatalogFile.NTx86 = androidwinusb86.cat
CatalogFile.NTamd64 = androidwinusba64.cat CatalogFile.NTamd64 = androidwinusba64.cat
@@ -43,9 +43,6 @@ HKR,,Icon,,-1
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4E11 %SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4E11
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E12&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E12&MI_01
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E22&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E22&MI_01
;
; Dell's Mini5
%CompositeAdbInterface% = USB_Install, USB\VID_413C&PID_B007&MI_01
[Google.NTamd64] [Google.NTamd64]
; HTC Dream ; HTC Dream
@@ -65,9 +62,6 @@ HKR,,Icon,,-1
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4E11 %SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4E11
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E12&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E12&MI_01
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E22&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E22&MI_01
;
; Dell's Mini5
%CompositeAdbInterface% = USB_Install, USB\VID_413C&PID_B007&MI_01
[USB_Install] [USB_Install]
Include = winusb.inf Include = winusb.inf
@@ -88,7 +82,7 @@ ServiceBinary = %12%\WinUSB.sys
KmdfService = WINUSB, WinUSB_Install KmdfService = WINUSB, WinUSB_Install
[WinUSB_Install] [WinUSB_Install]
KmdfLibraryVersion = 1.7 KmdfLibraryVersion = 1.9
[USB_Install.HW] [USB_Install.HW]
AddReg = Dev_AddReg AddReg = Dev_AddReg
@@ -101,11 +95,11 @@ AddReg = CoInstallers_AddReg
CopyFiles = CoInstallers_CopyFiles CopyFiles = CoInstallers_CopyFiles
[CoInstallers_AddReg] [CoInstallers_AddReg]
HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01007.dll,WdfCoInstaller","WinUSBCoInstaller.dll" HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01009.dll,WdfCoInstaller","WinUSBCoInstaller2.dll"
[CoInstallers_CopyFiles] [CoInstallers_CopyFiles]
WinUSBCoInstaller.dll WinUSBCoInstaller2.dll
WdfCoInstaller01007.dll WdfCoInstaller01009.dll
[DestinationDirs] [DestinationDirs]
CoInstallers_CopyFiles=11 CoInstallers_CopyFiles=11
@@ -115,12 +109,12 @@ CoInstallers_CopyFiles=11
2 = %DISK_NAME%,,,\amd64 2 = %DISK_NAME%,,,\amd64
[SourceDisksFiles.x86] [SourceDisksFiles.x86]
WinUSBCoInstaller.dll = 1 WinUSBCoInstaller2.dll = 1
WdfCoInstaller01007.dll = 1 WdfCoInstaller01009.dll = 1
[SourceDisksFiles.amd64] [SourceDisksFiles.amd64]
WinUSBCoInstaller.dll = 2 WinUSBCoInstaller2.dll = 2
WdfCoInstaller01007.dll = 2 WdfCoInstaller01009.dll = 2
[Strings] [Strings]
ProviderName = "Google, Inc." ProviderName = "Google, Inc."