ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing reading of the emulated Wiimote state in the real Wiimote mode 

because

* the purpose of the emulated Wiimote state in the real Wiimote mode is to store the real Wiimote state rather than synchronise with an emulated Wiimote
This commit is contained in:
John Peterson 2013-07-11 23:25:06 +02:00 committed by Rachel Bryk
parent a1822a3aca
commit c52a583090
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp
View File

@ -760,7 +760,8 @@ void Wiimote::HidOutputReport(const wm_report* const sr, const bool send_ack)
break;
case WM_REQUEST_STATUS : // 0x15
RequestStatus((wm_request_status*)sr->data);
if (WIIMOTE_SRC_EMU & g_wiimote_sources[m_index])
RequestStatus((wm_request_status*)sr->data);
return; // sends its own ack
break;
@ -769,7 +770,8 @@ void Wiimote::HidOutputReport(const wm_report* const sr, const bool send_ack)
break;
case WM_READ_DATA : // 0x17
ReadData((wm_read_data*)sr->data);
if (WIIMOTE_SRC_EMU & g_wiimote_sources[m_index])
ReadData((wm_read_data*)sr->data);
return; // sends its own ack
break;
@ -811,7 +813,7 @@ void Wiimote::HidOutputReport(const wm_report* const sr, const bool send_ack)
}
// send ack
if (send_ack)
if (send_ack && WIIMOTE_SRC_EMU & g_wiimote_sources[m_index])
SendAck(sr->wm);
}

2
Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -863,6 +863,8 @@ void Wiimote::InterruptChannel(const u16 _channelID, const void* _pData, u32 _Si
// these two types are handled in RequestStatus() & ReadData()
case WM_REQUEST_STATUS :
case WM_READ_DATA :
if (WIIMOTE_SRC_REAL == g_wiimote_sources[m_index])
WiimoteReal::InterruptChannel(m_index, _channelID, _pData, _Size);
break;
default :

5
Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -299,11 +299,6 @@ void Wiimote::Update()
return;
}
WiimoteEmu::Wiimote *const wm = (WiimoteEmu::Wiimote*)::Wiimote::GetPlugin()->controllers[index];
if (wm->Step())
return;
// Pop through the queued reports
const Report& rpt = ProcessReadQueue();