X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjerry.cpp;h=4f2d37b07e978286ef69c34d87f5b79db97ec5cd;hb=836c7fa1f3e2dc3ec9849cac2584d4544bf2fba4;hp=742cfb255cb5466fba345846b35f194e98d7b961;hpb=6c19e4098a43c47f8cd1824902f7335e124b834f;p=virtualjaguar

diff --git a/src/jerry.cpp b/src/jerry.cpp
index 742cfb2..4f2d37b 100644
--- a/src/jerry.cpp
+++ b/src/jerry.cpp
@@ -148,15 +148,15 @@
 
 #include <string.h>								// For memcpy
 //#include <math.h>
-#include "jaguar.h"
-#include "wavetable.h"
-#include "clock.h"
-#include "dsp.h"
+#include "cdrom.h"
 #include "dac.h"
-#include "joystick.h"
+#include "dsp.h"
 #include "eeprom.h"
+#include "event.h"
+#include "jaguar.h"
+#include "joystick.h"
 #include "log.h"
-#include "cdrom.h"
+#include "wavetable.h"
 
 //Note that 44100 Hz requires samples every 22.675737 usec.
 #define NEW_TIMER_SYSTEM
@@ -196,7 +196,7 @@ void JERRYI2SCallback(void);
 
 //This is only used by the old system, so once the new timer system is working this
 //should be safe to nuke.
-void jerry_i2s_exec(uint32 cycles)
+void JERRYI2SExec(uint32 cycles)
 {
 #ifndef NEW_TIMER_SYSTEM
 	extern uint16 serialMode;						// From DAC.CPP
@@ -411,11 +411,11 @@ void JERRYI2SCallback(void)
 }
 
 
-void jerry_init(void)
+void JERRYInit(void)
 {
 //	clock_init();
 //	anajoy_init();
-	joystick_init();
+	JoystickInit();
 	DACInit();
 //This should be handled with the cart initialization...
 //	eeprom_init();
@@ -428,12 +428,12 @@ void jerry_init(void)
 	JERRYPIT2Divider = 0xFFFF;
 }
 
-void jerry_reset(void)
+void JERRYReset(void)
 {
 //	clock_reset();
 //	anajoy_reset();
-	joystick_reset();
-	eeprom_reset();
+	JoystickReset();
+	EepromReset();
 	JERRYResetI2S();
 	DACReset();
 
@@ -446,20 +446,20 @@ void jerry_reset(void)
 	jerry_timer_2_counter = 0;
 }
 
-void jerry_done(void)
+void JERRYDone(void)
 {
 	WriteLog("JERRY: M68K Interrupt control ($F10020) = %04X\n", GET16(jerry_ram_8, 0x20));
 //	memory_free(jerry_ram_8);
 //	clock_done();
 //	anajoy_done();
-	joystick_done();
+	JoystickDone();
 	DACDone();
-	eeprom_done();
+	EepromDone();
 }
 
 bool JERRYIRQEnabled(int irq)
 {
-	// Read the word @ $F10020 
+	// Read the word @ $F10020
 	return jerry_ram_8[0x21] & (1 << irq);
 }
 
@@ -540,10 +540,10 @@ WriteLog("JERRY: Unhandled timer read (BYTE) at %08X...\n", offset);
 //	else if (offset >= 0xF17C00 && offset <= 0xF17C01)
 //		return anajoy_byte_read(offset);
 	else if (offset >= 0xF14000 && offset <= 0xF14003)
-		return joystick_byte_read(offset) | eeprom_byte_read(offset);
+		return JoystickReadByte(offset) | EepromReadByte(offset);
 	else if (offset >= 0xF14000 && offset <= 0xF1A0FF)
-		return eeprom_byte_read(offset);
-	
+		return EepromReadByte(offset);
+
 	return jerry_ram_8[offset & 0xFFFF];
 }
 
@@ -607,11 +607,11 @@ WriteLog("JERRY: Unhandled timer read (WORD) at %08X...\n", offset);
 //	else if ((offset >= 0xF17C00) && (offset <= 0xF17C01))
 //		return anajoy_word_read(offset);
 	else if (offset == 0xF14000)
-		return (joystick_word_read(offset) & 0xFFFE) | eeprom_word_read(offset);
+		return (JoystickReadWord(offset) & 0xFFFE) | EepromReadWord(offset);
 	else if ((offset >= 0xF14002) && (offset < 0xF14003))
-		return joystick_word_read(offset);
+		return JoystickReadWord(offset);
 	else if ((offset >= 0xF14000) && (offset <= 0xF1A0FF))
-		return eeprom_word_read(offset);
+		return EepromReadWord(offset);
 
 /*if (offset >= 0xF1D000)
 	WriteLog("JERRY: Reading word at %08X [%04X]...\n", offset, ((uint16)jerry_ram_8[(offset+0)&0xFFFF] << 8) | jerry_ram_8[(offset+1)&0xFFFF]);//*/
@@ -659,9 +659,9 @@ void JERRYWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/)
 	}
 	// LTXD/RTXD/SCLK/SMODE $F1A148/4C/50/54 (really 16-bit registers...)
 	else if (offset >= 0xF1A148 && offset <= 0xF1A157)
-	{ 
+	{
 		DACWriteByte(offset, data, who);
-		return; 
+		return;
 	}
 	else if (offset >= 0xF10000 && offset <= 0xF10007)
 	{
@@ -722,13 +722,13 @@ WriteLog("JERRY: (68K int en/lat - Unhandled!) Tried to write $%02X to $%08X!\n"
 	}*/
 	else if ((offset >= 0xF14000) && (offset <= 0xF14003))
 	{
-		joystick_byte_write(offset, data);
-		eeprom_byte_write(offset, data);
+		JoystickWriteByte(offset, data);
+		EepromWriteByte(offset, data);
 		return;
 	}
 	else if ((offset >= 0xF14000) && (offset <= 0xF1A0FF))
 	{
-		eeprom_byte_write(offset, data);
+		EepromWriteByte(offset, data);
 		return;
 	}
 
@@ -773,13 +773,13 @@ void JERRYWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/)
 #endif
 
 		DACWriteWord(offset, data, who);
-		return; 
+		return;
 	}
 	// LTXD/RTXD/SCLK/SMODE $F1A148/4C/50/54 (really 16-bit registers...)
 	else if (offset >= 0xF1A148 && offset <= 0xF1A156)
-	{ 
+	{
 		DACWriteWord(offset, data, who);
-		return; 
+		return;
 	}
 	else if (offset >= 0xF10000 && offset <= 0xF10007)
 	{
@@ -827,13 +827,13 @@ WriteLog("JERRY: (68K int en/lat - Unhandled!) Tried to write $%04X to $%08X!\n"
 	}*/
 	else if (offset >= 0xF14000 && offset < 0xF14003)
 	{
-		joystick_word_write(offset, data);
-		eeprom_word_write(offset, data);
+		JoystickWriteWord(offset, data);
+		EepromWriteWord(offset, data);
 		return;
 	}
 	else if (offset >= 0xF14000 && offset <= 0xF1A0FF)
 	{
-		eeprom_word_write(offset, data);
+		EepromWriteWord(offset, data);
 		return;
 	}