diff --git a/src/emu/bus/nes/bandai.c b/src/emu/bus/nes/bandai.c index 783d49e8567..e8ab8609aba 100644 --- a/src/emu/bus/nes/bandai.c +++ b/src/emu/bus/nes/bandai.c @@ -129,7 +129,7 @@ void nes_fcg_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); @@ -150,7 +150,7 @@ void nes_lz93d50_24c01_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); @@ -173,7 +173,7 @@ void nes_fjump2_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_reg)); } diff --git a/src/emu/bus/nes/bootleg.c b/src/emu/bus/nes/bootleg.c index 271c82d868e..8c616b28c12 100644 --- a/src/emu/bus/nes/bootleg.c +++ b/src/emu/bus/nes/bootleg.c @@ -208,7 +208,7 @@ void nes_mbaby_device::device_start() common_start(); irq_timer = timer_alloc(TIMER_IRQ); irq_timer->reset(); - timer_freq = m_maincpu->cycles_to_attotime(24576); + timer_freq = machine().device("maincpu")->cycles_to_attotime(24576); save_item(NAME(m_irq_enable)); save_item(NAME(m_latch)); @@ -243,7 +243,7 @@ void nes_smb3p_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); @@ -297,7 +297,7 @@ void nes_smb2j_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); @@ -320,7 +320,7 @@ void nes_smb2ja_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); @@ -343,7 +343,7 @@ void nes_smb2jb_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); @@ -429,7 +429,7 @@ void nes_lh53_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); @@ -510,7 +510,7 @@ void nes_shuiguan_device::device_start() common_start(); irq_timer = timer_alloc(TIMER_IRQ); // always running and checking for IRQ every 114 cycles? or resetting every frame? - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(114)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(114)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); diff --git a/src/emu/bus/nes/cony.c b/src/emu/bus/nes/cony.c index ff3b7daa79f..ff2cacdb669 100644 --- a/src/emu/bus/nes/cony.c +++ b/src/emu/bus/nes/cony.c @@ -62,7 +62,7 @@ void nes_cony_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); @@ -98,7 +98,7 @@ void nes_yoko_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); diff --git a/src/emu/bus/nes/datach.c b/src/emu/bus/nes/datach.c index 8d5bf62d776..d0d1edc3f59 100644 --- a/src/emu/bus/nes/datach.c +++ b/src/emu/bus/nes/datach.c @@ -242,8 +242,8 @@ void nes_datach_device::device_start() common_start(); irq_timer = timer_alloc(TIMER_IRQ); serial_timer = timer_alloc(TIMER_SERIAL); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); - serial_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1000)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); + serial_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1000)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); diff --git a/src/emu/bus/nes/disksys.c b/src/emu/bus/nes/disksys.c index 97b36c6dd53..23eee5c4573 100644 --- a/src/emu/bus/nes/disksys.c +++ b/src/emu/bus/nes/disksys.c @@ -123,7 +123,7 @@ void nes_disksys_device::device_start() m_disk->floppy_install_unload_proc(nes_disksys_device::unload_proc); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_fds_motor_on)); save_item(NAME(m_fds_door_closed)); diff --git a/src/emu/bus/nes/event.c b/src/emu/bus/nes/event.c index f28f9ab3d41..5177c785dfb 100644 --- a/src/emu/bus/nes/event.c +++ b/src/emu/bus/nes/event.c @@ -48,7 +48,7 @@ void nes_event_device::device_start() common_start(); event_timer = timer_alloc(TIMER_EVENT); event_timer->adjust(attotime::never); - timer_freq = m_maincpu->cycles_to_attotime(1); + timer_freq = machine().device("maincpu")->cycles_to_attotime(1); save_item(NAME(m_latch)); save_item(NAME(m_count)); diff --git a/src/emu/bus/nes/irem.c b/src/emu/bus/nes/irem.c index f2fd00af897..52afa139152 100644 --- a/src/emu/bus/nes/irem.c +++ b/src/emu/bus/nes/irem.c @@ -131,7 +131,7 @@ void nes_h3001_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); diff --git a/src/emu/bus/nes/jaleco.c b/src/emu/bus/nes/jaleco.c index 6a94b188cd7..1761ff08bcb 100644 --- a/src/emu/bus/nes/jaleco.c +++ b/src/emu/bus/nes/jaleco.c @@ -209,7 +209,7 @@ void nes_ss88006_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_mmc_prg_bank)); save_item(NAME(m_mmc_vrom_bank)); diff --git a/src/emu/bus/nes/jy.c b/src/emu/bus/nes/jy.c index f057c1197da..fdf72f83683 100644 --- a/src/emu/bus/nes/jy.c +++ b/src/emu/bus/nes/jy.c @@ -76,7 +76,7 @@ void nes_jy_typea_device::device_start() common_start(); irq_timer = timer_alloc(TIMER_IRQ); irq_timer->reset(); - timer_freq = m_maincpu->cycles_to_attotime(1); + timer_freq = machine().device("maincpu")->cycles_to_attotime(1); save_item(NAME(m_mul)); save_item(NAME(m_latch)); diff --git a/src/emu/bus/nes/kaiser.c b/src/emu/bus/nes/kaiser.c index fa6c552c794..a38ecca43a3 100644 --- a/src/emu/bus/nes/kaiser.c +++ b/src/emu/bus/nes/kaiser.c @@ -138,7 +138,7 @@ void nes_ks7032_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_latch)); save_item(NAME(m_irq_enable)); @@ -164,7 +164,7 @@ void nes_ks7017_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_latch)); save_item(NAME(m_irq_enable)); diff --git a/src/emu/bus/nes/konami.c b/src/emu/bus/nes/konami.c index e0a1c40c3fd..dc0f17b8b47 100644 --- a/src/emu/bus/nes/konami.c +++ b/src/emu/bus/nes/konami.c @@ -129,7 +129,7 @@ void nes_konami_vrc3_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_mode)); save_item(NAME(m_irq_enable)); @@ -157,7 +157,7 @@ void nes_konami_vrc4_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_mode)); save_item(NAME(m_irq_prescale)); @@ -198,7 +198,7 @@ void nes_konami_vrc7_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_mode)); save_item(NAME(m_irq_prescale)); diff --git a/src/emu/bus/nes/legacy.c b/src/emu/bus/nes/legacy.c index 12d3cd09f85..6382fc0aaf1 100644 --- a/src/emu/bus/nes/legacy.c +++ b/src/emu/bus/nes/legacy.c @@ -79,7 +79,7 @@ void nes_ffe4_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_exram)); save_item(NAME(m_exram_enabled)); diff --git a/src/emu/bus/nes/namcot.c b/src/emu/bus/nes/namcot.c index 391d8e6dded..0b62a23578d 100644 --- a/src/emu/bus/nes/namcot.c +++ b/src/emu/bus/nes/namcot.c @@ -146,7 +146,7 @@ void nes_namcot340_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); @@ -172,7 +172,7 @@ void nes_namcot175_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); @@ -200,7 +200,7 @@ void nes_namcot163_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_count)); diff --git a/src/emu/bus/nes/pirate.c b/src/emu/bus/nes/pirate.c index 952376ac18a..ca159fd0796 100644 --- a/src/emu/bus/nes/pirate.c +++ b/src/emu/bus/nes/pirate.c @@ -427,7 +427,7 @@ void nes_cityfight_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_prg_reg)); save_item(NAME(m_prg_mode)); diff --git a/src/emu/bus/nes/sunsoft.c b/src/emu/bus/nes/sunsoft.c index d986fb7cd12..a36b2dbf06c 100644 --- a/src/emu/bus/nes/sunsoft.c +++ b/src/emu/bus/nes/sunsoft.c @@ -123,7 +123,7 @@ void nes_sunsoft_3_device::device_start() { common_start(); irq_timer = timer_alloc(TIMER_IRQ); - irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); + irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_irq_enable)); save_item(NAME(m_irq_toggle)); @@ -169,7 +169,7 @@ void nes_sunsoft_fme7_device::device_start() irq_timer = timer_alloc(TIMER_IRQ); // this has to be hardcoded because some some scanline code only suits NTSC... it will be fixed with PPU rewrite irq_timer->adjust(attotime::zero, 0, attotime::from_hz((21477272.724 / 12))); -// irq_timer->adjust(attotime::zero, 0, m_maincpu->cycles_to_attotime(1)); +// irq_timer->adjust(attotime::zero, 0, machine().device("maincpu")->cycles_to_attotime(1)); save_item(NAME(m_wram_bank)); save_item(NAME(m_latch)); diff --git a/src/emu/bus/nes/sunsoft_dcs.c b/src/emu/bus/nes/sunsoft_dcs.c index e81e850dedc..d4dd1a8e261 100644 --- a/src/emu/bus/nes/sunsoft_dcs.c +++ b/src/emu/bus/nes/sunsoft_dcs.c @@ -175,7 +175,7 @@ void nes_sunsoft_dcs_device::device_start() common_start(); ntb_enable_timer = timer_alloc(TIMER_PROTECT); ntb_enable_timer->reset(); - timer_freq = m_maincpu->cycles_to_attotime(107520); + timer_freq = machine().device("maincpu")->cycles_to_attotime(107520); save_item(NAME(m_latch1)); save_item(NAME(m_latch2)); diff --git a/src/emu/bus/nes/tengen.c b/src/emu/bus/nes/tengen.c index 9c8aa0d1a07..9efb798fc9c 100644 --- a/src/emu/bus/nes/tengen.c +++ b/src/emu/bus/nes/tengen.c @@ -84,7 +84,7 @@ void nes_tengen032_device::device_start() common_start(); irq_timer = timer_alloc(TIMER_IRQ); irq_timer->reset(); - timer_freq = m_maincpu->cycles_to_attotime(4); + timer_freq = machine().device("maincpu")->cycles_to_attotime(4); save_item(NAME(m_mmc_prg_bank)); save_item(NAME(m_mmc_vrom_bank));