LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 3fda35f2: Merge "Windows USB Driver for generic + Q, rev 7."

Browse Source 
* commit '3fda35f2c9cc3910a9fbab92b4b73e9891387fc5':
  Windows USB Driver for generic + Q, rev 7.
This commit is contained in:
Raphael Moll
2012-08-29 11:06:12 -07:00
committed by Android Git Automerger
parent 87485cd822 3fda35f2c9
commit 0c11d9258f
3 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
host/windows/usb/android_winusb.inf
View File

@@ -6,15 +6,10 @@ Signature = "$Windows NT$"
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 @@ Addreg = AndroidWinUsbClassReg
HKR,,,0,%ClassName%
HKR,,Icon,,-1
[Manufacturer]
%ProviderName% = Google, NTx86, NTamd64
[Google.NTx86]
;Google Nexus One
@@ -46,6 +43,21 @@ HKR,,Icon,,-1
%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 @@ HKR,,Icon,,-1
%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 @@ CompositeAdbInterface = "Android Composite ADB Interface"
SingleBootLoaderInterface = "Android Bootloader Interface"
WinUSB_SvcDesc = "Android USB Driver"
DISK_NAME = "Android WinUsb installation disk"
ClassName = "Android Phone"
ClassName = "Android Device"

2
sdk/usbdriver_source.properties
View File

@@ -1,4 +1,4 @@
Pkg.Revision=6
Pkg.Revision=7
Archive.Os=WINDOWS
Archive.Arch=ANY
Extra.Path=usb_driver