From f4c4d59915feeb42236e3095cb1b0acc4c0fa2a5 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Mon, 25 Jun 2018 19:41:33 +0200 Subject: apple2gs: output_finder (nw) --- src/mame/includes/apple2.h | 4 +++- src/mame/machine/apple2.cpp | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mame/includes/apple2.h b/src/mame/includes/apple2.h index b04e26a78a0..a218b806d88 100644 --- a/src/mame/includes/apple2.h +++ b/src/mame/includes/apple2.h @@ -36,7 +36,7 @@ #define IIC_ACIA1_TAG "acia1" #define IIC_ACIA2_TAG "acia2" -#define IICP_IWM_TAG "iwm" +#define IICP_IWM_TAG "fdc" #define LASER128_UDC_TAG "l128udc" @@ -140,6 +140,7 @@ public: m_ram(*this, RAM_TAG), m_ay3600(*this, "ay3600"), m_a2bus(*this, "a2bus"), + m_speaker(*this, "a2speaker"), m_a2eauxslot(*this, AUXSLOT_TAG), m_joy1x(*this, "joystick_1_x"), m_joy1y(*this, "joystick_1_y"), @@ -163,6 +164,7 @@ public: required_device m_ram; required_device m_ay3600; required_device m_a2bus; + required_device m_speaker; optional_device m_a2eauxslot; optional_ioport m_joy1x, m_joy1y, m_joy2x, m_joy2y, m_joybuttons; diff --git a/src/mame/machine/apple2.cpp b/src/mame/machine/apple2.cpp index a555b69d9f4..b5d78232afa 100644 --- a/src/mame/machine/apple2.cpp +++ b/src/mame/machine/apple2.cpp @@ -1794,10 +1794,8 @@ READ8_MEMBER ( apple2_state::apple2_c03x_r ) { if (!offset) { - speaker_sound_device *speaker = machine().device("a2speaker"); - m_a2_speaker_state ^= 1; - speaker->level_w(m_a2_speaker_state); + m_speaker->level_w(m_a2_speaker_state); } } return apple2_getfloatingbusvalue(); @@ -2112,7 +2110,7 @@ void apple2_state::apple2_iwm_setdiskreg(uint8_t data) { m_fdc_diskreg = data & 0xC0; if (apple2_fdc_has_35()) - sony_set_sel_line( machine().device("fdc"),m_fdc_diskreg & 0x80); + sony_set_sel_line(m_iicpiwm, m_fdc_diskreg & 0x80); } -- cgit v1.2.3