X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftom.cpp;h=88223c2e6dc639416e7cc4b6b50c013ba8970d57;hb=d59de2a3408a34b53772bfd4b00cd3e8dc50a03b;hp=92280923fb57fb23576b07b582dd81f454594b6e;hpb=7a936c870f76998bc682b7db307d7732e36fbeac;p=virtualjaguar

diff --git a/src/tom.cpp b/src/tom.cpp
index 9228092..88223c2 100644
--- a/src/tom.cpp
+++ b/src/tom.cpp
@@ -3,10 +3,10 @@
 //
 // Originally by David Raingeard (cal2)
 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
-// Cleanups and endian wrongness amelioration by James L. Hammons
+// Cleanups and endian wrongness amelioration by James Hammons
 // (C) 2010 Underground Software
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // Who  When        What
 // ---  ----------  -------------------------------------------------------------
@@ -263,7 +263,7 @@
 #include "gpu.h"
 #include "jaguar.h"
 #include "log.h"
-#include "m68k.h"
+#include "m68000/m68kinterface.h"
 //#include "memory.h"
 #include "op.h"
 #include "settings.h"
@@ -314,8 +314,15 @@
 // Also note that VC is in *half* lines, i.e. divide by 2 to get the scanline
 /*#define LEFT_VISIBLE_HC			208
 #define RIGHT_VISIBLE_HC		1528//*/
-#define LEFT_VISIBLE_HC			208
-#define RIGHT_VISIBLE_HC		1488
+// These were right for Rayman, but that one is offset on a real TV too.
+//#define LEFT_VISIBLE_HC			208
+//#define RIGHT_VISIBLE_HC		1488
+// This is more like a real TV display...
+//#define LEFT_VISIBLE_HC			(208 - 32)
+//#define RIGHT_VISIBLE_HC		(1488 - 32)
+// Split the difference? (Seems to be OK for the most part...)
+#define LEFT_VISIBLE_HC			(208 - 16)
+#define RIGHT_VISIBLE_HC		(1488 - 16)
 //#define TOP_VISIBLE_VC		25
 //#define BOTTOM_VISIBLE_VC		503
 #define TOP_VISIBLE_VC			31
@@ -324,8 +331,8 @@
 //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 LEFT_VISIBLE_HC_PAL		(208 - 16)
+#define RIGHT_VISIBLE_HC_PAL	(1488 - 16)
 #define TOP_VISIBLE_VC_PAL		67
 #define BOTTOM_VISIBLE_VC_PAL	579
 
@@ -778,10 +785,14 @@ void tom_render_16bpp_rgb_scanline(uint32 * backbuffer)
 //
 void TOMExecHalfline(uint16 halfline, bool render)
 {
+#warning "!!! Need to handle multiple fields properly !!!"
+	// We ignore the problem for now
+	halfline &= 0x7FF;
+
 	bool inActiveDisplayArea = true;
 
 //Interlacing is still not handled correctly here... !!! FIX !!!
-	if (halfline & 0x01)							// Execute OP only on even lines (non-interlaced only!)
+	if (halfline & 0x01)							// Execute OP only on even halflines (non-interlaced only!)
 		return;
 
 //Hm, it seems that the OP needs to execute from zero, so let's try it:
@@ -1108,6 +1119,50 @@ uint32 TOMGetVideoModeHeight(void)
 // TOM reset code
 // Now PAL friendly!
 //
+/*
+The values in TOMReset come from the Jaguar BIOS.
+These values are from BJL:
+
+NSTC:
+CLK2	 181
+HP		 844
+HBB		 1713
+HBE		 125
+HS		 1741
+HVS		 651
+HEQ		 784
+HDE		 1696
+HDB1	 166
+HDB2	 166
+VP		 523
+VEE		 6
+VBE		 24
+VDB		 46
+VDE		 496
+VBB		 500
+VEB		 511
+VS		 517
+
+PAL:
+CLK2	 226
+HP		 850
+HBB		 1711
+HBE		 158
+HS		 1749
+HVS		 601
+HEQ		 787
+HDE		 1696
+HDB1	 166
+HDB2	 166
+VP		 625
+VEE		 6
+VBE		 34
+VDB		 46
+VDE		 429
+VBB		 600
+VEB		 613
+VS		 618
+*/
 void TOMReset(void)
 {
 	OPReset();