From 24199293d37f42b657cd5f9736d6eea10d1384f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Wed, 18 Jan 2017 13:50:28 +0100 Subject: =?UTF-8?q?IOS:=20Reorganise=20the=20source=20files=20and=20IPC=5F?= =?UTF-8?q?HLE=E2=86=92IOS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit IPC_HLE is actually IOS HLE. The actual IPC emulation is not in IPC_HLE, but in HW/WII_IPC.cpp. So calling IPC_HLE IOS is more accurate. (If IOS LLE gets ever implemented, it'll likely be at a lower level -- Starlet LLE.) This also totally gets rid of the IPC_HLE prefix in file names, and moves some source files to their own subdirectories to make the file hierarchy cleaner. We're going to get ~14 additional source files with the USB PR, and this is really needed to keep things from becoming a total pain. --- Source/Core/DolphinWX/Frame.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinWX/Frame.cpp') diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index cd334b54d2..4ea3c3901d 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -46,8 +46,8 @@ #include "Core/HW/GCPad.h" #include "Core/HW/Wiimote.h" #include "Core/HotkeyManager.h" -#include "Core/IPC_HLE/WII_IPC_HLE.h" -#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h" +#include "Core/IOS/IPC.h" +#include "Core/IOS/USB/Bluetooth/BTBase.h" #include "Core/Movie.h" #include "Core/State.h" -- cgit v1.2.3 From 49b9c723e23d89140fcc45662b6b0079eed33010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Wed, 18 Jan 2017 20:27:51 +0100 Subject: Put IOS devices in a namespace and drop WII_IPC_HLE prefix --- Source/Core/DolphinWX/Frame.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinWX/Frame.cpp') diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 4ea3c3901d..9bb98c5f62 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1279,8 +1279,8 @@ void CFrame::ParseHotkeys() { auto device = IOS::HLE::GetDeviceByName("/dev/usb/oh1/57e/305"); if (device != nullptr) - std::static_pointer_cast(device) - ->UpdateSyncButtonState(IsHotkey(HK_TRIGGER_SYNC_BUTTON, true)); + std::static_pointer_cast(device)->UpdateSyncButtonState( + IsHotkey(HK_TRIGGER_SYNC_BUTTON, true)); } if (UseDebugger) -- cgit v1.2.3