diff options
Diffstat (limited to 'src/devices/bus/isa/ega.cpp')
-rw-r--r-- | src/devices/bus/isa/ega.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp index abca884e810..e3d75e4070a 100644 --- a/src/devices/bus/isa/ega.cpp +++ b/src/devices/bus/isa/ega.cpp @@ -637,9 +637,9 @@ void isa8_ega_device::device_start() m_plane[3] = m_videoram + 0x30000; m_isa->install_rom(this, 0xc0000, 0xc3fff, "ega", "user2"); - m_isa->install_device(0x3b0, 0x3bf, read8_delegate(*this, FUNC(isa8_ega_device::pc_ega8_3b0_r)), write8_delegate(*this, FUNC(isa8_ega_device::pc_ega8_3b0_w))); - m_isa->install_device(0x3c0, 0x3cf, read8_delegate(*this, FUNC(isa8_ega_device::pc_ega8_3c0_r)), write8_delegate(*this, FUNC(isa8_ega_device::pc_ega8_3c0_w))); - m_isa->install_device(0x3d0, 0x3df, read8_delegate(*this, FUNC(isa8_ega_device::pc_ega8_3d0_r)), write8_delegate(*this, FUNC(isa8_ega_device::pc_ega8_3d0_w))); + m_isa->install_device(0x3b0, 0x3bf, read8sm_delegate(*this, FUNC(isa8_ega_device::pc_ega8_3b0_r)), write8sm_delegate(*this, FUNC(isa8_ega_device::pc_ega8_3b0_w))); + m_isa->install_device(0x3c0, 0x3cf, read8sm_delegate(*this, FUNC(isa8_ega_device::pc_ega8_3c0_r)), write8sm_delegate(*this, FUNC(isa8_ega_device::pc_ega8_3c0_w))); + m_isa->install_device(0x3d0, 0x3df, read8sm_delegate(*this, FUNC(isa8_ega_device::pc_ega8_3d0_r)), write8sm_delegate(*this, FUNC(isa8_ega_device::pc_ega8_3d0_w))); } //------------------------------------------------- @@ -693,7 +693,7 @@ void isa8_ega_device::install_banks() case 0x00: /* 0xA0000, 128KB */ if ( m_misc_output & 0x02 ) { - m_isa->install_memory(0xa0000, 0xbffff, read8_delegate(*this, FUNC(isa8_ega_device::read)), write8_delegate(*this, FUNC(isa8_ega_device::write))); + m_isa->install_memory(0xa0000, 0xbffff, read8sm_delegate(*this, FUNC(isa8_ega_device::read)), write8sm_delegate(*this, FUNC(isa8_ega_device::write))); } else { @@ -705,7 +705,7 @@ void isa8_ega_device::install_banks() case 0x04: /* 0xA0000, 64KB */ if ( m_misc_output & 0x02 ) { - m_isa->install_memory(0xa0000, 0xaffff, read8_delegate(*this, FUNC(isa8_ega_device::read)), write8_delegate(*this, FUNC(isa8_ega_device::write))); + m_isa->install_memory(0xa0000, 0xaffff, read8sm_delegate(*this, FUNC(isa8_ega_device::read)), write8sm_delegate(*this, FUNC(isa8_ega_device::write))); } else { @@ -718,7 +718,7 @@ void isa8_ega_device::install_banks() case 0x08: /* 0xB0000, 32KB */ if ( m_misc_output & 0x02 ) { - m_isa->install_memory(0xb0000, 0xb7fff, read8_delegate(*this, FUNC(isa8_ega_device::read)), write8_delegate(*this, FUNC(isa8_ega_device::write))); + m_isa->install_memory(0xb0000, 0xb7fff, read8sm_delegate(*this, FUNC(isa8_ega_device::read)), write8sm_delegate(*this, FUNC(isa8_ega_device::write))); } else { @@ -731,7 +731,7 @@ void isa8_ega_device::install_banks() case 0x0c: /* 0xB8000, 32KB */ if ( m_misc_output & 0x02 ) { - m_isa->install_memory(0xb8000, 0xbffff, read8_delegate(*this, FUNC(isa8_ega_device::read)), write8_delegate(*this, FUNC(isa8_ega_device::write))); + m_isa->install_memory(0xb8000, 0xbffff, read8sm_delegate(*this, FUNC(isa8_ega_device::read)), write8sm_delegate(*this, FUNC(isa8_ega_device::write))); } else { @@ -953,7 +953,7 @@ void isa8_ega_device::change_mode() } -READ8_MEMBER( isa8_ega_device::read ) +uint8_t isa8_ega_device::read(offs_t offset) { uint8_t data = 0xFF; @@ -1013,7 +1013,7 @@ uint8_t isa8_ega_device::alu_op( uint8_t data, uint8_t latch_data ) } -WRITE8_MEMBER( isa8_ega_device::write ) +void isa8_ega_device::write(offs_t offset, uint8_t data) { uint8_t d[4]; uint8_t alu[4]; @@ -1159,7 +1159,7 @@ WRITE8_MEMBER( isa8_ega_device::write ) } -READ8_MEMBER( isa8_ega_device::pc_ega8_3X0_r ) +uint8_t isa8_ega_device::pc_ega8_3X0_r(offs_t offset) { int data = 0xff; @@ -1196,7 +1196,7 @@ READ8_MEMBER( isa8_ega_device::pc_ega8_3X0_r ) return data; } -WRITE8_MEMBER( isa8_ega_device::pc_ega8_3X0_w ) +void isa8_ega_device::pc_ega8_3X0_w(offs_t offset, uint8_t data) { LOGSETUP("%s: offset = %02x, data = %02x\n", FUNCNAME, offset, data ); @@ -1229,37 +1229,37 @@ WRITE8_MEMBER( isa8_ega_device::pc_ega8_3X0_w ) -READ8_MEMBER(isa8_ega_device::pc_ega8_3b0_r ) +uint8_t isa8_ega_device::pc_ega8_3b0_r(offs_t offset) { - return ( m_misc_output & 0x01 ) ? 0xFF : pc_ega8_3X0_r(space, offset); + return ( m_misc_output & 0x01 ) ? 0xFF : pc_ega8_3X0_r(offset); } -READ8_MEMBER(isa8_ega_device::pc_ega8_3d0_r ) +uint8_t isa8_ega_device::pc_ega8_3d0_r(offs_t offset) { - return ( m_misc_output & 0x01 ) ? pc_ega8_3X0_r(space, offset) : 0xFF; + return ( m_misc_output & 0x01 ) ? pc_ega8_3X0_r(offset) : 0xFF; } -WRITE8_MEMBER(isa8_ega_device::pc_ega8_3b0_w ) +void isa8_ega_device::pc_ega8_3b0_w(offs_t offset, uint8_t data) { if ( ! ( m_misc_output & 0x01 ) ) { - pc_ega8_3X0_w( space, offset, data ); + pc_ega8_3X0_w( offset, data ); } } -WRITE8_MEMBER(isa8_ega_device::pc_ega8_3d0_w ) +void isa8_ega_device::pc_ega8_3d0_w(offs_t offset, uint8_t data) { if ( m_misc_output & 0x01 ) { - pc_ega8_3X0_w( space, offset, data ); + pc_ega8_3X0_w( offset, data ); } } -READ8_MEMBER(isa8_ega_device::pc_ega8_3c0_r ) +uint8_t isa8_ega_device::pc_ega8_3c0_r(offs_t offset) { int data = 0xff; @@ -1299,7 +1299,7 @@ READ8_MEMBER(isa8_ega_device::pc_ega8_3c0_r ) } -WRITE8_MEMBER(isa8_ega_device::pc_ega8_3c0_w ) +void isa8_ega_device::pc_ega8_3c0_w(offs_t offset, uint8_t data) { static const uint8_t ar_reg_mask[0x20] = { |