pc_vga: Made Cirrus ISA cards 16-bit, rather than 8-bit

This commit is contained in:
mahlemiut 2015-04-24 15:18:56 +12:00
parent 3e856eb9c7
commit dfd7ac44a4
3 changed files with 30 additions and 32 deletions

View File

@ -57,8 +57,6 @@ SLOT_INTERFACE_START( pc_isa16_cards )
SLOT_INTERFACE("ega", ISA8_EGA)
SLOT_INTERFACE("vga", ISA8_VGA)
SLOT_INTERFACE("svga_et4k", ISA8_SVGA_ET4K)
SLOT_INTERFACE("svga_dm",ISA8_SVGA_CIRRUS)
SLOT_INTERFACE("clgd542x",ISA8_SVGA_CIRRUS_GD542X)
SLOT_INTERFACE("num9rev",ISA8_NUM_9_REV)
SLOT_INTERFACE("com", ISA8_COM)
SLOT_INTERFACE("comat", ISA8_COM_AT)
@ -92,6 +90,8 @@ SLOT_INTERFACE_START( pc_isa16_cards )
SLOT_INTERFACE("s3virge", ISA16_S3VIRGE)
SLOT_INTERFACE("s3virgedx", ISA16_S3VIRGEDX)
SLOT_INTERFACE("dms3d2kp", ISA16_DMS3D2KPRO)
SLOT_INTERFACE("svga_dm",ISA16_SVGA_CIRRUS)
SLOT_INTERFACE("clgd542x",ISA16_SVGA_CIRRUS_GD542X)
SLOT_INTERFACE("gfxultra", ISA16_VGA_GFXULTRA)
SLOT_INTERFACE("gfxultrap", ISA16_SVGA_GFXULTRAPRO)
SLOT_INTERFACE("tgui9680",ISA16_SVGA_TGUI9680)

View File

@ -18,8 +18,8 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
const device_type ISA8_SVGA_CIRRUS = &device_creator<isa8_svga_cirrus_device>;
const device_type ISA8_SVGA_CIRRUS_GD542X = &device_creator<isa8_svga_cirrus_gd542x_device>;
const device_type ISA16_SVGA_CIRRUS = &device_creator<isa16_svga_cirrus_device>;
const device_type ISA16_SVGA_CIRRUS_GD542X = &device_creator<isa16_svga_cirrus_gd542x_device>;
static MACHINE_CONFIG_FRAGMENT( vga_cirrus )
MCFG_SCREEN_ADD("screen", RASTER)
@ -36,7 +36,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor isa8_svga_cirrus_device::device_mconfig_additions() const
machine_config_constructor isa16_svga_cirrus_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( vga_cirrus );
}
@ -45,7 +45,7 @@ machine_config_constructor isa8_svga_cirrus_device::device_mconfig_additions() c
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *isa8_svga_cirrus_device::device_rom_region() const
const rom_entry *isa16_svga_cirrus_device::device_rom_region() const
{
return ROM_NAME( dm_clgd5430 );
}
@ -55,21 +55,21 @@ const rom_entry *isa8_svga_cirrus_device::device_rom_region() const
//**************************************************************************
//-------------------------------------------------
// isa8_vga_device - constructor
// isa16_vga_device - constructor
//-------------------------------------------------
isa8_svga_cirrus_device::isa8_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8_SVGA_CIRRUS, "Diamond Speedstar Pro SE ISA Graphics Card (BIOS v1.00)", tag, owner, clock, "dm_clgd5430", __FILE__),
device_isa8_card_interface(mconfig, *this)
isa16_svga_cirrus_device::isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_SVGA_CIRRUS, "Diamond Speedstar Pro SE ISA Graphics Card (BIOS v1.00)", tag, owner, clock, "dm_clgd5430", __FILE__),
device_isa16_card_interface(mconfig, *this)
{
}
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
READ8_MEMBER(isa8_svga_cirrus_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
READ8_MEMBER(isa16_svga_cirrus_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
void isa8_svga_cirrus_device::device_start()
void isa16_svga_cirrus_device::device_start()
{
set_isa_device();
@ -88,7 +88,7 @@ void isa8_svga_cirrus_device::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
void isa8_svga_cirrus_device::device_reset()
void isa16_svga_cirrus_device::device_reset()
{
}
@ -122,7 +122,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
machine_config_constructor isa8_svga_cirrus_gd542x_device::device_mconfig_additions() const
machine_config_constructor isa16_svga_cirrus_gd542x_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( vga_cirrus_gd542x );
}
@ -131,7 +131,7 @@ machine_config_constructor isa8_svga_cirrus_gd542x_device::device_mconfig_additi
// rom_region - device-specific ROM region
//-------------------------------------------------
const rom_entry *isa8_svga_cirrus_gd542x_device::device_rom_region() const
const rom_entry *isa16_svga_cirrus_gd542x_device::device_rom_region() const
{
return ROM_NAME( clgd542x );
}
@ -141,21 +141,21 @@ const rom_entry *isa8_svga_cirrus_gd542x_device::device_rom_region() const
//**************************************************************************
//-------------------------------------------------
// isa8_vga_device - constructor
// isa16_vga_device - constructor
//-------------------------------------------------
isa8_svga_cirrus_gd542x_device::isa8_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA8_SVGA_CIRRUS_GD542X, "Generic Cirrus Logic GD542x Graphics Card (BIOS v1.20)", tag, owner, clock, "clgd542x", __FILE__),
device_isa8_card_interface(mconfig, *this)
isa16_svga_cirrus_gd542x_device::isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ISA16_SVGA_CIRRUS_GD542X, "Generic Cirrus Logic GD542x Graphics Card (BIOS v1.20)", tag, owner, clock, "clgd542x", __FILE__),
device_isa16_card_interface(mconfig, *this)
{
}
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
READ8_MEMBER(isa8_svga_cirrus_gd542x_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
READ8_MEMBER(isa16_svga_cirrus_gd542x_device::input_port_0_r ) { return 0xff; } //return space.machine().root_device().ioport("IN0")->read(); }
void isa8_svga_cirrus_gd542x_device::device_start()
void isa16_svga_cirrus_gd542x_device::device_start()
{
set_isa_device();
@ -174,6 +174,6 @@ void isa8_svga_cirrus_gd542x_device::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
void isa8_svga_cirrus_gd542x_device::device_reset()
void isa16_svga_cirrus_gd542x_device::device_reset()
{
}

View File

@ -11,15 +11,13 @@
// TYPE DEFINITIONS
//**************************************************************************
// ======================> isa8_vga_device
class isa8_svga_cirrus_device :
class isa16_svga_cirrus_device :
public device_t,
public device_isa8_card_interface
public device_isa16_card_interface
{
public:
// construction/destruction
isa8_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
@ -34,13 +32,13 @@ private:
cirrus_gd5430_device *m_vga;
};
class isa8_svga_cirrus_gd542x_device :
class isa16_svga_cirrus_gd542x_device :
public device_t,
public device_isa8_card_interface
public device_isa16_card_interface
{
public:
// construction/destruction
isa8_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
@ -57,7 +55,7 @@ private:
// device type definition
extern const device_type ISA8_SVGA_CIRRUS;
extern const device_type ISA8_SVGA_CIRRUS_GD542X;
extern const device_type ISA16_SVGA_CIRRUS;
extern const device_type ISA16_SVGA_CIRRUS_GD542X;
#endif /* __ISA_VGA_H__ */