From cad45aea724b8addacce18e99eec8bc4a170cbb2 Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Mon, 1 Sep 2008 09:12:30 +0000
Subject: [PATCH] Replaced CPFifo by SCPFifoStruct: both were identical and
 there is no point in having two definitions.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@421 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/HW/CommandProcessor.cpp |  2 +-
 Source/Core/Core/Src/HW/CommandProcessor.h   | 23 ++------------------
 Source/PluginSpecs/pluginspecs_video.h       |  2 +-
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/Source/Core/Core/Src/HW/CommandProcessor.cpp b/Source/Core/Core/Src/HW/CommandProcessor.cpp
index 954e9f90c5..727af87295 100644
--- a/Source/Core/Core/Src/HW/CommandProcessor.cpp
+++ b/Source/Core/Core/Src/HW/CommandProcessor.cpp
@@ -103,7 +103,7 @@ int m_bboxright;
 int m_bboxbottom;
 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)
 {
diff --git a/Source/Core/Core/Src/HW/CommandProcessor.h b/Source/Core/Core/Src/HW/CommandProcessor.h
index 6dfa84358f..79d27fb39b 100644
--- a/Source/Core/Core/Src/HW/CommandProcessor.h
+++ b/Source/Core/Core/Src/HW/CommandProcessor.h
@@ -19,6 +19,7 @@
 #define _COMMANDPROCESSOR_H
 
 #include "Common.h"
+#include "pluginspecs_video.h"
 class PointerWrap;
 
 #ifdef _WIN32
@@ -56,29 +57,9 @@ enum
 	FIFO_BP_LO					= 0x3C,
 	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;
-	volatile bool bFF_BPEnable;
-	volatile bool bFF_GPLinkEnable;
-	volatile bool bFF_Breakpoint;
-	volatile bool bPauseRead;
-#ifdef _WIN32
-	CRITICAL_SECTION sync;
-#endif
-};
+extern SCPFifoStruct fifo;
 
-extern CPFifo fifo;
 // Init
 void Init();
 void Shutdown();
diff --git a/Source/PluginSpecs/pluginspecs_video.h b/Source/PluginSpecs/pluginspecs_video.h
index 42fea210ff..cd1927f3e0 100644
--- a/Source/PluginSpecs/pluginspecs_video.h
+++ b/Source/PluginSpecs/pluginspecs_video.h
@@ -27,7 +27,7 @@ typedef struct
 	volatile DWORD CPEnd;
 	DWORD CPHiWatermark;
 	DWORD CPLoWatermark;
-	volatile INT CPReadWriteDistance;
+	volatile s32 CPReadWriteDistance;
 	volatile DWORD CPWritePointer;
 	volatile DWORD CPReadPointer;
 	volatile DWORD CPBreakpoint;