Merge "Windows USB Driver for generic, rev 7"

This commit is contained in:
Raphael Moll
2012-08-28 15:32:55 -07:00
committed by Android (Google) 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/22/2012,7.0.0000.00000 DriverVer = 08/27/2012,7.0.0000.00001
CatalogFile.NTx86 = androidwinusb86.cat CatalogFile.NTx86 = androidwinusb86.cat
CatalogFile.NTamd64 = androidwinusba64.cat CatalogFile.NTamd64 = androidwinusba64.cat
@@ -54,6 +54,8 @@ HKR,,Icon,,-1
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE2&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE2&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE3 %SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE3
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE4&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE4&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE5
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE6&MI_01
[Google.NTamd64] [Google.NTamd64]
@@ -88,6 +90,8 @@ HKR,,Icon,,-1
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE2&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE2&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE3 %SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE3
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE4&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE4&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE5
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE6&MI_01
[USB_Install] [USB_Install]
Include = winusb.inf Include = winusb.inf