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

Core: Move SI source files to their own directory

This commit is contained in:
Lioncash 2017-01-20 18:45:11 -05:00
parent 71ea457874
commit 794d0a9d7c
31 changed files with 89 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -109,14 +109,14 @@ set(SRCS ActionReplay.cpp
HW/MemoryInterface.cpp
HW/MMIO.cpp
HW/ProcessorInterface.cpp
HW/SI.cpp
HW/SI_Device.cpp
HW/SI_DeviceDanceMat.cpp
HW/SI_DeviceGBA.cpp
HW/SI_DeviceGCAdapter.cpp
HW/SI_DeviceGCController.cpp
HW/SI_DeviceGCSteeringWheel.cpp
HW/SI_DeviceKeyboard.cpp
HW/SI/SI.cpp
HW/SI/SI_Device.cpp
HW/SI/SI_DeviceDanceMat.cpp
HW/SI/SI_DeviceGBA.cpp
HW/SI/SI_DeviceGCAdapter.cpp
HW/SI/SI_DeviceGCController.cpp
HW/SI/SI_DeviceGCSteeringWheel.cpp
HW/SI/SI_DeviceKeyboard.cpp
HW/Sram.cpp
HW/StreamADPCM.cpp
HW/SystemTimers.cpp

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

@ -21,7 +21,7 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h" // for bWii
#include "Core/FifoPlayer/FifoDataFile.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI/SI.h"
#include "Core/IOS/USB/Bluetooth/BTBase.h"
#include "Core/PowerPC/PowerPC.h"

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

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

32
Source/Core/Core/Core.vcxproj
View File

@ -140,14 +140,14 @@
<ClCompile Include="HW\MemoryInterface.cpp" />
<ClCompile Include="HW\MMIO.cpp" />
<ClCompile Include="HW\ProcessorInterface.cpp" />
<ClCompile Include="HW\SI.cpp" />
<ClCompile Include="HW\SI_Device.cpp" />
<ClCompile Include="HW\SI_DeviceDanceMat.cpp" />
<ClCompile Include="HW\SI_DeviceGBA.cpp" />
<ClCompile Include="HW\SI_DeviceGCAdapter.cpp" />
<ClCompile Include="HW\SI_DeviceGCController.cpp" />
<ClCompile Include="HW\SI_DeviceGCSteeringWheel.cpp" />
<ClCompile Include="HW\SI_DeviceKeyboard.cpp" />
<ClCompile Include="HW\SI\SI.cpp" />
<ClCompile Include="HW\SI\SI_Device.cpp" />
<ClCompile Include="HW\SI\SI_DeviceDanceMat.cpp" />
<ClCompile Include="HW\SI\SI_DeviceGBA.cpp" />
<ClCompile Include="HW\SI\SI_DeviceGCAdapter.cpp" />
<ClCompile Include="HW\SI\SI_DeviceGCController.cpp" />
<ClCompile Include="HW\SI\SI_DeviceGCSteeringWheel.cpp" />
<ClCompile Include="HW\SI\SI_DeviceKeyboard.cpp" />
<ClCompile Include="HW\Sram.cpp" />
<ClCompile Include="HW\StreamADPCM.cpp" />
<ClCompile Include="HW\SystemTimers.cpp" />
@ -370,14 +370,14 @@
<ClInclude Include="HW\MMIO.h" />
<ClInclude Include="HW\MMIOHandlers.h" />
<ClInclude Include="HW\ProcessorInterface.h" />
<ClInclude Include="HW\SI.h" />
<ClInclude Include="HW\SI_Device.h" />
<ClInclude Include="HW\SI_DeviceDanceMat.h" />
<ClInclude Include="HW\SI_DeviceGBA.h" />
<ClInclude Include="HW\SI_DeviceGCAdapter.h" />
<ClInclude Include="HW\SI_DeviceGCController.h" />
<ClInclude Include="HW\SI_DeviceGCSteeringWheel.h" />
<ClInclude Include="HW\SI_DeviceKeyboard.h" />
<ClInclude Include="HW\SI\SI.h" />
<ClInclude Include="HW\SI\SI_Device.h" />
<ClInclude Include="HW\SI\SI_DeviceDanceMat.h" />
<ClInclude Include="HW\SI\SI_DeviceGBA.h" />
<ClInclude Include="HW\SI\SI_DeviceGCAdapter.h" />
<ClInclude Include="HW\SI\SI_DeviceGCController.h" />
<ClInclude Include="HW\SI\SI_DeviceGCSteeringWheel.h" />
<ClInclude Include="HW\SI\SI_DeviceKeyboard.h" />
<ClInclude Include="HW\Sram.h" />
<ClInclude Include="HW\StreamADPCM.h" />
<ClInclude Include="HW\SystemTimers.h" />

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

@ -445,28 +445,28 @@
<ClCompile Include="HW\ProcessorInterface.cpp">
<Filter>HW %28Flipper/Hollywood%29\PI - Processor Interface</Filter>
</ClCompile>
<ClCompile Include="HW\SI.cpp">
<ClCompile Include="HW\SI\SI.cpp">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClCompile>
<ClCompile Include="HW\SI_Device.cpp">
<ClCompile Include="HW\SI\SI_Device.cpp">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClCompile>
<ClCompile Include="HW\SI_DeviceDanceMat.cpp">
<ClCompile Include="HW\SI\SI_DeviceDanceMat.cpp">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClCompile>
<ClCompile Include="HW\SI_DeviceGBA.cpp">
<ClCompile Include="HW\SI\SI_DeviceGBA.cpp">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClCompile>
<ClCompile Include="HW\SI_DeviceGCAdapter.cpp">
<ClCompile Include="HW\SI\SI_DeviceGCAdapter.cpp">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClCompile>
<ClCompile Include="HW\SI_DeviceGCController.cpp">
<ClCompile Include="HW\SI\SI_DeviceGCController.cpp">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClCompile>
<ClCompile Include="HW\SI_DeviceGCSteeringWheel.cpp">
<ClCompile Include="HW\SI\SI_DeviceGCSteeringWheel.cpp">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClCompile>
<ClCompile Include="HW\SI_DeviceKeyboard.cpp">
<ClCompile Include="HW\SI\SI_DeviceKeyboard.cpp">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClCompile>
<ClCompile Include="HW\VideoInterface.cpp">
@ -1042,28 +1042,28 @@
<ClInclude Include="HW\ProcessorInterface.h">
<Filter>HW %28Flipper/Hollywood%29\PI - Processor Interface</Filter>
</ClInclude>
<ClInclude Include="HW\SI.h">
<ClInclude Include="HW\SI\SI.h">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClInclude>
<ClInclude Include="HW\SI_Device.h">
<ClInclude Include="HW\SI\SI_Device.h">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClInclude>
<ClInclude Include="HW\SI_DeviceDanceMat.h">
<ClInclude Include="HW\SI\SI_DeviceDanceMat.h">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClInclude>
<ClInclude Include="HW\SI_DeviceGBA.h">
<ClInclude Include="HW\SI\SI_DeviceGBA.h">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClInclude>
<ClInclude Include="HW\SI_DeviceGCAdapter.h">
<ClInclude Include="HW\SI\SI_DeviceGCAdapter.h">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClInclude>
<ClInclude Include="HW\SI_DeviceGCController.h">
<ClInclude Include="HW\SI\SI_DeviceGCController.h">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClInclude>
<ClInclude Include="HW\SI_DeviceGCSteeringWheel.h">
<ClInclude Include="HW\SI\SI_DeviceGCSteeringWheel.h">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClInclude>
<ClInclude Include="HW\SI_DeviceKeyboard.h">
<ClInclude Include="HW\SI\SI_DeviceKeyboard.h">
<Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
</ClInclude>
<ClInclude Include="HW\VideoInterface.h">

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

@ -17,7 +17,7 @@
#include "Core/HW/HW.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI/SI.h"
#include "Core/HW/SystemTimers.h"
#include "Core/HW/VideoInterface.h"
#include "Core/HW/WII_IPC.h"

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

@ -24,7 +24,7 @@
#include "Core/HW/Memmap.h"
#include "Core/HW/MemoryInterface.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI/SI.h"
#include "Core/HW/VideoInterface.h"
#include "Core/HW/WII_IPC.h"
#include "Core/PowerPC/JitCommon/JitBase.h"

5
Source/Core/Core/HW/SI.cpp → Source/Core/Core/HW/SI/SI.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/SI/SI.h"
#include <algorithm>
#include <array>
#include <cstring>
@ -13,8 +15,7 @@
#include "Core/CoreTiming.h"
#include "Core/HW/MMIO.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI_DeviceGBA.h"
#include "Core/HW/SI/SI_DeviceGBA.h"
#include "Core/HW/SystemTimers.h"
#include "Core/Movie.h"
#include "Core/NetPlayProto.h"

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

15
Source/Core/Core/HW/SI_Device.cpp → Source/Core/Core/HW/SI/SI_Device.cpp
View File

@ -2,19 +2,20 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/SI/SI_Device.h"
#include <memory>
#include <string>
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Common/StringUtil.h"
#include "Core/HW/SI_Device.h"
#include "Core/HW/SI_DeviceDanceMat.h"
#include "Core/HW/SI_DeviceGBA.h"
#include "Core/HW/SI_DeviceGCAdapter.h"
#include "Core/HW/SI_DeviceGCController.h"
#include "Core/HW/SI_DeviceGCSteeringWheel.h"
#include "Core/HW/SI_DeviceKeyboard.h"
#include "Core/HW/SI/SI_DeviceDanceMat.h"
#include "Core/HW/SI/SI_DeviceGBA.h"
#include "Core/HW/SI/SI_DeviceGCAdapter.h"
#include "Core/HW/SI/SI_DeviceGCController.h"
#include "Core/HW/SI/SI_DeviceGCSteeringWheel.h"
#include "Core/HW/SI/SI_DeviceKeyboard.h"
// --- interface ISIDevice ---
int ISIDevice::RunBuffer(u8* _pBuffer, int _iLength)

0
Source/Core/Core/HW/SI_Device.h → Source/Core/Core/HW/SI/SI_Device.h
View File

3
Source/Core/Core/HW/SI_DeviceDanceMat.cpp → Source/Core/Core/HW/SI/SI_DeviceDanceMat.cpp
View File

@ -2,7 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/SI_DeviceDanceMat.h"
#include "Core/HW/SI/SI_DeviceDanceMat.h"
#include "Common/CommonTypes.h"
#include "InputCommon/GCPadStatus.h"

2
Source/Core/Core/HW/SI_DeviceDanceMat.h → Source/Core/Core/HW/SI/SI_DeviceDanceMat.h
View File

@ -5,7 +5,7 @@
#pragma once
#include "Common/CommonTypes.h"
#include "Core/HW/SI_DeviceGCController.h"
#include "Core/HW/SI/SI_DeviceGCController.h"
struct GCPadStatus;

9
Source/Core/Core/HW/SI_DeviceGBA.cpp → Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
View File

@ -2,22 +2,23 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/SI/SI_DeviceGBA.h"
#include <memory>
#include <mutex>
#include <queue>
#include <thread>
#include <SFML/Network.hpp>
#include "Common/CommonTypes.h"
#include "Common/Flag.h"
#include "Common/Logging/Log.h"
#include "Common/Thread.h"
#include "Core/CoreTiming.h"
#include "Core/HW/SI_Device.h"
#include "Core/HW/SI_DeviceGBA.h"
#include "Core/HW/SI/SI_Device.h"
#include "Core/HW/SystemTimers.h"
#include "SFML/Network.hpp"
static std::thread connectionThread;
static std::queue<std::unique_ptr<sf::TcpSocket>> waiting_socks;
static std::queue<std::unique_ptr<sf::TcpSocket>> waiting_clocks;

5
Source/Core/Core/HW/SI_DeviceGBA.h → Source/Core/Core/HW/SI/SI_DeviceGBA.h
View File

@ -4,11 +4,12 @@
#pragma once
#include <SFML/Network.hpp>
#include <memory>
#include <SFML/Network.hpp>
#include "Common/CommonTypes.h"
#include "Core/HW/SI_Device.h"
#include "Core/HW/SI/SI_Device.h"
// GameBoy Advance "Link Cable"

3
Source/Core/Core/HW/SI_DeviceGCAdapter.cpp → Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/SI/SI_DeviceGCAdapter.h"
#include <cstring>
#include "Common/CommonTypes.h"
@ -10,7 +12,6 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/GCPad.h"
#include "Core/HW/SI_DeviceGCAdapter.h"
#include "Core/NetPlayProto.h"
#include "InputCommon/GCAdapter.h"

4
Source/Core/Core/HW/SI_DeviceGCAdapter.h → Source/Core/Core/HW/SI/SI_DeviceGCAdapter.h
View File

@ -4,8 +4,8 @@
#pragma once
#include "Core/HW/SI_Device.h"
#include "Core/HW/SI_DeviceGCController.h"
#include "Core/HW/SI/SI_Device.h"
#include "Core/HW/SI/SI_DeviceGCController.h"
#include "InputCommon/GCPadStatus.h"
class CSIDevice_GCAdapter : public CSIDevice_GCController

5
Source/Core/Core/HW/SI_DeviceGCController.cpp → Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
View File

@ -2,7 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/SI_Device.h"
#include "Core/HW/SI/SI_DeviceGCController.h"
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
@ -10,7 +11,7 @@
#include "Core/CoreTiming.h"
#include "Core/HW/GCPad.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SI_DeviceGCController.h"
#include "Core/HW/SI/SI_Device.h"
#include "Core/HW/SystemTimers.h"
#include "Core/Movie.h"
#include "Core/NetPlayProto.h"

2
Source/Core/Core/HW/SI_DeviceGCController.h → Source/Core/Core/HW/SI/SI_DeviceGCController.h
View File

@ -5,7 +5,7 @@
#pragma once
#include "Core/HW/GCPad.h"
#include "Core/HW/SI_Device.h"
#include "Core/HW/SI/SI_Device.h"
#include "InputCommon/GCPadStatus.h"
class CSIDevice_GCController : public ISIDevice

3
Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp → Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp
View File

@ -2,7 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/HW/SI_DeviceGCSteeringWheel.h"
#include "Core/HW/SI/SI_DeviceGCSteeringWheel.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Core/HW/GCPad.h"

2
Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h → Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "Core/HW/SI_DeviceGCController.h"
#include "Core/HW/SI/SI_DeviceGCController.h"
class CSIDevice_GCSteeringWheel : public CSIDevice_GCController
{

3
Source/Core/Core/HW/SI_DeviceKeyboard.cpp → Source/Core/Core/HW/SI/SI_DeviceKeyboard.cpp
View File

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

2
Source/Core/Core/HW/SI_DeviceKeyboard.h → Source/Core/Core/HW/SI/SI_DeviceKeyboard.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "Core/HW/SI_Device.h"
#include "Core/HW/SI/SI_Device.h"
class PointerWrap;
struct KeyboardStatus;

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

@ -14,7 +14,7 @@
#include "Core/CoreTiming.h"
#include "Core/HW/MMIO.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI/SI.h"
#include "Core/HW/SystemTimers.h"
#include "Core/HW/VideoInterface.h"

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

@ -28,7 +28,7 @@
#include "Core/HW/DVDInterface.h"
#include "Core/HW/EXI/EXI_DeviceIPL.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI/SI.h"
#include "Core/HW/Wiimote.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteEmu/WiimoteHid.h"

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

@ -17,8 +17,8 @@
#include "Common/Timer.h"
#include "Core/ConfigManager.h"
#include "Core/HW/EXI/EXI_DeviceIPL.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI_DeviceGCController.h"
#include "Core/HW/SI/SI.h"
#include "Core/HW/SI/SI_DeviceGCController.h"
#include "Core/HW/Sram.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"

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

@ -23,7 +23,7 @@
#include "Core/Core.h"
#include "Core/HW/GCKeyboard.h"
#include "Core/HW/GCPad.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI/SI.h"
#include "Core/HW/Wiimote.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "Core/HotkeyManager.h"

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

@ -37,7 +37,7 @@
#include "Core/HW/GCKeyboard.h"
#include "Core/HW/GCPad.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SI_Device.h"
#include "Core/HW/SI/SI_Device.h"
#include "Core/HW/WiiSaveCrypted.h"
#include "Core/HW/Wiimote.h"
#include "Core/Host.h"

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

@ -12,7 +12,7 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI/SI.h"
#include "Core/HW/SystemTimers.h"
#include "Core/NetPlayProto.h"

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

@ -13,7 +13,7 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI/SI.h"
#include "Core/HW/SystemTimers.h"
#include "InputCommon/GCAdapter.h"