X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjaguar.h;h=63e6de6238ca4876b0859b451754f2eaafe93c16;hb=f0a806e6b168b1c9cab5c9d7a27435dc4a76476a;hp=4d33afc34b6b5594132c424901a1c343a7a61fc5;hpb=e285d9bb9ae73f64443fa4add30119dc422c4d08;p=virtualjaguar

diff --git a/src/jaguar.h b/src/jaguar.h
index 4d33afc..63e6de6 100644
--- a/src/jaguar.h
+++ b/src/jaguar.h
@@ -1,35 +1,35 @@
 #ifndef __JAGUAR_H__
 #define __JAGUAR_H__
 
-#include "types.h"
+#include <stdint.h>
 #include "memory.h"							// For "UNKNOWN" enum
 
-void JaguarSetScreenBuffer(uint32 * buffer);
-void JaguarSetScreenPitch(uint32 pitch);
+void JaguarSetScreenBuffer(uint32_t * buffer);
+void JaguarSetScreenPitch(uint32_t pitch);
 void JaguarInit(void);
 void JaguarReset(void);
 void JaguarDone(void);
 
-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);
+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);
 
-bool JaguarInterruptHandlerIsValid(uint32 i);
-void JaguarDasm(uint32 offset, uint32 qt);
+bool JaguarInterruptHandlerIsValid(uint32_t i);
+void JaguarDasm(uint32_t offset, uint32_t qt);
 
-void JaguarExecute(uint32 * backbuffer, bool render);
-//For testing the new system...
 void JaguarExecuteNew(void);
 
 // Exports from JAGUAR.CPP
 
-extern int32 jaguarCPUInExec;
-extern uint32 jaguarMainROMCRC32, jaguarROMSize, jaguarRunAddress;
+extern int32_t jaguarCPUInExec;
+extern uint32_t jaguarMainROMCRC32, jaguarROMSize, jaguarRunAddress;
 extern char * jaguarEepromsPath;
 extern bool jaguarCartInserted;
+extern bool bpmActive;
+extern uint32_t bpmAddress1;
 
 // Various clock rates
 
@@ -43,15 +43,9 @@ extern bool jaguarCartInserted;
 #define ASSERT_LINE		1
 #define CLEAR_LINE		0
 
-// Video stuff (should go in tom.h?)
-
-#define VIRTUAL_SCREEN_WIDTH            320
-#define VIRTUAL_SCREEN_HEIGHT_NTSC      240
-#define VIRTUAL_SCREEN_HEIGHT_PAL       256
-
 //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__