summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/genpc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/genpc.cpp')
-rw-r--r--src/devices/machine/genpc.cpp31
1 files changed, 14 insertions, 17 deletions
diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp
index 87a9d7eeea2..b6a301248bc 100644
--- a/src/devices/machine/genpc.cpp
+++ b/src/devices/machine/genpc.cpp
@@ -389,7 +389,7 @@ WRITE8_MEMBER( ibm5160_mb_device::nmi_enable_w )
// GLOBAL VARIABLES
//**************************************************************************
-const device_type IBM5160_MOTHERBOARD = device_creator<ibm5160_mb_device>;
+DEFINE_DEVICE_TYPE(IBM5160_MOTHERBOARD, ibm5160_mb_device, "ibm5160_mb", "IBM 5160 motherboard")
//**************************************************************************
// DEVICE CONFIGURATION
@@ -511,20 +511,17 @@ void ibm5160_mb_device::static_set_cputag(device_t &device, const char *tag)
//-------------------------------------------------
ibm5160_mb_device::ibm5160_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ibm5160_mb_device(mconfig, IBM5160_MOTHERBOARD, "IBM5160_MOTHERBOARD", tag, owner, clock, "ibm5160_mb", __FILE__)
+ : ibm5160_mb_device(mconfig, IBM5160_MOTHERBOARD, tag, owner, clock)
{
}
ibm5160_mb_device::ibm5160_mb_device(
const machine_config &mconfig,
device_type type,
- const char *name,
const char *tag,
device_t *owner,
- uint32_t clock,
- const char *shortname,
- const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+ uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
, m_maincpu(*owner, "maincpu")
, m_pic8259(*this, "pic8259")
, m_dma8237(*this, "dma8237")
@@ -589,7 +586,7 @@ void ibm5160_mb_device::device_reset()
// GLOBAL VARIABLES
//**************************************************************************
-const device_type IBM5150_MOTHERBOARD = device_creator<ibm5150_mb_device>;
+DEFINE_DEVICE_TYPE(IBM5150_MOTHERBOARD, ibm5150_mb_device, "ibm5150_mb", "IBM 5150 motherboard")
//**************************************************************************
// DEVICE CONFIGURATION
@@ -628,12 +625,12 @@ machine_config_constructor ibm5150_mb_device::device_mconfig_additions() const
//-------------------------------------------------
ibm5150_mb_device::ibm5150_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ibm5150_mb_device(mconfig, IBM5150_MOTHERBOARD, "IBM5150_MOTHERBOARD", tag, owner, clock, "ibm5150_mb", __FILE__)
+ : ibm5150_mb_device(mconfig, IBM5150_MOTHERBOARD, tag, owner, clock)
{
}
-ibm5150_mb_device::ibm5150_mb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : ibm5160_mb_device(mconfig, type, name, tag, owner, clock, shortname, source)
+ibm5150_mb_device::ibm5150_mb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : ibm5160_mb_device(mconfig, type, tag, owner, clock)
, m_cassette(*this, "cassette")
{
}
@@ -776,7 +773,7 @@ WRITE8_MEMBER( ibm5150_mb_device::pc_ppi_portb_w )
// GLOBAL VARIABLES
//**************************************************************************
-const device_type EC1841_MOTHERBOARD = device_creator<ec1841_mb_device>;
+DEFINE_DEVICE_TYPE(EC1841_MOTHERBOARD, ec1841_mb_device, "ec1841_mb", "EC-1840 motherboard")
static MACHINE_CONFIG_FRAGMENT( ec1841_mb_config )
MCFG_FRAGMENT_ADD(ibm5160_mb_config)
@@ -848,7 +845,7 @@ ioport_constructor ec1841_mb_device::device_input_ports() const
//-------------------------------------------------
ec1841_mb_device::ec1841_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ibm5160_mb_device(mconfig, EC1841_MOTHERBOARD, "EC1841_MOTHERBOARD", tag, owner, clock, "ec1841_mb", __FILE__)
+ : ibm5160_mb_device(mconfig, EC1841_MOTHERBOARD, tag, owner, clock)
{
}
@@ -898,12 +895,12 @@ READ8_MEMBER ( ec1841_mb_device::pc_ppi_portc_r )
}
pc_noppi_mb_device::pc_noppi_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pc_noppi_mb_device(mconfig, PCNOPPI_MOTHERBOARD, "PCNOPPI_MOTHERBOARD", tag, owner, clock, "pcnoppi_mb", __FILE__)
+ : pc_noppi_mb_device(mconfig, PCNOPPI_MOTHERBOARD, tag, owner, clock)
{
}
-pc_noppi_mb_device::pc_noppi_mb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : ibm5160_mb_device(mconfig, type, name, tag, owner, clock, shortname, source)
+pc_noppi_mb_device::pc_noppi_mb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : ibm5160_mb_device(mconfig, type, tag, owner, clock)
{
}
@@ -944,4 +941,4 @@ DEVICE_ADDRESS_MAP_START( map, 8, pc_noppi_mb_device )
AM_RANGE(0x00a0, 0x00a1) AM_WRITE(nmi_enable_w)
ADDRESS_MAP_END
-const device_type PCNOPPI_MOTHERBOARD = device_creator<pc_noppi_mb_device>;
+DEFINE_DEVICE_TYPE(PCNOPPI_MOTHERBOARD, pc_noppi_mb_device, "pcnoppi_mb", "PCNOPPI_MOTHERBOARD")