X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftom.h;h=59369d7bb17103112a0a1fcb469af3d221f2bc69;hb=22e4f2eeba52ba2a1f2808e82147dc57a9e4e44f;hp=ea7ce35124de3ddd5d0112f19ae01de22a678bfc;hpb=dd520b965a1e6531bd1d285494b223ab04c5368b;p=virtualjaguar

diff --git a/src/tom.h b/src/tom.h
index ea7ce35..59369d7 100644
--- a/src/tom.h
+++ b/src/tom.h
@@ -6,7 +6,8 @@
 #define __TOM_H__
 
 //#include "jaguar.h"
-#include "types.h"
+//#include "types.h"
+#include "memory.h"
 
 #define VIDEO_MODE_16BPP_CRY	0
 #define VIDEO_MODE_24BPP_RGB	1
@@ -15,7 +16,7 @@
 
 // 68000 Interrupt bit positions (enabled at $F000E0)
 
-enum { IRQ_VBLANK = 0, IRQ_GPU, IRQ_OPFLAG, IRQ_TIMER, IRQ_DSP };
+enum { IRQ_VIDEO = 0, IRQ_GPU, IRQ_OPFLAG, IRQ_TIMER, IRQ_DSP };
 
 void TOMInit(void);
 void TOMReset(void);
@@ -26,7 +27,6 @@ uint16 TOMReadWord(uint32 offset, uint32 who = UNKNOWN);
 void TOMWriteByte(uint32 offset, uint8 data, uint32 who = UNKNOWN);
 void TOMWriteWord(uint32 offset, uint16 data, uint32 who = UNKNOWN);
 
-//void TOMExecScanline(int16 * backbuffer, int32 scanline, bool render);
 void TOMExecScanline(uint16 scanline, bool render);
 uint32 TOMGetVideoModeWidth(void);
 uint32 TOMGetVideoModeHeight(void);
@@ -37,7 +37,7 @@ uint16 TOMGetVDB(void);
 //uint16 tom_get_scanline(void);
 //uint32 tom_getHBlankWidthInPixels(void);
 
-int	TOMIRQEnabled(int irq);
+int TOMIRQEnabled(int irq);
 uint16 TOMIRQControlReg(void);
 void TOMSetIRQLatch(int irq, int enabled);
 void TOMExecPIT(uint32 cycles);
@@ -48,9 +48,6 @@ void TOMSetPendingGPUInt(void);
 void TOMSetPendingVideoInt(void);
 void TOMResetPIT(void);
 
-//uint32 TOMGetSDLScreenPitch(void);
-void TOMResetBackbuffer(uint32 * backbuffer);
-
 // Exported variables
 
 extern uint32 tomWidth;
@@ -60,4 +57,7 @@ extern uint32 tomTimerPrescaler;
 extern uint32 tomTimerDivider;
 extern int32 tomTimerCounter;
 
+extern uint32 screenPitch;
+extern uint32 * screenBuffer;
+
 #endif	// __TOM_H__