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

compile fix 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@928 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
fires.gc 2008-10-21 16:51:52 +00:00
parent 5ad0c43707
commit d3660be648
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,6 +305,11 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
// //
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
void CWII_IPC_HLE_Device_usb_oh1_57e_305::AddEventToQueue(const SQueuedEvent& _event)
{
m_EventQueue.push(_event);
}
bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventCommandStatus(u16 _Opcode) bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventCommandStatus(u16 _Opcode)
{ {
SQueuedEvent Event(sizeof(SHCIEventStatus), 0); SQueuedEvent Event(sizeof(SHCIEventStatus), 0);
@ -883,11 +888,8 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom
// //
default: default:
{ {
#ifdef LOGGING
u16 ocf = HCI_OCF(pMsg->Opcode); u16 ocf = HCI_OCF(pMsg->Opcode);
u16 ogf = HCI_OGF(pMsg->Opcode); u16 ogf = HCI_OGF(pMsg->Opcode);
#endif
PanicAlert("0x%08x", _rHCICommandMessage.m_PayLoadAddr); PanicAlert("0x%08x", _rHCICommandMessage.m_PayLoadAddr);

9
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h
View File

@ -14,6 +14,7 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#ifndef _WII_IPC_HLE_DEVICE_USB_H_ #ifndef _WII_IPC_HLE_DEVICE_USB_H_
#define _WII_IPC_HLE_DEVICE_USB_H_ #define _WII_IPC_HLE_DEVICE_USB_H_
@ -24,8 +25,6 @@
#include "WII_IPC_HLE_WiiMote.h" #include "WII_IPC_HLE_WiiMote.h"
class CWII_IPC_HLE_WiiMote;
union UACLHeader union UACLHeader
{ {
@ -147,6 +146,7 @@ private:
SIOCtlVBuffer* m_pHCIBuffer; SIOCtlVBuffer* m_pHCIBuffer;
// Events // Events
void AddEventToQueue(const SQueuedEvent& _event);
bool SendEventCommandStatus(u16 _Opcode); bool SendEventCommandStatus(u16 _Opcode);
void SendEventCommandComplete(u16 _OpCode, void* _pData, u32 _DataSize); void SendEventCommandComplete(u16 _OpCode, void* _pData, u32 _DataSize);
bool SendEventInquiryResponse(); bool SendEventInquiryResponse();
@ -205,11 +205,6 @@ private:
void CommandVendorSpecific_FC4F(u8* _Input, u32 _Size); void CommandVendorSpecific_FC4F(u8* _Input, u32 _Size);
void SendToDevice(u16 _ConnectionHandle, u8* _pData, u32 _Size); void SendToDevice(u16 _ConnectionHandle, u8* _pData, u32 _Size);
void AddEventToQueue(const SQueuedEvent& _event)
{
m_EventQueue.push(_event);
}
}; };
#endif #endif

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

@ -18,6 +18,7 @@
#include "Common.h" #include "Common.h"
#include "../Plugins/Plugin_Wiimote.h" #include "../Plugins/Plugin_Wiimote.h"
#include "WII_IPC_HLE_Device_usb.h"
#include "WII_IPC_HLE_WiiMote.h" #include "WII_IPC_HLE_WiiMote.h"
#include "l2cap.h" #include "l2cap.h"
#include "WiiMote_HID_Attr.h" #include "WiiMote_HID_Attr.h"

1
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h
View File

@ -18,7 +18,6 @@
#define _WII_IPC_HLE_WII_MOTE_ #define _WII_IPC_HLE_WII_MOTE_
#include <map> #include <map>
#include "WII_IPC_HLE_Device_usb.h"
class CWII_IPC_HLE_Device_usb_oh1_57e_305; class CWII_IPC_HLE_Device_usb_oh1_57e_305;