sigonasr2/SMX_PGE
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add more logs for device connections.

Browse Source
This commit is contained in:
Glenn Maynard 2018-05-31 20:25:07 -05:00
parent 913f740113
commit 9b6eb07e0b
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sdk/Windows/SMXDeviceSearch.cpp
View File

@ -37,7 +37,7 @@ static set<wstring> GetAllHIDDevicePaths(wstring &error)
int iError = GetLastError(); int iError = GetLastError();
if(iError != ERROR_INSUFFICIENT_BUFFER) if(iError != ERROR_INSUFFICIENT_BUFFER)
{ {
// Helpers::FormatWindowsError(error); Log(ssprintf("SetupDiGetDeviceInterfaceDetail failed: %ls", GetErrorString(iError).c_str()));
continue; continue;
} }
} }
@ -49,7 +49,10 @@ static set<wstring> GetAllHIDDevicePaths(wstring &error)
ZeroMemory(&DeviceInfoData, sizeof(SP_DEVINFO_DATA)); ZeroMemory(&DeviceInfoData, sizeof(SP_DEVINFO_DATA));
DeviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA); DeviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
if(!SetupDiGetDeviceInterfaceDetail(DeviceInfoSet, &DeviceInterfaceData, DeviceInterfaceDetailData, iSize, NULL, &DeviceInfoData)) if(!SetupDiGetDeviceInterfaceDetail(DeviceInfoSet, &DeviceInterfaceData, DeviceInterfaceDetailData, iSize, NULL, &DeviceInfoData))
{
Log(ssprintf("SetupDiGetDeviceInterfaceDetail failed: %ls", GetErrorString(GetLastError()).c_str()));
continue; continue;
}
paths.insert(DeviceInterfaceDetailData->DevicePath); paths.insert(DeviceInterfaceDetailData->DevicePath);
} }
@ -61,14 +64,20 @@ static set<wstring> GetAllHIDDevicePaths(wstring &error)
static shared_ptr<AutoCloseHandle> OpenUSBDevice(LPCTSTR DevicePath, wstring &error) static shared_ptr<AutoCloseHandle> OpenUSBDevice(LPCTSTR DevicePath, wstring &error)
{ {
// Log(ssprintf("Opening device: %ls", DevicePath));
HANDLE OpenDevice = CreateFile( HANDLE OpenDevice = CreateFile(
DevicePath, DevicePath,
GENERIC_READ | GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL
); );
if(OpenDevice == INVALID_HANDLE_VALUE) if(OpenDevice == INVALID_HANDLE_VALUE)
{
// Many unrelated devices will fail to open, so don't return this as an error.
Log(ssprintf("Error opening device %ls: %ls", DevicePath, GetErrorString(GetLastError()).c_str()));
return nullptr; return nullptr;
}
auto result = make_shared<AutoCloseHandle>(OpenDevice); auto result = make_shared<AutoCloseHandle>(OpenDevice);
@ -77,22 +86,32 @@ static shared_ptr<AutoCloseHandle> OpenUSBDevice(LPCTSTR DevicePath, wstring &er
HidAttributes.Size = sizeof(HidAttributes); HidAttributes.Size = sizeof(HidAttributes);
if(!HidD_GetAttributes(result->value(), &HidAttributes)) if(!HidD_GetAttributes(result->value(), &HidAttributes))
{ {
Log(ssprintf("Error opening device %ls: HidD_GetAttributes failed", DevicePath));
error = L"HidD_GetAttributes failed"; error = L"HidD_GetAttributes failed";
return nullptr; return nullptr;
} }
if(HidAttributes.VendorID != 0x2341 || HidAttributes.ProductID != 0x8037) if(HidAttributes.VendorID != 0x2341 || HidAttributes.ProductID != 0x8037)
{
Log(ssprintf("Device %ls: not our device (ID %04x:%04x)", DevicePath, HidAttributes.VendorID, HidAttributes.ProductID));
return nullptr; return nullptr;
}
// Since we're using the default Arduino IDs, check the product name to make sure // Since we're using the default Arduino IDs, check the product name to make sure
// this isn't some other Arduino device. // this isn't some other Arduino device.
WCHAR ProductName[255]; WCHAR ProductName[255];
ZeroMemory(ProductName, sizeof(ProductName)); ZeroMemory(ProductName, sizeof(ProductName));
if(!HidD_GetProductString(result->value(), ProductName, 255)) if(!HidD_GetProductString(result->value(), ProductName, 255))
{
Log(ssprintf("Error opening device %ls: HidD_GetProductString failed", DevicePath));
return nullptr; return nullptr;
}
if(wstring(ProductName) != L"StepManiaX") if(wstring(ProductName) != L"StepManiaX")
{
Log(ssprintf("Device %ls: not our device (%ls)", DevicePath, ProductName));
return nullptr; return nullptr;
}
return result; return result;
} }