From 50b5d72bb2627bbf9eec09bb26c842cd5c0c5afd Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sun, 24 Aug 2014 21:42:19 +0400 Subject: [PATCH] Include cleaning --- Utilities/rPlatform.cpp | 86 +----------------- Utilities/rPlatform.h | 11 --- rpcs3/Emu/Cell/SPUThread.cpp | 8 +- rpcs3/Emu/DbgCommand.cpp | 13 ++- rpcs3/Emu/DbgCommand.h | 4 + rpcs3/Emu/Io/Keyboard.cpp | 26 +++++- rpcs3/Emu/Io/Keyboard.h | 12 +-- rpcs3/Emu/Io/Mouse.cpp | 26 +++++- rpcs3/Emu/Io/Mouse.h | 12 +-- rpcs3/Emu/Io/Pad.cpp | 26 +++++- rpcs3/Emu/Io/Pad.h | 12 +-- rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h | 1 - rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp | 11 ++- rpcs3/Emu/SysCalls/Modules/cellSync.cpp | 3 +- rpcs3/Emu/SysCalls/lv2/sys_process.cpp | 7 +- rpcs3/Emu/System.cpp | 14 ++- rpcs3/Emu/System.h | 8 +- rpcs3/Gui/AutoPauseManager.cpp | 1 - rpcs3/Gui/CompilerELF.cpp | 6 +- rpcs3/Gui/CompilerELF.h | 4 - rpcs3/Gui/ConLogFrame.cpp | 2 - rpcs3/Gui/Debugger.cpp | 1 - rpcs3/Gui/MainFrame.cpp | 8 ++ rpcs3/Gui/RSXDebugger.cpp | 1 + rpcs3/Ini.cpp | 4 +- rpcs3/Ini.h | 1 - rpcs3/emucore.vcxproj | 10 +-- rpcs3/emucore.vcxproj.filters | 48 +++++----- rpcs3/rpcs3.cpp | 89 +++++++++++++++++-- rpcs3/rpcs3.vcxproj | 8 +- rpcs3/rpcs3.vcxproj.filters | 44 +++++---- 31 files changed, 291 insertions(+), 216 deletions(-) diff --git a/Utilities/rPlatform.cpp b/Utilities/rPlatform.cpp index d6729c718b..2ae7340583 100644 --- a/Utilities/rPlatform.cpp +++ b/Utilities/rPlatform.cpp @@ -3,22 +3,11 @@ #include #include "Gui/GLGSFrame.h" -#include "Emu/Io/Null/NullKeyboardHandler.h" -#include "Emu/Io/Windows/WindowsKeyboardHandler.h" - -#include "Emu/Io/Null/NullMouseHandler.h" -#include "Emu/Io/Windows/WindowsMouseHandler.h" - -#include "Emu/Io/Null/NullPadHandler.h" -#include "Emu/Io/Windows/WindowsPadHandler.h" -#if defined(_WIN32) -#include "Emu/Io/XInput/XInputPadHandler.h" -#endif - #ifndef _WIN32 #include #endif +#include "rPlatform.h" rCanvas::rCanvas(void *parent) { @@ -36,8 +25,6 @@ bool rCanvas::SetCurrent(void *ctx) } - - rGLFrame::rGLFrame() { handle = static_cast(new GLGSFrame()); @@ -114,31 +101,6 @@ void rImage::SaveFile(const std::string& name, rImageType type) } } -int rPlatform::getKeyboardHandlerCount() -{ - return 2; -} - -KeyboardHandlerBase *rPlatform::getKeyboardHandler(int i) -{ - switch (i) - { - case 0: - return new NullKeyboardHandler(); - break; - case 1: - return new WindowsKeyboardHandler(); - break; - default: - return new NullKeyboardHandler(); - } -} - -int rPlatform::getMouseHandlerCount() -{ - return 2; -} - std::string rPlatform::getConfigDir() { static std::string dir = "."; @@ -159,49 +121,3 @@ std::string rPlatform::getConfigDir() } return dir; } - - -MouseHandlerBase *rPlatform::getMouseHandler(int i) -{ - switch (i) - { - case 0: - return new NullMouseHandler(); - break; - case 1: - return new WindowsMouseHandler(); - break; - default: - return new NullMouseHandler(); - } -} - -int rPlatform::getPadHandlerCount() -{ -#if defined(_WIN32) - return 3; -#else - return 2; -#endif -} - - -PadHandlerBase *rPlatform::getPadHandler(int i) -{ - switch (i) - { - case 0: - return new NullPadHandler(); - break; - case 1: - return new WindowsPadHandler(); - break; -#if defined(_WIN32) - case 2: - return new XInputPadHandler(); - break; -#endif - default: - return new NullPadHandler(); - } -} diff --git a/Utilities/rPlatform.h b/Utilities/rPlatform.h index c5b1beab3f..32c6256291 100644 --- a/Utilities/rPlatform.h +++ b/Utilities/rPlatform.h @@ -2,10 +2,6 @@ #include #include -#include "Emu/Io/Null/NullKeyboardHandler.h" -#include "Emu/Io/Null/NullMouseHandler.h" -#include "Emu/Io/Null/NullPadHandler.h" - struct rCanvas { rCanvas(void *parent); @@ -39,13 +35,6 @@ struct rPlatform { rGLFrame *getGLGSFrame(); static rPlatform &getPlatform(); - - static int getKeyboardHandlerCount(); - static KeyboardHandlerBase *getKeyboardHandler(int i); - static int getMouseHandlerCount(); - static MouseHandlerBase *getMouseHandler(int i); - static int getPadHandlerCount(); - static PadHandlerBase *getPadHandler(int i); static std::string getConfigDir(); }; diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 0f87f2238f..b52f9cb0ba 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -349,8 +349,8 @@ void SPUThread::EnqMfcCmd(MFCReg& MFCArgs) ProcessCmd(cmd, tag, lsa, ea, size); MFCArgs.CMDStatus.SetValue(MFC_PPU_DMA_CMD_ENQUEUE_SUCCESSFUL); - } break; + } case MFC_PUTL_CMD: case MFC_PUTRL_CMD: // ??? @@ -364,8 +364,8 @@ void SPUThread::EnqMfcCmd(MFCReg& MFCArgs) lsa, ea, tag, size, cmd); ListCmd(lsa, ea, tag, size, cmd, MFCArgs); - } break; + } case MFC_GETLLAR_CMD: case MFC_PUTLLC_CMD: @@ -433,7 +433,7 @@ void SPUThread::EnqMfcCmd(MFCReg& MFCArgs) changed, mask, op, cmd, lsa, ea, tag, size); Emu.Pause(); } - + break; } } @@ -478,8 +478,8 @@ void SPUThread::EnqMfcCmd(MFCReg& MFCArgs) } R_ADDR = 0; } - } break; + } default: LOG_ERROR(Log::SPU, "Unknown MFC cmd. (opcode=0x%x, cmd=0x%x, lsa = 0x%x, ea = 0x%llx, tag = 0x%x, size = 0x%x)", diff --git a/rpcs3/Emu/DbgCommand.cpp b/rpcs3/Emu/DbgCommand.cpp index adc4b58bfe..8be005e73c 100644 --- a/rpcs3/Emu/DbgCommand.cpp +++ b/rpcs3/Emu/DbgCommand.cpp @@ -1,7 +1,14 @@ #include "stdafx.h" -#include "rpcs3.h" +#include "DbgCommand.h" -void SendDbgCommand(DbgCommand id, CPUThread* thr ) +SendDbgCommandCb SendDbgCommandFunc = nullptr; + +void SendDbgCommand(DbgCommand id, CPUThread* t) { - wxGetApp().SendDbgCommand(id, thr); + SendDbgCommandFunc(id, t); } + +void SetSendDbgCommandCallback(SendDbgCommandCb cb) +{ + SendDbgCommandFunc = cb; +} \ No newline at end of file diff --git a/rpcs3/Emu/DbgCommand.h b/rpcs3/Emu/DbgCommand.h index 88daa6b821..f3e7f03943 100644 --- a/rpcs3/Emu/DbgCommand.h +++ b/rpcs3/Emu/DbgCommand.h @@ -37,4 +37,8 @@ enum DbgCommand DID_LAST_COMMAND, }; +typedef void(*SendDbgCommandCb)(DbgCommand id, CPUThread* t); + +void SetSendDbgCommandCallback(SendDbgCommandCb value); + void SendDbgCommand(DbgCommand id, CPUThread* thr = nullptr); \ No newline at end of file diff --git a/rpcs3/Emu/Io/Keyboard.cpp b/rpcs3/Emu/Io/Keyboard.cpp index f63c5530ca..e23f325b87 100644 --- a/rpcs3/Emu/Io/Keyboard.cpp +++ b/rpcs3/Emu/Io/Keyboard.cpp @@ -1,7 +1,27 @@ #include "stdafx.h" #include "rpcs3/Ini.h" -#include "Keyboard.h" #include "Null/NullKeyboardHandler.h" +#include "Keyboard.h" + +GetKeyboardHandlerCountCb GetKeyboardHandlerCount = []() +{ + return 1; +}; + +GetKeyboardHandlerCb GetKeyboardHandler = [](int i) -> KeyboardHandlerBase* +{ + return new NullKeyboardHandler; +}; + +void SetGetKeyboardHandlerCountCallback(GetKeyboardHandlerCountCb cb) +{ + GetKeyboardHandlerCount = cb; +} + +void SetGetKeyboardHandlerCallback(GetKeyboardHandlerCb cb) +{ + GetKeyboardHandler = cb; +} KeyboardManager::KeyboardManager() : m_keyboard_handler(nullptr) @@ -19,13 +39,13 @@ void KeyboardManager::Init(const u32 max_connect) return; // NOTE: Change these to std::make_unique assignments when C++14 comes out. - int numHandlers = rPlatform::getKeyboardHandlerCount(); + int numHandlers = GetKeyboardHandlerCount(); int selectedHandler = Ini.KeyboardHandlerMode.GetValue(); if (selectedHandler > numHandlers) { selectedHandler = 0; } - m_keyboard_handler.reset(rPlatform::getKeyboardHandler(selectedHandler)); + m_keyboard_handler.reset(GetKeyboardHandler(selectedHandler)); m_keyboard_handler->Init(max_connect); m_inited = true; diff --git a/rpcs3/Emu/Io/Keyboard.h b/rpcs3/Emu/Io/Keyboard.h index 1674b185de..241913f72d 100644 --- a/rpcs3/Emu/Io/Keyboard.h +++ b/rpcs3/Emu/Io/Keyboard.h @@ -1,10 +1,9 @@ #pragma once #include -#include #include "KeyboardHandler.h" -class KeyboardManager //: public wxWindow +class KeyboardManager { bool m_inited; std::unique_ptr m_keyboard_handler; @@ -23,7 +22,10 @@ public: CellKbConfig& GetConfig(const u32 keyboard) { return m_keyboard_handler->GetConfig(keyboard); } bool IsInited() const { return m_inited; } +}; -//private: - //DECLARE_EVENT_TABLE(); -}; \ No newline at end of file +typedef int(*GetKeyboardHandlerCountCb)(); +typedef KeyboardHandlerBase*(*GetKeyboardHandlerCb)(int i); + +void SetGetKeyboardHandlerCountCallback(GetKeyboardHandlerCountCb cb); +void SetGetKeyboardHandlerCallback(GetKeyboardHandlerCb cb); \ No newline at end of file diff --git a/rpcs3/Emu/Io/Mouse.cpp b/rpcs3/Emu/Io/Mouse.cpp index fc0112e5e0..5a0f191dae 100644 --- a/rpcs3/Emu/Io/Mouse.cpp +++ b/rpcs3/Emu/Io/Mouse.cpp @@ -1,7 +1,27 @@ #include "stdafx.h" #include "rpcs3/Ini.h" -#include "Mouse.h" #include "Null/NullMouseHandler.h" +#include "Mouse.h" + +GetMouseHandlerCountCb GetMouseHandlerCount = []() +{ + return 1; +}; + +GetMouseHandlerCb GetMouseHandler = [](int i) -> MouseHandlerBase* +{ + return new NullMouseHandler; +}; + +void SetGetMouseHandlerCountCallback(GetMouseHandlerCountCb cb) +{ + GetMouseHandlerCount = cb; +} + +void SetGetMouseHandlerCallback(GetMouseHandlerCb cb) +{ + GetMouseHandler = cb; +} MouseManager::MouseManager() : m_mouse_handler(nullptr) @@ -19,13 +39,13 @@ void MouseManager::Init(const u32 max_connect) return; // NOTE: Change these to std::make_unique assignments when C++14 is available. - int numHandlers = rPlatform::getMouseHandlerCount(); + int numHandlers = GetMouseHandlerCount(); int selectedHandler = Ini.MouseHandlerMode.GetValue(); if (selectedHandler > numHandlers) { selectedHandler = 0; } - m_mouse_handler.reset(rPlatform::getMouseHandler(selectedHandler)); + m_mouse_handler.reset(GetMouseHandler(selectedHandler)); m_mouse_handler->Init(max_connect); m_inited = true; diff --git a/rpcs3/Emu/Io/Mouse.h b/rpcs3/Emu/Io/Mouse.h index aa3c546117..405155ac93 100644 --- a/rpcs3/Emu/Io/Mouse.h +++ b/rpcs3/Emu/Io/Mouse.h @@ -1,10 +1,9 @@ #pragma once #include -#include #include "MouseHandler.h" -class MouseManager //: public wxWindow +class MouseManager { bool m_inited; std::unique_ptr m_mouse_handler; @@ -22,7 +21,10 @@ public: CellMouseRawData& GetRawData(const u32 mouse) { return m_mouse_handler->GetRawData(mouse); } bool IsInited() const { return m_inited; } +}; -//private: - //DECLARE_EVENT_TABLE(); -}; \ No newline at end of file +typedef int(*GetMouseHandlerCountCb)(); +typedef MouseHandlerBase*(*GetMouseHandlerCb)(int i); + +void SetGetMouseHandlerCountCallback(GetMouseHandlerCountCb cb); +void SetGetMouseHandlerCallback(GetMouseHandlerCb cb); \ No newline at end of file diff --git a/rpcs3/Emu/Io/Pad.cpp b/rpcs3/Emu/Io/Pad.cpp index 55cdbf0e91..72efc937bd 100644 --- a/rpcs3/Emu/Io/Pad.cpp +++ b/rpcs3/Emu/Io/Pad.cpp @@ -1,7 +1,27 @@ #include "stdafx.h" #include "rpcs3/Ini.h" -#include "Pad.h" #include "Null/NullPadHandler.h" +#include "Pad.h" + +GetPadHandlerCountCb GetPadHandlerCount = []() +{ + return 1; +}; + +GetPadHandlerCb GetPadHandler = [](int i) -> PadHandlerBase* +{ + return new NullPadHandler; +}; + +void SetGetPadHandlerCountCallback(GetPadHandlerCountCb cb) +{ + GetPadHandlerCount = cb; +} + +void SetGetPadHandlerCallback(GetPadHandlerCb cb) +{ + GetPadHandler = cb; +} PadManager::PadManager() : m_pad_handler(nullptr) @@ -19,13 +39,13 @@ void PadManager::Init(const u32 max_connect) return; // NOTE: Change these to std::make_unique assignments when C++14 is available. - int numHandlers = rPlatform::getPadHandlerCount(); + int numHandlers = GetPadHandlerCount(); int selectedHandler = Ini.PadHandlerMode.GetValue(); if (selectedHandler > numHandlers) { selectedHandler = 0; } - m_pad_handler.reset(rPlatform::getPadHandler(selectedHandler)); + m_pad_handler.reset(GetPadHandler(selectedHandler)); m_pad_handler->Init(max_connect); m_inited = true; diff --git a/rpcs3/Emu/Io/Pad.h b/rpcs3/Emu/Io/Pad.h index 27b049cea4..f9758beb8a 100644 --- a/rpcs3/Emu/Io/Pad.h +++ b/rpcs3/Emu/Io/Pad.h @@ -1,10 +1,9 @@ #pragma once #include -#include #include "PadHandler.h" -class PadManager //: public wxWindow +class PadManager { bool m_inited; std::unique_ptr m_pad_handler; @@ -21,7 +20,10 @@ public: std::vector