diff --git a/src/mame/drivers/tsispch.cpp b/src/mame/drivers/tsispch.cpp index 6616ccf45f5..283cc43dbbe 100644 --- a/src/mame/drivers/tsispch.cpp +++ b/src/mame/drivers/tsispch.cpp @@ -114,7 +114,6 @@ #include "includes/tsispch.h" #include "cpu/i86/i86.h" -#include "cpu/upd7725/upd7725.h" #include "machine/i8251.h" #include "sound/dac.h" #include "sound/volt_reg.h" @@ -184,44 +183,38 @@ WRITE8_MEMBER( tsispch_state::peripheral_w ) *****************************************************************************/ READ16_MEMBER( tsispch_state::dsp_data_r ) { - upd7725_device *upd7725 = machine().device("dsp"); #ifdef DEBUG_DSP - uint8_t temp; - temp = upd7725->snesdsp_read(true); + uint8_t temp = m_dsp->snesdsp_read(true); fprintf(stderr, "dsp data read: %02x\n", temp); return temp; #else - return upd7725->snesdsp_read(true); + return m_dsp->snesdsp_read(true); #endif } WRITE16_MEMBER( tsispch_state::dsp_data_w ) { - upd7725_device *upd7725 = machine().device("dsp"); #ifdef DEBUG_DSP_W fprintf(stderr, "dsp data write: %02x\n", data); #endif - upd7725->snesdsp_write(true, data); + m_dsp->snesdsp_write(true, data); } READ16_MEMBER( tsispch_state::dsp_status_r ) { - upd7725_device *upd7725 = machine().device("dsp"); #ifdef DEBUG_DSP - uint8_t temp; - temp = upd7725->snesdsp_read(false); + uint8_t temp = m_dsp->snesdsp_read(false); fprintf(stderr, "dsp status read: %02x\n", temp); return temp; #else - return upd7725->snesdsp_read(false); + return m_dsp->snesdsp_read(false); #endif } WRITE16_MEMBER( tsispch_state::dsp_status_w ) { fprintf(stderr, "warning: upd772x status register should never be written to!\n"); - upd7725_device *upd7725 = machine().device("dsp"); - upd7725->snesdsp_write(false, data); + m_dsp->snesdsp_write(false, data); } WRITE_LINE_MEMBER( tsispch_state::dsp_to_8086_p0_w ) diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp index c15c06ebbbc..9c271b561ce 100644 --- a/src/mame/drivers/tvc.cpp +++ b/src/mame/drivers/tvc.cpp @@ -50,6 +50,7 @@ public: , m_cassette(*this, "cassette") , m_cart(*this, "cartslot") , m_centronics(*this, CENTRONICS_TAG) + , m_expansions(*this, "exp%u", 1) , m_palette(*this, "palette") , m_keyboard(*this, "LINE.%u", 0) { } @@ -60,10 +61,10 @@ public: required_device m_cassette; required_device m_cart; required_device m_centronics; + required_device_array m_expansions; required_device m_palette; required_ioport_array<16> m_keyboard; - tvcexp_slot_device *m_expansions[4]; memory_region *m_bios_rom; memory_region *m_cart_rom; memory_region *m_ext; @@ -609,11 +610,6 @@ void tvc_state::machine_start() m_int_flipflop = 0; - m_expansions[0] = machine().device("exp1"); - m_expansions[1] = machine().device("exp2"); - m_expansions[2] = machine().device("exp3"); - m_expansions[3] = machine().device("exp4"); - m_bios_rom = memregion("sys"); m_ext = memregion("ext"); m_vram = memregion("vram"); diff --git a/src/mame/includes/tsispch.h b/src/mame/includes/tsispch.h index e6ce7790132..3789b64de03 100644 --- a/src/mame/includes/tsispch.h +++ b/src/mame/includes/tsispch.h @@ -11,6 +11,7 @@ #pragma once +#include "cpu/upd7725/upd7725.h" #include "machine/pic8259.h" #include "machine/terminal.h" @@ -50,7 +51,7 @@ protected: virtual void machine_reset() override; required_device m_maincpu; - required_device m_dsp; + required_device m_dsp; required_device m_terminal; required_device m_pic;