diff options
Diffstat (limited to 'src/mame/drivers/hp9k_3xx.cpp')
-rw-r--r-- | src/mame/drivers/hp9k_3xx.cpp | 97 |
1 files changed, 46 insertions, 51 deletions
diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp index 5a0d69e4311..056817f7e36 100644 --- a/src/mame/drivers/hp9k_3xx.cpp +++ b/src/mame/drivers/hp9k_3xx.cpp @@ -258,7 +258,7 @@ WRITE16_MEMBER(hp9k3xx_state::led_w) void hp9k3xx_state::add_dio16_bus(machine_config &config) { bus::hp_dio::dio16_device &dio16(DIO16(config, "diobus", 0)); - dio16.set_program_space(m_maincpu, AS_PROGRAM); + dio16.set_cputag(m_maincpu); dio16.irq1_out_cb().set(FUNC(hp9k3xx_state::dio_irq1_w)); dio16.irq2_out_cb().set(FUNC(hp9k3xx_state::dio_irq2_w)); @@ -272,7 +272,7 @@ void hp9k3xx_state::add_dio16_bus(machine_config &config) void hp9k3xx_state::add_dio32_bus(machine_config &config) { bus::hp_dio::dio32_device &dio32(DIO32(config, "diobus", 0)); - dio32.set_program_space(m_maincpu, AS_PROGRAM); + dio32.set_cputag(m_maincpu); dio32.irq1_out_cb().set(FUNC(hp9k3xx_state::dio_irq1_w)); dio32.irq2_out_cb().set(FUNC(hp9k3xx_state::dio_irq2_w)); @@ -323,23 +323,22 @@ WRITE32_MEMBER(hp9k3xx_state::buserror_w) set_bus_error(offset << 2, false, mem_mask); } -void hp9k3xx_state::hp9k300(machine_config &config) -{ +MACHINE_CONFIG_START(hp9k3xx_state::hp9k300) ptm6840_device &ptm(PTM6840(config, PTM6840_TAG, 250000)); // from oscillator module next to the 6840 ptm.set_external_clocks(250000.0f, 0.0f, 250000.0f); ptm.o3_callback().set(PTM6840_TAG, FUNC(ptm6840_device::set_c2)); ptm.irq_callback().set_inputline("maincpu", M68K_IRQ_6); - SOFTWARE_LIST(config, "flop_list").set_original("hp9k3xx_flop"); + MCFG_SOFTWARE_LIST_ADD("flop_list", "hp9k3xx_flop") config.set_default_layout(layout_hp9k_3xx); -} +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(hp9k3xx_state::hp9k310) -void hp9k3xx_state::hp9k310(machine_config &config) -{ hp9k300(config); - M68010(config, m_maincpu, 10000000); - m_maincpu->set_addrmap(AS_PROGRAM, &hp9k3xx_state::hp9k310_map); + MCFG_DEVICE_ADD(m_maincpu, M68010, 10000000) + MCFG_DEVICE_PROGRAM_MAP(hp9k310_map) add_dio16_bus(config); @@ -349,12 +348,12 @@ void hp9k3xx_state::hp9k310(machine_config &config) DIO32_SLOT(config, "sl3", 0, "diobus", dio32_cards, "98643", false); DIO16_SLOT(config, "sl4", 0, "diobus", dio16_cards, "98644", false); DIO16_SLOT(config, "sl5", 0, "diobus", dio16_cards, nullptr, false); -} -void hp9k3xx_state::hp9k320(machine_config &config) -{ - M68020FPU(config, m_maincpu, 16670000); - m_maincpu->set_addrmap(AS_PROGRAM, &hp9k3xx_state::hp9k320_map); +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(hp9k3xx_state::hp9k320) + MCFG_DEVICE_ADD(m_maincpu, M68020FPU, 16670000) + MCFG_DEVICE_PROGRAM_MAP(hp9k320_map) hp9k300(config); add_dio32_bus(config); @@ -366,12 +365,11 @@ void hp9k3xx_state::hp9k320(machine_config &config) DIO32_SLOT(config, "sl4", 0, "diobus", dio32_cards, "98620", false); DIO32_SLOT(config, "sl5", 0, "diobus", dio32_cards, "98265a", false); DIO32_SLOT(config, "sl7", 0, "diobus", dio32_cards, nullptr, false); -} +MACHINE_CONFIG_END -void hp9k3xx_state::hp9k330(machine_config &config) -{ - M68020PMMU(config, m_maincpu, 16670000); - m_maincpu->set_addrmap(AS_PROGRAM, &hp9k3xx_state::hp9k330_map); +MACHINE_CONFIG_START(hp9k3xx_state::hp9k330) + MCFG_DEVICE_ADD(m_maincpu, M68020PMMU, 16670000) + MCFG_DEVICE_PROGRAM_MAP(hp9k330_map) hp9k300(config); add_dio32_bus(config); @@ -381,12 +379,11 @@ void hp9k3xx_state::hp9k330(machine_config &config) 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 -void hp9k3xx_state::hp9k332(machine_config &config) -{ - M68020PMMU(config, m_maincpu, 16670000); - m_maincpu->set_addrmap(AS_PROGRAM, &hp9k3xx_state::hp9k332_map); +MACHINE_CONFIG_START(hp9k3xx_state::hp9k332) + MCFG_DEVICE_ADD(m_maincpu, M68020PMMU, 16670000) + MCFG_DEVICE_PROGRAM_MAP(hp9k332_map) hp9k300(config); add_dio16_bus(config); @@ -396,22 +393,22 @@ void hp9k3xx_state::hp9k332(machine_config &config) DIO16_SLOT(config, "sl2", 0, "diobus", dio16_cards, "98644", false); DIO16_SLOT(config, "sl3", 0, "diobus", dio16_cards, "98543", false); DIO16_SLOT(config, "sl4", 0, "diobus", dio16_cards, nullptr, false); -} -void hp9k3xx_state::hp9k340(machine_config &config) -{ +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(hp9k3xx_state::hp9k340) hp9k320(config); - M68030(config.replace(), m_maincpu, 16670000); - m_maincpu->set_addrmap(AS_PROGRAM, &hp9k3xx_state::hp9k330_map); -} + MCFG_DEVICE_REPLACE(m_maincpu, M68030, 16670000) + MCFG_DEVICE_PROGRAM_MAP(hp9k330_map) +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(hp9k3xx_state::hp9k360) -void hp9k3xx_state::hp9k360(machine_config &config) -{ hp9k300(config); - M68030(config, m_maincpu, 25000000); - m_maincpu->set_addrmap(AS_PROGRAM, &hp9k3xx_state::hp9k360_map); + MCFG_DEVICE_ADD(m_maincpu, M68030, 25000000) + MCFG_DEVICE_PROGRAM_MAP(hp9k360_map) add_dio32_bus(config); @@ -421,32 +418,30 @@ void hp9k3xx_state::hp9k360(machine_config &config) DIO32_SLOT(config, "sl3", 0, "diobus", dio32_cards, "98620", false); DIO32_SLOT(config, "sl4", 0, "diobus", dio32_cards, "98265a", false); DIO32_SLOT(config, "sl5", 0, "diobus", dio32_cards, nullptr, false); -} +MACHINE_CONFIG_END -void hp9k3xx_state::hp9k370(machine_config &config) -{ + +MACHINE_CONFIG_START(hp9k3xx_state::hp9k370) hp9k360(config); - M68030(config.replace(), m_maincpu, 33000000); - m_maincpu->set_addrmap(AS_PROGRAM, &hp9k3xx_state::hp9k370_map); -} + MCFG_DEVICE_REPLACE(m_maincpu, M68030, 33000000) + MCFG_DEVICE_PROGRAM_MAP(hp9k370_map) +MACHINE_CONFIG_END -void hp9k3xx_state::hp9k380(machine_config &config) -{ +MACHINE_CONFIG_START(hp9k3xx_state::hp9k380) hp9k360(config); - M68040(config.replace(), m_maincpu, 25000000); - m_maincpu->set_addrmap(AS_PROGRAM, &hp9k3xx_state::hp9k380_map); -} + MCFG_DEVICE_REPLACE(m_maincpu, M68040, 25000000) + MCFG_DEVICE_PROGRAM_MAP(hp9k380_map) +MACHINE_CONFIG_END -void hp9k3xx_state::hp9k382(machine_config &config) -{ +MACHINE_CONFIG_START(hp9k3xx_state::hp9k382) hp9k360(config); - M68040(config.replace(), m_maincpu, 25000000); - m_maincpu->set_addrmap(AS_PROGRAM, &hp9k3xx_state::hp9k382_map); -} + MCFG_DEVICE_REPLACE(m_maincpu, M68040, 25000000) + MCFG_DEVICE_PROGRAM_MAP(hp9k382_map) +MACHINE_CONFIG_END ROM_START( hp9k310 ) ROM_REGION( 0x20000, MAINCPU_TAG, 0 ) |