diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2019-02-19 07:45:31 -0500 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2019-02-19 07:46:07 -0500 |
commit | aef98d52ed42aaf67b0c48708111b81ca86b6a99 (patch) | |
tree | e8505e084a04167002949eb611a5ac6e395adf46 /src/mame/drivers/c64.cpp | |
parent | d815ddd0fd8ac66bac0234919a6fc31b7ea1cc16 (diff) |
6525tpi, mos6526, bus/vic10: Eliminate address_space argument from handlers (nw)
Diffstat (limited to 'src/mame/drivers/c64.cpp')
-rw-r--r-- | src/mame/drivers/c64.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp index e2d38a6d515..9898081141d 100644 --- a/src/mame/drivers/c64.cpp +++ b/src/mame/drivers/c64.cpp @@ -350,11 +350,11 @@ uint8_t c64_state::read_memory(address_space &space, offs_t offset, offs_t va, i break; case 0xc: // CIA1 - data = m_cia1->read(space, offset & 0x0f); + data = m_cia1->read(offset & 0x0f); break; case 0xd: // CIA2 - data = m_cia2->read(space, offset & 0x0f); + data = m_cia2->read(offset & 0x0f); break; case 0xe: // I/O1 @@ -422,11 +422,11 @@ void c64_state::write_memory(address_space &space, offs_t offset, uint8_t data, break; case 0xc: // CIA1 - m_cia1->write(space, offset & 0x0f, data); + m_cia1->write(offset & 0x0f, data); break; case 0xd: // CIA2 - m_cia2->write(space, offset & 0x0f, data); + m_cia2->write(offset & 0x0f, data); break; case 0xe: // I/O1 @@ -692,7 +692,7 @@ READ8_MEMBER( c64_state::sid_potx_r ) { uint8_t data = 0xff; - switch (m_cia1->read_pa() >> 6) + switch (m_cia1->pa_r() >> 6) { case 1: data = m_joy1->read_pot_x(); break; case 2: data = m_joy2->read_pot_x(); break; @@ -719,7 +719,7 @@ READ8_MEMBER( c64_state::sid_poty_r ) { uint8_t data = 0xff; - switch (m_cia1->read_pa() >> 6) + switch (m_cia1->pa_r() >> 6) { case 1: data = m_joy1->read_pot_y(); break; case 2: data = m_joy2->read_pot_y(); break; @@ -773,7 +773,7 @@ READ8_MEMBER( c64_state::cia1_pa_r ) data &= ~(!BIT(joy_b, 5) << 4); // keyboard - uint8_t cia1_pb = m_cia1->read_pb(); + uint8_t cia1_pb = m_cia1->pb_r(); uint32_t row[8] = { m_row[0]->read(), m_row[1]->read() & m_lock->read(), m_row[2]->read(), m_row[3]->read(), m_row[4]->read(), m_row[5]->read(), m_row[6]->read(), m_row[7]->read() }; @@ -841,7 +841,7 @@ READ8_MEMBER( c64_state::cia1_pb_r ) data &= ~(!BIT(joy_a, 5) << 4); // keyboard - uint8_t cia1_pa = m_cia1->read_pa(); + uint8_t cia1_pa = m_cia1->pa_r(); if (!BIT(cia1_pa, 7)) data &= m_row[7]->read(); if (!BIT(cia1_pa, 6)) data &= m_row[6]->read(); |