Merge pull request #234 from notaz/master

psxmem: Reads of PIO Expansion area read all-ones.

diff --git a/configure b/configure
index 4d9b566..c3ff68f 100755 (executable)
--- a/configure
+++ b/configure
@@ -442,13 +442,14 @@ EOF
 fi
 
 # check for VideoCore stuff for Raspberry Pi
-if [ -d /opt/vc/include -a -d /opt/vc/lib ]; then
+if [ -d /opt/vc/include -a -d /opt/vc/lib -a "$VIDEOCORE" != "no" ]; then
   CFLAGS_GLES="$CFLAGS_GLES -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
   LDLIBS_GLES="$LDLIBS_GLES -L/opt/vc/lib"
   if [ -f /opt/vc/lib/libbcm_host.so ]; then
     LDLIBS_GLES="$LDLIBS_GLES -lbcm_host"
   fi
   need_xlib="yes"
+  VIDEOCORE="yes"
 fi
 
 # check for GLES headers
@@ -459,7 +460,10 @@ int main(void) {
   return (int)eglGetDisplay( (EGLNativeDisplayType)0 );
 }
 EOF
-if compile_binary $CFLAGS_GLES -lEGL -lGLES_CM $LDLIBS_GLES; then
+if [ "$VIDEOCORE" = "yes" ] && compile_binary $CFLAGS_GLES -lbrcmEGL -lbrcmGLESv2 $LDLIBS_GLES; then
+  have_gles="yes"
+  LDLIBS_GLES="-lbrcmEGL -lbrcmGLESv2 $LDLIBS_GLES"
+elif compile_binary $CFLAGS_GLES -lEGL -lGLES_CM $LDLIBS_GLES; then
   have_gles="yes"
   LDLIBS_GLES="-lEGL -lGLES_CM $LDLIBS_GLES"
 elif compile_binary $CFLAGS_GLES -lEGL -lGLESv1_CM $LDLIBS_GLES; then

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 14fd911..a1a641d 100644 (file)
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -187,7 +187,7 @@ void psxMemReset() {
        char bios[1024];
 
        memset(psxM, 0, 0x00200000);
-       memset(psxP, 0, 0x00010000);
+       memset(psxP, 0xff, 0x00010000);
 
        if (strcmp(Config.Bios, "HLE") != 0) {
                sprintf(bios, "%s/%s", Config.BiosDir, Config.Bios);