Fix more header sorting issues in Core/ (now check-includes clean).

This commit is contained in:
Lioncash 2014-02-19 13:09:14 -05:00 committed by Pierre Bourdon
parent 9a8ea53195
commit 146b301a91
84 changed files with 152 additions and 173 deletions

View File

@ -3,20 +3,20 @@
// Refer to the license.txt file included.
#include <stdio.h>
#include <cstdio>
#include <signal.h>
#ifdef ANDROID
#include <asm/sigcontext.h>
#else
#include <sys/ucontext.h> // Look in here for the context definition.
#include <execinfo.h>
#include <sys/ucontext.h> // Look in here for the context definition.
#endif
#include "Common/Common.h"
#include "Core/MemTools.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/JitInterface.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
namespace EMM

View File

@ -30,8 +30,8 @@
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/SignatureDB.h"
#include "DiscIO/VolumeCreator.h"
#include "DiscIO/NANDContentLoader.h"
#include "DiscIO/VolumeCreator.h"
void CBoot::Load_FST(bool _bIsWii)
{

View File

@ -15,10 +15,10 @@
#include "Core/VolumeHandler.h"
#include "Core/Boot/Boot.h"
#include "Core/HLE/HLE.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DVDInterface.h"
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/DVDInterface.h"
#include "Core/HW/CPU.h"
#include "Core/PowerPC/PowerPC.h"
#include "DiscIO/VolumeCreator.h"

View File

@ -23,10 +23,8 @@
#include <string>
#include <vector>
#include "DiscIO/Volume.h"
#include "DiscIO/VolumeCreator.h"
#include "Common/CommonTypes.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/IniFile.h"
#include "Common/SysConf.h"
#include "Core/BootManager.h"
@ -38,6 +36,8 @@
#include "Core/HW/EXI.h"
#include "Core/HW/SI.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "DiscIO/Volume.h"
#include "DiscIO/VolumeCreator.h"
#include "VideoCommon/VideoBackendBase.h"
namespace BootManager

View File

@ -2,13 +2,13 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "DiscIO/NANDContentLoader.h"
#include "Common/Common.h"
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Common/IniFile.h"
#include "Core/ConfigManager.h"
#include "Core/HW/SI.h"
#include "DiscIO/NANDContentLoader.h"
SConfig* SConfig::m_Instance;

View File

@ -9,8 +9,6 @@
#include "AudioCommon/AudioCommon.h"
#include "DiscIO/FileMonitor.h"
#include "Common/Atomic.h"
#include "Common/Common.h"
#include "Common/CommonPaths.h"
@ -48,14 +46,15 @@
#include "Core/HW/SystemTimers.h"
#include "Core/HW/VideoInterface.h"
#include "Core/HW/Wiimote.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/PowerPC/PowerPC.h"
#ifdef USE_GDBSTUB
#include "Core/PowerPC/GDBStub.h"
#endif
#include "DiscIO/FileMonitor.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/VideoBackendBase.h"

View File

@ -11,8 +11,8 @@
#pragma once
#include <vector>
#include <string>
#include <vector>
#include "Common/CommonTypes.h"
#include "Core/CoreParameter.h"

View File

@ -10,9 +10,6 @@
#include "Common/FileUtil.h"
#include "Common/StringUtil.h"
#include "DiscIO/NANDContentLoader.h"
#include "DiscIO/VolumeCreator.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h" // for bWii
#include "Core/CoreParameter.h"
@ -20,6 +17,9 @@
#include "Core/Boot/Boot_DOL.h"
#include "Core/FifoPlayer/FifoDataFile.h"
#include "DiscIO/NANDContentLoader.h"
#include "DiscIO/VolumeCreator.h"
SCoreStartupParameter::SCoreStartupParameter()
: hInstance(0),
bEnableDebugging(false), bAutomaticStart(false), bBootToPause(false),

View File

@ -25,11 +25,11 @@
#include "Common/Atomic.h"
#include "Common/CPUDetect.h"
#include "Common/Thread.h"
#include "Common/MemoryUtil.h"
#include "Common/Thread.h"
#include "Core/DSP/DSPAnalyzer.h"
#include "Core/DSP/DSPAccelerator.h"
#include "Core/DSP/DSPAnalyzer.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPHost.h"
#include "Core/DSP/DSPHWInterface.h"

View File

@ -8,8 +8,8 @@
// HELPER FUNCTIONS
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPInterpreter.h"
namespace DSPInterpreter {

View File

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

View File

@ -6,9 +6,9 @@
#include "Common/Common.h"
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntExtOps.h"
#include "Core/DSP/DSPEmitter.h"
#include "Core/DSP/DSPTables.h"
void nop(const UDSPInstruction opc)

View File

@ -4,8 +4,8 @@
//
// Additional copyrights go to Duddie and Tratax (c) 2004
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"
// Arithmetic and accumulator control.

View File

@ -5,13 +5,12 @@
// Additional copyrights go to Duddie and Tratax (c) 2004
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"
#include "Core/DSP/DSPMemoryMap.h"
#include "Core/DSP/DSPStacks.h"
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPIntUtil.h"
namespace DSPInterpreter {
// Generic call implementation

View File

@ -5,9 +5,8 @@
// Additional copyrights go to Duddie and Tratax (c) 2004
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPMemoryMap.h"
#include "Core/DSP/DSPIntUtil.h"
#include "Core/DSP/DSPMemoryMap.h"
namespace DSPInterpreter {

View File

@ -7,9 +7,8 @@
// Multiplier and product register control
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntCCUtil.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPIntUtil.h"
namespace DSPInterpreter {

View File

@ -24,8 +24,8 @@
#pragma once
#include <string>
#include <map>
#include <string>
#include "Common/Common.h"

View File

@ -4,8 +4,8 @@
#include "Core/DSPEmulator.h"
#include "Core/HW/DSPLLE/DSPLLE.h"
#include "Core/HW/DSPHLE/DSPHLE.h"
#include "Core/HW/DSPLLE/DSPLLE.h"
DSPEmulator *CreateDSPEmulator(bool HLE)
{

View File

@ -4,8 +4,8 @@
#pragma once
#include <vector>
#include <string>
#include <vector>
#include "Common/Common.h"

View File

@ -12,8 +12,8 @@
#include "Core/HW/DSP.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
void PPCDebugInterface::disasm(unsigned int address, char *dest, int max_size)
{

View File

@ -6,8 +6,8 @@
#include "Core/FifoPlayer/FifoAnalyzer.h"
#include "VideoCommon/VertexLoader.h"
#include "VideoCommon/VertexLoader_Position.h"
#include "VideoCommon/VertexLoader_Normal.h"
#include "VideoCommon/VertexLoader_Position.h"
#include "VideoCommon/VertexLoader_TextCoord.h"
namespace FifoAnalyzer

View File

@ -8,8 +8,8 @@
#include "Core/Core.h"
#include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/HLE/HLE.h"
#include "Core/HLE/HLE_OS.h"
#include "Core/HLE/HLE_Misc.h"
#include "Core/HLE/HLE_OS.h"
#include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
#include "Core/PowerPC/PowerPC.h"

View File

@ -18,8 +18,8 @@
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCAnalyst.h"
#include "Core/PowerPC/PPCCache.h"
#include "Core/PowerPC/SignatureDB.h"
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/SignatureDB.h"
#include "DiscIO/Filesystem.h"
#include "DiscIO/VolumeCreator.h"

View File

@ -31,8 +31,8 @@
// the TAP-Win32 driver and contains definitions
// common to both.
//===============================================
#include <windows.h>
#include <stdlib.h>
#include <windows.h>
#include <winioctl.h>
#define TAP_WIN32_MIN_MAJOR 9
#define TAP_WIN32_MIN_MINOR 0

View File

@ -14,8 +14,8 @@
#include "Core/HW/AudioInterface.h"
#include "Core/HW/SystemTimers.h"
#include "Core/HW/VideoInterface.h"
#include "Core/HW/DSPHLE/HLEMixer.h"
#include "Core/HW/DSPHLE/DSPHLE.h"
#include "Core/HW/DSPHLE/HLEMixer.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
DSPHLE::DSPHLE()

View File

@ -1,6 +1,8 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
//
#define AX_WII // Used in UCode_AX_Voice.
#include "AudioCommon/Mixer.h"
#include "Common/MathUtil.h"
@ -8,12 +10,10 @@
#include "Core/HW/DSPHLE/MailHandler.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
#include "Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h"
#include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h"
#include "Core/HW/DSPHLE/UCodes/UCode_AXWii.h"
#define AX_WII
#include "Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
CUCode_AXWii::CUCode_AXWii(DSPHLE *dsp_hle, u32 l_CRC)

View File

@ -17,6 +17,8 @@
#include "Common/Common.h"
#include "Common/MathUtil.h"
#include "Core/HW/DSP.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/DSPHLE/UCodes/UCode_AX.h"
#include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h"
#ifdef AX_GC

View File

@ -5,8 +5,8 @@
#include "Core/ConfigManager.h"
#include "Core/HW/DSP.h"
#include "Core/HW/DSPHLE/DSPHLE.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
#include "Core/HW/DSPHLE/UCodes/UCode_CARD.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
CUCode_CARD::CUCode_CARD(DSPHLE *dsp_hle, u32 crc)

View File

@ -4,8 +4,8 @@
#include "Core/ConfigManager.h"
#include "Core/HW/DSP.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
#include "Core/HW/DSPHLE/UCodes/UCode_GBA.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
CUCode_GBA::CUCode_GBA(DSPHLE *dsp_hle, u32 crc)
: IUCode(dsp_hle, crc)

View File

@ -3,8 +3,8 @@
// Refer to the license.txt file included.
#include "Core/ConfigManager.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
#include "Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
CUCode_InitAudioSystem::CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc)
: IUCode(dsp_hle, crc)

View File

@ -10,8 +10,8 @@
#include "Core/ConfigManager.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
#include "Core/HW/DSPHLE/UCodes/UCode_ROM.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
CUCode_Rom::CUCode_Rom(DSPHLE *dsp_hle, u32 crc)
: IUCode(dsp_hle, crc)

View File

@ -12,8 +12,8 @@
#include "Core/ConfigManager.h"
#include "Core/HW/DSP.h"
#include "Core/HW/DSPHLE/MailHandler.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
CUCode_Zelda::CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC)

View File

@ -7,8 +7,8 @@
#include "AudioCommon/AudioCommon.h"
#include "AudioCommon/Mixer.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
void CUCode_Zelda::RenderSynth_RectWave(ZeldaVoicePB &PB, s32* _Buffer, int _Size)
{

View File

@ -10,8 +10,8 @@
#include "Core/HW/DSP.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
void CUCode_Zelda::ReadVoicePB(u32 _Addr, ZeldaVoicePB& PB)
{

View File

@ -8,7 +8,6 @@
#include "Common/Hash.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
#include "Core/HW/DSPHLE/UCodes/UCode_AX.h"
#include "Core/HW/DSPHLE/UCodes/UCode_AXWii.h"
#include "Core/HW/DSPHLE/UCodes/UCode_CARD.h"
@ -16,6 +15,7 @@
#include "Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h"
#include "Core/HW/DSPHLE/UCodes/UCode_ROM.h"
#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii)
{

View File

@ -4,8 +4,8 @@
#pragma once
#include "Common/Common.h"
#include "Common/ChunkFile.h"
#include "Common/Common.h"
#include "Common/Thread.h"
#include "Core/HW/Memmap.h"

View File

@ -4,14 +4,15 @@
#include "Common/Common.h"
#include "Common/Hash.h"
#include "Core/Host.h"
#include "Core/ConfigManager.h"
#include "Core/Host.h"
#include "Core/DSP/DSPAnalyzer.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPHost.h"
#include "Core/HW/DSP.h"
#include "Core/HW/DSPLLE/DSPSymbols.h"
#include "Core/HW/DSPLLE/DSPLLETools.h"
#include "Core/HW/DSPLLE/DSPSymbols.h"
#include "Core/PowerPC/PowerPC.h"
#include "VideoCommon/OnScreenDisplay.h"

View File

@ -20,8 +20,8 @@
#include "Core/DSP/disassemble.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPHost.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPHWInterface.h"
#include "Core/DSP/DSPInterpreter.h"
#include "Core/DSP/DSPTables.h"
#include "Core/HW/AudioInterface.h"
#include "Core/HW/Memmap.h"

View File

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

View File

@ -3,8 +3,8 @@
// Refer to the license.txt file included.
#include "Core/Core.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI_DeviceAD16.h"
#include "Core/HW/EXI_DeviceAMBaseboard.h"

View File

@ -8,8 +8,8 @@
#include "Core/HW/GCPadEmu.h"
#include "InputCommon/GCPadStatus.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/InputConfig.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
namespace Pad

View File

@ -8,8 +8,8 @@
#include "Core/HW/GPFifo.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
#include "VideoCommon/VideoBackendBase.h"

View File

@ -4,8 +4,8 @@
#pragma once
#include "Common/Common.h"
#include "Common/ChunkFile.h"
#include "Common/Common.h"
namespace HW
{

View File

@ -13,8 +13,8 @@
#include "Common/MemArena.h"
#include "Common/MemoryUtil.h"
#include "Core/Core.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/HLE/HLE.h"
#include "Core/HW/AudioInterface.h"
@ -23,13 +23,13 @@
#include "Core/HW/DVDInterface.h"
#include "Core/HW/EXI.h"
#include "Core/HW/GPFifo.h"
#include "Core/HW/MemoryInterface.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/MemoryInterface.h"
#include "Core/HW/MMIO.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SI.h"
#include "Core/HW/WII_IPC.h"
#include "Core/HW/VideoInterface.h"
#include "Core/HW/WII_IPC.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/JitCommon/JitBase.h"

View File

@ -2,11 +2,11 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Core/HW/GCPad.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI_Device.h"
#include "Core/HW/SI_DeviceAMBaseboard.h"
#include "Core/HW/GCPad.h"
#include "InputCommon/GCPadStatus.h"
// where to put baseboard debug

View File

@ -4,13 +4,12 @@
#include <queue>
#include "SFML/Network.hpp"
#include "Common/Thread.h"
#include "Core/HW/SI_Device.h"
#include "Core/HW/SI_DeviceGBA.h"
#include "SFML/Network.hpp"
static std::thread connectionThread;
static std::queue<sf::SocketTCP> waiting_socks;
static std::mutex cs_gba;

View File

@ -61,8 +61,8 @@ IPC_HLE_PERIOD: For the Wiimote this is the call schedule:
#include "Common/Thread.h"
#include "Common/Timer.h"
#include "Core/CoreTiming.h"
#include "Core/ConfigManager.h"
#include "Core/CoreTiming.h"
#include "Core/DSPEmulator.h"
#include "Core/Host.h"
#include "Core/PatchEngine.h"
@ -72,8 +72,8 @@ IPC_HLE_PERIOD: For the Wiimote this is the call schedule:
#include "Core/HW/SI.h"
#include "Core/HW/SystemTimers.h"
#include "Core/HW/VideoInterface.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h"
#include "Core/PowerPC/PowerPC.h"
#include "VideoCommon/CommandProcessor.h"
#include "VideoCommon/VideoBackendBase.h"

View File

@ -10,8 +10,8 @@
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/InputConfig.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
namespace Wiimote
{

View File

@ -4,8 +4,8 @@
#include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h"
#include "InputCommon/UDPWrapper.h"
#include "InputCommon/UDPWiimote.h"
#include "InputCommon/UDPWrapper.h"
namespace WiimoteEmu
{

View File

@ -25,8 +25,8 @@
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteEmu/WiimoteHid.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "Core/HW/WiimoteEmu/Attachment/Attachment.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
namespace WiimoteEmu
{

View File

@ -7,23 +7,23 @@
#include "Common/Common.h"
#include "Common/Timer.h"
#include "Core/Host.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/UDPTLayer.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteEmu/WiimoteHid.h"
#include "Core/HW/WiimoteEmu/Attachment/Classic.h"
#include "Core/HW/WiimoteEmu/Attachment/Drums.h"
#include "Core/HW/WiimoteEmu/Attachment/Guitar.h"
#include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h"
#include "Core/HW/WiimoteEmu/Attachment/Turntable.h"
#include "Core/HW/WiimoteEmu/MatrixMath.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteEmu/WiimoteHid.h"
#include "Core/HW/WiimoteEmu/UDPTLayer.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
inline double round(double x) { return (x-floor(x))>0.5 ? ceil(x) : floor(x); } //because damn MSVSC doesen't comply to C99
namespace

View File

@ -7,13 +7,10 @@
#include <queue>
#include <vector>
#include "Core/Core.h"
#include "Common/ChunkFile.h"
#include "Core/Core.h"
#include "Core/HW/WiimoteEmu/Encryption.h"
#include "Core/HW/WiimoteEmu/WiimoteHid.h"
#include "InputCommon/ControllerEmu.h"
#include "InputCommon/UDPWrapper.h"

View File

@ -2,28 +2,27 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
// Used for pair up
#undef NTDDI_VERSION
#define NTDDI_VERSION NTDDI_WINXPSP2
#include <algorithm>
#include <BluetoothAPIs.h>
#include <bthdef.h>
#include <cstdio>
#include <cstdlib>
#include <ctime>
#include <unordered_map>
#include <unordered_set>
#include <windows.h>
#include <dbt.h>
#include <setupapi.h>
#include <unordered_map>
#include <unordered_set>
#include <windows.h>
#include "Common/Common.h"
#include "Common/StringUtil.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
// Used for pair up
#undef NTDDI_VERSION
#define NTDDI_VERSION NTDDI_WINXPSP2
#include <bthdef.h>
#include <BluetoothAPIs.h>
//#define AUTHENTICATE_WIIMOTES
#define SHARE_WRITE_WIIMOTES

View File

@ -6,8 +6,6 @@
#include <cstdlib>
#include <queue>
#include "SFML/Network.hpp"
#include "Common/Common.h"
#include "Common/IniFile.h"
#include "Common/StringUtil.h"
@ -15,8 +13,10 @@
#include "Core/ConfigManager.h"
#include "Core/Host.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "Core/HW/WiimoteEmu/WiimoteHid.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "SFML/Network.hpp"
unsigned int g_wiimote_sources[MAX_BBMOTES];

View File

@ -20,13 +20,13 @@ in case of success they are
They will also generate a true or false return for UpdateInterrupts() in WII_IPC.cpp.
*/
#include <map>
#include <list>
#include <map>
#include <string>
#include "Common/Common.h"
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h" // For Copy
#include "Common/FileUtil.h"
#include "Common/Thread.h"
#include "Core/ConfigManager.h"

View File

@ -33,8 +33,6 @@
*/
// =============
#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
// need to include this before polarssl/aes.h,
// otherwise we may not get __STDC_FORMAT_MACROS
#include <cinttypes>
@ -47,12 +45,13 @@
#include "Common/StringUtil.h"
#include "Core/ConfigManager.h"
#include "Core/ec_wii.h"
#include "Core/Movie.h"
#include "Core/VolumeHandler.h"
#include "Core/Boot/Boot_DOL.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/ec_wii.h"
#include "Core/PowerPC/PowerPC.h"
#ifdef _WIN32
#include <Windows.h>

View File

@ -4,9 +4,8 @@
#pragma once
#include <list>
#include <libusb.h>
#include <list>
#include "Common/Thread.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h"

View File

@ -4,9 +4,9 @@
#pragma once
#include <polarssl/havege.h>
#include <polarssl/net.h>
#include <polarssl/ssl.h>
#include <polarssl/havege.h>
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"

View File

@ -5,8 +5,8 @@
#include "Common/Common.h"
#include "Common/SDCardUtil.h"
#include "Core/Core.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/CPU.h"
#include "Core/HW/Memmap.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h"

View File

@ -9,8 +9,8 @@
#include "Core/Movie.h"
#include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/HW/SystemTimers.h"
#include "Core/HW/Wiimote.h"
#include "Core/HW/WII_IPC.h"
#include "Core/HW/Wiimote.h"
#include "Core/IPC_HLE/WII_IPC_HLE.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"

View File

@ -9,12 +9,11 @@
#include "Core/Core.h"
#include "Core/Host.h"
#include "Core/HW/Wiimote.h"
#include "Core/IPC_HLE/l2cap.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
#include "Core/IPC_HLE/WiiMote_HID_Attr.h"
#include "Core/IPC_HLE/l2cap.h" // Local
static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = NULL;
CWII_IPC_HLE_Device_usb_oh1_57e_305* GetUsbPointer()

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "polarssl/md5.h"
#include <polarssl/md5.h>
#include "Common/FileUtil.h"
#include "Common/NandPaths.h"

View File

@ -4,13 +4,13 @@
#pragma once
#include <string>
#include "Common/ChunkFile.h"
#include "Common/Common.h"
#include "InputCommon/GCPadStatus.h"
#include <string>
namespace WiimoteEmu
{
struct ReportFeatures;

View File

@ -2,24 +2,20 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Movie.h"
#include "Core/NetPlayClient.h"
// for wiimote
#include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
// for gcpad
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/SI.h"
#include "Core/HW/SI_DeviceDanceMat.h"
#include "Core/HW/SI_DeviceGCController.h"
#include "Core/HW/SI_DeviceGCSteeringWheel.h"
// for gctime
#include "Core/HW/EXI_DeviceIPL.h"
// for wiimote/ OSD messages
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Movie.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
std::mutex crit_netplay_client;
static NetPlayClient * netplay_client = NULL;

View File

@ -15,10 +15,10 @@
// [OnLoad]
// 0x80020394=dword,0x4e800020
#include <algorithm>
#include <map>
#include <string>
#include <vector>
#include <map>
#include <algorithm>
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"

View File

@ -4,11 +4,10 @@
// Originally written by Sven Peter <sven@fail0verflow.com> for anergistic.
#include "Core/PowerPC/GDBStub.h"
#include <fcntl.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
#ifdef _WIN32
#include <ws2tcpip.h>
@ -19,9 +18,9 @@
#include <sys/socket.h>
#include <netinet/in.h>
#endif
#include <stdarg.h>
#include "Host.h"
#include "Core/Host.h"
#include "Core/PowerPC/GDBStub.h"
#define GDB_BFR_MAX 10000
#define GDB_MAX_BP 10

View File

@ -5,11 +5,10 @@
#include "Common/Common.h"
#include "Common/MathUtil.h"
#include "Core/PowerPC/JitInterface.h"
#include "Core/PowerPC/Interpreter/Interpreter.h"
#include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
#include "Core/PowerPC/JitInterface.h"
bool Interpreter::g_bReserve;
u32 Interpreter::g_reserveAddr;

View File

@ -15,9 +15,9 @@
#include "Core/HW/ProcessorInterface.h"
#include "Core/PowerPC/Profiler.h"
#include "Core/PowerPC/Jit64/Jit.h"
#include "Core/PowerPC/Jit64/Jit64_Tables.h"
#include "Core/PowerPC/Jit64/JitAsm.h"
#include "Core/PowerPC/Jit64/JitRegCache.h"
#include "Core/PowerPC/Jit64/Jit64_Tables.h"
#if defined(_DEBUG) || defined(DEBUGFAST)
#include "PowerPCDisasm.h"
#endif

View File

@ -32,10 +32,10 @@
#include "Core/PowerPC/PPCTables.h"
#include "Core/PowerPC/Jit64/JitAsm.h"
#include "Core/PowerPC/Jit64/JitRegCache.h"
#include "Core/PowerPC/JitCommon/Jit_Util.h"
#include "Core/PowerPC/JitCommon/JitBackpatch.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
#include "Core/PowerPC/JitCommon/JitCache.h"
#include "Core/PowerPC/JitCommon/Jit_Util.h"
class Jit64 : public Jitx86Base
{

View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include <cinttypes>
#include <ctime> // For profiling
#include <map>
#include <memory>
@ -11,8 +12,8 @@
#include "Core/HLE/HLE.h"
#include "Core/PowerPC/Profiler.h"
#include "Core/PowerPC/Jit64IL/JitIL.h"
#include "Core/PowerPC/Jit64IL/JitILAsm.h"
#include "Core/PowerPC/Jit64IL/JitIL_Tables.h"
#include "Core/PowerPC/Jit64IL/JitILAsm.h"
using namespace Gen;
using namespace PowerPC;
@ -130,10 +131,6 @@ ps_adds1
*/
// For profiling
#include <time.h>
#ifdef _WIN32
#include <windows.h>
#include <intrin.h>

View File

@ -23,18 +23,18 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/GPFifo.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCAnalyst.h"
#include "Core/PowerPC/PPCTables.h"
#include "Core/PowerPC/Jit64IL/JitILAsm.h"
#include "Core/PowerPC/JitCommon/Jit_Util.h"
#include "Core/PowerPC/JitCommon/JitBackpatch.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
#include "Core/PowerPC/JitCommon/JitCache.h"
#include "Core/PowerPC/JitCommon/Jit_Util.h"
#include "Core/PowerPC/JitILCommon/JitILBase.h"
#include "Core/PowerPC/JitILCommon/IR.h"
#include "Core/PowerPC/JitILCommon/JitILBase.h"
#ifdef _M_X64
#define DISABLE64 \

View File

@ -2,12 +2,12 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Core/PowerPC/Jit64IL/JitIL.h"
#include "Core/PowerPC/Jit64IL/JitILAsm.h"
#include "Common/CPUDetect.h"
#include "Common/MemoryUtil.h"
#include "Core/PowerPC/Jit64IL/JitIL.h"
#include "Core/PowerPC/Jit64IL/JitILAsm.h"
using namespace Gen;
//static int temp32; // unused?

View File

@ -4,20 +4,21 @@
#include <map>
#include "Common/Common.h"
#include "Common/ArmEmitter.h"
#include "Common/Common.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/PatchEngine.h"
#include "Core/HLE/HLE.h"
#include "Core/PowerPC/JitInterface.h"
#include "Core/PowerPC/PPCAnalyst.h"
#include "Core/PowerPC/PPCTables.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/Profiler.h"
#include "Core/HW/GPFifo.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/JitInterface.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCAnalyst.h"
#include "Core/PowerPC/PPCTables.h"
#include "Core/PowerPC/Profiler.h"
#include "Core/PowerPC/JitArm32/Jit.h"
#include "Core/PowerPC/JitArm32/JitArm_Tables.h"

View File

@ -11,12 +11,10 @@
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCTables.h"
#include "Core/PowerPC/JitArm32/JitArm_FPUtils.h"
#include "Core/PowerPC/JitArm32/Jit.h"
#include "Core/PowerPC/JitArm32/JitArm_FPUtils.h"
#include "Core/PowerPC/JitArm32/JitAsm.h"
#include "Core/PowerPC/JitArm32/JitFPRCache.h"
#include "Core/PowerPC/JitArm32/JitArm_FPUtils.h"
#include "Core/PowerPC/JitArm32/JitRegCache.h"
void JitArm::Helper_UpdateCR1(ARMReg fpscr, ARMReg temp)

View File

@ -4,8 +4,8 @@
#include <map>
#include "Common/Common.h"
#include "Common/ArmEmitter.h"
#include "Common/Common.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"

View File

@ -10,9 +10,9 @@
#include "Core/HW/GPFifo.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/JitCommon/JitCache.h"
#include "Core/PowerPC/JitArmIL/JitIL.h"
#include "Core/PowerPC/JitArmIL/JitILAsm.h"
#include "Core/PowerPC/JitCommon/JitCache.h"
JitArmILAsmRoutineManager armil_asm_routines;
void JitArmILAsmRoutineManager::Generate()

View File

@ -9,8 +9,8 @@
#include "Common/Common.h"
#include "Common/StringUtil.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
#include "Core/PowerPC/JitCommon/JitBackpatch.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
#ifdef _WIN32
#include <windows.h>

View File

@ -5,8 +5,8 @@
#pragma once
#include "Common/Common.h"
#include "Common/x64Emitter.h"
#include "Common/x64Analyzer.h"
#include "Common/x64Emitter.h"
// meh.
#if defined(_WIN32)

View File

@ -22,10 +22,10 @@
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCAnalyst.h"
#include "Core/PowerPC/PPCTables.h"
#include "Core/PowerPC/JitCommon/Jit_Util.h"
#include "Core/PowerPC/JitCommon/JitAsmCommon.h"
#include "Core/PowerPC/JitCommon/JitBackpatch.h" // for EmuCodeBlock
#include "Core/PowerPC/JitCommon/JitBackpatch.h"
#include "Core/PowerPC/JitCommon/JitCache.h"
#include "Core/PowerPC/JitCommon/Jit_Util.h" // for EmuCodeBlock
// Use these to control the instruction selection
// #define INSTRUCTION_START Default(inst); return;

View File

@ -5,8 +5,8 @@
#include "Common/Common.h"
#include "Common/CPUDetect.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
#include "Core/PowerPC/JitCommon/Jit_Util.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
using namespace Gen;

View File

@ -9,8 +9,12 @@
#include <windows.h>
#endif
#include "Core/PowerPC/JitCommon/JitBase.h"
#include "Core/ConfigManager.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/JitInterface.h"
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/Profiler.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
#ifndef _M_GENERIC
#include "Core/PowerPC/Jit64/Jit.h"
@ -26,11 +30,6 @@
#include "Core/PowerPC/JitArmIL/JitIL_Tables.h"
#endif
#include "Core/ConfigManager.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/Profiler.h"
#include "Core/PowerPC/PPCSymbolDB.h"
bool bFakeVMEM = false;
bool bMMU = false;

View File

@ -3,11 +3,11 @@
// Refer to the license.txt file included.
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PPCCache.h"
#include "Core/PowerPC/JitInterface.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCCache.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
#include "Core/PowerPC/JitCommon/JitCache.h"
#include "Core/PowerPC/JitInterface.h"
namespace PowerPC
{

View File

@ -9,8 +9,8 @@
#include "Common/Thread.h"
#include "Common/Timer.h"
#include "Core/Core.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/Movie.h"
#include "Core/State.h"

View File

@ -10,7 +10,7 @@
#include <cstdio>
#include <string.h>
#include "polarssl/sha1.h"
#include <polarssl/sha1.h>
#include "Common/FileUtil.h"
#include "Common/Crypto/tools.h"