X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Finclude%2Fjaguar.h;h=6dffc26dd8fe17bebe80830e9d3a02d87198096f;hb=42a0fe10ada4fb012e64ae248073d23325d59016;hp=43184711ed2cba99a35c644819b4cbe0297e4112;hpb=cd61d997688c71e8eeecf39e4ce9d77a08872d7b;p=virtualjaguar diff --git a/src/include/jaguar.h b/src/include/jaguar.h index 4318471..6dffc26 100644 --- a/src/include/jaguar.h +++ b/src/include/jaguar.h @@ -1,6 +1,7 @@ #ifndef __JAGUAR_H__ #define __JAGUAR_H__ +#include // Why??? (for memset, etc... Lazy!) Dunno why, but this just strikes me as wrong... #include "types.h" #include "log.h" #include "version.h" @@ -13,7 +14,7 @@ #include "objectp.h" #include "blitter.h" #include "clock.h" -#include "anajoy.h" +//#include "anajoy.h" #include "joystick.h" #include "dac.h" #include "jagdasm.h" @@ -25,13 +26,12 @@ // Exports from JAGUAR.CPP extern int32 jaguar_cpu_in_exec; -extern uint32 jaguar_mainRom_crc32; +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_reset_handler(void); void jaguar_done(void); uint8 JaguarReadByte(uint32 offset, uint32 who = UNKNOWN); @@ -44,8 +44,9 @@ 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); +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