From 62b49ea2d63d67b0336da3d8bc01db1b119d691a Mon Sep 17 00:00:00 2001 From: nakeee Date: Mon, 27 Oct 2008 07:34:57 +0000 Subject: [PATCH] few compile errors fixed on linux (please check them out as I'm not 100% sure about them) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@975 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 6 +++--- Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote.cpp | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 303ab173bb..fd42385f88 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -1151,11 +1151,11 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandReadLocalFeatures(u8* _Input) void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandReadStoredLinkKey(u8* _Input) { -#ifdef LOGGING + // command parameters hci_read_stored_link_key_cp* ReadStoredLinkKey = (hci_read_stored_link_key_cp*)_Input; -#endif +#ifdef LOGGING LOG(WIIMOTE, "Command: HCI_CMD_READ_STORED_LINK_KEY:"); LOG(WIIMOTE, "input:"); LOG(WIIMOTE, " bd: %02x:%02x:%02x:%02x:%02x:%02x", @@ -1164,7 +1164,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandReadStoredLinkKey(u8* _Input) LOG(WIIMOTE, " read_all_ %i", ReadStoredLinkKey->read_all); LOG(WIIMOTE, "return:"); LOG(WIIMOTE, " no idea what i should answer :)"); - +#endif // reply hci_read_stored_link_key_rp Reply; diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote.cpp b/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote.cpp index 01c4a252e4..ec9931d6c6 100644 --- a/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote.cpp +++ b/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote.cpp @@ -392,8 +392,12 @@ void FillReportInfo(wm_core& _core) { static bool bb = true; bb = !bb; +#ifdef _WIN32 _core.a = GetAsyncKeyState(VK_LBUTTON) ? 1 : 0; _core.b = GetAsyncKeyState(VK_RBUTTON) ? 1 : 0; +#else + // TODO: fill in +#endif }