From 5ddc3ee5bd1accfb7b73c73394d307d6d69fabaa Mon Sep 17 00:00:00 2001 From: angelosa Date: Sat, 24 Feb 2024 21:24:03 +0100 Subject: [PATCH] isa/svga_s3: remove non-existant VIRGE/VIRGEDX ISA cards --- src/devices/bus/isa/isa_cards.cpp | 3 - src/devices/bus/isa/svga_s3.cpp | 337 ++---------------------------- src/devices/bus/isa/svga_s3.h | 89 -------- 3 files changed, 18 insertions(+), 411 deletions(-) diff --git a/src/devices/bus/isa/isa_cards.cpp b/src/devices/bus/isa/isa_cards.cpp index 25122a59579..8ad01bcef63 100644 --- a/src/devices/bus/isa/isa_cards.cpp +++ b/src/devices/bus/isa/isa_cards.cpp @@ -211,9 +211,6 @@ void pc_isa16_cards(device_slot_interface &device) device.option_add("gus",ISA16_GUS); device.option_add("sblaster_16", ISA16_SOUND_BLASTER_16); device.option_add("svga_s3", ISA16_SVGA_S3); - device.option_add("s3virge", ISA16_S3VIRGE); - device.option_add("s3virgedx", ISA16_S3VIRGEDX); - device.option_add("dms3d2kp", ISA16_DMS3D2KPRO); device.option_add("svga_dm",ISA16_SVGA_CIRRUS); device.option_add("clgd542x",ISA16_SVGA_CIRRUS_GD542X); device.option_add("gfxultra", ISA16_VGA_GFXULTRA); diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp index 57ad259fd99..527fa762ad7 100644 --- a/src/devices/bus/isa/svga_s3.cpp +++ b/src/devices/bus/isa/svga_s3.cpp @@ -4,8 +4,25 @@ ISA SVGA S3 wrapper + ISA16 + - P86C911 + - P86C911A + - P86C924 + - P86C801 + - 86C801-R + ISA16 / VL-Bus + - P86C928 + - P86C805 / 86C805-P / 86C805-Q + - 86C805i + VL-Bus / PCI + - Vision864 + - Vision868 + - Vision964 + - Vision968 + - Trio64 (Spea V7-MIRAGE P64, probably last card before full transition to PCI) + TODO: - - All these cards are really PCI and needs to be moved to video/virge_pci.cpp. + - all s3_764 roms are really PCI and needs to be moved to video/virge_pci.cpp. **************************************************************************************************/ @@ -134,321 +151,3 @@ void isa16_svga_s3_device::device_start() void isa16_svga_s3_device::device_reset() { } - - -/* - * S3 Virge 2D/3D accelerator - */ - -ROM_START( s3virge ) - ROM_REGION(0x8000,"s3virge", 0) - ROM_DEFAULT_BIOS("virge") - - ROM_SYSTEM_BIOS( 0, "virge", "PCI S3 ViRGE v1.00-10" ) - ROMX_LOAD("pci_m-v_virge-4s3.bin", 0x00000, 0x8000, CRC(d0a0f1de) SHA1(b7b41081974762a199610219bdeab149b7c7143d), ROM_BIOS(0) ) - - ROM_SYSTEM_BIOS( 1, "virgeo", "PCI S3 ViRGE v1.00-05" ) - ROMX_LOAD("s3virge.bin", 0x00000, 0x8000, CRC(a7983a85) SHA1(e885371816d3237f7badd57ccd602cd863c9c9f8), ROM_BIOS(1) ) - ROM_IGNORE( 0x8000 ) -ROM_END - -//************************************************************************** -// GLOBAL VARIABLES -//************************************************************************** - -DEFINE_DEVICE_TYPE(ISA16_S3VIRGE, isa16_s3virge_device, "s3virge", "S3 ViRGE Graphics Card") - - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- - -void isa16_s3virge_device::device_add_mconfig(machine_config &config) -{ - screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); - screen.set_screen_update(m_vga, FUNC(s3virge_vga_device::screen_update)); - - S3VIRGE(config, m_vga, 0); - m_vga->set_screen("screen"); - m_vga->set_vram_size(0x400000); - m_vga->linear_config_changed().set(FUNC(isa16_s3virge_device::linear_config_changed_w)); -} - -//------------------------------------------------- -// linear_config_changed_w - callback to indicate -// enabling, disabling, or changig of the linear -// framebuffer configuration. -//------------------------------------------------- - -void isa16_s3virge_device::linear_config_changed_w(int state) -{ -} - -//------------------------------------------------- -// rom_region - device-specific ROM region -//------------------------------------------------- - -const tiny_rom_entry *isa16_s3virge_device::device_rom_region() const -{ - return ROM_NAME( s3virge ); -} - -//************************************************************************** -// LIVE DEVICE -//************************************************************************** - -//------------------------------------------------- -// isa16_vga_device - constructor -//------------------------------------------------- - -isa16_s3virge_device::isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, ISA16_S3VIRGE, tag, owner, clock), - device_isa16_card_interface(mconfig, *this), - m_vga(*this, "vga") -{ -} - -void isa16_s3virge_device::io_isa_map(address_map &map) -{ - map(0x00, 0x2f).m(m_vga, FUNC(s3virge_vga_device::io_map)); -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- -uint8_t isa16_s3virge_device::input_port_0_r() { return 0xff; } //return machine().root_device().ioport("IN0")->read(); } - -void isa16_s3virge_device::device_start() -{ - set_isa_device(); - - m_isa->install_rom(this, 0xc0000, 0xc7fff, "s3virge"); - - m_isa->install_device(0x03b0, 0x03df, *this, &isa16_s3virge_device::io_isa_map); - - m_isa->install_memory(0xa0000, 0xbffff, read8sm_delegate(*m_vga, FUNC(s3virge_vga_device::mem_r)), write8sm_delegate(*m_vga, FUNC(s3virge_vga_device::mem_w))); -} - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void isa16_s3virge_device::device_reset() -{ -} - -/* - * S3 ViRGE/DX - */ - -ROM_START( s3virgedx ) - ROM_REGION(0x8000,"s3virgedx", 0) - ROM_LOAD("s3virgedx.bin", 0x00000, 0x8000, CRC(0da83bd3) SHA1(228a2d644e1732cb5a2eb1291608c7050cf39229) ) -ROM_END - -//************************************************************************** -// GLOBAL VARIABLES -//************************************************************************** - -DEFINE_DEVICE_TYPE(ISA16_S3VIRGEDX, isa16_s3virgedx_device, "s3virgedx", "S3 ViRGE/DX Graphics Card") - - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- - -void isa16_s3virgedx_device::device_add_mconfig(machine_config &config) -{ - screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); - screen.set_screen_update(m_vga, FUNC(s3virgedx_vga_device::screen_update)); - - S3VIRGEDX(config, m_vga, 0); - m_vga->set_screen("screen"); - m_vga->set_vram_size(0x400000); - m_vga->linear_config_changed().set(FUNC(isa16_s3virgedx_device::linear_config_changed_w)); -} - -//------------------------------------------------- -// linear_config_changed_w - callback to indicate -// enabling, disabling, or changig of the linear -// framebuffer configuration. -//------------------------------------------------- - -void isa16_s3virgedx_device::linear_config_changed_w(int state) -{ - const bool old = m_lfb_enable; - m_lfb_enable = state; - if (state) - { - if (old) - { - m_isa->unmap_readwrite(m_lfb_start, m_lfb_end); - } - m_lfb_start = m_vga->get_linear_address(); - m_lfb_end = m_lfb_start + m_vga->get_linear_address_size_full() - 1; - m_isa->install_memory(m_lfb_start, m_lfb_end, read8sm_delegate(*m_vga, FUNC(s3virge_vga_device::fb_r)), write8sm_delegate(*m_vga, FUNC(s3virge_vga_device::fb_w))); - } - else - { - m_isa->unmap_readwrite(m_lfb_start, m_lfb_end); - } -} - -//------------------------------------------------- -// rom_region - device-specific ROM region -//------------------------------------------------- - -const tiny_rom_entry *isa16_s3virgedx_device::device_rom_region() const -{ - return ROM_NAME( s3virgedx ); -} - -//************************************************************************** -// LIVE DEVICE -//************************************************************************** - -//------------------------------------------------- -// isa16_vga_device - constructor -//------------------------------------------------- - -isa16_s3virgedx_device::isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, ISA16_S3VIRGEDX, tag, owner, clock), - device_isa16_card_interface(mconfig, *this), - m_vga(*this, "vga") -{ -} - -void isa16_s3virgedx_device::io_isa_map(address_map &map) -{ - map(0x00, 0x2f).m(m_vga, FUNC(s3virgedx_vga_device::io_map)); -} - - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- -uint8_t isa16_s3virgedx_device::input_port_0_r() { return 0xff; } //return machine().root_device().ioport("IN0")->read(); } - -void isa16_s3virgedx_device::device_start() -{ - set_isa_device(); - - m_isa->install_rom(this, 0xc0000, 0xc7fff, "s3virgedx"); - - m_isa->install_device(0x03b0, 0x03df, *this, &isa16_s3virgedx_device::io_isa_map); - - m_isa->install_memory(0xa0000, 0xbffff, read8sm_delegate(*m_vga, FUNC(s3virgedx_vga_device::mem_r)), write8sm_delegate(*m_vga, FUNC(s3virgedx_vga_device::mem_w))); - - save_item(NAME(m_lfb_enable)); - save_item(NAME(m_lfb_start)); - save_item(NAME(m_lfb_end)); -} - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void isa16_s3virgedx_device::device_reset() -{ - m_lfb_enable = m_vga->is_linear_address_active(); - m_lfb_start = m_vga->get_linear_address(); - m_lfb_end = m_lfb_start + m_vga->get_linear_address_size_full() - 1; -} - - -/* - * Diamond Stealth 3D 2000 Pro - */ - -ROM_START( stealth3d2kpro ) - ROM_REGION(0x8000,"stealth3d", 0) - ROM_LOAD("virgedxdiamond.bin", 0x00000, 0x8000, CRC(58b0dcda) SHA1(b13ae6b04db6fc05a76d924ddf2efe150b823029) ) -ROM_END - -//************************************************************************** -// GLOBAL VARIABLES -//************************************************************************** - -DEFINE_DEVICE_TYPE(ISA16_DMS3D2KPRO, isa16_stealth3d2kpro_device, "dms3d2kp", "Diamond Stealth 3D 2000 Pro") - - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- - -void isa16_stealth3d2kpro_device::device_add_mconfig(machine_config &config) -{ - screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); - screen.set_screen_update(m_vga, FUNC(s3virgedx_rev1_vga_device::screen_update)); - - S3VIRGEDX1(config, m_vga, 0); - m_vga->set_screen("screen"); - m_vga->set_vram_size(0x400000); - m_vga->linear_config_changed().set(FUNC(isa16_stealth3d2kpro_device::linear_config_changed_w)); -} - -//------------------------------------------------- -// linear_config_changed_w - callback to indicate -// enabling, disabling, or changig of the linear -// framebuffer configuration. -//------------------------------------------------- - -void isa16_stealth3d2kpro_device::linear_config_changed_w(int state) -{ -} - -//------------------------------------------------- -// rom_region - device-specific ROM region -//------------------------------------------------- - -const tiny_rom_entry *isa16_stealth3d2kpro_device::device_rom_region() const -{ - return ROM_NAME( stealth3d2kpro ); -} - -//************************************************************************** -// LIVE DEVICE -//************************************************************************** - -//------------------------------------------------- -// isa16_vga_device - constructor -//------------------------------------------------- - -isa16_stealth3d2kpro_device::isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, ISA16_DMS3D2KPRO, tag, owner, clock), - device_isa16_card_interface(mconfig, *this), - m_vga(*this, "vga") -{ -} - -void isa16_stealth3d2kpro_device::io_isa_map(address_map &map) -{ - map(0x00, 0x2f).m(m_vga, FUNC(s3virgedx_vga_device::io_map)); -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- -uint8_t isa16_stealth3d2kpro_device::input_port_0_r() { return 0xff; } //return machine().root_device().ioport("IN0")->read(); } - -void isa16_stealth3d2kpro_device::device_start() -{ - set_isa_device(); - - m_isa->install_rom(this, 0xc0000, 0xc7fff, "stealth3d"); - - m_isa->install_device(0x03b0, 0x03df, *this, &isa16_stealth3d2kpro_device::io_isa_map); - - m_isa->install_memory(0xa0000, 0xbffff, read8sm_delegate(*m_vga, FUNC(s3virgedx_vga_device::mem_r)), write8sm_delegate(*m_vga, FUNC(s3virgedx_vga_device::mem_w))); -} - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void isa16_stealth3d2kpro_device::device_reset() -{ -} diff --git a/src/devices/bus/isa/svga_s3.h b/src/devices/bus/isa/svga_s3.h index c414c7ee6f6..c391443abe0 100644 --- a/src/devices/bus/isa/svga_s3.h +++ b/src/devices/bus/isa/svga_s3.h @@ -7,7 +7,6 @@ #include "isa.h" #include "video/pc_vga_s3.h" -#include "video/s3virge.h" //************************************************************************** @@ -42,95 +41,7 @@ private: required_device m_8514; }; -class isa16_s3virge_device : - public device_t, - public device_isa16_card_interface -{ -public: - // construction/destruction - isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - uint8_t input_port_0_r(); - -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - // optional information overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual const tiny_rom_entry *device_rom_region() const override; - - void linear_config_changed_w(int state); - - void io_isa_map(address_map &map); - -private: - required_device m_vga; -}; - -class isa16_s3virgedx_device : - public device_t, - public device_isa16_card_interface -{ -public: - // construction/destruction - isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - uint8_t input_port_0_r(); - -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - // optional information overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual const tiny_rom_entry *device_rom_region() const override; - - void linear_config_changed_w(int state); - - void io_isa_map(address_map &map); - -private: - required_device m_vga; - bool m_lfb_enable; - uint32_t m_lfb_start; - uint32_t m_lfb_end; -}; - -class isa16_stealth3d2kpro_device : - public device_t, - public device_isa16_card_interface -{ -public: - // construction/destruction - isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - uint8_t input_port_0_r(); - -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - // optional information overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual const tiny_rom_entry *device_rom_region() const override; - - void linear_config_changed_w(int state); - - void io_isa_map(address_map &map); - -private: - required_device m_vga; -}; - - // device type definition DECLARE_DEVICE_TYPE(ISA16_SVGA_S3, isa16_svga_s3_device) -DECLARE_DEVICE_TYPE(ISA16_S3VIRGE, isa16_s3virge_device) -DECLARE_DEVICE_TYPE(ISA16_S3VIRGEDX, isa16_s3virgedx_device) -DECLARE_DEVICE_TYPE(ISA16_DMS3D2KPRO, isa16_stealth3d2kpro_device) #endif // MAME_BUS_ISA_SVGA_S3_H