X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjaguar.h;h=d4bb73861c965915bfe84fe7eadc1cb093538957;hb=dd520b965a1e6531bd1d285494b223ab04c5368b;hp=e1358b9c21bc03d7eb3a3860fd8a1d647da969b8;hpb=7bac1ecb6a579c6b1622755113f80cf7e6a5e98d;p=virtualjaguar

diff --git a/src/jaguar.h b/src/jaguar.h
index e1358b9..d4bb738 100644
--- a/src/jaguar.h
+++ b/src/jaguar.h
@@ -1,39 +1,11 @@
 #ifndef __JAGUAR_H__
 #define __JAGUAR_H__
 
-#include <string.h>	// Why??? (for memset, etc... Lazy!) Dunno why, but this just strikes me as wrong...
-#include <stdlib.h>	// For exit()
 #include "types.h"
-#include "log.h"
-#include "version.h"
-#include "memory.h"
-#include "m68k.h"
-#include "tom.h"
-#include "jerry.h"
-#include "gpu.h"
-#include "dsp.h"
-#include "objectp.h"
-#include "blitter.h"
-#include "clock.h"
-//#include "anajoy.h"
-#include "joystick.h"
-#include "dac.h"
-#include "jagdasm.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, jaguarRomSize, jaguarRunAddress;
-extern char * jaguar_eeproms_path;
-extern char * whoName[9];
-
-void jaguar_init(void);
-void jaguar_reset(void);
-void jaguar_done(void);
+void JaguarInit(void);
+void JaguarReset(void);
+void JaguarDone(void);
 
 uint8 JaguarReadByte(uint32 offset, uint32 who = UNKNOWN);
 uint16 JaguarReadWord(uint32 offset, uint32 who = UNKNOWN);
@@ -42,13 +14,26 @@ 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);
+bool JaguarInterruptHandlerIsValid(uint32 i);
+void JaguarDasm(uint32 offset, uint32 qt);
 
 void JaguarExecute(uint32 * backbuffer, bool render);
 //For testing the new system...
 void JaguarExecuteNew(void);
 
+// Exports from JAGUAR.CPP
+
+extern uint8 jaguarMainRam[];
+extern uint8 jaguarMainRom[];
+extern uint8 jaguarBootRom[];
+extern uint8 jaguarCDBootROM[];
+extern bool BIOSLoaded;
+extern bool CDBIOSLoaded;
+extern int32 jaguarCPUInExec;
+extern uint32 jaguarMainRomCRC32, jaguarRomSize, jaguarRunAddress;
+extern char * jaguarEepromsPath;
+extern const char * whoName[9];
+
 // Some handy macros to help converting native endian to big endian (jaguar native)
 // & vice versa