am 1d85d8d1: am 97a6420d: Merge change I935c71f2 into eclair

Merge commit '1d85d8d1148e3c81500bb4aed66405fc6d33d956'

* commit '1d85d8d1148e3c81500bb4aed66405fc6d33d956':
  Add sholes to Windows USB Driver in Eclair.
This commit is contained in:
Raphael
2009-10-13 12:00:20 -07:00
committed by Android Git Automerger

View File

@@ -3,12 +3,12 @@
; ;
[Version] [Version]
Signature = "$Windows NT$" 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 = 08/11/2009,2.0.0010.00002
CatalogFile.NTx86 = androidwinusb86.cat CatalogFile.NTx86 = androidwinusb86.cat
CatalogFile.NTamd64 = androidwinusba64.cat CatalogFile.NTamd64 = androidwinusba64.cat
; ;
; This section seems to be required for WinUsb driver installation. ; This section seems to be required for WinUsb driver installation.
@@ -32,6 +32,13 @@ HKR,,Icon,,-1
%SingleBootLoaderInterface% = USB_Install, USB\VID_0BB4&PID_0FFF %SingleBootLoaderInterface% = USB_Install, USB\VID_0BB4&PID_0FFF
; HTC Magic ; HTC Magic
%CompositeAdbInterface% = USB_Install, USB\VID_0BB4&PID_0C03&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_0BB4&PID_0C03&MI_01
;
;Moto Sholes
%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_D00D
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_0002
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_0002&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_22B8&PID_41DB
%CompositeAdbInterface% = USB_Install, USB\VID_22B8&PID_41DB&MI_01
[Google.NTamd64] [Google.NTamd64]
; HTC Dream ; HTC Dream
@@ -40,6 +47,13 @@ HKR,,Icon,,-1
%SingleBootLoaderInterface% = USB_Install, USB\VID_0BB4&PID_0FFF %SingleBootLoaderInterface% = USB_Install, USB\VID_0BB4&PID_0FFF
; HTC Magic ; HTC Magic
%CompositeAdbInterface% = USB_Install, USB\VID_0BB4&PID_0C03&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_0BB4&PID_0C03&MI_01
;
;Moto Sholes
%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_D00D
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_0002
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_0002&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_22B8&PID_41DB
%CompositeAdbInterface% = USB_Install, USB\VID_22B8&PID_41DB&MI_01
[USB_Install] [USB_Install]
Include = winusb.inf Include = winusb.inf