sio;

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82898 e17a0e51-4ae3-4d35-97c3-1a29b211df97

8 files changed, 12 insertions, 15 deletions

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index e338417a..db12b197 100755
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -250,8 +250,6 @@ static void adjustTransferIndex(void)
 // FIXME: do this in SPU instead
 void cdrDecodedBufferInterrupt()
 {
-	u16 buf_ptr[0x400], lcv;
-
 #if 0
 	return;
 #endif
@@ -267,12 +265,10 @@ void cdrDecodedBufferInterrupt()
 	if( (SPU_readRegister( H_SPUirqAddr ) * 8) >= 0x800 ) return;
 
 
-
 	// turn off plugin SPU IRQ decoded buffer handling
 	SPU_registerCallback( 0 );
 
 
-
 	/*
 	Vib Ribbon
 
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 30073a28..f311d1c5 100755
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -641,7 +641,7 @@ int SendPcsxInfo() {
 		return 0;
 
 	NET_sendData(&Config.Xa, sizeof(Config.Xa), PSE_NET_BLOCKING);
-	NET_sendData(&Config.Sio, sizeof(Config.Sio), PSE_NET_BLOCKING);
+	NET_sendData(&Config.SioIrq, sizeof(Config.SioIrq), PSE_NET_BLOCKING);
 	NET_sendData(&Config.SpuIrq, sizeof(Config.SpuIrq), PSE_NET_BLOCKING);
 	NET_sendData(&Config.RCntFix, sizeof(Config.RCntFix), PSE_NET_BLOCKING);
 	NET_sendData(&Config.PsxType, sizeof(Config.PsxType), PSE_NET_BLOCKING);
@@ -657,7 +657,7 @@ int RecvPcsxInfo() {
 		return 0;
 
 	NET_recvData(&Config.Xa, sizeof(Config.Xa), PSE_NET_BLOCKING);
-	NET_recvData(&Config.Sio, sizeof(Config.Sio), PSE_NET_BLOCKING);
+	NET_recvData(&Config.SioIrq, sizeof(Config.SioIrq), PSE_NET_BLOCKING);
 	NET_recvData(&Config.SpuIrq, sizeof(Config.SpuIrq), PSE_NET_BLOCKING);
 	NET_recvData(&Config.RCntFix, sizeof(Config.RCntFix), PSE_NET_BLOCKING);
 	NET_recvData(&Config.PsxType, sizeof(Config.PsxType), PSE_NET_BLOCKING);
diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index 5d6aa9d2..27b92822 100755
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -26,8 +26,6 @@ extern "C" {
 
 #include "psxcommon.h"
 
-//#define ENABLE_SIO1API 1
-
 #ifndef _WIN32
 
 typedef void* HWND;
diff --git a/libpcsxcore/psemu_plugin_defs.h b/libpcsxcore/psemu_plugin_defs.h
index d1b05ac3..27642157 100755
--- a/libpcsxcore/psemu_plugin_defs.h
+++ b/libpcsxcore/psemu_plugin_defs.h
@@ -16,6 +16,7 @@ extern "C" {
 #define PSE_LT_SPU					4
 #define PSE_LT_PAD					8
 #define PSE_LT_NET					16
+#define PSE_LT_SIO1					32
 
 // DLL function return codes
 #define PSE_ERR_SUCCESS				0	// every function in DLL if completed sucessfully should return this value
diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index 1a825417..a725547d 100755
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -129,7 +129,9 @@ typedef struct {
 	char Pad1[MAXPATHLEN];
 	char Pad2[MAXPATHLEN];
 	char Net[MAXPATHLEN];
+#ifdef ENABLE_SIO1API
 	char Sio1[MAXPATHLEN];
+#endif
 	char Mcd1[MAXPATHLEN];
 	char Mcd2[MAXPATHLEN];
 	char Bios[MAXPATHLEN];
@@ -138,7 +140,7 @@ typedef struct {
 	char PatchesDir[MAXPATHLEN];
 	char IsoImgDir[MAXPATHLEN];
 	boolean Xa;
-	boolean Sio;
+	boolean SioIrq;
 	boolean Mdec;
 	boolean PsxAuto;
 	boolean Cdda;
diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c
index 53df663d..06f00d03 100755
--- a/libpcsxcore/psxhw.c
+++ b/libpcsxcore/psxhw.c
@@ -27,7 +27,7 @@
 #include "gpu.h"
 
 void psxHwReset() {
-	if (Config.Sio) psxHu32ref(0x1070) |= SWAP32(0x80);
+	if (Config.SioIrq) psxHu32ref(0x1070) |= SWAP32(0x80);
 	if (Config.SpuIrq) psxHu32ref(0x1070) |= SWAP32(0x200);
 
 	memset(psxH, 0, 0x10000);
@@ -422,7 +422,7 @@ void psxHwWrite16(u32 add, u16 value) {
 #ifdef PSXHW_LOG
 			PSXHW_LOG("IREG 16bit write %x\n", value);
 #endif
-			if (Config.Sio) psxHu16ref(0x1070) |= SWAPu16(0x80);
+			if (Config.SioIrq) psxHu16ref(0x1070) |= SWAPu16(0x80);
 			if (Config.SpuIrq) psxHu16ref(0x1070) |= SWAPu16(0x200);
 			psxHu16ref(0x1070) &= SWAPu16(value);
 			return;
@@ -537,7 +537,7 @@ void psxHwWrite32(u32 add, u32 value) {
 #ifdef PSXHW_LOG
 			PSXHW_LOG("IREG 32bit write %x\n", value);
 #endif
-			if (Config.Sio) psxHu32ref(0x1070) |= SWAPu32(0x80);
+			if (Config.SioIrq) psxHu32ref(0x1070) |= SWAPu32(0x80);
 			if (Config.SpuIrq) psxHu32ref(0x1070) |= SWAPu32(0x200);
 			psxHu32ref(0x1070) &= SWAPu32(value);
 			return;
diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 957908d1..4d014b72 100755
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -150,7 +150,7 @@ void psxBranchTest() {
 		psxRcntUpdate();
 
 	if (psxRegs.interrupt) {
-		if ((psxRegs.interrupt & (1 << PSXINT_SIO)) && !Config.Sio) { // sio
+		if ((psxRegs.interrupt & (1 << PSXINT_SIO)) && !Config.SioIrq) { // sio
 			if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SIO].sCycle) >= psxRegs.intCycle[PSXINT_SIO].cycle) {
 				psxRegs.interrupt &= ~(1 << PSXINT_SIO);
 				sioInterrupt();
diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c
index ace3e94d..df9479a3 100755
--- a/libpcsxcore/sio.c
+++ b/libpcsxcore/sio.c
@@ -85,7 +85,7 @@ static int DongleInit;
 #if 0
 // Breaks Twisted Metal 2 intro
 #define SIO_INT(eCycle) { \
-	if (!Config.Sio) { \
+	if (!Config.SioIrq) { \
 		psxRegs.interrupt |= (1 << PSXINT_SIO); \
 		psxRegs.intCycle[PSXINT_SIO].cycle = eCycle; \
 		psxRegs.intCycle[PSXINT_SIO].sCycle = psxRegs.cycle; \
@@ -97,7 +97,7 @@ static int DongleInit;
 #endif
 
 #define SIO_INT(eCycle) { \
-	if (!Config.Sio) { \
+	if (!Config.SioIrq) { \
 		psxRegs.interrupt |= (1 << PSXINT_SIO); \
 		psxRegs.intCycle[PSXINT_SIO].cycle = eCycle; \
 		psxRegs.intCycle[PSXINT_SIO].sCycle = psxRegs.cycle; \