From 09142d0365cc82de550ed3ce87c303ba3a6a6c88 Mon Sep 17 00:00:00 2001 From: OBattler Date: Tue, 1 Oct 2019 15:50:30 +0200 Subject: [PATCH] Removed the non-working standalone HT-216 that should not have been there. --- src/video/vid_ht216.c | 35 +---------------------------------- src/video/vid_ht216.h | 3 +-- src/video/vid_table.c | 3 +-- 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/src/video/vid_ht216.c b/src/video/vid_ht216.c index e14e68346..ffc16776c 100644 --- a/src/video/vid_ht216.c +++ b/src/video/vid_ht216.c @@ -8,7 +8,7 @@ * * Video 7 VGA 1024i emulation. * - * Version: @(#)vid_ht216.c 1.0.1 2019/09/28 + * Version: @(#)vid_ht216.c 1.0.2 2019/10/01 * * Authors: Sarah Walker, * Miran Grca, @@ -93,7 +93,6 @@ uint8_t ht216_in(uint16_t addr, void *p); #define BIOS_G2_GC205_PATH L"roms/video/video7/BIOS.BIN" #define BIOS_VIDEO7_VGA_1024I_PATH L"roms/video/video7/Video Seven VGA 1024i - BIOS - v2.19 - 435-0062-05 - U17 - 27C256.BIN" -#define BIOS_HT216_32_PATH L"roms/video/video7/ht216-32.bin" static video_timings_t timing_v7vga = {VIDEO_ISA, 5, 5, 9, 20, 20, 30}; @@ -1042,8 +1041,6 @@ void rom_init(&ht216->bios_rom, BIOS_VIDEO7_VGA_1024I_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); else if (has_rom == 2) rom_init(&ht216->bios_rom, BIOS_G2_GC205_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); - else if (has_rom == 3) - rom_init(&ht216->bios_rom, BIOS_HT216_32_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_v7vga); @@ -1097,15 +1094,6 @@ ht216_pb410a_init(const device_t *info) } -static void * -ht216_32_init(const device_t *info) -{ - ht216_t *ht216 = ht216_init(info, device_get_config_int("memory") << 10, 3); - - return ht216; -} - - static int g2_gc205_available(void) { @@ -1120,13 +1108,6 @@ v7_vga_1024i_available(void) } -static int -ht216_32_available(void) -{ - return rom_present(BIOS_HT216_32_PATH); -} - - void ht216_close(void *p) { @@ -1216,17 +1197,3 @@ const device_t ht216_32_pb410a_device = ht216_speed_changed, ht216_force_redraw }; - -const device_t ht216_32_device = -{ - "Headland HT216-32", - DEVICE_ISA, - 0x7861, /*HT216-32*/ - ht216_32_init, - ht216_close, - NULL, - ht216_32_available, - ht216_speed_changed, - ht216_force_redraw, - v7_vga_1024i_config -}; diff --git a/src/video/vid_ht216.h b/src/video/vid_ht216.h index 5a8572eb5..abb15bba9 100644 --- a/src/video/vid_ht216.h +++ b/src/video/vid_ht216.h @@ -8,7 +8,7 @@ * * Video 7 VGA 1024i emulation header. * - * Version: @(#)vid_ht216.h 1.0.0 2019/04/05 + * Version: @(#)vid_ht216.h 1.0.1 2019/10/01 * * Authors: Sarah Walker, * Miran Grca, @@ -19,4 +19,3 @@ extern const device_t g2_gc205_device; extern const device_t v7_vga_1024i_device; extern const device_t ht216_32_pb410a_device; -extern const device_t ht216_32_device; diff --git a/src/video/vid_table.c b/src/video/vid_table.c index c1f4882db..e3937a71d 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.43 2019/03/03 + * Version: @(#)vid_table.c 1.0.44 2019/10/01 * * Authors: Miran Grca, * Fred N. van Kempen, @@ -106,7 +106,6 @@ video_cards[] = { { "[ISA] Compaq EGA", "compaq_ega", &cpqega_device }, { "[ISA] EGA", "ega", &ega_device }, { "[ISA] G2 GC205", "g2_gc205", &g2_gc205_device }, - { "[ISA] Headland HT216-32", "ht216_32", &ht216_32_device }, { "[ISA] Hercules", "hercules", &hercules_device }, { "[ISA] Hercules Plus", "hercules_plus", &herculesplus_device }, { "[ISA] Hercules InColor", "incolor", &incolor_device },