diff options
Diffstat (limited to 'src/mame/drivers/viper.cpp')
-rw-r--r-- | src/mame/drivers/viper.cpp | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp index 4e7abd4c6ce..0ebda066b63 100644 --- a/src/mame/drivers/viper.cpp +++ b/src/mame/drivers/viper.cpp @@ -2388,10 +2388,10 @@ void viper_state::machine_reset() MACHINE_CONFIG_START(viper_state::viper) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", MPC8240, 166666666) // Unknown - MCFG_PPC_BUS_FREQUENCY(100000000) - MCFG_DEVICE_PROGRAM_MAP(viper_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", viper_state, viper_vblank) + MPC8240(config, m_maincpu, 166666666); // Unknown + m_maincpu->set_bus_frequency(100000000); + m_maincpu->set_addrmap(AS_PROGRAM, &viper_state::viper_map); + m_maincpu->set_vblank_int("screen", FUNC(viper_state::viper_vblank)); MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0) MCFG_PCI_BUS_LEGACY_DEVICE(0, DEVICE_SELF, viper_state, mpc8240_pci_r, mpc8240_pci_w) @@ -2399,29 +2399,30 @@ MACHINE_CONFIG_START(viper_state::viper) ATA_INTERFACE(config, m_ata).options(ata_devices, "hdd", nullptr, true); - MCFG_DEVICE_ADD("voodoo", VOODOO_3, STD_VOODOO_3_CLOCK) - MCFG_VOODOO_FBMEM(8) - MCFG_VOODOO_SCREEN_TAG("screen") - MCFG_VOODOO_CPU_TAG("maincpu") - MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, viper_state,voodoo_vblank)) - MCFG_VOODOO_PCIINT_CB(WRITELINE(*this, viper_state, voodoo_pciint)) + VOODOO_3(config, m_voodoo, STD_VOODOO_3_CLOCK); + m_voodoo->set_fbmem(8); + m_voodoo->set_screen_tag("screen"); + m_voodoo->set_cpu_tag("maincpu"); + m_voodoo->vblank_callback().set(FUNC(viper_state::voodoo_vblank)); + m_voodoo->pciint_callback().set(FUNC(viper_state::voodoo_pciint)); /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(1024, 768) - MCFG_SCREEN_VISIBLE_AREA(0, 1023, 0, 383) - MCFG_SCREEN_UPDATE_DRIVER(viper_state, screen_update_viper) + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + // Screeen size and timing is re-calculated later in voodoo card + screen.set_refresh_hz(60); + screen.set_size(1024, 768); + screen.set_screen_update(FUNC(viper_state::screen_update_viper)); - MCFG_PALETTE_ADD("palette", 65536) + PALETTE(config, "palette", 65536); - MCFG_TIMER_ADD_NONE("ds2430_timer2") + TIMER(config, "ds2430_timer2", 0); + //MCFG_TIMER_ADD_NONE("ds2430_timer2") /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_DEVICE_ADD("m48t58", M48T58, 0) + M48T58(config, "m48t58", 0); MACHINE_CONFIG_END /*****************************************************************************/ |