SDK: Windows USB driver rev 8.
Fixes for Nexus 7 and generic PIDs.
SDK Bugs: b/6494263, b/9322844
Change-Id: I40ea1d1abdb557dd7c67873ac592cbc2320754d5
diff --git a/host/windows/usb/android_winusb.inf b/host/windows/usb/android_winusb.inf
index f26a75c..8dbfe09 100755
--- a/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@ -6,7 +6,7 @@
Class = AndroidUsbDeviceClass
ClassGuid = {3F966BD9-FA04-4ec5-991C-D326973B5128}
Provider = %ProviderName%
-DriverVer = 08/27/2012,7.0.0000.00001
+DriverVer = 07/09/2013,8.0.0000.00000
CatalogFile.NTx86 = androidwinusb86.cat
CatalogFile.NTamd64 = androidwinusba64.cat
@@ -38,8 +38,6 @@
;Google Nexus 7
%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_4E40
-%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4E41
-%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E42
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E42&MI_01
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E44&MI_01
@@ -49,12 +47,8 @@
;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_4EE4&MI_02
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE6&MI_01
@@ -74,8 +68,6 @@
;Google Nexus 7
%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_4E40
-%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4E41
-%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E42
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E42&MI_01
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E44&MI_01
@@ -85,12 +77,8 @@
;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_4EE4&MI_02
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE6&MI_01
[USB_Install]
diff --git a/sdk/usbdriver_source.properties b/sdk/usbdriver_source.properties
index bff71f9..c33d032 100755
--- a/sdk/usbdriver_source.properties
+++ b/sdk/usbdriver_source.properties
@@ -1,4 +1,4 @@
-Pkg.Revision=7
+Pkg.Revision=8
Archive.Os=WINDOWS
Archive.Arch=ANY
Extra.Path=usb_driver
