diff --git a/src/video/vid_vga.c b/src/video/vid_vga.c
index 5ea76dc83..617ba1539 100644
--- a/src/video/vid_vga.c
+++ b/src/video/vid_vga.c
@@ -8,7 +8,7 @@
*
* IBM VGA emulation.
*
- * Version: @(#)vid_vga.c 1.0.5 2018/04/26
+ * Version: @(#)vid_vga.c 1.0.6 2018/08/16
*
* Authors: Sarah Walker,
* Miran Grca,
@@ -124,33 +124,6 @@ static void *vga_init(const device_t *info)
}
-#ifdef DEV_BRANCH
-static void *trigem_unk_init(const device_t *info)
-{
- vga_t *vga = malloc(sizeof(vga_t));
- memset(vga, 0, sizeof(vga_t));
-
- rom_init(&vga->bios_rom, L"roms/video/vga/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0x2000, MEM_MAPPING_EXTERNAL);
-
- svga_init(&vga->svga, vga, 1 << 18, /*256kb*/
- NULL,
- vga_in, vga_out,
- NULL,
- NULL);
-
- io_sethandler(0x03c0, 0x0020, vga_in, NULL, NULL, vga_out, NULL, NULL, vga);
-
- io_sethandler(0x22ca, 0x0002, svga_in, NULL, NULL, vga_out, NULL, NULL, vga);
- io_sethandler(0x22ce, 0x0002, svga_in, NULL, NULL, vga_out, NULL, NULL, vga);
- io_sethandler(0x32ca, 0x0002, svga_in, NULL, NULL, vga_out, NULL, NULL, vga);
-
- vga->svga.bpp = 8;
- vga->svga.miscout = 1;
-
- return vga;
-}
-#endif
-
/*PS/1 uses a standard VGA controller, but with no option ROM*/
void *ps1vga_init(const device_t *info)
{
@@ -212,21 +185,7 @@ const device_t vga_device =
vga_force_redraw,
NULL
};
-#ifdef DEV_BRANCH
-const device_t trigem_unk_device =
-{
- "VGA",
- DEVICE_ISA,
- 0,
- trigem_unk_init,
- vga_close,
- NULL,
- vga_available,
- vga_speed_changed,
- vga_force_redraw,
- NULL
-};
-#endif
+
const device_t ps1vga_device =
{
"PS/1 VGA",
diff --git a/src/video/vid_vga.h b/src/video/vid_vga.h
index 44fa836fb..1cb031acf 100644
--- a/src/video/vid_vga.h
+++ b/src/video/vid_vga.h
@@ -2,7 +2,4 @@
see COPYING for more details
*/
extern const device_t vga_device;
-#ifdef DEV_BRANCH
-extern const device_t trigem_unk_device;
-#endif
extern const device_t ps1vga_device;
diff --git a/src/video/video.h b/src/video/video.h
index ed960d9bb..4d481998c 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.32 2018/08/16
+ * Version: @(#)video.h 1.0.33 2018/08/16
*
* Authors: Sarah Walker,
* Miran Grca,
@@ -44,9 +44,9 @@ enum {
GFX_SUPER_EGA, /* Using Chips & Technologies SuperEGA BIOS */
GFX_VGA, /* IBM VGA */
GFX_TVGA, /* Using Trident TVGA8900D BIOS */
- GFX_ET4000_ISA, /* Tseng ET4000 */
- GFX_ET4000_MCA, /* Tseng ET4000 */
- GFX_TGKOREANVGA, /*Trigem Korean VGA(Tseng ET4000AX)*/
+ GFX_ET4000_ISA, /* Tseng ET4000 */
+ GFX_ET4000_MCA, /* Tseng ET4000 */
+ GFX_TGKOREANVGA, /*Trigem Korean VGA(Tseng ET4000AX)*/
GFX_ET4000W32_CARDEX_VLB, /* Tseng ET4000/W32p (Cardex) VLB */
GFX_ET4000W32_CARDEX_PCI, /* Tseng ET4000/W32p (Cardex) PCI */
#if defined(DEV_BRANCH) && defined(USE_STEALTH32)