diff options
author | 2018-03-03 18:18:08 +0100 | |
---|---|---|
committer | 2018-03-04 04:18:08 +1100 | |
commit | 3b923d59ccb8d2d8e386392518450006f8e644fe (patch) | |
tree | 73c48568e76d69edbde9f96a3f57d173dd05a747 /src/devices/machine/genpc.h | |
parent | 25472091b626bd01ef47f11389a4b2ebe0fc0008 (diff) |
destaticify initializations (nw) (#3289)
* destaticify initializations (nw)
* fix this->set_screen (nw)
Diffstat (limited to 'src/devices/machine/genpc.h')
-rw-r--r-- | src/devices/machine/genpc.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/machine/genpc.h b/src/devices/machine/genpc.h index f6242f0a2ca..1c94244e6ff 100644 --- a/src/devices/machine/genpc.h +++ b/src/devices/machine/genpc.h @@ -25,8 +25,8 @@ #define MCFG_IBM5160_MOTHERBOARD_ADD(_tag, _cputag) \ MCFG_DEVICE_ADD(_tag, IBM5160_MOTHERBOARD, 0) \ - ibm5160_mb_device::static_set_cputag(*device, "^" _cputag); \ - isa8_device::static_set_cputag(*device->subdevice("isa"), "^^" _cputag); + downcast<ibm5160_mb_device &>(*device).set_cputag("^" _cputag); \ + (*device->subdevice<isa8_device>("isa")).set_cputag("^^" _cputag); // ======================> ibm5160_mb_device class ibm5160_mb_device : public device_t @@ -36,7 +36,7 @@ public: ibm5160_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // inline configuration - static void static_set_cputag(device_t &device, const char *tag); + void set_cputag(const char *tag) { m_maincpu.set_tag(tag); } void map(address_map &map); @@ -130,8 +130,8 @@ DECLARE_DEVICE_TYPE(IBM5160_MOTHERBOARD, ibm5160_mb_device) #define MCFG_IBM5150_MOTHERBOARD_ADD(_tag, _cputag) \ MCFG_DEVICE_ADD(_tag, IBM5150_MOTHERBOARD, 0) \ - ibm5150_mb_device::static_set_cputag(*device, "^" _cputag); \ - isa8_device::static_set_cputag(*device->subdevice("isa"), "^^" _cputag); + downcast<ibm5150_mb_device &>(*device).set_cputag("^" _cputag); \ + (*device->subdevice<isa8_device>("isa")).set_cputag("^^" _cputag); // ======================> ibm5150_mb_device class ibm5150_mb_device : public ibm5160_mb_device @@ -163,8 +163,8 @@ DECLARE_DEVICE_TYPE(IBM5150_MOTHERBOARD, ibm5150_mb_device) #define MCFG_EC1841_MOTHERBOARD_ADD(_tag, _cputag) \ MCFG_DEVICE_ADD(_tag, EC1841_MOTHERBOARD, 0) \ - ec1841_mb_device::static_set_cputag(*device, "^" _cputag); \ - isa8_device::static_set_cputag(*device->subdevice("isa"), "^^" _cputag); + downcast<ec1841_mb_device &>(*device).set_cputag("^" _cputag); \ + (*device->subdevice<isa8_device>("isa")).set_cputag("^^" _cputag); class ec1841_mb_device : public ibm5160_mb_device { @@ -189,8 +189,8 @@ DECLARE_DEVICE_TYPE(EC1841_MOTHERBOARD, ec1841_mb_device) #define MCFG_PCNOPPI_MOTHERBOARD_ADD(_tag, _cputag) \ MCFG_DEVICE_ADD(_tag, PCNOPPI_MOTHERBOARD, 0) \ - pc_noppi_mb_device::static_set_cputag(*device, "^" _cputag); \ - isa8_device::static_set_cputag(*device->subdevice("isa"), "^^" _cputag); + downcast<pc_noppi_mb_device &>(*device).set_cputag("^" _cputag); \ + (*device->subdevice<isa8_device>("isa")).set_cputag("^^" _cputag); class pc_noppi_mb_device : public ibm5160_mb_device { |