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 #2380 from lioncash/corehdr 

Core: Remove some header inclusions in header files
This commit is contained in:
skidau 2015-05-09 16:49:07 +10:00
parent a7d5084e1f 76bbd46829
commit 78e59d08fe
139 changed files with 308 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/ENetUtil.h
View File

@ -5,7 +5,6 @@
#pragma once
#include <enet/enet.h>
#include "Common.h"
namespace ENetUtil
{

1
Source/Core/Core/ActionReplay.cpp
View File

@ -23,6 +23,7 @@
#include <vector>
#include "Common/CommonTypes.h"
#include "Common/IniFile.h"
#include "Common/StringUtil.h"
#include "Common/Logging/LogManager.h"

6
Source/Core/Core/ActionReplay.h
View File

@ -4,7 +4,11 @@
#pragma once
#include "Common/IniFile.h"
#include <string>
#include <vector>
#include "Common/CommonTypes.h"
class IniFile;
namespace ActionReplay
{

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

@ -12,6 +12,7 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreParameter.h"
#include "Core/Host.h"
#include "Core/PatchEngine.h"
#include "Core/Boot/Boot.h"

5
Source/Core/Core/Boot/Boot.h
View File

@ -7,10 +7,7 @@
#include <cstdlib>
#include <string>
#include "Core/CoreParameter.h"
#include "DiscIO/Volume.h"
using DiscIO::IVolume;
struct CountrySetting
{
@ -58,5 +55,5 @@ private:
static bool Load_BS2(const std::string& _rBootROMFilename);
static void Load_FST(bool _bIsWii);
static bool SetupWiiMemory(IVolume::ECountry country);
static bool SetupWiiMemory(DiscIO::IVolume::ECountry country);
};

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

@ -163,18 +163,18 @@ bool CBoot::EmulatedBS2_GC(bool skipAppLoader)
return true;
}
bool CBoot::SetupWiiMemory(IVolume::ECountry country)
bool CBoot::SetupWiiMemory(DiscIO::IVolume::ECountry country)
{
static const CountrySetting SETTING_EUROPE = {"EUR", "PAL", "EU", "LE"};
static const std::map<IVolume::ECountry, const CountrySetting> country_settings = {
{IVolume::COUNTRY_EUROPE, SETTING_EUROPE},
{IVolume::COUNTRY_USA, {"USA", "NTSC", "US", "LU"}},
{IVolume::COUNTRY_JAPAN, {"JPN", "NTSC", "JP", "LJ"}},
{IVolume::COUNTRY_KOREA, {"KOR", "NTSC", "KR", "LKH"}},
static const std::map<DiscIO::IVolume::ECountry, const CountrySetting> country_settings = {
{DiscIO::IVolume::COUNTRY_EUROPE, SETTING_EUROPE},
{DiscIO::IVolume::COUNTRY_USA, {"USA", "NTSC", "US", "LU"}},
{DiscIO::IVolume::COUNTRY_JAPAN, {"JPN", "NTSC", "JP", "LJ"}},
{DiscIO::IVolume::COUNTRY_KOREA, {"KOR", "NTSC", "KR", "LKH"}},
//TODO: Determine if Taiwan have their own specific settings.
// Also determine if there are other specific settings
// for other countries.
{IVolume::COUNTRY_TAIWAN, {"JPN", "NTSC", "JP", "LJ"}}
{DiscIO::IVolume::COUNTRY_TAIWAN, {"JPN", "NTSC", "JP", "LJ"}}
};
auto entryPos = country_settings.find(country);
const CountrySetting& country_setting =

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

@ -8,7 +8,7 @@
#include <vector>
#include "Common/SysConf.h"
#include "Core/Boot/Boot.h"
#include "Core/CoreParameter.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/SI_Device.h"

5
Source/Core/Core/Core.cpp
View File

@ -23,6 +23,7 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreParameter.h"
#include "Core/CoreTiming.h"
#include "Core/DSPEmulator.h"
#include "Core/Host.h"
@ -33,7 +34,6 @@
#include "Core/State.h"
#include "Core/Boot/Boot.h"
#include "Core/FifoPlayer/FifoPlayer.h"
#include "Core/HW/AudioInterface.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DSP.h"
@ -48,6 +48,7 @@
#include "Core/HW/VideoInterface.h"
#include "Core/HW/Wiimote.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
#include "Core/IPC_HLE/WII_Socket.h"
#include "Core/PowerPC/JitInterface.h"
#include "Core/PowerPC/PowerPC.h"
@ -57,7 +58,7 @@
#endif
#include "DiscIO/FileMonitor.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/VideoBackendBase.h"

1
Source/Core/Core/Core.h
View File

@ -15,7 +15,6 @@
#include <vector>
#include "Common/CommonTypes.h"
#include "Core/CoreParameter.h"
// TODO: ugly, remove
extern bool g_aspect_wide;

12
Source/Core/Core/CoreParameter.cpp
View File

@ -373,17 +373,17 @@ void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, std::stri
}
}
IVolume::ELanguage SCoreStartupParameter::GetCurrentLanguage(bool wii) const
DiscIO::IVolume::ELanguage SCoreStartupParameter::GetCurrentLanguage(bool wii) const
{
IVolume::ELanguage language;
DiscIO::IVolume::ELanguage language;
if (wii)
language = (IVolume::ELanguage)SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG");
language = (DiscIO::IVolume::ELanguage)SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG");
else
language = (IVolume::ELanguage)(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage + 1);
language = (DiscIO::IVolume::ELanguage)(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage + 1);
// Get rid of invalid values (probably doesn't matter, but might as well do it)
if (language > IVolume::ELanguage::LANGUAGE_UNKNOWN || language < 0)
language = IVolume::ELanguage::LANGUAGE_UNKNOWN;
if (language > DiscIO::IVolume::ELanguage::LANGUAGE_UNKNOWN || language < 0)
language = DiscIO::IVolume::ELanguage::LANGUAGE_UNKNOWN;
return language;
}

2
Source/Core/Core/DSP/DSPAnalyzer.h
View File

@ -5,7 +5,7 @@
#pragma once
#include <array>
#include "Core/DSP/DSPInterpreter.h"
#include "Common/CommonTypes.h"
// Basic code analysis.
namespace DSPAnalyzer

3
Source/Core/Core/DSP/DSPBreakpoints.h
View File

@ -4,7 +4,8 @@
#pragma once
#include "Common/Common.h"
#include <cstring>
#include "Common/CommonTypes.h"
// super fast breakpoints for a limited range.
// To be used interchangeably with the BreakPoints class.

1
Source/Core/Core/DSP/DSPCore.cpp
View File

@ -34,6 +34,7 @@
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPHost.h"
#include "Core/DSP/DSPHWInterface.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"
SDSP g_dsp;

2
Source/Core/Core/DSP/DSPCore.h
View File

@ -29,8 +29,6 @@
#include <memory>
#include <string>
#include "Common/Thread.h"
#include "Core/DSP/DSPBreakpoints.h"
#include "Core/DSP/DSPCaptureLogger.h"
#include "Core/DSP/DSPEmitter.h"

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

@ -7,6 +7,8 @@
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"
#include "Core/DSP/DSPMemoryMap.h"
#include "Core/DSP/DSPTables.h"
// Arithmetic and accumulator control.

2
Source/Core/Core/DSP/DSPIntExtOps.h
View File

@ -25,7 +25,7 @@
#pragma once
#include "Core/DSP/DSPTables.h"
#include "Core/DSP/DSPCommon.h"
// Extended opcode support.
// Many opcode have the lower 0xFF (some only 0x7f) free - there, an opcode extension

3
Source/Core/Core/DSP/DSPIntMisc.cpp
View File

@ -6,8 +6,9 @@
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"
#include "Core/DSP/DSPMemoryMap.h"
#include "Core/DSP/DSPTables.h"
namespace DSPInterpreter {

1
Source/Core/Core/DSP/DSPIntMultiplier.cpp
View File

@ -10,6 +10,7 @@
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"
#include "Core/DSP/DSPTables.h"
namespace DSPInterpreter {

2
Source/Core/Core/DSP/DSPIntUtil.h
View File

@ -28,8 +28,6 @@
#include "Common/CommonTypes.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPMemoryMap.h"
#include "Core/DSP/DSPStacks.h"

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

@ -26,7 +26,9 @@
#include "Core/DSP/DSPAnalyzer.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPHWInterface.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"
#include "Core/DSP/DSPMemoryMap.h"
#include "Core/DSP/DSPTables.h"
namespace DSPInterpreter {

2
Source/Core/Core/DSP/DSPInterpreter.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "Core/DSP/DSPTables.h"
#include "Core/DSP/DSPCommon.h"
#define DSP_REG_MASK 0x1f

2
Source/Core/Core/DSP/DSPMemoryMap.h
View File

@ -28,7 +28,7 @@
#include "Common/CommonTypes.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPTables.h"
u16 dsp_imem_read(u16 addr);
void dsp_dmem_write(u16 addr, u16 val);

1
Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp
View File

@ -8,6 +8,7 @@
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPIntUtil.h"
#include "Core/DSP/DSPMemoryMap.h"
using namespace Gen;

2
Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp
View File

@ -6,7 +6,9 @@
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"
#include "Core/DSP/DSPMemoryMap.h"
using namespace Gen;

2
Source/Core/Core/DSP/Jit/DSPJitMisc.cpp
View File

@ -3,7 +3,9 @@
// Refer to the license.txt file included.
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"
#include "Core/DSP/DSPMemoryMap.h"
using namespace Gen;

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

@ -4,7 +4,7 @@
#pragma once
#include "Common/ChunkFile.h"
class PointerWrap;
class DSPEmulator
{

1
Source/Core/Core/GeckoCode.cpp
View File

@ -5,6 +5,7 @@
#include <vector>
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Common/Thread.h"
#include "Core/ConfigManager.h"

1
Source/Core/Core/GeckoCode.h
View File

@ -4,7 +4,6 @@
#pragma once
#include <map>
#include <string>
#include <vector>

1
Source/Core/Core/HLE/HLE.h
View File

@ -5,6 +5,7 @@
#pragma once
#include <map>
#include <string>
#include "Common/CommonTypes.h"

2
Source/Core/Core/HLE/HLE_OS.h
View File

@ -4,8 +4,6 @@
#pragma once
#include "Common/CommonTypes.h"
namespace HLE_OS
{
void HLE_GeneralDebugPrint();

1
Source/Core/Core/HW/DSPHLE/DSPHLE.h
View File

@ -8,6 +8,7 @@
#include "Core/HW/DSP.h"
#include "Core/HW/DSPHLE/MailHandler.h"
class PointerWrap;
class UCodeInterface;
class DSPHLE : public DSPEmulator {

1
Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
View File

@ -12,6 +12,7 @@
#include "Common/CPUDetect.h"
#include "Common/Event.h"
#include "Common/IniFile.h"
#include "Common/Thread.h"
#include "Common/Logging/LogManager.h"
#include "Core/ConfigManager.h"

8
Source/Core/Core/HW/DSPLLE/DSPLLE.h
View File

@ -5,11 +5,13 @@
#pragma once
#include <atomic>
#include <mutex>
#include <thread>
#include "Common/Thread.h"
#include "Common/Flag.h"
#include "Core/DSPEmulator.h"
#include "Core/HW/DSPLLE/DSPLLEGlobals.h"
class PointerWrap;
class DSPLLE : public DSPEmulator
{

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

@ -9,6 +9,7 @@
#include "AudioCommon/AudioCommon.h"
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Core/ConfigManager.h"

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

@ -7,9 +7,9 @@
#include <string>
#include "Common/CommonTypes.h"
#include "DiscIO/Volume.h"
class PointerWrap;
namespace DiscIO { class IVolume; }
namespace MMIO { class Mapping; }
namespace DVDInterface
@ -79,7 +79,7 @@ enum DICommand
DVDLowAudioBufferConfig = 0xe4
};
enum DIInterruptType
enum DIInterruptType : int
{
INT_DEINT = 0,
INT_TCINT = 1,

1
Source/Core/Core/HW/EXI.cpp
View File

@ -9,6 +9,7 @@
#include "Core/CoreTiming.h"
#include "Core/Movie.h"
#include "Core/HW/EXI.h"
#include "Core/HW/EXI_Channel.h"
#include "Core/HW/MMIO.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/Sram.h"

6
Source/Core/Core/HW/EXI.h
View File

@ -5,11 +5,11 @@
#pragma once
#include "Common/CommonTypes.h"
#include "Common/Thread.h"
#include "Core/HW/EXI_Channel.h"
class CEXIChannel;
class IEXIDevice;
class PointerWrap;
enum TEXIDevices : int;
namespace MMIO { class Mapping; }
enum

1
Source/Core/Core/HW/EXI_Channel.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/ChunkFile.h"
#include "Core/ConfigManager.h"
#include "Core/CoreTiming.h"
#include "Core/Movie.h"

5
Source/Core/Core/HW/EXI_Channel.h
View File

@ -5,10 +5,11 @@
#pragma once
#include <memory>
#include "Common/CommonTypes.h"
#include "Core/HW/EXI_Device.h"
class IEXIDevice;
class PointerWrap;
enum TEXIDevices : int;
namespace MMIO { class Mapping; }
class CEXIChannel

3
Source/Core/Core/HW/EXI_Device.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/ChunkFile.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/EXI_Device.h"
@ -16,7 +16,6 @@
#include "Core/HW/EXI_DeviceMic.h"
#include "Core/HW/Memmap.h"
// --- interface IEXIDevice ---
void IEXIDevice::ImmWrite(u32 _uData, u32 _uSize)
{

5
Source/Core/Core/HW/EXI_Device.h
View File

@ -4,10 +4,11 @@
#pragma once
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
enum TEXIDevices
class PointerWrap;
enum TEXIDevices : int
{
EXIDEVICE_DUMMY,
EXIDEVICE_MEMORYCARD,

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

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

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

@ -6,6 +6,8 @@
#include "Core/HW/EXI_Device.h"
class PointerWrap;
class CEXIAD16 : public IEXIDevice
{
public:

1
Source/Core/Core/HW/EXI_DeviceAGP.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/ChunkFile.h"
#include "Common/FileUtil.h"
#include "Common/MemoryUtil.h"
#include "Common/StdMakeUnique.h"

4
Source/Core/Core/HW/EXI_DeviceAGP.h
View File

@ -6,9 +6,13 @@
#include <deque>
#include <queue>
#include <string>
#include <vector>
#include "Core/HW/EXI_Device.h"
class PointerWrap;
class CEXIAgp
: public IEXIDevice
{

3
Source/Core/Core/HW/EXI_DeviceAMBaseboard.cpp
View File

@ -2,8 +2,9 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/ChunkFile.h"
#include "Common/Logging/Log.h"
#include "Core/Core.h"
#include "Core/HW/EXI.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI_DeviceAMBaseboard.h"

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

@ -6,6 +6,8 @@
#include "Core/HW/EXI_Device.h"
class PointerWrap;
class CEXIAMBaseboard : public IEXIDevice
{
public:

1
Source/Core/Core/HW/EXI_DeviceEthernet.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/ChunkFile.h"
#include "Common/Network.h"
#include "Core/ConfigManager.h"
#include "Core/HW/EXI.h"

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

@ -11,6 +11,8 @@
#include "Common/Thread.h"
#include "Core/HW/EXI_Device.h"
class PointerWrap;
// Network Control Register A
enum NCRA
{

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

@ -2,7 +2,11 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/ChunkFile.h"
#include "Common/CommonFuncs.h"
#include "Common/StdMakeUnique.h"
#include "Common/StringUtil.h"
#include "Common/Thread.h"
#include "Core/Core.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI_DeviceGecko.h"

7
Source/Core/Core/HW/EXI_DeviceGecko.h
View File

@ -5,12 +5,13 @@
#pragma once
#include <deque>
#include <memory>
#include <mutex>
#include <queue>
#include <thread>
#include <SFML/Network.hpp>
#include "Common/Thread.h"
#include "Common/CommonTypes.h"
#include "Core/HW/EXI_Device.h"
class GeckoSockServer

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

@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/ChunkFile.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
@ -14,6 +15,7 @@
#include "Core/Movie.h"
#include "Core/NetPlayProto.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/Sram.h"
#include "Core/HW/SystemTimers.h"
// We should provide an option to choose from the above, or figure out the checksum (the algo in yagcd seems wrong)

3
Source/Core/Core/HW/EXI_DeviceIPL.h
View File

@ -7,7 +7,8 @@
#include <string>
#include "Core/HW/EXI_Device.h"
#include "Core/HW/Sram.h"
class PointerWrap;
class CEXIIPL : public IEXIDevice
{

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

@ -2,9 +2,11 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/NandPaths.h"
#include "Common/StdMakeUnique.h"
#include "Common/StringUtil.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"

7
Source/Core/Core/HW/EXI_DeviceMemoryCard.h
View File

@ -3,10 +3,15 @@
// Refer to the license.txt file included.
#pragma once
#include "Common/StdMakeUnique.h"
#include <functional>
#include <memory>
#include "Core/HW/EXI_Device.h"
class MemoryCardBase;
class PointerWrap;
class CEXIMemoryCard : public IEXIDevice
{
public:

1
Source/Core/Core/HW/GCKeyboard.cpp
View File

@ -3,7 +3,6 @@
// Refer to the license.txt file included.
#include "Common/CommonTypes.h"
#include "Core/ConfigManager.h"
#include "Core/HW/GCKeyboard.h"
#include "Core/HW/GCKeyboardEmu.h"

9
Source/Core/Core/HW/GCKeyboard.h
View File

@ -2,12 +2,13 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/CommonTypes.h"
#include "InputCommon/InputConfig.h"
#include "InputCommon/KeyboardStatus.h"
#pragma once
#include "Common/CommonTypes.h"
class InputConfig;
struct KeyboardStatus;
namespace Keyboard
{

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

@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Core/Host.h"
#include "Core/HW/GCKeyboardEmu.h"
#include "InputCommon/KeyboardStatus.h"
static const u16 keys0_bitmasks[] =
{

3
Source/Core/Core/HW/GCKeyboardEmu.h
View File

@ -7,7 +7,8 @@
#include <string>
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/KeyboardStatus.h"
struct KeyboardStatus;
class GCKeyboard : public ControllerEmu
{

1
Source/Core/Core/HW/GCMemcard.cpp
View File

@ -7,6 +7,7 @@
#include <string>
#include "Common/ColorUtil.h"
#include "Common/FileUtil.h"
#include "Core/HW/GCMemcard.h"
static void ByteSwap(u8 *valueA, u8 *valueB)

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

@ -2,8 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <cinttypes>
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Common/FileSearch.h"
#include "Common/FileUtil.h"
#include "Common/StdMakeUnique.h"
#include "Common/Thread.h"
#include "Core/ConfigManager.h"

7
Source/Core/Core/HW/GCMemcardDirectory.h
View File

@ -4,6 +4,13 @@
#pragma once
#include <atomic>
#include <chrono>
#include <mutex>
#include <string>
#include <thread>
#include <vector>
#include "Common/Event.h"
#include "Core/HW/GCMemcard.h"
#include "DiscIO/Volume.h"

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

@ -4,7 +4,9 @@
#include <chrono>
#include "Common/ChunkFile.h"
#include "Common/FileUtil.h"
#include "Common/StdMakeUnique.h"
#include "Common/Thread.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/GCMemcard.h"

4
Source/Core/Core/HW/GCMemcardRaw.h
View File

@ -5,9 +5,11 @@
#pragma once
#include <memory>
#include <mutex>
#include <string>
#include <thread>
#include "Common/Event.h"
#include "Common/Flag.h"
#include "Common/Thread.h"
#include "Core/HW/GCMemcard.h"
class PointerWrap;

10
Source/Core/Core/HW/GCPad.h
View File

@ -2,12 +2,14 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/CommonTypes.h"
#include "InputCommon/GCPadStatus.h"
#include "InputCommon/InputConfig.h"
#pragma once
#include "Common/CommonTypes.h"
#include "InputCommon/ControllerInterface/Device.h"
class InputConfig;
struct GCPadStatus;
namespace Pad
{

1
Source/Core/Core/HW/GPFifo.cpp
View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include "Common/ChunkFile.h"
#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
#include "Core/HW/GPFifo.h"

3
Source/Core/Core/HW/GPFifo.h
View File

@ -4,7 +4,8 @@
#pragma once
#include "Common/Common.h"
#include "Common/CommonTypes.h"
class PointerWrap;
namespace GPFifo

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

@ -8,7 +8,7 @@
#include <string>
#include <type_traits>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Core/ConfigManager.h"
#include "Core/HW/MMIOHandlers.h"

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

@ -7,7 +7,7 @@
#include <functional>
#include <memory>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
// All the templated and very repetitive MMIO-related code is isolated in this
// file for easier reading. It mostly contains code related to handling methods

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

@ -5,10 +5,10 @@
#pragma once
#include "Common/CommonTypes.h"
#include "Core/HW/SI_Device.h"
class PointerWrap;
class ISIDevice;
enum SIDevices : int;
namespace MMIO { class Mapping; }
// SI number of channels

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

@ -38,7 +38,7 @@ enum TSIDevices
};
// For configuration use, since some devices can have the same SI Device ID
enum SIDevices
enum SIDevices : int
{
SIDEVICE_NONE,
SIDEVICE_N64_MIC,

1
Source/Core/Core/HW/SI_DeviceDanceMat.cpp
View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include "Core/HW/SI_DeviceDanceMat.h"
#include "InputCommon/GCPadStatus.h"
CSIDevice_DanceMat::CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber)
: CSIDevice_GCController(device, _iDeviceNumber) {}

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

@ -6,6 +6,8 @@
#include "Core/HW/SI_DeviceGCController.h"
struct GCPadStatus;
class CSIDevice_DanceMat : public CSIDevice_GCController
{
public:

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

@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/ChunkFile.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/Movie.h"
@ -16,6 +17,7 @@
#include "Core/HW/SI_GCAdapter.h"
#endif
#include "Core/HW/SystemTimers.h"
#include "InputCommon/GCPadStatus.h"
// --- standard GameCube controller ---
CSIDevice_GCController::CSIDevice_GCController(SIDevices device, int _iDeviceNumber)

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

@ -2,8 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/ChunkFile.h"
#include "Core/HW/GCKeyboard.h"
#include "Core/HW/SI_DeviceKeyboard.h"
#include "InputCommon/KeyboardStatus.h"
// --- GameCube keyboard ---
CSIDevice_Keyboard::CSIDevice_Keyboard(SIDevices device, int _iDeviceNumber)

5
Source/Core/Core/HW/SI_DeviceKeyboard.h
View File

@ -4,7 +4,10 @@
#pragma once
#include "InputCommon/KeyboardStatus.h"
#include "Core/HW/SI_Device.h"
class PointerWrap;
struct KeyboardStatus;
class CSIDevice_Keyboard : public ISIDevice
{

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

@ -4,11 +4,15 @@
#include <libusb.h>
#include "Common/Flag.h"
#include "Common/Thread.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI_GCAdapter.h"
#include "Core/HW/SystemTimers.h"
#include "InputCommon/GCPadStatus.h"
namespace SI_GCAdapter
{

4
Source/Core/Core/HW/SI_GCAdapter.h
View File

@ -6,9 +6,7 @@
#include <functional>
#include "Common/Thread.h"
#include "Core/HW/SI.h"
#include "InputCommon/GCPadStatus.h"
struct GCPadStatus;
namespace SI_GCAdapter
{

1
Source/Core/Core/HW/Sram.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/FileUtil.h"
#include "Core/ConfigManager.h"
#include "Core/HW/Sram.h"

3
Source/Core/Core/HW/Wiimote.h
View File

@ -5,7 +5,8 @@
#pragma once
#include "Common/ChunkFile.h"
#include "InputCommon/InputConfig.h"
class InputConfig;
enum
{

1
Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp
View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include "Common/CommonTypes.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteEmu/Attachment/Attachment.h"
namespace WiimoteEmu

3
Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h
View File

@ -4,12 +4,13 @@
#pragma once
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "InputCommon/ControllerEmu.h"
namespace WiimoteEmu
{
struct ExtensionReg;
class Attachment : public ControllerEmu
{
public:

1
Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteEmu/Attachment/Classic.h"
namespace WiimoteEmu

2
Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h
View File

@ -9,6 +9,8 @@
namespace WiimoteEmu
{
struct ExtensionReg;
class Classic : public Attachment
{
public:

1
Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteEmu/Attachment/Drums.h"
namespace WiimoteEmu

2
Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h
View File

@ -9,6 +9,8 @@
namespace WiimoteEmu
{
struct ExtensionReg;
class Drums : public Attachment
{
public:

1
Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteEmu/Attachment/Guitar.h"
namespace WiimoteEmu

2
Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h
View File

@ -9,6 +9,8 @@
namespace WiimoteEmu
{
struct ExtensionReg;
class Guitar : public Attachment
{
public:

1
Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h"
namespace WiimoteEmu

2
Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h
View File

@ -9,6 +9,8 @@
namespace WiimoteEmu
{
struct ExtensionReg;
class Nunchuk : public Attachment
{
public:

1
Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteEmu/Attachment/Turntable.h"
namespace WiimoteEmu

2
Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h
View File

@ -9,6 +9,8 @@
namespace WiimoteEmu
{
struct ExtensionReg;
class Turntable : public Attachment
{
public:

3
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -4,14 +4,13 @@
#include <cmath>
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Common/Timer.h"
#include "Core/ConfigManager.h"
#include "Core/Host.h"
#include "Core/Movie.h"
#include "Core/NetPlayClient.h"
#include "Core/HW/WiimoteEmu/MatrixMath.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteEmu/WiimoteHid.h"

4
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
View File

@ -5,9 +5,9 @@
#pragma once
#include <queue>
#include <string>
#include <vector>
#include "Common/ChunkFile.h"
#include "Core/Core.h"
#include "Core/HW/WiimoteEmu/Encryption.h"
#include "Core/HW/WiimoteEmu/WiimoteHid.h"
@ -20,6 +20,8 @@
#define WIIMOTE_REG_EXT_SIZE 0x100
#define WIIMOTE_REG_IR_SIZE 0x34
class PointerWrap;
namespace WiimoteReal
{
class Wiimote;

3
Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -6,11 +6,12 @@
#include <cstdlib>
#include <queue>
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Common/IniFile.h"
#include "Common/StringUtil.h"
#include "Common/Thread.h"
#include "Common/Timer.h"
#include "Core/ConfigManager.h"
#include "Core/Host.h"
#include "Core/HW/WiimoteEmu/WiimoteHid.h"

9
Source/Core/Core/HW/WiimoteReal/WiimoteReal.h
View File

@ -4,19 +4,20 @@
#pragma once
#include <mutex>
#include <string>
#include <thread>
#include <vector>
#include "Common/ChunkFile.h"
#include "Common/FifoQueue.h"
#include "Common/Thread.h"
#include "Common/Timer.h"
#include "Core/HW/Wiimote.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteReal/WiimoteRealBase.h"
#include "InputCommon/InputConfig.h"
class PointerWrap;
typedef std::vector<u8> Report;
namespace WiimoteReal

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

@ -2,8 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <string>
#include <vector>
#include "Core/ConfigManager.h"
#include "Core/CoreParameter.h"
#include "Core/HotkeyManager.h"
const std::string hotkey_labels[] =

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

@ -4,7 +4,7 @@
#pragma once
#include "Core/CoreParameter.h"
#include <string>
#include "InputCommon/InputConfig.h"
struct HotkeyStatus

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h
View File

@ -6,10 +6,10 @@
#include <queue>
#include <string>
#include <vector>
#include "Common/ChunkFile.h"
#include "Common/StringUtil.h"
#include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h"

3
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
View File

@ -5,15 +5,14 @@
#include <cinttypes>
#include <memory>
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/LogManager.h"
#include "Core/ConfigManager.h"
#include "Core/CoreTiming.h"
#include "Core/HW/DVDInterface.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/SystemTimers.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h"

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