Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-01 00:09:18 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

mc68000: IO cleanup

Browse Source
This commit is contained in:
Dirk Best 2023-05-08 18:12:12 +02:00
parent cc64f0ccc8
commit ec5040453a
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mame/mc/mc68000.cpp
View File

@ -162,29 +162,27 @@ uint16_t mc68000_state::memory_r(offs_t offset, uint16_t mem_mask)
LOGMASKED(LOG_IO_READ, "Read from IO: %06x = %04x & %04x\n", offset << 1, data, mem_mask); LOGMASKED(LOG_IO_READ, "Read from IO: %06x = %04x & %04x\n", offset << 1, data, mem_mask);
offset = (offset << 1) & 0x3fff;
// ic45, 74ls139 // ic45, 74ls139
switch (offset >> 12) switch ((offset >> 11) & 0x03)
{ {
case 0: case 0:
if (ACCESSING_BITS_8_15 && (BIT(offset, 1) == 1)) if (ACCESSING_BITS_8_15 && (BIT(offset, 0) == 1))
data = m_crtc->register_r() << 8; data = m_crtc->register_r() << 8;
break; break;
case 1: case 1:
if (ACCESSING_BITS_0_7) if (ACCESSING_BITS_0_7)
data |= m_via[0]->read(offset >> 1) << 0; data |= m_via[0]->read(offset) << 0;
if (ACCESSING_BITS_8_15) if (ACCESSING_BITS_8_15)
data |= m_via[1]->read(offset >> 1) << 8; data |= m_via[1]->read(offset) << 8;
break; break;
case 2: case 2:
data = m_sysbus->floppy_r(offset >> 1, mem_mask); data = m_sysbus->floppy_r(offset, mem_mask);
break; break;
case 3: case 3:
if (ACCESSING_BITS_8_15 && (BIT(offset, 1) == 0)) if (ACCESSING_BITS_8_15 && (BIT(offset, 0) == 0))
{ {
data = m_key << 8; data = m_key << 8;
@ -192,7 +190,7 @@ uint16_t mc68000_state::memory_r(offs_t offset, uint16_t mem_mask)
m_via[1]->write_cb1(1); m_via[1]->write_cb1(1);
m_via[1]->write_cb1(BIT(m_switches->read(), 1)); m_via[1]->write_cb1(BIT(m_switches->read(), 1));
} }
if (ACCESSING_BITS_8_15 && (BIT(offset, 1) == 1)) if (ACCESSING_BITS_8_15 && (BIT(offset, 0) == 1))
m_apm_view.select(0); m_apm_view.select(0);
break; break;
} }
@ -251,31 +249,29 @@ void mc68000_state::memory_w(offs_t offset, uint16_t data, uint16_t mem_mask)
case 0x1: case 0x1:
LOGMASKED(LOG_IO_WRITE, "Write to IO: %06x = %04x & %04x\n", offset << 1, data, mem_mask); LOGMASKED(LOG_IO_WRITE, "Write to IO: %06x = %04x & %04x\n", offset << 1, data, mem_mask);
offset = (offset << 1) & 0x3fff;
// ic45, 74ls139 // ic45, 74ls139
switch (offset >> 12) switch ((offset >> 11) & 0x03)
{ {
case 0: case 0:
if (ACCESSING_BITS_8_15 && (BIT(offset, 1) == 0)) if (ACCESSING_BITS_8_15 && (BIT(offset, 0) == 0))
m_crtc->address_w(data >> 8); m_crtc->address_w(data >> 8);
if (ACCESSING_BITS_8_15 && (BIT(offset, 1) == 1)) if (ACCESSING_BITS_8_15 && (BIT(offset, 0) == 1))
m_crtc->register_w(data >> 8); m_crtc->register_w(data >> 8);
break; break;
case 1: case 1:
if (ACCESSING_BITS_0_7) if (ACCESSING_BITS_0_7)
m_via[0]->write(offset >> 1, data >> 0); m_via[0]->write(offset, data >> 0);
if (ACCESSING_BITS_8_15) if (ACCESSING_BITS_8_15)
m_via[1]->write(offset >> 1, data >> 8); m_via[1]->write(offset, data >> 8);
break; break;
case 2: case 2:
m_sysbus->floppy_w(offset >> 1, data, mem_mask); m_sysbus->floppy_w(offset, data, mem_mask);
break; break;
case 3: case 3:
if (ACCESSING_BITS_8_15 && (BIT(offset, 1) == 0)) if (ACCESSING_BITS_8_15 && (BIT(offset, 0) == 0))
{ {
m_centronics_latch->write(data >> 8); m_centronics_latch->write(data >> 8);
@ -283,7 +279,7 @@ void mc68000_state::memory_w(offs_t offset, uint16_t data, uint16_t mem_mask)
m_via[1]->write_cb1(1); m_via[1]->write_cb1(1);
m_via[1]->write_cb1(BIT(m_switches->read(), 0)); m_via[1]->write_cb1(BIT(m_switches->read(), 0));
} }
if (ACCESSING_BITS_8_15 && (BIT(offset, 1) == 1)) if (ACCESSING_BITS_8_15 && (BIT(offset, 0) == 1))
LOGMASKED(LOG_IO_WRITE, "Unhandled volume latch write\n"); LOGMASKED(LOG_IO_WRITE, "Unhandled volume latch write\n");
break; break;
} }