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

MGA cleanup

Browse Source
This commit is contained in:
Alexander Babikov
2024-02-18 19:12:57 +05:00
parent 1e23813057
commit 0fa364dec3
4 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -153,7 +153,6 @@ cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage"
cmake_dependent_option(ISAMEM_IAB "Intel Above Board" ON "DEV_BRANCH" OFF) cmake_dependent_option(ISAMEM_IAB "Intel Above Board" ON "DEV_BRANCH" OFF)
cmake_dependent_option(ISAMEM_BRAT "BocaRAM/AT" ON "DEV_BRANCH" OFF) cmake_dependent_option(ISAMEM_BRAT "BocaRAM/AT" ON "DEV_BRANCH" OFF)
cmake_dependent_option(LASERXT "VTech Laser XT" ON "DEV_BRANCH" OFF) cmake_dependent_option(LASERXT "VTech Laser XT" ON "DEV_BRANCH" OFF)
cmake_dependent_option(MGA2 "Matrox Millennium II and Productiva G100" ON "DEV_BRANCH" OFF)
cmake_dependent_option(OLIVETTI "Olivetti M290" ON "DEV_BRANCH" OFF) cmake_dependent_option(OLIVETTI "Olivetti M290" ON "DEV_BRANCH" OFF)
cmake_dependent_option(OPEN_AT "OpenAT" ON "DEV_BRANCH" OFF) cmake_dependent_option(OPEN_AT "OpenAT" ON "DEV_BRANCH" OFF)
cmake_dependent_option(OPL4ML "OPL4-ML daughterboard" ON "DEV_BRANCH" OFF) cmake_dependent_option(OPL4ML "OPL4-ML daughterboard" ON "DEV_BRANCH" OFF)

4
src/video/CMakeLists.txt
View File

@@ -28,10 +28,6 @@ add_library(vid OBJECT agpgart.c video.c vid_table.c vid_cga.c vid_cga_comp.c
vid_ibm_rgb528_ramdac.c vid_sdac_ramdac.c vid_ogc.c vid_mga.c vid_nga.c vid_ibm_rgb528_ramdac.c vid_sdac_ramdac.c vid_ogc.c vid_mga.c vid_nga.c
vid_tvp3026_ramdac.c vid_att2xc498_ramdac.c vid_xga.c) vid_tvp3026_ramdac.c vid_att2xc498_ramdac.c vid_xga.c)
if(MGA2)
target_compile_definitions(vid PRIVATE USE_MGA2)
endif()
if(VGAWONDER) if(VGAWONDER)
target_compile_definitions(vid PRIVATE USE_VGAWONDER) target_compile_definitions(vid PRIVATE USE_VGAWONDER)
endif() endif()

2
src/video/vid_mga.c
View File

@@ -2811,7 +2811,6 @@ static uint8_t
mystique_readb_linear(uint32_t addr, void *priv) mystique_readb_linear(uint32_t addr, void *priv)
{ {
const svga_t *svga = (svga_t *) priv; const svga_t *svga = (svga_t *) priv;
mystique_t *mystique = (mystique_t *) svga->priv;
cycles -= svga->monitor->mon_video_timing_read_b; cycles -= svga->monitor->mon_video_timing_read_b;
@@ -2861,7 +2860,6 @@ static void
mystique_writeb_linear(uint32_t addr, uint8_t val, void *priv) mystique_writeb_linear(uint32_t addr, uint8_t val, void *priv)
{ {
svga_t *svga = (svga_t *) priv; svga_t *svga = (svga_t *) priv;
mystique_t *mystique = (mystique_t *) svga->priv;
cycles -= svga->monitor->mon_video_timing_write_b; cycles -= svga->monitor->mon_video_timing_write_b;

10
src/win/Makefile.mingw
View File

@@ -64,9 +64,6 @@ ifeq ($(DEV_BUILD), y)
ifndef LASERXT ifndef LASERXT
LASERXT := y LASERXT := y
endif endif
ifndef MGA2
MGA2 := y
endif
ifndef OLIVETTI ifndef OLIVETTI
OLIVETTI := y OLIVETTI := y
endif endif
@@ -131,9 +128,6 @@ else
ifndef LASERXT ifndef LASERXT
LASERXT := n LASERXT := n
endif endif
ifndef MGA2
MGA2 := n
endif
ifndef OLIVETTI ifndef OLIVETTI
OLIVETTI := n OLIVETTI := n
endif endif
@@ -502,10 +496,6 @@ ifeq ($(DEV_BRANCH), y)
DEVBROBJ += m_xt_laserxt.o DEVBROBJ += m_xt_laserxt.o
endif endif
ifeq ($(MGA2), y)
OPTS += -DUSE_MGA2
endif
ifeq ($(OPEN_AT), y) ifeq ($(OPEN_AT), y)
OPTS += -DUSE_OPEN_AT OPTS += -DUSE_OPEN_AT
endif endif