80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Removed the Cirrus CL-GD5446 card.

Browse Source
This commit is contained in:
TC1995
2018-02-25 20:25:37 +01:00
parent e892247050
commit 763ed08d0f
4 changed files with 1 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/video/vid_cl54xx.c
View File

@@ -47,7 +47,6 @@
#define BIOS_GD5430_PCI_PATH L"roms/video/cirruslogic/pci.bin" #define BIOS_GD5430_PCI_PATH L"roms/video/cirruslogic/pci.bin"
#define BIOS_GD5434_PATH L"roms/video/cirruslogic/gd5434.bin" #define BIOS_GD5434_PATH L"roms/video/cirruslogic/gd5434.bin"
#define BIOS_GD5436_PATH L"roms/video/cirruslogic/5436.vbi" #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_CLGD5424 0x94
#define CIRRUS_ID_CLGD5428 0x98 #define CIRRUS_ID_CLGD5428 0x98
@@ -55,7 +54,6 @@
#define CIRRUS_ID_CLGD5430 0xa0 #define CIRRUS_ID_CLGD5430 0xa0
#define CIRRUS_ID_CLGD5434 0xa8 #define CIRRUS_ID_CLGD5434 0xa8
#define CIRRUS_ID_CLGD5436 0xac #define CIRRUS_ID_CLGD5436 0xac
#define CIRRUS_ID_CLGD5446 0xb8
/* sequencer 0x07 */ /* sequencer 0x07 */
#define CIRRUS_SR7_BPP_VGA 0x00 #define CIRRUS_SR7_BPP_VGA 0x00
@@ -1821,8 +1819,6 @@ cl_pci_read(int func, int addr, void *p)
return 0xa8; return 0xa8;
case CIRRUS_ID_CLGD5436: case CIRRUS_ID_CLGD5436:
return 0xac; return 0xac;
case CIRRUS_ID_CLGD5446:
return 0xb8;
} }
return 0xff; return 0xff;
case 0x03: return 0x00; case 0x03: return 0x00;
@@ -1931,10 +1927,6 @@ static void
case CIRRUS_ID_CLGD5436: case CIRRUS_ID_CLGD5436:
romfn = BIOS_GD5436_PATH; romfn = BIOS_GD5436_PATH;
break; break;
case CIRRUS_ID_CLGD5446:
romfn = BIOS_GD5446_PATH;
break;
} }
gd54xx->vram_size = device_get_config_int("memory"); gd54xx->vram_size = device_get_config_int("memory");
@@ -2040,11 +2032,6 @@ gd5436_available(void)
return rom_present(BIOS_GD5436_PATH); return rom_present(BIOS_GD5436_PATH);
} }
static int
gd5446_available(void)
{
return rom_present(BIOS_GD5446_PATH);
}
void void
gd54xx_close(void *p) 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 = device_t gd5434_isa_device =
{ {
"Cirrus Logic CL-GD 5434 (ISA)", "Cirrus Logic CL-GD 5434 (ISA)",
@@ -2297,22 +2268,6 @@ device_t gd5434_pci_device =
gd5434_config 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 = device_t gd5436_pci_device =
{ {
"Cirrus Logic CL-GD 5436 (PCI)", "Cirrus Logic CL-GD 5436 (PCI)",
@@ -2328,17 +2283,3 @@ device_t gd5436_pci_device =
gd5434_config 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
};

3
src/video/vid_cl54xx.h
View File

@@ -10,5 +10,4 @@ extern device_t gd5430_pci_device;
extern device_t gd5434_isa_device; extern device_t gd5434_isa_device;
extern device_t gd5434_vlb_device; extern device_t gd5434_vlb_device;
extern device_t gd5434_pci_device; extern device_t gd5434_pci_device;
extern device_t gd5436_pci_device; extern device_t gd5436_pci_device;
extern device_t gd5446_pci_device;

1
src/video/vid_table.c
View File

@@ -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 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 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 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) #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}}, {"[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 #endif

1
src/video/video.h
View File

@@ -82,7 +82,6 @@ enum {
GFX_CL_GD5434_VLB, /* Cirrus Logic CL-GD 5434 VLB */ GFX_CL_GD5434_VLB, /* Cirrus Logic CL-GD 5434 VLB */
GFX_CL_GD5434_PCI, /* Cirrus Logic CL-GD 5434 PCI */ GFX_CL_GD5434_PCI, /* Cirrus Logic CL-GD 5434 PCI */
GFX_CL_GD5436_PCI, /* Cirrus Logic CL-GD 5436 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) #if defined(DEV_BRANCH) && defined(USE_RIVA)
GFX_RIVATNT, /* nVidia Riva TNT */ GFX_RIVATNT, /* nVidia Riva TNT */
GFX_RIVATNT2, /* nVidia Riva TNT2 */ GFX_RIVATNT2, /* nVidia Riva TNT2 */