sio1;

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

4 files changed, 62 insertions, 20 deletions

diff --git a/Makefile.am b/Makefile.am
index 043e2461..6130c9ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,14 @@
-SUBDIRS = data doc po libpcsxcore gui pixmaps
-SUBDIRS += plugins/dfinput plugins/dfsound
-SUBDIRS += plugins/dfxvideo plugins/dfcdrom plugins/dfnet
-
+SUBDIRS =  data     
+SUBDIRS += doc
+SUBDIRS += pixmaps
+SUBDIRS += po
+SUBDIRS += libpcsxcore
+SUBDIRS += gui
+SUBDIRS += plugins/dfinput
+SUBDIRS += plugins/dfsound
+SUBDIRS += plugins/dfxvideo 
+SUBDIRS += plugins/dfcdrom
+SUBDIRS += plugins/dfnet
 SUBDIRS += plugins/bladesio1
 
 SUBDIRS += $(PEOPSXGL)
diff --git a/configure.ac b/configure.ac
index c28c195c..887910b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ plugins/dfsound/Makefile
 plugins/dfxvideo/Makefile
 plugins/dfcdrom/Makefile
 plugins/dfnet/Makefile
-plugins/bladesio1/Makefile
 pixmaps/Makefile
 po/Makefile.in])
 
@@ -143,6 +142,18 @@ if test "$BUILD_OPENGL" = "yes"; then
 	AC_CONFIG_FILES([plugins/peopsxgl/Makefile])
 fi
 
+AC_ARG_ENABLE(sio1, [  --enable-sio1         build SIO1 plugin (default=no)],
+[ BUILD_SIO1="$enableval" ],[ BUILD_SIO1="no" ])
+
+BLADESIO1=""
+
+if test "$BUILD_SIO1" = "yes"; then
+	AC_DEFINE([ENABLE_SIO1API], [1], [Define if we want use sio interface.])
+	PEOPSXGL="plugins/bladesio1"
+	AC_SUBST(BLADESIO1)
+	AC_CONFIG_FILES([plugins/bladesio1/Makefile])
+fi
+
 AM_CONDITIONAL(X86_NASM, false)
 
 if expr x"$build_cpu" : 'xi.86' > /dev/null; then
diff --git a/libpcsxcore/debug.h b/libpcsxcore/debug.h
index 2c0045c2..ba89e3d5 100755
--- a/libpcsxcore/debug.h
+++ b/libpcsxcore/debug.h
@@ -63,8 +63,8 @@ char* disR3000AF(u32 code, u32 pc);
 //#define PSXMEM_LOG  __Log("%8.8lx %8.8lx: ", psxRegs.pc, psxRegs.cycle); __Log
 //#define PSXCPU_LOG  __Log
 
-#if defined (PSXCPU_LOG) || defined(PSXDMA_LOG) || defined(CDR_LOG) || defined(PSXHW_LOG) || \
-	defined(PSXBIOS_LOG) || defined(PSXMEM_LOG) || defined(GTE_LOG)    || defined(PAD_LOG)
+#if defined(PSXCPU_LOG)  || defined(PSXDMA_LOG) || defined(CDR_LOG) || defined(PSXHW_LOG) || \
+	defined(PSXBIOS_LOG) || defined(PSXMEM_LOG) || defined(GTE_LOG) || defined(PAD_LOG)
 #define EMU_LOG __Log
 #endif
 
diff --git a/plugins/bladesio1/sio1.c b/plugins/bladesio1/sio1.c
index 669451ff..cef7d6cc 100755
--- a/plugins/bladesio1/sio1.c
+++ b/plugins/bladesio1/sio1.c
@@ -20,6 +20,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
+
+#include "psemu_plugin_defs.h"
 
 #include "settings.h"
 #include "sio1.h"
@@ -81,107 +84,129 @@ long CALLBACK SIO1keypressed( int val )
 
 void CALLBACK SIO1writeData8(unsigned char val)
 {
+	printf("SIO1writeData8(%.2x)\n", val);
 }
 
 void CALLBACK SIO1writeData16(unsigned short val)
 {
+	printf("SIO1writeData16(%.4x)\n", val);
 }
 
 void CALLBACK SIO1writeData32(unsigned long val)
 {
+	printf("SIO1writeData32(%.8x)\n", val);
 }
 
 void CALLBACK SIO1writeStat16(unsigned short val)
 {
+	printf("SIO1writeStat16(%.4x)\n", val);
 }
 
 void CALLBACK SIO1writeStat32(unsigned long val)
 {
+	printf("SIO1writeStat32(%.8x)\n", val);
 }
 
 void CALLBACK SIO1writeMode16(unsigned short val)
 {
+	printf("SIO1writeMode16(%.4x)\n", val);
 }
 
 void CALLBACK SIO1writeMode32(unsigned long val)
 {
+	printf("SIO1writeMode32(%.8x)\n", val);
 }
 
 void CALLBACK SIO1writeCtrl16(unsigned short val)
 {
+	printf("SIO1writeCtrl16(%.4x)\n", val);
 }
 
 void CALLBACK SIO1writeCtrl32(unsigned long val)
 {
+	printf("SIO1writeCtrl32(%.8x)\n", val);
 }
 
 void CALLBACK SIO1writeBaud16(unsigned short val)
 {
+	printf("SIO1writeBaud16(%.4x)\n", val);
 }
 
 void CALLBACK SIO1writeBaud32(unsigned long val)
 {
+	printf("SIO1writeBaud32(%.8x)\n", val);
 }
 
-unsigned char CALLBACK SIO1readData8(void)
+unsigned char CALLBACK SIO1readData8()
 {
+	printf("SIO1readData8()\n");
     return 0;
 }
 
-unsigned short CALLBACK SIO1readData16(void)
+unsigned short CALLBACK SIO1readData16()
 {
+	printf("SIO1readData16()\n");
     return 0;
 }
 
-unsigned long CALLBACK SIO1readData32(void)
+unsigned long CALLBACK SIO1readData32()
 {
+	printf("SIO1readData32()\n");
     return 0;
 }
 
-unsigned short CALLBACK SIO1readStat16(void)
+unsigned short CALLBACK SIO1readStat16()
 {
+	printf("SIO1readStat16()\n");
     return 0;
 }
 
-unsigned long CALLBACK SIO1readStat32(void)
+unsigned long CALLBACK SIO1readStat32()
 {
+	printf("SIO1readStat32()\n");
     return 0;
 }
 
-unsigned short CALLBACK SIO1readMode16(void)
+unsigned short CALLBACK SIO1readMode16()
 {
+	printf("SIO1readMode16()\n");
     return 0;
 }
 
-unsigned long CALLBACK SIO1readMode32(void)
+unsigned long CALLBACK SIO1readMode32()
 {
+	printf("SIO1readMode32()\n");
     return 0;
 }
 
-unsigned short CALLBACK SIO1readCtrl16(void)
+unsigned short CALLBACK SIO1readCtrl16()
 {
+	printf("SIO1readCtrl16()\n");
     return 0;
 }
 
-unsigned long CALLBACK SIO1readCtrl32(void)
+unsigned long CALLBACK SIO1readCtrl32()
 {
+	printf("SIO1readCtrl32()\n");
     return 0;
 }
 
-unsigned short CALLBACK SIO1readBaud16(void)
+unsigned short CALLBACK SIO1readBaud16()
 {
+	printf("SIO1readBaud16()\n");
     return 0;
 }
 
-unsigned long CALLBACK SIO1readBaud32(void)
+unsigned long CALLBACK SIO1readBaud32()
 {
+	printf("SIO1readBaud32()\n");
     return 0;
 }
 
 
 /******************************************************************************/
 
-void CALLBACK SIO1registerCallback(void (CALLBACK *callback)(void))
+void CALLBACK SIO1registerCallback(void (CALLBACK *callback)())
 {
 }
 
@@ -196,7 +221,6 @@ long CALLBACK SIO1queryPlayer()
 
 unsigned long CALLBACK PSEgetLibType()
 {
-	#define PSE_LT_SIO1   32
     return PSE_LT_SIO1;
 }