izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4695 from lioncash/exi-move

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/Core/Boot/Boot.cpp
+1 -1
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"
Source/Core/Core/Boot/Boot_BS2Emu.cpp
+1 -1
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"
Source/Core/Core/BootManager.cpp
+1 -1
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"
Source/Core/Core/CMakeLists.txt
+13 -13
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)
Source/Core/Core/ConfigManager.h
+1 -1
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
Source/Core/Core/Core.cpp
+1 -1
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"
Source/Core/Core/Core.vcxproj
+22 -22
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" />
Source/Core/Core/Core.vcxproj.filters
+22 -22
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">
Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp → Source/Core/Core/HW/EXI/BBA-TAP/TAP_Apple.cpp
+2 -2
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()
{
Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp → Source/Core/Core/HW/EXI/BBA-TAP/TAP_Unix.cpp
+2 -2
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>
Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp → Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.cpp
+3 -3
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
{
Source/Core/Core/HW/BBA-TAP/TAP_Win32.h → Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.h
View File
Source/Core/Core/HW/EXI.cpp → Source/Core/Core/HW/EXI/EXI.cpp
+4 -3
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"
Source/Core/Core/HW/EXI.h → Source/Core/Core/HW/EXI/EXI.h
View File
Source/Core/Core/HW/EXI_Channel.cpp → Source/Core/Core/HW/EXI/EXI_Channel.cpp
+4 -3
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
Source/Core/Core/HW/EXI_Channel.h → Source/Core/Core/HW/EXI/EXI_Channel.h
View File
Source/Core/Core/HW/EXI_Device.cpp → Source/Core/Core/HW/EXI/EXI_Device.cpp
+9 -8
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 ---
Source/Core/Core/HW/EXI_Device.h → Source/Core/Core/HW/EXI/EXI_Device.h
View File
Source/Core/Core/HW/EXI_DeviceAD16.cpp → Source/Core/Core/HW/EXI/EXI_DeviceAD16.cpp
+2 -1
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"
Source/Core/Core/HW/EXI_DeviceAD16.h → Source/Core/Core/HW/EXI/EXI_DeviceAD16.h
+1 -1
View File
@@ -4,7 +4,7 @@
#pragma once
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI/EXI_Device.h"
class PointerWrap;

Some files were not shown because too many files have changed in this diff Show More