piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replaced CPFifo by SCPFifoStruct: both were identical and there is no point in having two definitions.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@421 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne
2008-09-01 09:12:30 +00:00
parent 6638ed20a6
commit cad45aea72
3 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ int m_bboxright;
int m_bboxbottom; int m_bboxbottom;
u16 m_tokenReg; u16 m_tokenReg;
CPFifo fifo; //This one is shared between gfx thread and emulator thread SCPFifoStruct fifo; //This one is shared between gfx thread and emulator thread
void DoState(PointerWrap &p) void DoState(PointerWrap &p)
{ {

23
Source/Core/Core/Src/HW/CommandProcessor.h
View File

@ -19,6 +19,7 @@
#define _COMMANDPROCESSOR_H #define _COMMANDPROCESSOR_H
#include "Common.h" #include "Common.h"
#include "pluginspecs_video.h"
class PointerWrap; class PointerWrap;
#ifdef _WIN32 #ifdef _WIN32
@ -56,29 +57,9 @@ enum
FIFO_BP_LO = 0x3C, FIFO_BP_LO = 0x3C,
FIFO_BP_HI = 0x3E FIFO_BP_HI = 0x3E
}; };
struct CPFifo
{
// fifo registers
volatile u32 CPBase;
volatile u32 CPEnd;
u32 CPHiWatermark;
u32 CPLoWatermark;
volatile s32 CPReadWriteDistance;
volatile u32 CPWritePointer;
volatile u32 CPReadPointer;
volatile u32 CPBreakpoint;
volatile bool bFF_GPReadEnable; extern SCPFifoStruct fifo;
volatile bool bFF_BPEnable;
volatile bool bFF_GPLinkEnable;
volatile bool bFF_Breakpoint;
volatile bool bPauseRead;
#ifdef _WIN32
CRITICAL_SECTION sync;
#endif
};
extern CPFifo fifo;
// Init // Init
void Init(); void Init();
void Shutdown(); void Shutdown();

2
Source/PluginSpecs/pluginspecs_video.h
View File

@ -27,7 +27,7 @@ typedef struct
volatile DWORD CPEnd; volatile DWORD CPEnd;
DWORD CPHiWatermark; DWORD CPHiWatermark;
DWORD CPLoWatermark; DWORD CPLoWatermark;
volatile INT CPReadWriteDistance; volatile s32 CPReadWriteDistance;
volatile DWORD CPWritePointer; volatile DWORD CPWritePointer;
volatile DWORD CPReadPointer; volatile DWORD CPReadPointer;
volatile DWORD CPBreakpoint; volatile DWORD CPBreakpoint;