From 402ce5fd1cae18d622b04db8ba595f869b4b7464 Mon Sep 17 00:00:00 2001
From: Shamus Hammons <jlhamm@acm.org>
Date: Tue, 29 May 2007 14:39:27 +0000
Subject: [PATCH] Misc. small fixes/changes.

---
 src/cdrom.cpp       |  4 +++-
 src/clock.cpp       | 33 ---------------------------------
 src/joystick.cpp    | 21 ++++++++++++++++++++-
 src/sdlemu_opengl.c |  1 -
 4 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/src/cdrom.cpp b/src/cdrom.cpp
index d36a159..7f0af67 100644
--- 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 a1f4dad..f4ef419 100644
--- 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 edf8270..82057d9 100644
--- 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 4037bd7..7ea9faf 100644
--- 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);
 }
 
-- 
2.37.2