am 653de155: Reformat .inf file for better reading and remove redundancies

Merge commit '653de1559011a917d8f01dfd989ed26e32fa4a5b'

* commit '653de1559011a917d8f01dfd989ed26e32fa4a5b':
  Reformat .inf file for better reading and remove redundancies
This commit is contained in:
vchtchetkine
2009-08-12 14:36:10 -07:00
committed by Android Git Automerger

View File

@@ -1,20 +1,19 @@
;
; WinUsb installation File.
; Android WinUsb driver installation.
;
[Version]
Signature = "$Windows NT$"
Class = AndroidUsbDeviceClass
ClassGuid = {3F966BD9-FA04-4ec5-991C-D326973B5128}
Provider = %ProviderName%
DriverVer = 07/20/2009,2.0.0010.00001
DriverVer = 08/11/2009,2.0.0010.00002
CatalogFile.NTx86 = androidwinusb86.cat
CatalogFile.NTamd64 = androidwinusba64.cat
;
; This section is required even though we report our driver
; as a standard USB driver. If this section is removed the
; installer will report an error "Required section not found
; in INF file.
; This section seems to be required for WinUsb driver installation.
; If this section is removed the installer will report an error
; "Required section not found in INF file".
;
[ClassInstall32]
Addreg = AndroidWinUsbClassReg
@@ -28,19 +27,19 @@ HKR,,Icon,,-1
[Google.NTx86]
; HTC Dream
%USB\HCT_Dream.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0C01
%USB\HCT_Dream_Composite.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0C02&MI_01
%USB\HCT_BootLoader.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0FFF
; HCT Magic
%USB\HCT_Magic_Composite.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0C03&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_0BB4&PID_0C01
%CompositeAdbInterface% = USB_Install, USB\VID_0BB4&PID_0C02&MI_01
%SingleBootLoaderInterface% = USB_Install, USB\VID_0BB4&PID_0FFF
; HTC Magic
%CompositeAdbInterface% = USB_Install, USB\VID_0BB4&PID_0C03&MI_01
[Google.NTamd64]
; HTC Dream
%USB\HCT_Dream.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0C01
%USB\HCT_Dream_Composite.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0C02&MI_01
%USB\HCT_BootLoader.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0FFF
; HCT Magic
%USB\HCT_Magic_Composite.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0C03&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_0BB4&PID_0C01
%CompositeAdbInterface% = USB_Install, USB\VID_0BB4&PID_0C02&MI_01
%SingleBootLoaderInterface% = USB_Install, USB\VID_0BB4&PID_0FFF
; HTC Magic
%CompositeAdbInterface% = USB_Install, USB\VID_0BB4&PID_0C03&MI_01
[USB_Install]
Include = winusb.inf
@@ -59,6 +58,7 @@ ServiceBinary = %12%\WinUSB.sys
[USB_Install.Wdf]
KmdfService = WINUSB, WinUSB_Install
[WinUSB_Install]
KmdfLibraryVersion = 1.7
@@ -96,10 +96,9 @@ WdfCoInstaller01007.dll=2
[Strings]
ProviderName = "Google, Inc."
USB\HCT_Dream.DeviceDesc="Android ADB Interface"
USB\HCT_Dream_Composite.DeviceDesc="Android Composite ADB Interface"
USB\HCT_BootLoader.DeviceDesc="Android Bootloader Interface"
USB\HCT_Magic_Composite.DeviceDesc="Android Composite ADB Interface"
SingleAdbInterface = "Android ADB Interface"
CompositeAdbInterface = "Android Composite ADB Interface"
SingleBootLoaderInterface = "Android Bootloader Interface"
WinUSB_SvcDesc = "Android USB Driver"
DISK_NAME="Android install disk"
DISK_NAME = "Android WinUsb installation disk"
ClassName = "Android Phone"