Some header cleanup.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2193 96395faa-99c1-11dd-bbfe-3dabce05a288

pcsx2/GS.h

@@ -212,22 +212,6 @@ extern u16  gsRead16(u32 mem);
 extern u32  gsRead32(u32 mem);
 extern u64  gsRead64(u32 mem);
 
-
-//extern void gsWrite64(u32 mem, u64 value);
-
-
-void gsConstWrite8(u32 mem, int mmreg);
-void gsConstWrite16(u32 mem, int mmreg);
-void gsConstWrite32(u32 mem, int mmreg);
-void gsConstWrite64(u32 mem, int mmreg);
-void gsConstWrite128(u32 mem, int mmreg);
-
-int gsConstRead8(u32 x86reg, u32 mem, u32 sign);
-int gsConstRead16(u32 x86reg, u32 mem, u32 sign);
-int gsConstRead32(u32 x86reg, u32 mem);
-void gsConstRead64(u32 mem, int mmreg);
-void gsConstRead128(u32 mem, int xmmreg);
-
 void gsIrq();
 
 extern u32 CSRw;
@@ -249,7 +233,3 @@ extern int g_nLeftGSFrames;
 
 #endif
 
-extern void SaveGSState(const wxString& file);
-extern void LoadGSState(const wxString& file);
-extern void RunGSState( memLoadingState& f );
-

pcsx2/GSState.cpp

@@ -68,7 +68,7 @@ __forceinline void GSVSYNC(void) {
 }
 #endif
 
-void SaveGSState(const wxString& file)
+/*void SaveGSState(const wxString& file)
 {
 	if( g_SaveGSStream ) return;
 
@@ -92,8 +92,8 @@ void LoadGSState(const wxString& file)
 
 	wxString src( file );
 
-	/*if( !wxFileName::FileExists( src ) )
+	//if( !wxFileName::FileExists( src ) )
-		src = Path::Combine( g_Conf->Folders.Savestates, src );*/
+	//	src = Path::Combine( g_Conf->Folders.Savestates, src );
 		
 	if( !wxFileName::FileExists( src ) )
 		return;
@@ -189,7 +189,7 @@ void RunGSState( memLoadingState& f )
 		if( it == packets.end() )
 			it = packets.begin();
 	}
-}
+}*/
 #endif
 
 //////////////////////////////////////////////////////////////////////////////////////////

pcsx2/Hw.cpp

@@ -49,10 +49,10 @@ void hwInit()
 	ipuInit();
 }
 
-void hwShutdown() 
+/*void hwShutdown() 
 {
 	ipuShutdown();
-}
+}*/
 
 void hwReset()
 {

pcsx2/Hw.h

@@ -292,9 +292,6 @@ enum GSRegisterAddresses
 	GS_SIGLBLID		=	0x12001080
 };
 
-//#define SBFLG_IOPALIVE 0x10000
-//#define SBFLG_IOPSYNC 0x40000
-
 enum INTCIrqs
 {
 	INTC_GS = 0,
@@ -560,9 +557,7 @@ static __forceinline u32 *_dmaGetAddr(DMACh *dma, u32 addr, u32 num)
 	return ptr;
 }
 
-void hwInit();
 void hwReset();
-void hwShutdown();
 
 // hw read functions
 extern mem8_t   hwRead8 (u32 mem);
@@ -611,23 +606,10 @@ extern void __fastcall hwWrite128_generic(u32 mem, const mem128_t *srcval);
 void hwIntcIrq(int n);
 void hwDmacIrq(int n);
 
-//bool hwMFIFORead(u32 addr, u8 *data, u32 size);
+bool hwMFIFOWrite(u32 addr, u8 *data, u32 size);
-bool  hwMFIFOWrite(u32 addr, u8 *data, u32 size);
 
-bool  hwDmacSrcChainWithStack(DMACh *dma, int id);
+bool hwDmacSrcChainWithStack(DMACh *dma, int id);
-bool  hwDmacSrcChain(DMACh *dma, int id);
+bool hwDmacSrcChain(DMACh *dma, int id);
-
-int hwConstRead8 (u32 x86reg, u32 mem, u32 sign);
-int hwConstRead16(u32 x86reg, u32 mem, u32 sign);
-int hwConstRead32(u32 x86reg, u32 mem);
-void hwConstRead64(u32 mem, int mmreg);
-void hwConstRead128(u32 mem, int xmmreg);
-
-void hwConstWrite8 (u32 mem, int mmreg);
-void hwConstWrite16(u32 mem, int mmreg);
-void hwConstWrite32(u32 mem, int mmreg);
-void hwConstWrite64(u32 mem, int mmreg);
-void hwConstWrite128(u32 mem, int xmmreg);
 
 extern void  intcInterrupt();
 extern void  dmacInterrupt();

pcsx2/IPU/IPU.cpp

@@ -66,7 +66,6 @@ static coroutine_t s_routine; // used for executing BDEC/IDEC
 static int s_RoutineDone = 0;
 static u32 s_tempstack[0x4000]; // 64k
 
-void IPUCMD_WRITE(u32 val);
 void IPUWorker();
 int IPU0dma();
 int IPU1dma();
@@ -82,13 +81,13 @@ static u8 iq[64];			//intraquant matrix
 u16 vqclut[16];				//clut conversion table
 static u8 s_thresh[2];		//thresholds for color conversions
 int coded_block_pattern = 0;
-__aligned16 macroblock_8  mb8;
+__aligned16 macroblock_8 mb8;
 __aligned16 macroblock_16 mb16;
 __aligned16 macroblock_rgb32 rgb32;
 __aligned16 macroblock_rgb16 rgb16;
 
 u8 indx4[16*16/2];
-bool	mpeg2_inited = FALSE;		//mpeg2_idct_init() must be called only once
+bool mpeg2_inited = false;		//mpeg2_idct_init() must be called only once
 u8 PCT[] = {'r', 'I', 'P', 'B', 'D', '-', '-', '-'};
 decoder_t g_decoder;						//static, only to place it in bss
 decoder_t tempdec;
@@ -102,8 +101,6 @@ extern "C"
 __aligned16 u8 _readbits[80];	//local buffer (ring buffer)
 u8* readbits = _readbits; // always can decrement by one 1qw
 
-//#define SATURATE_4BITS(val) ((val)>15 ? 15 : (val))
-
 __forceinline void IPUProcessInterrupt()
 {
 	if (ipuRegs->ctrl.BUSY) IPUWorker();
@@ -134,7 +131,7 @@ __forceinline void mpeg2_init()
 		memzero(mb16.Y);
 		memzero(mb16.Cb);
 		memzero(mb16.Cr);
-		mpeg2_inited = TRUE;
+		mpeg2_inited = true;
 	}
 }
 

pcsx2/Memory.h

@@ -123,7 +123,7 @@ extern void memAlloc();
 extern void memReset();		// clears PS2 ram and loads the bios.  Throws Exception::FileNotFound on error.
 extern void memShutdown();
 extern void memSetKernelMode();
-extern void memSetSupervisorMode();
+//extern void memSetSupervisorMode();
 extern void memSetUserMode();
 extern void memSetPageAddr(u32 vaddr, u32 paddr);
 extern void memClearPageAddr(u32 vaddr);

pcsx2/R3000A.h

@@ -195,7 +195,6 @@ extern R3000Acpu psxInt;
 extern R3000Acpu psxRec;
 
 extern void psxReset();
-extern void psxShutdown();
 extern void __fastcall psxException(u32 code, u32 step);
 extern void psxBranchTest();
 extern void psxMemReset();

pcsx2/VU.h

@@ -78,7 +78,7 @@ struct REG_VI {
 					// VU0 mem, with only lower 16 bits valid, and the upper 112bits are hardwired to 0 (cottonvibes)
 };
 
-#define VUFLAG_BREAKONMFLAG		0x00000001
+//#define VUFLAG_BREAKONMFLAG		0x00000001
 #define VUFLAG_MFLAGSET			0x00000002
 
 struct fdivPipe {
@@ -164,9 +164,6 @@ enum VUPipeState
     VUPIPE_XGKICK
 };
 
-#define VUREG_READ		0x1
-#define VUREG_WRITE		0x2
-
 struct _VURegsNum {
 	u8 pipe; // if 0xff, COP2
 	u8 VFwrite;