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

Real Wiimote build fix for linux 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5319 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-04-10 18:49:26 +00:00
parent 50a4293d85
commit d00f5b20a1
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp
View File

@ -132,24 +132,26 @@ void SendData(u16 _channelID, const u8* _pData, u32 _Size)
/* Read and write data to the Wiimote */ /* Read and write data to the Wiimote */
void ReadData() void ReadData()
{ {
m_pCriticalSection->Enter(); m_pCriticalSection->Enter();
// Send data to the Wiimote // Send data to the Wiimote
if (!m_EventWriteQueue.empty()) if (!m_EventWriteQueue.empty())
{ {
//DEBUG_LOG(WIIMOTE, "Writing data to the Wiimote"); //DEBUG_LOG(WIIMOTE, "Writing data to the Wiimote");
SEvent& rEvent = m_EventWriteQueue.front(); SEvent& rEvent = m_EventWriteQueue.front();
wiiuse_io_write(m_pWiiMote, (byte*)rEvent.m_PayLoad, rEvent._Size); wiiuse_io_write(m_pWiiMote, (byte*)rEvent.m_PayLoad, rEvent._Size);
#ifdef _WIN32
if (m_pWiiMote->event == WIIUSE_UNEXPECTED_DISCONNECT) if (m_pWiiMote->event == WIIUSE_UNEXPECTED_DISCONNECT)
{ {
NOTICE_LOG(WIIMOTE, "wiiuse_io_write: unexpected disconnect. handle: %08x", m_pWiiMote->dev_handle); NOTICE_LOG(WIIMOTE, "wiiuse_io_write: unexpected disconnect. handle: %08x", m_pWiiMote->dev_handle);
} }
m_EventWriteQueue.pop(); #endif
m_EventWriteQueue.pop();
// InterruptDebugging(false, rEvent.m_PayLoad);
}
m_pCriticalSection->Leave(); // InterruptDebugging(false, rEvent.m_PayLoad);
}
m_pCriticalSection->Leave();
// Read data from wiimote (but don't send it to the core, just filter and queue) // Read data from wiimote (but don't send it to the core, just filter and queue)
@ -160,7 +162,7 @@ void ReadData()
if (m_channelID > 0) if (m_channelID > 0)
{ {
m_pCriticalSection->Enter(); m_pCriticalSection->Enter();
// Filter out data reports // Filter out data reports
if (pBuffer[1] >= 0x30) if (pBuffer[1] >= 0x30)
{ {
@ -180,10 +182,12 @@ void ReadData()
m_pCriticalSection->Leave(); m_pCriticalSection->Leave();
} }
} }
#ifdef _WIN32
else if (m_pWiiMote->event == WIIUSE_UNEXPECTED_DISCONNECT) else if (m_pWiiMote->event == WIIUSE_UNEXPECTED_DISCONNECT)
{ {
NOTICE_LOG(WIIMOTE, "wiiuse_io_read: unexpected disconnect. handle: %08x", m_pWiiMote->dev_handle); NOTICE_LOG(WIIMOTE, "wiiuse_io_read: unexpected disconnect. handle: %08x", m_pWiiMote->dev_handle);
} }
#endif
}; };