commit 2276398db0b0208b7627dc436ecc9e6c09e68107
author Android (Google) Code Review <android-gerrit@google.com> Fri Dec 11 13:29:37 2009 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 11 13:29:37 2009 -0800
tree a448f02c60eb4bc27e5cf5c8a7547d2c05b00aed
parent 7579e4afcff771ed7e137b46bd019acd581c9568
parent ecef8139decf8ff101c6bea2c7c89b4e3ff8ca38

Merge change I0d9344aa into eclair

* changes:
  Fixed

host/windows/usb/android_winusb.inf

diff --git a/host/windows/usb/android_winusb.inf b/host/windows/usb/android_winusb.inf
index f88af7e..54f7aa2 100755
--- a/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@ -34,11 +34,14 @@
 %CompositeAdbInterface%     = USB_Install, USB\VID_0BB4&PID_0C03&MI_01

 ;

 ;Moto Sholes

-%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_D00D

-%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_0002

-%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_0002&MI_01

 %SingleAdbInterface%        = USB_Install, USB\VID_22B8&PID_41DB

 %CompositeAdbInterface%     = USB_Install, USB\VID_22B8&PID_41DB&MI_01

+;

+;Google NexusOne

+%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_0D02
+%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_0D02&MI_01

+%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_4E11
+%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4E12&MI_01
 

 [Google.NTamd64]

 ; HTC Dream

@@ -49,11 +52,14 @@
 %CompositeAdbInterface%     = USB_Install, USB\VID_0BB4&PID_0C03&MI_01

 ;

 ;Moto Sholes

-%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_D00D

-%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_0002

-%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_0002&MI_01

 %SingleAdbInterface%        = USB_Install, USB\VID_22B8&PID_41DB

 %CompositeAdbInterface%     = USB_Install, USB\VID_22B8&PID_41DB&MI_01

+;

+;Google NexusOne

+%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_0D02

+%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_0D02&MI_01
+%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_4E11

+%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4E12&MI_01
 

 [USB_Install]

 Include = winusb.inf