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

Merge pull request #4695 from lioncash/exi-move 

Core: Move EXI source files to their own directory
This commit is contained in:
Matthew Parlane 2017-01-21 12:30:47 +13:00 committed by GitHub
parent b05fc9d369 8078c18a80
commit 980cd6532d
43 changed files with 123 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@
#include "Core/GeckoCode.h"
#include "Core/HLE/HLE.h"
#include "Core/HW/DVDInterface.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/EXI/EXI_DeviceIPL.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/VideoInterface.h"

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

@ -15,7 +15,7 @@
#include "Core/HLE/HLE.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DVDInterface.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/EXI/EXI_DeviceIPL.h"
#include "Core/HW/Memmap.h"
#include "Core/MemTools.h"
#include "Core/PatchEngine.h"

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

@ -32,7 +32,7 @@
#include "Core/BootManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/EXI.h"
#include "Core/HW/EXI/EXI.h"
#include "Core/HW/SI.h"
#include "Core/HW/Sram.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"

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

@ -86,16 +86,16 @@ set(SRCS ActionReplay.cpp
HW/DSPLLE/DSPLLETools.cpp
HW/DVDInterface.cpp
HW/DVDThread.cpp
HW/EXI_Channel.cpp
HW/EXI.cpp
HW/EXI_Device.cpp
HW/EXI_DeviceAD16.cpp
HW/EXI_DeviceAGP.cpp
HW/EXI_DeviceEthernet.cpp
HW/EXI_DeviceGecko.cpp
HW/EXI_DeviceIPL.cpp
HW/EXI_DeviceMemoryCard.cpp
HW/EXI_DeviceMic.cpp
HW/EXI/EXI_Channel.cpp
HW/EXI/EXI.cpp
HW/EXI/EXI_Device.cpp
HW/EXI/EXI_DeviceAD16.cpp
HW/EXI/EXI_DeviceAGP.cpp
HW/EXI/EXI_DeviceEthernet.cpp
HW/EXI/EXI_DeviceGecko.cpp
HW/EXI/EXI_DeviceIPL.cpp
HW/EXI/EXI_DeviceMemoryCard.cpp
HW/EXI/EXI_DeviceMic.cpp
HW/GCKeyboard.cpp
HW/GCKeyboardEmu.cpp
HW/GCMemcard.cpp
@ -271,13 +271,13 @@ endif()
set(LIBS ${LIBS} ${MBEDTLS_LIBRARIES})
if(WIN32)
set(SRCS ${SRCS} HW/BBA-TAP/TAP_Win32.cpp HW/WiimoteReal/IOWin.cpp)
set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Win32.cpp HW/WiimoteReal/IOWin.cpp)
elseif(APPLE)
set(SRCS ${SRCS} HW/BBA-TAP/TAP_Apple.cpp HW/WiimoteReal/IOdarwin.mm)
set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Apple.cpp HW/WiimoteReal/IOdarwin.mm)
set(LIBS ${LIBS}
${IOB_LIBRARY})
elseif(UNIX)
set(SRCS ${SRCS} HW/BBA-TAP/TAP_Unix.cpp)
set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Unix.cpp)
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND BLUEZ_FOUND)
set(SRCS ${SRCS} HW/WiimoteReal/IOLinux.cpp)
set(LIBS ${LIBS} bluetooth)

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

@ -10,7 +10,7 @@
#include "Common/IniFile.h"
#include "Common/NonCopyable.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI/EXI_Device.h"
#include "Core/HW/SI_Device.h"
namespace DiscIO

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

@ -44,7 +44,7 @@
#include "Core/HW/AudioInterface.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DSP.h"
#include "Core/HW/EXI.h"
#include "Core/HW/EXI/EXI.h"
#include "Core/HW/GCKeyboard.h"
#include "Core/HW/GCPad.h"
#include "Core/HW/GPFifo.h"

44
Source/Core/Core/Core.vcxproj
View File

@ -96,7 +96,6 @@
<ClCompile Include="HLE\HLE_OS.cpp" />
<ClCompile Include="HotkeyManager.cpp" />
<ClCompile Include="HW\AudioInterface.cpp" />
<ClCompile Include="HW\BBA-TAP\TAP_Win32.cpp" />
<ClCompile Include="HW\CPU.cpp" />
<ClCompile Include="HW\DSP.cpp" />
<ClCompile Include="HW\DSPHLE\DSPHLE.cpp" />
@ -117,16 +116,17 @@
<ClCompile Include="HW\DSPLLE\DSPSymbols.cpp" />
<ClCompile Include="HW\DVDInterface.cpp" />
<ClCompile Include="HW\DVDThread.cpp" />
<ClCompile Include="HW\EXI.cpp" />
<ClCompile Include="HW\EXI_Channel.cpp" />
<ClCompile Include="HW\EXI_Device.cpp" />
<ClCompile Include="HW\EXI_DeviceAD16.cpp" />
<ClCompile Include="HW\EXI_DeviceAGP.cpp" />
<ClCompile Include="HW\EXI_DeviceEthernet.cpp" />
<ClCompile Include="HW\EXI_DeviceGecko.cpp" />
<ClCompile Include="HW\EXI_DeviceIPL.cpp" />
<ClCompile Include="HW\EXI_DeviceMemoryCard.cpp" />
<ClCompile Include="HW\EXI_DeviceMic.cpp" />
<ClCompile Include="HW\EXI\BBA-TAP\TAP_Win32.cpp" />
<ClCompile Include="HW\EXI\EXI.cpp" />
<ClCompile Include="HW\EXI\EXI_Channel.cpp" />
<ClCompile Include="HW\EXI\EXI_Device.cpp" />
<ClCompile Include="HW\EXI\EXI_DeviceAD16.cpp" />
<ClCompile Include="HW\EXI\EXI_DeviceAGP.cpp" />
<ClCompile Include="HW\EXI\EXI_DeviceEthernet.cpp" />
<ClCompile Include="HW\EXI\EXI_DeviceGecko.cpp" />
<ClCompile Include="HW\EXI\EXI_DeviceIPL.cpp" />
<ClCompile Include="HW\EXI\EXI_DeviceMemoryCard.cpp" />
<ClCompile Include="HW\EXI\EXI_DeviceMic.cpp" />
<ClCompile Include="HW\GCKeyboard.cpp" />
<ClCompile Include="HW\GCKeyboardEmu.cpp" />
<ClCompile Include="HW\GCMemcard.cpp" />
@ -322,7 +322,6 @@
<ClInclude Include="Host.h" />
<ClInclude Include="HotkeyManager.h" />
<ClInclude Include="HW\AudioInterface.h" />
<ClInclude Include="HW\BBA-TAP\TAP_Win32.h" />
<ClInclude Include="HW\CPU.h" />
<ClInclude Include="HW\DSP.h" />
<ClInclude Include="HW\DSPHLE\DSPHLE.h" />
@ -344,16 +343,17 @@
<ClInclude Include="HW\DSPLLE\DSPSymbols.h" />
<ClInclude Include="HW\DVDInterface.h" />
<ClInclude Include="HW\DVDThread.h" />
<ClInclude Include="HW\EXI.h" />
<ClInclude Include="HW\EXI_Channel.h" />
<ClInclude Include="HW\EXI_Device.h" />
<ClInclude Include="HW\EXI_DeviceAD16.h" />
<ClInclude Include="HW\EXI_DeviceAGP.h" />
<ClInclude Include="HW\EXI_DeviceEthernet.h" />
<ClInclude Include="HW\EXI_DeviceGecko.h" />
<ClInclude Include="HW\EXI_DeviceIPL.h" />
<ClInclude Include="HW\EXI_DeviceMemoryCard.h" />
<ClInclude Include="HW\EXI_DeviceMic.h" />
<ClInclude Include="HW\EXI\BBA-TAP\TAP_Win32.h" />
<ClInclude Include="HW\EXI\EXI.h" />
<ClInclude Include="HW\EXI\EXI_Channel.h" />
<ClInclude Include="HW\EXI\EXI_Device.h" />
<ClInclude Include="HW\EXI\EXI_DeviceAD16.h" />
<ClInclude Include="HW\EXI\EXI_DeviceAGP.h" />
<ClInclude Include="HW\EXI\EXI_DeviceEthernet.h" />
<ClInclude Include="HW\EXI\EXI_DeviceGecko.h" />
<ClInclude Include="HW\EXI\EXI_DeviceIPL.h" />
<ClInclude Include="HW\EXI\EXI_DeviceMemoryCard.h" />
<ClInclude Include="HW\EXI\EXI_DeviceMic.h" />
<ClInclude Include="HW\GCKeyboard.h" />
<ClInclude Include="HW\GCKeyboardEmu.h" />
<ClInclude Include="HW\GCMemcard.h" />

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

@ -385,37 +385,37 @@
<ClCompile Include="HW\DSP.cpp">
<Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE</Filter>
</ClCompile>
<ClCompile Include="HW\EXI.cpp">
<ClCompile Include="HW\EXI\EXI.cpp">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClCompile>
<ClCompile Include="HW\EXI_Channel.cpp">
<ClCompile Include="HW\EXI\EXI_Channel.cpp">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClCompile>
<ClCompile Include="HW\EXI_Device.cpp">
<ClCompile Include="HW\EXI\EXI_Device.cpp">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClCompile>
<ClCompile Include="HW\EXI_DeviceAD16.cpp">
<ClCompile Include="HW\EXI\EXI_DeviceAD16.cpp">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClCompile>
<ClCompile Include="HW\EXI_DeviceAGP.cpp">
<ClCompile Include="HW\EXI\EXI_DeviceAGP.cpp">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClCompile>
<ClCompile Include="HW\EXI_DeviceEthernet.cpp">
<ClCompile Include="HW\EXI\EXI_DeviceEthernet.cpp">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClCompile>
<ClCompile Include="HW\EXI_DeviceGecko.cpp">
<ClCompile Include="HW\EXI\EXI_DeviceGecko.cpp">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClCompile>
<ClCompile Include="HW\EXI_DeviceIPL.cpp">
<ClCompile Include="HW\EXI\EXI_DeviceIPL.cpp">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClCompile>
<ClCompile Include="HW\EXI_DeviceMemoryCard.cpp">
<ClCompile Include="HW\EXI\EXI_DeviceMemoryCard.cpp">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClCompile>
<ClCompile Include="HW\EXI_DeviceMic.cpp">
<ClCompile Include="HW\EXI\EXI_DeviceMic.cpp">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClCompile>
<ClCompile Include="HW\BBA-TAP\TAP_Win32.cpp">
<ClCompile Include="HW\EXI\BBA-TAP\TAP_Win32.cpp">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClCompile>
<ClCompile Include="HW\Sram.cpp">
@ -976,37 +976,37 @@
<ClInclude Include="HW\DSP.h">
<Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE</Filter>
</ClInclude>
<ClInclude Include="HW\EXI.h">
<ClInclude Include="HW\EXI\EXI.h">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClInclude>
<ClInclude Include="HW\EXI_Channel.h">
<ClInclude Include="HW\EXI\EXI_Channel.h">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClInclude>
<ClInclude Include="HW\EXI_Device.h">
<ClInclude Include="HW\EXI\EXI_Device.h">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClInclude>
<ClInclude Include="HW\EXI_DeviceAD16.h">
<ClInclude Include="HW\EXI\EXI_DeviceAD16.h">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClInclude>
<ClInclude Include="HW\EXI_DeviceAGP.h">
<ClInclude Include="HW\EXI\EXI_DeviceAGP.h">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClInclude>
<ClInclude Include="HW\EXI_DeviceEthernet.h">
<ClInclude Include="HW\EXI\EXI_DeviceEthernet.h">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClInclude>
<ClInclude Include="HW\EXI_DeviceGecko.h">
<ClInclude Include="HW\EXI\EXI_DeviceGecko.h">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClInclude>
<ClInclude Include="HW\EXI_DeviceIPL.h">
<ClInclude Include="HW\EXI\EXI_DeviceIPL.h">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClInclude>
<ClInclude Include="HW\EXI_DeviceMemoryCard.h">
<ClInclude Include="HW\EXI\EXI_DeviceMemoryCard.h">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClInclude>
<ClInclude Include="HW\EXI_DeviceMic.h">
<ClInclude Include="HW\EXI\EXI_DeviceMic.h">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClInclude>
<ClInclude Include="HW\BBA-TAP\TAP_Win32.h">
<ClInclude Include="HW\EXI\BBA-TAP\TAP_Win32.h">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClInclude>
<ClInclude Include="HW\Sram.h">

4
Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp → Source/Core/Core/HW/EXI/BBA-TAP/TAP_Apple.cpp
View File

@ -7,8 +7,8 @@
#include "Common/Logging/Log.h"
#include "Common/StringUtil.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI_DeviceEthernet.h"
#include "Core/HW/EXI/EXI_Device.h"
#include "Core/HW/EXI/EXI_DeviceEthernet.h"
bool CEXIETHERNET::Activate()
{

4
Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp → Source/Core/Core/HW/EXI/BBA-TAP/TAP_Unix.cpp
View File

@ -10,8 +10,8 @@
#include "Common/Logging/Log.h"
#include "Common/StringUtil.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI_DeviceEthernet.h"
#include "Core/HW/EXI/EXI_Device.h"
#include "Core/HW/EXI/EXI_DeviceEthernet.h"
#ifdef __linux__
#include <fcntl.h>

6
Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp → Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.cpp
View File

@ -2,13 +2,13 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/BBA-TAP/TAP_Win32.h"
#include "Core/HW/EXI/BBA-TAP/TAP_Win32.h"
#include "Common/Assert.h"
#include "Common/Logging/Log.h"
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI_DeviceEthernet.h"
#include "Core/HW/EXI/EXI_Device.h"
#include "Core/HW/EXI/EXI_DeviceEthernet.h"
namespace Win32TAPHelper
{

0
Source/Core/Core/HW/BBA-TAP/TAP_Win32.h → Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.h
View File

7
Source/Core/Core/HW/EXI.cpp → Source/Core/Core/HW/EXI/EXI.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/EXI/EXI.h"
#include <array>
#include <memory>
@ -10,9 +12,8 @@
#include "Core/ConfigManager.h"
#include "Core/CoreTiming.h"
#include "Core/HW/EXI.h"
#include "Core/HW/EXI_Channel.h"
#include "Core/HW/EXI_DeviceMemoryCard.h"
#include "Core/HW/EXI/EXI_Channel.h"
#include "Core/HW/EXI/EXI_DeviceMemoryCard.h"
#include "Core/HW/MMIO.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/Sram.h"

0
Source/Core/Core/HW/EXI.h → Source/Core/Core/HW/EXI/EXI.h
View File

7
Source/Core/Core/HW/EXI_Channel.cpp → Source/Core/Core/HW/EXI/EXI_Channel.cpp
View File

@ -2,14 +2,15 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/EXI/EXI_Channel.h"
#include <memory>
#include "Common/Assert.h"
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Core/HW/EXI.h"
#include "Core/HW/EXI_Channel.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI/EXI.h"
#include "Core/HW/EXI/EXI_Device.h"
#include "Core/HW/MMIO.h"
enum

0
Source/Core/Core/HW/EXI_Channel.h → Source/Core/Core/HW/EXI/EXI_Channel.h
View File

17
Source/Core/Core/HW/EXI_Device.cpp → Source/Core/Core/HW/EXI/EXI_Device.cpp
View File

@ -2,19 +2,20 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/EXI/EXI_Device.h"
#include <memory>
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI_DeviceAD16.h"
#include "Core/HW/EXI_DeviceAGP.h"
#include "Core/HW/EXI_DeviceEthernet.h"
#include "Core/HW/EXI_DeviceGecko.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/EXI_DeviceMemoryCard.h"
#include "Core/HW/EXI_DeviceMic.h"
#include "Core/HW/EXI/EXI_DeviceAD16.h"
#include "Core/HW/EXI/EXI_DeviceAGP.h"
#include "Core/HW/EXI/EXI_DeviceEthernet.h"
#include "Core/HW/EXI/EXI_DeviceGecko.h"
#include "Core/HW/EXI/EXI_DeviceIPL.h"
#include "Core/HW/EXI/EXI_DeviceMemoryCard.h"
#include "Core/HW/EXI/EXI_DeviceMic.h"
#include "Core/HW/Memmap.h"
// --- interface IEXIDevice ---

0
Source/Core/Core/HW/EXI_Device.h → Source/Core/Core/HW/EXI/EXI_Device.h
View File

3
Source/Core/Core/HW/EXI_DeviceAD16.cpp → Source/Core/Core/HW/EXI/EXI_DeviceAD16.cpp
View File

@ -2,7 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/EXI_DeviceAD16.h"
#include "Core/HW/EXI/EXI_DeviceAD16.h"
#include "Common/Assert.h"
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"

2
Source/Core/Core/HW/EXI_DeviceAD16.h → Source/Core/Core/HW/EXI/EXI_DeviceAD16.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI/EXI_Device.h"
class PointerWrap;

3
Source/Core/Core/HW/EXI_DeviceAGP.cpp → Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/EXI/EXI_DeviceAGP.h"
#include <memory>
#include <string>
@ -10,7 +12,6 @@
#include "Common/FileUtil.h"
#include "Common/Logging/Log.h"
#include "Core/ConfigManager.h"
#include "Core/HW/EXI_DeviceAGP.h"
CEXIAgp::CEXIAgp(int index)
{

2
Source/Core/Core/HW/EXI_DeviceAGP.h → Source/Core/Core/HW/EXI/EXI_DeviceAGP.h
View File

@ -7,7 +7,7 @@
#include <string>
#include <vector>
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI/EXI_Device.h"
class PointerWrap;

5
Source/Core/Core/HW/EXI_DeviceEthernet.cpp → Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/EXI/EXI_DeviceEthernet.h"
#include <string>
#include "Common/ChunkFile.h"
@ -10,8 +12,7 @@
#include "Common/Network.h"
#include "Core/ConfigManager.h"
#include "Core/CoreTiming.h"
#include "Core/HW/EXI.h"
#include "Core/HW/EXI_DeviceEthernet.h"
#include "Core/HW/EXI/EXI.h"
#include "Core/HW/Memmap.h"
// XXX: The BBA stores multi-byte elements as little endian.

2
Source/Core/Core/HW/EXI_DeviceEthernet.h → Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h
View File

@ -13,7 +13,7 @@
#endif
#include "Common/Flag.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI/EXI_Device.h"
class PointerWrap;

3
Source/Core/Core/HW/EXI_DeviceGecko.cpp → Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/EXI/EXI_DeviceGecko.h"
#include <memory>
#include <mutex>
#include <queue>
@ -15,7 +17,6 @@
#include "Common/StringUtil.h"
#include "Common/Thread.h"
#include "Core/Core.h"
#include "Core/HW/EXI_DeviceGecko.h"
u16 GeckoSockServer::server_port;
int GeckoSockServer::client_count;

2
Source/Core/Core/HW/EXI_DeviceGecko.h → Source/Core/Core/HW/EXI/EXI_DeviceGecko.h
View File

@ -13,7 +13,7 @@
#include "Common/CommonTypes.h"
#include "Common/Flag.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI/EXI_Device.h"
class GeckoSockServer
{

3
Source/Core/Core/HW/EXI_DeviceIPL.cpp → Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/EXI/EXI_DeviceIPL.h"
#include <cstring>
#include "Common/Assert.h"
@ -17,7 +19,6 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/Sram.h"
#include "Core/HW/SystemTimers.h"
#include "Core/Movie.h"

2
Source/Core/Core/HW/EXI_DeviceIPL.h → Source/Core/Core/HW/EXI/EXI_DeviceIPL.h
View File

@ -6,7 +6,7 @@
#include <string>
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI/EXI_Device.h"
class PointerWrap;

9
Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp → Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/EXI/EXI_DeviceMemoryCard.h"
#include <array>
#include <cstring>
#include <memory>
@ -17,10 +19,9 @@
#include "Common/StringUtil.h"
#include "Core/ConfigManager.h"
#include "Core/CoreTiming.h"
#include "Core/HW/EXI.h"
#include "Core/HW/EXI_Channel.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI_DeviceMemoryCard.h"
#include "Core/HW/EXI/EXI.h"
#include "Core/HW/EXI/EXI_Channel.h"
#include "Core/HW/EXI/EXI_Device.h"
#include "Core/HW/GCMemcard.h"
#include "Core/HW/GCMemcardDirectory.h"
#include "Core/HW/GCMemcardRaw.h"

2
Source/Core/Core/HW/EXI_DeviceMemoryCard.h → Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.h
View File

@ -7,7 +7,7 @@
#include <functional>
#include <memory>
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI/EXI_Device.h"
class MemoryCardBase;
class PointerWrap;

5
Source/Core/Core/HW/EXI_DeviceMic.cpp → Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp
View File

@ -11,9 +11,10 @@
#if HAVE_PORTAUDIO
#include "Core/HW/EXI/EXI_DeviceMic.h"
#include "Core/CoreTiming.h"
#include "Core/HW/EXI.h"
#include "Core/HW/EXI_DeviceMic.h"
#include "Core/HW/EXI/EXI.h"
#include "Core/HW/GCPad.h"
#include "Core/HW/SystemTimers.h"

2
Source/Core/Core/HW/EXI_DeviceMic.h → Source/Core/Core/HW/EXI/EXI_DeviceMic.h
View File

@ -6,7 +6,7 @@
#include <mutex>
#include "Common/Common.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI/EXI_Device.h"
#if HAVE_PORTAUDIO

2
Source/Core/Core/HW/GCMemcard.h
View File

@ -13,7 +13,7 @@
#include "Common/NonCopyable.h"
#include "Common/Timer.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/EXI/EXI_DeviceIPL.h"
#include "Core/HW/Sram.h"
namespace File

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

@ -12,7 +12,7 @@
#include "Core/HW/CPU.h"
#include "Core/HW/DSP.h"
#include "Core/HW/DVDInterface.h"
#include "Core/HW/EXI.h"
#include "Core/HW/EXI/EXI.h"
#include "Core/HW/GPFifo.h"
#include "Core/HW/HW.h"
#include "Core/HW/Memmap.h"

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

@ -19,7 +19,7 @@
#include "Core/HW/AudioInterface.h"
#include "Core/HW/DSP.h"
#include "Core/HW/DVDInterface.h"
#include "Core/HW/EXI.h"
#include "Core/HW/EXI/EXI.h"
#include "Core/HW/MMIO.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/MemoryInterface.h"

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

@ -55,7 +55,7 @@ IPC_HLE_PERIOD: For the Wii Remote this is the call schedule:
#include "Core/DSPEmulator.h"
#include "Core/HW/AudioInterface.h"
#include "Core/HW/DSP.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/EXI/EXI_DeviceIPL.h"
#include "Core/HW/VideoInterface.h"
#include "Core/IOS/IPC.h"
#include "Core/PatchEngine.h"

2
Source/Core/Core/IOS/Network/Net.h
View File

@ -8,7 +8,7 @@
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/EXI/EXI_DeviceIPL.h"
#include "Core/HW/Memmap.h"
#include "Core/IOS/Device.h"
#include "Core/IOS/IPC.h"

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

@ -26,7 +26,7 @@
#include "Core/DSP/DSPCore.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DVDInterface.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/EXI/EXI_DeviceIPL.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SI.h"
#include "Core/HW/Wiimote.h"

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

@ -16,7 +16,7 @@
#include "Common/MsgHandler.h"
#include "Common/Timer.h"
#include "Core/ConfigManager.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/EXI/EXI_DeviceIPL.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI_DeviceGCController.h"
#include "Core/HW/Sram.h"

2
Source/Core/Core/NetPlayProto.h
View File

@ -7,7 +7,7 @@
#include <array>
#include <vector>
#include "Common/CommonTypes.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI/EXI_Device.h"
struct NetSettings
{

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

@ -14,7 +14,7 @@
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Core/ConfigManager.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/EXI/EXI_DeviceIPL.h"
#include "Core/HW/Sram.h"
#include "Core/NetPlayClient.h" //for NetPlayUI
#include "InputCommon/GCPadStatus.h"

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

@ -21,7 +21,7 @@
#include "Common/FileUtil.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/EXI.h"
#include "Core/HW/EXI/EXI.h"
#include "Core/HW/GCMemcard.h"
#include "Core/HW/GCPad.h"
#include "Core/NetPlayProto.h"

2
Source/Core/DolphinWX/NetPlay/NetWindow.cpp
View File

@ -35,7 +35,7 @@
#include "Common/MsgHandler.h"
#include "Core/ConfigManager.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI/EXI_Device.h"
#include "Core/NetPlayClient.h"
#include "Core/NetPlayProto.h"
#include "Core/NetPlayServer.h"