From 763ed08d0fbc670babd3e7b64894a3787bc8aa85 Mon Sep 17 00:00:00 2001
From: TC1995 <mariogplayer90@gmail.com>
Date: Sun, 25 Feb 2018 20:25:37 +0100
Subject: [PATCH] Removed the Cirrus CL-GD5446 card.

---
 src/video/vid_cl54xx.c | 59 ------------------------------------------
 src/video/vid_cl54xx.h |  3 +--
 src/video/vid_table.c  |  1 -
 src/video/video.h      |  1 -
 4 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c
index f10125506..9f10f5eb4 100644
--- a/src/video/vid_cl54xx.c
+++ b/src/video/vid_cl54xx.c
@@ -47,7 +47,6 @@
 #define BIOS_GD5430_PCI_PATH		L"roms/video/cirruslogic/pci.bin"
 #define BIOS_GD5434_PATH		L"roms/video/cirruslogic/gd5434.bin"
 #define BIOS_GD5436_PATH		L"roms/video/cirruslogic/5436.vbi"
-#define BIOS_GD5446_PATH		L"roms/video/cirruslogic/5446bv.vbi"
 
 #define CIRRUS_ID_CLGD5424		0x94
 #define CIRRUS_ID_CLGD5428		0x98
@@ -55,7 +54,6 @@
 #define CIRRUS_ID_CLGD5430		0xa0
 #define CIRRUS_ID_CLGD5434		0xa8
 #define CIRRUS_ID_CLGD5436		0xac
-#define CIRRUS_ID_CLGD5446		0xb8
 
 /* sequencer 0x07 */
 #define CIRRUS_SR7_BPP_VGA		0x00
@@ -1821,8 +1819,6 @@ cl_pci_read(int func, int addr, void *p)
 				return 0xa8;
 			case CIRRUS_ID_CLGD5436:
 				return 0xac;
-			case CIRRUS_ID_CLGD5446:
-				return 0xb8;
 		}
 		return 0xff;
 	case 0x03: return 0x00;
@@ -1931,10 +1927,6 @@ static void
 	case CIRRUS_ID_CLGD5436:
 		romfn = BIOS_GD5436_PATH;
 		break;
-		
-	case CIRRUS_ID_CLGD5446:
-		romfn = BIOS_GD5446_PATH;
-		break;
     }	
 
     gd54xx->vram_size = device_get_config_int("memory");
@@ -2040,11 +2032,6 @@ gd5436_available(void)
     return rom_present(BIOS_GD5436_PATH);
 }
 
-static int
-gd5446_available(void)
-{
-    return rom_present(BIOS_GD5446_PATH);
-}
 
 void
 gd54xx_close(void *p)
@@ -2234,22 +2221,6 @@ device_t gd5430_pci_device =
 };
 
 
-device_t gd5430_onboard_pci_device =
-{
-    "Cirrus Logic CL-GD 5430 On-Board (PCI)",
-    DEVICE_PCI,
-    0x8000 | CIRRUS_ID_CLGD5430,
-    gd54xx_init, 
-    gd54xx_close, 
-    NULL,
-    NULL,
-    gd54xx_speed_changed,
-    gd54xx_force_redraw,
-    gd54xx_add_status_info,
-    gd5428_config
-};
-
-
 device_t gd5434_isa_device =
 {
     "Cirrus Logic CL-GD 5434 (ISA)",
@@ -2297,22 +2268,6 @@ device_t gd5434_pci_device =
     gd5434_config
 };
 
-
-device_t gd5434_onboard_pci_device =
-{
-    "Cirrus Logic CL-GD 5434 On-Board (PCI)",
-    DEVICE_PCI,
-    0x8000 | CIRRUS_ID_CLGD5434,
-    gd54xx_init, 
-    gd54xx_close, 
-    NULL,
-    NULL,
-    gd54xx_speed_changed,
-    gd54xx_force_redraw,
-    gd54xx_add_status_info,
-    gd5434_config
-};
-
 device_t gd5436_pci_device =
 {
     "Cirrus Logic CL-GD 5436 (PCI)",
@@ -2328,17 +2283,3 @@ device_t gd5436_pci_device =
     gd5434_config
 };
 
-device_t gd5446_pci_device =
-{
-    "Cirrus Logic CL-GD 5446 (PCI)",
-    DEVICE_PCI,
-    CIRRUS_ID_CLGD5436,
-    gd54xx_init, 
-    gd54xx_close, 
-    NULL,
-    gd5446_available,
-    gd54xx_speed_changed,
-    gd54xx_force_redraw,
-    gd54xx_add_status_info,
-    gd5434_config
-};
diff --git a/src/video/vid_cl54xx.h b/src/video/vid_cl54xx.h
index a5d6bce5e..2bf9e6aaf 100644
--- a/src/video/vid_cl54xx.h
+++ b/src/video/vid_cl54xx.h
@@ -10,5 +10,4 @@ extern device_t gd5430_pci_device;
 extern device_t gd5434_isa_device;
 extern device_t gd5434_vlb_device;
 extern device_t gd5434_pci_device;
-extern device_t gd5436_pci_device;
-extern device_t gd5446_pci_device;
\ No newline at end of file
+extern device_t gd5436_pci_device;
\ No newline at end of file
diff --git a/src/video/vid_table.c b/src/video/vid_table.c
index 68bf12aa4..2aa87861b 100644
--- a/src/video/vid_table.c
+++ b/src/video/vid_table.c
@@ -130,7 +130,6 @@ video_cards[] = {
     {"[PCI] Cirrus Logic CL-GD 5430",		    	"cl_gd5430_pci",	&gd5430_pci_device,			GFX_CL_GD5430_PCI,	VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4,  4,  8,  10, 10, 20}},
     {"[PCI] Cirrus Logic CL-GD 5434",		    	"cl_gd5434_pci",	&gd5434_pci_device,			GFX_CL_GD5434_PCI,	VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4,  4,  8,  10, 10, 20}},
 	{"[PCI] Cirrus Logic CL-GD 5436",		    	"cl_gd5436_pci",	&gd5436_pci_device,			GFX_CL_GD5436_PCI,	VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4,  4,  8,  10, 10, 20}},
-	{"[PCI] Cirrus Logic CL-GD 5446",		    	"cl_gd5446_pci",	&gd5446_pci_device,			GFX_CL_GD5446_PCI,	VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4,  4,  8,  10, 10, 20}},
 #if defined(DEV_BRANCH) && defined(USE_STEALTH32)
     {"[PCI] Diamond Stealth 32 (Tseng ET4000/w32p)","stealth32_pci",	&et4000w32p_pci_device,     GFX_ET4000W32_PCI,	VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4,  4,  4,  10, 10, 10}},
 #endif
diff --git a/src/video/video.h b/src/video/video.h
index 9ae7d1d90..52a103369 100644
--- a/src/video/video.h
+++ b/src/video/video.h
@@ -82,7 +82,6 @@ enum {
 	GFX_CL_GD5434_VLB,		/* Cirrus Logic CL-GD 5434 VLB */
 	GFX_CL_GD5434_PCI,		/* Cirrus Logic CL-GD 5434 PCI */
 	GFX_CL_GD5436_PCI,		/* Cirrus Logic CL-GD 5436 PCI */
-	GFX_CL_GD5446_PCI,		/* Cirrus Logic CL-GD 5446 PCI */
 #if defined(DEV_BRANCH) && defined(USE_RIVA)
     GFX_RIVATNT,		/* nVidia Riva TNT */
     GFX_RIVATNT2,		/* nVidia Riva TNT2 */