[PATCH 15/20] Add a main loop for running the Jaguar emulation

[Thomas Huth <huth@xxxxxxxxxxxxx>]

---
 src/jaguar/jaguar.c | 54 +++++++++++++++++++++++++++++++++++++++++++++
 src/jaguar/jaguar.h |  2 ++
 2 files changed, 56 insertions(+)

diff --git a/src/jaguar/jaguar.c b/src/jaguar/jaguar.c
index f6427b5b..54f2dafb 100644
--- a/src/jaguar/jaguar.c
+++ b/src/jaguar/jaguar.c
@@ -32,6 +32,7 @@
 #include "settings.h"
 #include "tom.h"
 #include "jagScreen.h"
+#include "../includes/main.h"
 
 #define CPU_DEBUG
 //Do this in makefile??? Yes! Could, but it's easier to define here...
@@ -1921,3 +1922,56 @@ void RenderCallback(void)
 //	SetCallbackTime(RenderCallback, 33303.082);	// # Scanlines * scanline time
 	SetCallbackTime(RenderCallback, 16651.541);	// # Scanlines * scanline time
 }
+
+/**
+ * The Jaguar main emulator loop
+ */
+int Jag_Main(char *cartname)
+{
+	LogInit("/tmp/jaguar.log");
+	LoadVJSettings();
+
+	//vjs.DSPEnabled = true;
+
+	// Set up SDL library
+	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) < 0)
+	{
+		fprintf(stderr, "Could not init the SDL library: %s\n", SDL_GetError());
+		return -1;
+	}
+
+	JaguarInit();
+
+	SET32(jaguarMainRAM, 0, 0x00200000);	/* Set top of stack... */
+
+	JagScreen_Init();
+
+	if (!JaguarLoadFile(cartname))
+	{
+		fprintf(stderr, "Failed to load '%s'\n", cartname);
+		return -1;
+	}
+	else
+	{
+		JaguarReset();
+
+		while (!bQuitProgram)
+		{
+			uint32_t ticks = SDL_GetTicks();
+			JaguarExecuteNew();
+			RenderBackbuffer();
+			ticks = SDL_GetTicks() - ticks;
+			if (ticks < 16)
+				SDL_Delay(16 - ticks);
+		}
+	}
+
+	JaguarDone();
+	JagScreen_UnInit();
+	LogDone();
+
+	SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO);
+	SDL_Quit();
+
+	return 0;
+}
diff --git a/src/jaguar/jaguar.h b/src/jaguar/jaguar.h
index dfa1988f..236a5574 100644
--- a/src/jaguar/jaguar.h
+++ b/src/jaguar/jaguar.h
@@ -48,4 +48,6 @@ extern char * jaguarEepromsPath;
 void DumpMainMemory(void);
 uint8 * GetRamPtr(void);
 
+int Jag_Main(char *sCartName);
+
 #endif	// __JAGUAR_H__
-- 
2.48.1


--MP_/VkVZp1l8MIESxWVe2vPSxV2
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename=0016-update-for-the-initial-release.patch