diff options
author | 2020-05-28 18:10:20 +0200 | |
---|---|---|
committer | 2020-05-28 18:10:20 +0200 | |
commit | d4c772bcc7263dd2697a7977d196a96ad2d067a3 (patch) | |
tree | 3fa4d24ee8250f44ec9f7a0cc9df94bf8bd3c5cb /src/mame/drivers/jupace.cpp | |
parent | c7d667d41adaa9627a3350e7f984fe7fc431f081 (diff) |
drivers starting with i, j, k, l and m: more macro removal (nw)
Diffstat (limited to 'src/mame/drivers/jupace.cpp')
-rw-r--r-- | src/mame/drivers/jupace.cpp | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp index 3cc27b6af46..97a71dbdcb3 100644 --- a/src/mame/drivers/jupace.cpp +++ b/src/mame/drivers/jupace.cpp @@ -104,32 +104,32 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER( io_r ); - DECLARE_WRITE8_MEMBER( io_w ); - DECLARE_READ8_MEMBER( ppi_pa_r ); - DECLARE_WRITE8_MEMBER( ppi_pa_w ); - DECLARE_READ8_MEMBER( ppi_pb_r ); - DECLARE_WRITE8_MEMBER( ppi_pb_w ); - DECLARE_READ8_MEMBER( ppi_pc_r ); - DECLARE_WRITE8_MEMBER( ppi_pc_w ); - DECLARE_READ8_MEMBER( ppi_control_r ); - DECLARE_WRITE8_MEMBER( ppi_control_w ); + uint8_t io_r(offs_t offset); + void io_w(uint8_t data); + uint8_t ppi_pa_r(); + void ppi_pa_w(uint8_t data); + uint8_t ppi_pb_r(); + void ppi_pb_w(uint8_t data); + uint8_t ppi_pc_r(); + void ppi_pc_w(uint8_t data); + uint8_t ppi_control_r(); + void ppi_control_w(uint8_t data); uint8_t pio_pa_r(); void pio_pa_w(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(set_irq); TIMER_DEVICE_CALLBACK_MEMBER(clear_irq); - DECLARE_READ8_MEMBER(pio_ad_r); - DECLARE_READ8_MEMBER(pio_bd_r); - DECLARE_READ8_MEMBER(pio_ac_r); - DECLARE_READ8_MEMBER(pio_bc_r); - DECLARE_WRITE8_MEMBER(pio_ad_w); - DECLARE_WRITE8_MEMBER(pio_bd_w); - DECLARE_WRITE8_MEMBER(pio_ac_w); - DECLARE_WRITE8_MEMBER(pio_bc_w); + uint8_t pio_ad_r(); + uint8_t pio_bd_r(); + uint8_t pio_ac_r(); + uint8_t pio_bc_r(); + void pio_ad_w(uint8_t data); + void pio_bd_w(uint8_t data); + void pio_ac_w(uint8_t data); + void pio_bc_w(uint8_t data); uint8_t sby_r(); void ald_w(uint8_t data); - DECLARE_SNAPSHOT_LOAD_MEMBER(snapshot_cb); + SNAPSHOT_LOAD_MEMBER(snapshot_cb); void ace_io(address_map &map); void ace_mem(address_map &map); @@ -266,7 +266,7 @@ SNAPSHOT_LOAD_MEMBER(ace_state::snapshot_cb) // io_r - //------------------------------------------------- -READ8_MEMBER( ace_state::io_r ) +uint8_t ace_state::io_r(offs_t offset) { uint8_t data = 0xff; @@ -299,7 +299,7 @@ READ8_MEMBER( ace_state::io_r ) // io_w - //------------------------------------------------- -WRITE8_MEMBER( ace_state::io_w ) +void ace_state::io_w(uint8_t data) { m_cassette->output(1); m_speaker->level_w(1); @@ -310,22 +310,22 @@ WRITE8_MEMBER( ace_state::io_w ) // ppi_r - //------------------------------------------------- -READ8_MEMBER( ace_state::ppi_pa_r ) +uint8_t ace_state::ppi_pa_r() { return m_ppi->read(0); } -READ8_MEMBER( ace_state::ppi_pb_r ) +uint8_t ace_state::ppi_pb_r() { return m_ppi->read(1); } -READ8_MEMBER( ace_state::ppi_pc_r ) +uint8_t ace_state::ppi_pc_r() { return m_ppi->read(2); } -READ8_MEMBER( ace_state::ppi_control_r ) +uint8_t ace_state::ppi_control_r() { return m_ppi->read(3); } @@ -335,22 +335,22 @@ READ8_MEMBER( ace_state::ppi_control_r ) // ppi_w - //------------------------------------------------- -WRITE8_MEMBER( ace_state::ppi_pa_w ) +void ace_state::ppi_pa_w(uint8_t data) { m_ppi->write(0, data); } -WRITE8_MEMBER( ace_state::ppi_pb_w ) +void ace_state::ppi_pb_w(uint8_t data) { m_ppi->write(1, data); } -WRITE8_MEMBER( ace_state::ppi_pc_w ) +void ace_state::ppi_pc_w(uint8_t data) { m_ppi->write(2, data); } -WRITE8_MEMBER( ace_state::ppi_control_w ) +void ace_state::ppi_control_w(uint8_t data) { m_ppi->write(3, data); } @@ -360,22 +360,22 @@ WRITE8_MEMBER( ace_state::ppi_control_w ) // pio_r - //------------------------------------------------- -READ8_MEMBER(ace_state::pio_ad_r) +uint8_t ace_state::pio_ad_r() { return m_z80pio->data_read(0); } -READ8_MEMBER(ace_state::pio_bd_r) +uint8_t ace_state::pio_bd_r() { return m_z80pio->data_read(1); } -READ8_MEMBER(ace_state::pio_ac_r) +uint8_t ace_state::pio_ac_r() { return m_z80pio->control_read(); } -READ8_MEMBER(ace_state::pio_bc_r) +uint8_t ace_state::pio_bc_r() { return m_z80pio->control_read(); } @@ -385,22 +385,22 @@ READ8_MEMBER(ace_state::pio_bc_r) // pio_w - //------------------------------------------------- -WRITE8_MEMBER(ace_state::pio_ad_w) +void ace_state::pio_ad_w(uint8_t data) { m_z80pio->data_write(0, data); } -WRITE8_MEMBER(ace_state::pio_bd_w) +void ace_state::pio_bd_w(uint8_t data) { m_z80pio->data_write(1, data); } -WRITE8_MEMBER(ace_state::pio_ac_w) +void ace_state::pio_ac_w(uint8_t data) { m_z80pio->control_write(0, data); } -WRITE8_MEMBER(ace_state::pio_bc_w) +void ace_state::pio_bc_w(uint8_t data) { m_z80pio->control_write(1, data); } |