Changes for upcoming 1.0.5 release

[virtualjaguar] / src / include / tom.h

diff --git a/src/include/tom.h b/src/include/tom.h
index be51f63747a08ad6143efc1fbfb3ba008ff7874f..a98aadfca23ecee91df01be16e9eb1130db895e0 100644 (file)
--- a/src/include/tom.h
+++ b/src/include/tom.h
@@ -7,15 +7,14 @@
 
 #include "jaguar.h"
 
-//#define TOM_VBLANK_DURATION_IN_SCANLINES 25
-
 #define VIDEO_MODE_16BPP_CRY   0
 #define VIDEO_MODE_24BPP_RGB   1
 #define VIDEO_MODE_16BPP_DIRECT 2
 #define VIDEO_MODE_16BPP_RGB   3
 
-extern uint32 tom_width;
-extern uint32 tom_height;
+// 68000 Interrupt bit positions (enabled at $F000E0)
+
+enum { IRQ_VBLANK = 0, IRQ_GPU, IRQ_OPFLAG, IRQ_TIMER, IRQ_DSP };
 
 void tom_init(void);
 void tom_reset(void);
@@ -33,24 +32,14 @@ uint8 tom_getVideoMode(void);
 uint8 * tom_get_ram_pointer(void);
 uint16 tom_get_hdb(void);
 uint16 tom_get_vdb(void);
-uint16 tom_get_scanline(void);
-uint32 tom_getHBlankWidthInPixels(void);
-
-// 68000 Interrupt bit positions (enabled at $F000E0)
-
-/*#define IRQ_VBLANK   0
-#define IRQ_GPU                1
-#define IRQ_HBLANK  2
-#define IRQ_OPFLAG  IRQ_HBLANK
-#define IRQ_TIMER      3
-#define IRQ_DSP                4*/
-enum { IRQ_VBLANK = 0, IRQ_GPU, IRQ_OPFLAG, IRQ_TIMER, IRQ_DSP };
+//uint16 tom_get_scanline(void);
+//uint32 tom_getHBlankWidthInPixels(void);
 
 int    tom_irq_enabled(int irq);
 uint16 tom_irq_control_reg(void);
 void tom_set_irq_latch(int irq, int enabled);
 void tom_pit_exec(uint32 cycles);
-void tom_set_pending_puck_int(void);
+void tom_set_pending_jerry_int(void);
 void tom_set_pending_timer_int(void);
 void tom_set_pending_object_int(void);
 void tom_set_pending_gpu_int(void);
@@ -59,4 +48,9 @@ void tom_reset_timer(void);
 
 uint32 TOMGetSDLScreenPitch(void);
 
+// Exported variables
+
+extern uint32 tom_width;
+extern uint32 tom_height;
+
 #endif // __TOM_H__