From 69eafc7724d8e5c703cf2177aca00417a3d0a109 Mon Sep 17 00:00:00 2001 From: Sven Schnelle Date: Mon, 8 Oct 2018 21:00:35 +0200 Subject: hp_dio: remove MCFG And while at it, set the cards as non-fixed, as all of our default cards can be removed on real hardware --- src/devices/bus/hp_dio/hp_dio.h | 6 ------ src/mame/drivers/hp9k_3xx.cpp | 39 +++++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/devices/bus/hp_dio/hp_dio.h b/src/devices/bus/hp_dio/hp_dio.h index a1738b76f3a..938e267b7f6 100644 --- a/src/devices/bus/hp_dio/hp_dio.h +++ b/src/devices/bus/hp_dio/hp_dio.h @@ -19,12 +19,6 @@ namespace bus { namespace hp_dio { -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_DIO16_CPU(_cputag) downcast(*device).set_cputag(_cputag); -#define MCFG_DIO32_CPU(_cputag) downcast(*device).set_cputag(_cputag); //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp index f28e296a6a7..c388cd710f8 100644 --- a/src/mame/drivers/hp9k_3xx.cpp +++ b/src/mame/drivers/hp9k_3xx.cpp @@ -513,12 +513,13 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k310) MCFG_DEVICE_ADD(m_maincpu, M68010, 10000000) MCFG_DEVICE_PROGRAM_MAP(hp9k310_map) - MCFG_DEVICE_ADD("diobus", DIO16, 0) - MCFG_DIO16_CPU(m_maincpu) - MCFG_DEVICE_ADD("sl1", DIO16_SLOT, 0, "diobus", dio16_cards, "98544", true) - MCFG_DEVICE_ADD("sl2", DIO16_SLOT, 0, "diobus", dio16_cards, "98603b", true) - MCFG_DEVICE_ADD("sl3", DIO16_SLOT, 0, "diobus", dio16_cards, "98644", true) - MCFG_DEVICE_ADD("sl4", DIO16_SLOT, 0, "diobus", dio16_cards, nullptr, false) + bus::hp_dio::dio16_device &dio16(DIO16(config, "diobus", 0)); + dio16.set_cputag(m_maincpu); + + DIO16_SLOT(config, "sl1", 0, "diobus", dio16_cards, "98544", false); + DIO16_SLOT(config, "sl2", 0, "diobus", dio16_cards, "98603b", false); + DIO16_SLOT(config, "sl3", 0, "diobus", dio16_cards, "98644", false); + DIO16_SLOT(config, "sl4", 0, "diobus", dio16_cards, nullptr, false); MACHINE_CONFIG_END @@ -528,12 +529,13 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k320) hp9k300(config); - MCFG_DEVICE_ADD("diobus", DIO32, 0) - MCFG_DIO32_CPU(m_maincpu) - MCFG_DEVICE_ADD("sl1", DIO32_SLOT, 0, "diobus", dio16_cards, "98544", true) - MCFG_DEVICE_ADD("sl2", DIO16_SLOT, 0, "diobus", dio16_cards, "98603b", true) - MCFG_DEVICE_ADD("sl3", DIO16_SLOT, 0, "diobus", dio16_cards, "98644", true) - MCFG_DEVICE_ADD("sl4", DIO32_SLOT, 0, "diobus", dio16_cards, nullptr, false) + bus::hp_dio::dio16_device &dio32(DIO32(config, "diobus", 0)); + dio32.set_cputag(m_maincpu); + + DIO32_SLOT(config, "sl1", 0, "diobus", dio16_cards, "98544", false); + DIO32_SLOT(config, "sl2", 0, "diobus", dio16_cards, "98603b", false); + DIO32_SLOT(config, "sl3", 0, "diobus", dio16_cards, "98644", false); + DIO32_SLOT(config, "sl4", 0, "diobus", dio16_cards, nullptr, false); MACHINE_CONFIG_END MACHINE_CONFIG_START(hp9k3xx_state::hp9k330) @@ -542,12 +544,13 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k330) hp9k300(config); - MCFG_DEVICE_ADD("diobus", DIO32, 0) - MCFG_DIO32_CPU(m_maincpu) - MCFG_DEVICE_ADD("sl1", DIO32_SLOT, 0, "diobus", dio16_cards, "98544", true) - MCFG_DEVICE_ADD("sl2", DIO16_SLOT, 0, "diobus", dio16_cards, "98603b", true) - MCFG_DEVICE_ADD("sl3", DIO16_SLOT, 0, "diobus", dio16_cards, "98644", true) - MCFG_DEVICE_ADD("sl4", DIO32_SLOT, 0, "diobus", dio16_cards, nullptr, false) + bus::hp_dio::dio16_device &dio32(DIO32(config, "diobus", 0)); + dio32.set_cputag(m_maincpu); + + DIO32_SLOT(config, "sl1", 0, "diobus", dio16_cards, "98544", false); + DIO32_SLOT(config, "sl2", 0, "diobus", dio16_cards, "98603b", false); + DIO32_SLOT(config, "sl3", 0, "diobus", dio16_cards, "98644", false); + DIO32_SLOT(config, "sl4", 0, "diobus", dio16_cards, nullptr, false); MACHINE_CONFIG_END MACHINE_CONFIG_START(hp9k3xx_state::hp9k332) -- cgit v1.2.3