am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."

* commit '55089c32d599d2a7108e10728c59ad1f1b24384d':
  Android SDK Windows USB driver: Glass PID.
This commit is contained in:
Xavier Ducrohet
2014-01-31 10:26:49 +00:00
committed by Android Git Automerger

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 = 07/09/2013,8.0.0000.00000 DriverVer = 01/27/2014,9.0.0000.00000
CatalogFile.NTx86 = androidwinusb86.cat CatalogFile.NTx86 = androidwinusb86.cat
CatalogFile.NTamd64 = androidwinusba64.cat CatalogFile.NTamd64 = androidwinusba64.cat
@@ -51,6 +51,10 @@ HKR,,Icon,,-1
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE4&MI_02 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE4&MI_02
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE6&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE6&MI_01
;Google Glass
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_9001
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_9001&MI_01
[Google.NTamd64] [Google.NTamd64]
@@ -81,6 +85,11 @@ HKR,,Icon,,-1
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE4&MI_02 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE4&MI_02
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE6&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE6&MI_01
;Google Glass
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_9001
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_9001&MI_01
[USB_Install] [USB_Install]
Include = winusb.inf Include = winusb.inf
Needs = WINUSB.NT Needs = WINUSB.NT