X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftom.h;h=a484d78775ab9e3dc1306e2c89effbcd67e533de;hb=438d3a52ef0af04ac3279c0839fe6ffd7333b776;hp=091cd0cffa71bbecb1cd8a8f686582136a81c288;hpb=6c19e4098a43c47f8cd1824902f7335e124b834f;p=virtualjaguar

diff --git a/src/tom.h b/src/tom.h
index 091cd0c..a484d78 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
@@ -17,9 +18,9 @@
 
 enum { IRQ_VBLANK = 0, IRQ_GPU, IRQ_OPFLAG, IRQ_TIMER, IRQ_DSP };
 
-void tom_init(void);
-void tom_reset(void);
-void tom_done(void);
+void TOMInit(void);
+void TOMReset(void);
+void TOMDone(void);
 
 uint8 TOMReadByte(uint32 offset, uint32 who = UNKNOWN);
 uint16 TOMReadWord(uint32 offset, uint32 who = UNKNOWN);
@@ -28,24 +29,24 @@ void TOMWriteWord(uint32 offset, uint16 data, uint32 who = UNKNOWN);
 
 //void TOMExecScanline(int16 * backbuffer, int32 scanline, bool render);
 void TOMExecScanline(uint16 scanline, bool render);
-uint32 tom_getVideoModeWidth(void);
-uint32 tom_getVideoModeHeight(void);
-uint8 tom_getVideoMode(void);
-uint8 * tom_get_ram_pointer(void);
-uint16 tom_get_hdb(void);
-uint16 tom_get_vdb(void);
+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	tom_irq_enabled(int irq);
-uint16 tom_irq_control_reg(void);
-void tom_set_irq_latch(int irq, int enabled);
+int	TOMIRQEnabled(int irq);
+uint16 TOMIRQControlReg(void);
+void TOMSetIRQLatch(int irq, int enabled);
 void TOMExecPIT(uint32 cycles);
-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);
-void tom_set_pending_video_int(void);
+void TOMSetPendingJERRYInt(void);
+void TOMSetPendingTimerInt(void);
+void TOMSetPendingObjectInt(void);
+void TOMSetPendingGPUInt(void);
+void TOMSetPendingVideoInt(void);
 void TOMResetPIT(void);
 
 //uint32 TOMGetSDLScreenPitch(void);
@@ -53,8 +54,13 @@ void TOMResetBackbuffer(uint32 * backbuffer);
 
 // Exported variables
 
-extern uint32 tom_width;
-extern uint32 tom_height;
-extern uint8 tom_ram_8[];
+extern uint32 tomWidth;
+extern uint32 tomHeight;
+extern uint8 tomRam8[];
+extern uint32 tomTimerPrescaler;
+extern uint32 tomTimerDivider;
+extern int32 tomTimerCounter;
+
+extern uint32 tomDeviceWidth;
 
 #endif	// __TOM_H__