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

more warnings fixed 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1304 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-11-26 17:40:28 +00:00
parent d0cd722e81
commit b84bf2f273
4 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
View File

@ -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) 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) : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
, m_pACLBuffer(NULL)
, m_pHCIBuffer(NULL)
, m_ScanEnable(0)
, m_PINType(0) , m_PINType(0)
, m_ScanEnable(0)
, m_EventFilterType(0) , m_EventFilterType(0)
, m_EventFilterCondition(0) , m_EventFilterCondition(0)
, m_HostMaxACLSize(0) , m_HostMaxACLSize(0)
, m_HostMaxSCOSize(0) , m_HostMaxSCOSize(0)
, m_HostNumACLPackets(0) , m_HostNumACLPackets(0)
, m_HostNumSCOPackets(0) , m_HostNumSCOPackets(0)
, m_pACLBuffer(NULL)
, m_pHCIBuffer(NULL)
{ {
m_WiiMotes.push_back(CWII_IPC_HLE_WiiMote(this, 0)); 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) 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); SQueuedEvent Event(sizeof(SHCIEventRequestLinkKey), 0);
SHCIEventRequestLinkKey* pEventRequestLinkKey = (SHCIEventRequestLinkKey*)Event.m_buffer; SHCIEventRequestLinkKey* pEventRequestLinkKey = (SHCIEventRequestLinkKey*)Event.m_buffer;
@ -1073,13 +1071,13 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom
// //
default: default:
{ {
u16 ocf = HCI_OCF(pMsg->Opcode); u16 _ocf = HCI_OCF(pMsg->Opcode);
u16 ogf = HCI_OGF(pMsg->Opcode); u16 _ogf = HCI_OGF(pMsg->Opcode);
if (ogf == 0x3f) if (_ogf == 0x3f)
{ {
PanicAlert("Vendor specific HCI command"); 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; i<pMsg->len; i++) for (int i=0; i<pMsg->len; i++)
{ {
@ -1088,7 +1086,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom
} }
else 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... // send fake all is okay msg...

14
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
View File

@ -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) 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_Connected(false)
, m_pHost(_pHost)
, m_Connected(false)
, m_HIDControlChannel_Connected(false) , m_HIDControlChannel_Connected(false)
, m_HIDControlChannel_Config(false)
, m_HIDInterruptChannel_Connected(false)
, m_HIDInterruptChannel_Config(false)
, m_HIDControlChannel_ConnectedWait(false) , m_HIDControlChannel_ConnectedWait(false)
, m_HIDControlChannel_Config(false)
, m_HIDControlChannel_ConfigWait(false) , m_HIDControlChannel_ConfigWait(false)
, m_HIDInterruptChannel_Connected(false)
, m_HIDInterruptChannel_ConnectedWait(false) , m_HIDInterruptChannel_ConnectedWait(false)
, m_HIDInterruptChannel_Config(false)
, m_HIDInterruptChannel_ConfigWait(false) , m_HIDInterruptChannel_ConfigWait(false)
, m_Name("Nintendo RVL-CNT-01")
, m_pHost(_pHost)
{ {
s_Usb = _pHost; s_Usb = _pHost;
LOG(WII_IPC_WIIMOTE, "Wiimote %i constructed", _Number); LOG(WII_IPC_WIIMOTE, "Wiimote %i constructed", _Number);

60
Source/Core/Core/Src/IPC_HLE/l2cap.h
View File

@ -219,52 +219,52 @@ struct value_string
}; };
static const value_string command_code_vals[] = { static const value_string command_code_vals[] = {
{ 0x01, "Command Reject" }, { 0x01, (char *)"Command Reject" },
{ 0x02, "Connection Request" }, { 0x02, (char *)"Connection Request" },
{ 0x03, "Connection Response" }, { 0x03, (char *)"Connection Response" },
{ 0x04, "Configure Request" }, { 0x04, (char *)"Configure Request" },
{ 0x05, "Configure Response" }, { 0x05, (char *)"Configure Response" },
{ 0x06, "Disconnect Request" }, { 0x06, (char *)"Disconnect Request" },
{ 0x07, "Disconnect Response" }, { 0x07, (char *)"Disconnect Response" },
{ 0x08, "Echo Request" }, { 0x08, (char *)"Echo Request" },
{ 0x09, "Echo Response" }, { 0x09, (char *)"Echo Response" },
{ 0x0A, "Information Request" }, { 0x0A, (char *)"Information Request" },
{ 0x0B, "Information Response" }, { 0x0B, (char *)"Information Response" },
{ 0, NULL } { 0, NULL }
}; };
static const value_string psm_vals[] = { static const value_string psm_vals[] = {
{ 0x0001, "SDP" }, { 0x0001, (char *)"SDP" },
{ 0x0003, "RFCOMM" }, { 0x0003, (char *)"RFCOMM" },
{ 0x0005, "TCS-BIN" }, { 0x0005, (char *)"TCS-BIN" },
{ 0x0007, "TCS-BIN-CORDLESS" }, { 0x0007, (char *)"TCS-BIN-CORDLESS" },
{ 0x000F, "BNEP" }, { 0x000F, (char *)"BNEP" },
{ 0x0011, "HID_CONTROL" }, { 0x0011, (char *)"HID_CONTROL" },
{ 0x0013, "HID_INTERRUPT" }, { 0x0013, (char *)"HID_INTERRUPT" },
{ 0x0015, "UPnP" }, { 0x0015, (char *)"UPnP" },
{ 0x0017, "AVCTP" }, { 0x0017, (char *)"AVCTP" },
{ 0x0019, "AVDTP" }, { 0x0019, (char *)"AVDTP" },
{ 0x001D, "UDI_C-Plane" }, { 0x001D, (char *)"UDI_C-Plane" },
{ 0, NULL } { 0, NULL }
}; };
static const value_string result_vals[] = { static const value_string result_vals[] = {
{ 0x0000, "Connection successful" }, { 0x0000, (char *)"Connection successful" },
{ 0x0001, "Connection pending" }, { 0x0001, (char *)"Connection pending" },
{ 0x0002, "Connection Refused - PSM not supported" }, { 0x0002, (char *)"Connection Refused - PSM not supported" },
{ 0x0003, "Connection refused - security block" }, { 0x0003, (char *)"Connection refused - security block" },
{ 0x0004, "Connection refused - no resources available" }, { 0x0004, (char *)"Connection refused - no resources available" },
{ 0, NULL } { 0, NULL }
}; };
static const value_string status_vals[] = { static const value_string status_vals[] = {
{ 0x0000, "No further information available" }, { 0x0000, (char *)"No further information available" },
{ 0x0001, "Authentication panding" }, { 0x0001, (char *)"Authentication panding" },
{ 0x0002, "Authorization pending" }, { 0x0002, (char *)"Authorization pending" },
{ 0, NULL } { 0, NULL }
}; };

2
Source/Core/Core/Src/Plugins/Plugin_DSP.cpp
View File

@ -122,6 +122,8 @@ bool LoadPlugin(const char *_Filename)
} }
else if (ret == 0) else if (ret == 0)
return false; return false;
return false;
} }
} // namespace } // namespace