diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/coco/coco_ssc.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/coco/coco_ssc.cpp')
-rw-r--r-- | src/devices/bus/coco/coco_ssc.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp index 6dcd34a8f03..8840df18835 100644 --- a/src/devices/bus/coco/coco_ssc.cpp +++ b/src/devices/bus/coco/coco_ssc.cpp @@ -152,8 +152,7 @@ DEFINE_DEVICE_TYPE(COCOSSC_SAC, cocossc_sac_device, "cocossc_sac", "CoCo SSC Sou // MACHINE FRAGMENTS AND ADDRESS MAPS //************************************************************************** -void coco_ssc_device::device_add_mconfig(machine_config &config) -{ +MACHINE_CONFIG_START(coco_ssc_device::device_add_mconfig) TMS7040(config, m_tms7040, DERIVED_CLOCK(2, 1)); m_tms7040->in_porta().set(FUNC(coco_ssc_device::ssc_port_a_r)); m_tms7040->out_portb().set(FUNC(coco_ssc_device::ssc_port_b_w)); @@ -174,9 +173,9 @@ void coco_ssc_device::device_add_mconfig(machine_config &config) m_ay->set_flags(AY8910_SINGLE_OUTPUT); m_ay->add_route(ALL_OUTPUTS, "coco_sac_tag", AY8913_GAIN); - COCOSSC_SAC(config, m_sac, DERIVED_CLOCK(2, 1)); - m_sac->add_route(ALL_OUTPUTS, "ssc_audio", 1.0); -} + MCFG_DEVICE_ADD("coco_sac_tag", COCOSSC_SAC, DERIVED_CLOCK(2, 1)) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ssc_audio", 1.0) +MACHINE_CONFIG_END ROM_START(coco_ssc) ROM_REGION(0x1000, PIC_TAG, 0) @@ -438,12 +437,12 @@ WRITE8_MEMBER(coco_ssc_device::ssc_port_c_w) { if( (data & (C_BDR|C_BC1)) == (C_BDR|C_BC1) ) /* BDIR = 1, BC1 = 1: latch address */ { - m_ay->address_w(m_tms7000_portd); + m_ay->address_w(space, 0, m_tms7000_portd); } if( ((data & C_BDR) == C_BDR) && ((data & C_BC1) == 0) ) /* BDIR = 1, BC1 = 0: write data */ { - m_ay->data_w(m_tms7000_portd); + m_ay->data_w(space, 0, m_tms7000_portd); } } @@ -493,7 +492,7 @@ READ8_MEMBER(coco_ssc_device::ssc_port_d_r) { if( ((m_tms7000_portc & C_BDR) == 0) && ((m_tms7000_portc & C_BC1) == C_BC1) ) /* psg read data */ { - m_tms7000_portd = m_ay->data_r(); + m_tms7000_portd = m_ay->data_r(space, 0); } } |