[Vice-emu-commit] SF.net SVN: vice-emu:[19078] branches/viceplus/v2.0-x64dtv/vice/src/vicii

Revision: 19078
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19078&view=rev
Author:   nojoopa
Date:     2008-07-24 14:45:22 +0000 (Thu, 24 Jul 2008)

Log Message:
-----------
Code cleanup via readded VICII(DTV)_RASTER_X_ADJ.

Modified Paths:
--------------
    branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c
    branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciitypes.h

Modified: branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c	2008-07-24 06:22:44 UTC (rev 19077)
+++ branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c	2008-07-24 14:45:22 UTC (rev 19078)
@@ -749,7 +749,7 @@
     vicii.regs[0x20] = value;
 
     raster_changes_border_add_int(&vicii.raster,
-        vicii.viciidtv?VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk))-2:VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk)),
+        vicii.viciidtv?VICIIDTV_RASTER_X_ADJ(VICII_RASTER_CYCLE(maincpu_clk)):VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk)),
         (int *)&vicii.raster.border_color,
         vicii.viciidtv?vicii.dtvpalette[value]:value);
 }
@@ -768,7 +768,7 @@
     if (!vicii.viciidtv && (vicii.regs[0x21] == value))
         return;
 
-    x_pos = vicii.viciidtv?VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk))-2:VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk));
+    x_pos = vicii.viciidtv?VICIIDTV_RASTER_X_ADJ(VICII_RASTER_CYCLE(maincpu_clk)):VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk));
 
     if (!vicii.force_black_overscan_background_color) {
         raster_changes_background_add_int(&vicii.raster, x_pos,
@@ -997,7 +997,7 @@
 
     /* make some of those constants below into defines */
     raster_changes_border_add_int(&vicii.raster,
-        VICII_RASTER_X(VICII_RASTER_CYCLE(maincpu_clk))-2,
+        VICIIDTV_RASTER_X_ADJ(cycle),
         (int *)&vicii.raster.border_disable,
         vicii.border_off);
 

Modified: branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciitypes.h
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciitypes.h	2008-07-24 06:22:44 UTC (rev 19077)
+++ branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciitypes.h	2008-07-24 14:45:22 UTC (rev 19078)
@@ -123,6 +123,10 @@
    SCREEN_WIDTH if outside the visible range.  */
 #define VICII_RASTER_X(cycle)      (((int)(cycle) - 17) * 8 + vicii.screen_leftborderwidth)
 
+/* Adjusted RASTER_X position to account for -2 pixel difference on some
+   C64DTV stores */
+#define VICIIDTV_RASTER_X_ADJ(cycle)     (VICII_RASTER_X(cycle) - 2)
+
 /* Current vertical position of the raster.  Unlike `rasterline', which is
    only accurate if a pending drawing event has been served, this is
    guarranteed to be always correct.  It is a bit slow, though.  */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.