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 #5087 from lioncash/gcmemcard 

GCMemcard: Move memcard source files to their own directory
This commit is contained in:
Anthony 2017-03-14 18:58:35 -07:00 committed by GitHub
parent a3557ed199 09d4871067
commit 2b38338a9d
12 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,9 +104,9 @@ set(SRCS
HW/EXI/EXI_DeviceMic.cpp HW/EXI/EXI_DeviceMic.cpp
HW/GCKeyboard.cpp HW/GCKeyboard.cpp
HW/GCKeyboardEmu.cpp HW/GCKeyboardEmu.cpp
HW/GCMemcard.cpp HW/GCMemcard/GCMemcard.cpp
HW/GCMemcardDirectory.cpp HW/GCMemcard/GCMemcardDirectory.cpp
HW/GCMemcardRaw.cpp HW/GCMemcard/GCMemcardRaw.cpp
HW/GCPad.cpp HW/GCPad.cpp
HW/GCPadEmu.cpp HW/GCPadEmu.cpp
HW/GPFifo.cpp HW/GPFifo.cpp

12
Source/Core/Core/Core.vcxproj
View File

@ -130,9 +130,9 @@
<ClCompile Include="HW\EXI\EXI_DeviceMic.cpp" /> <ClCompile Include="HW\EXI\EXI_DeviceMic.cpp" />
<ClCompile Include="HW\GCKeyboard.cpp" /> <ClCompile Include="HW\GCKeyboard.cpp" />
<ClCompile Include="HW\GCKeyboardEmu.cpp" /> <ClCompile Include="HW\GCKeyboardEmu.cpp" />
<ClCompile Include="HW\GCMemcard.cpp" /> <ClCompile Include="HW\GCMemcard\GCMemcard.cpp" />
<ClCompile Include="HW\GCMemcardDirectory.cpp" /> <ClCompile Include="HW\GCMemcard\GCMemcardDirectory.cpp" />
<ClCompile Include="HW\GCMemcardRaw.cpp" /> <ClCompile Include="HW\GCMemcard\GCMemcardRaw.cpp" />
<ClCompile Include="HW\GCPad.cpp" /> <ClCompile Include="HW\GCPad.cpp" />
<ClCompile Include="HW\GCPadEmu.cpp" /> <ClCompile Include="HW\GCPadEmu.cpp" />
<ClCompile Include="HW\GPFifo.cpp" /> <ClCompile Include="HW\GPFifo.cpp" />
@ -380,9 +380,9 @@
<ClInclude Include="HW\EXI\EXI_DeviceMic.h" /> <ClInclude Include="HW\EXI\EXI_DeviceMic.h" />
<ClInclude Include="HW\GCKeyboard.h" /> <ClInclude Include="HW\GCKeyboard.h" />
<ClInclude Include="HW\GCKeyboardEmu.h" /> <ClInclude Include="HW\GCKeyboardEmu.h" />
<ClInclude Include="HW\GCMemcard.h" /> <ClInclude Include="HW\GCMemcard\GCMemcard.h" />
<ClInclude Include="HW\GCMemcardDirectory.h" /> <ClInclude Include="HW\GCMemcard\GCMemcardDirectory.h" />
<ClInclude Include="HW\GCMemcardRaw.h" /> <ClInclude Include="HW\GCMemcard\GCMemcardRaw.h" />
<ClInclude Include="HW\GCPad.h" /> <ClInclude Include="HW\GCPad.h" />
<ClInclude Include="HW\GCPadEmu.h" /> <ClInclude Include="HW\GCPadEmu.h" />
<ClInclude Include="HW\GPFifo.h" /> <ClInclude Include="HW\GPFifo.h" />

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

@ -440,13 +440,13 @@
<ClCompile Include="HW\Sram.cpp"> <ClCompile Include="HW\Sram.cpp">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter> <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="HW\GCMemcard.cpp"> <ClCompile Include="HW\GCMemcard\GCMemcard.cpp">
<Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter> <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="HW\GCMemcardDirectory.cpp"> <ClCompile Include="HW\GCMemcard\GCMemcardDirectory.cpp">
<Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter> <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="HW\GCMemcardRaw.cpp"> <ClCompile Include="HW\GCMemcard\GCMemcardRaw.cpp">
<Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter> <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="HW\GCPad.cpp"> <ClCompile Include="HW\GCPad.cpp">
@ -1092,13 +1092,13 @@
<ClInclude Include="HW\Sram.h"> <ClInclude Include="HW\Sram.h">
<Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter> <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="HW\GCMemcard.h"> <ClInclude Include="HW\GCMemcard\GCMemcard.h">
<Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter> <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="HW\GCMemcardDirectory.h"> <ClInclude Include="HW\GCMemcard\GCMemcardDirectory.h">
<Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter> <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="HW\GCMemcardRaw.h"> <ClInclude Include="HW\GCMemcard\GCMemcardRaw.h">
<Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter> <Filter>HW %28Flipper/Hollywood%29\GCMemcard</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="HW\GCPadEmu.h"> <ClInclude Include="HW\GCPadEmu.h">

6
Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp
View File

@ -22,9 +22,9 @@
#include "Core/HW/EXI/EXI.h" #include "Core/HW/EXI/EXI.h"
#include "Core/HW/EXI/EXI_Channel.h" #include "Core/HW/EXI/EXI_Channel.h"
#include "Core/HW/EXI/EXI_Device.h" #include "Core/HW/EXI/EXI_Device.h"
#include "Core/HW/GCMemcard.h" #include "Core/HW/GCMemcard/GCMemcard.h"
#include "Core/HW/GCMemcardDirectory.h" #include "Core/HW/GCMemcard/GCMemcardDirectory.h"
#include "Core/HW/GCMemcardRaw.h" #include "Core/HW/GCMemcard/GCMemcardRaw.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/HW/Sram.h" #include "Core/HW/Sram.h"
#include "Core/HW/SystemTimers.h" #include "Core/HW/SystemTimers.h"

2
Source/Core/Core/HW/GCMemcard.cpp → Source/Core/Core/HW/GCMemcard/GCMemcard.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/HW/GCMemcard.h" #include "Core/HW/GCMemcard/GCMemcard.h"
#include <algorithm> #include <algorithm>
#include <cinttypes> #include <cinttypes>

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

3
Source/Core/Core/HW/GCMemcardDirectory.cpp → Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/HW/GCMemcard/GCMemcardDirectory.h"
#include <cinttypes> #include <cinttypes>
#include <cstring> #include <cstring>
#include <memory> #include <memory>
@ -18,7 +20,6 @@
#include "Common/Thread.h" #include "Common/Thread.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/HW/GCMemcardDirectory.h"
#include "DiscIO/Volume.h" #include "DiscIO/Volume.h"
const int NO_INDEX = -1; const int NO_INDEX = -1;

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

@ -12,7 +12,7 @@
#include "Common/Event.h" #include "Common/Event.h"
#include "Common/NonCopyable.h" #include "Common/NonCopyable.h"
#include "Core/HW/GCMemcard.h" #include "Core/HW/GCMemcard/GCMemcard.h"
#include "DiscIO/Enums.h" #include "DiscIO/Enums.h"
// Uncomment this to write the system data of the memorycard from directory to disc // Uncomment this to write the system data of the memorycard from directory to disc

5
Source/Core/Core/HW/GCMemcardRaw.cpp → Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/HW/GCMemcard/GCMemcardRaw.h"
#include <chrono> #include <chrono>
#include <cstring> #include <cstring>
#include <memory> #include <memory>
@ -15,8 +17,7 @@
#include "Common/Thread.h" #include "Common/Thread.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/HW/GCMemcard.h" #include "Core/HW/GCMemcard/GCMemcard.h"
#include "Core/HW/GCMemcardRaw.h"
#define SIZE_TO_Mb (1024 * 8 * 16) #define SIZE_TO_Mb (1024 * 8 * 16)
#define MC_HDR_SIZE 0xA000 #define MC_HDR_SIZE 0xA000

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

@ -10,7 +10,7 @@
#include <thread> #include <thread>
#include "Common/Event.h" #include "Common/Event.h"
#include "Common/Flag.h" #include "Common/Flag.h"
#include "Core/HW/GCMemcard.h" #include "Core/HW/GCMemcard/GCMemcard.h"
class PointerWrap; class PointerWrap;

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

@ -23,7 +23,7 @@
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/HW/EXI/EXI.h" #include "Core/HW/EXI/EXI.h"
#include "Core/HW/GCMemcard.h" #include "Core/HW/GCMemcard/GCMemcard.h"
#include "Core/HW/GCPad.h" #include "Core/HW/GCPad.h"
#include "Core/NetPlayProto.h" #include "Core/NetPlayProto.h"
#include "DolphinWX/Config/ConfigMain.h" #include "DolphinWX/Config/ConfigMain.h"

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

@ -29,7 +29,7 @@
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/HW/GCMemcard.h" #include "Core/HW/GCMemcard/GCMemcard.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
#define FIRSTPAGE 0 #define FIRSTPAGE 0