From b84bf2f273efae868f4faed899c9b81b581e1697 Mon Sep 17 00:00:00 2001 From: nakeee Date: Wed, 26 Nov 2008 17:40:28 +0000 Subject: [PATCH] more warnings fixed git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1304 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 18 +++--- .../Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp | 18 +++--- Source/Core/Core/Src/IPC_HLE/l2cap.h | 62 +++++++++---------- Source/Core/Core/Src/Plugins/Plugin_DSP.cpp | 2 + 4 files changed, 51 insertions(+), 49 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 597abc32eb..ed817e0f85 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 @@ -27,16 +27,16 @@ int g_GlobalHandle = 0; CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _DeviceID, const std::string& _rDeviceName) : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName) - , m_pACLBuffer(NULL) - , m_pHCIBuffer(NULL) + , m_PINType(0) , m_ScanEnable(0) - , m_PINType(0) , m_EventFilterType(0) , m_EventFilterCondition(0) , m_HostMaxACLSize(0) , m_HostMaxSCOSize(0) , m_HostNumACLPackets(0) , m_HostNumSCOPackets(0) + , m_pACLBuffer(NULL) + , m_pHCIBuffer(NULL) { m_WiiMotes.push_back(CWII_IPC_HLE_WiiMote(this, 0)); @@ -567,8 +567,6 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRequestConnection(CWII_IPC_HL bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRequestLinkKey(bdaddr_t _bd) { - const CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_bd); - SQueuedEvent Event(sizeof(SHCIEventRequestLinkKey), 0); SHCIEventRequestLinkKey* pEventRequestLinkKey = (SHCIEventRequestLinkKey*)Event.m_buffer; @@ -1073,13 +1071,13 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom // default: { - u16 ocf = HCI_OCF(pMsg->Opcode); - u16 ogf = HCI_OGF(pMsg->Opcode); + u16 _ocf = HCI_OCF(pMsg->Opcode); + u16 _ogf = HCI_OGF(pMsg->Opcode); - if (ogf == 0x3f) + if (_ogf == 0x3f) { PanicAlert("Vendor specific HCI command"); - LOG(WII_IPC_WIIMOTE, "Command: vendor specific: 0x%04X (ocf: 0x%x)", pMsg->Opcode, ocf); + LOG(WII_IPC_WIIMOTE, "Command: vendor specific: 0x%04X (ocf: 0x%x)", pMsg->Opcode, _ocf); for (int i=0; ilen; i++) { @@ -1088,7 +1086,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom } else { - _dbg_assert_msg_(WII_IPC_WIIMOTE, 0, "Unknown USB_IOCTL_CTRLMSG: 0x%04X (ocf: 0x%x ogf 0x%x)", pMsg->Opcode, ocf, ogf); + _dbg_assert_msg_(WII_IPC_WIIMOTE, 0, "Unknown USB_IOCTL_CTRLMSG: 0x%04X (ocf: 0x%x ogf 0x%x)", pMsg->Opcode, _ocf, _ogf); } // send fake all is okay msg... diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index cf808dfb9b..9581074ae8 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -137,17 +137,19 @@ static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb; CWII_IPC_HLE_WiiMote::CWII_IPC_HLE_WiiMote(CWII_IPC_HLE_Device_usb_oh1_57e_305* _pHost, int _Number) - : m_Name("Nintendo RVL-CNT-01") - , m_pHost(_pHost) - , m_Connected(false) + : m_Connected(false) , m_HIDControlChannel_Connected(false) - , m_HIDControlChannel_Config(false) - , m_HIDInterruptChannel_Connected(false) - , m_HIDInterruptChannel_Config(false) , m_HIDControlChannel_ConnectedWait(false) + , m_HIDControlChannel_Config(false) , m_HIDControlChannel_ConfigWait(false) + , m_HIDInterruptChannel_Connected(false) , m_HIDInterruptChannel_ConnectedWait(false) - , m_HIDInterruptChannel_ConfigWait(false) + , m_HIDInterruptChannel_Config(false) + , m_HIDInterruptChannel_ConfigWait(false) + , m_Name("Nintendo RVL-CNT-01") + , m_pHost(_pHost) + + { s_Usb = _pHost; LOG(WII_IPC_WIIMOTE, "Wiimote %i constructed", _Number); @@ -963,4 +965,4 @@ namespace Core s_Usb->m_WiiMotes[0].SendL2capData(_channelID, _pData, _Size); LOGV(WII_IPC_WIIMOTE, 3, "========================================================="); } -} \ No newline at end of file +} diff --git a/Source/Core/Core/Src/IPC_HLE/l2cap.h b/Source/Core/Core/Src/IPC_HLE/l2cap.h index 7f46e278fc..ca23f20f0b 100644 --- a/Source/Core/Core/Src/IPC_HLE/l2cap.h +++ b/Source/Core/Core/Src/IPC_HLE/l2cap.h @@ -219,52 +219,52 @@ struct value_string }; static const value_string command_code_vals[] = { - { 0x01, "Command Reject" }, - { 0x02, "Connection Request" }, - { 0x03, "Connection Response" }, - { 0x04, "Configure Request" }, - { 0x05, "Configure Response" }, - { 0x06, "Disconnect Request" }, - { 0x07, "Disconnect Response" }, - { 0x08, "Echo Request" }, - { 0x09, "Echo Response" }, - { 0x0A, "Information Request" }, - { 0x0B, "Information Response" }, - { 0, NULL } + { 0x01, (char *)"Command Reject" }, + { 0x02, (char *)"Connection Request" }, + { 0x03, (char *)"Connection Response" }, + { 0x04, (char *)"Configure Request" }, + { 0x05, (char *)"Configure Response" }, + { 0x06, (char *)"Disconnect Request" }, + { 0x07, (char *)"Disconnect Response" }, + { 0x08, (char *)"Echo Request" }, + { 0x09, (char *)"Echo Response" }, + { 0x0A, (char *)"Information Request" }, + { 0x0B, (char *)"Information Response" }, + { 0, NULL } }; static const value_string psm_vals[] = { - { 0x0001, "SDP" }, - { 0x0003, "RFCOMM" }, - { 0x0005, "TCS-BIN" }, - { 0x0007, "TCS-BIN-CORDLESS" }, - { 0x000F, "BNEP" }, - { 0x0011, "HID_CONTROL" }, - { 0x0013, "HID_INTERRUPT" }, - { 0x0015, "UPnP" }, - { 0x0017, "AVCTP" }, - { 0x0019, "AVDTP" }, - { 0x001D, "UDI_C-Plane" }, + { 0x0001, (char *)"SDP" }, + { 0x0003, (char *)"RFCOMM" }, + { 0x0005, (char *)"TCS-BIN" }, + { 0x0007, (char *)"TCS-BIN-CORDLESS" }, + { 0x000F, (char *)"BNEP" }, + { 0x0011, (char *)"HID_CONTROL" }, + { 0x0013, (char *)"HID_INTERRUPT" }, + { 0x0015, (char *)"UPnP" }, + { 0x0017, (char *)"AVCTP" }, + { 0x0019, (char *)"AVDTP" }, + { 0x001D, (char *)"UDI_C-Plane" }, { 0, NULL } }; static const value_string result_vals[] = { - { 0x0000, "Connection successful" }, - { 0x0001, "Connection pending" }, - { 0x0002, "Connection Refused - PSM not supported" }, - { 0x0003, "Connection refused - security block" }, - { 0x0004, "Connection refused - no resources available" }, + { 0x0000, (char *)"Connection successful" }, + { 0x0001, (char *)"Connection pending" }, + { 0x0002, (char *)"Connection Refused - PSM not supported" }, + { 0x0003, (char *)"Connection refused - security block" }, + { 0x0004, (char *)"Connection refused - no resources available" }, { 0, NULL } }; static const value_string status_vals[] = { - { 0x0000, "No further information available" }, - { 0x0001, "Authentication panding" }, - { 0x0002, "Authorization pending" }, + { 0x0000, (char *)"No further information available" }, + { 0x0001, (char *)"Authentication panding" }, + { 0x0002, (char *)"Authorization pending" }, { 0, NULL } }; diff --git a/Source/Core/Core/Src/Plugins/Plugin_DSP.cpp b/Source/Core/Core/Src/Plugins/Plugin_DSP.cpp index f9944fc724..d12f906705 100644 --- a/Source/Core/Core/Src/Plugins/Plugin_DSP.cpp +++ b/Source/Core/Core/Src/Plugins/Plugin_DSP.cpp @@ -122,6 +122,8 @@ bool LoadPlugin(const char *_Filename) } else if (ret == 0) return false; + + return false; } } // namespace