Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cut down on h files including PointerWrap.

Browse Source 
This makes changes to it a bit faster to build.
This commit is contained in:
Unknown W. Brackets 2013-02-03 20:31:46 -08:00
parent edb9cf5c71
commit 2a6457b6ab
47 changed files with 84 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Common/FixedSizeQueue.h
View File

@ -19,6 +19,7 @@
#define _FIXED_SIZE_QUEUE_H_
#include <cstring>
#include "ChunkFile.h"
// STL-look-a-like interface, but name is mixed case to distinguish it clearly from the
// real STL classes.

3
Core/CoreTiming.h
View File

@ -32,10 +32,11 @@
// ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever")
#include "../Globals.h"
#include "../Common/ChunkFile.h"
#include <string>
class PointerWrap;
//const int CPU_HZ = 222000000;
extern int CPU_HZ;

1
Core/Dialog/PSPDialog.cpp
View File

@ -17,6 +17,7 @@
#include "../Util/PPGeDraw.h"
#include "PSPDialog.h"
#include "ChunkFile.h"
#define FADE_TIME 0.5

5
Core/Dialog/PSPDialog.h
View File

@ -17,9 +17,10 @@
#pragma once
#include "../Globals.h"
#include "../Config.h"
#include "../../Common/ChunkFile.h"
class PointerWrap;
#define SCE_UTILITY_DIALOG_RESULT_SUCCESS 0
#define SCE_UTILITY_DIALOG_RESULT_CANCEL 1

1
Core/Dialog/PSPMsgDialog.cpp
View File

@ -19,6 +19,7 @@
#include "../Util/PPGeDraw.h"
#include "../HLE/sceCtrl.h"
#include "../Core/MemMap.h"
#include "ChunkFile.h"
PSPMsgDialog::PSPMsgDialog()
: PSPDialog()

1
Core/Dialog/PSPOskDialog.cpp
View File

@ -18,6 +18,7 @@
#include "PSPOskDialog.h"
#include "../Util/PPGeDraw.h"
#include "../HLE/sceCtrl.h"
#include "ChunkFile.h"
#define NUMKEYROWS 4
#define KEYSPERROW 12

2
Core/FileSystems/FileSystem.h
View File

@ -18,7 +18,7 @@
#pragma once
#include "../../Globals.h"
#include "../../Common/ChunkFile.h"
#include "ChunkFile.h"
#include <string>
enum FileAccess

1
Core/HLE/__sceAudio.cpp
View File

@ -25,6 +25,7 @@
#include "../MemMap.h"
#include "../Host.h"
#include "../Config.h"
#include "ChunkFile.h"
#include "FixedSizeQueue.h"
#include "Common/Thread.h"

1
Core/HLE/sceAtrac.cpp
View File

@ -22,6 +22,7 @@
#include "HLE.h"
#include "../MIPS/MIPS.h"
#include "../CoreTiming.h"
#include "ChunkFile.h"
#include "sceKernel.h"
#include "sceUtility.h"

2
Core/HLE/sceAtrac.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "../Common/ChunkFile.h"
class PointerWrap;
void Register_sceAtrac3plus();
void __AtracInit();

15
Core/HLE/sceAudio.cpp
View File

@ -17,12 +17,25 @@
#include "../MIPS/MIPS.h"
#include "../Host.h"
#include "../../Core/CoreTiming.h"
#include "Core/CoreTiming.h"
#include "ChunkFile.h"
#include "sceAudio.h"
#include "__sceAudio.h"
#include "HLE.h"
void AudioChannel::DoState(PointerWrap &p)
{
p.Do(reserved);
p.Do(sampleAddress);
p.Do(sampleCount);
p.Do(leftVolume);
p.Do(rightVolume);
p.Do(format);
p.Do(waitingThread);
sampleQueue.DoState(p);
p.DoMarker("AudioChannel");
}
// There's a second Audio api called Audio2 that only has one channel, I guess the 8 channel api was overkill.
// We simply map it to the first of the 8 channels.

14
Core/HLE/sceAudio.h
View File

@ -23,6 +23,8 @@
#include "sceKernel.h"
#include "FixedSizeQueue.h"
class PointerWrap;
enum PspAudioFormats { PSP_AUDIO_FORMAT_STEREO = 0, PSP_AUDIO_FORMAT_MONO = 0x10 };
enum PspAudioFrequencies { PSP_AUDIO_FREQ_44K = 44100, PSP_AUDIO_FREQ_48K = 48000 };
@ -63,17 +65,7 @@ struct AudioChannel
// Might try something more efficient later.
FixedSizeQueue<s16, 32768 * 8> sampleQueue;
void DoState(PointerWrap &p) {
p.Do(reserved);
p.Do(sampleAddress);
p.Do(sampleCount);
p.Do(leftVolume);
p.Do(rightVolume);
p.Do(format);
p.Do(waitingThread);
sampleQueue.DoState(p);
p.DoMarker("AudioChannel");
}
void DoState(PointerWrap &p);
void clear() {
reserved = false;

1
Core/HLE/sceCtrl.cpp
View File

@ -18,6 +18,7 @@
#include "HLE.h"
#include "../MIPS/MIPS.h"
#include "../CoreTiming.h"
#include "ChunkFile.h"
#include "StdMutex.h"
#include "sceCtrl.h"
#include "sceDisplay.h"

2
Core/HLE/sceCtrl.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "../../Common/ChunkFile.h"
class PointerWrap;
void Register_sceCtrl();

3
Core/HLE/sceFont.cpp
View File

@ -4,8 +4,7 @@
#include "HLE.h"
#include "../MIPS/MIPS.h"
#include "sceFont.h"
#include "ChunkFile.h"
typedef u32 FontLibraryHandle;

2
Core/HLE/sceFont.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "../../Common/ChunkFile.h"
class PointerWrap;
void Register_sceFont();

1
Core/HLE/sceImpose.cpp
View File

@ -18,6 +18,7 @@
#include "HLE.h"
#include "FunctionWrappers.h"
#include "../MIPS/MIPS.h"
#include "ChunkFile.h"
const int PSP_LANGUAGE_JAPANESE = 0;

2
Core/HLE/sceImpose.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "../../Common/ChunkFile.h"
class PointerWrap;
void Register_sceImpose();
void __ImposeInit();

4
Core/HLE/sceKernel.h
View File

@ -18,8 +18,10 @@
#pragma once
#include "../../Globals.h"
#include "../../Common/ChunkFile.h"
#include <cstring>
#include <map>
class PointerWrap;
enum
{

3
Core/HLE/sceKernelEventFlag.cpp
View File

@ -19,7 +19,8 @@
#include "HLE.h"
#include "../MIPS/MIPS.h"
#include "../../Core/CoreTiming.h"
#include "Core/CoreTiming.h"
#include "ChunkFile.h"
#include "sceKernel.h"
#include "sceKernelThread.h"

3
Core/HLE/sceKernelMbx.cpp
View File

@ -19,7 +19,8 @@
#include "sceKernelThread.h"
#include "sceKernelMbx.h"
#include "HLE.h"
#include "../../Core/CoreTiming.h"
#include "Core/CoreTiming.h"
#include "ChunkFile.h"
#define SCE_KERNEL_MBA_THPRI 0x100
#define SCE_KERNEL_MBA_MSPRI 0x400

1
Core/HLE/sceKernelMsgPipe.cpp
View File

@ -19,6 +19,7 @@
#include "sceKernel.h"
#include "sceKernelMsgPipe.h"
#include "sceKernelThread.h"
#include "ChunkFile.h"
#define SCE_KERNEL_MPA_THFIFO_S 0x0000
#define SCE_KERNEL_MPA_THPRI_S 0x0100

3
Core/HLE/sceKernelMutex.cpp
View File

@ -19,7 +19,8 @@
#include <map>
#include "HLE.h"
#include "../MIPS/MIPS.h"
#include "../../Core/CoreTiming.h"
#include "Core/CoreTiming.h"
#include "ChunkFile.h"
#include "sceKernel.h"
#include "sceKernelMutex.h"
#include "sceKernelThread.h"

3
Core/HLE/sceKernelSemaphore.cpp
View File

@ -18,7 +18,8 @@
#include <algorithm>
#include "HLE.h"
#include "../MIPS/MIPS.h"
#include "../../Core/CoreTiming.h"
#include "Core/CoreTiming.h"
#include "ChunkFile.h"
#include "sceKernel.h"
#include "sceKernelThread.h"
#include "sceKernelSemaphore.h"

1
Core/HLE/sceKernelTime.cpp
View File

@ -29,6 +29,7 @@
#include "sceKernelTime.h"
#include "../CoreTiming.h"
#include "ChunkFile.h"
//////////////////////////////////////////////////////////////////////////
// State

1
Core/HLE/sceKernelVTimer.cpp
View File

@ -19,6 +19,7 @@
#include "sceKernelThread.h"
#include "sceKernelVTimer.h"
#include "HLE.h"
#include "ChunkFile.h"
// Using ERROR_LOG liberally when this is in development. When done,
// should be changed to DEBUG_LOG wherever applicable.

3
Core/HLE/sceMpeg.h
View File

@ -18,9 +18,10 @@
#pragma once
#include "../../Globals.h"
#include "../../Common/ChunkFile.h"
#include "../MIPS/MIPS.h"
class PointerWrap;
enum {
ERROR_MPEG_BAD_VERSION = 0x80610002,
ERROR_MPEG_NO_MEMORY = 0x80610022,

1
Core/HLE/scePower.cpp
View File

@ -18,6 +18,7 @@
#include "HLE.h"
#include "../MIPS/MIPS.h"
#include "../CoreTiming.h"
#include "ChunkFile.h"
#include "scePower.h"
#include "sceKernelThread.h"

2
Core/HLE/scePower.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "../../Common/ChunkFile.h"
class PointerWrap;
void __PowerInit();
void __PowerDoState(PointerWrap &p);

1
Core/HLE/scePsmf.cpp
View File

@ -16,6 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "HLE.h"
#include "ChunkFile.h"
#include "scePsmf.h"
#include "sceMpeg.h"

1
Core/HLE/sceSsl.cpp
View File

@ -16,6 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "HLE.h"
#include "ChunkFile.h"
#include "sceSsl.h"

2
Core/HLE/sceSsl.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "../../Common/ChunkFile.h"
class PointerWrap;
void Register_sceSsl();

3
Core/HLE/sceUmd.cpp
View File

@ -17,7 +17,8 @@
#include "HLE.h"
#include "../MIPS/MIPS.h"
#include "../../Core/CoreTiming.h"
#include "Core/CoreTiming.h"
#include "ChunkFile.h"
#include "sceUmd.h"
#include "sceKernelThread.h"

3
Core/HLE/sceUsb.cpp
View File

@ -17,7 +17,8 @@
#include "HLE.h"
#include "../MIPS/MIPS.h"
#include "../../Core/CoreTiming.h"
#include "Core/CoreTiming.h"
#include "ChunkFile.h"
#include "sceUsb.h"
bool usbActivated = false;

2
Core/HLE/sceUtility.h
View File

@ -17,7 +17,7 @@
#pragma once
#include "../../Common/ChunkFile.h"
class PointerWrap;
/**
* Valid values for PSP_SYSTEMPARAM_ID_INT_LANGUAGE

1
Core/HW/MediaEngine.h
View File

@ -27,6 +27,7 @@
#include "../../Globals.h"
#include "../HLE/sceMpeg.h"
#include "ChunkFile.h"
class MediaEngine
{

1
Core/HW/MemoryStick.cpp
View File

@ -1,4 +1,5 @@
#include "MemoryStick.h"
#include "ChunkFile.h"
// MS and FatMS states.
static MemStickState memStickState = PSP_MEMORYSTICK_STATE_DRIVER_READY;

3
Core/HW/MemoryStick.h
View File

@ -1,5 +1,6 @@
#include "../../Globals.h"
#include "../../Common/ChunkFile.h"
class PointerWrap;
// mscmhc0 states
enum MemStickState {

2
Core/HW/SasAudio.h
View File

@ -23,7 +23,7 @@
#pragma once
#include "../Globals.h"
#include "../../Common/ChunkFile.h"
#include "ChunkFile.h"
enum {
PSP_SAS_VOICES_MAX = 32,

7
Core/MIPS/MIPS.cpp
View File

@ -98,6 +98,13 @@ void MIPSState::Reset()
rng.Init(0x1337);
}
void GMRng::DoState(PointerWrap &p)
{
p.Do(m_w);
p.Do(m_z);
p.DoMarker("GMRng");
}
void MIPSState::DoState(PointerWrap &p)
{
// Reset the jit if we're loading.

7
Core/MIPS/MIPS.h
View File

@ -18,7 +18,6 @@
#pragma once
#include "../../Globals.h"
#include "../../Common/ChunkFile.h"
#include "../CPU.h"
enum
@ -93,11 +92,7 @@ public:
return (m_z << 16) + m_w;
}
void DoState(PointerWrap &p) {
p.Do(m_w);
p.Do(m_z);
p.DoMarker("GMRng");
}
void DoState(PointerWrap &p);
private:
u32 m_w;

3
Core/SaveState.h
View File

@ -15,9 +15,10 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "../Common/ChunkFile.h"
#include <string>
class PointerWrap;
namespace SaveState
{
typedef void (*Callback)(bool status, void *cbUserData);

1
Core/Util/BlockAllocator.cpp
View File

@ -1,5 +1,6 @@
#include "Log.h"
#include "BlockAllocator.h"
#include "ChunkFile.h"
// Slow freaking thing but works (eventually) :)

2
Core/Util/BlockAllocator.h
View File

@ -2,12 +2,12 @@
#pragma once
#include "../../Globals.h"
#include "../../Common/ChunkFile.h"
#include <vector>
#include <list>
#include <cstring>
class PointerWrap;
// Generic allocator thingy
// Allocates blocks from a range

3
Core/Util/PPGeDraw.h
View File

@ -18,9 +18,10 @@
#pragma once
#include "../../Globals.h"
#include "../../Common/ChunkFile.h"
#include "ppge_atlas.h"
class PointerWrap;
/////////////////////////////////////////////////////////////////////////////////////////////
// PPGeDraw: Super simple internal drawing API for 2D overlays like sceUtility messageboxes
// etc. Goes through the Ge emulation so that it's 100% portable - will work

2
GPU/GPUCommon.cpp
View File

@ -3,7 +3,7 @@
#include "GeDisasm.h"
#include "GPUCommon.h"
#include "GPUState.h"
#include "ChunkFile.h"
static int dlIdGenerator = 1;

3
GPU/GPUInterface.h
View File

@ -18,9 +18,10 @@
#pragma once
#include "../Globals.h"
#include "../Common/ChunkFile.h"
#include <deque>
class PointerWrap;
enum DisplayListStatus
{
PSP_GE_LIST_DONE = 0, // reached finish+end