buildfix!

This commit is contained in:
Jordan Woyak 2013-02-11 03:50:54 -06:00
parent 05ec90488b
commit 7a053d0f07
4 changed files with 7 additions and 6 deletions

View File

@ -27,8 +27,8 @@ namespace WiimoteReal
{ {
WiimoteScanner::WiimoteScanner() WiimoteScanner::WiimoteScanner()
: run_thread() : m_run_thread()
, want_wiimotes() , m_want_wiimotes()
, device_id(-1) , device_id(-1)
, device_sock(-1) , device_sock(-1)
{ {

View File

@ -138,6 +138,8 @@ void RemoveWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi);
bool ForgetWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi); bool ForgetWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi);
WiimoteScanner::WiimoteScanner() WiimoteScanner::WiimoteScanner()
: m_run_thread()
, m_want_wiimotes()
{ {
init_lib(); init_lib();
} }

View File

@ -106,6 +106,8 @@ namespace WiimoteReal
{ {
WiimoteScanner::WiimoteScanner() WiimoteScanner::WiimoteScanner()
: m_run_thread()
, m_want_wiimotes()
{} {}
WiimoteScanner::~WiimoteScanner() WiimoteScanner::~WiimoteScanner()

View File

@ -250,14 +250,11 @@ bool Wiimote::Prepare(int _index)
index = _index; index = _index;
// Set the active LEDs. // 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 // Rumble briefly
u8 rumble_report[] = {HID_TYPE_SET_REPORT, WM_CMD_RUMBLE, 1}; 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? // TODO: request status and check for sane response?
return (IOWrite(led_report, sizeof(led_report)) return (IOWrite(led_report, sizeof(led_report))