mirror of https://github.com/pbatard/rufus.git
[usb] fix detection for some Innostor UFDs
This commit is contained in:
Pete Batard
parent
b66401b355
commit
759599221c
|
|
@ -3,12 +3,12 @@
|
|||
* SMART HDD vs Flash detection - isHDD() tables
|
||||
* Copyright © 2013-2014 Pete Batard <pete@akeo.ie>
|
||||
*
|
||||
* Based in part on drivedb.h from Smartmontools:
|
||||
* Based in part on drivedb.h from Smartmontools:
|
||||
* http://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools/drivedb.h
|
||||
* Copyright © 2003-11 Philip Williams, Bruce Allen
|
||||
* Copyright © 2008-13 Christian Franke <smartmontools-support@lists.sourceforge.net>
|
||||
*
|
||||
* Also based on entries listed in the identification flash database
|
||||
* Also based on entries listed in the identification flash database
|
||||
* (http://flashboot.ru/iflash/saved/) as well as the Linux USB IDs
|
||||
* (http://www.linux-usb.org/usb.ids)
|
||||
*
|
||||
|
|
@ -215,7 +215,7 @@ static vidpid_score_t vidpid_score[] = {
|
|||
{ 0x18a5, 0x0237, 10 }, // Verbatim Portable Hard Drive (500 GB)
|
||||
// SunPlus seem to have a bunch of UFDs
|
||||
{ 0x1bcf, 0x0c31, 10 }, // SunplusIT
|
||||
// Plenty of Innostor UFDs
|
||||
// Plenty of Innostor UFDs
|
||||
{ 0x1f75, 0x0888, 10 }, // Innostor IS888
|
||||
// NOT in VID list as plenty of UFDs
|
||||
{ 0x3538, 0x0902, 10 }, // PQI H560
|
||||
|
|
@ -265,6 +265,8 @@ static vidpid_score_t vidpid_score[] = {
|
|||
{ 0x0930, 0x653e, -20 },
|
||||
{ 0x0930, 0x6544, -20 },
|
||||
{ 0x0930, 0x6545, -20 },
|
||||
// Innostor exceptions
|
||||
{ 0x0BC2, 0x03312, -20 },
|
||||
// Verbatim exceptions
|
||||
{ 0x18a5, 0x0243, -20 },
|
||||
{ 0x18a5, 0x0245, -20 },
|
||||
|
|
|
|||
10
src/rufus.rc
10
src/rufus.rc
|
|
@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
|||
|
||||
IDD_DIALOG DIALOGEX 12, 12, 242, 376
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Rufus 2.6.802"
|
||||
CAPTION "Rufus 2.6.803"
|
||||
FONT 8, "Segoe UI Symbol", 400, 0, 0x0
|
||||
BEGIN
|
||||
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
|
||||
|
|
@ -319,8 +319,8 @@ END
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 2,6,802,0
|
||||
PRODUCTVERSION 2,6,802,0
|
||||
FILEVERSION 2,6,803,0
|
||||
PRODUCTVERSION 2,6,803,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
|
|
@ -337,13 +337,13 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
|
||||
VALUE "FileDescription", "Rufus"
|
||||
VALUE "FileVersion", "2.6.802"
|
||||
VALUE "FileVersion", "2.6.803"
|
||||
VALUE "InternalName", "Rufus"
|
||||
VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
|
||||
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
|
||||
VALUE "OriginalFilename", "rufus.exe"
|
||||
VALUE "ProductName", "Rufus"
|
||||
VALUE "ProductVersion", "2.6.802"
|
||||
VALUE "ProductVersion", "2.6.803"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
|
|||
12
src/usb.c
12
src/usb.c
|
|
@ -136,9 +136,9 @@ static __inline BOOL IsVHD(const char* buffer)
|
|||
/* For debugging user reports of HDDs vs UFDs */
|
||||
//#define FORCED_DEVICE
|
||||
#ifdef FORCED_DEVICE
|
||||
#define FORCED_VID 0x125F
|
||||
#define FORCED_PID 0xA11A
|
||||
#define FORCED_NAME "ABATA CH11 USB Device"
|
||||
#define FORCED_VID 0x0BC2
|
||||
#define FORCED_PID 0x3312
|
||||
#define FORCED_NAME "Innostor Innostor USB Device"
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -194,8 +194,8 @@ BOOL GetUSBDevices(DWORD devnum)
|
|||
devint_data.cbSize = sizeof(devint_data);
|
||||
// Only care about the first interface (MemberIndex 0)
|
||||
if ( (SetupDiEnumDeviceInterfaces(dev_info, &dev_info_data, &_GUID_DEVINTERFACE_USB_HUB, 0, &devint_data))
|
||||
&& (!SetupDiGetDeviceInterfaceDetailA(dev_info, &devint_data, NULL, 0, &size, NULL))
|
||||
&& (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
|
||||
&& (!SetupDiGetDeviceInterfaceDetailA(dev_info, &devint_data, NULL, 0, &size, NULL))
|
||||
&& (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
|
||||
&& ((devint_detail_data = (PSP_DEVICE_INTERFACE_DETAIL_DATA_A)calloc(1, size)) != NULL) ) {
|
||||
devint_detail_data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A);
|
||||
if (SetupDiGetDeviceInterfaceDetailA(dev_info, &devint_data, devint_detail_data, size, &size, NULL)) {
|
||||
|
|
@ -381,7 +381,7 @@ BOOL GetUSBDevices(DWORD devnum)
|
|||
}
|
||||
if (props.speed >= USB_SPEED_MAX)
|
||||
props.speed = 0;
|
||||
uprintf("Found %s%s%s device '%s' (%s) %s\n", props.is_UASP?"UAS (":"",
|
||||
uprintf("Found %s%s%s device '%s' (%s) %s\n", props.is_UASP?"UAS (":"",
|
||||
usb_speed_name[props.speed], props.is_UASP?")":"", buffer, str, method_str);
|
||||
if (props.is_LowerSpeed)
|
||||
uprintf("NOTE: This device is an USB 3.0 device operating at lower speed...");
|
||||
|
|
|
|||
Loading…
Reference in New Issue