From 326383192884575ce06754fd764a7f53e15ca914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 22 Oct 2016 17:00:32 +0200 Subject: [PATCH] IPC_HLE: Clean up includes (IWYU) Apply automated fixes by include-what-you-use (IWYU) (with some minor changes). IPC_HLE should now be essentially free of indirect includes. --- Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp | 21 +++++++++---------- Source/Core/Core/IPC_HLE/WII_IPC_HLE.h | 1 - .../Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp | 8 +++---- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h | 5 +++++ .../IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 9 ++++---- .../Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h | 5 +++++ .../Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 16 +++++++++----- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h | 3 +++ .../Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp | 14 ++++++++++++- .../Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h | 8 ++++--- .../Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp | 11 +++++++--- .../Core/IPC_HLE/WII_IPC_HLE_Device_hid.h | 8 ++++--- .../Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp | 19 +++++++---------- .../Core/IPC_HLE/WII_IPC_HLE_Device_net.h | 4 +++- .../IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp | 9 ++++++-- .../Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h | 6 +++++- .../IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp | 9 +++++--- .../IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h | 8 +++---- .../Core/IPC_HLE/WII_IPC_HLE_Device_stm.cpp | 5 +++++ .../Core/IPC_HLE/WII_IPC_HLE_Device_stm.h | 4 ++++ .../WII_IPC_HLE_Device_usb_bt_base.cpp | 8 +++++-- .../IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h | 7 ++++++- .../IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp | 21 ++++++++++++++++--- .../IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h | 17 ++++++--------- .../WII_IPC_HLE_Device_usb_bt_real.cpp | 13 +++++++++++- .../IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h | 7 ++++++- .../WII_IPC_HLE_Device_usb_bt_stub.cpp | 2 ++ .../IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h | 6 ++++++ .../IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp | 21 +++++++++++++++++-- .../Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h | 15 +++---------- .../Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp | 10 +++++++-- .../Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h | 1 + Source/Core/Core/IPC_HLE/WII_Socket.h | 3 +++ Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp | 6 +----- 34 files changed, 211 insertions(+), 99 deletions(-) diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp index 94bacf5fcf..a47b529b38 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp @@ -20,27 +20,23 @@ in case of success they are They will also generate a true or false return for UpdateInterrupts() in WII_IPC.cpp. */ -#include +#include #include +#include #include #include +#include #include +#include "Common/Assert.h" #include "Common/ChunkFile.h" -#include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/FileUtil.h" -#include "Common/Thread.h" - +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/CoreTiming.h" -#include "Core/Debugger/Debugger_SymbolMap.h" -#include "Core/HW/CPU.h" #include "Core/HW/Memmap.h" -#include "Core/HW/SystemTimers.h" #include "Core/HW/WII_IPC.h" - #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h" @@ -57,12 +53,15 @@ They will also generate a true or false return for UpdateInterrupts() in WII_IPC #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.h" +namespace CoreTiming +{ +struct EventType; +} // namespace CoreTiming + #if defined(__LIBUSB__) #include "Core/IPC_HLE/WII_IPC_HLE_Device_hid.h" #endif -#include "Core/PowerPC/PowerPC.h" - namespace WII_IPC_HLE_Interface { static std::map> s_device_map; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h index d0a274349b..fc567662f3 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h @@ -9,7 +9,6 @@ #include #include "Common/CommonTypes.h" - #include "Core/CoreTiming.h" #include "Core/HW/SystemTimers.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index 0feb803110..53454c70bf 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -4,15 +4,15 @@ #include #include +#include +#include "Common/Assert.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/Logging/LogManager.h" -#include "Core/ConfigManager.h" -#include "Core/CoreTiming.h" +#include "Common/Logging/Log.h" +#include "Common/MsgHandler.h" #include "Core/HW/DVDInterface.h" #include "Core/HW/Memmap.h" -#include "Core/HW/SystemTimers.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h" #include "DiscIO/Volume.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h index e4dd893ea0..0e8ed43485 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h @@ -5,9 +5,14 @@ #pragma once #include +#include + +#include "Common/CommonTypes.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" class PointerWrap; + namespace DVDInterface { enum DIInterruptType : int; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index 295e6b248b..1c90d81d7a 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -2,18 +2,17 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include +#include +#include +#include +#include #include "Common/ChunkFile.h" -#include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/NandPaths.h" -#include "Common/StringUtil.h" - -#include "Core/Core.h" #include "Core/HW/Memmap.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h index 29e5b687db..3c004a5762 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h @@ -5,9 +5,14 @@ #pragma once #include + +#include "Common/ChunkFile.h" +#include "Common/CommonTypes.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" class PointerWrap; + namespace File { class IOFile; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp index 12a48e41b0..fb8abf301c 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -31,21 +31,27 @@ */ // ============= -// need to include this before mbedtls/aes.h, -// otherwise we may not get __STDC_FORMAT_MACROS #include -#include +#include +#include #include +#include #include +#include + +#include "Common/Assert.h" #include "Common/ChunkFile.h" -#include "Common/CommonPaths.h" +#include "Common/CommonFuncs.h" #include "Common/FileUtil.h" +#include "Common/Logging/Log.h" +#include "Common/MsgHandler.h" #include "Common/NandPaths.h" -#include "Common/StringUtil.h" #include "Core/Boot/Boot_DOL.h" #include "Core/ConfigManager.h" #include "Core/HW/DVDInterface.h" +#include "Core/HW/Memmap.h" +#include "Core/HW/Wiimote.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h" #include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h index 6b1d870dd1..0d8bc995d3 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h @@ -9,9 +9,12 @@ #include #include +#include "Common/CommonTypes.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" class PointerWrap; + namespace DiscIO { class CNANDContentLoader; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp index a853cb6773..d631b4e28e 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp @@ -4,14 +4,19 @@ #include #include +#include +#include +#include +#include "Common/Assert.h" #include "Common/ChunkFile.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/Logging/Log.h" +#include "Common/MsgHandler.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" - #include "Core/HW/Memmap.h" #include "Core/HW/SystemTimers.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h" @@ -29,6 +34,13 @@ CWII_IPC_HLE_Device_fs::~CWII_IPC_HLE_Device_fs() { } +// ~1/1000th of a second is too short and causes hangs in Wii Party +// Play it safe at 1/500th +IPCCommandResult CWII_IPC_HLE_Device_fs::GetFSReply() const +{ + return {true, SystemTimers::GetTicksPerSecond() / 500}; +} + IPCCommandResult CWII_IPC_HLE_Device_fs::Open(u32 _CommandAddress, u32 _Mode) { // clear tmp folder diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h index a18cc55b83..4d4933d164 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h @@ -4,6 +4,10 @@ #pragma once +#include + +#include "Common/CommonTypes.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" class PointerWrap; @@ -60,9 +64,7 @@ private: IOCTL_SHUTDOWN = 0x0D }; - // ~1/1000th of a second is too short and causes hangs in Wii Party - // Play it safe at 1/500th - IPCCommandResult GetFSReply() const { return {true, SystemTimers::GetTicksPerSecond() / 500}; } + IPCCommandResult GetFSReply() const; s32 ExecuteCommand(u32 Parameter, u32 _BufferIn, u32 _BufferInSize, u32 _BufferOut, u32 _BufferOutSize); }; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp index 3a35f07d75..efe3a60660 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp @@ -2,15 +2,20 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include +#include +#include +#include +#include +#include + #include -#include "Common/Thread.h" +#include "Common/CommonFuncs.h" +#include "Common/Logging/Log.h" #include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/HW/Memmap.h" -#include "Core/HW/WII_IPC.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_hid.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h index 7cae4a8559..9ff0feda28 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h @@ -7,8 +7,10 @@ #include #include #include +#include #include +#include "Common/CommonTypes.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" @@ -19,11 +21,11 @@ #else #define LIBUSB_CALL #endif -struct libusb_device_handle; -struct libusb_device_descriptor; struct libusb_config_descriptor; -struct libusb_interface_descriptor; +struct libusb_device_descriptor; +struct libusb_device_handle; struct libusb_endpoint_descriptor; +struct libusb_interface_descriptor; struct libusb_transfer; #define HID_ID_MASK 0x0000FFFFFFFFFFFF diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp index f87d114dfd..efdef61030 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -6,14 +6,19 @@ #include #include #include -#include +#include +#include +#include #include +#include +#include #ifndef _WIN32 -#include #include #include #endif +#include "Common/Assert.h" +#include "Common/CommonFuncs.h" #include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Common/Logging/Log.h" @@ -21,11 +26,9 @@ #include "Common/Network.h" #include "Common/SettingsHandler.h" #include "Common/StringUtil.h" - #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/IPC_HLE/ICMP.h" -#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h" #include "Core/IPC_HLE/WII_Socket.h" #include "Core/ec_wii.h" @@ -38,16 +41,8 @@ #define FREE(x) HeapFree(GetProcessHeap(), 0, (x)) #elif defined(__linux__) or defined(__APPLE__) -#include -#include -#include -#include #include -#include -#include -#include #include -#include typedef struct pollfd pollfd_t; #else diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h index 5c25e2dfc2..ace3d41e9b 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h @@ -4,12 +4,14 @@ #pragma once +#include + #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Common/Timer.h" #include "Core/HW/EXI_DeviceIPL.h" #include "Core/HW/Memmap.h" #include "Core/IPC_HLE/NWC24Config.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IPC_HLE/WiiNetConfig.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp index 8f29e83ea4..9e093bf4ae 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp @@ -2,12 +2,17 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include +#include +#include +#include + +#include #include "Common/FileUtil.h" -#include "Common/NandPaths.h" +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/HW/Memmap.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h" #include "Core/IPC_HLE/WII_Socket.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h index 079e56b0b8..07ae9ce81a 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h @@ -7,15 +7,19 @@ // These imports need to be in this order for mbed to be included correctly. // clang-format off -#include #include #include #include +#include +#include #include +#include #include // clang-format on +#include "Common/CommonTypes.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #define NET_SSL_MAXINSTANCES 4 diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp index 77c2ce56dc..feaf536f68 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp @@ -2,14 +2,17 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include +#include +#include +#include + #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/Logging/Log.h" #include "Common/SDCardUtil.h" - #include "Core/ConfigManager.h" -#include "Core/Core.h" -#include "Core/HW/CPU.h" #include "Core/HW/Memmap.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h index 3a1946f512..780cc79a1a 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h @@ -8,13 +8,13 @@ #include #include + +#include "Common/CommonTypes.h" +#include "Common/FileUtil.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" class PointerWrap; -namespace File -{ -class IOFile; -} class CWII_IPC_HLE_Device_sdio_slot0 : public IWII_IPC_HLE_Device { diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.cpp index 73c84c9d4b..d772868154 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.cpp @@ -3,6 +3,11 @@ // Refer to the license.txt file included. #include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h" + +#include + +#include "Common/Assert.h" +#include "Common/Logging/Log.h" #include "Core/HW/Memmap.h" namespace Core diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h index 6e2f939114..85cfe85ce2 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h @@ -4,6 +4,10 @@ #pragma once +#include + +#include "Common/CommonTypes.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" enum diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.cpp index 8154c07dd6..14e6c80198 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include #include #include @@ -12,8 +13,6 @@ #include "Common/FileUtil.h" #include "Common/Logging/Log.h" #include "Common/SysConf.h" -#include "Core/ConfigManager.h" -#include "Core/Core.h" #include "Core/HW/Memmap.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h" @@ -86,3 +85,8 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305_base::CtrlBuffer::FillBuffer(const u8* m_length); Memory::CopyToEmu(m_payload_addr, src, size); } + +void CWII_IPC_HLE_Device_usb_oh1_57e_305_base::CtrlBuffer::SetRetVal(const u32 retval) const +{ + Memory::Write_U32(retval, m_cmd_address + 4); +} diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h index bd6989babd..ffc1a32286 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h @@ -4,9 +4,14 @@ #pragma once +#include +#include + +#include "Common/CommonTypes.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" +class PointerWrap; class SysConf; void BackUpBTInfoSection(SysConf* sysconf); @@ -74,7 +79,7 @@ protected: CtrlBuffer(const SIOCtlVBuffer& cmd_buffer, u32 command_address); void FillBuffer(const u8* src, size_t size) const; - void SetRetVal(const u32 retval) const { Memory::Write_U32(retval, m_cmd_address + 4); } + void SetRetVal(const u32 retval) const; bool IsValid() const { return m_cmd_address != 0; } void Invalidate() { m_cmd_address = m_payload_addr = 0; } u8 m_endpoint = 0; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp index 05297363b8..a22400c56c 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp @@ -2,22 +2,37 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/HW/WII_IPC.h" +#include +#include +#include +#include + +#include "Common/Assert.h" #include "Common/CommonPaths.h" +#include "Common/FileUtil.h" +#include "Common/Logging/Log.h" +#include "Common/MsgHandler.h" +#include "Common/StringUtil.h" #include "Common/SysConf.h" -#include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/CoreTiming.h" #include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/HW/Memmap.h" #include "Core/HW/SystemTimers.h" #include "Core/HW/Wiimote.h" #include "Core/Host.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h" #include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" -#include "Core/Movie.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" +SQueuedEvent::SQueuedEvent(u32 size, u16 handle) : m_size(size), m_connectionHandle(handle) +{ + if (m_size > 1024) + PanicAlert("SQueuedEvent: The size is too large."); +} + // The device class CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::CWII_IPC_HLE_Device_usb_oh1_57e_305_emu( u32 _DeviceID, const std::string& _rDeviceName) diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h index 55fdf7ac04..c7d49628cd 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h @@ -7,32 +7,27 @@ #include #include #include +#include #include +#include "Common/CommonTypes.h" #include "Core/HW/Wiimote.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h" +#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/IPC_HLE/hci.h" class CWII_IPC_HLE_WiiMote; +class PointerWrap; struct SQueuedEvent { - u8 m_buffer[1024]; + u8 m_buffer[1024] = {0}; u32 m_size = 0; u16 m_connectionHandle = 0; - SQueuedEvent(u32 size, u16 connectionHandle) : m_size(size), m_connectionHandle(connectionHandle) - { - if (m_size > 1024) - { - // i know this code sux... - PanicAlert("SQueuedEvent: allocate too big buffer!!"); - } - memset(m_buffer, 0, 1024); - } - + SQueuedEvent(u32 size, u16 handle); SQueuedEvent() = default; }; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp index 3e56044b2b..12e38b9a84 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp @@ -3,19 +3,30 @@ // Refer to the license.txt file included. #include +#include +#include #include +#include #include #include #include #include +#include +#include #include +#include "Common/Assert.h" +#include "Common/ChunkFile.h" +#include "Common/Logging/Log.h" +#include "Common/MsgHandler.h" #include "Common/Network.h" +#include "Common/StringUtil.h" #include "Common/Thread.h" #include "Core/ConfigManager.h" #include "Core/Core.h" -#include "Core/CoreTiming.h" +#include "Core/HW/Memmap.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h" #include "Core/IPC_HLE/hci.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h index fd2e172e57..99184960d2 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h @@ -7,15 +7,19 @@ #if defined(__LIBUSB__) #include #include +#include #include +#include "Common/CommonTypes.h" #include "Common/Flag.h" #include "Common/Timer.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h" +class PointerWrap; +struct libusb_context; struct libusb_device; struct libusb_device_handle; -struct libusb_context; struct libusb_transfer; enum class SyncButtonState @@ -96,5 +100,6 @@ private: #else #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h" + using CWII_IPC_HLE_Device_usb_oh1_57e_305_real = CWII_IPC_HLE_Device_usb_oh1_57e_305_stub; #endif diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.cpp index 1677699fe6..e4cbd011eb 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.cpp @@ -3,6 +3,8 @@ // Refer to the license.txt file included. #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h" + +#include "Common/ChunkFile.h" #include "Common/MsgHandler.h" namespace Core diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h index 2e0ed16691..a4f7bf10d1 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h @@ -4,8 +4,14 @@ #pragma once +#include + +#include "Common/CommonTypes.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h" +class PointerWrap; + class CWII_IPC_HLE_Device_usb_oh1_57e_305_stub final : public CWII_IPC_HLE_Device_usb_oh1_57e_305_base { diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp index 847aa21060..826a7cfa50 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp @@ -2,17 +2,34 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Common/FileUtil.h" +#include +#include "Common/CommonFuncs.h" +#include "Common/FileUtil.h" +#include "Common/IniFile.h" +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" #include "Core/Core.h" // Local core functions -#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h" +#include "Core/HW/Memmap.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h" #ifdef _WIN32 #include #endif +CWII_IPC_HLE_Device_usb_kbd::SMessageData::SMessageData(u32 type, u8 modifiers, u8* pressed_keys) +{ + MsgType = Common::swap32(type); + Unk1 = 0; // swapped + Modifiers = modifiers; + Unk2 = 0; + + if (pressed_keys) // Doesn't need to be in a specific order + memcpy(PressedKeys, pressed_keys, sizeof(PressedKeys)); + else + memset(PressedKeys, 0, sizeof(PressedKeys)); +} + // TODO: support in netplay/movies. CWII_IPC_HLE_Device_usb_kbd::CWII_IPC_HLE_Device_usb_kbd(u32 _DeviceID, diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h index 7fbcd7de79..dca8fcd86d 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h @@ -7,6 +7,8 @@ #include #include +#include "Common/CommonTypes.h" +#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device.h" class CWII_IPC_HLE_Device_usb_kbd : public IWII_IPC_HLE_Device @@ -38,18 +40,7 @@ private: u8 Unk2; u8 PressedKeys[6]; - SMessageData(u32 _MsgType, u8 _Modifiers, u8* _PressedKeys) - { - MsgType = Common::swap32(_MsgType); - Unk1 = 0; // swapped - Modifiers = _Modifiers; - Unk2 = 0; - - if (_PressedKeys) // Doesn't need to be in a specific order - memcpy(PressedKeys, _PressedKeys, sizeof(PressedKeys)); - else - memset(PressedKeys, 0, sizeof(PressedKeys)); - } + SMessageData(u32 msg_type, u8 modifiers, u8* pressed_keys); }; #pragma pack(pop) std::queue m_MessageQueue; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index d48d6abb6a..4cfc34fa3a 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -2,11 +2,17 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include +#include +#include +#include + +#include "Common/Assert.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" - -#include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/Wiimote.h" #include "Core/Host.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h index fdb2b02cb9..8f463b36c4 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h @@ -4,6 +4,7 @@ #pragma once +#include #include #include diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.h b/Source/Core/Core/IPC_HLE/WII_Socket.h index de1a0bd148..8c5dfaa9f8 100644 --- a/Source/Core/Core/IPC_HLE/WII_Socket.h +++ b/Source/Core/Core/IPC_HLE/WII_Socket.h @@ -46,9 +46,12 @@ typedef struct pollfd pollfd_t; #include #include #include +#include #include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "Common/NonCopyable.h" +#include "Core/HW/Memmap.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h" diff --git a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp index 574b6944e9..9f2905e199 100644 --- a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp +++ b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp @@ -2,13 +2,9 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include - +#include "Core/IPC_HLE/WiiMote_HID_Attr.h" #include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "Common/Logging/Log.h" -#include "Common/MsgHandler.h" -#include "Core/IPC_HLE/WiiMote_HID_Attr.h" #if 0 // 0x00 (checked)