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/a2bus/a2mockingboard.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/a2bus/a2mockingboard.cpp')
-rw-r--r-- | src/devices/bus/a2bus/a2mockingboard.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp index c4c45b6975b..c1d67bfa7d3 100644 --- a/src/devices/bus/a2bus/a2mockingboard.cpp +++ b/src/devices/bus/a2bus/a2mockingboard.cpp @@ -238,7 +238,7 @@ WRITE8_MEMBER( a2bus_ayboard_device::via1_out_b ) { if (!BIT(data, 2)) { - m_ay1->reset_w(); + m_ay1->reset_w(space, 0, 0); } else { @@ -248,15 +248,15 @@ WRITE8_MEMBER( a2bus_ayboard_device::via1_out_b ) break; case 1: // BDIR=0, BC1=1 (read PSG) - m_porta1 = m_ay1->data_r(); + m_porta1 = m_ay1->read_data(); break; case 2: // BDIR=1, BC1=0 (write PSG) - m_ay1->data_w(m_porta1); + m_ay1->write_data(m_porta1); break; case 3: // BDIR=1, BC1=1 (latch) - m_ay1->address_w(m_porta1); + m_ay1->write_address(m_porta1); break; } } @@ -266,10 +266,10 @@ WRITE8_MEMBER( a2bus_phasor_device::via1_out_b ) { if (!(data & 4)) { - m_ay1->reset_w(); + m_ay1->reset_w(space, 0, 0); if (m_native) { - m_ay2->reset_w(); + m_ay2->reset_w(space, 0, 0); } } else @@ -289,23 +289,23 @@ WRITE8_MEMBER( a2bus_phasor_device::via1_out_b ) case 1: // BDIR=0, BC1=1 (read PSG) if (BIT(chip_sel, 0)) - m_porta1 = m_ay1->data_r(); + m_porta1 = m_ay1->read_data(); if (BIT(chip_sel, 1)) - m_porta1 = m_ay2->data_r(); + m_porta1 = m_ay2->read_data(); break; case 2: // BDIR=1, BC1=0 (write PSG) if (BIT(chip_sel, 0)) - m_ay1->data_w(m_porta1); + m_ay1->write_data(m_porta1); if (BIT(chip_sel, 1)) - m_ay2->data_w(m_porta1); + m_ay2->write_data(m_porta1); break; case 3: // BDIR=1, BC1=1 (latch) if (BIT(chip_sel, 0)) - m_ay1->address_w(m_porta1); + m_ay1->write_address(m_porta1); if (BIT(chip_sel, 1)) - m_ay2->address_w(m_porta1); + m_ay2->write_address(m_porta1); break; } } @@ -320,7 +320,7 @@ WRITE8_MEMBER( a2bus_ayboard_device::via2_out_b ) { if (!BIT(data, 2)) { - m_ay2->reset_w(); + m_ay2->reset_w(space, 0, 0); } else { @@ -330,15 +330,15 @@ WRITE8_MEMBER( a2bus_ayboard_device::via2_out_b ) break; case 1: // BDIR=0, BC1=1 (read PSG) - m_porta2 = m_ay2->data_r(); + m_porta2 = m_ay2->read_data(); break; case 2: // BDIR=1, BC1=0 (write PSG) - m_ay2->data_w(m_porta2); + m_ay2->write_data(m_porta2); break; case 3: // BDIR=1, BC1=1 (latch) - m_ay2->data_w(m_porta2); + m_ay2->write_data(m_porta2); break; } } @@ -350,12 +350,12 @@ WRITE8_MEMBER( a2bus_phasor_device::via2_out_b ) { if (m_native) { - m_ay3->reset_w(); - m_ay4->reset_w(); + m_ay3->reset_w(space, 0, 0); + m_ay4->reset_w(space, 0, 0); } else { - m_ay2->reset_w(); + m_ay2->reset_w(space, 0, 0); } } else @@ -375,23 +375,23 @@ WRITE8_MEMBER( a2bus_phasor_device::via2_out_b ) case 1: // BDIR=0, BC1=1 (read PSG) if (BIT(chip_sel, 0)) - m_porta2 = m_ay3->data_r(); + m_porta2 = m_ay3->read_data(); if (BIT(chip_sel, 1)) - m_porta2 = m_ay4->data_r(); + m_porta2 = m_ay4->read_data(); break; case 2: // BDIR=1, BC1=0 (write PSG) if (BIT(chip_sel, 0)) - m_ay3->data_w(m_porta2); + m_ay3->write_data(m_porta2); if (BIT(chip_sel, 1)) - m_ay4->data_w(m_porta2); + m_ay4->write_data(m_porta2); break; case 3: // BDIR=1, BC1=1 (latch) if (BIT(chip_sel, 0)) - m_ay3->address_w(m_porta2); + m_ay3->write_address(m_porta2); if (BIT(chip_sel, 1)) - m_ay4->address_w(m_porta2); + m_ay4->write_address(m_porta2); break; } } |