From 98aeb64c3c16843e2be02223ffc644f41ad5724a Mon Sep 17 00:00:00 2001 From: angelosa Date: Sat, 26 May 2018 17:32:24 +0200 Subject: Fix encapsulation flaw (nw) --- src/devices/bus/cbus/pc9801_118.cpp | 4 ++-- src/devices/bus/cbus/pc9801_26.cpp | 8 ++++---- src/devices/bus/cbus/pc9801_26.h | 2 +- src/devices/bus/cbus/pc9801_86.cpp | 4 ++-- src/devices/bus/cbus/pc9801_snd.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/devices/bus/cbus/pc9801_118.cpp b/src/devices/bus/cbus/pc9801_118.cpp index eee4232c92d..e05c61a3cf6 100644 --- a/src/devices/bus/cbus/pc9801_118.cpp +++ b/src/devices/bus/cbus/pc9801_118.cpp @@ -43,10 +43,10 @@ MACHINE_CONFIG_START(pc9801_118_device::device_add_mconfig) SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("opn3", YM2608, MAIN_CLOCK_X2*4) // actually YMF288, unknown clock / divider, might be X1 x 5 actually MCFG_YM2608_IRQ_HANDLER(WRITELINE(*this, pc9801_118_device, sound_irq)) - MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pc9801_snd_device, opn_porta_r)) + MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pc9801_118_device, opn_porta_r)) //MCFG_AY8910_PORT_B_READ_CB(READ8(*this, pc9801_state, opn_portb_r)) //MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, pc9801_state, opn_porta_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, pc9801_snd_device, opn_portb_w)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, pc9801_118_device, opn_portb_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) MACHINE_CONFIG_END diff --git a/src/devices/bus/cbus/pc9801_26.cpp b/src/devices/bus/cbus/pc9801_26.cpp index 30dbe96711e..95ef0baf69c 100644 --- a/src/devices/bus/cbus/pc9801_26.cpp +++ b/src/devices/bus/cbus/pc9801_26.cpp @@ -27,7 +27,7 @@ // device type definition DEFINE_DEVICE_TYPE(PC9801_26, pc9801_26_device, "pc9801_26", "pc9801_26") -WRITE_LINE_MEMBER(pc9801_26_device::pc9801_sound_irq) +WRITE_LINE_MEMBER(pc9801_26_device::sound_irq) { /* TODO: seems to die very often */ m_bus->int_w<5>(state); @@ -41,11 +41,11 @@ WRITE_LINE_MEMBER(pc9801_26_device::pc9801_sound_irq) MACHINE_CONFIG_START(pc9801_26_device::device_add_mconfig) SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("opn", YM2203, MAIN_CLOCK_X1*2) // unknown clock / divider - MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, pc9801_26_device, pc9801_sound_irq)) - MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pc9801_snd_device, opn_porta_r)) + MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, pc9801_26_device, sound_irq)) + MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pc9801_26_device, opn_porta_r)) //MCFG_AY8910_PORT_B_READ_CB(READ8(*this, pc9801_state, opn_portb_r)) //MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, pc9801_state, opn_porta_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, pc9801_snd_device, opn_portb_w)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, pc9801_26_device, opn_portb_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END diff --git a/src/devices/bus/cbus/pc9801_26.h b/src/devices/bus/cbus/pc9801_26.h index eb5049db2bd..9ad86b8b067 100644 --- a/src/devices/bus/cbus/pc9801_26.h +++ b/src/devices/bus/cbus/pc9801_26.h @@ -46,7 +46,7 @@ private: uint8_t m_joy_sel; - DECLARE_WRITE_LINE_MEMBER(pc9801_sound_irq); + DECLARE_WRITE_LINE_MEMBER(sound_irq); }; diff --git a/src/devices/bus/cbus/pc9801_86.cpp b/src/devices/bus/cbus/pc9801_86.cpp index 8743aeb7243..e022b745712 100644 --- a/src/devices/bus/cbus/pc9801_86.cpp +++ b/src/devices/bus/cbus/pc9801_86.cpp @@ -56,10 +56,10 @@ MACHINE_CONFIG_START(pc9801_86_device::pc9801_86_config) MCFG_DEVICE_ADD("opna", YM2608, 7.987_MHz_XTAL) MCFG_YM2608_IRQ_HANDLER(WRITELINE(*this, pc9801_86_device, sound_irq)) MCFG_AY8910_OUTPUT_TYPE(0) - MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pc9801_snd_device, opn_porta_r)) + MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pc9801_86_device, opn_porta_r)) //MCFG_AY8910_PORT_B_READ_CB(READ8(*this, pc9801_state, opn_portb_r)) //MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, pc9801_state, opn_porta_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, pc9801_snd_device, opn_portb_w)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, pc9801_86_device, opn_portb_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) diff --git a/src/devices/bus/cbus/pc9801_snd.h b/src/devices/bus/cbus/pc9801_snd.h index 24c410cf12d..a5d9b8d3c61 100644 --- a/src/devices/bus/cbus/pc9801_snd.h +++ b/src/devices/bus/cbus/pc9801_snd.h @@ -17,9 +17,9 @@ class pc9801_snd_device : public device_t public: pc9801_snd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); +protected: DECLARE_READ8_MEMBER(opn_porta_r); DECLARE_WRITE8_MEMBER(opn_portb_w); -protected: private: uint8_t m_joy_sel; -- cgit v1.2.3