summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2013-02-11 03:50:54 -0600
committerJordan Woyak <jordan.woyak@gmail.com>2013-02-11 03:50:54 -0600
commit7a053d0f0715a5308300a9ee05928433a8250953 (patch)
tree453488abf3dbc26fdeefd7ee6634e6d4b6d97485 /Source/Core
parent05ec90488b3951d5af29e41bec47955dc36baaec (diff)
buildfix!
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp4
-rw-r--r--Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp2
-rw-r--r--Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm2
-rw-r--r--Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp5
4 files changed, 7 insertions, 6 deletions
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp
index 62fd2e4ac5..87ddc5086b 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp
@@ -27,8 +27,8 @@ namespace WiimoteReal
{
WiimoteScanner::WiimoteScanner()
- : run_thread()
- , want_wiimotes()
+ : m_run_thread()
+ , m_want_wiimotes()
, device_id(-1)
, device_sock(-1)
{
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
index c88cdebdbc..1920577de4 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
@@ -138,6 +138,8 @@ void RemoveWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi);
bool ForgetWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi);
WiimoteScanner::WiimoteScanner()
+ : m_run_thread()
+ , m_want_wiimotes()
{
init_lib();
}
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
index 9ed78800cc..51dcd17785 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
@@ -106,6 +106,8 @@ namespace WiimoteReal
{
WiimoteScanner::WiimoteScanner()
+ : m_run_thread()
+ , m_want_wiimotes()
{}
WiimoteScanner::~WiimoteScanner()
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index 6a5d91fa00..821eccea0c 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -250,14 +250,11 @@ bool Wiimote::Prepare(int _index)
index = _index;
// Set the active LEDs.
- u8 const led_report[] = {HID_TYPE_SET_REPORT, WM_CMD_LED, WIIMOTE_LED_1 << index};
+ u8 const led_report[] = {HID_TYPE_SET_REPORT, WM_CMD_LED, u8(WIIMOTE_LED_1 << index)};
// Rumble briefly
u8 rumble_report[] = {HID_TYPE_SET_REPORT, WM_CMD_RUMBLE, 1};
- // don't really care what is read, just that reading works
- u8 input_buf[MAX_PAYLOAD];
-
// TODO: request status and check for sane response?
return (IOWrite(led_report, sizeof(led_report))