diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2020-05-25 20:09:31 +0200 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2020-05-25 20:09:31 +0200 |
commit | 05ff77a36994c0d3a7a8187ff966ab2355b20277 (patch) | |
tree | 72701356c692f61aa315e60fbcd67974d96886ea /src/devices/bus/isa/cga.cpp | |
parent | dbfff24288ccf868e1901c61b5c079bb9aaeae2b (diff) |
drivers starting with a and b: some macro removal (nw)
Diffstat (limited to 'src/devices/bus/isa/cga.cpp')
-rw-r--r-- | src/devices/bus/isa/cga.cpp | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp index 1be367cc992..ff30f3690ad 100644 --- a/src/devices/bus/isa/cga.cpp +++ b/src/devices/bus/isa/cga.cpp @@ -331,7 +331,7 @@ void isa8_cga_device::device_start() set_isa_device(); m_vram.resize(m_vram_size); - m_isa->install_device(0x3d0, 0x3df, read8_delegate(*this, FUNC(isa8_cga_device::io_read)), write8_delegate(*this, FUNC(isa8_cga_device::io_write))); + m_isa->install_device(0x3d0, 0x3df, read8sm_delegate(*this, FUNC(isa8_cga_device::io_read)), write8sm_delegate(*this, FUNC(isa8_cga_device::io_write))); m_isa->install_bank(0xb8000, 0xb8000 + (std::min<size_t>)(0x8000, m_vram_size) - 1, "bank_cga", &m_vram[0]); if(m_vram_size == 0x4000) m_isa->install_bank(0xbc000, 0xbffff, "bank_cga", &m_vram[0]); @@ -903,7 +903,7 @@ void isa8_cga_device::plantronics_w(uint8_t data) *************************************************************************/ -READ8_MEMBER( isa8_cga_device::io_read ) +uint8_t isa8_cga_device::io_read(offs_t offset) { uint8_t data = 0xff; @@ -924,7 +924,7 @@ READ8_MEMBER( isa8_cga_device::io_read ) -WRITE8_MEMBER( isa8_cga_device::io_write ) +void isa8_cga_device::io_write(offs_t offset, uint8_t data) { switch(offset) { case 0: case 2: case 4: case 6: @@ -1164,7 +1164,7 @@ MC6845_UPDATE_ROW( isa8_cga_pc1512_device::pc1512_gfx_4bpp_update_row ) } -WRITE8_MEMBER( isa8_cga_pc1512_device::io_write ) +void isa8_cga_pc1512_device::io_write(offs_t offset, uint8_t data) { switch (offset) { @@ -1256,13 +1256,13 @@ WRITE8_MEMBER( isa8_cga_pc1512_device::io_write ) break; default: - isa8_cga_device::io_write(space, offset,data); + isa8_cga_device::io_write(offset, data); break; } } -READ8_MEMBER( isa8_cga_pc1512_device::io_read ) +uint8_t isa8_cga_pc1512_device::io_read(offs_t offset) { uint8_t data; @@ -1277,14 +1277,14 @@ READ8_MEMBER( isa8_cga_pc1512_device::io_read ) break; default: - data = isa8_cga_device::io_read(space, offset); + data = isa8_cga_device::io_read(offset); break; } return data; } -WRITE8_MEMBER( isa8_cga_pc1512_device::vram_w ) +void isa8_cga_pc1512_device::vram_w(offs_t offset, uint8_t data) { if ( ( m_mode_control & 0x12 ) == 0x12 ) { @@ -1346,13 +1346,13 @@ void isa8_cga_pc1512_device::device_start() { isa8_cga_device::device_start(); - m_isa->install_device(0x3d0, 0x3df, read8_delegate(*this, FUNC(isa8_cga_pc1512_device::io_read)), write8_delegate(*this, FUNC(isa8_cga_pc1512_device::io_write))); + m_isa->install_device(0x3d0, 0x3df, read8sm_delegate(*this, FUNC(isa8_cga_pc1512_device::io_read)), write8sm_delegate(*this, FUNC(isa8_cga_pc1512_device::io_write))); m_isa->install_bank(0xb8000, 0xbbfff, "bank1", &m_vram[0]); address_space &space = m_isa->memspace(); - space.install_write_handler(0xb8000, 0xbbfff, write8_delegate(*this, FUNC(isa8_cga_pc1512_device::vram_w))); - space.install_write_handler(0xbc000, 0xbffff, write8_delegate(*this, FUNC(isa8_cga_pc1512_device::vram_w))); + space.install_write_handler(0xb8000, 0xbbfff, write8sm_delegate(*this, FUNC(isa8_cga_pc1512_device::vram_w))); + space.install_write_handler(0xbc000, 0xbffff, write8sm_delegate(*this, FUNC(isa8_cga_pc1512_device::vram_w))); } void isa8_cga_pc1512_device::device_reset() @@ -1391,7 +1391,7 @@ void isa8_wyse700_device::change_resolution(uint8_t mode) } -WRITE8_MEMBER( isa8_wyse700_device::io_write ) +void isa8_wyse700_device::io_write(offs_t offset, uint8_t data) { switch (offset) { @@ -1408,13 +1408,13 @@ WRITE8_MEMBER( isa8_wyse700_device::io_write ) m_control = data; break; default: - isa8_cga_device::io_write(space, offset,data); + isa8_cga_device::io_write(offset, data); break; } } -READ8_MEMBER( isa8_wyse700_device::io_read ) +uint8_t isa8_wyse700_device::io_read(offs_t offset) { uint8_t data; @@ -1432,7 +1432,7 @@ READ8_MEMBER( isa8_wyse700_device::io_read ) data = m_control; break; default: - data = isa8_cga_device::io_read(space, offset); + data = isa8_cga_device::io_read(offset); break; } return data; @@ -1485,7 +1485,7 @@ void isa8_wyse700_device::device_start() { isa8_cga_device::device_start(); - m_isa->install_device(0x3d0, 0x3df, read8_delegate(*this, FUNC(isa8_wyse700_device::io_read)), write8_delegate(*this, FUNC(isa8_wyse700_device::io_write))); + m_isa->install_device(0x3d0, 0x3df, read8sm_delegate(*this, FUNC(isa8_wyse700_device::io_read)), write8sm_delegate(*this, FUNC(isa8_wyse700_device::io_write))); m_isa->install_bank(0xa0000, 0xaffff, "bank_wy1", &m_vram[0x00000]); m_isa->install_bank(0xb0000, 0xbffff, "bank_cga", &m_vram[0x10000]); } @@ -1547,7 +1547,7 @@ void isa8_ec1841_0002_device::device_start() { isa8_cga_device::device_start(); - m_isa->install_device(0x3d0, 0x3df, read8_delegate(*this, FUNC(isa8_ec1841_0002_device::io_read)), write8_delegate(*this, FUNC(isa8_ec1841_0002_device::io_write))); + m_isa->install_device(0x3d0, 0x3df, read8sm_delegate(*this, FUNC(isa8_ec1841_0002_device::io_read)), write8sm_delegate(*this, FUNC(isa8_ec1841_0002_device::io_write))); } void isa8_ec1841_0002_device::device_reset() @@ -1556,7 +1556,7 @@ void isa8_ec1841_0002_device::device_reset() m_p3df = 0; } -WRITE8_MEMBER( isa8_ec1841_0002_device::char_ram_write ) +void isa8_ec1841_0002_device::char_ram_write(offs_t offset, uint8_t data) { offset ^= BIT(offset, 12); // logerror("write char ram %04x %02x\n",offset,data); @@ -1566,13 +1566,13 @@ WRITE8_MEMBER( isa8_ec1841_0002_device::char_ram_write ) m_chr_gen_base[offset + 0x1800] = data; } -READ8_MEMBER( isa8_ec1841_0002_device::char_ram_read ) +uint8_t isa8_ec1841_0002_device::char_ram_read(offs_t offset) { offset ^= BIT(offset, 12); return m_chr_gen_base[offset]; } -WRITE8_MEMBER( isa8_ec1841_0002_device::io_write ) +void isa8_ec1841_0002_device::io_write(offs_t offset, uint8_t data) { switch (offset) { @@ -1580,12 +1580,12 @@ WRITE8_MEMBER( isa8_ec1841_0002_device::io_write ) m_p3df = data; if (data & 1) { m_isa->install_memory(0xb8000, 0xb9fff, - read8_delegate( *this, FUNC(isa8_ec1841_0002_device::char_ram_read)), - write8_delegate(*this, FUNC(isa8_ec1841_0002_device::char_ram_write))); + read8sm_delegate( *this, FUNC(isa8_ec1841_0002_device::char_ram_read)), + write8sm_delegate(*this, FUNC(isa8_ec1841_0002_device::char_ram_write))); if(m_vram_size == 0x4000) m_isa->install_memory(0xbc000, 0xbdfff, - read8_delegate( *this, FUNC(isa8_ec1841_0002_device::char_ram_read)), - write8_delegate(*this, FUNC(isa8_ec1841_0002_device::char_ram_write))); + read8sm_delegate( *this, FUNC(isa8_ec1841_0002_device::char_ram_read)), + write8sm_delegate(*this, FUNC(isa8_ec1841_0002_device::char_ram_write))); } else { m_isa->install_bank(0xb8000, 0xb8000 + (std::min<size_t>)(0x8000, m_vram_size) - 1, "bank_cga", &m_vram[0]); if(m_vram_size == 0x4000) @@ -1593,12 +1593,12 @@ WRITE8_MEMBER( isa8_ec1841_0002_device::io_write ) } break; default: - isa8_cga_device::io_write(space, offset, data); + isa8_cga_device::io_write(offset, data); break; } } -READ8_MEMBER( isa8_ec1841_0002_device::io_read ) +uint8_t isa8_ec1841_0002_device::io_read(offs_t offset) { uint8_t data; @@ -1608,7 +1608,7 @@ READ8_MEMBER( isa8_ec1841_0002_device::io_read ) data = m_p3df; break; default: - data = isa8_cga_device::io_read(space, offset); + data = isa8_cga_device::io_read(offset); break; } return data; @@ -1775,7 +1775,7 @@ MC6845_RECONFIGURE( isa8_cga_m24_device::reconfigure ) m_screen->configure(width, height, visarea, frame_period); } -WRITE8_MEMBER( isa8_cga_m24_device::io_write ) +void isa8_cga_m24_device::io_write(offs_t offset, uint8_t data) { switch(offset) { @@ -1810,12 +1810,12 @@ WRITE8_MEMBER( isa8_cga_m24_device::io_write ) m_start_offset = 0; break; default: - isa8_cga_device::io_write(space, offset, data); + isa8_cga_device::io_write(offset, data); break; } } -READ8_MEMBER( isa8_cga_m24_device::io_read ) +uint8_t isa8_cga_m24_device::io_read(offs_t offset) { uint8_t data = 0xff; @@ -1828,7 +1828,7 @@ READ8_MEMBER( isa8_cga_m24_device::io_read ) data = m_mode2; break; default: - data = isa8_cga_device::io_read(space, offset); + data = isa8_cga_device::io_read(offset); break; } return data; @@ -1946,42 +1946,42 @@ const tiny_rom_entry *isa8_cga_cportiii_device::device_rom_region() const void isa8_cga_cportiii_device::device_reset() { isa8_cga_m24_device::device_reset(); - m_isa->install_device(0x13c6, 0x13c7, read8_delegate(*this, FUNC(isa8_cga_cportiii_device::port_13c6_r)), write8_delegate(*this, FUNC(isa8_cga_cportiii_device::port_13c6_w))); - m_isa->install_device(0x23c6, 0x23c7, read8_delegate(*this, FUNC(isa8_cga_cportiii_device::port_23c6_r)), write8_delegate(*this, FUNC(isa8_cga_cportiii_device::port_23c6_w))); + m_isa->install_device(0x13c6, 0x13c7, read8smo_delegate(*this, FUNC(isa8_cga_cportiii_device::port_13c6_r)), write8smo_delegate(*this, FUNC(isa8_cga_cportiii_device::port_13c6_w))); + m_isa->install_device(0x23c6, 0x23c7, read8smo_delegate(*this, FUNC(isa8_cga_cportiii_device::port_23c6_r)), write8smo_delegate(*this, FUNC(isa8_cga_cportiii_device::port_23c6_w))); m_palette->set_pen_color(0, 100, 25, 0); m_chr_gen_offset[0] = m_chr_gen_offset[2] = 0x0000; m_chr_gen_offset[1] = m_chr_gen_offset[3] = 0x1000; } -WRITE8_MEMBER(isa8_cga_cportiii_device::char_ram_write) +void isa8_cga_cportiii_device::char_ram_write(offs_t offset, uint8_t data) { m_chr_gen_base[offset] = data; } -READ8_MEMBER(isa8_cga_cportiii_device::char_ram_read) +uint8_t isa8_cga_cportiii_device::char_ram_read(offs_t offset) { return m_chr_gen_base[offset]; } -READ8_MEMBER(isa8_cga_cportiii_device::port_13c6_r) +uint8_t isa8_cga_cportiii_device::port_13c6_r() { return 0x04; } -WRITE8_MEMBER(isa8_cga_cportiii_device::port_13c6_w) +void isa8_cga_cportiii_device::port_13c6_w(uint8_t data) { } -READ8_MEMBER(isa8_cga_cportiii_device::port_23c6_r) +uint8_t isa8_cga_cportiii_device::port_23c6_r() { return 0; } -WRITE8_MEMBER(isa8_cga_cportiii_device::port_23c6_w) +void isa8_cga_cportiii_device::port_23c6_w(uint8_t data) { m_mode2 = data & 1; if(BIT(data, 3)) - m_isa->install_memory(0xb8000, 0xb9fff, read8_delegate(*this, FUNC(isa8_cga_cportiii_device::char_ram_read)), write8_delegate(*this, FUNC(isa8_cga_cportiii_device::char_ram_write))); + m_isa->install_memory(0xb8000, 0xb9fff, read8sm_delegate(*this, FUNC(isa8_cga_cportiii_device::char_ram_read)), write8sm_delegate(*this, FUNC(isa8_cga_cportiii_device::char_ram_write))); else m_isa->install_bank(0xb8000, 0xb8000 + 0x8000 - 1, "bank_cga", &m_vram[0]); } |