X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftom.h;h=72521488bbdccf6939a6012625a50546f424e009;hb=83fce768d2c1e0e16691c092ea02d64e2b280fad;hp=4d5eae94d2679e62c19c7da22f2c294bb1486163;hpb=2f21d8ee63902b160acbaf4c26caaaa0e23ca62f;p=virtualjaguar

diff --git a/src/tom.h b/src/tom.h
index 4d5eae9..7252148 100644
--- a/src/tom.h
+++ b/src/tom.h
@@ -5,8 +5,6 @@
 #ifndef __TOM_H__
 #define __TOM_H__
 
-//#include "jaguar.h"
-//#include "types.h"
 #include "memory.h"
 
 #define VIDEO_MODE_16BPP_CRY	0
@@ -14,9 +12,18 @@
 #define VIDEO_MODE_16BPP_DIRECT 2
 #define VIDEO_MODE_16BPP_RGB	3
 
+// Virtual screen size stuff
+
+// NB: This virtual width is for PWIDTH = 4
+//#define VIRTUAL_SCREEN_WIDTH            320
+//was:340, 330
+#define VIRTUAL_SCREEN_WIDTH            326
+#define VIRTUAL_SCREEN_HEIGHT_NTSC      240
+#define VIRTUAL_SCREEN_HEIGHT_PAL       256
+
 // 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);
@@ -27,16 +34,13 @@ 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);
+void TOMExecHalfline(uint16 halfline, bool render);
 uint32 TOMGetVideoModeWidth(void);
 uint32 TOMGetVideoModeHeight(void);
 uint8 TOMGetVideoMode(void);
 uint8 * TOMGetRamPointer(void);
 uint16 TOMGetHDB(void);
 uint16 TOMGetVDB(void);
-//uint16 tom_get_scanline(void);
-//uint32 tom_getHBlankWidthInPixels(void);
 
 int TOMIRQEnabled(int irq);
 uint16 TOMIRQControlReg(void);
@@ -49,9 +53,6 @@ void TOMSetPendingGPUInt(void);
 void TOMSetPendingVideoInt(void);
 void TOMResetPIT(void);
 
-//uint32 TOMGetSDLScreenPitch(void);
-void TOMResetBackbuffer(uint32 * backbuffer);
-
 // Exported variables
 
 extern uint32 tomWidth;
@@ -61,6 +62,7 @@ extern uint32 tomTimerPrescaler;
 extern uint32 tomTimerDivider;
 extern int32 tomTimerCounter;
 
-extern uint32 tomDeviceWidth;
+extern uint32 screenPitch;
+extern uint32 * screenBuffer;
 
 #endif	// __TOM_H__