From ede82ec9f0f4c7bbc10733aa54b4c2e51682165e Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 11 Feb 2018 21:35:09 +0100 Subject: [PATCH] Fixed a bug in vid_et4000w32.c; Removed the old PCem-X-era Cirrus stuff from the Dev branch. --- src/video/vid_et4000w32.c | 4 ++-- src/video/vid_table.c | 20 +------------------- src/video/video.h | 13 +------------ src/win/Makefile.mingw | 11 +---------- 4 files changed, 5 insertions(+), 43 deletions(-) diff --git a/src/video/vid_et4000w32.c b/src/video/vid_et4000w32.c index 1278778d3..3fe4c0399 100644 --- a/src/video/vid_et4000w32.c +++ b/src/video/vid_et4000w32.c @@ -10,7 +10,7 @@ * * Known bugs: Accelerator doesn't work in planar modes * - * Version: @(#)vid_et4000w32.c 1.0.5 2018/01/25 + * Version: @(#)vid_et4000w32.c 1.0.6 2018/02/11 * * Authors: Sarah Walker, * Miran Grca, @@ -168,7 +168,7 @@ void et4000w32p_out(uint16_t addr, uint8_t val, void *p) { #if defined(DEV_BRANCH) && defined(USE_STEALTH32) case 0x3c2: - if (et4000->type = ET4000W32_DIAMOND) + if (et4000->type == ET4000W32_DIAMOND) icd2061_write(&et4000->icd2061, (val >> 2) & 3); break; #endif diff --git a/src/video/vid_table.c b/src/video/vid_table.c index 9a0aa9cd7..e5c65d01b 100644 --- a/src/video/vid_table.c +++ b/src/video/vid_table.c @@ -8,7 +8,7 @@ * * Define all known video cards. * - * Version: @(#)vid_table.c 1.0.16 2018/02/11 + * Version: @(#)vid_table.c 1.0.17 2018/02/11 * * Authors: Miran Grca, * Fred N. van Kempen, @@ -36,12 +36,6 @@ #include "vid_ati_mach64.h" #include "vid_cga.h" #include "vid_cl5428.h" -#ifdef DEV_BRANCH -# ifdef USE_CIRRUS -# include "vid_cl_ramdac.h" /* vid_cl_gd.c needs this */ -# include "vid_cl_gd.h" -# endif -#endif #include "vid_compaq_cga.h" #include "vid_ega.h" #include "vid_et4000.h" @@ -95,14 +89,6 @@ video_cards[] = { { "[ISA] ATI VGA Wonder XL24 (ATI-28800-6)", "ati28800w", &ati28800_wonderxl24_device, GFX_VGAWONDERXL24, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}}, { "[ISA] CGA", "cga", &cga_device, GFX_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}}, { "[ISA] Chips & Technologies SuperEGA", "superega", &sega_device, GFX_SUPER_EGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}}, -#if defined(DEV_BRANCH) && defined(USE_CIRRUS) - { "[ISA] Cirrus Logic CL-GD5422", "cl_gd5422", &gd5422_device, GFX_CL_GD5422, {VIDEO_ISA, 6, 8, 16, 6, 8, 16}}, - { "[ISA] Cirrus Logic CL-GD5429", "cl_gd5429", &gd5429_device, GFX_CL_GD5429, {VIDEO_ISA, 3, 3, 6, 3, 3, 6}}, - { "[ISA] Cirrus Logic CL-GD5430", "cl_gd5430", &gd5430_device, GFX_CL_GD5430, {VIDEO_ISA, 3, 3, 6, 3, 3, 6}}, - { "[ISA] Cirrus Logic CL-GD5434", "cl_gd5434", &gd5434_device, GFX_CL_GD5434, {VIDEO_ISA, 3, 3, 6, 3, 3, 6}}, - { "[ISA] Cirrus Logic CL-GD5436", "cl_gd5436", &gd5436_device, GFX_CL_GD5436, {VIDEO_ISA, 3, 3, 6, 3, 3, 6}}, - { "[ISA] Cirrus Logic CL-GD5440", "cl_gd5440", &gd5440_device, GFX_CL_GD5440, {VIDEO_ISA, 3, 3, 6, 3, 3, 6}}, -#endif { "[ISA] Compaq ATI VGA Wonder XL (ATI-28800-5)","compaq_ati28800", &compaq_ati28800_device, GFX_VGAWONDERXL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}}, { "[ISA] Compaq CGA", "compaq_cga", &compaq_cga_device, GFX_COMPAQ_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}}, { "[ISA] Compaq CGA 2", "compaq_cga_2", &compaq_cga_2_device, GFX_COMPAQ_CGA_2, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}}, @@ -150,10 +136,6 @@ video_cards[] = { {"[PCI] Trident TGUI9440", "tgui9440_pci", &tgui9440_pci_device, GFX_TGUI9440_PCI, {VIDEO_BUS, 4, 8, 16, 4, 8, 16}}, {"[VLB] ATI Graphics Pro Turbo (Mach64 GX)", "mach64gx_vlb", &mach64gx_vlb_device, GFX_MACH64GX_VLB, {VIDEO_BUS, 2, 2, 1, 20, 20, 21}}, {"[VLB] Cardex Tseng ET4000/w32p", "et4000w32p_vlb", &et4000w32p_cardex_vlb_device, GFX_ET4000W32_CARDEX_VLB, {VIDEO_BUS, 4, 4, 4, 10, 10, 10}}, -#if defined(DEV_BRANCH) && defined(USE_CIRRUS) - {"[VLB] Cirrus Logic CL-GD5430", "cl_gd5430_vlb", &dia5430_device, GFX_CL_GD5430, {VIDEO_BUS, 4, 8, 16, 4, 8, 16}}, - {"[VLB] Cirrus Logic CL-GD5446", "cl_gd5446", &gd5446_device, GFX_CL_GD5446, {VIDEO_BUS, 4, 4, 4, 10, 10, 10}}, -#endif #if defined(DEV_BRANCH) && defined(USE_STEALTH32) {"[VLB] Diamond Stealth 32 (Tseng ET4000/w32p)","stealth32_vlb", &et4000w32p_vlb_device, GFX_ET4000W32_VLB, {VIDEO_BUS, 4, 4, 4, 10, 10, 10}}, #endif diff --git a/src/video/video.h b/src/video/video.h index 7af93a210..fa479b6f1 100644 --- a/src/video/video.h +++ b/src/video/video.h @@ -8,7 +8,7 @@ * * Definitions for the video controller module. * - * Version: @(#)video.h 1.0.14 2018/02/11 + * Version: @(#)video.h 1.0.15 2018/02/11 * * Authors: Sarah Walker, * Miran Grca, @@ -67,18 +67,7 @@ enum { GFX_MACH64GX_VLB, /* ATI Graphics Pro Turbo (Mach64) VLB */ GFX_MACH64GX_PCI, /* ATI Graphics Pro Turbo (Mach64) PCI */ GFX_MACH64VT2, /* ATI Mach64 VT2 */ -#if defined(DEV_BRANCH) && defined(USE_CIRRUS) - GFX_CL_GD5422, /* Cirrus Logic CL-GD5422 */ -#endif GFX_CL_GD5428, /* Diamond SpeedStar PRO (Cirrus Logic CL-GD5428) */ -#if defined(DEV_BRANCH) && defined(USE_CIRRUS) - GFX_CL_GD5429, /* Cirrus Logic CL-GD5429 */ - GFX_CL_GD5430, /* Cirrus Logic CL-GD5430 */ - GFX_CL_GD5434, /* Cirrus Logic CL-GD5434 */ - GFX_CL_GD5436, /* Cirrus Logic CL-GD5436 */ - GFX_CL_GD5440, /* Cirrus Logic CL-GD5440 */ - GFX_CL_GD5446, /* Cirrus Logic CL-GD5446 */ -#endif #if defined(DEV_BRANCH) && defined(USE_RIVA) GFX_RIVATNT, /* nVidia Riva TNT */ GFX_RIVATNT2, /* nVidia Riva TNT2 */ diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index b9c393595..f44bf9fe5 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -8,7 +8,7 @@ # # Makefile for Win32 (MinGW32) environment. # -# Version: @(#)Makefile.mingw 1.0.100 2018/02/11 +# Version: @(#)Makefile.mingw 1.0.101 2018/02/11 # # Authors: Miran Grca, # Fred N. van Kempen, @@ -58,9 +58,6 @@ endif ifndef DEV_BRANCH DEV_BRANCH := n endif -ifndef CIRRUS -CIRRUS := n -endif ifndef CRASHDUMP CRASHDUMP := n endif @@ -111,7 +108,6 @@ endif ifeq ($(DEV_BUILD), y) DEBUG := y DEV_BRANCH := y -CIRRUS := y CRASHDUMP := y GREENB := y I686 := y @@ -305,11 +301,6 @@ ifeq ($(DEV_BRANCH), y) OPTS += -DDEV_BRANCH DEVBROBJ := -ifeq ($(CIRRUS), y) -OPTS += -DUSE_CIRRUS -DEVBROBJ += vid_cl_gd.o vid_cl_gd_blit.o vid_cl_ramdac.o -endif - ifeq ($(CRASHDUMPOBJ), y) OPTS += -DUSE_CRASHDUMP DEVBROBJ += win_crashdump.o