From: Toni Wilen <twilen@winuae.net>
Date: Sun, 11 Oct 2020 17:18:52 +0000 (+0300)
Subject: CV64/3D uses original Virge, not Virge/DX chip.
X-Git-Tag: 4900~284
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=2660f159a19d4c924a8e75a5858726c69f0e1390;p=francis%2Fwinuae.git

CV64/3D uses original Virge, not Virge/DX chip.
---

diff --git a/gfxboard.cpp b/gfxboard.cpp
index 7a4728fc..0ef76557 100644
--- a/gfxboard.cpp
+++ b/gfxboard.cpp
@@ -180,14 +180,14 @@ static const struct gfxboard boards[] =
 		_T("CyberVision 64/3D Zorro II"), _T("Phase 5"), _T("CV643D_Z2"),
 		8512, 67, 0,
 		0x00000000, 0x00400000, 0x00400000, 0x00400000, 0, 2, 2, false,
-		0, 0, NULL, &s3_virge_375_device
+		0, 0, NULL, &s3_virge_device
 	},
 	{
 		GFXBOARD_ID_CV643D_Z3,
 		_T("CyberVision 64/3D Zorro III"), _T("Phase 5"), _T("CV643D_Z3"),
 		8512, 67, 0,
 		0x00000000, 0x00400000, 0x00400000, 0x10000000, 0, 3, 2, false,
-		0, 0, NULL, &s3_virge_375_device
+		0, 0, NULL, &s3_virge_device
 	},
 	{
 		GFXBOARD_ID_PICASSO2,
@@ -2416,7 +2416,7 @@ static void REGPARAM2 gfxboard_wput_mem_autoconfig (uaecptr addr, uae_u32 b)
 		gb->gfxboard_bank_memory.wput = gfxboard_wput_mem;
 		if (gb->board->pcemdev) {
 			if (boardnum == GFXBOARD_ID_CV643D_Z3) {
-				gb->gfxboardmem_start += 0x4800000;
+				gb->gfxboardmem_start += 0x4000000;
 			}
 		}
 		init_board(gb);
diff --git a/pcem/vid_s3_virge.cpp b/pcem/vid_s3_virge.cpp
index f7031c59..b029b991 100644
--- a/pcem/vid_s3_virge.cpp
+++ b/pcem/vid_s3_virge.cpp
@@ -3912,6 +3912,7 @@ static void *s3_virge_init()
                    s3_virge_in, s3_virge_out,
                    s3_virge_hwcursor_draw,
                    s3_virge_overlay_draw);
+        virge->svga.vblank_start = s3_virge_vblank_start;
 
         rom_init(&virge->bios_rom, "s3virge.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
         if (PCI)
@@ -4216,7 +4217,6 @@ static device_config_t s3_virge_config[] =
 };
 #endif
 
-#ifndef UAE
 device_t s3_virge_device =
 {
         "Diamond Stealth 3D 2000 (S3 ViRGE)",
@@ -4227,10 +4227,12 @@ device_t s3_virge_device =
         s3_virge_speed_changed,
         s3_virge_force_redraw,
         s3_virge_add_status_info,
+#ifndef UAE
         s3_virge_config
-};
 #endif
+};
 
+#ifndef UAE
 device_t s3_virge_375_device =
 {
         "S3 ViRGE/DX",
@@ -4241,7 +4243,6 @@ device_t s3_virge_375_device =
         s3_virge_speed_changed,
         s3_virge_force_redraw,
         s3_virge_add_status_info,
-#ifndef UAE
         s3_virge_config
-#endif
 };
+#endif