X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftom.cpp;h=ca38c13c54fb879b52ac6d78b29f177d458c9d25;hb=3580a9ef98432ed54f065f2d537d588fdc083592;hp=a8e482d6c6f1718ffa00a8a0bc2ebd1effd178f3;hpb=acd4dec52a1502aed6a1a74dc383610b56b205ec;p=virtualjaguar diff --git a/src/tom.cpp b/src/tom.cpp index a8e482d..ca38c13 100644 --- a/src/tom.cpp +++ b/src/tom.cpp @@ -251,6 +251,9 @@ #include "objectp.h" #include "cry2rgb.h" #include "settings.h" +#include "clock.h" + +#define NEW_TIMER_SYSTEM // TOM registers (offset from $F00000) @@ -284,20 +287,27 @@ //NOTE: These arbitrary cutoffs are NOT taken into account for PAL jaguar screens. !!! FIX !!! // Arbitrary video cutoff values (i.e., first/last visible spots on a TV, in HC ticks) -/*#define LEFT_VISIBLE_HC 208 -#define RIGHT_VISIBLE_HC 1528//*/ -#define LEFT_VISIBLE_HC 208 -#define RIGHT_VISIBLE_HC 1488 +/*#define LEFT_VISIBLE_HC 208 +#define RIGHT_VISIBLE_HC 1528//*/ +#define LEFT_VISIBLE_HC 208 +#define RIGHT_VISIBLE_HC 1488 //#define TOP_VISIBLE_VC 25 -//#define BOTTOM_VISIBLE_VC 503 -#define TOP_VISIBLE_VC 31 -#define BOTTOM_VISIBLE_VC 511 +//#define BOTTOM_VISIBLE_VC 503 +#define TOP_VISIBLE_VC 31 +#define BOTTOM_VISIBLE_VC 511 + +//Are these PAL horizontals correct? +//They seem to be for the most part, but there are some games that seem to be +//shifted over to the right from this "window". +#define LEFT_VISIBLE_HC_PAL 208 +#define RIGHT_VISIBLE_HC_PAL 1488 +#define TOP_VISIBLE_VC_PAL 67 +#define BOTTOM_VISIBLE_VC_PAL 579 //This can be defined in the makefile as well... //(It's easier to do it here, though...) //#define TOM_DEBUG -extern uint32 jaguar_mainRom_crc32; extern uint8 objectp_running; static uint8 * tom_ram_8; @@ -310,27 +320,28 @@ static int32 tom_timer_counter; uint16 tom_jerry_int_pending, tom_timer_int_pending, tom_object_int_pending, tom_gpu_int_pending, tom_video_int_pending; uint16 * tom_cry_rgb_mix_lut; -int16 * TOMBackbuffer; +//int16 * TOMBackbuffer; +uint32 * TOMBackbuffer; static char * videoMode_to_str[8] = { "16 BPP CRY", "24 BPP RGB", "16 BPP DIRECT", "16 BPP RGB", "Mixed mode", "24 BPP RGB", "16 BPP DIRECT", "16 BPP RGB" }; -typedef void (render_xxx_scanline_fn)(int16 *); +typedef void (render_xxx_scanline_fn)(uint32 *); // Private function prototypes -void tom_render_16bpp_cry_scanline(int16 * backbuffer); -void tom_render_24bpp_scanline(int16 * backbuffer); -void tom_render_16bpp_direct_scanline(int16 * backbuffer); -void tom_render_16bpp_rgb_scanline(int16 * backbuffer); -void tom_render_16bpp_cry_rgb_mix_scanline(int16 * backbuffer); +void tom_render_16bpp_cry_scanline(uint32 * backbuffer); +void tom_render_24bpp_scanline(uint32 * backbuffer); +void tom_render_16bpp_direct_scanline(uint32 * backbuffer); +void tom_render_16bpp_rgb_scanline(uint32 * backbuffer); +void tom_render_16bpp_cry_rgb_mix_scanline(uint32 * backbuffer); -void tom_render_16bpp_cry_stretch_scanline(int16 * backbuffer); -void tom_render_24bpp_stretch_scanline(int16 * backbuffer); -void tom_render_16bpp_direct_stretch_scanline(int16 * backbuffer); -void tom_render_16bpp_rgb_stretch_scanline(int16 * backbuffer); -void tom_render_16bpp_cry_rgb_mix_stretch_scanline(int16 * backbuffer); +void tom_render_16bpp_cry_stretch_scanline(uint32 * backbuffer); +void tom_render_24bpp_stretch_scanline(uint32 * backbuffer); +void tom_render_16bpp_direct_stretch_scanline(uint32 * backbuffer); +void tom_render_16bpp_rgb_stretch_scanline(uint32 * backbuffer); +void tom_render_16bpp_cry_rgb_mix_stretch_scanline(uint32 * backbuffer); render_xxx_scanline_fn * scanline_render_normal[]= { @@ -359,6 +370,81 @@ render_xxx_scanline_fn * scanline_render_stretch[]= render_xxx_scanline_fn * scanline_render[8]; +// Screen info for various games [PAL]... +/* +BIOS +TOM: Horizontal Period written by M68K: 850 (+1*2 = 1702) +TOM: Horizontal Blank Begin written by M68K: 1711 +TOM: Horizontal Blank End written by M68K: 158 +TOM: Horizontal Display End written by M68K: 1696 +TOM: Horizontal Display Begin 1 written by M68K: 166 +TOM: Vertical Period written by M68K: 623 (non-interlaced) +TOM: Vertical Blank End written by M68K: 34 +TOM: Vertical Display Begin written by M68K: 46 +TOM: Vertical Display End written by M68K: 526 +TOM: Vertical Blank Begin written by M68K: 600 +TOM: Vertical Sync written by M68K: 618 +TOM: Horizontal Display End written by M68K: 1665 +TOM: Horizontal Display Begin 1 written by M68K: 203 +TOM: Vertical Display Begin written by M68K: 38 +TOM: Vertical Display End written by M68K: 518 +TOM: Video Mode written by M68K: 06C1. PWIDTH = 4, MODE = 16 BPP CRY, flags: BGEN (VC = 151) +TOM: Horizontal Display End written by M68K: 1713 +TOM: Horizontal Display Begin 1 written by M68K: 157 +TOM: Vertical Display Begin written by M68K: 35 +TOM: Vertical Display End written by M68K: 2047 +Horizontal range: 157 - 1713 (width: 1557 / 4 = 389.25, / 5 = 315.4) + +Asteroid +TOM: Horizontal Period written by M68K: 845 (+1*2 = 1692) +TOM: Horizontal Blank Begin written by M68K: 1700 +TOM: Horizontal Blank End written by M68K: 122 +TOM: Horizontal Display End written by M68K: 1600 +TOM: Horizontal Display Begin 1 written by M68K: 268 +TOM: Vertical Period written by M68K: 523 (non-interlaced) +TOM: Vertical Blank End written by M68K: 40 +TOM: Vertical Display Begin written by M68K: 44 +TOM: Vertical Display End written by M68K: 492 +TOM: Vertical Blank Begin written by M68K: 532 +TOM: Vertical Sync written by M68K: 513 +TOM: Video Mode written by M68K: 04C7. PWIDTH = 3, MODE = 16 BPP RGB, flags: BGEN (VC = 461) + +Rayman +TOM: Horizontal Display End written by M68K: 1713 +TOM: Horizontal Display Begin 1 written by M68K: 157 +TOM: Vertical Display Begin written by M68K: 35 +TOM: Vertical Display End written by M68K: 2047 +TOM: Video Mode written by M68K: 06C7. PWIDTH = 4, MODE = 16 BPP RGB, flags: BGEN (VC = 89) +TOM: Horizontal Display Begin 1 written by M68K: 208 +TOM: Horizontal Display End written by M68K: 1662 +TOM: Vertical Display Begin written by M68K: 100 +TOM: Vertical Display End written by M68K: 2047 +TOM: Video Mode written by M68K: 07C7. PWIDTH = 4, MODE = 16 BPP RGB, flags: BGEN VARMOD (VC = 205) +Horizontal range: 208 - 1662 (width: 1455 / 4 = 363.5) + +Alien vs Predator +TOM: Vertical Display Begin written by M68K: 96 +TOM: Vertical Display End written by M68K: 2047 +TOM: Horizontal Display Begin 1 written by M68K: 239 +TOM: Horizontal Display End written by M68K: 1692 +TOM: Video Mode written by M68K: 06C1. PWIDTH = 4, MODE = 16 BPP CRY, flags: BGEN (VC = 378) +TOM: Vertical Display Begin written by M68K: 44 +TOM: Vertical Display End written by M68K: 2047 +TOM: Horizontal Display Begin 1 written by M68K: 239 +TOM: Horizontal Display End written by M68K: 1692 +TOM: Video Mode written by M68K: 06C7. PWIDTH = 4, MODE = 16 BPP RGB, flags: BGEN (VC = 559) +TOM: Vertical Display Begin written by M68K: 84 +TOM: Vertical Display End written by M68K: 2047 +TOM: Horizontal Display Begin 1 written by M68K: 239 +TOM: Horizontal Display End written by M68K: 1692 +TOM: Vertical Display Begin written by M68K: 44 +TOM: Vertical Display End written by M68K: 2047 +TOM: Horizontal Display Begin 1 written by M68K: 239 +TOM: Horizontal Display End written by M68K: 1692 +Horizontal range: 239 - 1692 (width: 1454 / 4 = 363.5) + +*/ + // Screen info for various games [NTSC]... /* Doom @@ -454,8 +540,39 @@ Trevor McFur Vertical resolution: 238 lines */ +uint32 RGB16ToRGB32[0x10000]; +uint32 CRY16ToRGB32[0x10000]; +uint32 MIX16ToRGB32[0x10000]; + +void TOMFillLookupTables(void) +{ + for(uint32 i=0; i<0x10000; i++) + RGB16ToRGB32[i] = 0xFF000000 + | ((i & 0xF100) >> 8) | ((i & 0xE000) >> 13) + | ((i & 0x07C0) << 13) | ((i & 0x0700) << 8) + | ((i & 0x003F) << 10) | ((i & 0x0030) << 4); + + + for(uint32 i=0; i<0x10000; i++) + { + uint32 chrm = (i & 0xF000) >> 12, + chrl = (i & 0x0F00) >> 8, + y = (i & 0x00FF); + + uint32 r = (((uint32)redcv[chrm][chrl]) * y) >> 8, + g = (((uint32)greencv[chrm][chrl]) * y) >> 8, + b = (((uint32)bluecv[chrm][chrl]) * y) >> 8; + + CRY16ToRGB32[i] = 0xFF000000 | (b << 16) | (g << 8) | r; + MIX16ToRGB32[i] = CRY16ToRGB32[i]; + } + + for(uint32 i=0; i<0x10000; i++) + if (i & 0x01) + MIX16ToRGB32[i] = RGB16ToRGB32[i]; +} -void tom_calc_cry_rgb_mix_lut(void) +/*void tom_calc_cry_rgb_mix_lut(void) { for (uint32 i=0; i<0x10000; i++) { @@ -479,7 +596,7 @@ void tom_calc_cry_rgb_mix_lut(void) tom_cry_rgb_mix_lut[i] = color; } -} +}*/ void tom_set_pending_jerry_int(void) { @@ -528,26 +645,33 @@ uint16 tom_get_vdb(void) // // 16 BPP CRY/RGB mixed mode rendering // -void tom_render_16bpp_cry_rgb_mix_scanline(int16 * backbuffer) +void tom_render_16bpp_cry_rgb_mix_scanline(uint32 * backbuffer) { +//CHANGED TO 32BPP RENDERING uint16 width = tom_width; uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800]; //New stuff--restrict our drawing... uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1; //NOTE: May have to check HDB2 as well! - int16 startPos = GET16(tom_ram_8, HDB1) - LEFT_VISIBLE_HC; // Get start position in HC ticks + // Get start position in HC ticks + int16 startPos = GET16(tom_ram_8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); startPos /= pwidth; if (startPos < 0) current_line_buffer += 2 * -startPos; else +//This case doesn't properly handle the "start on the right side of virtual screen" case +//Dunno why--looks Ok... +//What *is* for sure wrong is that it doesn't copy the linebuffer's BG pixels... +//This should likely be 4 instead of 2 (?--not sure) backbuffer += 2 * startPos, width -= startPos; while (width) { uint16 color = (*current_line_buffer++) << 8; color |= *current_line_buffer++; - *backbuffer++ = tom_cry_rgb_mix_lut[color]; +// *backbuffer++ = tom_cry_rgb_mix_lut[color]; + *backbuffer++ = MIX16ToRGB32[color]; width--; } } @@ -555,35 +679,28 @@ void tom_render_16bpp_cry_rgb_mix_scanline(int16 * backbuffer) // // 16 BPP CRY mode rendering // -void tom_render_16bpp_cry_scanline(int16 * backbuffer) +void tom_render_16bpp_cry_scanline(uint32 * backbuffer) { +//CHANGED TO 32BPP RENDERING uint16 width = tom_width; uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800]; //New stuff--restrict our drawing... uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1; //NOTE: May have to check HDB2 as well! - int16 startPos = GET16(tom_ram_8, HDB1) - LEFT_VISIBLE_HC; // Get start position in HC ticks + int16 startPos = GET16(tom_ram_8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL);// Get start position in HC ticks startPos /= pwidth; if (startPos < 0) current_line_buffer += 2 * -startPos; else +//This should likely be 4 instead of 2 (?--not sure) backbuffer += 2 * startPos, width -= startPos; while (width) { uint16 color = (*current_line_buffer++) << 8; color |= *current_line_buffer++; - - uint32 chrm = (color & 0xF000) >> 12, - chrl = (color & 0x0F00) >> 8, - y = (color & 0x00FF); - - uint16 red = (((uint32)redcv[chrm][chrl]) * y) >> 11, - green = (((uint32)greencv[chrm][chrl]) * y) >> 11, - blue = (((uint32)bluecv[chrm][chrl]) * y) >> 11; - - *backbuffer++ = (red << 10) | (green << 5) | blue; + *backbuffer++ = CRY16ToRGB32[color]; width--; } } @@ -591,30 +708,30 @@ void tom_render_16bpp_cry_scanline(int16 * backbuffer) // // 24 BPP mode rendering // -void tom_render_24bpp_scanline(int16 * backbuffer) +void tom_render_24bpp_scanline(uint32 * backbuffer) { +//CHANGED TO 32BPP RENDERING uint16 width = tom_width; uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800]; //New stuff--restrict our drawing... uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1; //NOTE: May have to check HDB2 as well! - int16 startPos = GET16(tom_ram_8, HDB1) - LEFT_VISIBLE_HC; // Get start position in HC ticks + int16 startPos = GET16(tom_ram_8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); // Get start position in HC ticks startPos /= pwidth; if (startPos < 0) current_line_buffer += 4 * -startPos; else +//This should likely be 4 instead of 2 (?--not sure) backbuffer += 2 * startPos, width -= startPos; while (width) { - // This is NOT a good 8 -> 5 bit RGB conversion! (It saturates values below 8 - // to zero and throws away almost *half* the color resolution!) - uint16 green = (*current_line_buffer++) >> 3; - uint16 red = (*current_line_buffer++) >> 3; + uint32 g = *current_line_buffer++; + uint32 r = *current_line_buffer++; current_line_buffer++; - uint16 blue = (*current_line_buffer++) >> 3; - *backbuffer++ = (red << 10) | (green << 5) | blue; + uint32 b = *current_line_buffer++; + *backbuffer++ = 0xFF000000 | (b << 16) | (g << 8) | r; width--; } } @@ -624,7 +741,7 @@ void tom_render_24bpp_scanline(int16 * backbuffer) // // 16 BPP direct mode rendering // -void tom_render_16bpp_direct_scanline(int16 * backbuffer) +void tom_render_16bpp_direct_scanline(uint32 * backbuffer) { uint16 width = tom_width; uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800]; @@ -641,35 +758,41 @@ void tom_render_16bpp_direct_scanline(int16 * backbuffer) // // 16 BPP RGB mode rendering // -void tom_render_16bpp_rgb_scanline(int16 * backbuffer) +void tom_render_16bpp_rgb_scanline(uint32 * backbuffer) { +//CHANGED TO 32BPP RENDERING + // 16 BPP RGB: 0-5 green, 6-10 blue, 11-15 red + uint16 width = tom_width; uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800]; //New stuff--restrict our drawing... uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1; //NOTE: May have to check HDB2 as well! - int16 startPos = GET16(tom_ram_8, HDB1) - LEFT_VISIBLE_HC; // Get start position in HC ticks + int16 startPos = GET16(tom_ram_8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); // Get start position in HC ticks startPos /= pwidth; + if (startPos < 0) current_line_buffer += 2 * -startPos; else +//This should likely be 4 instead of 2 (?--not sure) backbuffer += 2 * startPos, width -= startPos; while (width) { - uint16 color = (*current_line_buffer++) << 8; - color = (color | *current_line_buffer++) >> 1; - color = (color&0x7C00) | ((color&0x03E0) >> 5) | ((color&0x001F) << 5); - *backbuffer++ = color; + uint32 color = (*current_line_buffer++) << 8; + color |= *current_line_buffer++; + *backbuffer++ = RGB16ToRGB32[color]; width--; } } -// This stuff may just go away by itself, especially if we do some -// good old OpenGL goodness... +///////////////////////////////////////////////////////////////////// +// This stuff may just go away by itself, especially if we do some // +// good old OpenGL goodness... // +///////////////////////////////////////////////////////////////////// -void tom_render_16bpp_cry_rgb_mix_stretch_scanline(int16 *backbuffer) +void tom_render_16bpp_cry_rgb_mix_stretch_scanline(uint32 *backbuffer) { uint16 width=tom_width; uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800]; @@ -686,7 +809,7 @@ void tom_render_16bpp_cry_rgb_mix_stretch_scanline(int16 *backbuffer) } } -void tom_render_16bpp_cry_stretch_scanline(int16 *backbuffer) +void tom_render_16bpp_cry_stretch_scanline(uint32 *backbuffer) { uint32 chrm, chrl, y; @@ -730,7 +853,7 @@ void tom_render_16bpp_cry_stretch_scanline(int16 *backbuffer) } } -void tom_render_24bpp_stretch_scanline(int16 *backbuffer) +void tom_render_24bpp_stretch_scanline(uint32 *backbuffer) { uint16 width=tom_width; uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800]; @@ -750,7 +873,7 @@ void tom_render_24bpp_stretch_scanline(int16 *backbuffer) } } -void tom_render_16bpp_direct_stretch_scanline(int16 *backbuffer) +void tom_render_16bpp_direct_stretch_scanline(uint32 *backbuffer) { uint16 width=tom_width; uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800]; @@ -767,7 +890,7 @@ void tom_render_16bpp_direct_stretch_scanline(int16 *backbuffer) } } -void tom_render_16bpp_rgb_stretch_scanline(int16 *backbuffer) +void tom_render_16bpp_rgb_stretch_scanline(uint32 *backbuffer) { uint16 width=tom_width; uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800]; @@ -792,7 +915,7 @@ void tom_render_16bpp_rgb_stretch_scanline(int16 *backbuffer) } } -void TOMResetBackbuffer(int16 * backbuffer) +void TOMResetBackbuffer(uint32 * backbuffer) { TOMBackbuffer = backbuffer; } @@ -826,23 +949,30 @@ void TOMExecScanline(uint16 scanline, bool render) else inActiveDisplayArea = false; +//Try to take PAL into account... +uint16 topVisible = (vjs.hardwareTypeNTSC ? TOP_VISIBLE_VC : TOP_VISIBLE_VC_PAL), + bottomVisible = (vjs.hardwareTypeNTSC ? BOTTOM_VISIBLE_VC : BOTTOM_VISIBLE_VC_PAL); // Here's our virtualized scanline code... - if (scanline >= TOP_VISIBLE_VC && scanline < BOTTOM_VISIBLE_VC) + if (scanline >= topVisible && scanline < bottomVisible) { if (inActiveDisplayArea) scanline_render[tom_getVideoMode()](TOMBackbuffer); else { // If outside of VDB & VDE, then display the border color - int16 * currentLineBuffer = TOMBackbuffer; +/* int16 * currentLineBuffer = TOMBackbuffer; + uint8 g = tom_ram_8[BORD1], r = tom_ram_8[BORD1 + 1], b = tom_ram_8[BORD2 + 1]; + uint16 pixel = ((r & 0xF8) << 7) | ((g & 0xF8) << 2) | (b >> 3);//*/ + uint32 * currentLineBuffer = TOMBackbuffer; uint8 g = tom_ram_8[BORD1], r = tom_ram_8[BORD1 + 1], b = tom_ram_8[BORD2 + 1]; - uint16 pixel = ((r & 0xF8) << 7) | ((g & 0xF8) << 2) | (b >> 3); + uint32 pixel = 0xFF000000 | (b << 16) | (g << 8) | r; for(uint32 i=0; i> 9) + 1; - return (RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC) / pwidth; + return (vjs.hardwareTypeNTSC ? RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC : RIGHT_VISIBLE_HC_PAL - LEFT_VISIBLE_HC_PAL) / pwidth; //Temporary, for testing Doom... // return (RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC) / (pwidth == 8 ? 4 : pwidth); //// return (RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC) / (pwidth == 4 ? 8 : pwidth); @@ -1033,7 +1164,7 @@ void tom_reset(void) tom_gpu_int_pending = 0; tom_video_int_pending = 0; - tom_timer_prescaler = 0; + tom_timer_prescaler = 0; // TOM PIT is disabled tom_timer_divider = 0; tom_timer_counter = 0; memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render)); @@ -1339,34 +1470,67 @@ int tom_irq_enabled(int irq) return (tom_ram_8[0xE0] << 8) | tom_ram_8[0xE1]; }*/ +// NEW: +// TOM Programmable Interrupt Timer handler +// NOTE: TOM's PIT is only enabled if the prescaler is != 0 +// The PIT only generates an interrupt when it counts down to zero, not when loaded! + +void TOMPITCallback(void); + void TOMResetPIT(void) { - if (!tom_timer_prescaler || !tom_timer_divider) - tom_timer_counter = 0; - else -//Probably should *add* this amount to the counter to retain cycle accuracy! !!! FIX !!! -//Also, why +1??? - tom_timer_counter = (1 + tom_timer_prescaler) * (1 + tom_timer_divider); +#ifndef NEW_TIMER_SYSTEM +//Probably should *add* this amount to the counter to retain cycle accuracy! !!! FIX !!! [DONE] +//Also, why +1??? 'Cause that's what it says in the JTRM...! +//There is a small problem with this approach: If both the prescaler and the divider are equal +//to $FFFF then the counter won't be large enough to handle it. !!! FIX !!! + if (tom_timer_prescaler) + tom_timer_counter += (1 + tom_timer_prescaler) * (1 + tom_timer_divider); // WriteLog("tom: reseting timer to 0x%.8x (%i)\n",tom_timer_counter,tom_timer_counter); +#else + // Need to remove previous timer from the queue, if it exists... + RemoveCallback(TOMPITCallback); + + if (tom_timer_prescaler) + { + double usecs = (float)(tom_timer_prescaler + 1) * (float)(tom_timer_divider + 1) * RISC_CYCLE_IN_USEC; + SetCallbackTime(TOMPITCallback, usecs); + } +#endif } // // TOM Programmable Interrupt Timer handler +// NOTE: TOM's PIT is only enabled if the prescaler is != 0 // void TOMExecPIT(uint32 cycles) { - if (tom_timer_counter > 0) + if (tom_timer_prescaler) { tom_timer_counter -= cycles; if (tom_timer_counter <= 0) { tom_set_pending_timer_int(); - GPUSetIRQLine(GPUIRQ_TIMER, ASSERT_LINE); - if (tom_irq_enabled(IRQ_TIMER) && jaguar_interrupt_handler_is_valid(64)) - m68k_set_irq(7); // Cause a 68000 NMI... + GPUSetIRQLine(GPUIRQ_TIMER, ASSERT_LINE); // GPUSetIRQLine does the 'IRQ enabled' checking + if (tom_irq_enabled(IRQ_TIMER))//get rid of this crap -> && jaguar_interrupt_handler_is_valid(64)) + m68k_set_irq(7); // Cause a 68000 NMI... TOMResetPIT(); } } } + + +void TOMPITCallback(void) +{ +// INT1_RREG |= 0x08; // Set TOM PIT interrupt pending + tom_set_pending_timer_int(); + GPUSetIRQLine(GPUIRQ_TIMER, ASSERT_LINE); // It does the 'IRQ enabled' checking + +// if (INT1_WREG & 0x08) + if (tom_irq_enabled(IRQ_TIMER)) + m68k_set_irq(7); // Generate 68K NMI + + TOMResetPIT(); +}