Reformat .inf file for better reading and remove redundancies

1 files changed, 37 insertions, 38 deletions

diff --git a/host/windows/usb/android_winusb.inf b/host/windows/usb/android_winusb.inf
index c39961276..de4f93e94 100755
--- a/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@ -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

@@ -24,31 +23,31 @@ HKR,,,0,%ClassName%
 HKR,,Icon,,-1

 

 [Manufacturer]

-%ProviderName% = Google,NTx86,NTamd64

+%ProviderName% = Google, NTx86, NTamd64

 

 [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

-Needs=WINUSB.NT

+Include = winusb.inf

+Needs   = WINUSB.NT

 

 [USB_Install.Services]

-Include=winusb.inf

-AddService=WinUSB,0x00000002,WinUSB_ServiceInstall

+Include     = winusb.inf

+AddService  = WinUSB,0x00000002,WinUSB_ServiceInstall

 

 [WinUSB_ServiceInstall]

 DisplayName     = %WinUSB_SvcDesc%

@@ -58,19 +57,20 @@ ErrorControl    = 1
 ServiceBinary   = %12%\WinUSB.sys

 

 [USB_Install.Wdf]

-KmdfService=WINUSB, WinUSB_Install

+KmdfService = WINUSB, WinUSB_Install

+

 [WinUSB_Install]

-KmdfLibraryVersion=1.7

+KmdfLibraryVersion  = 1.7

 

 [USB_Install.HW]

-AddReg=Dev_AddReg

+AddReg  = Dev_AddReg

 

 [Dev_AddReg]

 HKR,,DeviceInterfaceGUIDs,0x10000,"{F72FE0D4-CBCB-407d-8814-9ED673D0DD6B}"

 

 [USB_Install.CoInstallers]

-AddReg=CoInstallers_AddReg

-CopyFiles=CoInstallers_CopyFiles

+AddReg    = CoInstallers_AddReg

+CopyFiles = CoInstallers_CopyFiles

 

 [CoInstallers_AddReg]

 HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01007.dll,WdfCoInstaller","WinUSBCoInstaller.dll"

@@ -87,19 +87,18 @@ CoInstallers_CopyFiles=11
 2 = %DISK_NAME%,,,\amd64

 

 [SourceDisksFiles.x86]

-WinUSBCoInstaller.dll=1

-WdfCoInstaller01007.dll=1

+WinUSBCoInstaller.dll  = 1

+WdfCoInstaller01007.dll = 1

 

 [SourceDisksFiles.amd64]

-WinUSBCoInstaller.dll=2

-WdfCoInstaller01007.dll=2

+WinUSBCoInstaller.dll  = 2

+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"

-WinUSB_SvcDesc="Android USB Driver"

-DISK_NAME="Android install disk"

-ClassName="Android Phone"

+ProviderName                = "Google, Inc."

+SingleAdbInterface          = "Android ADB Interface"

+CompositeAdbInterface       = "Android Composite ADB Interface"

+SingleBootLoaderInterface   = "Android Bootloader Interface"

+WinUSB_SvcDesc              = "Android USB Driver"

+DISK_NAME                   = "Android WinUsb installation disk"

+ClassName                   = "Android Phone"