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

New Wiimote Plugin: Keep track of the io_write report sizes instead of just sending MAX_PAYLOAD bytes. (Should fix the issues of my last commit) 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5997 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak 2010-07-29 20:11:55 +00:00
parent f081710800
commit 8223dcd32c
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp
View File

@ -46,17 +46,6 @@ Common::CriticalSection g_refresh_critsec, g_wiimote_critsec;
THREAD_RETURN WiimoteThreadFunc(void* arg); THREAD_RETURN WiimoteThreadFunc(void* arg);
// silly, copying data n stuff, o well, don't use this too often
void SendPacket(wiimote_t* const wm, const u8 rpt_id, const void* const data, const unsigned int size)
{
u8* const rpt = new u8[size + 2];
rpt[0] = 0xA1;
rpt[1] = rpt_id;
memcpy(rpt + 2, data, size);
wiiuse_io_write(wm, (byte*)rpt, size + 2);
delete[] rpt;
}
class Wiimote class Wiimote
{ {
public: public:
@ -72,6 +61,11 @@ public:
void Disconnect(); void Disconnect();
void DisableDataReporting(); void DisableDataReporting();
void SendPacket(const u8 rpt_id, const void* const data, const unsigned int size);
// pointer to data, and size of data
typedef std::pair<u8*,u8> Report;
private: private:
void ClearReports(); void ClearReports();
@ -83,7 +77,7 @@ private:
bool m_last_data_report_valid; bool m_last_data_report_valid;
Common::FifoQueue<u8*> m_read_reports; Common::FifoQueue<u8*> m_read_reports;
Common::FifoQueue<u8*> m_write_reports; Common::FifoQueue<Report> m_write_reports;
}; };
Wiimote::Wiimote(wiimote_t* const wm, const unsigned int index) Wiimote::Wiimote(wiimote_t* const wm, const unsigned int index)
@ -137,21 +131,33 @@ Wiimote::~Wiimote()
//} //}
} }
// silly, copying data n stuff, o well, don't use this too often
void Wiimote::SendPacket(const u8 rpt_id, const void* const data, const unsigned int size)
{
Report rpt;
rpt.second = size + 2;
rpt.first = new u8[rpt.second];
rpt.first[0] = 0xA1;
rpt.first[1] = rpt_id;
memcpy(rpt.first + 2, data, size);
m_write_reports.Push(rpt);
}
void Wiimote::DisableDataReporting() void Wiimote::DisableDataReporting()
{ {
wm_report_mode rpt = wm_report_mode(); wm_report_mode rpt = wm_report_mode();
rpt.mode = WM_REPORT_CORE; rpt.mode = WM_REPORT_CORE;
SendPacket(m_wiimote, WM_REPORT_MODE, &rpt, sizeof(rpt)); SendPacket(WM_REPORT_MODE, &rpt, sizeof(rpt));
} }
void Wiimote::ClearReports() void Wiimote::ClearReports()
{ {
m_last_data_report_valid = false; m_last_data_report_valid = false;
u8* rpt; Report rpt;
while (m_read_reports.Pop(rpt)) while (m_read_reports.Pop(rpt.first))
delete[] rpt; delete[] rpt.first;
while (m_write_reports.Pop(rpt)) while (m_write_reports.Pop(rpt))
delete[] rpt; delete[] rpt.first;
} }
void Wiimote::ControlChannel(const u16 channel, const void* const data, const u32 size) void Wiimote::ControlChannel(const u16 channel, const void* const data, const u32 size)
@ -172,13 +178,15 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const data, const
// request status // request status
wm_request_status rpt = wm_request_status(); wm_request_status rpt = wm_request_status();
SendPacket(m_wiimote, WM_REQUEST_STATUS, &rpt, sizeof(rpt)); SendPacket(WM_REQUEST_STATUS, &rpt, sizeof(rpt));
} }
m_channel = channel; // this right? m_channel = channel; // this right?
u8* const rpt = new u8[MAX_PAYLOAD]; Wiimote::Report rpt;
memcpy(rpt, (byte*)data, MAX_PAYLOAD); rpt.first = new u8[size];
rpt.second = (u8)size;
memcpy(rpt.first, (u8*)data, size);
m_write_reports.Push(rpt); m_write_reports.Push(rpt);
} }
@ -208,11 +216,11 @@ void Wiimote::Read()
void Wiimote::Write() void Wiimote::Write()
{ {
u8* rpt; Report rpt;
if (m_write_reports.Pop(rpt)) if (m_write_reports.Pop(rpt))
{ {
wiiuse_io_write(m_wiimote, rpt, MAX_PAYLOAD); wiiuse_io_write(m_wiimote, rpt.first, rpt.second);
delete[] rpt; delete[] rpt.first;
} }
} }