Reformat .inf file for better reading and remove redundancies

[android-x86/development.git] / host / windows / usb / android_winusb.inf

diff --git a/host/windows/usb/android_winusb.inf b/host/windows/usb/android_winusb.inf
index c399612..de4f93e 100755 (executable)
--- a/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@ -1,20 +1,19 @@
 ;\r
-; WinUsb installation File.\r
+; Android WinUsb driver installation.\r
 ;\r
 [Version]\r
 Signature           = "$Windows NT$"\r
 Class               = AndroidUsbDeviceClass
 ClassGuid           = {3F966BD9-FA04-4ec5-991C-D326973B5128}
 Provider            = %ProviderName%\r
-DriverVer           = 07/20/2009,2.0.0010.00001
+DriverVer           = 08/11/2009,2.0.0010.00002
 CatalogFile.NTx86   = androidwinusb86.cat
 CatalogFile.NTamd64 = androidwinusba64.cat
 \r
 ;\r
-; This section is required even though we report our driver\r
-; as a standard USB driver. If this section is removed the\r
-; installer will report an error "Required section not found\r
-; in INF file.\r
+; This section seems to be required for WinUsb driver installation.\r
+; If this section is removed the installer will report an error\r
+; "Required section not found in INF file".\r
 ;\r
 [ClassInstall32]\r
 Addreg = AndroidWinUsbClassReg\r
@@ -24,31 +23,31 @@ HKR,,,0,%ClassName%
 HKR,,Icon,,-1\r
 \r
 [Manufacturer]\r
-%ProviderName% = Google,NTx86,NTamd64\r
+%ProviderName% = Google, NTx86, NTamd64\r
 \r
 [Google.NTx86]\r
 ; HTC Dream\r
-%USB\HCT_Dream.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0C01\r
-%USB\HCT_Dream_Composite.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0C02&MI_01\r
-%USB\HCT_BootLoader.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0FFF\r
-; HCT Magic\r
-%USB\HCT_Magic_Composite.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0C03&MI_01\r
+%SingleAdbInterface%        = USB_Install, USB\VID_0BB4&PID_0C01\r
+%CompositeAdbInterface%     = USB_Install, USB\VID_0BB4&PID_0C02&MI_01\r
+%SingleBootLoaderInterface% = USB_Install, USB\VID_0BB4&PID_0FFF\r
+; HTC Magic\r
+%CompositeAdbInterface%     = USB_Install, USB\VID_0BB4&PID_0C03&MI_01\r
 \r
 [Google.NTamd64]\r
 ; HTC Dream\r
-%USB\HCT_Dream.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0C01\r
-%USB\HCT_Dream_Composite.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0C02&MI_01\r
-%USB\HCT_BootLoader.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0FFF\r
-; HCT Magic\r
-%USB\HCT_Magic_Composite.DeviceDesc% = USB_Install, USB\VID_0BB4&PID_0C03&MI_01\r
+%SingleAdbInterface%        = USB_Install, USB\VID_0BB4&PID_0C01\r
+%CompositeAdbInterface%     = USB_Install, USB\VID_0BB4&PID_0C02&MI_01\r
+%SingleBootLoaderInterface% = USB_Install, USB\VID_0BB4&PID_0FFF\r
+; HTC Magic\r
+%CompositeAdbInterface%     = USB_Install, USB\VID_0BB4&PID_0C03&MI_01\r
 \r
 [USB_Install]\r
-Include=winusb.inf\r
-Needs=WINUSB.NT\r
+Include = winusb.inf\r
+Needs   = WINUSB.NT\r
 \r
 [USB_Install.Services]\r
-Include=winusb.inf\r
-AddService=WinUSB,0x00000002,WinUSB_ServiceInstall\r
+Include     = winusb.inf\r
+AddService  = WinUSB,0x00000002,WinUSB_ServiceInstall\r
 \r
 [WinUSB_ServiceInstall]\r
 DisplayName     = %WinUSB_SvcDesc%\r
@@ -58,19 +57,20 @@ ErrorControl    = 1
 ServiceBinary   = %12%\WinUSB.sys\r
 \r
 [USB_Install.Wdf]\r
-KmdfService=WINUSB, WinUSB_Install\r
+KmdfService = WINUSB, WinUSB_Install\r
+\r
 [WinUSB_Install]\r
-KmdfLibraryVersion=1.7\r
+KmdfLibraryVersion  = 1.7\r
 \r
 [USB_Install.HW]\r
-AddReg=Dev_AddReg\r
+AddReg  = Dev_AddReg\r
 \r
 [Dev_AddReg]\r
 HKR,,DeviceInterfaceGUIDs,0x10000,"{F72FE0D4-CBCB-407d-8814-9ED673D0DD6B}"\r
 \r
 [USB_Install.CoInstallers]\r
-AddReg=CoInstallers_AddReg\r
-CopyFiles=CoInstallers_CopyFiles\r
+AddReg    = CoInstallers_AddReg\r
+CopyFiles = CoInstallers_CopyFiles\r
 \r
 [CoInstallers_AddReg]\r
 HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01007.dll,WdfCoInstaller","WinUSBCoInstaller.dll"\r
@@ -87,19 +87,18 @@ CoInstallers_CopyFiles=11
 2 = %DISK_NAME%,,,\amd64\r
 \r
 [SourceDisksFiles.x86]\r
-WinUSBCoInstaller.dll=1\r
-WdfCoInstaller01007.dll=1\r
+WinUSBCoInstaller.dll  = 1\r
+WdfCoInstaller01007.dll = 1\r
 \r
 [SourceDisksFiles.amd64]\r
-WinUSBCoInstaller.dll=2\r
-WdfCoInstaller01007.dll=2\r
+WinUSBCoInstaller.dll  = 2\r
+WdfCoInstaller01007.dll = 2\r
 \r
 [Strings]\r
-ProviderName="Google, Inc."\r
-USB\HCT_Dream.DeviceDesc="Android ADB Interface"\r
-USB\HCT_Dream_Composite.DeviceDesc="Android Composite ADB Interface"\r
-USB\HCT_BootLoader.DeviceDesc="Android Bootloader Interface"\r
-USB\HCT_Magic_Composite.DeviceDesc="Android Composite ADB Interface"\r
-WinUSB_SvcDesc="Android USB Driver"\r
-DISK_NAME="Android install disk"\r
-ClassName="Android Phone"\r
+ProviderName                = "Google, Inc."\r
+SingleAdbInterface          = "Android ADB Interface"\r
+CompositeAdbInterface       = "Android Composite ADB Interface"\r
+SingleBootLoaderInterface   = "Android Bootloader Interface"\r
+WinUSB_SvcDesc              = "Android USB Driver"\r
+DISK_NAME                   = "Android WinUsb installation disk"\r
+ClassName                   = "Android Phone"\r