The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

IOS: Reorganise the source files and IPC_HLE→IOS

Browse Source 
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.
This commit is contained in:
Léo Lam 2017-01-18 13:50:28 +01:00
parent 01b322d45f
commit 24199293d3
77 changed files with 432 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Boot/Boot.cpp
View File

@ -26,7 +26,7 @@
#include "Core/HW/ProcessorInterface.h" #include "Core/HW/ProcessorInterface.h"
#include "Core/HW/VideoInterface.h" #include "Core/HW/VideoInterface.h"
#include "Core/Host.h" #include "Core/Host.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/PatchEngine.h" #include "Core/PatchEngine.h"
#include "Core/PowerPC/PPCAnalyst.h" #include "Core/PowerPC/PPCAnalyst.h"
#include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PPCSymbolDB.h"

4
Source/Core/Core/Boot/Boot_WiiWAD.cpp
View File

@ -14,8 +14,8 @@
#include "Core/HLE/HLE.h" #include "Core/HLE/HLE.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/HW/VideoInterface.h" #include "Core/HW/VideoInterface.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/FS/FileIO.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h" #include "Core/IOS/IPC.h"
#include "Core/PatchEngine.h" #include "Core/PatchEngine.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"

54
Source/Core/Core/CMakeLists.txt
View File

@ -135,31 +135,31 @@ set(SRCS ActionReplay.cpp
HW/WiimoteEmu/Speaker.cpp HW/WiimoteEmu/Speaker.cpp
HW/WiimoteReal/WiimoteReal.cpp HW/WiimoteReal/WiimoteReal.cpp
HW/WiiSaveCrypted.cpp HW/WiiSaveCrypted.cpp
IPC_HLE/ESFormats.cpp IOS/Device.cpp
IPC_HLE/ICMPLin.cpp IOS/DeviceStub.cpp
IPC_HLE/NWC24Config.cpp IOS/IPC.cpp
IPC_HLE/WII_IPC_HLE.cpp IOS/DI/DI.cpp
IPC_HLE/WII_IPC_HLE_Device.cpp IOS/ES/ES.cpp
IPC_HLE/WII_IPC_HLE_Device_stub.cpp IOS/ES/Formats.cpp
IPC_HLE/WII_IPC_HLE_Device_DI.cpp IOS/FS/FileIO.cpp
IPC_HLE/WII_IPC_HLE_Device_es.cpp IOS/FS/FS.cpp
IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp IOS/Network/Config.cpp
IPC_HLE/WII_IPC_HLE_Device_fs.cpp IOS/Network/ICMPLin.cpp
IPC_HLE/WII_Socket.cpp IOS/Network/NWC24Config.cpp
IPC_HLE/WII_IPC_HLE_Device_net.cpp IOS/Network/Socket.cpp
IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp IOS/Network/Net.cpp
IPC_HLE/WII_IPC_HLE_Device_stm.cpp IOS/Network/SSL.cpp
IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp IOS/SDIO/SDIOSlot0.cpp
IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.cpp IOS/STM/STM.cpp
IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp IOS/USB/USB_KBD.cpp
IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.cpp IOS/USB/USB_VEN.cpp
IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp IOS/USB/Bluetooth/BTBase.cpp
IPC_HLE/WII_IPC_HLE_Device_usb_ven.cpp IOS/USB/Bluetooth/BTEmu.cpp
IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.cpp IOS/USB/Bluetooth/BTStub.cpp
IPC_HLE/WII_IPC_HLE_Device_wfsi.cpp IOS/USB/Bluetooth/WiimoteDevice.cpp
IPC_HLE/WII_IPC_HLE_WiiMote.cpp IOS/USB/Bluetooth/WiimoteHIDAttr.cpp
IPC_HLE/WiiMote_HID_Attr.cpp IOS/WFS/WFSSRV.cpp
IPC_HLE/WiiNetConfig.cpp IOS/WFS/WFSI.cpp
PowerPC/BreakPoints.cpp PowerPC/BreakPoints.cpp
PowerPC/MMU.cpp PowerPC/MMU.cpp
PowerPC/PowerPC.cpp PowerPC/PowerPC.cpp
@ -260,8 +260,8 @@ set(LIBS
if(LIBUSB_FOUND) if(LIBUSB_FOUND)
# Using shared LibUSB # Using shared LibUSB
set(LIBS ${LIBS} ${LIBUSB_LIBRARIES}) set(LIBS ${LIBS} ${LIBUSB_LIBRARIES})
set(SRCS ${SRCS} IPC_HLE/WII_IPC_HLE_Device_hid.cpp set(SRCS ${SRCS} IOS/USB/USB_HIDv4.cpp
IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp) IOS/USB/Bluetooth/BTReal.cpp)
endif(LIBUSB_FOUND) endif(LIBUSB_FOUND)
if(NOT APPLE) if(NOT APPLE)

2
Source/Core/Core/ConfigManager.cpp
View File

@ -22,7 +22,7 @@
#include "Core/Core.h" // for bWii #include "Core/Core.h" // for bWii
#include "Core/FifoPlayer/FifoDataFile.h" #include "Core/FifoPlayer/FifoDataFile.h"
#include "Core/HW/SI.h" #include "Core/HW/SI.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h" #include "Core/IOS/USB/Bluetooth/BTBase.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
#include "DiscIO/Enums.h" #include "DiscIO/Enums.h"

6
Source/Core/Core/Core.cpp
View File

@ -54,9 +54,9 @@
#include "Core/HW/SystemTimers.h" #include "Core/HW/SystemTimers.h"
#include "Core/HW/VideoInterface.h" #include "Core/HW/VideoInterface.h"
#include "Core/HW/Wiimote.h" #include "Core/HW/Wiimote.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h" #include "Core/IOS/Network/Socket.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/IOS/USB/Bluetooth/BTEmu.h"
#include "Core/IPC_HLE/WII_Socket.h" #include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "Core/NetPlayClient.h" #include "Core/NetPlayClient.h"
#include "Core/NetPlayProto.h" #include "Core/NetPlayProto.h"

113
Source/Core/Core/Core.vcxproj
View File

@ -167,41 +167,41 @@
<ClCompile Include="HW\WiimoteReal\WiimoteReal.cpp" /> <ClCompile Include="HW\WiimoteReal\WiimoteReal.cpp" />
<ClCompile Include="HW\WII_IPC.cpp" /> <ClCompile Include="HW\WII_IPC.cpp" />
<ClCompile Include="HW\WiiSaveCrypted.cpp" /> <ClCompile Include="HW\WiiSaveCrypted.cpp" />
<ClCompile Include="IPC_HLE\ESFormats.cpp" /> <ClCompile Include="IOS\Device.cpp" />
<ClCompile Include="IPC_HLE\ICMPWin.cpp" /> <ClCompile Include="IOS\DeviceStub.cpp" />
<ClCompile Include="IPC_HLE\NWC24Config.cpp" /> <ClCompile Include="IOS\IPC.cpp" />
<ClCompile Include="IPC_HLE\WiiMote_HID_Attr.cpp" /> <ClCompile Include="IOS\DI\DI.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE.cpp" /> <ClCompile Include="IOS\ES\ES.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device.cpp" /> <ClCompile Include="IOS\ES\Formats.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_stub.cpp" /> <ClCompile Include="IOS\FS\FileIO.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_DI.cpp" /> <ClCompile Include="IOS\FS\FS.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_es.cpp" /> <ClCompile Include="IOS\Network\Config.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp" /> <ClCompile Include="IOS\Network\ICMPLin.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_fs.cpp" /> <ClCompile Include="IOS\Network\NWC24Config.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_hid.cpp"> <ClCompile Include="IOS\Network\Socket.cpp" />
<ClCompile Include="IOS\Network\Net.cpp" />
<ClCompile Include="IOS\Network\SSL.cpp" />
<ClCompile Include="IOS\SDIO\SDIOSlot0.cpp" />
<ClCompile Include="IOS\STM\STM.cpp" />
<ClCompile Include="IOS\USB\USB_HIDv4.cpp">
<!-- <!--
Disable "nonstandard extension used : zero-sized array in struct/union" warning, Disable "nonstandard extension used : zero-sized array in struct/union" warning,
which is hit in libusb.h. which is hit in libusb.h.
--> -->
<DisableSpecificWarnings>4200;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4200;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_net.cpp" /> <ClCompile Include="IOS\USB\USB_KBD.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_net_ssl.cpp" /> <ClCompile Include="IOS\USB\USB_VEN.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_stm.cpp" /> <ClCompile Include="IOS\USB\Bluetooth\BTBase.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp" /> <ClCompile Include="IOS\USB\Bluetooth\BTEmu.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_base.cpp" /> <ClCompile Include="IOS\USB\Bluetooth\BTStub.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_emu.cpp" /> <ClCompile Include="IOS\USB\Bluetooth\BTReal.cpp">
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_real.cpp">
<DisableSpecificWarnings>4200;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4200;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_stub.cpp" /> <ClCompile Include="IOS\USB\Bluetooth\WiimoteDevice.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp" /> <ClCompile Include="IOS\USB\Bluetooth\WiimoteHIDAttr.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_ven.cpp" /> <ClCompile Include="IOS\WFS\WFSSRV.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_wfssrv.cpp" /> <ClCompile Include="IOS\WFS\WFSI.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_wfsi.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_WiiMote.cpp" />
<ClCompile Include="IPC_HLE\WII_Socket.cpp" />
<ClCompile Include="IPC_HLE\WiiNetConfig.cpp" />
<ClCompile Include="MemTools.cpp" /> <ClCompile Include="MemTools.cpp" />
<ClCompile Include="Movie.cpp" /> <ClCompile Include="Movie.cpp" />
<ClCompile Include="NetPlayClient.cpp" /> <ClCompile Include="NetPlayClient.cpp" />
@ -395,35 +395,36 @@
<ClInclude Include="HW\WiimoteReal\WiimoteRealBase.h" /> <ClInclude Include="HW\WiimoteReal\WiimoteRealBase.h" />
<ClInclude Include="HW\WiiSaveCrypted.h" /> <ClInclude Include="HW\WiiSaveCrypted.h" />
<ClInclude Include="HW\WII_IPC.h" /> <ClInclude Include="HW\WII_IPC.h" />
<ClInclude Include="IPC_HLE\ESFormats.h" /> <ClInclude Include="IOS\Device.h" />
<ClInclude Include="IPC_HLE\hci.h" /> <ClInclude Include="IOS\DeviceStub.h" />
<ClInclude Include="IPC_HLE\ICMP.h" /> <ClInclude Include="IOS\IPC.h" />
<ClInclude Include="IPC_HLE\l2cap.h" /> <ClInclude Include="IOS\DI\DI.h" />
<ClInclude Include="IPC_HLE\NWC24Config.h" /> <ClInclude Include="IOS\ES\ES.h" />
<ClInclude Include="IPC_HLE\WiiMote_HID_Attr.h" /> <ClInclude Include="IOS\ES\Formats.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE.h" /> <ClInclude Include="IOS\FS\FileIO.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device.h" /> <ClInclude Include="IOS\FS\FS.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_stub.h" /> <ClInclude Include="IOS\Network\Config.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_DI.h" /> <ClInclude Include="IOS\Network\ICMPLin.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_es.h" /> <ClInclude Include="IOS\Network\NWC24Config.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_FileIO.h" /> <ClInclude Include="IOS\Network\ICMP.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_fs.h" /> <ClInclude Include="IOS\Network\Socket.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_hid.h" /> <ClInclude Include="IOS\Network\Net.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_net.h" /> <ClInclude Include="IOS\Network\SSL.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_net_ssl.h" /> <ClInclude Include="IOS\SDIO\SDIOSlot0.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_stm.h" /> <ClInclude Include="IOS\STM\STM.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h" /> <ClInclude Include="IOS\USB\USB_HIDv4.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_base.h" /> <ClInclude Include="IOS\USB\USB_KBD.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_emu.h" /> <ClInclude Include="IOS\USB\USB_VEN.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_real.h" /> <ClInclude Include="IOS\USB\Bluetooth\BTBase.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_stub.h" /> <ClInclude Include="IOS\USB\Bluetooth\BTEmu.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h" /> <ClInclude Include="IOS\USB\Bluetooth\BTStub.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_ven.h" /> <ClInclude Include="IOS\USB\Bluetooth\BTReal.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_wfssrv.h" /> <ClInclude Include="IOS\USB\Bluetooth\WiimoteDevice.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_wfsi.h" /> <ClInclude Include="IOS\USB\Bluetooth\WiimoteHIDAttr.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_WiiMote.h" /> <ClInclude Include="IOS\USB\Bluetooth\hci.h" />
<ClInclude Include="IPC_HLE\WII_Socket.h" /> <ClInclude Include="IOS\USB\Bluetooth\l2cap.h" />
<ClInclude Include="IPC_HLE\WiiNetConfig.h" /> <ClInclude Include="IOS\WFS\WFSSRV.h" />
<ClInclude Include="IOS\WFS\WFSI.h" />
<ClInclude Include="MachineContext.h" /> <ClInclude Include="MachineContext.h" />
<ClInclude Include="MemTools.h" /> <ClInclude Include="MemTools.h" />
<ClInclude Include="Movie.h" /> <ClInclude Include="Movie.h" />

409
Source/Core/Core/Core.vcxproj.filters
View File

@ -25,9 +25,6 @@
<Filter Include="HW %28Flipper/Hollywood%29"> <Filter Include="HW %28Flipper/Hollywood%29">
<UniqueIdentifier>{d060b137-c211-44eb-9cad-fc12dedbea73}</UniqueIdentifier> <UniqueIdentifier>{d060b137-c211-44eb-9cad-fc12dedbea73}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="IPC HLE %28IOS/Starlet%29">
<UniqueIdentifier>{becbad5b-2531-410c-b032-2da2f078b178}</UniqueIdentifier>
</Filter>
<Filter Include="PowerPC"> <Filter Include="PowerPC">
<UniqueIdentifier>{ebd24590-dfdc-433e-a411-21723e4b7cb5}</UniqueIdentifier> <UniqueIdentifier>{ebd24590-dfdc-433e-a411-21723e4b7cb5}</UniqueIdentifier>
</Filter> </Filter>
@ -112,39 +109,42 @@
<Filter Include="HW %28Flipper/Hollywood%29\Wii IPC"> <Filter Include="HW %28Flipper/Hollywood%29\Wii IPC">
<UniqueIdentifier>{2b41ab45-ba8c-45dc-92cc-9107c1fa3e36}</UniqueIdentifier> <UniqueIdentifier>{2b41ab45-ba8c-45dc-92cc-9107c1fa3e36}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="IPC HLE %28IOS/Starlet%29\DI">
<UniqueIdentifier>{9370a21f-a7bf-4973-8258-290253617653}</UniqueIdentifier>
</Filter>
<Filter Include="IPC HLE %28IOS/Starlet%29\ES">
<UniqueIdentifier>{3f85582a-e612-4582-b0fa-ecc27ba3658c}</UniqueIdentifier>
</Filter>
<Filter Include="IPC HLE %28IOS/Starlet%29\FS">
<UniqueIdentifier>{1f5662c1-885f-4ed4-9f10-cc8e98eaa35d}</UniqueIdentifier>
</Filter>
<Filter Include="IPC HLE %28IOS/Starlet%29\Keyboard">
<UniqueIdentifier>{1fb00563-01ba-42c4-82de-2c66371e614a}</UniqueIdentifier>
</Filter>
<Filter Include="IPC HLE %28IOS/Starlet%29\Net">
<UniqueIdentifier>{4620ba8f-5638-4d56-941e-69fc4a4dfc07}</UniqueIdentifier>
</Filter>
<Filter Include="IPC HLE %28IOS/Starlet%29\SDIO - SD Card">
<UniqueIdentifier>{83c278e5-6b06-4cd0-96fb-2e3c88eb32d7}</UniqueIdentifier>
</Filter>
<Filter Include="IPC HLE %28IOS/Starlet%29\USB">
<UniqueIdentifier>{4a090016-76d5-43dd-95a4-abedfc11ef31}</UniqueIdentifier>
</Filter>
<Filter Include="IPC HLE %28IOS/Starlet%29\WFS">
<UniqueIdentifier>{f11746cf-277a-4d58-bcf1-578a45348b07}</UniqueIdentifier>
</Filter>
<Filter Include="IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote">
<UniqueIdentifier>{8352be4d-d37d-4f55-adec-b940a9712802}</UniqueIdentifier>
</Filter>
<Filter Include="PowerPC\JitILCommon"> <Filter Include="PowerPC\JitILCommon">
<UniqueIdentifier>{827afa93-1a80-4835-93ae-b5516d95867f}</UniqueIdentifier> <UniqueIdentifier>{827afa93-1a80-4835-93ae-b5516d95867f}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="PowerPC\Jit64Common"> <Filter Include="PowerPC\Jit64Common">
<UniqueIdentifier>{81956f71-d9fe-454f-96a6-855195d611c4}</UniqueIdentifier> <UniqueIdentifier>{81956f71-d9fe-454f-96a6-855195d611c4}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="IOS">
<UniqueIdentifier>{e14b3339-dc23-46d6-845d-7206dc4f88c3}</UniqueIdentifier>
</Filter>
<Filter Include="IOS\USB">
<UniqueIdentifier>{c1e2e0dc-30ac-44cd-9909-e5b594647a04}</UniqueIdentifier>
</Filter>
<Filter Include="IOS\USB\Bluetooth">
<UniqueIdentifier>{5846b261-397e-4e2a-89e3-88d22ab927c5}</UniqueIdentifier>
</Filter>
<Filter Include="IOS\Network">
<UniqueIdentifier>{ab9cdd90-54d7-4f42-9248-d7903ce52cc8}</UniqueIdentifier>
</Filter>
<Filter Include="IOS\DI">
<UniqueIdentifier>{3db8c364-1d72-4660-9179-86d1c46904b9}</UniqueIdentifier>
</Filter>
<Filter Include="IOS\FS">
<UniqueIdentifier>{75be4669-90fe-4280-b0ea-df350f481357}</UniqueIdentifier>
</Filter>
<Filter Include="IOS\ES">
<UniqueIdentifier>{7fae98ef-4b62-4701-8f08-c496bd1ce2a7}</UniqueIdentifier>
</Filter>
<Filter Include="IOS\SDIO">
<UniqueIdentifier>{b132ac6a-a02e-429e-858b-bfbc3fdc1851}</UniqueIdentifier>
</Filter>
<Filter Include="IOS\STM">
<UniqueIdentifier>{2bfd4ecc-7225-48f0-91b9-efb42aaf71bf}</UniqueIdentifier>
</Filter>
<Filter Include="IOS\WFS">
<UniqueIdentifier>{1fa9df3e-6741-4045-b2f6-457b4a0540a9}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="BootManager.cpp" /> <ClCompile Include="BootManager.cpp" />
@ -568,84 +568,6 @@
<ClCompile Include="DSP\LabelMap.cpp"> <ClCompile Include="DSP\LabelMap.cpp">
<Filter>DSPCore</Filter> <Filter>DSPCore</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="IPC_HLE\ESFormats.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE.cpp">
<Filter>IPC HLE %28IOS/Starlet%29</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device.cpp">
<Filter>IPC HLE %28IOS/Starlet%29</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_stub.cpp">
<Filter>IPC HLE %28IOS/Starlet%29</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_DI.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\DI</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_es.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_fs.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\Keyboard</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\ICMPWin.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\NWC24Config.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_net.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_net_ssl.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_Socket.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WiiNetConfig.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\SDIO - SD Card</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_stm.cpp">
<Filter>IPC HLE %28IOS/Starlet%29</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_hid.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_base.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_emu.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_real.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_stub.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_wfssrv.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\WFS</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_wfsi.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\WFS</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WII_IPC_HLE_WiiMote.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClCompile>
<ClCompile Include="IPC_HLE\WiiMote_HID_Attr.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClCompile>
<ClCompile Include="HW\Wiimote.cpp"> <ClCompile Include="HW\Wiimote.cpp">
<Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter> <Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter>
</ClCompile> </ClCompile>
@ -779,17 +701,89 @@
<Filter>PowerPC\Jit64Common</Filter> <Filter>PowerPC\Jit64Common</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Analytics.cpp" /> <ClCompile Include="Analytics.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_ven.cpp"> <ClCompile Include="PowerPC\SignatureDB\CSVSignatureDB.cpp" />
<Filter>IPC HLE %28IOS/Starlet%29\USB</Filter> <ClCompile Include="PowerPC\SignatureDB\DSYSignatureDB.cpp" />
<ClCompile Include="PowerPC\SignatureDB\SignatureDB.cpp" />
<ClCompile Include="IOS\USB\Bluetooth\BTBase.cpp">
<Filter>IOS\USB\Bluetooth</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="PowerPC\SignatureDB\CSVSignatureDB.cpp"> <ClCompile Include="IOS\USB\Bluetooth\BTEmu.cpp">
<Filter>PowerPC\SignatureDB</Filter> <Filter>IOS\USB\Bluetooth</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="PowerPC\SignatureDB\DSYSignatureDB.cpp"> <ClCompile Include="IOS\USB\Bluetooth\BTReal.cpp">
<Filter>PowerPC\SignatureDB</Filter> <Filter>IOS\USB\Bluetooth</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="PowerPC\SignatureDB\SignatureDB.cpp"> <ClCompile Include="IOS\USB\Bluetooth\BTStub.cpp">
<Filter>PowerPC\SignatureDB</Filter> <Filter>IOS\USB\Bluetooth</Filter>
</ClCompile>
<ClCompile Include="IOS\Network\Config.cpp">
<Filter>IOS\Network</Filter>
</ClCompile>
<ClCompile Include="IOS\Device.cpp">
<Filter>IOS</Filter>
</ClCompile>
<ClCompile Include="IOS\DeviceStub.cpp">
<Filter>IOS</Filter>
</ClCompile>
<ClCompile Include="IOS\DI\DI.cpp">
<Filter>IOS\DI</Filter>
</ClCompile>
<ClCompile Include="IOS\FS\FileIO.cpp">
<Filter>IOS\FS</Filter>
</ClCompile>
<ClCompile Include="IOS\ES\ES.cpp">
<Filter>IOS\ES</Filter>
</ClCompile>
<ClCompile Include="IOS\ES\Formats.cpp">
<Filter>IOS\ES</Filter>
</ClCompile>
<ClCompile Include="IOS\FS\FS.cpp">
<Filter>IOS\FS</Filter>
</ClCompile>
<ClCompile Include="IOS\Network\ICMPLin.cpp">
<Filter>IOS\Network</Filter>
</ClCompile>
<ClCompile Include="IOS\IPC.cpp">
<Filter>IOS</Filter>
</ClCompile>
<ClCompile Include="IOS\Network\Net.cpp">
<Filter>IOS\Network</Filter>
</ClCompile>
<ClCompile Include="IOS\Network\NWC24Config.cpp">
<Filter>IOS\Network</Filter>
</ClCompile>
<ClCompile Include="IOS\SDIO\SDIOSlot0.cpp">
<Filter>IOS\SDIO</Filter>
</ClCompile>
<ClCompile Include="IOS\Network\Socket.cpp">
<Filter>IOS\Network</Filter>
</ClCompile>
<ClCompile Include="IOS\Network\SSL.cpp">
<Filter>IOS\Network</Filter>
</ClCompile>
<ClCompile Include="IOS\STM\STM.cpp">
<Filter>IOS\STM</Filter>
</ClCompile>
<ClCompile Include="IOS\USB\USB_HIDv4.cpp">
<Filter>IOS\USB</Filter>
</ClCompile>
<ClCompile Include="IOS\USB\USB_KBD.cpp">
<Filter>IOS\USB</Filter>
</ClCompile>
<ClCompile Include="IOS\USB\USB_VEN.cpp">
<Filter>IOS\USB</Filter>
</ClCompile>
<ClCompile Include="IOS\WFS\WFSI.cpp">
<Filter>IOS\WFS</Filter>
</ClCompile>
<ClCompile Include="IOS\WFS\WFSSRV.cpp">
<Filter>IOS\WFS</Filter>
</ClCompile>
<ClCompile Include="IOS\USB\Bluetooth\WiimoteDevice.cpp">
<Filter>IOS\USB\Bluetooth</Filter>
</ClCompile>
<ClCompile Include="IOS\USB\Bluetooth\WiimoteHIDAttr.cpp">
<Filter>IOS\USB\Bluetooth</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -1174,90 +1168,6 @@
<ClInclude Include="DSP\LabelMap.h"> <ClInclude Include="DSP\LabelMap.h">
<Filter>DSPCore</Filter> <Filter>DSPCore</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="IPC_HLE\ESFormats.h">
<Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE.h">
<Filter>IPC HLE %28IOS/Starlet%29</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device.h">
<Filter>IPC HLE %28IOS/Starlet%29</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_stub.h">
<Filter>IPC HLE %28IOS/Starlet%29</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_stm.h">
<Filter>IPC HLE %28IOS/Starlet%29</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_DI.h">
<Filter>IPC HLE %28IOS/Starlet%29\DI</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_es.h">
<Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_FileIO.h">
<Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_fs.h">
<Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h">
<Filter>IPC HLE %28IOS/Starlet%29\Keyboard</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\ICMP.h">
<Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\NWC24Config.h">
<Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_net.h">
<Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_net_ssl.h">
<Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_Socket.h">
<Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WiiNetConfig.h">
<Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h">
<Filter>IPC HLE %28IOS/Starlet%29\SDIO - SD Card</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_hid.h">
<Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_base.h">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_emu.h">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_real.h">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_stub.h">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_WiiMote.h">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\hci.h">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\l2cap.h">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WiiMote_HID_Attr.h">
<Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_wfssrv.h">
<Filter>IPC HLE %28IOS/Starlet%29\WFS</Filter>
</ClInclude>
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_wfsi.h">
<Filter>IPC HLE %28IOS/Starlet%29\WFS</Filter>
</ClInclude>
<ClInclude Include="HW\Wiimote.h"> <ClInclude Include="HW\Wiimote.h">
<Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter> <Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter>
</ClInclude> </ClInclude>
@ -1356,20 +1266,101 @@
<Filter>PowerPC\Jit64Common</Filter> <Filter>PowerPC\Jit64Common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Analytics.h" /> <ClInclude Include="Analytics.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_ven.h"> <ClInclude Include="PowerPC\SignatureDB\CSVSignatureDB.h" />
<Filter>IPC HLE %28IOS/Starlet%29\USB</Filter> <ClInclude Include="PowerPC\SignatureDB\DSYSignatureDB.h" />
<ClInclude Include="PowerPC\SignatureDB\SignatureDB.h" />
<ClInclude Include="IOS\USB\Bluetooth\BTBase.h">
<Filter>IOS\USB\Bluetooth</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="PowerPC\SignatureDB\CSVSignatureDB.h"> <ClInclude Include="IOS\USB\Bluetooth\BTEmu.h">
<Filter>PowerPC\SignatureDB</Filter> <Filter>IOS\USB\Bluetooth</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="PowerPC\SignatureDB\DSYSignatureDB.h"> <ClInclude Include="IOS\USB\Bluetooth\BTReal.h">
<Filter>PowerPC\SignatureDB</Filter> <Filter>IOS\USB\Bluetooth</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="PowerPC\SignatureDB\SignatureDB.h"> <ClInclude Include="IOS\USB\Bluetooth\BTStub.h">
<Filter>PowerPC\SignatureDB</Filter> <Filter>IOS\USB\Bluetooth</Filter>
</ClInclude>
<ClInclude Include="IOS\Network\Config.h">
<Filter>IOS\Network</Filter>
</ClInclude>
<ClInclude Include="IOS\DeviceStub.h">
<Filter>IOS</Filter>
</ClInclude>
<ClInclude Include="IOS\DI\DI.h">
<Filter>IOS\DI</Filter>
</ClInclude>
<ClInclude Include="IOS\ES\ES.h">
<Filter>IOS\ES</Filter>
</ClInclude>
<ClInclude Include="IOS\FS\FileIO.h">
<Filter>IOS\FS</Filter>
</ClInclude>
<ClInclude Include="IOS\ES\Formats.h">
<Filter>IOS\ES</Filter>
</ClInclude>
<ClInclude Include="IOS\FS\FS.h">
<Filter>IOS\FS</Filter>
</ClInclude>
<ClInclude Include="IOS\USB\Bluetooth\hci.h">
<Filter>IOS\USB\Bluetooth</Filter>
</ClInclude>
<ClInclude Include="IOS\Network\ICMP.h">
<Filter>IOS\Network</Filter>
</ClInclude>
<ClInclude Include="IOS\Network\ICMPLin.h">
<Filter>IOS\Network</Filter>
</ClInclude>
<ClInclude Include="IOS\USB\Bluetooth\l2cap.h">
<Filter>IOS\USB\Bluetooth</Filter>
</ClInclude>
<ClInclude Include="IOS\Network\Net.h">
<Filter>IOS\Network</Filter>
</ClInclude>
<ClInclude Include="IOS\Network\NWC24Config.h">
<Filter>IOS\Network</Filter>
</ClInclude>
<ClInclude Include="IOS\SDIO\SDIOSlot0.h">
<Filter>IOS\SDIO</Filter>
</ClInclude>
<ClInclude Include="IOS\Network\Socket.h">
<Filter>IOS\Network</Filter>
</ClInclude>
<ClInclude Include="IOS\Network\SSL.h">
<Filter>IOS\Network</Filter>
</ClInclude>
<ClInclude Include="IOS\STM\STM.h">
<Filter>IOS\STM</Filter>
</ClInclude>
<ClInclude Include="IOS\USB\USB_HIDv4.h">
<Filter>IOS\USB</Filter>
</ClInclude>
<ClInclude Include="IOS\USB\USB_KBD.h">
<Filter>IOS\USB</Filter>
</ClInclude>
<ClInclude Include="IOS\USB\USB_VEN.h">
<Filter>IOS\USB</Filter>
</ClInclude>
<ClInclude Include="IOS\WFS\WFSI.h">
<Filter>IOS\WFS</Filter>
</ClInclude>
<ClInclude Include="IOS\WFS\WFSSRV.h">
<Filter>IOS\WFS</Filter>
</ClInclude>
<ClInclude Include="IOS\USB\Bluetooth\WiimoteDevice.h">
<Filter>IOS\USB\Bluetooth</Filter>
</ClInclude>
<ClInclude Include="IOS\USB\Bluetooth\WiimoteHIDAttr.h">
<Filter>IOS\USB\Bluetooth</Filter>
</ClInclude>
<ClInclude Include="IOS\Device.h">
<Filter>IOS</Filter>
</ClInclude>
<ClInclude Include="IOS\IPC.h">
<Filter>IOS</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Text Include="CMakeLists.txt" /> <Text Include="CMakeLists.txt" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
Source/Core/Core/HLE/HLE.cpp
View File

@ -14,7 +14,7 @@
#include "Core/HLE/HLE_Misc.h" #include "Core/HLE/HLE_Misc.h"
#include "Core/HLE/HLE_OS.h" #include "Core/HLE/HLE_OS.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h" #include "Core/IOS/ES/ES.h"
#include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"

4
Source/Core/Core/HW/DVDInterface.cpp
View File

@ -24,8 +24,8 @@
#include "Core/HW/ProcessorInterface.h" #include "Core/HW/ProcessorInterface.h"
#include "Core/HW/StreamADPCM.h" #include "Core/HW/StreamADPCM.h"
#include "Core/HW/SystemTimers.h" #include "Core/HW/SystemTimers.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/DI/DI.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h" #include "Core/IOS/IPC.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "DiscIO/Enums.h" #include "DiscIO/Enums.h"

2
Source/Core/Core/HW/HW.cpp
View File

@ -21,7 +21,7 @@
#include "Core/HW/SystemTimers.h" #include "Core/HW/SystemTimers.h"
#include "Core/HW/VideoInterface.h" #include "Core/HW/VideoInterface.h"
#include "Core/HW/WII_IPC.h" #include "Core/HW/WII_IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/State.h" #include "Core/State.h"
#include "Core/WiiRoot.h" #include "Core/WiiRoot.h"
#include "DiscIO/NANDContentLoader.h" #include "DiscIO/NANDContentLoader.h"

4
Source/Core/Core/HW/ProcessorInterface.cpp
View File

@ -11,8 +11,8 @@
#include "Core/HW/MMIO.h" #include "Core/HW/MMIO.h"
#include "Core/HW/ProcessorInterface.h" #include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SystemTimers.h" #include "Core/HW/SystemTimers.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h" #include "Core/IOS/STM/STM.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
namespace ProcessorInterface namespace ProcessorInterface

2
Source/Core/Core/HW/SystemTimers.cpp
View File

@ -57,7 +57,7 @@ IPC_HLE_PERIOD: For the Wii Remote this is the call schedule:
#include "Core/HW/DSP.h" #include "Core/HW/DSP.h"
#include "Core/HW/EXI_DeviceIPL.h" #include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/VideoInterface.h" #include "Core/HW/VideoInterface.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/PatchEngine.h" #include "Core/PatchEngine.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
#include "VideoCommon/Fifo.h" #include "VideoCommon/Fifo.h"

2
Source/Core/Core/HW/WII_IPC.cpp
View File

@ -9,7 +9,7 @@
#include "Core/CoreTiming.h" #include "Core/CoreTiming.h"
#include "Core/HW/MMIO.h" #include "Core/HW/MMIO.h"
#include "Core/HW/ProcessorInterface.h" #include "Core/HW/ProcessorInterface.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
// This is the intercommunication between ARM and PPC. Currently only PPC actually uses it, because // This is the intercommunication between ARM and PPC. Currently only PPC actually uses it, because
// of the IOS HLE // of the IOS HLE

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp → Source/Core/Core/IOS/DI/DI.cpp
View File

@ -13,8 +13,8 @@
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
#include "Core/HW/DVDInterface.h" #include "Core/HW/DVDInterface.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/DI/DI.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h" #include "Core/IOS/IPC.h"
#include "DiscIO/Volume.h" #include "DiscIO/Volume.h"
namespace IOS namespace IOS

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h → Source/Core/Core/IOS/DI/DI.h
View File

@ -8,8 +8,8 @@
#include <string> #include <string>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
class PointerWrap; class PointerWrap;

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.cpp → Source/Core/Core/IOS/Device.cpp
View File

@ -9,8 +9,8 @@
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/HW/SystemTimers.h" #include "Core/HW/SystemTimers.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
namespace IOS namespace IOS
{ {

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h → Source/Core/Core/IOS/Device.h
View File

@ -11,7 +11,7 @@
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
namespace IOS namespace IOS
{ {

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stub.cpp → Source/Core/Core/IOS/DeviceStub.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/IPC_HLE/WII_IPC_HLE_Device_stub.h" #include "Core/IOS/DeviceStub.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
namespace IOS namespace IOS

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stub.h → Source/Core/Core/IOS/DeviceStub.h
View File

@ -7,8 +7,8 @@
#include <string> #include <string>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
namespace IOS namespace IOS
{ {

8
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp → Source/Core/Core/IOS/ES/ES.cpp
View File

@ -53,10 +53,10 @@
#include "Core/HW/DVDInterface.h" #include "Core/HW/DVDInterface.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/HW/Wiimote.h" #include "Core/HW/Wiimote.h"
#include "Core/IPC_HLE/ESFormats.h" #include "Core/IOS/ES/ES.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h" #include "Core/IOS/ES/Formats.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h" #include "Core/IOS/USB/Bluetooth/BTEmu.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
#include "Core/ec_wii.h" #include "Core/ec_wii.h"

6
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h → Source/Core/Core/IOS/ES/ES.h
View File

@ -10,9 +10,9 @@
#include <vector> #include <vector>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/ESFormats.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/ES/Formats.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
class PointerWrap; class PointerWrap;

2
Source/Core/Core/IPC_HLE/ESFormats.cpp → Source/Core/Core/IOS/ES/Formats.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/IPC_HLE/ESFormats.h" #include "Core/IOS/ES/Formats.h"
#include <algorithm> #include <algorithm>
#include <utility> #include <utility>

0
Source/Core/Core/IPC_HLE/ESFormats.h → Source/Core/Core/IOS/ES/Formats.h
View File

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp → Source/Core/Core/IOS/FS/FS.cpp
View File

@ -19,8 +19,8 @@
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/HW/SystemTimers.h" #include "Core/HW/SystemTimers.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h" #include "Core/IOS/FS/FS.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_fs.h" #include "Core/IOS/FS/FileIO.h"
namespace IOS namespace IOS
{ {

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h → Source/Core/Core/IOS/FS/FS.h
View File

@ -7,8 +7,8 @@
#include <string> #include <string>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
class PointerWrap; class PointerWrap;

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp → Source/Core/Core/IOS/FS/FileIO.cpp
View File

@ -14,8 +14,8 @@
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/NandPaths.h" #include "Common/NandPaths.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/FS/FileIO.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h" #include "Core/IOS/IPC.h"
namespace IOS namespace IOS
{ {

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h → Source/Core/Core/IOS/FS/FileIO.h
View File

@ -8,8 +8,8 @@
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
class PointerWrap; class PointerWrap;

36
Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp → Source/Core/Core/IOS/IPC.cpp
View File

@ -33,23 +33,23 @@
#include "Core/CoreTiming.h" #include "Core/CoreTiming.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/HW/WII_IPC.h" #include "Core/HW/WII_IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/DI/DI.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h" #include "Core/IOS/DeviceStub.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h" #include "Core/IOS/ES/ES.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h" #include "Core/IOS/FS/FS.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_fs.h" #include "Core/IOS/FS/FileIO.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h" #include "Core/IOS/Network/Net.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h" #include "Core/IOS/Network/SSL.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h" #include "Core/IOS/SDIO/SDIOSlot0.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_stub.h" #include "Core/IOS/STM/STM.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h" #include "Core/IOS/USB/Bluetooth/BTEmu.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h" #include "Core/IOS/USB/Bluetooth/BTReal.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h" #include "Core/IOS/USB/USB_KBD.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.h" #include "Core/IOS/USB/USB_VEN.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.h" #include "Core/IOS/WFS/WFSI.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_wfsi.h" #include "Core/IOS/WFS/WFSSRV.h"
namespace CoreTiming namespace CoreTiming
{ {
@ -57,7 +57,7 @@ struct EventType;
} // namespace CoreTiming } // namespace CoreTiming
#if defined(__LIBUSB__) #if defined(__LIBUSB__)
#include "Core/IPC_HLE/WII_IPC_HLE_Device_hid.h" #include "Core/IOS/USB/USB_HIDv4.h"
#endif #endif
namespace IOS namespace IOS

0
Source/Core/Core/IPC_HLE/WII_IPC_HLE.h → Source/Core/Core/IOS/IPC.h
View File

2
Source/Core/Core/IPC_HLE/WiiNetConfig.cpp → Source/Core/Core/IOS/Network/Config.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/IPC_HLE/WiiNetConfig.h" #include "Core/IOS/Network/Config.h"
#include <cstring> #include <cstring>

0
Source/Core/Core/IPC_HLE/WiiNetConfig.h → Source/Core/Core/IOS/Network/Config.h
View File

0
Source/Core/Core/IPC_HLE/ICMP.h → Source/Core/Core/IOS/Network/ICMP.h
View File

2
Source/Core/Core/IPC_HLE/ICMPLin.cpp → Source/Core/Core/IOS/Network/ICMPLin.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "ICMP.h" #include "Core/IOS/Network/ICMP.h"
// Currently stubbed. AFAIK (delroth) there is no way to send ICMP echo // Currently stubbed. AFAIK (delroth) there is no way to send ICMP echo
// requests without being root on current Linux versions. // requests without being root on current Linux versions.

2
Source/Core/Core/IPC_HLE/ICMPWin.cpp → Source/Core/Core/IOS/Network/ICMPWin.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/IPC_HLE/ICMP.h" #include "Core/IOS/Network/ICMP.h"
enum enum
{ {

2
Source/Core/Core/IPC_HLE/NWC24Config.cpp → Source/Core/Core/IOS/Network/NWC24Config.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/IPC_HLE/NWC24Config.h" #include "Core/IOS/Network/NWC24Config.h"
#include <cstring> #include <cstring>

0
Source/Core/Core/IPC_HLE/NWC24Config.h → Source/Core/Core/IOS/Network/NWC24Config.h
View File

6
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp → Source/Core/Core/IOS/Network/Net.cpp
View File

@ -28,9 +28,9 @@
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/IPC_HLE/ICMP.h" #include "Core/IOS/Network/ICMP.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h" #include "Core/IOS/Network/Net.h"
#include "Core/IPC_HLE/WII_Socket.h" #include "Core/IOS/Network/Socket.h"
#include "Core/ec_wii.h" #include "Core/ec_wii.h"
#ifdef _WIN32 #ifdef _WIN32

8
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h → Source/Core/Core/IOS/Network/Net.h
View File

@ -10,10 +10,10 @@
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Core/HW/EXI_DeviceIPL.h" #include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/NWC24Config.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/Network/Config.h"
#include "Core/IPC_HLE/WiiNetConfig.h" #include "Core/IOS/Network/NWC24Config.h"
#ifdef _WIN32 #ifdef _WIN32
#include <ws2tcpip.h> #include <ws2tcpip.h>

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp → Source/Core/Core/IOS/Network/SSL.cpp
View File

@ -13,8 +13,8 @@
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h" #include "Core/IOS/Network/SSL.h"
#include "Core/IPC_HLE/WII_Socket.h" #include "Core/IOS/Network/Socket.h"
namespace IOS namespace IOS
{ {

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h → Source/Core/Core/IOS/Network/SSL.h
View File

@ -19,8 +19,8 @@
// clang-format on // clang-format on
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/Device.h"
namespace IOS namespace IOS
{ {

6
Source/Core/Core/IPC_HLE/WII_Socket.cpp → Source/Core/Core/IOS/Network/Socket.cpp
View File

@ -12,9 +12,9 @@
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_Socket.h" // No Wii socket support while using NetPlay or TAS #include "Core/IOS/Network/Socket.h" // No Wii socket support while using NetPlay or TAS
#ifdef _WIN32 #ifdef _WIN32
#define ERRORCODE(name) WSA##name #define ERRORCODE(name) WSA##name

6
Source/Core/Core/IPC_HLE/WII_Socket.h → Source/Core/Core/IOS/Network/Socket.h
View File

@ -52,9 +52,9 @@ typedef struct pollfd pollfd_t;
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/NonCopyable.h" #include "Common/NonCopyable.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h" #include "Core/IOS/Network/Net.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h" #include "Core/IOS/Network/SSL.h"
namespace IOS namespace IOS
{ {

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp → Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp
View File

@ -14,8 +14,8 @@
#include "Common/SDCardUtil.h" #include "Common/SDCardUtil.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h" #include "Core/IOS/SDIO/SDIOSlot0.h"
namespace IOS namespace IOS
{ {

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h → Source/Core/Core/IOS/SDIO/SDIOSlot0.h
View File

@ -11,8 +11,8 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
class PointerWrap; class PointerWrap;

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.cpp → Source/Core/Core/IOS/STM/STM.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h" #include "Core/IOS/STM/STM.h"
#include <functional> #include <functional>
#include <memory> #include <memory>

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h → Source/Core/Core/IOS/STM/STM.h
View File

@ -7,8 +7,8 @@
#include <string> #include <string>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
namespace IOS namespace IOS
{ {

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.cpp → Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp
View File

@ -14,7 +14,7 @@
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/SysConf.h" #include "Common/SysConf.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h" #include "Core/IOS/USB/Bluetooth/BTBase.h"
namespace IOS namespace IOS
{ {

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h → Source/Core/Core/IOS/USB/Bluetooth/BTBase.h
View File

@ -8,8 +8,8 @@
#include <string> #include <string>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
class PointerWrap; class PointerWrap;
class SysConf; class SysConf;

7
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp → Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp
View File

@ -22,10 +22,9 @@
#include "Core/HW/SystemTimers.h" #include "Core/HW/SystemTimers.h"
#include "Core/HW/Wiimote.h" #include "Core/HW/Wiimote.h"
#include "Core/Host.h" #include "Core/Host.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h" #include "Core/IOS/USB/Bluetooth/BTEmu.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/ControllerInterface.h"
namespace IOS namespace IOS

10
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h → Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h
View File

@ -13,11 +13,11 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/HW/Wiimote.h" #include "Core/HW/Wiimote.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h" #include "Core/IOS/USB/Bluetooth/BTBase.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
#include "Core/IPC_HLE/hci.h" #include "Core/IOS/USB/Bluetooth/hci.h"
class PointerWrap; class PointerWrap;

6
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp → Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp
View File

@ -27,9 +27,9 @@
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h" #include "Core/IOS/USB/Bluetooth/BTReal.h"
#include "Core/IPC_HLE/hci.h" #include "Core/IOS/USB/Bluetooth/hci.h"
namespace IOS namespace IOS
{ {

6
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h → Source/Core/Core/IOS/USB/Bluetooth/BTReal.h
View File

@ -13,8 +13,8 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Flag.h" #include "Common/Flag.h"
#include "Common/Timer.h" #include "Common/Timer.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h" #include "Core/IOS/USB/Bluetooth/BTBase.h"
class PointerWrap; class PointerWrap;
struct libusb_context; struct libusb_context;
@ -104,7 +104,7 @@ private:
} // namespace IOS } // namespace IOS
#else #else
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h" #include "Core/IOS/USB/Bluetooth/BTStub.h"
namespace IOS namespace IOS
{ {

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.cpp → Source/Core/Core/IOS/USB/Bluetooth/BTStub.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h" #include "Core/IOS/USB/Bluetooth/BTStub.h"
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h → Source/Core/Core/IOS/USB/Bluetooth/BTStub.h
View File

@ -7,8 +7,8 @@
#include <string> #include <string>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h" #include "Core/IOS/USB/Bluetooth/BTBase.h"
class PointerWrap; class PointerWrap;

8
Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp → Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
View File

@ -16,10 +16,10 @@
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/HW/Wiimote.h" #include "Core/HW/Wiimote.h"
#include "Core/Host.h" #include "Core/Host.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h" #include "Core/IOS/USB/Bluetooth/BTEmu.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
#include "Core/IPC_HLE/WiiMote_HID_Attr.h" #include "Core/IOS/USB/Bluetooth/WiimoteHIDAttr.h"
#include "Core/IPC_HLE/l2cap.h" #include "Core/IOS/USB/Bluetooth/l2cap.h"
namespace IOS namespace IOS
{ {

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h → Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.h
View File

@ -10,7 +10,7 @@
#include "Common/CommonFuncs.h" #include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/hci.h" #include "Core/IOS/USB/Bluetooth/hci.h"
class PointerWrap; class PointerWrap;

2
Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp → Source/Core/Core/IOS/USB/Bluetooth/WiimoteHIDAttr.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/IPC_HLE/WiiMote_HID_Attr.h" #include "Core/IOS/USB/Bluetooth/WiimoteHIDAttr.h"
#include "Common/Assert.h" #include "Common/Assert.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"

0
Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h → Source/Core/Core/IOS/USB/Bluetooth/WiimoteHIDAttr.h
View File

0
Source/Core/Core/IPC_HLE/hci.h → Source/Core/Core/IOS/USB/Bluetooth/hci.h
View File

0
Source/Core/Core/IPC_HLE/l2cap.h → Source/Core/Core/IOS/USB/Bluetooth/l2cap.h
View File

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp → Source/Core/Core/IOS/USB/USB_HIDv4.cpp
View File

@ -17,8 +17,8 @@
#include "Core/CoreTiming.h" #include "Core/CoreTiming.h"
#include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_hid.h" #include "Core/IOS/USB/USB_HIDv4.h"
namespace IOS namespace IOS
{ {

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h → Source/Core/Core/IOS/USB/USB_HIDv4.h
View File

@ -11,8 +11,8 @@
#include <thread> #include <thread>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
// Forward declare things which we need from libusb header. // Forward declare things which we need from libusb header.
// This prevents users of this file from indirectly pulling in libusb. // This prevents users of this file from indirectly pulling in libusb.

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp → Source/Core/Core/IOS/USB/USB_KBD.cpp
View File

@ -11,7 +11,7 @@
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" // Local core functions #include "Core/Core.h" // Local core functions
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h" #include "Core/IOS/USB/USB_KBD.h"
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h → Source/Core/Core/IOS/USB/USB_KBD.h
View File

@ -8,8 +8,8 @@
#include <string> #include <string>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
namespace IOS namespace IOS
{ {

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.cpp → Source/Core/Core/IOS/USB/USB_VEN.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.h" #include "Core/IOS/USB/USB_VEN.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.h → Source/Core/Core/IOS/USB/USB_VEN.h
View File

@ -7,8 +7,8 @@
#include <string> #include <string>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
namespace IOS namespace IOS
{ {

6
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_wfsi.cpp → Source/Core/Core/IOS/WFS/WFSI.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/IPC_HLE/WII_IPC_HLE_Device_wfsi.h" #include "Core/IOS/WFS/WFSI.h"
#include <mbedtls/aes.h> #include <mbedtls/aes.h>
#include <stack> #include <stack>
@ -14,8 +14,8 @@
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/ESFormats.h" #include "Core/IOS/ES/Formats.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.h" #include "Core/IOS/WFS/WFSSRV.h"
#include "DiscIO/NANDContentLoader.h" #include "DiscIO/NANDContentLoader.h"
namespace IOS namespace IOS

6
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_wfsi.h → Source/Core/Core/IOS/WFS/WFSI.h
View File

@ -10,9 +10,9 @@
#include <mbedtls/aes.h> #include <mbedtls/aes.h>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IPC_HLE/ESFormats.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/ES/Formats.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
namespace IOS namespace IOS
{ {

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.cpp → Source/Core/Core/IOS/WFS/WFSSRV.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.h" #include "Core/IOS/WFS/WFSSRV.h"
#include <string> #include <string>
#include <vector> #include <vector>

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.h → Source/Core/Core/IOS/WFS/WFSSRV.h
View File

@ -9,8 +9,8 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/Device.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h" #include "Core/IOS/IPC.h"
#include "DiscIO/Volume.h" #include "DiscIO/Volume.h"
namespace IOS namespace IOS

4
Source/Core/Core/Movie.cpp
View File

@ -32,8 +32,8 @@
#include "Core/HW/Wiimote.h" #include "Core/HW/Wiimote.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteEmu/WiimoteHid.h" #include "Core/HW/WiimoteEmu/WiimoteHid.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h" #include "Core/IOS/USB/Bluetooth/BTEmu.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "Core/NetPlayProto.h" #include "Core/NetPlayProto.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"

2
Source/Core/Core/NetPlayClient.cpp
View File

@ -22,7 +22,7 @@
#include "Core/HW/Sram.h" #include "Core/HW/Sram.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h" #include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h" #include "Core/IOS/USB/Bluetooth/BTEmu.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "InputCommon/GCAdapter.h" #include "InputCommon/GCAdapter.h"
#include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/OnScreenDisplay.h"

2
Source/Core/DolphinWX/Config/WiiConfigPane.cpp
View File

@ -13,7 +13,7 @@
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "DolphinWX/DolphinSlider.h" #include "DolphinWX/DolphinSlider.h"
#include "DolphinWX/WxEventUtils.h" #include "DolphinWX/WxEventUtils.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"

4
Source/Core/DolphinWX/ControllerConfigDiag.cpp
View File

@ -27,8 +27,8 @@
#include "Core/HW/Wiimote.h" #include "Core/HW/Wiimote.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h" #include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "Core/HotkeyManager.h" #include "Core/HotkeyManager.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h" #include "Core/IOS/USB/Bluetooth/BTReal.h"
#include "Core/NetPlayProto.h" #include "Core/NetPlayProto.h"
#include "DolphinWX/Config/GCAdapterConfigDiag.h" #include "DolphinWX/Config/GCAdapterConfigDiag.h"
#include "DolphinWX/ControllerConfigDiag.h" #include "DolphinWX/ControllerConfigDiag.h"

4
Source/Core/DolphinWX/Frame.cpp
View File

@ -46,8 +46,8 @@
#include "Core/HW/GCPad.h" #include "Core/HW/GCPad.h"
#include "Core/HW/Wiimote.h" #include "Core/HW/Wiimote.h"
#include "Core/HotkeyManager.h" #include "Core/HotkeyManager.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h" #include "Core/IOS/USB/Bluetooth/BTBase.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "Core/State.h" #include "Core/State.h"

8
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -42,10 +42,10 @@
#include "Core/HW/Wiimote.h" #include "Core/HW/Wiimote.h"
#include "Core/Host.h" #include "Core/Host.h"
#include "Core/HotkeyManager.h" #include "Core/HotkeyManager.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h" #include "Core/IOS/STM/STM.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h" #include "Core/IOS/USB/Bluetooth/BTEmu.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"

8
Source/Core/DolphinWX/MainNoGUI.cpp
View File

@ -23,10 +23,10 @@
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/HW/Wiimote.h" #include "Core/HW/Wiimote.h"
#include "Core/Host.h" #include "Core/Host.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IOS/IPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h" #include "Core/IOS/STM/STM.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h" #include "Core/IOS/USB/Bluetooth/BTEmu.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
#include "Core/State.h" #include "Core/State.h"
#include "UICommon/UICommon.h" #include "UICommon/UICommon.h"