X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Finclude%2Ftom.h;h=a98aadfca23ecee91df01be16e9eb1130db895e0;hb=cd61d997688c71e8eeecf39e4ce9d77a08872d7b;hp=e521d58b334f6e862f915aa73049966179d45222;hpb=135a0c52a2bcbcc37192c61801de6e9c80aeebff;p=virtualjaguar

diff --git a/src/include/tom.h b/src/include/tom.h
index e521d58..a98aadf 100644
--- a/src/include/tom.h
+++ b/src/include/tom.h
@@ -7,23 +7,24 @@
 
 #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);
 void tom_done(void);
-unsigned tom_byte_read(unsigned int offset);
-unsigned tom_word_read(unsigned int offset);
-void tom_byte_write(unsigned  offset, unsigned  data);
-void tom_word_write(unsigned  offset, unsigned  data);
+
+uint8 TOMReadByte(uint32 offset, uint32 who = UNKNOWN);
+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 tom_exec_scanline(int16 * backbuffer, int32 scanline, bool render);
 uint32 tom_getVideoModeWidth(void);
 uint32 tom_getVideoModeHeight(void);
@@ -31,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);
@@ -57,4 +48,9 @@ void tom_reset_timer(void);
 
 uint32 TOMGetSDLScreenPitch(void);
 
+// Exported variables
+
+extern uint32 tom_width;
+extern uint32 tom_height;
+
 #endif	// __TOM_H__