Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 00:54:22 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
Oliver Stöneberg 2014-10-24 14:11:24 +02:00
commit ea75a57613
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/emu/bus/isa/isa_cards.c
View File

@ -19,7 +19,6 @@ SLOT_INTERFACE_START( pc_isa8_cards )
SLOT_INTERFACE("aga_pc200", ISA8_AGA_PC200) SLOT_INTERFACE("aga_pc200", ISA8_AGA_PC200)
SLOT_INTERFACE("ega", ISA8_EGA) SLOT_INTERFACE("ega", ISA8_EGA)
SLOT_INTERFACE("svga_et4k", ISA8_SVGA_ET4K) SLOT_INTERFACE("svga_et4k", ISA8_SVGA_ET4K)
SLOT_INTERFACE("tgui9680",ISA8_SVGA_TGUI9680)
SLOT_INTERFACE("com", ISA8_COM) SLOT_INTERFACE("com", ISA8_COM)
SLOT_INTERFACE("fdc", ISA8_FDC_SUPERIO) SLOT_INTERFACE("fdc", ISA8_FDC_SUPERIO)
SLOT_INTERFACE("fdc_xt", ISA8_FDC_XT) SLOT_INTERFACE("fdc_xt", ISA8_FDC_XT)
@ -58,7 +57,6 @@ SLOT_INTERFACE_START( pc_isa16_cards )
SLOT_INTERFACE("vga", ISA8_VGA) SLOT_INTERFACE("vga", ISA8_VGA)
SLOT_INTERFACE("svga_et4k", ISA8_SVGA_ET4K) SLOT_INTERFACE("svga_et4k", ISA8_SVGA_ET4K)
SLOT_INTERFACE("svga_dm",ISA8_SVGA_CIRRUS) SLOT_INTERFACE("svga_dm",ISA8_SVGA_CIRRUS)
SLOT_INTERFACE("tgui9680",ISA8_SVGA_TGUI9680)
SLOT_INTERFACE("com", ISA8_COM) SLOT_INTERFACE("com", ISA8_COM)
SLOT_INTERFACE("comat", ISA8_COM_AT) SLOT_INTERFACE("comat", ISA8_COM_AT)
SLOT_INTERFACE("fdc", ISA8_FDC_AT) SLOT_INTERFACE("fdc", ISA8_FDC_AT)
@ -93,6 +91,7 @@ SLOT_INTERFACE_START( pc_isa16_cards )
SLOT_INTERFACE("dms3d2kp", ISA16_DMS3D2KPRO) SLOT_INTERFACE("dms3d2kp", ISA16_DMS3D2KPRO)
SLOT_INTERFACE("gfxultra", ISA16_VGA_GFXULTRA) SLOT_INTERFACE("gfxultra", ISA16_VGA_GFXULTRA)
SLOT_INTERFACE("gfxultrap", ISA16_SVGA_GFXULTRAPRO) SLOT_INTERFACE("gfxultrap", ISA16_SVGA_GFXULTRAPRO)
SLOT_INTERFACE("tgui9680",ISA16_SVGA_TGUI9680)
SLOT_INTERFACE("3c505", ISA16_3C505) SLOT_INTERFACE("3c505", ISA16_3C505)
SLOT_INTERFACE("mach64", ISA16_SVGA_MACH64) SLOT_INTERFACE("mach64", ISA16_SVGA_MACH64)
SLOT_INTERFACE("sb16_lle", ISA16_SB16) SLOT_INTERFACE("sb16_lle", ISA16_SB16)

18
src/emu/bus/isa/svga_trident.c
View File

@ -19,7 +19,7 @@ ROM_END
// GLOBAL VARIABLES // GLOBAL VARIABLES
//************************************************************************** //**************************************************************************
const device_type ISA8_SVGA_TGUI9680 = &device_creator<isa8_svga_tgui9680_device>; const device_type ISA16_SVGA_TGUI9680 = &device_creator<isa16_svga_tgui9680_device>;
static MACHINE_CONFIG_FRAGMENT( vga_trident ) static MACHINE_CONFIG_FRAGMENT( vga_trident )
@ -37,7 +37,7 @@ MACHINE_CONFIG_END
// machine configurations // machine configurations
//------------------------------------------------- //-------------------------------------------------
machine_config_constructor isa8_svga_tgui9680_device::device_mconfig_additions() const machine_config_constructor isa16_svga_tgui9680_device::device_mconfig_additions() const
{ {
return MACHINE_CONFIG_NAME( vga_trident ); return MACHINE_CONFIG_NAME( vga_trident );
} }
@ -46,7 +46,7 @@ machine_config_constructor isa8_svga_tgui9680_device::device_mconfig_additions()
// rom_region - device-specific ROM region // rom_region - device-specific ROM region
//------------------------------------------------- //-------------------------------------------------
const rom_entry *isa8_svga_tgui9680_device::device_rom_region() const const rom_entry *isa16_svga_tgui9680_device::device_rom_region() const
{ {
return ROM_NAME( tgui9680 ); return ROM_NAME( tgui9680 );
} }
@ -59,18 +59,18 @@ const rom_entry *isa8_svga_tgui9680_device::device_rom_region() const
// isa8_vga_device - constructor // isa8_vga_device - constructor
//------------------------------------------------- //-------------------------------------------------
isa8_svga_tgui9680_device::isa8_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa16_svga_tgui9680_device::isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8_SVGA_TGUI9680, "Trident TGUI9680 Graphics Card (BIOS X5.5 (02) 02/13/96)", tag, owner, clock, "tgui9680", __FILE__), device_t(mconfig, ISA16_SVGA_TGUI9680, "Trident TGUI9680 Graphics Card (BIOS X5.5 (02) 02/13/96)", tag, owner, clock, "tgui9680", __FILE__),
device_isa8_card_interface(mconfig, *this) device_isa16_card_interface(mconfig, *this)
{ {
} }
//------------------------------------------------- //-------------------------------------------------
// device_start - device-specific startup // device_start - device-specific startup
//------------------------------------------------- //-------------------------------------------------
READ8_MEMBER(isa8_svga_tgui9680_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); } READ8_MEMBER(isa16_svga_tgui9680_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
void isa8_svga_tgui9680_device::device_start() void isa16_svga_tgui9680_device::device_start()
{ {
set_isa_device(); set_isa_device();
@ -100,6 +100,6 @@ void isa8_svga_tgui9680_device::device_start()
// device_reset - device-specific reset // device_reset - device-specific reset
//------------------------------------------------- //-------------------------------------------------
void isa8_svga_tgui9680_device::device_reset() void isa16_svga_tgui9680_device::device_reset()
{ {
} }

10
src/emu/bus/isa/svga_trident.h
View File

@ -16,15 +16,15 @@
// TYPE DEFINITIONS // TYPE DEFINITIONS
//************************************************************************** //**************************************************************************
// ======================> isa8_vga_device // ======================> isa16_vga_device
class isa8_svga_tgui9680_device : class isa16_svga_tgui9680_device :
public device_t, public device_t,
public device_isa8_card_interface public device_isa16_card_interface
{ {
public: public:
// construction/destruction // construction/destruction
isa8_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides // optional information overrides
virtual machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
@ -41,7 +41,7 @@ private:
// device type definition // device type definition
extern const device_type ISA8_SVGA_TGUI9680; extern const device_type ISA16_SVGA_TGUI9680;
#endif /* SVGA_TRIDENT_H_ */ #endif /* SVGA_TRIDENT_H_ */