Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
john-peterson authored and RachelBryk committed Jul 11, 2013
1 parent a1822a3 commit c52a583
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
8 changes: 5 additions & 3 deletions Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp
Expand Up @@ -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;

Expand All @@ -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;

Expand Down Expand Up @@ -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);
}

Expand Down
2 changes: 2 additions & 0 deletions Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
Expand Up @@ -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 :
Expand Down
5 changes: 0 additions & 5 deletions Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
Expand Up @@ -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();

Expand Down

0 comments on commit c52a583

Please sign in to comment.