From bf9276a63fbe8fb08729b9a5f6faf43b2d09d191 Mon Sep 17 00:00:00 2001 From: AJR Date: Fri, 3 Mar 2017 12:02:49 -0500 Subject: Device validation fixes: clean up the genpc MESS (nw) --- src/devices/machine/genpc.cpp | 16 +++++++++++++--- src/devices/machine/genpc.h | 5 +++++ src/mame/drivers/asst128.cpp | 4 +++- src/mame/drivers/tandy1t.cpp | 4 +++- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp index a939bc75551..87a9d7eeea2 100644 --- a/src/devices/machine/genpc.cpp +++ b/src/devices/machine/genpc.cpp @@ -524,7 +524,7 @@ ibm5160_mb_device::ibm5160_mb_device( uint32_t clock, const char *shortname, const char *source) - : device_t(mconfig, IBM5160_MOTHERBOARD, name, tag, owner, clock, shortname, source) + : device_t(mconfig, type, name, tag, owner, clock, shortname, source) , m_maincpu(*owner, "maincpu") , m_pic8259(*this, "pic8259") , m_dma8237(*this, "dma8237") @@ -628,7 +628,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) - : ibm5160_mb_device(mconfig, IBM5150_MOTHERBOARD, "IBM5150_MOTHERBOARD", tag, owner, clock, "ibm5150_mb", __FILE__) + : ibm5150_mb_device(mconfig, IBM5150_MOTHERBOARD, "IBM5150_MOTHERBOARD", tag, owner, clock, "ibm5150_mb", __FILE__) +{ +} + +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) , m_cassette(*this, "cassette") { } @@ -893,7 +898,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) - : ibm5160_mb_device(mconfig, PCNOPPI_MOTHERBOARD, "PCNOPPI_MOTHERBOARD", tag, owner, clock, "pcnoppi_mb", __FILE__) + : pc_noppi_mb_device(mconfig, PCNOPPI_MOTHERBOARD, "PCNOPPI_MOTHERBOARD", tag, owner, clock, "pcnoppi_mb", __FILE__) +{ +} + +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) { } diff --git a/src/devices/machine/genpc.h b/src/devices/machine/genpc.h index 0e12bff5119..65462fcdbe7 100644 --- a/src/devices/machine/genpc.h +++ b/src/devices/machine/genpc.h @@ -140,6 +140,8 @@ public: DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w ); protected: + 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); + // device-level overrides required_device m_cassette; @@ -191,6 +193,9 @@ public: DECLARE_ADDRESS_MAP(map, 8); +protected: + 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); + virtual machine_config_constructor device_mconfig_additions() const override; virtual ioport_constructor device_input_ports() const override; }; diff --git a/src/mame/drivers/asst128.cpp b/src/mame/drivers/asst128.cpp index 4af137fe625..2838f4e0e99 100644 --- a/src/mame/drivers/asst128.cpp +++ b/src/mame/drivers/asst128.cpp @@ -6,12 +6,14 @@ #include "machine/pc_fdc.h" #include "formats/asst128_dsk.h" +extern const device_type ASST128_MOTHERBOARD; + class asst128_mb_device : public ibm5150_mb_device { public: // construction/destruction asst128_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : ibm5150_mb_device(mconfig, tag, owner, clock) { } + : ibm5150_mb_device(mconfig, ASST128_MOTHERBOARD, "ASST128_MOTHERBOARD", tag, owner, clock, "asst128_mb", __FILE__) { } DECLARE_ADDRESS_MAP(map, 8); }; diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index 8a14fd740de..737214b4e01 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -48,12 +48,14 @@ Tandy 1000 (80386) variations: #include "cpu/i86/i286.h" #include "softlist.h" +extern const device_type T1000_MOTHERBOARD; + class t1000_mb_device : public pc_noppi_mb_device { public: // construction/destruction t1000_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : pc_noppi_mb_device(mconfig, tag, owner, clock) { } + : pc_noppi_mb_device(mconfig, T1000_MOTHERBOARD, "T1000_MOTHERBOARD", tag, owner, clock, "t1000_mb", __FILE__) { } protected: virtual void device_start() override; }; -- cgit v1.2.3