diff options
Diffstat (limited to 'src/devices/bus/isa/3c503.cpp')
-rw-r--r-- | src/devices/bus/isa/3c503.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp index 50922872343..424ce8bb082 100644 --- a/src/devices/bus/isa/3c503.cpp +++ b/src/devices/bus/isa/3c503.cpp @@ -8,8 +8,8 @@ MACHINE_CONFIG_START(el2_3c503_device::device_add_mconfig) MCFG_DEVICE_ADD("dp8390d", DP8390D, 0) MCFG_DP8390D_IRQ_CB(WRITELINE(*this, el2_3c503_device, el2_3c503_irq_w)) - MCFG_DP8390D_MEM_READ_CB(READ8(*this, el2_3c503_device, el2_3c503_mem_read)) - MCFG_DP8390D_MEM_WRITE_CB(WRITE8(*this, el2_3c503_device, el2_3c503_mem_write)) + MCFG_DP8390D_MEM_READ_CB(READ8(*this, el2_3c503_device, el2_3c503_mem_r)) + MCFG_DP8390D_MEM_WRITE_CB(WRITE8(*this, el2_3c503_device, el2_3c503_mem_w)) MACHINE_CONFIG_END DEFINE_DEVICE_TYPE(EL2_3C503, el2_3c503_device, "el2_3c503", "3C503 Network Adapter") @@ -168,10 +168,10 @@ READ8_MEMBER(el2_3c503_device::el2_3c503_hiport_r) { return (m_regs.vptr & 0x0f) << 4; case 14: if(!(m_regs.ctrl & 0x80)) return 0xff; - return el2_3c503_mem_read(space, m_regs.da++, mem_mask); + return el2_3c503_mem_r(space, machine().side_effects_disabled() ? m_regs.da : m_regs.da++, mem_mask); case 15: if(!(m_regs.ctrl & 0x80)) return 0xff; - return el2_3c503_mem_read(space, m_regs.da++, mem_mask); + return el2_3c503_mem_r(space, machine().side_effects_disabled() ? m_regs.da : m_regs.da++, mem_mask); } return 0; } @@ -267,11 +267,11 @@ WRITE8_MEMBER(el2_3c503_device::el2_3c503_hiport_w) { return; case 14: if(!(m_regs.ctrl & 0x80)) return; - el2_3c503_mem_write(space, m_regs.da++, data, mem_mask); + el2_3c503_mem_w(space, m_regs.da++, data, mem_mask); return; case 15: if(!(m_regs.ctrl & 0x80)) return; - el2_3c503_mem_write(space, m_regs.da++, data, mem_mask); + el2_3c503_mem_w(space, m_regs.da++, data, mem_mask); return; default: logerror("3c503: invalid high register write %02x\n", offset); @@ -283,14 +283,6 @@ WRITE_LINE_MEMBER(el2_3c503_device::el2_3c503_irq_w) { if(!(m_regs.gacfr & 0x80)) set_irq(state); } -READ8_MEMBER(el2_3c503_device::el2_3c503_mem_read) { - return el2_3c503_mem_read(offset); -} - -WRITE8_MEMBER(el2_3c503_device::el2_3c503_mem_write) { - el2_3c503_mem_write(offset, data); -} - uint8_t el2_3c503_device::el2_3c503_mem_read(offs_t offset) { if((offset < 8*1024) || (offset >= 16*1024)) return 0xff; return m_board_ram[offset - (8*1024)]; |