From b6466ba266f3af63c985c78dbc4ac3798dcc3957 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Thu, 10 Nov 2022 17:20:54 -0500
Subject: [PATCH] Voodoo3 3500 SI

---
 src/include/86box/video.h      |  1 +
 src/video/vid_table.c          |  1 +
 src/video/vid_voodoo_banshee.c | 35 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/src/include/86box/video.h b/src/include/86box/video.h
index 86b077387..0dad732e8 100644
--- a/src/include/86box/video.h
+++ b/src/include/86box/video.h
@@ -531,6 +531,7 @@ extern const device_t voodoo_3_3500_agp_ntsc_device;
 extern const device_t voodoo_3_3500_agp_pal_device;
 extern const device_t compaq_voodoo_3_3500_agp_device;
 extern const device_t voodoo_3_3500_se_agp_device;
+extern const device_t voodoo_3_3500_si_agp_device;
 extern const device_t velocity_100_agp_device;
 extern const device_t velocity_200_agp_device;
 
diff --git a/src/video/vid_table.c b/src/video/vid_table.c
index d8d908e24..b6b55f56f 100644
--- a/src/video/vid_table.c
+++ b/src/video/vid_table.c
@@ -259,6 +259,7 @@ video_cards[] = {
     { &voodoo_3_3500_agp_pal_device                  },
     { &compaq_voodoo_3_3500_agp_device               },
     { &voodoo_3_3500_se_agp_device                   },
+    { &voodoo_3_3500_si_agp_device                   },
     { NULL                                           }
 };
 // clang-format on
diff --git a/src/video/vid_voodoo_banshee.c b/src/video/vid_voodoo_banshee.c
index 7bedf661d..ca22eae02 100644
--- a/src/video/vid_voodoo_banshee.c
+++ b/src/video/vid_voodoo_banshee.c
@@ -55,6 +55,7 @@
 #define ROM_VOODOO3_3500_AGP_PAL    "roms/video/voodoo/35k05p.rom"
 #define ROM_VOODOO3_3500_AGP_COMPAQ "roms/video/voodoo/V3_3500_AGP_SD_2.15.05_Compaq.rom"
 #define ROM_VOODOO3_3500_SE_AGP     "roms/video/voodoo/V3_3500_AGP_SD_2.15.06_NTSC_Falcon_Northwest.rom"
+#define ROM_VOODOO3_3500_SI_AGP     "roms/video/voodoo/V3_3500_AGP_SD_2.15.07_PAL_3500TV-SI.rom"
 #define ROM_VELOCITY_100            "roms/video/voodoo/Velocity100.VBI"
 #define ROM_VELOCITY_200            "roms/video/voodoo/Velocity200sg.rom"
 
@@ -78,6 +79,7 @@ enum {
     TYPE_V3_3000,
     TYPE_V3_3500,
     TYPE_V3_3500_COMPAQ,
+    TYPE_V3_3500_SI,
     TYPE_VELOCITY100,
     TYPE_VELOCITY200
 };
@@ -3061,6 +3063,13 @@ banshee_init_common(const device_t *info, char *fn, int has_sgram, int type, int
             banshee->pci_regs[0x2f] = 0x12;
             break;
 
+        case TYPE_V3_3500_SI:
+            banshee->pci_regs[0x2c] = 0x1a;
+            banshee->pci_regs[0x2d] = 0x12;
+            banshee->pci_regs[0x2e] = 0x61;
+            banshee->pci_regs[0x2f] = 0x00;
+            break;
+
         case TYPE_VELOCITY100:
             banshee->pci_regs[0x2c] = 0x1a;
             banshee->pci_regs[0x2d] = 0x12;
@@ -3159,6 +3168,12 @@ v3_3500_se_agp_init(const device_t *info)
     return banshee_init_common(info, ROM_VOODOO3_3500_SE_AGP, 0, TYPE_V3_3500, VOODOO_3, 1);
 }
 
+static void *
+v3_3500_si_agp_init(const device_t *info)
+{
+    return banshee_init_common(info, ROM_VOODOO3_3500_SI_AGP, 0, TYPE_V3_3500_SI, VOODOO_3, 1);
+}
+
 static void *
 velocity_100_agp_init(const device_t *info)
 {
@@ -3228,6 +3243,12 @@ v3_3500_se_agp_available(void)
     return rom_present(ROM_VOODOO3_3500_SE_AGP);
 }
 
+static int
+v3_3500_si_agp_available(void)
+{
+    return rom_present(ROM_VOODOO3_3500_SI_AGP);
+}
+
 static int
 velocity_100_available(void)
 {
@@ -3452,6 +3473,20 @@ const device_t voodoo_3_3500_se_agp_device = {
     banshee_sdram_config
 };
 
+const device_t voodoo_3_3500_si_agp_device = {
+    .name          = "3dfx Voodoo3 3500 SI",
+    .internal_name = "voodoo3_3500_si_agp",
+    .flags         = DEVICE_AGP,
+    .local         = 0,
+    .init          = v3_3500_si_agp_init,
+    .close         = banshee_close,
+    .reset         = NULL,
+    { .available = v3_3500_si_agp_available },
+    .speed_changed = banshee_speed_changed,
+    .force_redraw  = banshee_force_redraw,
+    banshee_sdram_config
+};
+
 const device_t velocity_100_agp_device = {
     .name          = "3dfx Velocity 100",
     .internal_name = "velocity100_agp",