The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 07:21:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Edge case where balance board returns corrupt extension type...

Browse Source
This commit is contained in:
Matthew Parlane 2013-05-22 22:39:55 +12:00
parent 2effab9a9f
commit 3778c96d48
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
View File

@ -353,6 +353,8 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
{ {
case WM_STATUS_REPORT: case WM_STATUS_REPORT:
{ {
real_wiimote = true;
// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Status Report"); // DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Status Report");
wm_status_report * wsr = (wm_status_report*)&buf[2]; wm_status_report * wsr = (wm_status_report*)&buf[2];
if (wsr->extension) if (wsr->extension)
@ -369,7 +371,6 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
} }
else else
{ {
real_wiimote = true;
// Normal Wiimote, exit while and be happy. // Normal Wiimote, exit while and be happy.
rc = -1; rc = -1;
} }
@ -377,7 +378,9 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
} }
case WM_ACK_DATA: case WM_ACK_DATA:
{ {
// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Ack"); real_wiimote = true;
//wm_acknowledge * wm = (wm_acknowledge*)&buf[2];
//DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Ack Error: %X ReportID: %X", wm->errorID, wm->reportID);
break; break;
} }
case WM_READ_DATA_REPLY: case WM_READ_DATA_REPLY:
@ -394,7 +397,9 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
// DEBUG_LOG(WIIMOTE, // DEBUG_LOG(WIIMOTE,
// "CheckDeviceType: GOT EXT TYPE %llX", // "CheckDeviceType: GOT EXT TYPE %llX",
// ext_type); // ext_type);
is_bb = ext_type == 0x020420A40000ULL; is_bb = (ext_type == 0x020420A40000ULL) ||
((ext_type & 0xf00000000000ULL) &&
ext_type != 0xffffffffffffULL);
} }
else else
{ {