summaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2010-05-18 13:45:36 -0700
committerVladimir Chtchetkine <vchtchetkine@google.com>2010-05-18 13:45:36 -0700
commitdeef918041bd00c5be7f3533913bc92eac8c829c (patch)
tree7dcc4bbbf14cd51681f4987ca4784aa0b2dae6f5 /host
parent5b4766d4a2082b019f144c88e4d697f81cd831fe (diff)
downloadandroid_development-deef918041bd00c5be7f3533913bc92eac8c829c.tar.gz
android_development-deef918041bd00c5be7f3533913bc92eac8c829c.tar.bz2
android_development-deef918041bd00c5be7f3533913bc92eac8c829c.zip
Add Samsung VID/PID to android_winusb.inf fixing bug 2687489
Change-Id: I31baae3400ef8ef04270fd17352ee81cd244d779
Diffstat (limited to 'host')
-rwxr-xr-xhost/windows/usb/android_winusb.inf56
1 files changed, 45 insertions, 11 deletions
diff --git a/host/windows/usb/android_winusb.inf b/host/windows/usb/android_winusb.inf
index b2daf8954..331ed6df8 100755
--- a/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@ -38,14 +38,31 @@ HKR,,Icon,,-1
%CompositeAdbInterface% = USB_Install, USB\VID_22B8&PID_41DB&MI_01
;
;Google NexusOne
-%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02
+%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
+%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4E11
+%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E12&MI_01
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E22&MI_01
-;
-; Dell's Mini5
-%CompositeAdbInterface% = USB_Install, USB\VID_413C&PID_B007&MI_01
+;
+; Dell's Mini5
+%SingleAdbInterface% = USB_Install, USB\VID_413C&PID_B007
+%CompositeAdbInterface% = USB_Install, USB\VID_413C&PID_B007&MI_01
+;
+; Samsung SPH-M900, GT-I5700, SCH-R880
+%SingleAdbInterface% = USB_Install, USB\VID_04E8&PID_681C
+%CompositeAdbInterface% = USB_Install, USB\VID_04E8&PID_681C&MI_01
+; Samsung GT-I7500
+%SingleAdbInterface% = USB_Install, USB\VID_04E8&PID_6601
+%CompositeAdbInterface% = USB_Install, USB\VID_04E8&PID_6601&MI_01
+; Samsung GT-I5500
+%SingleAdbInterface% = USB_Install, USB\VID_04E8&PID_6882
+%CompositeAdbInterface% = USB_Install, USB\VID_04E8&PID_6882&MI_01
+; Samsung SHW-M100S
+%SingleAdbInterface% = USB_Install, USB\VID_04E8&PID_6850
+%CompositeAdbInterface% = USB_Install, USB\VID_04E8&PID_6850&MI_01
+; Samsung SHW-M110S
+%SingleAdbInterface% = USB_Install, USB\VID_04E8&PID_681D
+%CompositeAdbInterface% = USB_Install, USB\VID_04E8&PID_681D&MI_01
[Google.NTamd64]
; HTC Dream
@@ -61,13 +78,30 @@ HKR,,Icon,,-1
;
;Google NexusOne
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02
-%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02&MI_01
+%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
+%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E12&MI_01
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E22&MI_01
-;
-; Dell's Mini5
-%CompositeAdbInterface% = USB_Install, USB\VID_413C&PID_B007&MI_01
+;
+; Dell's Mini5
+%SingleAdbInterface% = USB_Install, USB\VID_413C&PID_B007
+%CompositeAdbInterface% = USB_Install, USB\VID_413C&PID_B007&MI_01
+;
+; Samsung SPH-M900, GT-I5700, SCH-R880
+%SingleAdbInterface% = USB_Install, USB\VID_04E8&PID_681C
+%CompositeAdbInterface% = USB_Install, USB\VID_04E8&PID_681C&MI_01
+; Samsung GT-I7500
+%SingleAdbInterface% = USB_Install, USB\VID_04E8&PID_6601
+%CompositeAdbInterface% = USB_Install, USB\VID_04E8&PID_6601&MI_01
+; Samsung GT-I5500
+%SingleAdbInterface% = USB_Install, USB\VID_04E8&PID_6882
+%CompositeAdbInterface% = USB_Install, USB\VID_04E8&PID_6882&MI_01
+; Samsung SHW-M100S
+%SingleAdbInterface% = USB_Install, USB\VID_04E8&PID_6850
+%CompositeAdbInterface% = USB_Install, USB\VID_04E8&PID_6850&MI_01
+; Samsung SHW-M110S
+%SingleAdbInterface% = USB_Install, USB\VID_04E8&PID_681D
+%CompositeAdbInterface% = USB_Install, USB\VID_04E8&PID_681D&MI_01
[USB_Install]
Include = winusb.inf