From 250ffdd5806a334f9ba440743af935833b0f5fd5 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 20 May 2018 16:08:26 -0400 Subject: model2.cpp: Use required_device_array for timers (nw) --- src/mame/drivers/model2.cpp | 4 ---- src/mame/includes/model2.h | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp index 8800163efe5..02ff412af1f 100644 --- a/src/mame/drivers/model2.cpp +++ b/src/mame/drivers/model2.cpp @@ -267,10 +267,6 @@ MACHINE_RESET_MEMBER( model2_state, model2_common ) m_timerrun[0] = m_timerrun[1] = m_timerrun[2] = m_timerrun[3] = 0; - m_timers[0] = machine().device("timer0"); - m_timers[1] = machine().device("timer1"); - m_timers[2] = machine().device("timer2"); - m_timers[3] = machine().device("timer3"); for (i=0; i<4; i++) m_timers[i]->reset(); diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index 02fe76586fc..7e06084787d 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -46,6 +46,7 @@ public: m_screen(*this, "screen"), m_palette(*this, "palette"), m_scsp(*this, "scsp"), + m_timers(*this, "timer%u", 0U), m_cryptdevice(*this, "315_5881"), m_0229crypt(*this, "317_0229"), m_copro_data(*this, "copro_data"), @@ -102,6 +103,7 @@ protected: required_device m_screen; required_device m_palette; optional_device m_scsp; + required_device_array m_timers; optional_device m_cryptdevice; optional_device m_0229crypt; optional_memory_region m_copro_data; @@ -113,7 +115,6 @@ protected: uint32_t m_timervals[4]; uint32_t m_timerorig[4]; int m_timerrun[4]; - timer_device *m_timers[4]; int m_ctrlmode; uint16_t m_cmd_data; uint8_t m_driveio_comm_data; -- cgit v1.2.3