Removed some cruft and nonstandard int/uint types, added M series BIOS.

[virtualjaguar] / src / jaguar.h

diff --git a/src/jaguar.h b/src/jaguar.h
index e1358b9c21bc03d7eb3a3860fd8a1d647da969b8..54e25aeacd7760abf5b6ed612fded3099ab11758 100644 (file)
--- a/src/jaguar.h
+++ b/src/jaguar.h
@@ -1,70 +1,33 @@
 #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"
+#include <stdint.h>
+#include "memory.h"                                                    // For "UNKNOWN" enum
 
-// 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 JaguarSetScreenBuffer(uint32_t * buffer);
+void JaguarSetScreenPitch(uint32_t pitch);
+void JaguarInit(void);
+void JaguarReset(void);
+void JaguarDone(void);
 
-void jaguar_init(void);
-void jaguar_reset(void);
-void jaguar_done(void);
+uint8_t JaguarReadByte(uint32_t offset, uint32_t who = UNKNOWN);
+uint16_t JaguarReadWord(uint32_t offset, uint32_t who = UNKNOWN);
+uint32_t JaguarReadLong(uint32_t offset, uint32_t who = UNKNOWN);
+void JaguarWriteByte(uint32_t offset, uint8_t data, uint32_t who = UNKNOWN);
+void JaguarWriteWord(uint32_t offset, uint16_t data, uint32_t who = UNKNOWN);
+void JaguarWriteLong(uint32_t offset, uint32_t data, uint32_t who = UNKNOWN);
 
-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);
+bool JaguarInterruptHandlerIsValid(uint32_t i);
+void JaguarDasm(uint32_t offset, uint32_t qt);
 
-uint32 jaguar_interrupt_handler_is_valid(uint32 i);
-void jaguar_dasm(uint32 offset, uint32 qt);
-
-void JaguarExecute(uint32 * backbuffer, bool render);
-//For testing the new system...
 void JaguarExecuteNew(void);
 
-// Some handy macros to help converting native endian to big endian (jaguar native)
-// & vice versa
+// Exports from JAGUAR.CPP
 
-#define SET64(r, a, v)         r[(a)] = ((v) & 0xFF00000000000000) >> 56, r[(a)+1] = ((v) & 0x00FF000000000000) >> 48, \
-                                               r[(a)+2] = ((v) & 0x0000FF0000000000) >> 40, r[(a)+3] = ((v) & 0x000000FF00000000) >> 32, \
-                                               r[(a)+4] = ((v) & 0xFF000000) >> 24, r[(a)+5] = ((v) & 0x00FF0000) >> 16, \
-                                               r[(a)+6] = ((v) & 0x0000FF00) >> 8, r[(a)+7] = (v) & 0x000000FF
-#define GET64(r, a)            (((uint64)r[(a)] << 56) | ((uint64)r[(a)+1] << 48) | \
-                                               ((uint64)r[(a)+2] << 40) | ((uint64)r[(a)+3] << 32) | \
-                                               ((uint64)r[(a)+4] << 24) | ((uint64)r[(a)+5] << 16) | \
-                                               ((uint64)r[(a)+6] << 8) | (uint64)r[(a)+7])
-#define SET32(r, a, v) r[(a)] = ((v) & 0xFF000000) >> 24, r[(a)+1] = ((v) & 0x00FF0000) >> 16, \
-                                               r[(a)+2] = ((v) & 0x0000FF00) >> 8, r[(a)+3] = (v) & 0x000000FF
-#define GET32(r, a)            ((r[(a)] << 24) | (r[(a)+1] << 16) | (r[(a)+2] << 8) | r[(a)+3])
-#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])
+extern int32_t jaguarCPUInExec;
+extern uint32_t jaguarMainROMCRC32, jaguarROMSize, jaguarRunAddress;
+extern char * jaguarEepromsPath;
+extern bool jaguarCartInserted;
 
 // Various clock rates
 
@@ -81,6 +44,6 @@ void JaguarExecuteNew(void);
 //Temp debug stuff (will go away soon, so don't depend on these)
 
 void DumpMainMemory(void);
-uint8 * GetRamPtr(void);
+uint8_t * GetRamPtr(void);
 
 #endif // __JAGUAR_H__