Misc. small fixes/changes.

diff --git a/src/cdrom.cpp b/src/cdrom.cpp
index d36a15978e5a8a552cfa344e774a71ec3bdab07f..7f0af672c72a461d80203c764a6d061fe3763959 100644 (file)
--- a/src/cdrom.cpp
+++ b/src/cdrom.cpp
@@ -11,7 +11,7 @@
 #include "cdintf.h"                                                                    // System agnostic CD interface functions
 #include "cdrom.h"
 
-#define CDROM_LOG                                                                      // For CDROM logging, obviously
+//#define CDROM_LOG                                                                    // For CDROM logging, obviously
 
 /*
 BUTCH     equ  $DFFF00         ; base of Butch=interrupt control register, R/W
@@ -825,6 +825,8 @@ if (cdBufPtr % 32 == 30)
 
 bool ButchIsReadyToSend(void)
 {
+WriteLog("Butch is%s ready to send...\n", cdRam[I2CNTRL + 3] & 0x02 ? "" : " not");
+
        return (cdRam[I2CNTRL + 3] & 0x02 ? true : false);
 }
 

diff --git a/src/clock.cpp b/src/clock.cpp
index a1f4dad882b8745cb5b298152378706f8e82b13c..f4ef41963c9a1fc8010c16667d3eedd1fac0b3b0 100644 (file)
--- a/src/clock.cpp
+++ b/src/clock.cpp
@@ -175,39 +175,6 @@ void HandleNextEvent(void)
 }
 
 
-
-/*void clock_reset(void)
-{
-}
-
-void clock_init(void)
-{
-       clock_reset();
-}
-
-void clock_done(void)
-{
-}
-
-void clock_byte_write(uint32 offset, uint8 data)
-{
-}
-
-void clock_word_write(uint32 offset, uint16 data)
-{
-}
-
-uint8 clock_byte_read(uint32 offset)
-{
-       return 0xFF;
-}
-
-uint16 clock_word_read(uint32 offset)
-{
-       return 0xFFFF;
-}*/
-
-
 /*
 void OPCallback(void)
 {

diff --git a/src/joystick.cpp b/src/joystick.cpp
index edf8270e90c4069a728cba68d2c658388374bd10..82057d9aa7d832abacfbafa137f34218dd9d6e85 100644 (file)
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -54,8 +54,11 @@ bool iLeft, iRight, iToggle = false;
 bool keyHeld1 = false, keyHeld2 = false, keyHeld3 = false;
 int objectPtr = 0;
 bool startMemLog = false;
-extern bool doDSPDis;
+extern bool doDSPDis, doGPUDis;
 
+bool blitterSingleStep = false;
+bool bssGo = false;
+bool bssHeld = false;
 
 void joystick_init(void)
 {
@@ -204,7 +207,23 @@ void joystick_exec(void)
                WriteLog("\n--------> MARK!\n\n");
        if (keystate[SDLK_t])
                doDSPDis = true;
+       if (keystate[SDLK_y])
+               doGPUDis = true;
 
+       // BLITTER single step
+       if (keystate[SDLK_F5])
+               blitterSingleStep = true;
+
+       if (keystate[SDLK_F6])
+       {
+               if (!bssHeld)
+               {
+                       bssHeld = true;
+                       bssGo = true;
+               }
+       }
+       else
+               bssHeld = false;
 
        // Joystick support [nwagenaar]
 

diff --git a/src/sdlemu_opengl.c b/src/sdlemu_opengl.c
index 4037bd7feb0bf50ff68284c40d9230b9ac623e9e..7ea9fafcbc92ff8a5aac9c7a761bcbe5ca3265ff 100644 (file)
--- a/src/sdlemu_opengl.c
+++ b/src/sdlemu_opengl.c
@@ -87,7 +87,6 @@ void sdlemu_init_opengl(SDL_Surface * src, SDL_Surface * dst, int texturetype, i
 
        // Let us create the texture information :
        sdlemu_create_texture(src, dst, filter, src_bpp);
-
        sdlemu_create_overlay(dst, src_bpp);
 }