Windows USB Driver for generic + Q, rev 7.
(Cherry-picked from master c9533ad3cf7dc50e033eeeccac08350042e9c794)
Change-Id: Ia18fe5f08a6e2c6040e61f3105cff71cb3f4f8e5
diff --git a/host/windows/usb/android_winusb.inf b/host/windows/usb/android_winusb.inf
index b4462cd..f26a75c 100755
--- a/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@ -6,15 +6,10 @@
Class = AndroidUsbDeviceClass
ClassGuid = {3F966BD9-FA04-4ec5-991C-D326973B5128}
Provider = %ProviderName%
-DriverVer = 05/24/2012,6.0.0000.00000
+DriverVer = 08/27/2012,7.0.0000.00001
CatalogFile.NTx86 = androidwinusb86.cat
CatalogFile.NTamd64 = androidwinusba64.cat
-;
-; 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
@@ -22,9 +17,11 @@
HKR,,,0,%ClassName%
HKR,,Icon,,-1
+
[Manufacturer]
%ProviderName% = Google, NTx86, NTamd64
+
[Google.NTx86]
;Google Nexus One
@@ -46,6 +43,21 @@
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E42&MI_01
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E44&MI_01
+;Google Nexus Q
+%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_2C10
+%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_2C11
+
+;Google Nexus (generic)
+%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_4EE0
+%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE1
+%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE2
+%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE2&MI_01
+%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE3
+%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE4&MI_01
+%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE5
+%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE6&MI_01
+
+
[Google.NTamd64]
;Google Nexus One
@@ -67,6 +79,20 @@
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E42&MI_01
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E44&MI_01
+;Google Nexus Q
+%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_2C10
+%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_2C11
+
+;Google Nexus (generic)
+%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_4EE0
+%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE1
+%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE2
+%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE2&MI_01
+%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE3
+%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE4&MI_01
+%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE5
+%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE6&MI_01
+
[USB_Install]
Include = winusb.inf
Needs = WINUSB.NT
@@ -127,4 +153,4 @@
SingleBootLoaderInterface = "Android Bootloader Interface"
WinUSB_SvcDesc = "Android USB Driver"
DISK_NAME = "Android WinUsb installation disk"
-ClassName = "Android Phone"
+ClassName = "Android Device"
diff --git a/host/windows/usb/readme.txt b/host/windows/usb/readme.txt
index 961b45a..d01bc98 100755
--- a/host/windows/usb/readme.txt
+++ b/host/windows/usb/readme.txt
@@ -15,7 +15,7 @@
* WdfCoInstaller01007.dll
* WinUSBCoInstaller.dll
* WUDFUpdate_01007.dll
-
+
File contained in i386 and amd64 subfolders are Microsoft distributives needed
to install WinUsb framework. These files can be obtained from WDK 'redist'
folder, respectively to the OS: copy x86 files to i386 subfolder, and amd64
diff --git a/sdk/usbdriver_source.properties b/sdk/usbdriver_source.properties
index 73ddf74..bff71f9 100755
--- a/sdk/usbdriver_source.properties
+++ b/sdk/usbdriver_source.properties
@@ -1,4 +1,4 @@
-Pkg.Revision=6
+Pkg.Revision=7
Archive.Os=WINDOWS
Archive.Arch=ANY
Extra.Path=usb_driver
