From e3f8e57269a80a7a65a0f9e31c0bc6111c76cf0e Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 3 Aug 2016 20:41:50 +0200
Subject: [PATCH] The Stealth64 now correctly uses the Vision864 chip.

---
 src/ibm.h    |  2 +-
 src/vid_s3.c | 24 ++++++++++++++++--------
 src/video.c  |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/ibm.h b/src/ibm.h
index c4817a81a..b6169ca40 100644
--- a/src/ibm.h
+++ b/src/ibm.h
@@ -397,7 +397,7 @@ enum
         GFX_OTI077,     /*Oak OTI-077*/
 	GFX_ET4000W32CS,	/*Tseng ET4000/W32p (Cardex) (ICS RAMDAC) */
 	GFX_VGAWONDERXL24,	/*Compaq ATI VGA Wonder XL24 (28800-6)*/
-	GFX_STEALTH64,	/*S3 764/Trio64 (Diamond Stealth 64)*/
+	GFX_STEALTH64,	/*S3 Vision864 (Diamond Stealth 64)*/
         GFX_MAX
 };
 
diff --git a/src/vid_s3.c b/src/vid_s3.c
index b0550b88c..042d975a4 100644
--- a/src/vid_s3.c
+++ b/src/vid_s3.c
@@ -2297,15 +2297,15 @@ int s3_phoenix_trio64_available()
 
 void *s3_diamond_stealth64_init()
 {
-        s3_t *s3 = s3_init("roms/STEALT64.BIN", S3_TRIO64);
+        s3_t *s3 = s3_init("roms/STEALT64.BIN", S3_VISION864);
         svga_t *svga = &s3->svga;
 
-        s3->id = 0xe1; /*Trio64*/
-        s3->id_ext = s3->id_ext_pci = 0x11;
-        s3->packed_mmio = 1;
-
-        s3->getclock = s3_trio64_getclock;
-        s3->getclock_p = s3;
+        s3->id = 0xc1; /*Vision864P*/
+        s3->id_ext = s3->id_ext_pci = 0xc1;
+        s3->packed_mmio = 0;
+        
+        s3->getclock = sdac_getclock;
+        s3->getclock_p = &s3->ramdac;
 
         return s3;
 }
@@ -2529,6 +2529,14 @@ static device_config_t s3_diamond_stealth64_config[] =
                                 .description = "4 MB",
                                 .value = 4
                         },
+                        {
+                                .description = "6 MB",
+                                .value = 6
+                        },
+                        {
+                                .description = "8 MB",
+                                .value = 8
+                        },
                         {
                                 .description = ""
                         }
@@ -2638,7 +2646,7 @@ device_t s3_phoenix_trio64_device =
 
 device_t s3_diamond_stealth64_device =
 {
-        "Phoenix S3 Trio64 (Diamond Stealth64)",
+        "S3 Vision864 (Diamond Stealth64)",
         0,
         s3_diamond_stealth64_init,
         s3_close,
diff --git a/src/video.c b/src/video.c
index 43b8687da..d7f0a5b0e 100644
--- a/src/video.c
+++ b/src/video.c
@@ -59,7 +59,7 @@ static VIDEO_CARD video_cards[] =
         {"CGA",                                    &cga_device,                 GFX_CGA},
         {"Cirrus Logic CL-GD5429",                 &gd5429_device,              GFX_CL_GD5429},
         {"Diamond Stealth 32 (Tseng ET4000/w32p)", &et4000w32p_device,          GFX_ET4000W32},
-        {"Diamond Stealth 64 DRAM (S3 Trio64)",    &s3_diamond_stealth64_device,GFX_STEALTH64},
+        {"Diamond Stealth 64 DRAM (S3 Vision864)", &s3_diamond_stealth64_device,GFX_STEALTH64},
         {"Diamond Stealth 3D 2000 (S3 ViRGE)",     &s3_virge_device,            GFX_VIRGE},
         {"EGA",                                    &ega_device,                 GFX_EGA},
         {"Chips & Technologies SuperEGA",          &sega_device,           	GFX_SUPER_EGA},