X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Finclude%2Fjaguar.h;h=d3d69047fc198fbd6e1967be1e628dfd0163f7cd;hb=dc758656c7425eec3ecb0dd3ccbeb95ae700c482;hp=f903f1bc0b9e296d5bb7e9bda05f689a71217b1c;hpb=135a0c52a2bcbcc37192c61801de6e9c80aeebff;p=virtualjaguar

diff --git a/src/include/jaguar.h b/src/include/jaguar.h
index f903f1b..d3d6904 100644
--- a/src/include/jaguar.h
+++ b/src/include/jaguar.h
@@ -15,37 +15,34 @@
 #include "clock.h"
 #include "anajoy.h"
 #include "joystick.h"
-#include "pcm.h"
+#include "dac.h"
 #include "jagdasm.h"
-#include "dsnd.h"
 #include "cdrom.h"
 #include "eeprom.h"
 #include "cdi.h"
 #include "cdbios.h"
 
+// Exports from JAGUAR.CPP
+
 extern int32 jaguar_cpu_in_exec;
 extern uint32 jaguar_mainRom_crc32;
 extern char * jaguar_eeproms_path;
+extern char * whoName[9];
 
-//#ifdef __PORT__
-//void jaguar_init(const char * filename);
-//#else
 void jaguar_init(void);
-//#endif	// #ifdef __PORT__
 void jaguar_reset(void);
-void jaguar_reset_handler(void);
 void jaguar_done(void);
-void jaguar_exec(int16 * backbuffer, bool render);
-unsigned jaguar_byte_read(unsigned int offset);
-unsigned jaguar_word_read(unsigned int offset);
-unsigned jaguar_long_read(unsigned int offset);
-void jaguar_byte_write(unsigned offset, unsigned data);
-void jaguar_word_write(unsigned offset, unsigned data);
-void jaguar_long_write(unsigned offset, unsigned data);
+
+uint8 JaguarReadByte(uint32 offset, uint32 who = UNKNOWN);
+uint16 JaguarReadWord(uint32 offset, uint32 who = UNKNOWN);
+uint32 JaguarReadLong(uint32 offset, uint32 who = UNKNOWN);
+void JaguarWriteByte(uint32 offset, uint8 data, uint32 who = UNKNOWN);
+void JaguarWriteWord(uint32 offset, uint16 data, uint32 who = UNKNOWN);
+void JaguarWriteLong(uint32 offset, uint32 data, uint32 who = UNKNOWN);
+
 uint32 jaguar_interrupt_handler_is_valid(uint32 i);
 void jaguar_dasm(uint32 offset, uint32 qt);
 
-//New stuff...
 void JaguarExecute(int16 * backbuffer, bool render);
 
 // Some handy macros to help converting native endian to big endian (jaguar native)
@@ -57,7 +54,19 @@ void JaguarExecute(int16 * backbuffer, bool render);
 #define SET16(r, a, v)	r[(a)] = ((v) & 0xFF00) >> 8, r[(a)+1] = (v) & 0xFF
 #define GET16(r, a)		((r[(a)] << 8) | r[(a)+1])
 
-//Temp debug stuff
+// Various clock rates
+
+#define M68K_CLOCK_RATE_PAL		13296950
+#define M68K_CLOCK_RATE_NTSC	13295453
+#define RISC_CLOCK_RATE_PAL		26593900
+#define RISC_CLOCK_RATE_NTSC	26590906
+
+// Stuff for IRQ handling
+
+#define ASSERT_LINE		1
+#define CLEAR_LINE		0
+
+//Temp debug stuff (will go away soon, so don't depend on these)
 
 void DumpMainMemory(void);
 uint8 * GetRamPtr(void);