diff --git a/XBOFS.win/PDCursesUIManager.cpp b/XBOFS.win/PDCursesUIManager.cpp index ebae3a6..58c4ef0 100644 --- a/XBOFS.win/PDCursesUIManager.cpp +++ b/XBOFS.win/PDCursesUIManager.cpp @@ -60,7 +60,7 @@ int PDCursesUIManager::checkMailbox() void PDCursesUIManager::render(bool exiting) { erase(); - mvwprintw(this->window, 0, 0, "XBOFS.win v0.3 %s", exiting ? "" : "(Press Q to exit)"); + mvwprintw(this->window, 0, 0, "XBOFS.win v0.3a %s", exiting ? "" : "(Press Q to exit)"); mvwprintw(this->window, 2, 0, "WinUSB Device Manager (Thread ID %d) status: %s", this->winUsbDeviceManager->getThreadId(), threadMessageToString(this->winUsbDeviceManagerStatus).c_str()); auto counter = 0; for (auto threadId : this->winUsbDeviceThreadIdList) { diff --git a/XBOFS.win/WinUsbDeviceManager.cpp b/XBOFS.win/WinUsbDeviceManager.cpp index 6191204..d7376f0 100644 --- a/XBOFS.win/WinUsbDeviceManager.cpp +++ b/XBOFS.win/WinUsbDeviceManager.cpp @@ -67,7 +67,7 @@ std::set WinUsbDeviceManager::retrieveDevicePaths() { this->logger->debug("Retrieving device interface paths"); do { configurationManagerResult = CM_Get_Device_Interface_List_Size(&deviceInterfaceListSize, - (LPGUID)&GUID_DEVINTERFACE_RazorAtroxWinUSBVigEmFeeder, + (LPGUID)&GUID_DEVINTERFACE_XBOFS_WIN_CONTROLLER, NULL, CM_GET_DEVICE_INTERFACE_LIST_PRESENT); @@ -87,7 +87,7 @@ std::set WinUsbDeviceManager::retrieveDevicePaths() { break; } - configurationManagerResult = CM_Get_Device_Interface_List((LPGUID)&GUID_DEVINTERFACE_RazorAtroxWinUSBVigEmFeeder, + configurationManagerResult = CM_Get_Device_Interface_List((LPGUID)&GUID_DEVINTERFACE_XBOFS_WIN_CONTROLLER, NULL, deviceInterfaceList, deviceInterfaceListSize, diff --git a/XBOFS.win/device.cpp b/XBOFS.win/device.cpp index 680d1bb..59e6a6d 100644 --- a/XBOFS.win/device.cpp +++ b/XBOFS.win/device.cpp @@ -171,7 +171,7 @@ Return value: // do { cr = CM_Get_Device_Interface_List_Size(&DeviceInterfaceListLength, - (LPGUID)&GUID_DEVINTERFACE_RazorAtroxWinUSBVigEmFeeder, + (LPGUID)&GUID_DEVINTERFACE_XBOFS_WIN_CONTROLLER, NULL, CM_GET_DEVICE_INTERFACE_LIST_PRESENT); @@ -189,7 +189,7 @@ Return value: break; } - cr = CM_Get_Device_Interface_List((LPGUID)&GUID_DEVINTERFACE_RazorAtroxWinUSBVigEmFeeder, + cr = CM_Get_Device_Interface_List((LPGUID)&GUID_DEVINTERFACE_XBOFS_WIN_CONTROLLER, NULL, DeviceInterfaceList, DeviceInterfaceListLength, diff --git a/XBOFS.win/device.h b/XBOFS.win/device.h index c221a7f..508de82 100644 --- a/XBOFS.win/device.h +++ b/XBOFS.win/device.h @@ -10,7 +10,7 @@ // Must match "DeviceInterfaceGUIDs" registry value specified in the INF file. // // 5ACF052A-3BE5-46AE-905E-356BA17671BD -DEFINE_GUID(GUID_DEVINTERFACE_RazorAtroxWinUSBVigEmFeeder, +DEFINE_GUID(GUID_DEVINTERFACE_XBOFS_WIN_CONTROLLER, 0x5ACF052A, 0x3BE5, 0x46AE, 0x90, 0x5E, 0x35, 0x6B, 0xA1, 0x76, 0x71, 0xBD); typedef struct _DEVICE_DATA {