* Sync with codeplex branch (libpcsxcore, linux gui)

    This commit reflects mostly changes that happened in upstream since the last sync.
    Commit messages in upstream are lacking information. Most important changes are
    commented below, the rest of them are either formating or just trivial stuff.

    Memory viewer, invalidate dynarec
        gui/DebugMemory.c
        libpcsxcore/cdrom.c
        libpcsxcore/gpu.c
        libpcsxcore/misc.c
        libpcsxcore/psxdma.c

    Load binary files and psx executables
        libpcsxcore/misc.c
        libpcsxcore/misc.h
        libpcsxcore/plugin.c
        libpcsxcore/plugin.h

    Support for psxida
        libpcsxcore/debug.c
        libpcsxcore/r3000a.c
        plugins/bladesio1/connection.c

    disable loading save states with digits
        gui/Plugin.c

    Fix psxDIV in interpreter
        libpcsxcore/psxinterpreter.c

16 files changed, 45 insertions, 20 deletions

diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am
index badd57e5..840713b4 100644
--- a/plugins/bladesio1/Makefile.am
+++ b/plugins/bladesio1/Makefile.am
@@ -40,4 +40,3 @@ GtkResources.h: bladesio1.gresource.xml $(bladesio1_gresource)
 EXTRA_DIST = $(glade_DATA)
 
 CLEANFILES = bladesio1.gresource.xml GtkResources.c GtkResources.h
-
diff --git a/plugins/bladesio1/cfg.c b/plugins/bladesio1/cfg.c
index f830d7b3..df120b1a 100755
--- a/plugins/bladesio1/cfg.c
+++ b/plugins/bladesio1/cfg.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "psxcommon.h"
+#include "typedefs.h"
 #include "psemu_plugin_defs.h"
 
 #include "sio1.h"
diff --git a/plugins/bladesio1/connection.c b/plugins/bladesio1/connection.c
index 1d4a075d..c922f2f2 100755
--- a/plugins/bladesio1/connection.c
+++ b/plugins/bladesio1/connection.c
@@ -61,7 +61,11 @@ int connectionOpen() {
 
 			serversock = socket(AF_INET, SOCK_STREAM, 0);
 			if(serversock == -1) {
+#if defined _WINDOWS
+				fprintf(stderr, "[SIO1] ERROR: server socket(): %d\n", WSAGetLastError());
+#else
 				fprintf(stderr, "[SIO1] ERROR: server socket()\n");
+#endif
 				return -1;
 			}
 			
@@ -74,12 +78,20 @@ int connectionOpen() {
 			address.sin_port		= settings.port;
 
 			if(bind(serversock,(struct sockaddr*)&address,sizeof(address)) == -1) {
+#if defined _WINDOWS
+				fprintf(stderr, "[SIO1] ERROR: server bind(): %d\n", WSAGetLastError());
+#else
 				fprintf(stderr, "[SIO1] ERROR: server bind()\n");
+#endif
 				return -1;
 			}
 
 			if(listen(serversock, 1) != 0) {
+#if defined _WINDOWS
+				fprintf(stderr, "[SIO1] ERROR: server listen(): %d\n", WSAGetLastError());
+#else
 				fprintf(stderr, "[SIO1] ERROR: server listen()\n");
+#endif
 				return -1;
 			}
 
@@ -99,14 +111,22 @@ int connectionOpen() {
 
 			clientsock = socket(AF_INET, SOCK_STREAM, 0);
 			if(clientsock == -1) {
+#if defined _WINDOWS
+				fprintf(stderr, "[SIO1] ERROR: client socket(): %d\n", WSAGetLastError());
+#else
 				fprintf(stderr, "[SIO1] ERROR: client socket()\n");
+#endif
 				return -1;
 			}
 
 			setsockopt(clientsock, IPPROTO_TCP, TCP_NODELAY, (const char*)&one, sizeof(one));
 
 			if(connect(clientsock,(struct sockaddr*)&address,sizeof(address)) != 0) {
-				fprintf(stderr, "[SIO1] ERROR: client connect(%s)\n", settings.ip);
+#if defined _WINDOWS
+				fprintf(stderr, "[SIO1] ERROR: client connect(%s): %d\n", settings.ip, WSAGetLastError());
+#else
+				fprintf(stderr, "[SIO1] ERROR: client connect(%s)", settings.ip);
+#endif
 				return -1;
 			}
 		}
diff --git a/plugins/bladesio1/gui.c b/plugins/bladesio1/gui.c
index 37ffb83f..9a265899 100644
--- a/plugins/bladesio1/gui.c
+++ b/plugins/bladesio1/gui.c
@@ -32,7 +32,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include "psxcommon.h"
+//#include "psxcommon.h"
 #include "psemu_plugin_defs.h"
 
 #include "cfg.c"
diff --git a/plugins/bladesio1/sio1.c b/plugins/bladesio1/sio1.c
index 453d7fec..feab1bb6 100755
--- a/plugins/bladesio1/sio1.c
+++ b/plugins/bladesio1/sio1.c
@@ -30,7 +30,10 @@
 void AboutDlgProc();
 void ConfDlgProc();
 #else
+#include <unistd.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #endif
 
 #include "typedefs.h"
diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am
index 1f87998b..c942fb40 100644
--- a/plugins/dfcdrom/Makefile.am
+++ b/plugins/dfcdrom/Makefile.am
@@ -55,4 +55,3 @@ GtkResources.h: dfcdrom.gresource.xml $(dfcdrom_gresource)
 EXTRA_DIST = $(glade_DATA)
 
 CLEANFILES = dfcdrom.gresource.xml GtkResources.c GtkResources.h
-
diff --git a/plugins/dfcdrom/cdr.c b/plugins/dfcdrom/cdr.c
index ecd0d9a4..97a2735d 100755
--- a/plugins/dfcdrom/cdr.c
+++ b/plugins/dfcdrom/cdr.c
@@ -20,6 +20,10 @@
  */
 
 #include "cdr.h"
+#if defined(__linux__)
+#include <sys/types.h>
+#include <sys/wait.h>
+#endif 
 
 #ifndef USE_NULL
 static char *LibName = N_("CD-ROM Drive Reader");
diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am
index 9f8130a1..18a49ac7 100755
--- a/plugins/dfsound/Makefile.am
+++ b/plugins/dfsound/Makefile.am
@@ -76,4 +76,3 @@ GtkResources.h: dfsound.gresource.xml $(dfsound_gresource)
 EXTRA_DIST = $(glade_DATA)
 
 CLEANFILES = dfsound.gresource.xml GtkResources.c GtkResources.h
-
diff --git a/plugins/dfsound/cfg.c b/plugins/dfsound/cfg.c
index 0bb2172c..0e1f63fa 100755
--- a/plugins/dfsound/cfg.c
+++ b/plugins/dfsound/cfg.c
@@ -26,6 +26,10 @@
 ////////////////////////////////////////////////////////////////////////
 
 #include <unistd.h>
+#if defined(__linux__)
+#include <sys/types.h>
+#include <sys/wait.h>
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // START EXTERNAL CFG TOOL
diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am
index 520749b2..b1dc9c3d 100755
--- a/plugins/dfxvideo/Makefile.am
+++ b/plugins/dfxvideo/Makefile.am
@@ -54,4 +54,3 @@ GtkResources.h: dfxvideo.gresource.xml $(dfxvideo_gresource)
 EXTRA_DIST = $(glade_DATA)
 
 CLEANFILES = dfxvideo.gresource.xml GtkResources.c GtkResources.h
-
diff --git a/plugins/dfxvideo/cfg.c b/plugins/dfxvideo/cfg.c
index 1bf879b8..67f79a8a 100755
--- a/plugins/dfxvideo/cfg.c
+++ b/plugins/dfxvideo/cfg.c
@@ -20,6 +20,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdlib.h>
+#if defined(__linux__)
+#include <sys/types.h>
+#include <sys/wait.h>
+#endif
 
 #undef FALSE
 #undef TRUE
diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am
index 576e140d..e9d7de4e 100755
--- a/plugins/peopsxgl/Makefile.am
+++ b/plugins/peopsxgl/Makefile.am
@@ -54,4 +54,3 @@ GtkResources.h: peopsxgl.gresource.xml $(peopsxgl_gresource)
 EXTRA_DIST = $(glade_DATA)
 
 CLEANFILES = peopsxgl.gresource.xml GtkResources.c GtkResources.h
-
diff --git a/plugins/peopsxgl/draw.c b/plugins/peopsxgl/draw.c
index c7a778a8..c60d9379 100755
--- a/plugins/peopsxgl/draw.c
+++ b/plugins/peopsxgl/draw.c
@@ -1020,7 +1020,6 @@ BOOL offsetline(unsigned int* addr)
  vertex[1].y=(short)((float)y1+px);
  vertex[2].y=(short)((float)y1+py);
 
-
  if(vertex[0].x==vertex[3].x &&                        // ortho rect? done
     vertex[1].x==vertex[2].x &&
     vertex[0].y==vertex[1].y &&
diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c
index c19dd2b6..12c453b5 100755
--- a/plugins/peopsxgl/gpu.c
+++ b/plugins/peopsxgl/gpu.c
@@ -35,6 +35,10 @@ static int iOldMode=0;
 
 #endif
 
+#if defined(__linux__)
+#include <sys/wait.h>
+#endif
+
 #define _IN_GPU
 
 #include "externals.h"
@@ -1088,13 +1092,7 @@ long GPUopen(unsigned long * disp,char * CapText,char * CfgFile)
  GLinitialize();                                       // init opengl
 
  if(disp)
-  {
-#if defined (_MACGL)
-   *disp = display;
-#else
-   *disp=(unsigned long *)display;                       // return display ID to main emu
-#endif
-  }
+   *disp = (unsigned long)display;                     // return display ID to main emu
 
  if(display) return 0;
  return -1;
@@ -1317,7 +1315,6 @@ void SetScanLines(void)
 
  //PGXP_SetMatrix(0, PSXDisplay.DisplayMode.x, PSXDisplay.DisplayMode.y, 0, -1, 1);
 
-
  if(bKeepRatio)
   glViewport(rRatioRect.left,
              iResY-(rRatioRect.top+rRatioRect.bottom),
@@ -1895,7 +1892,6 @@ void updateDisplayIfChanged(void)
 
  //  PGXP_SetMatrix(0, PSXDisplay.DisplayModeNew.x, PSXDisplay.DisplayModeNew.y, 0, -1, 1);
 
-
    if(bKeepRatio) SetAspectRatio();
   }
 
diff --git a/plugins/peopsxgl/prim.c b/plugins/peopsxgl/prim.c
index 1af588f0..b03d87d7 100755
--- a/plugins/peopsxgl/prim.c
+++ b/plugins/peopsxgl/prim.c
@@ -155,7 +155,6 @@ static __inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2
 		if(PGXP_DrawDebugTriQuad(vertex1, vertex2, vertex4, vertex3, COLOUR_NONE, 1))
 		return;
 	}
-		
 
  glBegin(GL_TRIANGLE_STRIP);
   glTexCoord2fv(&vertex1->sow);
@@ -2553,7 +2552,6 @@ void DrawMultiBlur(void)
  fx=(float)PSXDisplay.DisplayMode.x/(float)(iResX); 
  fy=(float)PSXDisplay.DisplayMode.y/(float)(iResY);
 
-
  for (unsigned int i = 0; i < 4; ++i)
  {
 	 vertex[i].PGXP_flag = 999;
diff --git a/plugins/peopsxgl/stdafx.h b/plugins/peopsxgl/stdafx.h
index b069ba25..ab40002e 100755
--- a/plugins/peopsxgl/stdafx.h
+++ b/plugins/peopsxgl/stdafx.h
@@ -62,6 +62,8 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <GL/gl.h>
 #include <GL/glx.h>
 #include <math.h>