diff --git a/src/include/86box/video.h b/src/include/86box/video.h index 3232c6908..2ee72aefe 100644 --- a/src/include/86box/video.h +++ b/src/include/86box/video.h @@ -329,9 +329,6 @@ extern const device_t tgui9440_vlb_device; extern const device_t tgui9440_pci_device; /* IBM PS/1 (S)VGA */ -#if defined(DEV_BRANCH) && defined(USE_TI) -extern const device_t ti_cf62011_device; -#endif extern const device_t ibm_ps1_2121_device; /* Trident TVGA 8900 */ diff --git a/src/video/vid_table.c b/src/video/vid_table.c index ddadb4c2c..57f77b83e 100644 --- a/src/video/vid_table.c +++ b/src/video/vid_table.c @@ -99,9 +99,6 @@ video_cards[] = { { "[ISA] Professional Graphics Controller", "pgc", &pgc_device }, { "[ISA] Sigma Color 400", "sigma400", &sigma_device }, { "[ISA] SPEA V7 Mirage (S3 86c801)", "px_s3_v7_801_isa", &s3_v7mirage_86c801_isa_device }, -#if defined(DEV_BRANCH) && defined(USE_TI) - { "[ISA] TI CF62011 SVGA", "ti_cf62011", &ti_cf62011_device }, -#endif { "[ISA] Trident TVGA8900B", "tvga8900b", &tvga8900b_device }, { "[ISA] Trident TVGA8900D", "tvga8900d", &tvga8900d_device }, { "[ISA] Trigem Korean VGA (ET4000AX)", "tgkorvga", &et4000k_isa_device }, diff --git a/src/video/vid_ti_cf62011.c b/src/video/vid_ti_cf62011.c index 7b982adbf..1a0619c5d 100644 --- a/src/video/vid_ti_cf62011.c +++ b/src/video/vid_ti_cf62011.c @@ -263,45 +263,6 @@ vid_init(const device_t *info) } -#if defined(DEV_BRANCH) && defined(USE_TI) -static const device_config_t vid_config[] = -{ - { - "vram_size", "Memory Size", CONFIG_SELECTION, "", 256, - { - { - "256K", 256 - }, - { - "512K", 512 - }, - { - "1024K", 1024 - }, - { - "" - } - } - }, - { - "", "", -1 - } -}; - - -const device_t ti_cf62011_device = { - "TI CF62011 SVGA", - DEVICE_ISA, - 0, - vid_init, vid_close, NULL, - NULL, - vid_speed_changed, - vid_force_redraw, - vid_config -}; -#endif - - const device_t ibm_ps1_2121_device = { "IBM PS/1 Model 2121 SVGA", DEVICE_ISA, diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index b68da7d32..6b7337929 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -65,9 +65,6 @@ ifeq ($(DEV_BUILD), y) ifndef PS2M70T4 PS2M70T4 := y endif - ifndef TI - TI := y - endif ifndef VECTRA54 VECTRA54 := y endif @@ -123,9 +120,6 @@ else ifndef PS2M70T4 PS2M70T4 := n endif - ifndef TI - TI := n - endif ifndef VECTRA54 VECTRA54 := n endif @@ -445,10 +439,6 @@ ifeq ($(PS2M70T4), y) OPTS += -DUSE_PS2M70T4 endif -ifeq ($(TI), y) -OPTS += -DUSE_TI -endif - ifeq ($(VECTRA54), y) OPTS += -DUSE_VECTRA54 endif diff --git a/src/win/Makefile_ndr.mingw b/src/win/Makefile_ndr.mingw index 90adfc650..63aa78608 100644 --- a/src/win/Makefile_ndr.mingw +++ b/src/win/Makefile_ndr.mingw @@ -65,9 +65,6 @@ ifeq ($(DEV_BUILD), y) ifndef PS2M70T4 PS2M70T4 := y endif - ifndef TI - TI := y - endif ifndef VECTRA54 VECTRA54 := y endif @@ -123,9 +120,6 @@ else ifndef PS2M70T4 PS2M70T4 := n endif - ifndef TI - TI := n - endif ifndef VECTRA54 VECTRA54 := n endif @@ -454,10 +448,6 @@ ifeq ($(PS2M70T4), y) OPTS += -DUSE_PS2M70T4 endif -ifeq ($(TI), y) -OPTS += -DUSE_TI -endif - ifeq ($(VECTRA54), y) OPTS += -DUSE_VECTRA54 endif