コミット: 327b8aa802ae97956fdbfbd53b75d263daaa2875 - development (git)

development

コミットメタ情報

• リビジョン: 327b8aa802ae97956fdbfbd53b75d263daaa2875 (tree)
• 日時: 2010-12-07 09:33:25
• 作者: Raphael <raphael@goog...>
• コミッター: Raphael

ログメッセージ

USB driver: update to public rev 4

Change-Id: Icecde3b08876a939db3f170ba9a4b23260df336f

変更サマリ

• modified: host/windows/usb/android_winusb.inf

差分

--- a/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@ -6,7 +6,7 @@ Signature           = "$Windows NT$"
 Class               = AndroidUsbDeviceClass
 ClassGuid           = {3F966BD9-FA04-4ec5-991C-D326973B5128}
 Provider            = %ProviderName%
-DriverVer           = 08/11/2009,2.0.0010.00002
+DriverVer           = 12/06/2010,4.0.0000.00000
 CatalogFile.NTx86   = androidwinusb86.cat
 CatalogFile.NTamd64 = androidwinusba64.cat
 
@@ -43,26 +43,6 @@ HKR,,Icon,,-1
 %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
-%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
@@ -82,29 +62,6 @@ HKR,,Icon,,-1
 %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
-%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
-=======
-%CompositeAdbInterface%     = USB_Install, USB\VID_413C&PID_B007&MI_01
->>>>>>> 4e75b80a
 
 [USB_Install]
 Include = winusb.inf
@@ -125,7 +82,7 @@ ServiceBinary   = %12%\WinUSB.sys
 KmdfService = WINUSB, WinUSB_Install
 
 [WinUSB_Install]
-KmdfLibraryVersion  = 1.7
+KmdfLibraryVersion  = 1.9
 
 [USB_Install.HW]
 AddReg  = Dev_AddReg
@@ -138,11 +95,11 @@ AddReg    = CoInstallers_AddReg
 CopyFiles = CoInstallers_CopyFiles
 
 [CoInstallers_AddReg]
-HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01007.dll,WdfCoInstaller","WinUSBCoInstaller.dll"
+HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01009.dll,WdfCoInstaller","WinUSBCoInstaller2.dll"
 
 [CoInstallers_CopyFiles]
-WinUSBCoInstaller.dll
-WdfCoInstaller01007.dll
+WinUSBCoInstaller2.dll
+WdfCoInstaller01009.dll
 
 [DestinationDirs]
 CoInstallers_CopyFiles=11
@@ -152,12 +109,12 @@ CoInstallers_CopyFiles=11
 2 = %DISK_NAME%,,,\amd64
 
 [SourceDisksFiles.x86]
-WinUSBCoInstaller.dll  = 1
-WdfCoInstaller01007.dll = 1
+WinUSBCoInstaller2.dll  = 1
+WdfCoInstaller01009.dll = 1
 
 [SourceDisksFiles.amd64]
-WinUSBCoInstaller.dll  = 2
-WdfCoInstaller01007.dll = 2
+WinUSBCoInstaller2.dll  = 2
+WdfCoInstaller01009.dll = 2
 
 [Strings]
 ProviderName                = "Google, Inc."