diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:58 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:58 -0800 |
| commit | e3c5766074e2d6d1dcd60c4dafabce8a0c20d2b8 (patch) | |
| tree | e1440f63420acf2b3808f57738bc600b5d710c1e /host | |
| parent | 5a4d0fa291a7269007701282f32cfda55ce39008 (diff) | |
| download | android_development-e3c5766074e2d6d1dcd60c4dafabce8a0c20d2b8.tar.gz android_development-e3c5766074e2d6d1dcd60c4dafabce8a0c20d2b8.tar.bz2 android_development-e3c5766074e2d6d1dcd60c4dafabce8a0c20d2b8.zip | |
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'host')
| -rw-r--r-- | host/windows/prebuilt/AdbWinApi.dll | bin | 106496 -> 0 bytes | |||
| -rwxr-xr-x | host/windows/prebuilt/usb/AdbWinApi.dll | bin | 106496 -> 106496 bytes | |||
| -rw-r--r-- | host/windows/prebuilt/usb/driver/android_usb.inf | 6 | ||||
| -rw-r--r-- | host/windows/prebuilt/usb/driver_amd_64/android_usb.inf | 6 | ||||
| -rw-r--r-- | host/windows/usb/api/adb_interface.cpp | 4 | ||||
| -rw-r--r-- | host/windows/usb/driver/android_usb.inf | 6 |
6 files changed, 17 insertions, 5 deletions
diff --git a/host/windows/prebuilt/AdbWinApi.dll b/host/windows/prebuilt/AdbWinApi.dll Binary files differdeleted file mode 100644 index aa8e9568a..000000000 --- a/host/windows/prebuilt/AdbWinApi.dll +++ /dev/null diff --git a/host/windows/prebuilt/usb/AdbWinApi.dll b/host/windows/prebuilt/usb/AdbWinApi.dll Binary files differindex 1626bce4b..9670b4f7e 100755 --- a/host/windows/prebuilt/usb/AdbWinApi.dll +++ b/host/windows/prebuilt/usb/AdbWinApi.dll diff --git a/host/windows/prebuilt/usb/driver/android_usb.inf b/host/windows/prebuilt/usb/driver/android_usb.inf index 2837a1bc9..fff04400d 100644 --- a/host/windows/prebuilt/usb/driver/android_usb.inf +++ b/host/windows/prebuilt/usb/driver/android_usb.inf @@ -10,7 +10,7 @@ Signature="$WINDOWS NT$" Class=USB ClassGuid={F72FE0D4-CBCB-407d-8814-9ED673D0DD6B} Provider=%GOOG% -DriverVer=12/11/2008,1.0.0009.00000 +DriverVer=1/29/2009,1.0.0010.00000 CatalogFile.NTx86=androidusb86.cat CatalogFile.NTamd64=androidusba64.cat @@ -38,6 +38,7 @@ DefaultDestDir = 12 ; HTC Dream %USB\VID_0BB4&PID_0C01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C01 %USB\VID_0BB4&PID_0C02&MI_01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C02&MI_01 +%USB\VID_0BB4&PID_0FFF.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0FFF ; For XP and later [Google.NTx86] @@ -46,6 +47,7 @@ DefaultDestDir = 12 ; HTC Dream %USB\VID_0BB4&PID_0C01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C01 %USB\VID_0BB4&PID_0C02&MI_01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C02&MI_01 +%USB\VID_0BB4&PID_0FFF.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0FFF ; For AMD64 and later [Google.NTamd64] @@ -54,6 +56,7 @@ DefaultDestDir = 12 ; HTC Dream %USB\VID_0BB4&PID_0C01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C01 %USB\VID_0BB4&PID_0C02&MI_01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C02&MI_01 +%USB\VID_0BB4&PID_0FFF.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0FFF [androidusb.Dev.NT] CopyFiles=androidusb.Files.Ext @@ -120,3 +123,4 @@ ClassName = "ADB Interface" USB\VID_18D1&PID_DDDD.DeviceDescTest="ADB Testing Interface" USB\VID_0BB4&PID_0C01.DeviceDescRelease="HTC Dream" USB\VID_0BB4&PID_0C02&MI_01.DeviceDescRelease="HTC Dream Composite ADB Interface" +USB\VID_0BB4&PID_0FFF.DeviceDescRelease="HTC Bootloader" diff --git a/host/windows/prebuilt/usb/driver_amd_64/android_usb.inf b/host/windows/prebuilt/usb/driver_amd_64/android_usb.inf index 2837a1bc9..fff04400d 100644 --- a/host/windows/prebuilt/usb/driver_amd_64/android_usb.inf +++ b/host/windows/prebuilt/usb/driver_amd_64/android_usb.inf @@ -10,7 +10,7 @@ Signature="$WINDOWS NT$" Class=USB ClassGuid={F72FE0D4-CBCB-407d-8814-9ED673D0DD6B} Provider=%GOOG% -DriverVer=12/11/2008,1.0.0009.00000 +DriverVer=1/29/2009,1.0.0010.00000 CatalogFile.NTx86=androidusb86.cat CatalogFile.NTamd64=androidusba64.cat @@ -38,6 +38,7 @@ DefaultDestDir = 12 ; HTC Dream %USB\VID_0BB4&PID_0C01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C01 %USB\VID_0BB4&PID_0C02&MI_01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C02&MI_01 +%USB\VID_0BB4&PID_0FFF.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0FFF ; For XP and later [Google.NTx86] @@ -46,6 +47,7 @@ DefaultDestDir = 12 ; HTC Dream %USB\VID_0BB4&PID_0C01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C01 %USB\VID_0BB4&PID_0C02&MI_01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C02&MI_01 +%USB\VID_0BB4&PID_0FFF.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0FFF ; For AMD64 and later [Google.NTamd64] @@ -54,6 +56,7 @@ DefaultDestDir = 12 ; HTC Dream %USB\VID_0BB4&PID_0C01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C01 %USB\VID_0BB4&PID_0C02&MI_01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C02&MI_01 +%USB\VID_0BB4&PID_0FFF.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0FFF [androidusb.Dev.NT] CopyFiles=androidusb.Files.Ext @@ -120,3 +123,4 @@ ClassName = "ADB Interface" USB\VID_18D1&PID_DDDD.DeviceDescTest="ADB Testing Interface" USB\VID_0BB4&PID_0C01.DeviceDescRelease="HTC Dream" USB\VID_0BB4&PID_0C02&MI_01.DeviceDescRelease="HTC Dream Composite ADB Interface" +USB\VID_0BB4&PID_0FFF.DeviceDescRelease="HTC Bootloader" diff --git a/host/windows/usb/api/adb_interface.cpp b/host/windows/usb/api/adb_interface.cpp index 4f6c801c2..9369e13e9 100644 --- a/host/windows/usb/api/adb_interface.cpp +++ b/host/windows/usb/api/adb_interface.cpp @@ -106,7 +106,7 @@ bool AdbInterfaceObject::GetSerialNumber(void* buffer, // Open USB device for this intefface HANDLE usb_device_handle = CreateFile(interface_name().c_str(), - FILE_READ_ATTRIBUTES | FILE_READ_EA, + GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, @@ -208,7 +208,7 @@ bool AdbInterfaceObject::GetEndpointInformation(UCHAR endpoint_index, // Open USB device for this intefface HANDLE usb_device_handle = CreateFile(interface_name().c_str(), - FILE_READ_ATTRIBUTES | FILE_READ_EA, + GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, diff --git a/host/windows/usb/driver/android_usb.inf b/host/windows/usb/driver/android_usb.inf index 2837a1bc9..fff04400d 100644 --- a/host/windows/usb/driver/android_usb.inf +++ b/host/windows/usb/driver/android_usb.inf @@ -10,7 +10,7 @@ Signature="$WINDOWS NT$" Class=USB ClassGuid={F72FE0D4-CBCB-407d-8814-9ED673D0DD6B} Provider=%GOOG% -DriverVer=12/11/2008,1.0.0009.00000 +DriverVer=1/29/2009,1.0.0010.00000 CatalogFile.NTx86=androidusb86.cat CatalogFile.NTamd64=androidusba64.cat @@ -38,6 +38,7 @@ DefaultDestDir = 12 ; HTC Dream %USB\VID_0BB4&PID_0C01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C01 %USB\VID_0BB4&PID_0C02&MI_01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C02&MI_01 +%USB\VID_0BB4&PID_0FFF.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0FFF ; For XP and later [Google.NTx86] @@ -46,6 +47,7 @@ DefaultDestDir = 12 ; HTC Dream %USB\VID_0BB4&PID_0C01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C01 %USB\VID_0BB4&PID_0C02&MI_01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C02&MI_01 +%USB\VID_0BB4&PID_0FFF.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0FFF ; For AMD64 and later [Google.NTamd64] @@ -54,6 +56,7 @@ DefaultDestDir = 12 ; HTC Dream %USB\VID_0BB4&PID_0C01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C01 %USB\VID_0BB4&PID_0C02&MI_01.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0C02&MI_01 +%USB\VID_0BB4&PID_0FFF.DeviceDescRelease%=androidusb.Dev, USB\VID_0BB4&PID_0FFF [androidusb.Dev.NT] CopyFiles=androidusb.Files.Ext @@ -120,3 +123,4 @@ ClassName = "ADB Interface" USB\VID_18D1&PID_DDDD.DeviceDescTest="ADB Testing Interface" USB\VID_0BB4&PID_0C01.DeviceDescRelease="HTC Dream" USB\VID_0BB4&PID_0C02&MI_01.DeviceDescRelease="HTC Dream Composite ADB Interface" +USB\VID_0BB4&PID_0FFF.DeviceDescRelease="HTC Bootloader" |