diff options
author | 2020-05-19 17:59:29 +0200 | |
---|---|---|
committer | 2020-05-19 17:59:29 +0200 | |
commit | ef8bb312d8b89201b09e3e5ba4c3b47c3dc7046f (patch) | |
tree | 84539469dbe7023611812db152c948ca3b26951a | |
parent | 4ecd0d2b7f4e4c17b288eed6b6ebbc39b15c2001 (diff) |
more macro removal (nw)
222 files changed, 1656 insertions, 1705 deletions
diff --git a/src/devices/bus/vectrex/rom.cpp b/src/devices/bus/vectrex/rom.cpp index 8f93c87f6fd..273d9d55b4f 100644 --- a/src/devices/bus/vectrex/rom.cpp +++ b/src/devices/bus/vectrex/rom.cpp @@ -78,7 +78,7 @@ READ8_MEMBER(vectrex_rom64k_device::read_rom) return m_rom[(offset + m_bank * 0x8000) & (m_rom_size - 1)]; } -WRITE8_MEMBER(vectrex_rom64k_device::write_bank) +void vectrex_rom64k_device::write_bank(uint8_t data) { m_bank = data >> 6; } diff --git a/src/devices/bus/vectrex/rom.h b/src/devices/bus/vectrex/rom.h index 375db83315c..6aeeed2545f 100644 --- a/src/devices/bus/vectrex/rom.h +++ b/src/devices/bus/vectrex/rom.h @@ -38,7 +38,7 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_rom) override; - virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual void write_bank(uint8_t data) override; protected: // device-level overrides diff --git a/src/devices/bus/vectrex/slot.cpp b/src/devices/bus/vectrex/slot.cpp index 15095b5b285..4a19cd20065 100644 --- a/src/devices/bus/vectrex/slot.cpp +++ b/src/devices/bus/vectrex/slot.cpp @@ -247,8 +247,8 @@ WRITE8_MEMBER(vectrex_cart_slot_device::write_ram) write_bank -------------------------------------------------*/ -WRITE8_MEMBER(vectrex_cart_slot_device::write_bank) +void vectrex_cart_slot_device::write_bank(uint8_t data) { if (m_cart) - m_cart->write_bank(space, offset, data); + m_cart->write_bank(data); } diff --git a/src/devices/bus/vectrex/slot.h b/src/devices/bus/vectrex/slot.h index 2427e4be7f3..b81cd67ede3 100644 --- a/src/devices/bus/vectrex/slot.h +++ b/src/devices/bus/vectrex/slot.h @@ -41,7 +41,7 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; } virtual DECLARE_WRITE8_MEMBER(write_ram) { } - virtual DECLARE_WRITE8_MEMBER(write_bank) { } + virtual void write_bank(uint8_t data) { } void rom_alloc(uint32_t size, const char *tag); uint8_t* get_rom_base() { return m_rom; } @@ -89,7 +89,7 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); virtual DECLARE_WRITE8_MEMBER(write_ram); - virtual DECLARE_WRITE8_MEMBER(write_bank); + virtual void write_bank(uint8_t data); protected: // device-level overrides diff --git a/src/devices/video/huc6272.cpp b/src/devices/video/huc6272.cpp index 88d71542d55..630bdb3a63d 100644 --- a/src/devices/video/huc6272.cpp +++ b/src/devices/video/huc6272.cpp @@ -549,17 +549,17 @@ uint8_t huc6272_device::adpcm_update(int chan) return (m_adpcm.input[chan] >> m_adpcm.nibble[chan]) & 0xf; } -READ8_MEMBER(huc6272_device::adpcm_update_0) +uint8_t huc6272_device::adpcm_update_0() { return adpcm_update(0); } -READ8_MEMBER(huc6272_device::adpcm_update_1) +uint8_t huc6272_device::adpcm_update_1() { return adpcm_update(1); } -WRITE8_MEMBER(huc6272_device::cdda_update) +void huc6272_device::cdda_update(offs_t offset, uint8_t data) { if (offset) m_cdda_r->set_output_gain(ALL_OUTPUTS, float(data) / 63.0); diff --git a/src/devices/video/huc6272.h b/src/devices/video/huc6272.h index 8380482f38b..9fa7f8bb8a2 100644 --- a/src/devices/video/huc6272.h +++ b/src/devices/video/huc6272.h @@ -40,11 +40,11 @@ public: DECLARE_READ32_MEMBER( read ); // ADPCM operations - DECLARE_READ8_MEMBER( adpcm_update_0 ); - DECLARE_READ8_MEMBER( adpcm_update_1 ); + uint8_t adpcm_update_0(); + uint8_t adpcm_update_1(); // CD-DA operations - DECLARE_WRITE8_MEMBER( cdda_update ); + void cdda_update(offs_t offset, uint8_t data); static void cdrom_config(device_t *device); diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp index 01f94b1b876..4765c205c5e 100644 --- a/src/mame/audio/dkong.cpp +++ b/src/mame/audio/dkong.cpp @@ -1197,7 +1197,7 @@ Addresses found at @0x510, cpu2 */ -WRITE8_MEMBER(dkong_state::m58817_command_w) +void dkong_state::m58817_command_w(uint8_t data) { m_m58817->ctl_w(data & 0x0f); m_m58817->pdc_w((data>>4) & 0x01); @@ -1211,7 +1211,7 @@ WRITE8_MEMBER(dkong_state::m58817_command_w) * ****************************************************************/ -WRITE8_MEMBER(dkong_state::dkong_voice_w) +void dkong_state::dkong_voice_w(uint8_t data) { /* only provided for documentation purposes * not actually used @@ -1219,7 +1219,7 @@ WRITE8_MEMBER(dkong_state::dkong_voice_w) logerror("dkong_speech_w: 0x%02x\n", data); } -READ8_MEMBER(dkong_state::dkong_voice_status_r) +uint8_t dkong_state::dkong_voice_status_r() { /* only provided for documentation purposes * not actually used @@ -1227,13 +1227,13 @@ READ8_MEMBER(dkong_state::dkong_voice_status_r) return 0; } -READ8_MEMBER(dkong_state::dkong_tune_r) +uint8_t dkong_state::dkong_tune_r(offs_t offset) { uint8_t page = m_dev_vp2->read(0) & 0x47; if ( page & 0x40 ) { - return (m_ls175_3d->read(0) & 0x0F) | (dkong_voice_status_r(space, 0) << 4); + return (m_ls175_3d->read(0) & 0x0F) | (dkong_voice_status_r() << 4); } else { @@ -1242,7 +1242,7 @@ READ8_MEMBER(dkong_state::dkong_tune_r) } } -WRITE8_MEMBER(dkong_state::dkong_p1_w) +void dkong_state::dkong_p1_w(uint8_t data) { m_discrete->write(DS_DAC,data); } diff --git a/src/mame/audio/hng64.cpp b/src/mame/audio/hng64.cpp index 558c97a317c..5207f3d98ae 100644 --- a/src/mame/audio/hng64.cpp +++ b/src/mame/audio/hng64.cpp @@ -323,12 +323,12 @@ WRITE_LINE_MEMBER(hng64_state::dma_hreq_cb) m_audiocpu->hack_w(1); } -READ8_MEMBER(hng64_state::dma_memr_cb) +uint8_t hng64_state::dma_memr_cb(offs_t offset) { - return m_audiocpu->space(AS_PROGRAM).read_byte(offset);; + return m_audiocpu->space(AS_PROGRAM).read_byte(offset); } -WRITE8_MEMBER(hng64_state::dma_iow3_cb) +void hng64_state::dma_iow3_cb(uint8_t data) { // currently it reads a block of 0x20 '0x00' values from a very specific block of RAM where there is a 0x20 space in the data and transfers them repeatedly, I assume // this is some kind of buffer for the audio or DSP and eventually will be populated with other values... diff --git a/src/mame/audio/mario.cpp b/src/mame/audio/mario.cpp index eb0e48bc679..e8fc4ca61b8 100644 --- a/src/mame/audio/mario.cpp +++ b/src/mame/audio/mario.cpp @@ -467,12 +467,12 @@ void mario_state::sound_reset() * ****************************************************************/ -READ8_MEMBER(mario_state::mario_sh_p1_r) +uint8_t mario_state::mario_sh_p1_r() { return I8035_P1_R(); } -READ8_MEMBER(mario_state::mario_sh_p2_r) +uint8_t mario_state::mario_sh_p2_r() { return I8035_P2_R() & 0xEF; /* Bit 4 connected to GND! */ } @@ -508,12 +508,12 @@ WRITE8_MEMBER(mario_state::mario_sh_sound_w) #endif } -WRITE8_MEMBER(mario_state::mario_sh_p1_w) +void mario_state::mario_sh_p1_w(uint8_t data) { I8035_P1_W(data); } -WRITE8_MEMBER(mario_state::mario_sh_p2_w) +void mario_state::mario_sh_p2_w(uint8_t data) { I8035_P2_W(data); } diff --git a/src/mame/audio/spacefb.cpp b/src/mame/audio/spacefb.cpp index c8e139ac583..6ff1674c8af 100644 --- a/src/mame/audio/spacefb.cpp +++ b/src/mame/audio/spacefb.cpp @@ -16,7 +16,7 @@ #include "speaker.h" -READ8_MEMBER(spacefb_state::audio_p2_r) +uint8_t spacefb_state::audio_p2_r() { return (m_sound_latch & 0x18) << 1; } diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp index 66bcc4f40c4..1b6585bd98f 100644 --- a/src/mame/drivers/alphasma.cpp +++ b/src/mame/drivers/alphasma.cpp @@ -58,10 +58,10 @@ protected: DECLARE_READ8_MEMBER(kb_r); DECLARE_WRITE8_MEMBER(kb_matrixl_w); DECLARE_WRITE8_MEMBER(kb_matrixh_w); - DECLARE_READ8_MEMBER(port_a_r); - virtual DECLARE_WRITE8_MEMBER(port_a_w); - DECLARE_READ8_MEMBER(port_d_r); - DECLARE_WRITE8_MEMBER(port_d_w); + uint8_t port_a_r(); + virtual void port_a_w(uint8_t data); + uint8_t port_d_r(); + void port_d_w(uint8_t data); void update_lcdc(bool lcdc0, bool lcdc1); void alphasmart_mem(address_map &map); @@ -85,7 +85,7 @@ public: private: DECLARE_READ8_MEMBER(io_r); DECLARE_WRITE8_MEMBER(io_w); - virtual DECLARE_WRITE8_MEMBER(port_a_w) override; + virtual void port_a_w(uint8_t data) override; void asma2k_mem(address_map &map); @@ -119,7 +119,7 @@ WRITE8_MEMBER(alphasmart_state::kb_matrixh_w) m_matrix[1] = data; } -READ8_MEMBER(alphasmart_state::port_a_r) +uint8_t alphasmart_state::port_a_r() { return (m_port_a & 0xfd) | (m_battery_status->read() << 1); } @@ -150,7 +150,7 @@ void alphasmart_state::update_lcdc(bool lcdc0, bool lcdc1) } } -WRITE8_MEMBER(alphasmart_state::port_a_w) +void alphasmart_state::port_a_w(uint8_t data) { uint8_t changed = (m_port_a ^ data) & data; update_lcdc(changed & 0x80, changed & 0x20); @@ -158,12 +158,12 @@ WRITE8_MEMBER(alphasmart_state::port_a_w) m_port_a = data; } -READ8_MEMBER(alphasmart_state::port_d_r) +uint8_t alphasmart_state::port_d_r() { return m_port_d; } -WRITE8_MEMBER(alphasmart_state::port_d_w) +void alphasmart_state::port_d_w(uint8_t data) { m_port_d = data; } @@ -202,7 +202,7 @@ WRITE8_MEMBER(asma2k_state::io_w) //else printf("unknown w: %x %x\n", offset, data); } -WRITE8_MEMBER(asma2k_state::port_a_w) +void asma2k_state::port_a_w(uint8_t data) { if ((m_port_a ^ data) & 0x40) { diff --git a/src/mame/drivers/alphatpx.cpp b/src/mame/drivers/alphatpx.cpp index 6fe53e44309..7f58976d55d 100644 --- a/src/mame/drivers/alphatpx.cpp +++ b/src/mame/drivers/alphatpx.cpp @@ -115,9 +115,9 @@ private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_READ_LINE_MEMBER(kbd_matrix_r); - DECLARE_WRITE8_MEMBER(kbd_matrix_w); - DECLARE_READ8_MEMBER(kbd_port2_r); - DECLARE_WRITE8_MEMBER(kbd_port2_w); + void kbd_matrix_w(uint8_t data); + uint8_t kbd_port2_r(); + void kbd_port2_w(uint8_t data); DECLARE_READ8_MEMBER(fdc_r); DECLARE_WRITE8_MEMBER(fdc_w); @@ -187,9 +187,9 @@ private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_READ_LINE_MEMBER(kbd_matrix_r); - DECLARE_WRITE8_MEMBER(kbd_matrix_w); - DECLARE_READ8_MEMBER(kbd_port2_r); - DECLARE_WRITE8_MEMBER(kbd_port2_w); + void kbd_matrix_w(uint8_t data); + uint8_t kbd_port2_r(); + void kbd_port2_w(uint8_t data); DECLARE_READ8_MEMBER(fdc_r); DECLARE_WRITE8_MEMBER(fdc_w); @@ -469,7 +469,7 @@ READ_LINE_MEMBER(alphatp_12_state::kbd_matrix_r) return m_kbdread; } -WRITE8_MEMBER(alphatp_12_state::kbd_matrix_w) +void alphatp_12_state::kbd_matrix_w(uint8_t data) { if ((data & 0x80) && (!m_kbdclk)) { @@ -482,13 +482,13 @@ WRITE8_MEMBER(alphatp_12_state::kbd_matrix_w) } // bit 2 is UPI-41 host IRQ to Z80 -WRITE8_MEMBER(alphatp_12_state::kbd_port2_w) +void alphatp_12_state::kbd_port2_w(uint8_t data) { m_kbdport2 = data; } -READ8_MEMBER(alphatp_12_state::kbd_port2_r) +uint8_t alphatp_12_state::kbd_port2_r() { return m_kbdport2; } @@ -502,7 +502,7 @@ READ_LINE_MEMBER(alphatp_34_state::kbd_matrix_r) return m_kbdread; } -WRITE8_MEMBER(alphatp_34_state::kbd_matrix_w) +void alphatp_34_state::kbd_matrix_w(uint8_t data) { if (data & 0x80) { @@ -516,13 +516,13 @@ WRITE8_MEMBER(alphatp_34_state::kbd_matrix_w) } // bit 2 is UPI-41 host IRQ to Z80 -WRITE8_MEMBER(alphatp_34_state::kbd_port2_w) +void alphatp_34_state::kbd_port2_w(uint8_t data) { m_kbdport2 = data; } -READ8_MEMBER(alphatp_34_state::kbd_port2_r) +uint8_t alphatp_34_state::kbd_port2_r() { return m_kbdport2; } diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp index a7e71bccd00..ee71b8324cb 100644 --- a/src/mame/drivers/alphatro.cpp +++ b/src/mame/drivers/alphatro.cpp @@ -80,8 +80,8 @@ protected: virtual void machine_reset() override; private: - DECLARE_READ8_MEMBER (ram0000_r); - DECLARE_WRITE8_MEMBER(ram0000_w); + uint8_t ram0000_r(offs_t offset); + void ram0000_w(offs_t offset, uint8_t data); DECLARE_READ8_MEMBER (ram6000_r); DECLARE_WRITE8_MEMBER(ram6000_w); DECLARE_READ8_MEMBER (rama000_r); @@ -190,7 +190,7 @@ void alphatro_state::update_banking() } } -READ8_MEMBER (alphatro_state::ram0000_r) +uint8_t alphatro_state::ram0000_r(offs_t offset) { if (offset < 0xf000) { @@ -200,7 +200,7 @@ READ8_MEMBER (alphatro_state::ram0000_r) return m_p_videoram[offset & 0xfff]; } -WRITE8_MEMBER(alphatro_state::ram0000_w) +void alphatro_state::ram0000_w(offs_t offset, uint8_t data) { if (offset < 0xf000) diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp index 819708e8b3c..36a07f99ba7 100644 --- a/src/mame/drivers/amust.cpp +++ b/src/mame/drivers/amust.cpp @@ -116,17 +116,17 @@ private: TIMER_BEEP_OFF }; - DECLARE_READ8_MEMBER(port04_r); - DECLARE_WRITE8_MEMBER(port04_w); - DECLARE_READ8_MEMBER(port05_r); - DECLARE_READ8_MEMBER(port06_r); - DECLARE_WRITE8_MEMBER(port06_w); - DECLARE_READ8_MEMBER(port08_r); - DECLARE_WRITE8_MEMBER(port08_w); - DECLARE_READ8_MEMBER(port09_r); - DECLARE_READ8_MEMBER(port0a_r); - DECLARE_WRITE8_MEMBER(port0a_w); - DECLARE_WRITE8_MEMBER(port0d_w); + u8 port04_r(); + void port04_w(u8 data); + u8 port05_r(); + u8 port06_r(); + void port06_w(u8 data); + u8 port08_r(); + void port08_w(u8 data); + u8 port09_r(); + u8 port0a_r(); + void port0a_w(u8 data); + void port0d_w(u8 data); DECLARE_WRITE_LINE_MEMBER(hsync_w); DECLARE_WRITE_LINE_MEMBER(vsync_w); DECLARE_WRITE_LINE_MEMBER(drq_w); @@ -172,7 +172,7 @@ void amust_state::device_timer(emu_timer &timer, device_timer_id id, int param, } } -//WRITE8_MEMBER( amust_state::port00_w ) +//void amust_state::port00_w(u8 data) //{ // membank("bankr0")->set_entry(BIT(data, 6)); // m_fdc->dden_w(BIT(data, 5)); @@ -270,39 +270,39 @@ WRITE_LINE_MEMBER( amust_state::vsync_w ) do_int(); } -READ8_MEMBER( amust_state::port04_r ) +u8 amust_state::port04_r() { return m_port04; } -WRITE8_MEMBER( amust_state::port04_w ) +void amust_state::port04_w(u8 data) { m_port04 = data; } -READ8_MEMBER( amust_state::port05_r ) +u8 amust_state::port05_r() { return 0; } -READ8_MEMBER( amust_state::port06_r ) +u8 amust_state::port06_r() { return m_port06; } // BIT 5 low while writing to screen -WRITE8_MEMBER( amust_state::port06_w ) +void amust_state::port06_w(u8 data) { m_port06 = data; } -READ8_MEMBER( amust_state::port08_r ) +u8 amust_state::port08_r() { return m_port08; } // lower 8 bits of video address -WRITE8_MEMBER( amust_state::port08_w ) +void amust_state::port08_w(u8 data) { m_port08 = data; } @@ -317,13 +317,13 @@ d5 - status of fdc intrq; loops till NZ d6 - d7 - */ -READ8_MEMBER( amust_state::port09_r ) +u8 amust_state::port09_r() { logerror("%s\n",machine().describe_context()); return (ioport("P9")->read() & 0x1f) | m_port09; } -READ8_MEMBER( amust_state::port0a_r ) +u8 amust_state::port0a_r() { return m_port0a; } @@ -335,7 +335,7 @@ with selecting which device causes interrupt? D0 ? Bit 4 low = beeper. Lower 3 bits = upper part of video address */ -WRITE8_MEMBER( amust_state::port0a_w ) +void amust_state::port0a_w(u8 data) { m_port0a = data; @@ -354,7 +354,7 @@ WRITE8_MEMBER( amust_state::port0a_w ) } } -WRITE8_MEMBER( amust_state::port0d_w ) +void amust_state::port0d_w(u8 data) { uint16_t video_address = m_port08 | ((m_port0a & 7) << 8); m_p_videoram[video_address] = data; diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp index 490a1e2b432..19fc40fcdb3 100644 --- a/src/mame/drivers/apc.cpp +++ b/src/mame/drivers/apc.cpp @@ -153,17 +153,15 @@ private: uint8_t sh; //shift switches }m_keyb; - DECLARE_READ8_MEMBER(get_slave_ack); + uint8_t get_slave_ack(offs_t offset); DECLARE_WRITE_LINE_MEMBER(apc_dma_hrq_changed); DECLARE_WRITE_LINE_MEMBER(apc_tc_w); DECLARE_WRITE_LINE_MEMBER(apc_dack0_w); DECLARE_WRITE_LINE_MEMBER(apc_dack1_w); DECLARE_WRITE_LINE_MEMBER(apc_dack2_w); DECLARE_WRITE_LINE_MEMBER(apc_dack3_w); - DECLARE_READ8_MEMBER(fdc_r); - DECLARE_WRITE8_MEMBER(fdc_w); - DECLARE_READ8_MEMBER(apc_dma_read_byte); - DECLARE_WRITE8_MEMBER(apc_dma_write_byte); + uint8_t apc_dma_read_byte(offs_t offset); + void apc_dma_write_byte(offs_t offset, uint8_t data); int m_dack; uint8_t m_dma_offset[4]; @@ -845,7 +843,7 @@ ir6 Option ir7 APU */ -READ8_MEMBER(apc_state::get_slave_ack) +uint8_t apc_state::get_slave_ack(offs_t offset) { if (offset==7) { // IRQ = 7 return m_i8259_s->acknowledge(); @@ -876,7 +874,7 @@ WRITE_LINE_MEMBER( apc_state::apc_tc_w ) // printf("TC %02x\n",state); } -READ8_MEMBER(apc_state::apc_dma_read_byte) +uint8_t apc_state::apc_dma_read_byte(offs_t offset) { address_space &program = m_maincpu->space(AS_PROGRAM); offs_t addr = (m_dma_offset[m_dack] << 16) | offset; @@ -887,7 +885,7 @@ READ8_MEMBER(apc_state::apc_dma_read_byte) } -WRITE8_MEMBER(apc_state::apc_dma_write_byte) +void apc_state::apc_dma_write_byte(offs_t offset, uint8_t data) { address_space &program = m_maincpu->space(AS_PROGRAM); offs_t addr = (m_dma_offset[m_dack] << 16) | offset; @@ -907,16 +905,6 @@ WRITE_LINE_MEMBER(apc_state::apc_dack1_w){ /*printf("%02x 1\n",state);*/ set_dma WRITE_LINE_MEMBER(apc_state::apc_dack2_w){ /*printf("%02x 2\n",state);*/ set_dma_channel(2, state); } WRITE_LINE_MEMBER(apc_state::apc_dack3_w){ /*printf("%02x 3\n",state);*/ set_dma_channel(3, state); } -READ8_MEMBER(apc_state::fdc_r) -{ - return m_fdc->dma_r(); -} - -WRITE8_MEMBER(apc_state::fdc_w) -{ - m_fdc->dma_w(data); -} - /* CH0: CRT CH1: FDC @@ -964,8 +952,8 @@ void apc_state::apc(machine_config &config) m_dmac->out_eop_callback().set(FUNC(apc_state::apc_tc_w)); m_dmac->in_memr_callback().set(FUNC(apc_state::apc_dma_read_byte)); m_dmac->out_memw_callback().set(FUNC(apc_state::apc_dma_write_byte)); - m_dmac->in_ior_callback<1>().set(FUNC(apc_state::fdc_r)); - m_dmac->out_iow_callback<1>().set(FUNC(apc_state::fdc_w)); + m_dmac->in_ior_callback<1>().set(m_fdc, FUNC(upd765a_device::dma_r)); + m_dmac->out_iow_callback<1>().set(m_fdc, FUNC(upd765a_device::dma_w)); m_dmac->out_dack_callback<0>().set(FUNC(apc_state::apc_dack0_w)); m_dmac->out_dack_callback<1>().set(FUNC(apc_state::apc_dack1_w)); m_dmac->out_dack_callback<2>().set(FUNC(apc_state::apc_dack2_w)); diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp index 375ca36a354..7efc8dc185d 100644 --- a/src/mame/drivers/applix.cpp +++ b/src/mame/drivers/applix.cpp @@ -117,9 +117,9 @@ private: DECLARE_WRITE16_MEMBER(analog_latch_w); DECLARE_WRITE16_MEMBER(dac_latch_w); DECLARE_WRITE16_MEMBER(video_latch_w); - DECLARE_READ8_MEMBER(applix_pb_r); - DECLARE_WRITE8_MEMBER(applix_pa_w); - DECLARE_WRITE8_MEMBER(applix_pb_w); + uint8_t applix_pb_r(); + void applix_pa_w(uint8_t data); + void applix_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(vsync_w); DECLARE_READ8_MEMBER(port00_r); DECLARE_READ8_MEMBER(port08_r); @@ -139,12 +139,12 @@ private: DECLARE_FLOPPY_FORMATS(floppy_formats); DECLARE_READ8_MEMBER( internal_data_read ); DECLARE_WRITE8_MEMBER( internal_data_write ); - DECLARE_READ8_MEMBER( p1_read ); - DECLARE_WRITE8_MEMBER( p1_write ); - DECLARE_READ8_MEMBER( p2_read ); - DECLARE_WRITE8_MEMBER( p2_write ); - DECLARE_READ8_MEMBER( p3_read ); - DECLARE_WRITE8_MEMBER( p3_write ); + uint8_t p1_read(); + void p1_write(uint8_t data); + uint8_t p2_read(); + void p2_write(uint8_t data); + uint8_t p3_read(); + void p3_write(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(cass_timer); MC6845_UPDATE_ROW(crtc_update_row); @@ -279,7 +279,7 @@ READ16_MEMBER( applix_state::applix_inputs_r ) return m_io_dsw->read() | m_cass_data[2]; } -READ8_MEMBER( applix_state::applix_pb_r ) +uint8_t applix_state::applix_pb_r() { return m_pb; } @@ -294,7 +294,7 @@ d5 = /(out) clear cass IRQ and output line d6 = /(out) reset keyboard by pulling kbd clock low d7 = /(out) reset keyboard flipflop */ -WRITE8_MEMBER( applix_state::applix_pa_w ) +void applix_state::applix_pa_w(uint8_t data) { // Reset flipflop counter if (!BIT(data, 7)) @@ -325,7 +325,7 @@ WRITE8_MEMBER( applix_state::applix_pa_w ) d0-6 = user d7 = square wave output for cassette IRQ */ -WRITE8_MEMBER( applix_state::applix_pb_w ) +void applix_state::applix_pb_w(uint8_t data) { // low-to-high of PB7 when writing cassette - CLK on IC49 if (!BIT(m_pb, 7) && BIT(data, 7)) @@ -1115,31 +1115,31 @@ WRITE8_MEMBER( applix_state::internal_data_write ) } -READ8_MEMBER( applix_state::p1_read ) +uint8_t applix_state::p1_read() { return m_p1 & m_p1_data; } -WRITE8_MEMBER( applix_state::p1_write ) +void applix_state::p1_write(uint8_t data) { m_p1 = data; } -READ8_MEMBER( applix_state::p2_read ) +uint8_t applix_state::p2_read() { return m_p2; } -WRITE8_MEMBER( applix_state::p2_write ) +void applix_state::p2_write(uint8_t data) { m_p2 = data; } -READ8_MEMBER( applix_state::p3_read ) +uint8_t applix_state::p3_read() { uint8_t data = m_p3; @@ -1155,7 +1155,7 @@ READ8_MEMBER( applix_state::p3_read ) } -WRITE8_MEMBER( applix_state::p3_write ) +void applix_state::p3_write(uint8_t data) { m_p3 = data; } diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index f4f767793b9..f682019202a 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -129,16 +129,16 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER(pio_portA_r); - DECLARE_READ8_MEMBER(pio_portB_r); - DECLARE_WRITE8_MEMBER(pio_portA_w); - DECLARE_WRITE8_MEMBER(pio_portB_w); + uint8_t pio_portA_r(); + uint8_t pio_portB_r(); + void pio_portA_w(uint8_t data); + void pio_portB_w(uint8_t data); - DECLARE_READ8_MEMBER(dma_mem_r); - DECLARE_WRITE8_MEMBER(dma_mem_w); + uint8_t dma_mem_r(offs_t offset); + void dma_mem_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER(fdc_dma_r); - DECLARE_WRITE8_MEMBER(fdc_dma_w); + uint8_t fdc_dma_r(); + void fdc_dma_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(hreq_w); DECLARE_WRITE_LINE_MEMBER(eop_w); @@ -188,7 +188,7 @@ protected: DECLARE_READ8_MEMBER(memmap_r); DECLARE_WRITE8_MEMBER(memmap_w); - void operation_strobe(address_space& space,uint8_t data); + void operation_strobe(uint8_t data); void keyboard_clock_w(bool state); uint8_t keyboard_data_r(); uint16_t get_key(); @@ -262,9 +262,9 @@ public: void attache816(machine_config &config); private: - DECLARE_WRITE8_MEMBER(x86_comms_w); - DECLARE_READ8_MEMBER(x86_comms_r); - DECLARE_WRITE8_MEMBER(x86_irq_enable); + void x86_comms_w(uint8_t data); + uint8_t x86_comms_r(); + void x86_irq_enable(uint8_t data); DECLARE_WRITE8_MEMBER(x86_iobf_enable_w); DECLARE_READ8_MEMBER(z80_comms_r); DECLARE_WRITE8_MEMBER(z80_comms_w); @@ -498,7 +498,7 @@ void attache_state::keyboard_clock_w(bool state) } // TODO: Figure out exactly how the HLD, RD, WR and CS lines on the RTC are hooked up -READ8_MEMBER(attache_state::pio_portA_r) +uint8_t attache_state::pio_portA_r() { uint8_t ret = 0xff; uint8_t porta = m_pio_porta; @@ -547,14 +547,14 @@ READ8_MEMBER(attache_state::pio_portA_r) return ret; } -READ8_MEMBER(attache_state::pio_portB_r) +uint8_t attache_state::pio_portB_r() { uint8_t ret = m_pio_portb & 0xbf; ret |= keyboard_data_r(); return ret; } -void attache_state::operation_strobe(address_space& space, uint8_t data) +void attache_state::operation_strobe(uint8_t data) { //logerror("PIO: Port A write operation %i, data %02x\n",m_pio_select,data); switch(m_pio_select) @@ -605,7 +605,7 @@ void attache_state::operation_strobe(address_space& space, uint8_t data) } } -WRITE8_MEMBER(attache_state::pio_portA_w) +void attache_state::pio_portA_w(uint8_t data) { // AO-7 = LATCH DATA OUT: // LO = MOTOR ON @@ -620,7 +620,7 @@ WRITE8_MEMBER(attache_state::pio_portA_w) m_pio_porta = data; } -WRITE8_MEMBER(attache_state::pio_portB_w) +void attache_state::pio_portB_w(uint8_t data) { // BO-1 = 5101 A4-5 // B2-4 = OPERATION SELECT @@ -639,7 +639,7 @@ WRITE8_MEMBER(attache_state::pio_portB_w) if(!(data & 0x20) && (m_pio_portb & 0x20)) { m_pio_select = (data & 0x1c) >> 2; - operation_strobe(space,m_pio_porta); + operation_strobe(m_pio_porta); } m_pio_portb = data; keyboard_clock_w(data & 0x80); @@ -779,23 +779,23 @@ WRITE8_MEMBER(attache_state::dma_mask_w) m_dma->write(0x0f,data); } -READ8_MEMBER(attache_state::fdc_dma_r) +uint8_t attache_state::fdc_dma_r() { uint8_t ret = m_fdc->dma_r(); return ret; } -WRITE8_MEMBER(attache_state::fdc_dma_w) +void attache_state::fdc_dma_w(uint8_t data) { m_fdc->dma_w(data); } -READ8_MEMBER(attache_state::dma_mem_r) +uint8_t attache_state::dma_mem_r(offs_t offset) { return m_maincpu->space(AS_PROGRAM).read_byte(offset); } -WRITE8_MEMBER(attache_state::dma_mem_w) +void attache_state::dma_mem_w(offs_t offset, uint8_t data) { m_maincpu->space(AS_PROGRAM).write_byte(offset,data); } @@ -820,14 +820,14 @@ WRITE_LINE_MEMBER( attache_state::fdc_dack_w ) * Z80 <-> 8086 communication */ -WRITE8_MEMBER(attache816_state::x86_comms_w) +void attache816_state::x86_comms_w(uint8_t data) { m_comms_val = data; m_ppi->pc6_w(1); m_z80_rx_ready = false; } -READ8_MEMBER(attache816_state::x86_comms_r) +uint8_t attache816_state::x86_comms_r() { m_z80_tx_ready = false; m_ppi->pc4_w(1); @@ -841,7 +841,7 @@ READ8_MEMBER(attache816_state::x86_comms_r) // bit 3: 8087 FPU // bit 4: enable WAIT logic // bit 5: enable high-resolution graphics -WRITE8_MEMBER(attache816_state::x86_irq_enable) +void attache816_state::x86_irq_enable(uint8_t data) { m_x86_irq_enable = data; } diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp index 8f7c2318e54..de25077c325 100644 --- a/src/mame/drivers/aussiebyte.cpp +++ b/src/mame/drivers/aussiebyte.cpp @@ -217,7 +217,7 @@ WRITE8_MEMBER( aussiebyte_state::port1c_w ) { } -WRITE8_MEMBER( aussiebyte_state::port20_w ) +void aussiebyte_state::port20_w(uint8_t data) { m_speaker->level_w(BIT(data, 7)); m_rtc->cs_w(BIT(data, 0)); @@ -256,25 +256,25 @@ WRITE8_MEMBER( aussiebyte_state::rtc_w ) DMA ************************************************************/ -READ8_MEMBER( aussiebyte_state::memory_read_byte ) +uint8_t aussiebyte_state::memory_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); return prog_space.read_byte(offset); } -WRITE8_MEMBER( aussiebyte_state::memory_write_byte ) +void aussiebyte_state::memory_write_byte(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); prog_space.write_byte(offset, data); } -READ8_MEMBER( aussiebyte_state::io_read_byte ) +uint8_t aussiebyte_state::io_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_IO); return prog_space.read_byte(offset); } -WRITE8_MEMBER( aussiebyte_state::io_write_byte ) +void aussiebyte_state::io_write_byte(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_IO); prog_space.write_byte(offset, data); diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp index 6c080e00811..4639ec0fcde 100644 --- a/src/mame/drivers/beta.cpp +++ b/src/mame/drivers/beta.cpp @@ -69,10 +69,10 @@ public: protected: virtual void machine_start() override; - DECLARE_READ8_MEMBER( riot_pa_r ); - DECLARE_WRITE8_MEMBER( riot_pa_w ); - DECLARE_READ8_MEMBER( riot_pb_r ); - DECLARE_WRITE8_MEMBER( riot_pb_w ); + uint8_t riot_pa_r(); + void riot_pa_w(uint8_t data); + uint8_t riot_pb_r(); + void riot_pb_w(uint8_t data); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(load_beta_eprom); DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER(unload_beta_eprom); @@ -166,7 +166,7 @@ TIMER_CALLBACK_MEMBER(beta_state::led_refresh) m_digits[m_ls145_p] = m_segment; } -READ8_MEMBER( beta_state::riot_pa_r ) +uint8_t beta_state::riot_pa_r() { /* @@ -204,7 +204,7 @@ READ8_MEMBER( beta_state::riot_pa_r ) return data; } -WRITE8_MEMBER( beta_state::riot_pa_w ) +void beta_state::riot_pa_w(uint8_t data) { /* @@ -231,12 +231,12 @@ WRITE8_MEMBER( beta_state::riot_pa_w ) m_eprom_data = data; } -READ8_MEMBER( beta_state::riot_pb_r ) +uint8_t beta_state::riot_pb_r() { return 0; } -WRITE8_MEMBER( beta_state::riot_pb_w ) +void beta_state::riot_pb_w(uint8_t data) { /* diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp index f73298577fe..7f57940fd0e 100644 --- a/src/mame/drivers/bitgraph.cpp +++ b/src/mame/drivers/bitgraph.cpp @@ -113,10 +113,10 @@ public: DECLARE_READ8_MEMBER(pia_r); DECLARE_WRITE8_MEMBER(pia_w); - DECLARE_READ8_MEMBER(pia_pa_r); - DECLARE_READ8_MEMBER(pia_pb_r); - DECLARE_WRITE8_MEMBER(pia_pa_w); - DECLARE_WRITE8_MEMBER(pia_pb_w); + uint8_t pia_pa_r(); + uint8_t pia_pb_r(); + void pia_pa_w(uint8_t data); + void pia_pb_w(uint8_t data); DECLARE_READ_LINE_MEMBER(pia_ca1_r); DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); @@ -129,7 +129,7 @@ public: DECLARE_READ8_MEMBER(adlc_r); DECLARE_WRITE8_MEMBER(adlc_w); - DECLARE_WRITE8_MEMBER(earom_write); + void earom_write(uint8_t data); DECLARE_WRITE8_MEMBER(misccr_write); DECLARE_WRITE_LINE_MEMBER(system_clock_write); @@ -243,14 +243,14 @@ WRITE_LINE_MEMBER(bitgraph_state::pia_cb2_w) // XXX shut up verbose log } -READ8_MEMBER(bitgraph_state::pia_pa_r) +uint8_t bitgraph_state::pia_pa_r() { uint8_t data = BIT(m_pia_b, 3) ? m_earom->data() : m_pia_a; LOGDBG("PIA A == %02X (%s)\n", data, BIT(m_pia_b, 3) ? "earom" : "pia"); return data; } -WRITE8_MEMBER(bitgraph_state::pia_pa_w) +void bitgraph_state::pia_pa_w(uint8_t data) { LOGDBG("PIA A <- %02X\n", data); m_pia_a = data; @@ -266,13 +266,13 @@ WRITE8_MEMBER(bitgraph_state::pia_pa_w) B6 O: Clear Clock interrupt. Must write a 0 [clear interrupt], then a 1. B7 I: EVEN field ?? */ -READ8_MEMBER(bitgraph_state::pia_pb_r) +uint8_t bitgraph_state::pia_pb_r() { LOGDBG("PIA B == %02X\n", m_pia_b); return m_pia_b; } -WRITE8_MEMBER(bitgraph_state::pia_pb_w) +void bitgraph_state::pia_pb_w(uint8_t data) { LOGDBG("PIA B <- %02X\n", data); m_pia_b = data; @@ -302,7 +302,7 @@ WRITE8_MEMBER(bitgraph_state::pia_pb_w) } } -WRITE8_MEMBER(bitgraph_state::earom_write) +void bitgraph_state::earom_write(uint8_t data) { LOGDBG("EAROM addr <- %02X (%02X)\n", data & 0x3f, data); m_earom->set_address(data & 0x3f); diff --git a/src/mame/drivers/br8641.cpp b/src/mame/drivers/br8641.cpp index b58495a71d5..d8177351d5a 100644 --- a/src/mame/drivers/br8641.cpp +++ b/src/mame/drivers/br8641.cpp @@ -44,9 +44,9 @@ public: , m_beep(*this, "beeper") { } - DECLARE_READ8_MEMBER(port08_r); - DECLARE_WRITE8_MEMBER(port08_w); - DECLARE_WRITE8_MEMBER(port09_w); + uint8_t port08_r(); + void port08_w(uint8_t data); + void port09_w(uint8_t data); void brandt8641(machine_config &config); void brandt8641_io(address_map &map); @@ -125,7 +125,7 @@ static INPUT_PORTS_START( brandt8641 ) PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) INPUT_PORTS_END -READ8_MEMBER( brandt8641_state::port08_r ) +uint8_t brandt8641_state::port08_r() { uint8_t i, data = 7; @@ -136,13 +136,13 @@ READ8_MEMBER( brandt8641_state::port08_r ) return data | m_port08; } -WRITE8_MEMBER( brandt8641_state::port08_w ) +void brandt8641_state::port08_w(uint8_t data) { m_port08 = data & 0xf8; m_beep->set_state(BIT(data, 4)); } -WRITE8_MEMBER( brandt8641_state::port09_w ) +void brandt8641_state::port09_w(uint8_t data) { m_port09 = data ^ 0xff; } diff --git a/src/mame/drivers/candela.cpp b/src/mame/drivers/candela.cpp index 0b38881a307..b4ca8e37ef2 100644 --- a/src/mame/drivers/candela.cpp +++ b/src/mame/drivers/candela.cpp @@ -152,9 +152,9 @@ public: virtual void machine_start() override; DECLARE_READ8_MEMBER (read); DECLARE_WRITE8_MEMBER (write); - DECLARE_READ8_MEMBER( syspia_A_r ); - DECLARE_READ8_MEMBER( syspia_B_r ); - DECLARE_WRITE8_MEMBER( syspia_B_w ); + uint8_t syspia_A_r(); + uint8_t syspia_B_r(); + void syspia_B_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( syspia_cb2_w); DECLARE_WRITE_LINE_MEMBER( usrpia_cb2_w); DECLARE_WRITE_LINE_MEMBER (write_acia_clock); @@ -420,20 +420,20 @@ WRITE8_MEMBER( can09t_state::write ) } } -READ8_MEMBER( can09t_state::syspia_A_r ) +uint8_t can09t_state::syspia_A_r() { LOG("%s()\n", FUNCNAME); return 0; } -READ8_MEMBER( can09t_state::syspia_B_r ) +uint8_t can09t_state::syspia_B_r() { LOG("%s()\n", FUNCNAME); u8 data = (m_cass->input() > 0.04) ? 0x80 : 0; return data; } -WRITE8_MEMBER( can09t_state::syspia_B_w ) +void can09t_state::syspia_B_w(uint8_t data) { LOG("%s(%02x)\n", FUNCNAME, data); @@ -517,10 +517,10 @@ protected: required_device<cpu_device> m_maincpu; virtual void machine_reset() override; virtual void machine_start() override; - DECLARE_READ8_MEMBER( pia1_A_r ); - DECLARE_WRITE8_MEMBER( pia1_A_w ); - DECLARE_READ8_MEMBER( pia1_B_r ); - DECLARE_WRITE8_MEMBER( pia1_B_w ); + uint8_t pia1_A_r(); + void pia1_A_w(uint8_t data); + uint8_t pia1_B_r(); + void pia1_B_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( pia1_cb2_w); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void can09_map(address_map &map); @@ -582,24 +582,24 @@ uint32_t can09_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, return 0; } -READ8_MEMBER( can09_state::pia1_A_r ) +uint8_t can09_state::pia1_A_r() { LOG("%s()\n", FUNCNAME); return 0x40; } -WRITE8_MEMBER( can09_state::pia1_A_w ) +void can09_state::pia1_A_w(uint8_t data) { LOG("%s(%02x)\n", FUNCNAME, data); } -READ8_MEMBER( can09_state::pia1_B_r ) +uint8_t can09_state::pia1_B_r() { LOG("%s()\n", FUNCNAME); return 0; } -WRITE8_MEMBER( can09_state::pia1_B_w ) +void can09_state::pia1_B_w(uint8_t data) { // UINT8 *RAM = memregion("maincpu")->base(); LOG("%s(%02x)\n", FUNCNAME, data); diff --git a/src/mame/drivers/cdc721.cpp b/src/mame/drivers/cdc721.cpp index 2a39187231f..b8b41520872 100644 --- a/src/mame/drivers/cdc721.cpp +++ b/src/mame/drivers/cdc721.cpp @@ -47,8 +47,8 @@ protected: private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void cdc721_palette(palette_device &palette) const; - DECLARE_WRITE8_MEMBER(interrupt_mask_w); - DECLARE_WRITE8_MEMBER(misc_w); + void interrupt_mask_w(u8 data); + void misc_w(u8 data); DECLARE_WRITE8_MEMBER(lights_w); DECLARE_WRITE8_MEMBER(block_select_w); DECLARE_WRITE8_MEMBER(nvram_w); @@ -82,7 +82,7 @@ private: required_shared_ptr<u8> m_nvram; }; -WRITE8_MEMBER(cdc721_state::interrupt_mask_w) +void cdc721_state::interrupt_mask_w(u8 data) { m_interrupt_mask = data ^ 0xff; machine().scheduler().synchronize(timer_expired_delegate(FUNC(cdc721_state::update_interrupts), this)); @@ -122,7 +122,7 @@ IRQ_CALLBACK_MEMBER(cdc721_state::restart_cb) return vector; } -WRITE8_MEMBER(cdc721_state::misc_w) +void cdc721_state::misc_w(u8 data) { // 7: Stop Refresh Operation // 6: Enable RAM Char Gen diff --git a/src/mame/drivers/compmahj.cpp b/src/mame/drivers/compmahj.cpp index 192dac9bcb2..999e85aec0d 100644 --- a/src/mame/drivers/compmahj.cpp +++ b/src/mame/drivers/compmahj.cpp @@ -54,10 +54,10 @@ private: required_device<lh5801_cpu_device> m_maincpu; - DECLARE_READ8_MEMBER(ita_r); + u8 ita_r(); }; -READ8_MEMBER(compmahj_state::ita_r) +u8 compmahj_state::ita_r() { // f75e/f760 return 0; diff --git a/src/mame/drivers/controlid.cpp b/src/mame/drivers/controlid.cpp index ee09bd2f956..9bad4be38e2 100644 --- a/src/mame/drivers/controlid.cpp +++ b/src/mame/drivers/controlid.cpp @@ -48,12 +48,12 @@ protected: virtual void machine_start() override; private: - DECLARE_WRITE8_MEMBER(p0_w); - DECLARE_READ8_MEMBER(p1_r); - DECLARE_WRITE8_MEMBER(p1_w); - DECLARE_READ8_MEMBER(p2_r); - DECLARE_READ8_MEMBER(p3_r); - DECLARE_WRITE8_MEMBER(p3_w); + void p0_w(uint8_t data); + uint8_t p1_r(); + void p1_w(uint8_t data); + uint8_t p2_r(); + uint8_t p3_r(); + void p3_w(uint8_t data); void controlidx628_palette(palette_device &palette) const; void io_map(address_map &map); @@ -87,18 +87,18 @@ void controlidx628_state::io_map(address_map &map) } -WRITE8_MEMBER(controlidx628_state::p0_w) +void controlidx628_state::p0_w(uint8_t data) { m_p0_data = data; } -READ8_MEMBER(controlidx628_state::p1_r) +uint8_t controlidx628_state::p1_r() { // P1.1 is used for serial I/O; P1.4 and P1.5 are also used bidirectionally return 0xcd; } -WRITE8_MEMBER(controlidx628_state::p1_w) +void controlidx628_state::p1_w(uint8_t data) { if ((BIT(m_p1_data, 6) == 0) && (BIT(data, 6) == 1)) // on raising-edge of bit 6 { @@ -108,19 +108,19 @@ WRITE8_MEMBER(controlidx628_state::p1_w) m_p1_data = data; } -READ8_MEMBER(controlidx628_state::p2_r) +uint8_t controlidx628_state::p2_r() { // Low nibble used for input return 0xf0; } -READ8_MEMBER(controlidx628_state::p3_r) +uint8_t controlidx628_state::p3_r() { // P3.3 (INT1) and P3.4 (T0) used bidirectionally return 0xff; } -WRITE8_MEMBER(controlidx628_state::p3_w) +void controlidx628_state::p3_w(uint8_t data) { m_p3_data = data; } diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp index d3b23c7a785..b858c8d7ea0 100644 --- a/src/mame/drivers/cosmicos.cpp +++ b/src/mame/drivers/cosmicos.cpp @@ -438,12 +438,12 @@ WRITE_LINE_MEMBER( cosmicos_state::q_w ) m_q = state; } -READ8_MEMBER( cosmicos_state::dma_r ) +uint8_t cosmicos_state::dma_r() { return m_data; } -WRITE8_MEMBER( cosmicos_state::sc_w ) +void cosmicos_state::sc_w(uint8_t data) { int sc1 = BIT(data, 1); diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp index 8aec2a4fe7b..97be9ab9cb5 100644 --- a/src/mame/drivers/cp1.cpp +++ b/src/mame/drivers/cp1.cpp @@ -44,18 +44,18 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER(port1_r); - DECLARE_READ8_MEMBER(port2_r); - DECLARE_WRITE8_MEMBER(port1_w); - DECLARE_WRITE8_MEMBER(port2_w); + uint8_t port1_r(); + uint8_t port2_r(); + void port1_w(uint8_t data); + void port2_w(uint8_t data); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); DECLARE_READ8_MEMBER(i8155_read); DECLARE_WRITE8_MEMBER(i8155_write); - DECLARE_WRITE8_MEMBER(i8155_porta_w); - DECLARE_READ8_MEMBER(i8155_portb_r); - DECLARE_WRITE8_MEMBER(i8155_portb_w); - DECLARE_WRITE8_MEMBER(i8155_portc_w); + void i8155_porta_w(uint8_t data); + uint8_t i8155_portb_r(); + void i8155_portb_w(uint8_t data); + void i8155_portc_w(uint8_t data); required_device<cpu_device> m_maincpu; required_device<i8155_device> m_i8155; @@ -70,7 +70,7 @@ private: uint8_t m_matrix; }; -READ8_MEMBER(cp1_state::port1_r) +uint8_t cp1_state::port1_r() { logerror("Read from expansion port 1\n"); @@ -82,7 +82,7 @@ READ8_MEMBER(cp1_state::port1_r) return data; } -WRITE8_MEMBER(cp1_state::port1_w) +void cp1_state::port1_w(uint8_t data) { logerror("Write to expansion port 1 %x\n", data); @@ -90,7 +90,7 @@ WRITE8_MEMBER(cp1_state::port1_w) m_cassette->output(data & 0x80 ? +1.0 : -1.0); } -READ8_MEMBER(cp1_state::port2_r) +uint8_t cp1_state::port2_r() { // x--- ---- I8155 IO/M // -x-- ---- I8155 RESET @@ -107,7 +107,7 @@ READ8_MEMBER(cp1_state::port2_r) return (data & 0x0f) | (m_port2 & 0xf0); } -WRITE8_MEMBER(cp1_state::port2_w) +void cp1_state::port2_w(uint8_t data) { if (data & 0x40) { @@ -154,24 +154,24 @@ WRITE8_MEMBER(cp1_state::i8155_write) } } -WRITE8_MEMBER(cp1_state::i8155_porta_w) +void cp1_state::i8155_porta_w(uint8_t data) { m_7seg = data & 0x7f; // PA7 is not connected m_display->matrix(~m_matrix, m_7seg); } -READ8_MEMBER(cp1_state::i8155_portb_r) +uint8_t cp1_state::i8155_portb_r() { logerror("read from expansion port 2\n"); return 0; } -WRITE8_MEMBER(cp1_state::i8155_portb_w) +void cp1_state::i8155_portb_w(uint8_t data) { logerror("Write to expansion port 2 %x\n", data); } -WRITE8_MEMBER(cp1_state::i8155_portc_w) +void cp1_state::i8155_portc_w(uint8_t data) { // --xx xxxx keyboard matrix, 7seg select m_matrix = data & 0x3f; diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp index ced66c31a75..4324da54f12 100644 --- a/src/mame/drivers/d6800.cpp +++ b/src/mame/drivers/d6800.cpp @@ -83,10 +83,10 @@ public: DECLARE_INPUT_CHANGED_MEMBER(reset_button); private: - DECLARE_READ8_MEMBER( d6800_cassette_r ); - DECLARE_WRITE8_MEMBER( d6800_cassette_w ); - DECLARE_READ8_MEMBER( d6800_keyboard_r ); - DECLARE_WRITE8_MEMBER( d6800_keyboard_w ); + uint8_t d6800_cassette_r(); + void d6800_cassette_w(uint8_t data); + uint8_t d6800_keyboard_r(); + void d6800_keyboard_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( d6800_screen_w ); uint32_t screen_update_d6800(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(kansas_w); @@ -289,7 +289,7 @@ WRITE_LINE_MEMBER( d6800_state::d6800_screen_w ) m_cb2 = state; } -READ8_MEMBER( d6800_state::d6800_cassette_r ) +uint8_t d6800_state::d6800_cassette_r() { /* Cassette circuit consists of a 741 op-amp, a 74121 oneshot, and a 74LS74. @@ -301,7 +301,7 @@ READ8_MEMBER( d6800_state::d6800_cassette_r ) return m_cass_data[2] | m_portb; } -WRITE8_MEMBER( d6800_state::d6800_cassette_w ) +void d6800_state::d6800_cassette_w(uint8_t data) { /* A NE556 runs at either 1200 or 2400 Hz, depending on the state of bit 0. @@ -316,7 +316,7 @@ WRITE8_MEMBER( d6800_state::d6800_cassette_w ) m_portb = data & 0x7f; } -READ8_MEMBER( d6800_state::d6800_keyboard_r ) +uint8_t d6800_state::d6800_keyboard_r() { /* This system reads the key matrix one way, then swaps the input and output @@ -329,7 +329,7 @@ READ8_MEMBER( d6800_state::d6800_keyboard_r ) return data; } -WRITE8_MEMBER( d6800_state::d6800_keyboard_w ) +void d6800_state::d6800_keyboard_w(uint8_t data) { /* diff --git a/src/mame/drivers/dbox.cpp b/src/mame/drivers/dbox.cpp index 0cf929923ee..d32733f9f91 100644 --- a/src/mame/drivers/dbox.cpp +++ b/src/mame/drivers/dbox.cpp @@ -458,7 +458,7 @@ private: virtual void machine_start() override; DECLARE_WRITE8_MEMBER(sda5708_reset); DECLARE_WRITE8_MEMBER(sda5708_clk); - DECLARE_WRITE8_MEMBER(write_pa); + void write_pa(uint8_t data); void dbox_map(address_map &map); @@ -503,7 +503,7 @@ WRITE8_MEMBER (dbox_state::sda5708_clk){ m_display->sdclk_w(ASSERT_LINE); } -WRITE8_MEMBER (dbox_state::write_pa){ +void dbox_state::write_pa(uint8_t data) { LOGDISPLAY("%s\n", FUNCNAME); m_display->load_w((0x04 & data) == 0 ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp index 7dc7c80095e..c869ca8be03 100644 --- a/src/mame/drivers/dkong.cpp +++ b/src/mame/drivers/dkong.cpp @@ -433,13 +433,13 @@ Donkey Kong Notes * *************************************/ -READ8_MEMBER(dkong_state::memory_read_byte) +uint8_t dkong_state::memory_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); return prog_space.read_byte(offset); } -WRITE8_MEMBER(dkong_state::memory_write_byte) +void dkong_state::memory_write_byte(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); prog_space.write_byte(offset, data); @@ -564,7 +564,7 @@ MACHINE_RESET_MEMBER(dkong_state,drakton) * *************************************/ -READ8_MEMBER(dkong_state::hb_dma_read_byte) +uint8_t dkong_state::hb_dma_read_byte(offs_t offset) { int bucket = m_rev_map[(offset>>10) & 0x1ff]; int addr; @@ -577,7 +577,7 @@ READ8_MEMBER(dkong_state::hb_dma_read_byte) return prog_space.read_byte(addr); } -WRITE8_MEMBER(dkong_state::hb_dma_write_byte) +void dkong_state::hb_dma_write_byte(offs_t offset, uint8_t data) { int bucket = m_rev_map[(offset>>10) & 0x1ff]; int addr; @@ -590,12 +590,12 @@ WRITE8_MEMBER(dkong_state::hb_dma_write_byte) prog_space.write_byte(addr, data); } -READ8_MEMBER(dkong_state::p8257_ctl_r) +uint8_t dkong_state::p8257_ctl_r() { return m_dma_latch; } -WRITE8_MEMBER(dkong_state::p8257_ctl_w) +void dkong_state::p8257_ctl_w(uint8_t data) { m_dma_latch = data; } diff --git a/src/mame/drivers/dpb7000.cpp b/src/mame/drivers/dpb7000.cpp index 30a6512ad01..201cfed27f7 100644 --- a/src/mame/drivers/dpb7000.cpp +++ b/src/mame/drivers/dpb7000.cpp @@ -115,9 +115,9 @@ private: void fdd_index_callback(floppy_image_device *floppy, int state); DECLARE_READ8_MEMBER(fdd_ctrl_r); DECLARE_READ8_MEMBER(fdd_cmd_r); - DECLARE_WRITE8_MEMBER(fddcpu_p1_w); - DECLARE_READ8_MEMBER(fddcpu_p2_r); - DECLARE_WRITE8_MEMBER(fddcpu_p2_w); + void fddcpu_p1_w(uint8_t data); + uint8_t fddcpu_p2_r(); + void fddcpu_p2_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(fddcpu_debug_rx); void handle_command(uint16_t data); @@ -140,7 +140,7 @@ private: MC6845_UPDATE_ROW(crtc_update_row); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_addr_changed); - DECLARE_WRITE16_MEMBER(diskseq_y_w); + void diskseq_y_w(uint16_t data); void diskseq_tick(); required_device<m68000_base_device> m_maincpu; @@ -757,7 +757,7 @@ MC6845_ON_UPDATE_ADDR_CHANGED(dpb7000_state::crtc_addr_changed) } // NOTE: This function is not used, but is retained in the event we wish for low-level disk sequencer emulation. -WRITE16_MEMBER(dpb7000_state::diskseq_y_w) +void dpb7000_state::diskseq_y_w(uint16_t data) { uint8_t old_prom_latch[7]; memcpy(old_prom_latch, m_diskseq_ucode_latch, 7); @@ -1609,7 +1609,7 @@ void dpb7000_state::fdd_index_callback(floppy_image_device *floppy, int state) } } -WRITE8_MEMBER(dpb7000_state::fddcpu_p1_w) +void dpb7000_state::fddcpu_p1_w(uint8_t data) { LOGMASKED(LOG_FDC_PORT, "%s: Floppy CPU Port 1 Write: %02x\n", machine().describe_context(), data); const uint8_t old_value = m_fdd_port1; @@ -1660,12 +1660,12 @@ WRITE8_MEMBER(dpb7000_state::fddcpu_p1_w) m_diskseq_status_out |= 0x08; } -WRITE8_MEMBER(dpb7000_state::fddcpu_p2_w) +void dpb7000_state::fddcpu_p2_w(uint8_t data) { m_fdd_serial->write_txd(BIT(data, 4)); } -READ8_MEMBER(dpb7000_state::fddcpu_p2_r) +uint8_t dpb7000_state::fddcpu_p2_r() { uint8_t ret = 0; if (m_fdd_debug_rx_byte_count) diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp index a693b642c82..201f2c182ea 100644 --- a/src/mame/drivers/elf.cpp +++ b/src/mame/drivers/elf.cpp @@ -159,12 +159,12 @@ WRITE_LINE_MEMBER( elf2_state::q_w ) m_led = state ? 1 : 0; } -READ8_MEMBER( elf2_state::dma_r ) +uint8_t elf2_state::dma_r() { return m_data; } -WRITE8_MEMBER( elf2_state::sc_w ) +void elf2_state::sc_w(uint8_t data) { switch (data) { diff --git a/src/mame/drivers/exp85.cpp b/src/mame/drivers/exp85.cpp index 58b30641f3b..465e6b6e022 100644 --- a/src/mame/drivers/exp85.cpp +++ b/src/mame/drivers/exp85.cpp @@ -78,7 +78,7 @@ INPUT_PORTS_END /* 8355 Interface */ -READ8_MEMBER( exp85_state::i8355_a_r ) +uint8_t exp85_state::i8355_a_r() { /* @@ -98,7 +98,7 @@ READ8_MEMBER( exp85_state::i8355_a_r ) return 0x02; } -WRITE8_MEMBER( exp85_state::i8355_a_w ) +void exp85_state::i8355_a_w(uint8_t data) { /* diff --git a/src/mame/drivers/fontwriter.cpp b/src/mame/drivers/fontwriter.cpp index 26ad6b4364e..96cf3036134 100644 --- a/src/mame/drivers/fontwriter.cpp +++ b/src/mame/drivers/fontwriter.cpp @@ -44,12 +44,12 @@ private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER(vbl_r) + uint8_t vbl_r() { m_vbl ^= 0xff; return m_vbl; } - DECLARE_READ8_MEMBER(vbl2_r) + uint8_t vbl2_r() { m_vbl2 ^= 0x88; return m_vbl; diff --git a/src/mame/drivers/hektor.cpp b/src/mame/drivers/hektor.cpp index 33a0d8a090b..939896fcc0e 100644 --- a/src/mame/drivers/hektor.cpp +++ b/src/mame/drivers/hektor.cpp @@ -49,8 +49,8 @@ public: , m_rs232(*this, "rs232") { } - DECLARE_WRITE8_MEMBER(i8155_porta_w); - DECLARE_READ8_MEMBER(i8155_portb_r); + void i8155_porta_w(uint8_t data); + uint8_t i8155_portb_r(); DECLARE_READ_LINE_MEMBER(sid_r); DECLARE_WRITE_LINE_MEMBER(sod_w); @@ -90,7 +90,7 @@ public: private: void hektor2_mem(address_map &map); - DECLARE_WRITE8_MEMBER(i8155_portc_w); + void i8155_portc_w(uint8_t data); required_device<ef9364_device> m_ef9364; }; @@ -115,7 +115,7 @@ private: uint8_t mem_r(offs_t offset); void mem_w(offs_t offset, uint8_t data); - DECLARE_WRITE8_MEMBER(i8155_portc_w); + void i8155_portc_w(uint8_t data); MC6845_UPDATE_ROW(crtc_update_row); required_device<ram_device> m_ram; @@ -124,12 +124,12 @@ private: }; -WRITE8_MEMBER(hektor_state::i8155_porta_w) +void hektor_state::i8155_porta_w(uint8_t data) { m_kbd_row = data; } -READ8_MEMBER(hektor_state::i8155_portb_r) +uint8_t hektor_state::i8155_portb_r() { for (int col = 0; col < 8; col++) { @@ -139,7 +139,7 @@ READ8_MEMBER(hektor_state::i8155_portb_r) return 0xff; } -WRITE8_MEMBER(hektor2_state::i8155_portc_w) +void hektor2_state::i8155_portc_w(uint8_t data) { m_i8155_portc = data; @@ -156,7 +156,7 @@ WRITE8_MEMBER(hektor2_state::i8155_portc_w) m_speaker->level_w(BIT(data, 6)); // TODO: verify which bit } -WRITE8_MEMBER(hektor3_state::i8155_portc_w) +void hektor3_state::i8155_portc_w(uint8_t data) { m_i8155_portc = data; diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp index 5380f7a25da..1a9d5ac7144 100644 --- a/src/mame/drivers/hh_cop400.cpp +++ b/src/mame/drivers/hh_cop400.cpp @@ -161,27 +161,27 @@ public: hh_cop400_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(write_g); - DECLARE_WRITE8_MEMBER(write_l); - DECLARE_READ8_MEMBER(read_l); + void write_g(u8 data); + void write_l(u8 data); + u8 read_l(); void ctstein(machine_config &config); }; // handlers -WRITE8_MEMBER(ctstein_state::write_g) +void ctstein_state::write_g(u8 data) { // G0-G2: input mux m_inp_mux = data & 7; } -WRITE8_MEMBER(ctstein_state::write_l) +void ctstein_state::write_l(u8 data) { // L0-L3: button lamps m_display->matrix(1, data & 0xf); } -READ8_MEMBER(ctstein_state::read_l) +u8 ctstein_state::read_l() { // L4-L7: multiplexed inputs return read_inputs(3, 0xf) << 4 | 0xf; @@ -263,10 +263,10 @@ public: hh_cop400_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(write_d); - DECLARE_WRITE8_MEMBER(write_g); - DECLARE_WRITE8_MEMBER(write_l); - DECLARE_READ8_MEMBER(read_in); + void write_d(u8 data); + void write_g(u8 data); + void write_l(u8 data); + u8 read_in(); void h2hsoccerc(machine_config &config); void h2hbaskbc(machine_config &config); void h2hhockeyc(machine_config &config); @@ -274,20 +274,20 @@ public: // handlers -WRITE8_MEMBER(h2hbaskbc_state::write_d) +void h2hbaskbc_state::write_d(u8 data) { // D: led select m_d = data & 0xf; } -WRITE8_MEMBER(h2hbaskbc_state::write_g) +void h2hbaskbc_state::write_g(u8 data) { // G: led select, input mux m_inp_mux = data; m_g = data & 0xf; } -WRITE8_MEMBER(h2hbaskbc_state::write_l) +void h2hbaskbc_state::write_l(u8 data) { // D2,D3 double as multiplexer u16 mask = ((m_d >> 2 & 1) * 0x00ff) | ((m_d >> 3 & 1) * 0xff00); @@ -298,7 +298,7 @@ WRITE8_MEMBER(h2hbaskbc_state::write_l) m_display->matrix(sel, data); } -READ8_MEMBER(h2hbaskbc_state::read_in) +u8 h2hbaskbc_state::read_in() { // IN: multiplexed inputs return read_inputs(4, 7) | (m_inputs[4]->read() & 8); @@ -421,11 +421,11 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(write_d); - DECLARE_WRITE8_MEMBER(write_g); + void write_d(u8 data); + void write_g(u8 data); DECLARE_WRITE_LINE_MEMBER(write_sk); DECLARE_WRITE_LINE_MEMBER(write_so); - DECLARE_WRITE8_MEMBER(write_l); + void write_l(u8 data); void einvaderc(machine_config &config); }; @@ -439,14 +439,14 @@ void einvaderc_state::update_display() m_display->matrix(grid, l); } -WRITE8_MEMBER(einvaderc_state::write_d) +void einvaderc_state::write_d(u8 data) { // D: led grid 0-3 (D0-D2 are 7segs) m_d = data; update_display(); } -WRITE8_MEMBER(einvaderc_state::write_g) +void einvaderc_state::write_g(u8 data) { // G: led grid 4-7 m_g = data; @@ -468,7 +468,7 @@ WRITE_LINE_MEMBER(einvaderc_state::write_so) update_display(); } -WRITE8_MEMBER(einvaderc_state::write_l) +void einvaderc_state::write_l(u8 data) { // L: led state/segment m_l = data; @@ -550,10 +550,10 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(write_g); - DECLARE_WRITE8_MEMBER(write_d); - DECLARE_WRITE8_MEMBER(write_l); - DECLARE_READ8_MEMBER(read_l); + void write_g(u8 data); + void write_d(u8 data); + void write_l(u8 data); + u8 read_l(); DECLARE_INPUT_CHANGED_MEMBER(position_changed) { update_display(); } void unkeinv(machine_config &config); @@ -571,7 +571,7 @@ void unkeinv_state::update_display() m_display->update(); } -WRITE8_MEMBER(unkeinv_state::write_g) +void unkeinv_state::write_g(u8 data) { // G0-G3: led select part // G2,G3: input mux @@ -579,21 +579,21 @@ WRITE8_MEMBER(unkeinv_state::write_g) update_display(); } -WRITE8_MEMBER(unkeinv_state::write_d) +void unkeinv_state::write_d(u8 data) { // D0-D3: led select part m_d = ~data & 0xf; update_display(); } -WRITE8_MEMBER(unkeinv_state::write_l) +void unkeinv_state::write_l(u8 data) { // L0-L7: led data m_l = ~data & 0xff; update_display(); } -READ8_MEMBER(unkeinv_state::read_l) +u8 unkeinv_state::read_l() { u8 ret = 0xff; @@ -680,10 +680,10 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(motor_sim_tick); DECLARE_READ_LINE_MEMBER(motor_switch_r); - DECLARE_WRITE8_MEMBER(write_l); - DECLARE_WRITE8_MEMBER(write_d); - DECLARE_WRITE8_MEMBER(write_g); - DECLARE_READ8_MEMBER(read_g); + void write_l(u8 data); + void write_d(u8 data); + void write_g(u8 data); + u8 read_g(); DECLARE_WRITE_LINE_MEMBER(write_so); DECLARE_READ_LINE_MEMBER(read_si); void lchicken(machine_config &config); @@ -717,7 +717,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(lchicken_state::motor_sim_tick) } } -WRITE8_MEMBER(lchicken_state::write_l) +void lchicken_state::write_l(u8 data) { // L0-L3: led data // L4-L6: led select @@ -725,7 +725,7 @@ WRITE8_MEMBER(lchicken_state::write_l) m_display->matrix(data >> 4 & 7, ~data & 0xf); } -WRITE8_MEMBER(lchicken_state::write_d) +void lchicken_state::write_d(u8 data) { // D0-D3: input mux // D3: motor on @@ -733,12 +733,12 @@ WRITE8_MEMBER(lchicken_state::write_d) output().set_value("motor_on", ~data >> 3 & 1); } -WRITE8_MEMBER(lchicken_state::write_g) +void lchicken_state::write_g(u8 data) { m_g = data; } -READ8_MEMBER(lchicken_state::read_g) +u8 lchicken_state::read_g() { // G0-G3: multiplexed inputs return read_inputs(4, m_g); @@ -835,11 +835,11 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(write_d); - DECLARE_WRITE8_MEMBER(write_l); - DECLARE_WRITE8_MEMBER(write_g); - DECLARE_READ8_MEMBER(read_l); - DECLARE_READ8_MEMBER(read_g); + void write_d(u8 data); + void write_l(u8 data); + void write_g(u8 data); + u8 read_l(); + u8 read_g(); void funjacks(machine_config &config); }; @@ -850,7 +850,7 @@ void funjacks_state::update_display() m_display->matrix(m_d, m_l); } -WRITE8_MEMBER(funjacks_state::write_d) +void funjacks_state::write_d(u8 data) { // D: led grid + input mux m_inp_mux = data; @@ -858,27 +858,27 @@ WRITE8_MEMBER(funjacks_state::write_d) update_display(); } -WRITE8_MEMBER(funjacks_state::write_l) +void funjacks_state::write_l(u8 data) { // L0,L1: led state m_l = data & 3; update_display(); } -WRITE8_MEMBER(funjacks_state::write_g) +void funjacks_state::write_g(u8 data) { // G1: speaker out m_speaker->level_w(data >> 1 & 1); m_g = data; } -READ8_MEMBER(funjacks_state::read_l) +u8 funjacks_state::read_l() { // L4,L5: multiplexed inputs return read_inputs(3, 0x30) | m_l; } -READ8_MEMBER(funjacks_state::read_g) +u8 funjacks_state::read_g() { // G1: speaker out state // G2,G3: inputs @@ -960,9 +960,9 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(write_d); - DECLARE_WRITE8_MEMBER(write_l); - DECLARE_WRITE8_MEMBER(write_g); + void write_d(u8 data); + void write_l(u8 data); + void write_g(u8 data); void funrlgl(machine_config &config); }; @@ -973,14 +973,14 @@ void funrlgl_state::update_display() m_display->matrix(m_d, m_l); } -WRITE8_MEMBER(funrlgl_state::write_d) +void funrlgl_state::write_d(u8 data) { // D: led grid m_d = ~data & 0xf; update_display(); } -WRITE8_MEMBER(funrlgl_state::write_l) +void funrlgl_state::write_l(u8 data) { // L0-L3: led state // L4-L7: N/C @@ -988,7 +988,7 @@ WRITE8_MEMBER(funrlgl_state::write_l) update_display(); } -WRITE8_MEMBER(funrlgl_state::write_g) +void funrlgl_state::write_g(u8 data) { // G3: speaker out m_speaker->level_w(data >> 3 & 1); @@ -1059,10 +1059,10 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(write_l); - DECLARE_WRITE8_MEMBER(write_d); - DECLARE_WRITE8_MEMBER(write_g); - DECLARE_READ8_MEMBER(read_in); + void write_l(u8 data); + void write_d(u8 data); + void write_g(u8 data); + u8 read_in(); void mdallas(machine_config &config); }; @@ -1073,14 +1073,14 @@ void mdallas_state::update_display() m_display->matrix(~(m_d << 4 | m_g), m_l); } -WRITE8_MEMBER(mdallas_state::write_l) +void mdallas_state::write_l(u8 data) { // L: digit segment data m_l = data; update_display(); } -WRITE8_MEMBER(mdallas_state::write_d) +void mdallas_state::write_d(u8 data) { // D: select digit, input mux high m_inp_mux = (m_inp_mux & 0xf) | (data << 4 & 3); @@ -1088,7 +1088,7 @@ WRITE8_MEMBER(mdallas_state::write_d) update_display(); } -WRITE8_MEMBER(mdallas_state::write_g) +void mdallas_state::write_g(u8 data) { // G: select digit, input mux low m_inp_mux = (m_inp_mux & 0x30) | (data & 0xf); @@ -1096,7 +1096,7 @@ WRITE8_MEMBER(mdallas_state::write_g) update_display(); } -READ8_MEMBER(mdallas_state::read_in) +u8 mdallas_state::read_in() { // IN: multiplexed inputs return read_inputs(6, 0xf); @@ -1202,26 +1202,26 @@ public: hh_cop400_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(write_d); - DECLARE_WRITE8_MEMBER(write_l); - DECLARE_READ8_MEMBER(read_l); + void write_d(u8 data); + void write_l(u8 data); + u8 read_l(); void plus1(machine_config &config); }; // handlers -WRITE8_MEMBER(plus1_state::write_d) +void plus1_state::write_d(u8 data) { // D0?: speaker out m_speaker->level_w(data & 1); } -WRITE8_MEMBER(plus1_state::write_l) +void plus1_state::write_l(u8 data) { m_l = data; } -READ8_MEMBER(plus1_state::read_l) +u8 plus1_state::read_l() { // L: IN.1, mask with output return m_inputs[1]->read() & m_l; @@ -1301,9 +1301,9 @@ public: void update_display(); DECLARE_WRITE_LINE_MEMBER(write_so); - DECLARE_WRITE8_MEMBER(write_d); - DECLARE_WRITE8_MEMBER(write_l); - DECLARE_READ8_MEMBER(read_g); + void write_d(u8 data); + void write_l(u8 data); + u8 read_g(); void lightfgt(machine_config &config); }; @@ -1322,14 +1322,14 @@ WRITE_LINE_MEMBER(lightfgt_state::write_so) update_display(); } -WRITE8_MEMBER(lightfgt_state::write_d) +void lightfgt_state::write_d(u8 data) { // D: led grid 1-4 (and input mux) m_d = data; update_display(); } -WRITE8_MEMBER(lightfgt_state::write_l) +void lightfgt_state::write_l(u8 data) { // L0-L4: led state // L5-L7: N/C @@ -1337,7 +1337,7 @@ WRITE8_MEMBER(lightfgt_state::write_l) update_display(); } -READ8_MEMBER(lightfgt_state::read_g) +u8 lightfgt_state::read_g() { // G: multiplexed inputs m_inp_mux = m_d << 1 | m_so; @@ -1425,28 +1425,28 @@ public: hh_cop400_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(write_d); - DECLARE_READ8_MEMBER(read_l); - DECLARE_READ8_MEMBER(read_in); + void write_d(u8 data); + u8 read_l(); + u8 read_in(); DECLARE_WRITE_LINE_MEMBER(write_so); void bship82(machine_config &config); }; // handlers -WRITE8_MEMBER(bship82_state::write_d) +void bship82_state::write_d(u8 data) { // D: input mux m_inp_mux = data; } -READ8_MEMBER(bship82_state::read_l) +u8 bship82_state::read_l() { // L: multiplexed inputs return read_inputs(4, 0xff); } -READ8_MEMBER(bship82_state::read_in) +u8 bship82_state::read_in() { // IN: multiplexed inputs return read_inputs(4, 0xf00) >> 8; @@ -1592,10 +1592,10 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(write_d); - DECLARE_WRITE8_MEMBER(write_g); - DECLARE_WRITE8_MEMBER(write_l); - DECLARE_READ8_MEMBER(read_in); + void write_d(u8 data); + void write_g(u8 data); + void write_l(u8 data); + u8 read_in(); DECLARE_WRITE_LINE_MEMBER(write_sk); void qkracer(machine_config &config); }; @@ -1607,7 +1607,7 @@ void qkracer_state::update_display() m_display->matrix(~(m_d | m_g << 4 | m_sk << 8), m_l); } -WRITE8_MEMBER(qkracer_state::write_d) +void qkracer_state::write_d(u8 data) { // D: select digit, D3: input mux high bit m_inp_mux = (m_inp_mux & 0xf) | (data << 1 & 0x10); @@ -1615,7 +1615,7 @@ WRITE8_MEMBER(qkracer_state::write_d) update_display(); } -WRITE8_MEMBER(qkracer_state::write_g) +void qkracer_state::write_g(u8 data) { // G: select digit, input mux m_inp_mux = (m_inp_mux & 0x10) | (data & 0xf); @@ -1623,14 +1623,14 @@ WRITE8_MEMBER(qkracer_state::write_g) update_display(); } -WRITE8_MEMBER(qkracer_state::write_l) +void qkracer_state::write_l(u8 data) { // L0-L6: digit segment data m_l = data & 0x7f; update_display(); } -READ8_MEMBER(qkracer_state::read_in) +u8 qkracer_state::read_in() { // IN: multiplexed inputs return read_inputs(5, 0xf); @@ -1733,8 +1733,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(write_d); - DECLARE_WRITE8_MEMBER(write_l); + void write_d(u8 data); + void write_l(u8 data); DECLARE_WRITE_LINE_MEMBER(write_sk); void vidchal(machine_config &config); }; @@ -1746,14 +1746,14 @@ void vidchal_state::update_display() m_display->matrix(m_d | m_sk << 6, m_l); } -WRITE8_MEMBER(vidchal_state::write_d) +void vidchal_state::write_d(u8 data) { // D: CD4028BE to digit select m_d = 1 << data & 0x3f; update_display(); } -WRITE8_MEMBER(vidchal_state::write_l) +void vidchal_state::write_l(u8 data) { // L: digit segment data m_l = bitswap<8>(data,0,3,1,5,4,7,2,6); diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp index b0c899381b0..fcc3510fcc0 100644 --- a/src/mame/drivers/hh_sm510.cpp +++ b/src/mame/drivers/hh_sm510.cpp @@ -243,13 +243,13 @@ void hh_sm510_state::set_display_size(u8 x, u8 y, u8 z) m_display_z_len = z; } -WRITE16_MEMBER(hh_sm510_state::sm510_lcd_segment_w) +void hh_sm510_state::sm510_lcd_segment_w(offs_t offset, u16 data) { set_display_size(2, 16, 2); m_display_state[offset] = data; } -WRITE16_MEMBER(hh_sm510_state::sm500_lcd_segment_w) +void hh_sm510_state::sm500_lcd_segment_w(offs_t offset, u16 data) { set_display_size(4, 4, 1); m_display_state[offset] = data; @@ -287,7 +287,7 @@ INPUT_CHANGED_MEMBER(hh_sm510_state::input_changed) update_k_line(); } -WRITE8_MEMBER(hh_sm510_state::input_w) +void hh_sm510_state::input_w(u8 data) { m_inp_mux = data; update_k_line(); @@ -307,38 +307,38 @@ INPUT_CHANGED_MEMBER(hh_sm510_state::acl_button) // other generic output handlers -WRITE8_MEMBER(hh_sm510_state::piezo_r1_w) +void hh_sm510_state::piezo_r1_w(u8 data) { // R1 to piezo (SM511 R pin is melody output) m_speaker->level_w(data & 1); } -WRITE8_MEMBER(hh_sm510_state::piezo_r2_w) +void hh_sm510_state::piezo_r2_w(u8 data) { // R2 to piezo m_speaker->level_w(data >> 1 & 1); } -WRITE8_MEMBER(hh_sm510_state::piezo_input_w) +void hh_sm510_state::piezo_input_w(u8 data) { // R1 to piezo, other to input mux - piezo_r1_w(space, 0, data & 1); - input_w(space, 0, data >> 1); + piezo_r1_w(data & 1); + input_w(data >> 1); } -WRITE8_MEMBER(hh_sm510_state::piezo2bit_r1_w) +void hh_sm510_state::piezo2bit_r1_w(u8 data) { // R1(+S1) to piezo m_speaker_data = (m_speaker_data & ~1) | (data & 1); m_speaker->level_w(m_speaker_data); } -WRITE8_MEMBER(hh_sm510_state::piezo2bit_input_w) +void hh_sm510_state::piezo2bit_input_w(u8 data) { // S1(+R1) to piezo, other to input mux m_speaker_data = (m_speaker_data & ~2) | (data << 1 & 2); m_speaker->level_w(m_speaker_data); - input_w(space, 0, data >> 1); + input_w(data >> 1); } @@ -5265,7 +5265,7 @@ public: } // R2 connects to a single LED behind the screen - DECLARE_WRITE8_MEMBER(led_w) { m_led_out = data >> 1 & 1; } + void led_w(u8 data) { m_led_out = data >> 1 & 1; } output_finder<> m_led_out; void tgaiden(machine_config &config); @@ -7750,16 +7750,16 @@ public: inp_fixed_last(); } - virtual DECLARE_WRITE8_MEMBER(input_w) override; + virtual void input_w(u8 data) override; void tnmarebc(machine_config &config); }; // handlers -WRITE8_MEMBER(tnmarebc_state::input_w) +void tnmarebc_state::input_w(u8 data) { // S5 and S6 tied together - hh_sm510_state::input_w(space, 0, (data & 0x1f) | (data >> 1 & 0x10)); + hh_sm510_state::input_w((data & 0x1f) | (data >> 1 & 0x10)); } // config diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp index 762b5f35db4..33c68e23a51 100644 --- a/src/mame/drivers/hh_ucom4.cpp +++ b/src/mame/drivers/hh_ucom4.cpp @@ -244,9 +244,9 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE8_MEMBER(speaker_w); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); + void speaker_w(u8 data); void ufombs(machine_config &config); }; @@ -259,7 +259,7 @@ void ufombs_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(ufombs_state::grid_w) +void ufombs_state::grid_w(offs_t offset, u8 data) { // F,G,H0: vfd grid int shift = (offset - PORTF) * 4; @@ -267,7 +267,7 @@ WRITE8_MEMBER(ufombs_state::grid_w) update_display(); } -WRITE8_MEMBER(ufombs_state::plate_w) +void ufombs_state::plate_w(offs_t offset, u8 data) { // C,D012,I: vfd plate int shift = (offset == PORTI) ? 8 : (offset - PORTC) * 4; @@ -275,7 +275,7 @@ WRITE8_MEMBER(ufombs_state::plate_w) update_display(); } -WRITE8_MEMBER(ufombs_state::speaker_w) +void ufombs_state::speaker_w(u8 data) { // E01: speaker out m_speaker->level_w(data & 3); @@ -366,9 +366,9 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_READ8_MEMBER(input_b_r); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); + u8 input_b_r(); void ssfball(machine_config &config); }; @@ -380,7 +380,7 @@ void ssfball_state::update_display() m_display->matrix(m_grid, plate); } -WRITE8_MEMBER(ssfball_state::grid_w) +void ssfball_state::grid_w(offs_t offset, u8 data) { // C,D(,E3): vfd grid 0-7(,8) int shift = (offset - PORTC) * 4; @@ -388,7 +388,7 @@ WRITE8_MEMBER(ssfball_state::grid_w) update_display(); } -WRITE8_MEMBER(ssfball_state::plate_w) +void ssfball_state::plate_w(offs_t offset, u8 data) { m_port[offset] = data; @@ -402,12 +402,12 @@ WRITE8_MEMBER(ssfball_state::plate_w) // E3: vfd grid 8 if (offset == PORTE) - grid_w(space, offset, data >> 3 & 1); + grid_w(offset, data >> 3 & 1); else update_display(); } -READ8_MEMBER(ssfball_state::input_b_r) +u8 ssfball_state::input_b_r() { // B: input port 2, where B3 is multiplexed return m_inputs[2]->read() | read_inputs(2); @@ -527,9 +527,9 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_READ8_MEMBER(input_a_r); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); + u8 input_a_r(); void bmsoccer(machine_config &config); }; @@ -541,7 +541,7 @@ void bmsoccer_state::update_display() m_display->matrix(m_grid, plate); } -WRITE8_MEMBER(bmsoccer_state::grid_w) +void bmsoccer_state::grid_w(offs_t offset, u8 data) { // C01: input mux if (offset == PORTC) @@ -553,7 +553,7 @@ WRITE8_MEMBER(bmsoccer_state::grid_w) update_display(); } -WRITE8_MEMBER(bmsoccer_state::plate_w) +void bmsoccer_state::plate_w(offs_t offset, u8 data) { // G3: speaker out if (offset == PORTG) @@ -565,12 +565,12 @@ WRITE8_MEMBER(bmsoccer_state::plate_w) // E3: grid 8 if (offset == PORTE) - grid_w(space, offset, data >> 3 & 1); + grid_w(offset, data >> 3 & 1); else update_display(); } -READ8_MEMBER(bmsoccer_state::input_a_r) +u8 bmsoccer_state::input_a_r() { // port A: multiplexed inputs return read_inputs(2); @@ -660,9 +660,9 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE8_MEMBER(speaker_w); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); + void speaker_w(u8 data); void bmsafari(machine_config &config); }; @@ -675,7 +675,7 @@ void bmsafari_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(bmsafari_state::grid_w) +void bmsafari_state::grid_w(offs_t offset, u8 data) { // C,D(,E3): vfd grid int shift = (offset - PORTC) * 4; @@ -683,7 +683,7 @@ WRITE8_MEMBER(bmsafari_state::grid_w) update_display(); } -WRITE8_MEMBER(bmsafari_state::plate_w) +void bmsafari_state::plate_w(offs_t offset, u8 data) { // E012,H,I: vfd plate int shift = (offset == PORTE) ? 8 : (offset - PORTH) * 4; @@ -691,12 +691,12 @@ WRITE8_MEMBER(bmsafari_state::plate_w) // E3: grid 0 if (offset == PORTE) - grid_w(space, offset, data >> 3 & 1); + grid_w(offset, data >> 3 & 1); else update_display(); } -WRITE8_MEMBER(bmsafari_state::speaker_w) +void bmsafari_state::speaker_w(u8 data) { // G0: speaker out m_speaker->level_w(data & 1); @@ -780,9 +780,9 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_READ8_MEMBER(input_b_r); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); + u8 input_b_r(); void splasfgt(machine_config &config); }; @@ -794,7 +794,7 @@ void splasfgt_state::update_display() m_display->matrix(m_grid, plate); } -WRITE8_MEMBER(splasfgt_state::grid_w) +void splasfgt_state::grid_w(offs_t offset, u8 data) { // G,H,I0: vfd grid int shift = (offset - PORTG) * 4; @@ -805,12 +805,12 @@ WRITE8_MEMBER(splasfgt_state::grid_w) // I2: vfd plate 6 if (offset == PORTI) - plate_w(space, 4 + PORTC, data >> 2 & 1); + plate_w(4 + PORTC, data >> 2 & 1); else update_display(); } -WRITE8_MEMBER(splasfgt_state::plate_w) +void splasfgt_state::plate_w(offs_t offset, u8 data) { // F01: speaker out if (offset == PORTF) @@ -822,7 +822,7 @@ WRITE8_MEMBER(splasfgt_state::plate_w) update_display(); } -READ8_MEMBER(splasfgt_state::input_b_r) +u8 splasfgt_state::input_b_r() { // B: multiplexed buttons return read_inputs(4); @@ -942,8 +942,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); void bcclimbr(machine_config &config); }; @@ -956,7 +956,7 @@ void bcclimbr_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(bcclimbr_state::grid_w) +void bcclimbr_state::grid_w(offs_t offset, u8 data) { // I2: speaker out if (offset == PORTI) @@ -968,7 +968,7 @@ WRITE8_MEMBER(bcclimbr_state::grid_w) update_display(); } -WRITE8_MEMBER(bcclimbr_state::plate_w) +void bcclimbr_state::plate_w(offs_t offset, u8 data) { // C,D,E,F: vfd plate int shift = (offset - PORTC) * 4; @@ -1056,36 +1056,36 @@ public: hh_ucom4_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(leds_w); - DECLARE_WRITE8_MEMBER(speaker_w); - DECLARE_WRITE8_MEMBER(input_w); - DECLARE_READ8_MEMBER(input_r); + void leds_w(offs_t offset, u8 data); + void speaker_w(u8 data); + void input_w(offs_t offset, u8 data); + u8 input_r(); void tactix(machine_config &config); }; // handlers -WRITE8_MEMBER(tactix_state::leds_w) +void tactix_state::leds_w(offs_t offset, u8 data) { // D,F: 4*4 led matrix m_port[offset] = data; m_display->matrix(m_port[PORTF], m_port[PORTD]); } -WRITE8_MEMBER(tactix_state::speaker_w) +void tactix_state::speaker_w(u8 data) { // G0: speaker out m_speaker->level_w(data & 1); } -WRITE8_MEMBER(tactix_state::input_w) +void tactix_state::input_w(offs_t offset, u8 data) { // C,E0: input mux m_port[offset] = data; m_inp_mux = (m_port[PORTE] << 4 & 0x10) | m_port[PORTC]; } -READ8_MEMBER(tactix_state::input_r) +u8 tactix_state::input_r() { // A: multiplexed inputs return read_inputs(5); @@ -1179,10 +1179,10 @@ public: DECLARE_INPUT_CHANGED_MEMBER(start_button) { m_maincpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); } void update_display(); - DECLARE_WRITE8_MEMBER(_7seg_w); - DECLARE_WRITE8_MEMBER(speaker_w); - DECLARE_WRITE8_MEMBER(input_w); - DECLARE_READ8_MEMBER(input_r); + void _7seg_w(offs_t offset, u8 data); + void speaker_w(u8 data); + void input_w(offs_t offset, u8 data); + u8 input_r(); void ctntune(machine_config &config); }; @@ -1197,20 +1197,20 @@ void ctntune_state::update_display() m_display->matrix(sel, lamps << 7 | digit); } -WRITE8_MEMBER(ctntune_state::_7seg_w) +void ctntune_state::_7seg_w(offs_t offset, u8 data) { // E,F012: 7seg data, F3: N/C m_port[offset] = data; update_display(); } -WRITE8_MEMBER(ctntune_state::speaker_w) +void ctntune_state::speaker_w(u8 data) { // G0: speaker out m_speaker->level_w(data & 1); } -WRITE8_MEMBER(ctntune_state::input_w) +void ctntune_state::input_w(offs_t offset, u8 data) { // D3: trigger power-off on falling edge if (offset == PORTD && ~data & m_port[PORTD] & 8) @@ -1223,7 +1223,7 @@ WRITE8_MEMBER(ctntune_state::input_w) update_display(); } -READ8_MEMBER(ctntune_state::input_r) +u8 ctntune_state::input_r() { // A: multiplexed inputs return read_inputs(6); @@ -1319,8 +1319,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); void invspace(machine_config &config); }; @@ -1333,7 +1333,7 @@ void invspace_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(invspace_state::grid_w) +void invspace_state::grid_w(offs_t offset, u8 data) { // I0: speaker out if (offset == PORTI) @@ -1345,7 +1345,7 @@ WRITE8_MEMBER(invspace_state::grid_w) update_display(); } -WRITE8_MEMBER(invspace_state::plate_w) +void invspace_state::plate_w(offs_t offset, u8 data) { // E,F,G,H123: vfd plate int shift = (offset - PORTE) * 4; @@ -1431,8 +1431,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); void efball(machine_config &config); }; @@ -1444,7 +1444,7 @@ void efball_state::update_display() m_display->matrix(m_grid, plate); } -WRITE8_MEMBER(efball_state::grid_w) +void efball_state::grid_w(offs_t offset, u8 data) { // H2: speaker out if (offset == PORTH) @@ -1456,7 +1456,7 @@ WRITE8_MEMBER(efball_state::grid_w) update_display(); } -WRITE8_MEMBER(efball_state::plate_w) +void efball_state::plate_w(offs_t offset, u8 data) { // D,E,I: vfd plate int shift = (offset == PORTI) ? 8 : (offset - PORTD) * 4; @@ -1552,8 +1552,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); void galaxy2b(machine_config &config); void galaxy2(machine_config &config); }; @@ -1567,7 +1567,7 @@ void galaxy2_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(galaxy2_state::grid_w) +void galaxy2_state::grid_w(offs_t offset, u8 data) { // E3: speaker out if (offset == PORTE) @@ -1579,7 +1579,7 @@ WRITE8_MEMBER(galaxy2_state::grid_w) update_display(); } -WRITE8_MEMBER(galaxy2_state::plate_w) +void galaxy2_state::plate_w(offs_t offset, u8 data) { // F,G,H,I: vfd plate int shift = (offset - PORTF) * 4; @@ -1684,8 +1684,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); void astrocmd(machine_config &config); }; @@ -1698,7 +1698,7 @@ void astrocmd_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(astrocmd_state::grid_w) +void astrocmd_state::grid_w(offs_t offset, u8 data) { // C,D(,E3): vfd grid int shift = (offset - PORTC) * 4; @@ -1706,7 +1706,7 @@ WRITE8_MEMBER(astrocmd_state::grid_w) update_display(); } -WRITE8_MEMBER(astrocmd_state::plate_w) +void astrocmd_state::plate_w(offs_t offset, u8 data) { // E01,F,G,H,I: vfd plate int shift = (offset - PORTE) * 4; @@ -1718,7 +1718,7 @@ WRITE8_MEMBER(astrocmd_state::plate_w) m_speaker->level_w(data >> 2 & 1); // E3: vfd grid 8 - grid_w(space, offset, data >> 3 & 1); + grid_w(offset, data >> 3 & 1); } else update_display(); @@ -1804,8 +1804,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); void edracula(machine_config &config); }; @@ -1816,7 +1816,7 @@ void edracula_state::update_display() m_display->matrix(m_grid, m_plate); } -WRITE8_MEMBER(edracula_state::grid_w) +void edracula_state::grid_w(offs_t offset, u8 data) { // C,D: vfd grid int shift = (offset - PORTC) * 4; @@ -1824,7 +1824,7 @@ WRITE8_MEMBER(edracula_state::grid_w) update_display(); } -WRITE8_MEMBER(edracula_state::plate_w) +void edracula_state::plate_w(offs_t offset, u8 data) { // I2: speaker out if (offset == PORTI) @@ -1912,20 +1912,20 @@ public: required_device<hlcd0530_device> m_lcd; - DECLARE_WRITE32_MEMBER(lcd_output_w); - DECLARE_WRITE8_MEMBER(lcd_w); + void lcd_output_w(offs_t offset, u32 data); + void lcd_w(u8 data); void mcompgin(machine_config &config); }; // handlers -WRITE32_MEMBER(mcompgin_state::lcd_output_w) +void mcompgin_state::lcd_output_w(offs_t offset, u32 data) { // uses ROW0-4, COL11-24 m_display->matrix(1 << offset, data); } -WRITE8_MEMBER(mcompgin_state::lcd_w) +void mcompgin_state::lcd_w(u8 data) { // E0: HLCD0530 _CS // E1: HLCD0530 clock @@ -1997,9 +1997,9 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE8_MEMBER(speaker_w); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); + void speaker_w(u8 data); void mvbfree(machine_config &config); }; @@ -2012,7 +2012,7 @@ void mvbfree_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(mvbfree_state::grid_w) +void mvbfree_state::grid_w(offs_t offset, u8 data) { // E23,F,G,H: vfd grid int shift = (offset - PORTE) * 4; @@ -2020,12 +2020,12 @@ WRITE8_MEMBER(mvbfree_state::grid_w) // E01: plate 0,1 if (offset == PORTE) - plate_w(space, 2 + PORTC, data & 3); + plate_w(2 + PORTC, data & 3); else update_display(); } -WRITE8_MEMBER(mvbfree_state::plate_w) +void mvbfree_state::plate_w(offs_t offset, u8 data) { // C,D(,E01): vfd plate int shift = (offset - PORTC) * 4; @@ -2033,7 +2033,7 @@ WRITE8_MEMBER(mvbfree_state::plate_w) update_display(); } -WRITE8_MEMBER(mvbfree_state::speaker_w) +void mvbfree_state::speaker_w(u8 data) { // I0: speaker out m_speaker->level_w(data & 1); @@ -2115,16 +2115,16 @@ public: hh_ucom4_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(lamps_w); - DECLARE_WRITE8_MEMBER(speaker_w); - DECLARE_WRITE8_MEMBER(input_w); - DECLARE_READ8_MEMBER(input_r); + void lamps_w(offs_t offset, u8 data); + void speaker_w(u8 data); + void input_w(u8 data); + u8 input_r(); void grobot9(machine_config &config); }; // handlers -WRITE8_MEMBER(grobot9_state::lamps_w) +void grobot9_state::lamps_w(offs_t offset, u8 data) { if (offset == PORTE) { @@ -2140,13 +2140,13 @@ WRITE8_MEMBER(grobot9_state::lamps_w) m_display->matrix(1, m_port[PORTD] | m_port[PORTF] << 4 | m_port[PORTE] << 8); } -WRITE8_MEMBER(grobot9_state::input_w) +void grobot9_state::input_w(u8 data) { // C012: input mux low m_inp_mux = (m_inp_mux & 8) | (data & 7); } -READ8_MEMBER(grobot9_state::input_r) +u8 grobot9_state::input_r() { // A: multiplexed inputs return read_inputs(5); @@ -2235,8 +2235,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); void tccombat(machine_config &config); }; @@ -2249,7 +2249,7 @@ void tccombat_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(tccombat_state::grid_w) +void tccombat_state::grid_w(offs_t offset, u8 data) { // I1: speaker out if (offset == PORTI) @@ -2261,7 +2261,7 @@ WRITE8_MEMBER(tccombat_state::grid_w) update_display(); } -WRITE8_MEMBER(tccombat_state::plate_w) +void tccombat_state::plate_w(offs_t offset, u8 data) { // E,F123,G,H: vfd plate int shift = (offset - PORTE) * 4; @@ -2345,10 +2345,10 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); - DECLARE_WRITE8_MEMBER(port_e_w); - DECLARE_READ8_MEMBER(input_r); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); + void port_e_w(u8 data); + u8 input_r(offs_t offset); void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(difficulty_switch) { set_clock(); } @@ -2379,7 +2379,7 @@ void tmtennis_state::update_display() m_display->matrix(m_grid, m_plate); } -WRITE8_MEMBER(tmtennis_state::grid_w) +void tmtennis_state::grid_w(offs_t offset, u8 data) { // G,H,I: vfd grid int shift = (offset - PORTG) * 4; @@ -2387,7 +2387,7 @@ WRITE8_MEMBER(tmtennis_state::grid_w) update_display(); } -WRITE8_MEMBER(tmtennis_state::plate_w) +void tmtennis_state::plate_w(offs_t offset, u8 data) { // C,D,F: vfd plate int shift = (offset == PORTF) ? 8 : (offset - PORTC) * 4; @@ -2395,7 +2395,7 @@ WRITE8_MEMBER(tmtennis_state::plate_w) update_display(); } -WRITE8_MEMBER(tmtennis_state::port_e_w) +void tmtennis_state::port_e_w(u8 data) { // E01: input mux // E2: speaker out @@ -2404,7 +2404,7 @@ WRITE8_MEMBER(tmtennis_state::port_e_w) m_speaker->level_w(data >> 2 & 1); } -READ8_MEMBER(tmtennis_state::input_r) +u8 tmtennis_state::input_r(offs_t offset) { // A,B: multiplexed buttons return ~read_inputs(2) >> (offset*4); @@ -2519,8 +2519,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); void tmpacman(machine_config &config); }; @@ -2533,7 +2533,7 @@ void tmpacman_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(tmpacman_state::grid_w) +void tmpacman_state::grid_w(offs_t offset, u8 data) { // C,D: vfd grid int shift = (offset - PORTC) * 4; @@ -2541,7 +2541,7 @@ WRITE8_MEMBER(tmpacman_state::grid_w) update_display(); } -WRITE8_MEMBER(tmpacman_state::plate_w) +void tmpacman_state::plate_w(offs_t offset, u8 data) { // E1: speaker out if (offset == PORTE) @@ -2634,8 +2634,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); void tmscramb(machine_config &config); }; @@ -2647,7 +2647,7 @@ void tmscramb_state::update_display() m_display->matrix(m_grid, plate); } -WRITE8_MEMBER(tmscramb_state::grid_w) +void tmscramb_state::grid_w(offs_t offset, u8 data) { // I2: speaker out if (offset == PORTI) @@ -2659,7 +2659,7 @@ WRITE8_MEMBER(tmscramb_state::grid_w) update_display(); } -WRITE8_MEMBER(tmscramb_state::plate_w) +void tmscramb_state::plate_w(offs_t offset, u8 data) { // E,F,G,H: vfd plate int shift = (offset - PORTE) * 4; @@ -2746,8 +2746,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(grid_w); - DECLARE_WRITE8_MEMBER(plate_w); + void grid_w(offs_t offset, u8 data); + void plate_w(offs_t offset, u8 data); void tcaveman(machine_config &config); }; @@ -2760,7 +2760,7 @@ void tcaveman_state::update_display() m_display->matrix(grid, plate); } -WRITE8_MEMBER(tcaveman_state::grid_w) +void tcaveman_state::grid_w(offs_t offset, u8 data) { // C,D: vfd grid int shift = (offset - PORTC) * 4; @@ -2768,7 +2768,7 @@ WRITE8_MEMBER(tcaveman_state::grid_w) update_display(); } -WRITE8_MEMBER(tcaveman_state::plate_w) +void tcaveman_state::plate_w(offs_t offset, u8 data) { // E3: speaker out if (offset == PORTE) @@ -2855,14 +2855,14 @@ public: hh_ucom4_state(mconfig, type, tag) { } - DECLARE_WRITE8_MEMBER(output_w); - DECLARE_READ8_MEMBER(input_r); + void output_w(offs_t offset, u8 data); + u8 input_r(); void alnchase(machine_config &config); }; // handlers -WRITE8_MEMBER(alnchase_state::output_w) +void alnchase_state::output_w(offs_t offset, u8 data) { if (offset <= PORTE) { @@ -2889,7 +2889,7 @@ WRITE8_MEMBER(alnchase_state::output_w) m_display->matrix(m_grid, m_plate); } -READ8_MEMBER(alnchase_state::input_r) +u8 alnchase_state::input_r() { // A: multiplexed buttons return read_inputs(2); diff --git a/src/mame/drivers/hng64.cpp b/src/mame/drivers/hng64.cpp index bb0bdd6406f..c42ae48fa77 100644 --- a/src/mame/drivers/hng64.cpp +++ b/src/mame/drivers/hng64.cpp @@ -1819,7 +1819,7 @@ void hng64_state::machine_reset() ***********************************************/ -WRITE8_MEMBER(hng64_state::ioport1_w) +void hng64_state::ioport1_w(uint8_t data) { //LOG("%s: ioport1_w %02x\n", machine().describe_context(), data); @@ -1840,18 +1840,18 @@ WRITE8_MEMBER(hng64_state::ioport1_w) } // it does write 0xff here before each set of reading, but before setting a new output address? -WRITE8_MEMBER(hng64_state::ioport3_w) +void hng64_state::ioport3_w(uint8_t data) { if (m_port1 & 0x08) // 0x08 in port1 enables write? otherwise it writes 0xff to port 7 all the time, when port 7 is also lamps { int addr = (m_port1 & 0xe0) >> 5; - m_lamps->lamps_w(space, addr, data); + m_lamps->lamps_w(addr, data); } } -READ8_MEMBER(hng64_state::ioport3_r) +uint8_t hng64_state::ioport3_r() { int addr = (m_port1&0xe0)>>5; @@ -1872,7 +1872,7 @@ void hng64_lamps_device::device_start() m_lamps_out_cb.resolve_all_safe(); } -WRITE8_MEMBER(hng64_state::hng64_drive_lamps7_w) +void hng64_state::hng64_drive_lamps7_w(uint8_t data) { /* 0x80 - BGM Select #2 (Active High) @@ -1886,7 +1886,7 @@ WRITE8_MEMBER(hng64_state::hng64_drive_lamps7_w) */ } -WRITE8_MEMBER(hng64_state::hng64_drive_lamps6_w) +void hng64_state::hng64_drive_lamps6_w(uint8_t data) { /* 0x80 - BGM Select #4 (Active High) @@ -1901,12 +1901,12 @@ WRITE8_MEMBER(hng64_state::hng64_drive_lamps6_w) machine().bookkeeping().coin_counter_w(0, data & 0x01); } -WRITE8_MEMBER(hng64_state::hng64_drive_lamps5_w) +void hng64_state::hng64_drive_lamps5_w(uint8_t data) { // force feedback steering position } -WRITE8_MEMBER(hng64_state::hng64_shoot_lamps7_w) +void hng64_state::hng64_shoot_lamps7_w(uint8_t data) { /* 0x80 @@ -1930,7 +1930,7 @@ WRITE8_MEMBER(hng64_state::hng64_shoot_lamps7_w) 0x00004000 gun #3 */ -WRITE8_MEMBER(hng64_state::hng64_shoot_lamps6_w) +void hng64_state::hng64_shoot_lamps6_w(uint8_t data) { // Start Lamp #1 / #2 don't get written to the output port, is this a TLCS870 bug or are they not connected to the 'lamp' outputs, they do get written to the DP ram, see above notes /* @@ -1945,7 +1945,7 @@ WRITE8_MEMBER(hng64_state::hng64_shoot_lamps6_w) */ } -WRITE8_MEMBER(hng64_state::hng64_fight_lamps6_w) +void hng64_state::hng64_fight_lamps6_w(uint8_t data) { /* 0x80 @@ -1968,7 +1968,7 @@ WRITE8_MEMBER(hng64_state::hng64_fight_lamps6_w) ***********************************************/ -WRITE8_MEMBER(hng64_state::ioport7_w) +void hng64_state::ioport7_w(uint8_t data) { /* Port bits @@ -2012,7 +2012,7 @@ WRITE8_MEMBER(hng64_state::ioport7_w) m_port7 = data; } -READ8_MEMBER(hng64_state::ioport0_r) +uint8_t hng64_state::ioport0_r() { uint16_t addr = (m_ex_ramaddr | (m_ex_ramaddr_upper<<9)) & 0x7ff; uint8_t ret = m_dt71321_dpram->left_r(addr); @@ -2021,7 +2021,7 @@ READ8_MEMBER(hng64_state::ioport0_r) return ret; } -WRITE8_MEMBER(hng64_state::ioport0_w) +void hng64_state::ioport0_w(uint8_t data) { uint16_t addr = (m_ex_ramaddr | (m_ex_ramaddr_upper<<9)) & 0x7ff; m_dt71321_dpram->left_w(addr, data); @@ -2039,7 +2039,7 @@ WRITE8_MEMBER(hng64_state::ioport0_w) /* This port is dual purpose, with the upper pins being used as a serial input / output / clock etc. and the output latch (written data) being configured appropriately however the lower 2 bits also seem to be used maybe these lower 2 bits were intended for serial comms LEDs, although none are documented in the PCB layouts. */ -WRITE8_MEMBER(hng64_state::ioport4_w) +void hng64_state::ioport4_w(uint8_t data) { LOG("%s: ioport4_w %02x\n", machine().describe_context(), data); } @@ -2050,14 +2050,14 @@ WRITE8_MEMBER(hng64_state::ioport4_w) ***********************************************/ -READ8_MEMBER(hng64_state::anport0_r) { return m_an_in[0]->read(); } -READ8_MEMBER(hng64_state::anport1_r) { return m_an_in[1]->read(); } -READ8_MEMBER(hng64_state::anport2_r) { return m_an_in[2]->read(); } -READ8_MEMBER(hng64_state::anport3_r) { return m_an_in[3]->read(); } -READ8_MEMBER(hng64_state::anport4_r) { return m_an_in[4]->read(); } -READ8_MEMBER(hng64_state::anport5_r) { return m_an_in[5]->read(); } -READ8_MEMBER(hng64_state::anport6_r) { return m_an_in[6]->read(); } -READ8_MEMBER(hng64_state::anport7_r) { return m_an_in[7]->read(); } +uint8_t hng64_state::anport0_r() { return m_an_in[0]->read(); } +uint8_t hng64_state::anport1_r() { return m_an_in[1]->read(); } +uint8_t hng64_state::anport2_r() { return m_an_in[2]->read(); } +uint8_t hng64_state::anport3_r() { return m_an_in[3]->read(); } +uint8_t hng64_state::anport4_r() { return m_an_in[4]->read(); } +uint8_t hng64_state::anport5_r() { return m_an_in[5]->read(); } +uint8_t hng64_state::anport6_r() { return m_an_in[6]->read(); } +uint8_t hng64_state::anport7_r() { return m_an_in[7]->read(); } /*********************************************** diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp index 97573e6f3a7..f6b902da5ff 100644 --- a/src/mame/drivers/ibmpcjr.cpp +++ b/src/mame/drivers/ibmpcjr.cpp @@ -70,8 +70,8 @@ private: DECLARE_READ8_MEMBER(pcjr_nmi_enable_r); DECLARE_WRITE_LINE_MEMBER(pic8259_set_int_line); - DECLARE_WRITE8_MEMBER(pcjr_ppi_portb_w); - DECLARE_READ8_MEMBER(pcjr_ppi_portc_r); + void pcjr_ppi_portb_w(uint8_t data); + uint8_t pcjr_ppi_portc_r(); DECLARE_WRITE8_MEMBER(pcjr_fdc_dor_w); DECLARE_READ8_MEMBER(pcjx_port_1ff_r); DECLARE_WRITE8_MEMBER(pcjx_port_1ff_w); @@ -323,7 +323,7 @@ WRITE8_MEMBER(pcjr_state::pc_nmi_enable_w) m_maincpu->set_input_line(INPUT_LINE_NMI, m_nmi_enabled && m_latch); } -WRITE8_MEMBER(pcjr_state::pcjr_ppi_portb_w) +void pcjr_state::pcjr_ppi_portb_w(uint8_t data) { /* KB controller port B */ m_ppi_portb = data; @@ -345,7 +345,7 @@ WRITE8_MEMBER(pcjr_state::pcjr_ppi_portb_w) * PC6 - KYBD IN * PC7 - (keyboard) CABLE CONNECTED */ -READ8_MEMBER(pcjr_state::pcjr_ppi_portc_r) +uint8_t pcjr_state::pcjr_ppi_portc_r() { int data=0xff; diff --git a/src/mame/drivers/m24.cpp b/src/mame/drivers/m24.cpp index 14337300a33..2ddf54dcbd7 100644 --- a/src/mame/drivers/m24.cpp +++ b/src/mame/drivers/m24.cpp @@ -121,8 +121,8 @@ private: u8 m_pa, m_kbcin, m_kbcout; bool m_kbcibf, m_kbdata, m_i86_halt, m_i86_halt_perm; - DECLARE_READ8_MEMBER(pa_r); - DECLARE_WRITE8_MEMBER(pb_w); + u8 pa_r(); + void pb_w(u8 data); DECLARE_READ8_MEMBER(kbcdata_r); DECLARE_WRITE8_MEMBER(kbcdata_w); DECLARE_WRITE_LINE_MEMBER(kbcin_w); @@ -395,12 +395,12 @@ void m24_state::update_nmi() m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -READ8_MEMBER(m24_state::pa_r) +u8 m24_state::pa_r() { return m_pa & (m_kbdata ? 0xff : 0xfd); } -WRITE8_MEMBER(m24_state::pb_w) +void m24_state::pb_w(u8 data) { m_keyboard->clock_w(!BIT(data, 0)); m_keyboard->data_w(!BIT(data, 1)); diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp index 4d29790d821..f48110198a2 100644 --- a/src/mame/drivers/m5.cpp +++ b/src/mame/drivers/m5.cpp @@ -887,12 +887,12 @@ WRITE_LINE_MEMBER(m5_state::sordm5_video_interrupt_callback) // I8255 Interface //------------------------------------------------- -READ8_MEMBER( m5_state::ppi_pa_r ) +uint8_t m5_state::ppi_pa_r() { return m_fd5_data; } -READ8_MEMBER(m5_state::ppi_pc_r ) +uint8_t m5_state::ppi_pc_r() { /* @@ -919,12 +919,12 @@ READ8_MEMBER(m5_state::ppi_pc_r ) ); } -WRITE8_MEMBER( m5_state::ppi_pa_w ) +void m5_state::ppi_pa_w(uint8_t data) { m_fd5_data = data; } -WRITE8_MEMBER( m5_state::ppi_pb_w ) +void m5_state::ppi_pb_w(uint8_t data) { /* @@ -948,7 +948,7 @@ WRITE8_MEMBER( m5_state::ppi_pb_w ) } } -WRITE8_MEMBER( m5_state::ppi_pc_w ) +void m5_state::ppi_pc_w(uint8_t data) { /* diff --git a/src/mame/drivers/mario.cpp b/src/mame/drivers/mario.cpp index 6349f290ec1..ca897d0563a 100644 --- a/src/mame/drivers/mario.cpp +++ b/src/mame/drivers/mario.cpp @@ -106,13 +106,13 @@ write: * *************************************/ -READ8_MEMBER(mario_state::memory_read_byte) +uint8_t mario_state::memory_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); return prog_space.read_byte(offset); } -WRITE8_MEMBER(mario_state::memory_write_byte) +void mario_state::memory_write_byte(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); return prog_space.write_byte(offset, data); diff --git a/src/mame/drivers/mbc200.cpp b/src/mame/drivers/mbc200.cpp index 07ef1b84754..c1b04c1340d 100644 --- a/src/mame/drivers/mbc200.cpp +++ b/src/mame/drivers/mbc200.cpp @@ -78,10 +78,10 @@ public: void mbc200(machine_config &config); private: - DECLARE_READ8_MEMBER(p2_porta_r); - DECLARE_WRITE8_MEMBER(p1_portc_w); - DECLARE_WRITE8_MEMBER(pm_porta_w); - DECLARE_WRITE8_MEMBER(pm_portb_w); + uint8_t p2_porta_r(); + void p1_portc_w(uint8_t data); + void pm_porta_w(uint8_t data); + void pm_portb_w(uint8_t data); DECLARE_READ8_MEMBER(keyboard_r); void kbd_put(u8 data); MC6845_UPDATE_ROW(update_row); @@ -115,19 +115,19 @@ void mbc200_state::mbc200_mem(address_map &map) map(0x1000, 0xffff).ram(); } -WRITE8_MEMBER( mbc200_state::p1_portc_w ) +void mbc200_state::p1_portc_w(uint8_t data) { m_speaker->level_w(BIT(data,4)); // used by beep command in basic } -WRITE8_MEMBER( mbc200_state::pm_porta_w ) +void mbc200_state::pm_porta_w(uint8_t data) { machine().scheduler().synchronize(); // force resync //printf("A %02x %c\n",data,data); m_comm_latch = data; // to slave CPU } -WRITE8_MEMBER( mbc200_state::pm_portb_w ) +void mbc200_state::pm_portb_w(uint8_t data) { floppy_image_device *floppy = nullptr; @@ -169,7 +169,7 @@ void mbc200_state::mbc200_sub_mem(address_map &map) map(0x8000, 0xffff).ram().share("vram"); } -READ8_MEMBER(mbc200_state::p2_porta_r) +uint8_t mbc200_state::p2_porta_r() { machine().scheduler().synchronize(); // force resync uint8_t tmp = m_comm_latch; diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp index a93b14bf927..fe4b6825491 100644 --- a/src/mame/drivers/mekd2.cpp +++ b/src/mame/drivers/mekd2.cpp @@ -108,10 +108,10 @@ public: private: DECLARE_READ_LINE_MEMBER(mekd2_key40_r); - DECLARE_READ8_MEMBER(mekd2_key_r); + uint8_t mekd2_key_r(); DECLARE_WRITE_LINE_MEMBER(mekd2_nmi_w); - DECLARE_WRITE8_MEMBER(mekd2_digit_w); - DECLARE_WRITE8_MEMBER(mekd2_segment_w); + void mekd2_digit_w(uint8_t data); + void mekd2_segment_w(uint8_t data); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); TIMER_DEVICE_CALLBACK_MEMBER(kansas_w); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); @@ -237,7 +237,7 @@ READ_LINE_MEMBER( mekd2_state::mekd2_key40_r ) return BIT(m_keydata, 6); } -READ8_MEMBER( mekd2_state::mekd2_key_r ) +uint8_t mekd2_state::mekd2_key_r() { char kbdrow[4]; uint8_t i; @@ -275,17 +275,16 @@ READ8_MEMBER( mekd2_state::mekd2_key_r ) ************************************************************/ -WRITE8_MEMBER( mekd2_state::mekd2_segment_w ) +void mekd2_state::mekd2_segment_w(uint8_t data) { m_segment = data & 0x7f; } -WRITE8_MEMBER( mekd2_state::mekd2_digit_w ) +void mekd2_state::mekd2_digit_w(uint8_t data) { - uint8_t i; if (data < 0x3f) { - for (i = 0; i < 6; i++) + for (uint8_t i = 0; i < 6; i++) { if (BIT(data, i)) m_digits[i] = ~m_segment & 0x7f; diff --git a/src/mame/drivers/mekd3.cpp b/src/mame/drivers/mekd3.cpp index 1400fb585f2..aed68ab06ad 100644 --- a/src/mame/drivers/mekd3.cpp +++ b/src/mame/drivers/mekd3.cpp @@ -178,13 +178,13 @@ public: private: DECLARE_READ_LINE_MEMBER(keypad_cb1_r); - DECLARE_READ8_MEMBER(keypad_key_r); - DECLARE_WRITE8_MEMBER(led_digit_w); - DECLARE_WRITE8_MEMBER(led_segment_w); + uint8_t keypad_key_r(); + void led_digit_w(uint8_t data); + void led_segment_w(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(led_update); - DECLARE_WRITE8_MEMBER(page_w); - DECLARE_WRITE8_MEMBER(trace_timer_w); - DECLARE_READ8_MEMBER(trace_timer_r); + void page_w(uint8_t data); + void trace_timer_w(uint8_t data); + uint8_t trace_timer_r(); required_device<m6802_cpu_device> m_maincpu; required_device<ram_device> m_ram; @@ -230,7 +230,7 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); DECLARE_WRITE_LINE_MEMBER(acia_cas_clock300_w); DECLARE_WRITE_LINE_MEMBER(acia_cas_clock1200_w); - DECLARE_READ8_MEMBER(pia_io2a_r); + uint8_t pia_io2a_r(); required_device<pia6821_device> m_pia_io1; required_device<pia6821_device> m_pia_io2; @@ -249,8 +249,8 @@ private: // MEK68R2 MC6845_UPDATE_ROW(update_row); - DECLARE_READ8_MEMBER(r2_pia_pa_r); - DECLARE_READ8_MEMBER(r2_pia_pb_r); + uint8_t r2_pia_pa_r(); + uint8_t r2_pia_pb_r(); DECLARE_WRITE_LINE_MEMBER(r2_hsync_changed); DECLARE_WRITE_LINE_MEMBER(r2_vsync_changed); DECLARE_READ_LINE_MEMBER(r2_pia_cb1_r); @@ -456,7 +456,7 @@ INPUT_PORTS_END ************************************************************/ -WRITE8_MEMBER(mekd3_state::page_w) +void mekd3_state::page_w(uint8_t data) { m_rom_page = data & 0x07; // TODO switch the ROM bank entry. @@ -470,13 +470,13 @@ WRITE8_MEMBER(mekd3_state::page_w) ************************************************************/ -WRITE8_MEMBER(mekd3_state::trace_timer_w) +void mekd3_state::trace_timer_w(uint8_t data) { m_trace = data; m_kpd_pia->ca1_w(data); } -READ8_MEMBER(mekd3_state::trace_timer_r) +uint8_t mekd3_state::trace_timer_r() { return m_trace; } @@ -529,7 +529,7 @@ READ_LINE_MEMBER(mekd3_state::keypad_cb1_r) return mekd3_state::keypad_key_pressed(); } -READ8_MEMBER(mekd3_state::keypad_key_r) +uint8_t mekd3_state::keypad_key_r() { uint8_t mux = (m_digit & 0xc0) >> 6; uint8_t i = (m_keypad_columns[mux]->read() & m_digit) ? 0 : 0x80; @@ -544,14 +544,14 @@ READ8_MEMBER(mekd3_state::keypad_key_r) ************************************************************/ // PA -WRITE8_MEMBER(mekd3_state::led_segment_w) +void mekd3_state::led_segment_w(uint8_t data) { m_segment = data & 0x7f; m_display->matrix(m_digit, m_segment); } // PB -WRITE8_MEMBER(mekd3_state::led_digit_w) +void mekd3_state::led_digit_w(uint8_t data) { m_digit = data; m_display->matrix(m_digit, m_segment); @@ -749,7 +749,7 @@ WRITE_LINE_MEMBER(mekd3_state::acia_cas_clock1200_w) m_acia_cas->write_rxc(state); } -READ8_MEMBER(mekd3_state::pia_io2a_r) +uint8_t mekd3_state::pia_io2a_r() { uint32_t console_enable = m_console_enable->read(); @@ -786,7 +786,7 @@ void mekd3_state::kbd_put(uint8_t data) // PA0 to PA6 - Keyboard data. // PA7 - Display nationality, 0 USA, 1 Europe. -READ8_MEMBER(mekd3_state::r2_pia_pa_r) +uint8_t mekd3_state::r2_pia_pa_r() { uint8_t ret = m_term_data; int8_t display_nationality = m_r2_display_nationality->read(); @@ -803,7 +803,7 @@ READ8_MEMBER(mekd3_state::r2_pia_pa_r) // 01 - 16 lines of 64 characters. // 10 - 20 lines of 80 characters. // 11 - User defined. -READ8_MEMBER(mekd3_state::r2_pia_pb_r) +uint8_t mekd3_state::r2_pia_pb_r() { int8_t display_format = m_r2_display_format->read(); int8_t mode = m_r2_mode->read(); diff --git a/src/mame/drivers/mekd4.cpp b/src/mame/drivers/mekd4.cpp index 3a77846d955..1b0828f1c47 100644 --- a/src/mame/drivers/mekd4.cpp +++ b/src/mame/drivers/mekd4.cpp @@ -303,14 +303,14 @@ public: DECLARE_INPUT_CHANGED_MEMBER(rs232_dcd_route_change); private: - DECLARE_READ8_MEMBER(main_r); - DECLARE_WRITE8_MEMBER(main_w); - DECLARE_READ8_MEMBER(config_r); - DECLARE_WRITE8_MEMBER(page_w); - DECLARE_READ8_MEMBER(stop_pia_r); - DECLARE_WRITE8_MEMBER(stop_pia_w); - DECLARE_WRITE8_MEMBER(stop_pia_pa_w); - DECLARE_WRITE8_MEMBER(stop_pia_pb_w); + uint8_t main_r(offs_t offset); + void main_w(offs_t offset, uint8_t data); + uint8_t config_r(); + void page_w(uint8_t data); + uint8_t stop_pia_r(offs_t offset); + void stop_pia_w(offs_t offset, uint8_t data); + void stop_pia_pa_w(uint8_t data); + void stop_pia_pb_w(uint8_t data); DECLARE_READ_LINE_MEMBER(stop_pia_ca2_r); uint16_t m_stop_address; @@ -326,9 +326,9 @@ private: DECLARE_WRITE_LINE_MEMBER(write_f13_clock); DECLARE_READ_LINE_MEMBER(keypad_cb1_r); - DECLARE_READ8_MEMBER(keypad_key_r); - DECLARE_WRITE8_MEMBER(led_digit_w); - DECLARE_WRITE8_MEMBER(led_segment_w); + uint8_t keypad_key_r(); + void led_digit_w(uint8_t data); + void led_segment_w(uint8_t data); DECLARE_READ_LINE_MEMBER(stop_pia_cb1_r); DECLARE_WRITE_LINE_MEMBER(stop_pia_cb2_w); @@ -368,8 +368,8 @@ private: // MEK68R2 MC6845_UPDATE_ROW(update_row); - DECLARE_READ8_MEMBER(r2_pia_pa_r); - DECLARE_READ8_MEMBER(r2_pia_pb_r); + uint8_t r2_pia_pa_r(); + uint8_t r2_pia_pb_r(); DECLARE_WRITE_LINE_MEMBER(r2_hsync_changed); DECLARE_WRITE_LINE_MEMBER(r2_vsync_changed); DECLARE_READ_LINE_MEMBER(r2_pia_cb1_r); @@ -550,7 +550,7 @@ INPUT_PORTS_END ************************************************************/ -READ8_MEMBER(mekd4_state::main_r) +uint8_t mekd4_state::main_r(offs_t offset) { if (offset == m_stop_address && !machine().side_effects_disabled()) { @@ -561,7 +561,7 @@ READ8_MEMBER(mekd4_state::main_r) return m_banked_space->read_byte(offset); } -WRITE8_MEMBER(mekd4_state::main_w) +void mekd4_state::main_w(offs_t offset, uint8_t data) { if (offset == m_stop_address && !machine().side_effects_disabled()) { @@ -572,33 +572,33 @@ WRITE8_MEMBER(mekd4_state::main_w) m_banked_space->write_byte(offset, data); } -READ8_MEMBER(mekd4_state::config_r) +uint8_t mekd4_state::config_r() { return 0xf0 | m_jumper1->read(); } // The design reversed the A0 and A1 lines so that // a 16 bit write could write both data addresses. -READ8_MEMBER(mekd4_state::stop_pia_r) +uint8_t mekd4_state::stop_pia_r(offs_t offset) { // Reverse the A0 and A1 address lines; int8_t reversed = BIT(offset, 0) << 1 | BIT(offset, 1); return m_stop_pia->read(reversed); } -WRITE8_MEMBER(mekd4_state::stop_pia_w) +void mekd4_state::stop_pia_w(offs_t offset, uint8_t data) { // Reverse the A0 and A1 address lines; int8_t reversed = BIT(offset, 0) << 1 | BIT(offset, 1); m_stop_pia->write(reversed, data); } -WRITE8_MEMBER(mekd4_state::stop_pia_pa_w) +void mekd4_state::stop_pia_pa_w(uint8_t data) { m_stop_address = (m_stop_address & 0x00ff) | (data << 8); } -WRITE8_MEMBER(mekd4_state::stop_pia_pb_w) +void mekd4_state::stop_pia_pb_w(uint8_t data) { m_stop_address = (m_stop_address & 0xff00) | data; } @@ -615,7 +615,7 @@ READ_LINE_MEMBER(mekd4_state::stop_pia_ca2_r) ************************************************************/ -WRITE8_MEMBER(mekd4_state::page_w) +void mekd4_state::page_w(uint8_t data) { m_rom_page = data & 0x07; m_ram_page = (data >> 4) & 0x07; @@ -652,7 +652,7 @@ READ_LINE_MEMBER(mekd4_state::keypad_cb1_r) return mekd4_state::keypad_key_pressed(); } -READ8_MEMBER(mekd4_state::keypad_key_r) +uint8_t mekd4_state::keypad_key_r() { uint8_t mux = (m_digit & 0xc0) >> 6; uint8_t i = (m_keypad_columns[mux]->read() & m_digit) ? 0 : 0x80; @@ -667,14 +667,14 @@ READ8_MEMBER(mekd4_state::keypad_key_r) ************************************************************/ // PA -WRITE8_MEMBER(mekd4_state::led_segment_w) +void mekd4_state::led_segment_w(uint8_t data) { m_segment = data & 0x7f; m_display->matrix(m_digit, ~m_segment); } // PB -WRITE8_MEMBER(mekd4_state::led_digit_w) +void mekd4_state::led_digit_w(uint8_t data) { m_digit = data; m_display->matrix(m_digit, ~m_segment); @@ -818,7 +818,7 @@ void mekd4_state::kbd_put(uint8_t data) // PA0 to PA6 - Keyboard data. // PA7 - Display nationality, 0 USA, 1 Europe. -READ8_MEMBER(mekd4_state::r2_pia_pa_r) +uint8_t mekd4_state::r2_pia_pa_r() { uint8_t ret = m_term_data; int8_t display_nationality = m_r2_display_nationality->read(); @@ -835,7 +835,7 @@ READ8_MEMBER(mekd4_state::r2_pia_pa_r) // 01 - 16 lines of 64 characters. // 10 - 20 lines of 80 characters. // 11 - User defined. -READ8_MEMBER(mekd4_state::r2_pia_pb_r) +uint8_t mekd4_state::r2_pia_pb_r() { int8_t display_format = m_r2_display_format->read(); int8_t mode = m_r2_mode->read(); diff --git a/src/mame/drivers/mekd5.cpp b/src/mame/drivers/mekd5.cpp index 840b8ea27bc..284b2d30eda 100644 --- a/src/mame/drivers/mekd5.cpp +++ b/src/mame/drivers/mekd5.cpp @@ -122,9 +122,9 @@ private: DECLARE_WRITE_LINE_MEMBER(trace_timer_clear_w); DECLARE_READ_LINE_MEMBER(keypad_cb1_r); - DECLARE_READ8_MEMBER(keypad_key_r); - DECLARE_WRITE8_MEMBER(led_digit_w); - DECLARE_WRITE8_MEMBER(led_segment_w); + uint8_t keypad_key_r(); + void led_digit_w(uint8_t data); + void led_segment_w(uint8_t data); DECLARE_READ_LINE_MEMBER(kansas_r); // Clocks @@ -310,7 +310,7 @@ READ_LINE_MEMBER(mekd5_state::keypad_cb1_r) return mekd5_state::keypad_key_pressed(); } -READ8_MEMBER(mekd5_state::keypad_key_r) +uint8_t mekd5_state::keypad_key_r() { uint8_t view = machine().render().first_target()->view(); if (view > 1) return m_segment; @@ -328,14 +328,14 @@ READ8_MEMBER(mekd5_state::keypad_key_r) ************************************************************/ // PA -WRITE8_MEMBER(mekd5_state::led_segment_w) +void mekd5_state::led_segment_w(uint8_t data) { m_segment = data & 0x7f; m_display->matrix(m_digit & 0x3f, ~m_segment); } // PB -WRITE8_MEMBER(mekd5_state::led_digit_w) +void mekd5_state::led_digit_w(uint8_t data) { m_digit = data; m_display->matrix(m_digit & 0x3f, ~m_segment); diff --git a/src/mame/drivers/mikromik.cpp b/src/mame/drivers/mikromik.cpp index a6d40dbebcc..75c4f6fa5dd 100644 --- a/src/mame/drivers/mikromik.cpp +++ b/src/mame/drivers/mikromik.cpp @@ -83,7 +83,7 @@ // read - //------------------------------------------------- -READ8_MEMBER( mm1_state::read ) +uint8_t mm1_state::read(offs_t offset) { uint8_t data = 0; uint8_t mmu = m_mmu_rom->base()[(m_a8 << 8) | (offset >> 8)]; @@ -117,7 +117,7 @@ READ8_MEMBER( mm1_state::read ) // write - //------------------------------------------------- -WRITE8_MEMBER( mm1_state::write ) +void mm1_state::write(offs_t offset, uint8_t data) { uint8_t mmu = m_mmu_rom->base()[(m_a8 << 8) | (offset >> 8)]; @@ -295,7 +295,7 @@ WRITE_LINE_MEMBER( mm1_state::dma_hrq_w ) m_dmac->hack_w(state); } -READ8_MEMBER( mm1_state::mpsc_dack_r ) +uint8_t mm1_state::mpsc_dack_r() { // clear data request m_dmac->dreq2_w(CLEAR_LINE); @@ -303,7 +303,7 @@ READ8_MEMBER( mm1_state::mpsc_dack_r ) return 1;//m_mpsc->dtra_r(); } -WRITE8_MEMBER( mm1_state::mpsc_dack_w ) +void mm1_state::mpsc_dack_w(uint8_t data) { //m_mpsc->hai_w(data); diff --git a/src/mame/drivers/monty.cpp b/src/mame/drivers/monty.cpp index dfe1366644e..f242a81fc0f 100644 --- a/src/mame/drivers/monty.cpp +++ b/src/mame/drivers/monty.cpp @@ -76,7 +76,7 @@ private: u32 screen_update(screen_device& screen, bitmap_rgb32& bitmap, const rectangle& cliprect); DECLARE_WRITE8_MEMBER(control_w); - DECLARE_WRITE8_MEMBER(lcd_w) { m_lcd[m_lcd_cs]->write(offset, data); } + void lcd_w(offs_t offset, u8 data) { m_lcd[m_lcd_cs]->write(offset, data); } DECLARE_WRITE_LINE_MEMBER(halt_changed) { m_halt = state; } u64 m_lcd_data[32]; diff --git a/src/mame/drivers/monzagp.cpp b/src/mame/drivers/monzagp.cpp index 074edd9f8a5..955f812391a 100644 --- a/src/mame/drivers/monzagp.cpp +++ b/src/mame/drivers/monzagp.cpp @@ -70,9 +70,9 @@ protected: private: DECLARE_READ8_MEMBER(port_r); DECLARE_WRITE8_MEMBER(port_w); - DECLARE_WRITE8_MEMBER(port1_w); - DECLARE_WRITE8_MEMBER(port2_w); - DECLARE_READ8_MEMBER(port2_r); + void port1_w(uint8_t data); + void port2_w(uint8_t data); + uint8_t port2_r(); TIMER_DEVICE_CALLBACK_MEMBER(time_tick_timer); void monzagp_palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -403,18 +403,18 @@ WRITE8_MEMBER(monzagp_state::port_w) } } -WRITE8_MEMBER(monzagp_state::port1_w) +void monzagp_state::port1_w(uint8_t data) { // printf("P1 %x = %x\n",m_maincpu->pc(),data); m_p1 = data; } -READ8_MEMBER(monzagp_state::port2_r) +uint8_t monzagp_state::port2_r() { return m_p2; } -WRITE8_MEMBER(monzagp_state::port2_w) +void monzagp_state::port2_w(uint8_t data) { // printf("P2 %x = %x\n",m_maincpu->pc(),data); m_p2 = data; diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp index eec49abcc2e..ee1192aeff5 100644 --- a/src/mame/drivers/mpf1.cpp +++ b/src/mame/drivers/mpf1.cpp @@ -256,7 +256,7 @@ TIMER_CALLBACK_MEMBER(mpf1_state::led_refresh) m_digits[digit] = param; } -READ8_MEMBER( mpf1_state::ppi_pa_r ) +uint8_t mpf1_state::ppi_pa_r() { uint8_t data = 0x7f; @@ -274,7 +274,7 @@ READ8_MEMBER( mpf1_state::ppi_pa_r ) return data; } -WRITE8_MEMBER( mpf1_state::ppi_pb_w ) +void mpf1_state::ppi_pb_w(uint8_t data) { /* swap bits around for the mame 7-segment emulation */ uint8_t led_data = bitswap<8>(data, 6, 1, 2, 0, 7, 5, 4, 3); @@ -283,7 +283,7 @@ WRITE8_MEMBER( mpf1_state::ppi_pb_w ) m_led_refresh_timer->adjust(attotime::from_usec(70), led_data); } -WRITE8_MEMBER( mpf1_state::ppi_pc_w ) +void mpf1_state::ppi_pc_w(uint8_t data) { /* bits 0-5, led select and keyboard latch */ m_lednum = data & 0x3f; @@ -304,7 +304,7 @@ WRITE8_MEMBER( mpf1_state::ppi_pc_w ) m_cassette->output( BIT(data, 7) ? 1.0 : -1.0); } -READ8_MEMBER(mpf1_state::step_r) +uint8_t mpf1_state::step_r(offs_t offset) { if (!m_break) { diff --git a/src/mame/drivers/mupid2.cpp b/src/mame/drivers/mupid2.cpp index 50c028176f3..8697a0435d1 100644 --- a/src/mame/drivers/mupid2.cpp +++ b/src/mame/drivers/mupid2.cpp @@ -51,10 +51,10 @@ private: DECLARE_WRITE8_MEMBER(port_a0_w); DECLARE_WRITE8_MEMBER(port_c0_w); template<int C> DECLARE_WRITE8_MEMBER(palette_w); - DECLARE_READ8_MEMBER(kbd_bus_r); - DECLARE_READ8_MEMBER(kbd_p1_r); - DECLARE_WRITE8_MEMBER(kbd_p1_w); - DECLARE_WRITE8_MEMBER(kbd_p2_w); + uint8_t kbd_bus_r(); + uint8_t kbd_p1_r(); + void kbd_p1_w(uint8_t data); + void kbd_p2_w(uint8_t data); void palette_init(palette_device &palette); @@ -110,24 +110,24 @@ void mupid2_state::kbdcpu_mem(address_map &map) INPUT_PORTS_START( mupid2 ) INPUT_PORTS_END -READ8_MEMBER(mupid2_state::kbd_bus_r) +uint8_t mupid2_state::kbd_bus_r() { // logerror("kbd_bus_r\n"); return 0xff; } -READ8_MEMBER(mupid2_state::kbd_p1_r) +uint8_t mupid2_state::kbd_p1_r() { // logerror("kbd_p1_r\n"); return 0xff; } -WRITE8_MEMBER(mupid2_state::kbd_p1_w) +void mupid2_state::kbd_p1_w(uint8_t data) { // logerror("kbd_p1_w: %02x\n", data); } -WRITE8_MEMBER(mupid2_state::kbd_p2_w) +void mupid2_state::kbd_p2_w(uint8_t data) { // logerror("kbd_p2_w: %02x\n", data); } diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp index f3f6873437a..6f3f9a58c99 100644 --- a/src/mame/drivers/mz2000.cpp +++ b/src/mame/drivers/mz2000.cpp @@ -123,15 +123,15 @@ private: uint32_t screen_update_mz2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_READ8_MEMBER(fdc_r); DECLARE_WRITE8_MEMBER(fdc_w); - DECLARE_READ8_MEMBER(mz2000_porta_r); - DECLARE_READ8_MEMBER(mz2000_portb_r); - DECLARE_READ8_MEMBER(mz2000_portc_r); - DECLARE_WRITE8_MEMBER(mz2000_porta_w); - DECLARE_WRITE8_MEMBER(mz2000_portb_w); - DECLARE_WRITE8_MEMBER(mz2000_portc_w); - DECLARE_WRITE8_MEMBER(mz2000_pio1_porta_w); - DECLARE_READ8_MEMBER(mz2000_pio1_portb_r); - DECLARE_READ8_MEMBER(mz2000_pio1_porta_r); + uint8_t mz2000_porta_r(); + uint8_t mz2000_portb_r(); + uint8_t mz2000_portc_r(); + void mz2000_porta_w(uint8_t data); + void mz2000_portb_w(uint8_t data); + void mz2000_portc_w(uint8_t data); + void mz2000_pio1_porta_w(uint8_t data); + uint8_t mz2000_pio1_portb_r(); + uint8_t mz2000_pio1_porta_r(); void mz2000_io(address_map &map); void mz2000_map(address_map &map); @@ -701,13 +701,13 @@ static GFXDECODE_START( gfx_mz2000 ) GFXDECODE_ENTRY( "chargen", 0x0800, mz2000_charlayout_16, 0, 1 ) GFXDECODE_END -READ8_MEMBER(mz2000_state::mz2000_porta_r) +uint8_t mz2000_state::mz2000_porta_r() { printf("A R\n"); return 0xff; } -READ8_MEMBER(mz2000_state::mz2000_portb_r) +uint8_t mz2000_state::mz2000_portb_r() { /* x--- ---- break key @@ -733,13 +733,13 @@ READ8_MEMBER(mz2000_state::mz2000_portb_r) return res; } -READ8_MEMBER(mz2000_state::mz2000_portc_r) +uint8_t mz2000_state::mz2000_portc_r() { printf("C R\n"); return 0xff; } -WRITE8_MEMBER(mz2000_state::mz2000_porta_w) +void mz2000_state::mz2000_porta_w(uint8_t data) { /* These are enabled thru a 0->1 transition @@ -798,14 +798,14 @@ WRITE8_MEMBER(mz2000_state::mz2000_porta_w) m_tape_ctrl = data; } -WRITE8_MEMBER(mz2000_state::mz2000_portb_w) +void mz2000_state::mz2000_portb_w(uint8_t data) { //printf("B W %02x\n",data); // ... } -WRITE8_MEMBER(mz2000_state::mz2000_portc_w) +void mz2000_state::mz2000_portc_w(uint8_t data) { /* x--- ---- tape data write @@ -833,7 +833,7 @@ WRITE8_MEMBER(mz2000_state::mz2000_portc_w) m_old_portc = data; } -WRITE8_MEMBER(mz2000_state::mz2000_pio1_porta_w) +void mz2000_state::mz2000_pio1_porta_w(uint8_t data) { m_tvram_enable = ((data & 0xc0) == 0xc0); m_gvram_enable = ((data & 0xc0) == 0x80); @@ -843,7 +843,7 @@ WRITE8_MEMBER(mz2000_state::mz2000_pio1_porta_w) m_porta_latch = data; } -READ8_MEMBER(mz2000_state::mz2000_pio1_portb_r) +uint8_t mz2000_state::mz2000_pio1_portb_r() { if(((m_key_mux & 0x10) == 0x00) || ((m_key_mux & 0x0f) == 0x0f)) //status read { @@ -859,7 +859,7 @@ READ8_MEMBER(mz2000_state::mz2000_pio1_portb_r) return m_io_keys[m_key_mux & 0xf]->read(); } -READ8_MEMBER(mz2000_state::mz2000_pio1_porta_r) +uint8_t mz2000_state::mz2000_pio1_porta_r() { return m_porta_latch; } diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp index 967b4cfc2bf..3898a1064e7 100644 --- a/src/mame/drivers/mz2500.cpp +++ b/src/mame/drivers/mz2500.cpp @@ -1599,14 +1599,14 @@ IRQ_CALLBACK_MEMBER(mz2500_state::mz2500_irq_ack) return 0; } -READ8_MEMBER(mz2500_state::mz2500_porta_r) +uint8_t mz2500_state::mz2500_porta_r() { logerror("PPI PORTA R\n"); return 0xff; } -READ8_MEMBER(mz2500_state::mz2500_portb_r) +uint8_t mz2500_state::mz2500_portb_r() { uint8_t vblank_bit; @@ -1615,24 +1615,24 @@ READ8_MEMBER(mz2500_state::mz2500_portb_r) return 0xfe | vblank_bit; } -READ8_MEMBER(mz2500_state::mz2500_portc_r) +uint8_t mz2500_state::mz2500_portc_r() { logerror("PPI PORTC R\n"); return 0xff; } -WRITE8_MEMBER(mz2500_state::mz2500_porta_w) +void mz2500_state::mz2500_porta_w(uint8_t data) { logerror("PPI PORTA W %02x\n",data); } -WRITE8_MEMBER(mz2500_state::mz2500_portb_w) +void mz2500_state::mz2500_portb_w(uint8_t data) { logerror("PPI PORTB W %02x\n",data); } -WRITE8_MEMBER(mz2500_state::mz2500_portc_w) +void mz2500_state::mz2500_portc_w(uint8_t data) { /* ---- x--- 0->1 transition = IPL reset @@ -1665,7 +1665,7 @@ WRITE8_MEMBER(mz2500_state::mz2500_portc_w) logerror("PPI PORTC W %02x\n",data & ~0x0f); } -WRITE8_MEMBER(mz2500_state::mz2500_pio1_porta_w) +void mz2500_state::mz2500_pio1_porta_w(uint8_t data) { // printf("%02x\n",data); @@ -1679,7 +1679,7 @@ WRITE8_MEMBER(mz2500_state::mz2500_pio1_porta_w) } -READ8_MEMBER(mz2500_state::mz2500_pio1_porta_r) +uint8_t mz2500_state::mz2500_pio1_porta_r() { static const char *const keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5", "KEY6", "KEY7", @@ -1705,18 +1705,18 @@ READ8_MEMBER(mz2500_state::mz2500_pio1_porta_r) } #if 0 -READ8_MEMBER(mz2500_state::mz2500_pio1_portb_r) +uint8_t mz2500_state::mz2500_pio1_portb_r() { return m_pio_latchb; } #endif -READ8_MEMBER(mz2500_state::opn_porta_r) +uint8_t mz2500_state::opn_porta_r() { return m_ym_porta; } -WRITE8_MEMBER(mz2500_state::opn_porta_w) +void mz2500_state::opn_porta_w(uint8_t data) { /* ---- x--- mouse select diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp index cbc069208b3..029dace8484 100644 --- a/src/mame/drivers/mz3500.cpp +++ b/src/mame/drivers/mz3500.cpp @@ -100,9 +100,9 @@ private: DECLARE_READ8_MEMBER(mz3500_fdc_r); DECLARE_WRITE8_MEMBER(mz3500_fdc_w); DECLARE_READ8_MEMBER(mz3500_fdc_dma_r); - DECLARE_WRITE8_MEMBER(mz3500_pa_w); - DECLARE_WRITE8_MEMBER(mz3500_pb_w); - DECLARE_WRITE8_MEMBER(mz3500_pc_w); + void mz3500_pa_w(uint8_t data); + void mz3500_pb_w(uint8_t data); + void mz3500_pc_w(uint8_t data); // screen updates uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -636,12 +636,12 @@ void mz3500_state::mz3500_slave_io(address_map &map) map(0x70, 0x71).rw(m_hgdc1, FUNC(upd7220_device::read), FUNC(upd7220_device::write)); } -WRITE8_MEMBER(mz3500_state::mz3500_pa_w) +void mz3500_state::mz3500_pa_w(uint8_t data) { // printer data } -WRITE8_MEMBER(mz3500_state::mz3500_pb_w) +void mz3500_state::mz3500_pb_w(uint8_t data) { /* x--- ---- CG select (ROM and/or upd7220 clock?) @@ -654,7 +654,7 @@ WRITE8_MEMBER(mz3500_state::mz3500_pb_w) m_srdy = (data & 0x40) >> 6; } -WRITE8_MEMBER(mz3500_state::mz3500_pc_w) +void mz3500_state::mz3500_pc_w(uint8_t data) { /* x--- ---- printer OBF output diff --git a/src/mame/drivers/ncd68k.cpp b/src/mame/drivers/ncd68k.cpp index 7e4ef1b22cf..ecfeca15ddf 100644 --- a/src/mame/drivers/ncd68k.cpp +++ b/src/mame/drivers/ncd68k.cpp @@ -146,8 +146,8 @@ private: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, rectangle const &cliprect); - DECLARE_READ16_MEMBER(lance_dma_r); - DECLARE_WRITE16_MEMBER(lance_dma_w); + u16 lance_dma_r(offs_t offset); + void lance_dma_w(offs_t offset, u16 data, u16 mem_mask = ~0); required_device<bert_device> m_bert; }; @@ -172,8 +172,8 @@ private: u8 mcu_status_r(); void irq_w(u8 data); - DECLARE_READ16_MEMBER(lance_dma_r); - DECLARE_WRITE16_MEMBER(lance_dma_w); + u16 lance_dma_r(offs_t offset); + void lance_dma_w(offs_t offset, u16 data, u16 mem_mask = ~0); required_device<bt478_device> m_ramdac; }; @@ -194,8 +194,8 @@ private: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, rectangle const &cliprect); - DECLARE_READ16_MEMBER(lance_dma_r); - DECLARE_WRITE16_MEMBER(lance_dma_w); + u16 lance_dma_r(offs_t offset); + void lance_dma_w(offs_t offset, u16 data, u16 mem_mask = ~0); }; void ncd68k_state::machine_reset() @@ -383,7 +383,7 @@ void ncd17c_state::irq_w(u8 data) m_maincpu->set_input_line(M68K_IRQ_1, BIT(data, 7)); } -READ16_MEMBER(ncd16_state::lance_dma_r) +u16 ncd16_state::lance_dma_r(offs_t offset) { if (offset < 0x380000) fatalerror("lance_dma_r DMA target %08x not handled", offset); @@ -396,7 +396,7 @@ READ16_MEMBER(ncd16_state::lance_dma_r) return data; } -WRITE16_MEMBER(ncd16_state::lance_dma_w) +void ncd16_state::lance_dma_w(offs_t offset, u16 data, u16 mem_mask) { if (offset < 0x380000) fatalerror("lance_dma_w DMA target %08x not handled", offset); @@ -409,7 +409,7 @@ WRITE16_MEMBER(ncd16_state::lance_dma_w) m_ram->write(BYTE_XOR_BE(offset + 1), u8(data >> 0)); } -READ16_MEMBER(ncd17c_state::lance_dma_r) +u16 ncd17c_state::lance_dma_r(offs_t offset) { u16 const data = (u16(m_ram->read(BYTE4_XOR_BE(offset + 0))) << 8) | m_ram->read(BYTE4_XOR_BE(offset + 1)); @@ -417,7 +417,7 @@ READ16_MEMBER(ncd17c_state::lance_dma_r) return data; } -WRITE16_MEMBER(ncd17c_state::lance_dma_w) +void ncd17c_state::lance_dma_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_8_15) m_ram->write(BYTE4_XOR_BE(offset + 0), u8(data >> 8)); @@ -425,7 +425,7 @@ WRITE16_MEMBER(ncd17c_state::lance_dma_w) m_ram->write(BYTE4_XOR_BE(offset + 1), u8(data >> 0)); } -READ16_MEMBER(ncd19_state::lance_dma_r) +u16 ncd19_state::lance_dma_r(offs_t offset) { if (offset < 0x800000) fatalerror("lance_dma_r DMA target %08x not handled!", offset); @@ -436,7 +436,7 @@ READ16_MEMBER(ncd19_state::lance_dma_r) return data; } -WRITE16_MEMBER(ncd19_state::lance_dma_w) +void ncd19_state::lance_dma_w(offs_t offset, u16 data, u16 mem_mask) { if (offset < 0x800000) fatalerror("lance_dma_w DMA target %08x not handled!", offset); diff --git a/src/mame/drivers/nes_sh6578.cpp b/src/mame/drivers/nes_sh6578.cpp index d0db1f56e8b..e8fa4fdf646 100644 --- a/src/mame/drivers/nes_sh6578.cpp +++ b/src/mame/drivers/nes_sh6578.cpp @@ -105,7 +105,7 @@ private: DECLARE_READ8_MEMBER(psg1_4015_r); DECLARE_WRITE8_MEMBER(psg1_4015_w); DECLARE_WRITE8_MEMBER(psg1_4017_w); - DECLARE_READ8_MEMBER(apu_read_mem); + uint8_t apu_read_mem(offs_t offset); DECLARE_WRITE_LINE_MEMBER(apu_irq); @@ -432,7 +432,7 @@ WRITE_LINE_MEMBER(nes_sh6578_state::apu_irq) // unimplemented } -READ8_MEMBER(nes_sh6578_state::apu_read_mem) +uint8_t nes_sh6578_state::apu_read_mem(offs_t offset) { return m_maincpu->space(AS_PROGRAM).read_byte(offset); } diff --git a/src/mame/drivers/nes_vt.cpp b/src/mame/drivers/nes_vt.cpp index 9f5a595f6a7..1fac87b913f 100644 --- a/src/mame/drivers/nes_vt.cpp +++ b/src/mame/drivers/nes_vt.cpp @@ -41,9 +41,9 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; - virtual DECLARE_READ8_MEMBER(in0_r); - virtual DECLARE_READ8_MEMBER(in1_r); - virtual DECLARE_WRITE8_MEMBER(in0_w); + virtual uint8_t in0_r(); + virtual uint8_t in1_r(); + virtual void in0_w(uint8_t data); void nes_vt_map(address_map& map); @@ -72,18 +72,18 @@ protected: void configure_soc(nes_vt_soc_device* soc); - DECLARE_READ8_MEMBER(upper_412c_r); - DECLARE_READ8_MEMBER(upper_412d_r); - DECLARE_WRITE8_MEMBER(upper_412c_w); + uint8_t upper_412c_r(); + uint8_t upper_412d_r(); + void upper_412c_w(uint8_t data); private: /* APU handling */ /* Extra IO */ - DECLARE_READ8_MEMBER(extrain_0_r); - DECLARE_READ8_MEMBER(extrain_1_r); - DECLARE_READ8_MEMBER(extrain_2_r); - DECLARE_READ8_MEMBER(extrain_3_r); + uint8_t extrain_0_r(); + uint8_t extrain_1_r(); + uint8_t extrain_2_r(); + uint8_t extrain_3_r(); }; @@ -215,8 +215,8 @@ public: void nes_vt_2mb_ablping(machine_config& config); private: - DECLARE_READ8_MEMBER(ablping_extraio_r); - DECLARE_WRITE8_MEMBER(ablping_extraio_w); + uint8_t ablping_extraio_r(); + void ablping_extraio_w(uint8_t data); }; class nes_vt_cy_state : public nes_vt_state @@ -240,7 +240,7 @@ private: void nes_vt_cy_map(address_map& map); void nes_vt_bt_map(address_map& map); - DECLARE_WRITE8_MEMBER(bittboy_412c_w); + void bittboy_412c_w(uint8_t data); DECLARE_READ8_MEMBER(vt_rom_banked_r); }; @@ -256,9 +256,9 @@ public: { } protected: - virtual DECLARE_READ8_MEMBER(in0_r) override; - virtual DECLARE_READ8_MEMBER(in1_r) override; - virtual DECLARE_WRITE8_MEMBER(in0_w) override; + virtual uint8_t in0_r() override; + virtual uint8_t in1_r() override; + virtual void in0_w(uint8_t data) override; private: int m_previous_port0; @@ -291,8 +291,8 @@ private: void nes_vt_dg_baddma_map(address_map& map); void nes_vt_fa_map(address_map& map); - DECLARE_READ8_MEMBER(fapocket_412c_r); - DECLARE_WRITE8_MEMBER(fapocket_412c_w); + uint8_t fapocket_412c_r(); + void fapocket_412c_w(uint8_t data); }; @@ -343,8 +343,8 @@ private: void nes_vt_fp_map(address_map& map); - DECLARE_READ8_MEMBER(fcpocket_412d_r); - DECLARE_WRITE8_MEMBER(fcpocket_412c_w); + uint8_t fcpocket_412d_r(); + void fcpocket_412c_w(uint8_t data); }; class nes_vt_ablpinb_state : public nes_vt_state @@ -361,9 +361,9 @@ protected: virtual void machine_reset() override; private: - virtual DECLARE_READ8_MEMBER(in0_r) override; - virtual DECLARE_READ8_MEMBER(in1_r) override; - virtual DECLARE_WRITE8_MEMBER(in0_w) override; + virtual uint8_t in0_r() override; + virtual uint8_t in1_r() override; + virtual void in0_w(uint8_t data) override; uint8_t m_ablpinb_in0_val; @@ -385,9 +385,9 @@ public: void nes_vt_sudoku_512kb(machine_config& config); private: - virtual DECLARE_READ8_MEMBER(in0_r) override; - virtual DECLARE_READ8_MEMBER(in1_r) override; - virtual DECLARE_WRITE8_MEMBER(in0_w) override; + virtual uint8_t in0_r() override; + virtual uint8_t in1_r() override; + virtual void in0_w(uint8_t data) override; }; class nes_vt_vg_1mb_majgnc_state : public nes_vt_state @@ -486,7 +486,7 @@ void nes_vt_hh_state::vt_external_space_map_fp_2x32mbyte(address_map &map) map(0x0000000, 0x1ffffff).rw(FUNC(nes_vt_hh_state::vt_rom_banked_r), FUNC(nes_vt_hh_state::vt03_8000_mapper_w)); } -READ8_MEMBER(nes_vt_base_state::extrain_0_r) +uint8_t nes_vt_base_state::extrain_0_r() { if (m_exin0) return m_exin0->read(); @@ -497,7 +497,7 @@ READ8_MEMBER(nes_vt_base_state::extrain_0_r) return 0x00; } -READ8_MEMBER(nes_vt_base_state::extrain_1_r) +uint8_t nes_vt_base_state::extrain_1_r() { if (m_exin1) return m_exin1->read(); @@ -508,7 +508,7 @@ READ8_MEMBER(nes_vt_base_state::extrain_1_r) return 0x00; } -READ8_MEMBER(nes_vt_base_state::extrain_2_r) +uint8_t nes_vt_base_state::extrain_2_r() { if (m_exin2) return m_exin2->read(); @@ -519,7 +519,7 @@ READ8_MEMBER(nes_vt_base_state::extrain_2_r) return 0x00; } -READ8_MEMBER(nes_vt_base_state::extrain_3_r) +uint8_t nes_vt_base_state::extrain_3_r() { if (m_exin3) return m_exin3->read(); @@ -532,7 +532,7 @@ READ8_MEMBER(nes_vt_base_state::extrain_3_r) /* Standard I/O handlers (NES Controller clone) */ -READ8_MEMBER(nes_vt_base_state::in0_r) +uint8_t nes_vt_base_state::in0_r() { //logerror("%s: in0_r\n", machine().describe_context()); uint8_t ret = 0x40; @@ -541,7 +541,7 @@ READ8_MEMBER(nes_vt_base_state::in0_r) return ret; } -READ8_MEMBER(nes_vt_base_state::in1_r) +uint8_t nes_vt_base_state::in1_r() { //logerror("%s: in1_r\n", machine().describe_context()); uint8_t ret = 0x40; @@ -550,7 +550,7 @@ READ8_MEMBER(nes_vt_base_state::in1_r) return ret; } -WRITE8_MEMBER(nes_vt_base_state::in0_w) +void nes_vt_base_state::in0_w(uint8_t data) { //logerror("%s: in0_w %02x\n", machine().describe_context(), data); if (data & 0x01) @@ -562,21 +562,21 @@ WRITE8_MEMBER(nes_vt_base_state::in0_w) /* Lexibook I/O handlers */ -READ8_MEMBER(nes_vt_cy_lexibook_state::in0_r) +uint8_t nes_vt_cy_lexibook_state::in0_r() { //logerror("%s: in0_r\n", machine().describe_context()); uint8_t ret = m_latch0_bit; return ret; } -READ8_MEMBER(nes_vt_cy_lexibook_state::in1_r) +uint8_t nes_vt_cy_lexibook_state::in1_r() { //logerror("%s: in1_r\n", machine().describe_context()); uint8_t ret = m_latch1_bit; return ret; } -WRITE8_MEMBER(nes_vt_cy_lexibook_state::in0_w) +void nes_vt_cy_lexibook_state::in0_w(uint8_t data) { //logerror("%s: in0_w %02x\n", machine().describe_context(), data); if ((!(data & 0x01)) && (m_previous_port0 & 0x01)) // 0x03 -> 0x02 transition @@ -600,13 +600,13 @@ WRITE8_MEMBER(nes_vt_cy_lexibook_state::in0_w) // ablping polls this (also writes here) what is it? 4-bit DAC? PCM? (inputs only start responding once it finishes writing data on startup but takes longer than a sample should) // (this is the extended IO port on VT) -READ8_MEMBER(nes_vt_ablping_state::ablping_extraio_r) +uint8_t nes_vt_ablping_state::ablping_extraio_r() { // needs to change at least return machine().rand()&0xf; }; -WRITE8_MEMBER(nes_vt_ablping_state::ablping_extraio_w) +void nes_vt_ablping_state::ablping_extraio_w(uint8_t data) { popmessage("ablping_extraio_w %02x", data); }; @@ -652,7 +652,7 @@ void nes_vt_ablpinb_state::machine_reset() } -READ8_MEMBER(nes_vt_ablpinb_state::in0_r) +uint8_t nes_vt_ablpinb_state::in0_r() { if (m_plunger_off) { @@ -681,7 +681,7 @@ READ8_MEMBER(nes_vt_ablpinb_state::in0_r) } -READ8_MEMBER(nes_vt_ablpinb_state::in1_r) +uint8_t nes_vt_ablpinb_state::in1_r() { uint8_t i = machine().rand() & 0x10; @@ -693,7 +693,7 @@ READ8_MEMBER(nes_vt_ablpinb_state::in1_r) return i | ret; } -WRITE8_MEMBER(nes_vt_ablpinb_state::in0_w) +void nes_vt_ablpinb_state::in0_w(uint8_t data) { // write 0x04 to 0x4016 sets bit 0x08 in 0x4017 // write 0x00 to 0x4016 clears bit 0x08 in 0x4017 @@ -703,17 +703,17 @@ WRITE8_MEMBER(nes_vt_ablpinb_state::in0_w) logerror("in0_w %02x\n", data); } -READ8_MEMBER(nes_vt_sudoku_state::in0_r) +uint8_t nes_vt_sudoku_state::in0_r() { return machine().rand(); } -READ8_MEMBER(nes_vt_sudoku_state::in1_r) +uint8_t nes_vt_sudoku_state::in1_r() { return machine().rand(); } -WRITE8_MEMBER(nes_vt_sudoku_state::in0_w) +void nes_vt_sudoku_state::in0_w(uint8_t data) { } @@ -926,19 +926,19 @@ void nes_vt_ablping_state::nes_vt_2mb_ablping(machine_config &config) GFXDECODE(config, "gfxdecode", "soc:ppu", vt03_gfx_helper); } -READ8_MEMBER(nes_vt_base_state::upper_412c_r) +uint8_t nes_vt_base_state::upper_412c_r() { logerror("%s: upper_412c_r\n", machine().describe_context()); return 0x00; } -READ8_MEMBER(nes_vt_base_state::upper_412d_r) +uint8_t nes_vt_base_state::upper_412d_r() { logerror("%s: upper_412d_r\n", machine().describe_context()); return 0x00; } -WRITE8_MEMBER(nes_vt_base_state::upper_412c_w) +void nes_vt_base_state::upper_412c_w(uint8_t data) { logerror("%s: upper_412c_w %02x\n", machine().describe_context(), data); } @@ -991,7 +991,7 @@ void nes_vt_cy_state::nes_vt_bt(machine_config &config) } -WRITE8_MEMBER(nes_vt_cy_state::bittboy_412c_w) +void nes_vt_cy_state::bittboy_412c_w(uint8_t data) { //bittboy (ok), mc_pg150 (not working) logerror("%s: vt03_412c_extbank_w %02x\n", machine().describe_context(), data); @@ -1170,7 +1170,7 @@ static INPUT_PORTS_START( dbdancem ) INPUT_PORTS_END -READ8_MEMBER(nes_vt_hh_state::fcpocket_412d_r) +uint8_t nes_vt_hh_state::fcpocket_412d_r() { if (m_cartsel) return m_cartsel->read(); @@ -1178,7 +1178,7 @@ READ8_MEMBER(nes_vt_hh_state::fcpocket_412d_r) return 0; } -WRITE8_MEMBER(nes_vt_hh_state::fcpocket_412c_w) +void nes_vt_hh_state::fcpocket_412c_w(uint8_t data) { // fcpocket logerror("%s: vtfp_412c_extbank_w %02x\n", machine().describe_context(), data); @@ -1255,7 +1255,7 @@ void nes_vt_dg_state::nes_vt_fa(machine_config& config) } -READ8_MEMBER(nes_vt_dg_state::fapocket_412c_r) +uint8_t nes_vt_dg_state::fapocket_412c_r() { if (m_cartsel) return m_cartsel->read(); @@ -1263,7 +1263,7 @@ READ8_MEMBER(nes_vt_dg_state::fapocket_412c_r) return 0; } -WRITE8_MEMBER(nes_vt_dg_state::fapocket_412c_w) +void nes_vt_dg_state::fapocket_412c_w(uint8_t data) { // fapocket (ok?) (also uses bank from config switch for fake cartridge slot) logerror("%s: vtfa_412c_extbank_w %02x\n", machine().describe_context(), data); diff --git a/src/mame/drivers/nforcepc.cpp b/src/mame/drivers/nforcepc.cpp index 8ac0bd3a62c..e35d2d9128d 100644 --- a/src/mame/drivers/nforcepc.cpp +++ b/src/mame/drivers/nforcepc.cpp @@ -1054,7 +1054,7 @@ public: private: void nforce_map(address_map &map); void nforce_map_io(address_map &map); - DECLARE_WRITE8_MEMBER(boot_state_award_w); + void boot_state_award_w(uint8_t data); IRQ_CALLBACK_MEMBER(irq_callback); DECLARE_WRITE_LINE_MEMBER(maincpu_interrupt); @@ -1088,7 +1088,7 @@ const nforcepc_state::boot_state_info nforcepc_state::boot_state_infos_award[] = { 0, nullptr } }; -WRITE8_MEMBER(nforcepc_state::boot_state_award_w) +void nforcepc_state::boot_state_award_w(uint8_t data) { const char *desc = ""; for (int i = 0; boot_state_infos_award[i].message; i++) diff --git a/src/mame/drivers/norautp.cpp b/src/mame/drivers/norautp.cpp index 3d055cce2ea..d8ddad30182 100644 --- a/src/mame/drivers/norautp.cpp +++ b/src/mame/drivers/norautp.cpp @@ -633,7 +633,7 @@ void norautp_state::norautp_palette(palette_device &palette) const * R/W Handlers * *************************/ -WRITE8_MEMBER(norautp_state::mainlamps_w) +void norautp_state::mainlamps_w(uint8_t data) { /* PPI-0 (60h-63h); PortB OUT. Lamps: @@ -660,7 +660,7 @@ WRITE8_MEMBER(norautp_state::mainlamps_w) // popmessage("lamps: %02x", data); } -WRITE8_MEMBER(norautp_state::soundlamps_w) +void norautp_state::soundlamps_w(uint8_t data) { /* PPI-1 (a0h-a3h); PortC OUT. Sound & Lamps: @@ -683,7 +683,7 @@ WRITE8_MEMBER(norautp_state::soundlamps_w) // popmessage("sound bits 4-5-6-7: %02x, %02x, %02x, %02x", ((data >> 4) & 0x01), ((data >> 5) & 0x01), ((data >> 6) & 0x01), ((data >> 7) & 0x01)); } -WRITE8_MEMBER(norautp_state::counterlamps_w) +void norautp_state::counterlamps_w(uint8_t data) { /* PPI-0 (60h-63h); PortC OUT. Lamps & Coin Counters: diff --git a/src/mame/drivers/novag_cforte.cpp b/src/mame/drivers/novag_cforte.cpp index 009a24e4003..99baf1bcfae 100644 --- a/src/mame/drivers/novag_cforte.cpp +++ b/src/mame/drivers/novag_cforte.cpp @@ -72,7 +72,7 @@ private: // I/O handlers void update_display(); - DECLARE_WRITE64_MEMBER(lcd_output_w); + void lcd_output_w(u64 data); DECLARE_WRITE8_MEMBER(mux_w); DECLARE_WRITE8_MEMBER(control_w); DECLARE_READ8_MEMBER(input1_r); @@ -101,7 +101,7 @@ void cforte_state::machine_start() // HLCD0538 -WRITE64_MEMBER(cforte_state::lcd_output_w) +void cforte_state::lcd_output_w(u64 data) { // 4 rows used u32 rowdata[4]; diff --git a/src/mame/drivers/novag_micro2.cpp b/src/mame/drivers/novag_micro2.cpp index 854188c780b..6c124965d88 100644 --- a/src/mame/drivers/novag_micro2.cpp +++ b/src/mame/drivers/novag_micro2.cpp @@ -89,9 +89,9 @@ private: // I/O handlers void update_display(); - DECLARE_WRITE8_MEMBER(mux_w); - DECLARE_WRITE8_MEMBER(control_w); - DECLARE_READ8_MEMBER(input_r); + void mux_w(u8 data); + void control_w(u8 data); + u8 input_r(); bool m_kp_select = false; u8 m_inp_mux = 0; @@ -127,14 +127,14 @@ void micro2_state::update_display() m_display->matrix(m_led_select, m_inp_mux); } -WRITE8_MEMBER(micro2_state::mux_w) +void micro2_state::mux_w(u8 data) { // D0-D7: input mux, led data m_inp_mux = ~data; update_display(); } -WRITE8_MEMBER(micro2_state::control_w) +void micro2_state::control_w(u8 data) { // P21: keypad select m_kp_select = bool(~data & 2); @@ -147,7 +147,7 @@ WRITE8_MEMBER(micro2_state::control_w) update_display(); } -READ8_MEMBER(micro2_state::input_r) +u8 micro2_state::input_r() { u8 data = 0; diff --git a/src/mame/drivers/novag_savant.cpp b/src/mame/drivers/novag_savant.cpp index 31dec9858b2..296c40364ad 100644 --- a/src/mame/drivers/novag_savant.cpp +++ b/src/mame/drivers/novag_savant.cpp @@ -93,15 +93,15 @@ private: DECLARE_WRITE8_MEMBER(stall_w); DECLARE_READ8_MEMBER(mcustatus_r); - DECLARE_WRITE64_MEMBER(lcd1_output_w); - DECLARE_WRITE64_MEMBER(lcd2_output_w); + void lcd1_output_w(u64 data); + void lcd2_output_w(u64 data); DECLARE_READ8_MEMBER(databus_r); DECLARE_WRITE8_MEMBER(databus_w); DECLARE_READ8_MEMBER(control_r); DECLARE_WRITE8_MEMBER(control_w); - DECLARE_WRITE8_MEMBER(lcd_w); - DECLARE_READ8_MEMBER(input_r); + void lcd_w(u8 data); + u8 input_r(); bool m_wait_in; u8 m_inp_mux; @@ -173,14 +173,14 @@ READ8_MEMBER(savant_state::mcustatus_r) // 3870 side -WRITE64_MEMBER(savant_state::lcd1_output_w) +void savant_state::lcd1_output_w(u64 data) { // uses C1-C24 m_lcd_data = m_lcd_data << 24 | (data >> 8 & 0xffffff); m_display->matrix(data & 0xff, m_lcd_data); } -WRITE64_MEMBER(savant_state::lcd2_output_w) +void savant_state::lcd2_output_w(u64 data) { // uses C6-C32 m_lcd_data = data >> 5 & 0x7ffffff; @@ -235,7 +235,7 @@ WRITE8_MEMBER(savant_state::control_w) m_control = data; } -WRITE8_MEMBER(savant_state::lcd_w) +void savant_state::lcd_w(u8 data) { // d0: HLCD0538 data // d4: HLCD0539 data @@ -250,7 +250,7 @@ WRITE8_MEMBER(savant_state::lcd_w) m_inp_mux = bitswap<8>(data,7,3,6,2,5,1,4,0); } -READ8_MEMBER(savant_state::input_r) +u8 savant_state::input_r() { u8 data = 0; diff --git a/src/mame/drivers/olyboss.cpp b/src/mame/drivers/olyboss.cpp index a6d5ec61508..6bb254bad2b 100644 --- a/src/mame/drivers/olyboss.cpp +++ b/src/mame/drivers/olyboss.cpp @@ -87,27 +87,27 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: - DECLARE_READ8_MEMBER(keyboard_read); + uint8_t keyboard_read(); UPD3301_DRAW_CHARACTER_MEMBER( olyboss_display_pixels ); DECLARE_WRITE_LINE_MEMBER( hrq_w ); DECLARE_WRITE_LINE_MEMBER( tc_w ); DECLARE_WRITE_LINE_MEMBER( romdis_w ); - DECLARE_READ8_MEMBER( dma_mem_r ); - DECLARE_WRITE8_MEMBER( dma_mem_w ); + uint8_t dma_mem_r(offs_t offset); + void dma_mem_w(offs_t offset, uint8_t data); DECLARE_READ8_MEMBER( fdcctrl_r ); DECLARE_WRITE8_MEMBER( fdcctrl_w ); DECLARE_WRITE8_MEMBER( fdcctrl85_w ); - DECLARE_READ8_MEMBER( fdcdma_r ); - DECLARE_WRITE8_MEMBER( fdcdma_w ); - DECLARE_WRITE8_MEMBER( crtcdma_w ); + uint8_t fdcdma_r(); + void fdcdma_w(uint8_t data); + void crtcdma_w(uint8_t data); DECLARE_READ8_MEMBER( rom_r ); DECLARE_WRITE8_MEMBER( rom_w ); DECLARE_WRITE8_MEMBER( vchrmap_w ); DECLARE_WRITE8_MEMBER( vchrram_w ); DECLARE_WRITE8_MEMBER( vchrram85_w ); - DECLARE_WRITE8_MEMBER( ppic_w ); + void ppic_w(uint8_t data); void olyboss_io(address_map &map); void olyboss_mem(address_map &map); void olyboss85_io(address_map &map); @@ -282,7 +282,7 @@ UPD3301_DRAW_CHARACTER_MEMBER( olyboss_state::olyboss_display_pixels ) // KEYBOARD //************************************************************************** -READ8_MEMBER( olyboss_state::keyboard_read ) +uint8_t olyboss_state::keyboard_read() { //logerror ("keyboard_read offs [%d]\n",offset); if (m_keybhit) @@ -295,7 +295,7 @@ READ8_MEMBER( olyboss_state::keyboard_read ) return 0x00; } -WRITE8_MEMBER( olyboss_state::ppic_w ) +void olyboss_state::ppic_w(uint8_t data) { m_uic->ireq4_w(BIT(data, 5) ? CLEAR_LINE : ASSERT_LINE); m_fdcctrl = (m_fdcctrl & ~0x10) | (BIT(data, 5) ? 0x10 : 0); @@ -351,31 +351,31 @@ WRITE_LINE_MEMBER( olyboss_state::tc_w ) } } -READ8_MEMBER( olyboss_state::dma_mem_r ) +uint8_t olyboss_state::dma_mem_r(offs_t offset) { address_space &program = m_maincpu->space(AS_PROGRAM); return program.read_byte(offset); } -WRITE8_MEMBER( olyboss_state::dma_mem_w ) +void olyboss_state::dma_mem_w(offs_t offset, uint8_t data) { address_space &program = m_maincpu->space(AS_PROGRAM); program.write_byte(offset, data); } -READ8_MEMBER( olyboss_state::fdcdma_r ) +uint8_t olyboss_state::fdcdma_r() { m_channel = 0; return m_fdc->dma_r(); } -WRITE8_MEMBER( olyboss_state::fdcdma_w ) +void olyboss_state::fdcdma_w(uint8_t data) { m_channel = 0; m_fdc->dma_w(data); } -WRITE8_MEMBER( olyboss_state::crtcdma_w ) +void olyboss_state::crtcdma_w(uint8_t data) { m_channel = 2; m_crtc->dack_w(data); diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp index 5c7649667e4..1512e0e1fd2 100644 --- a/src/mame/drivers/osbexec.cpp +++ b/src/mame/drivers/osbexec.cpp @@ -119,10 +119,10 @@ private: DECLARE_READ8_MEMBER(osbexec_rtc_r); virtual void machine_reset() override; TIMER_CALLBACK_MEMBER(osbexec_video_callback); - DECLARE_READ8_MEMBER(osbexec_pia0_a_r); - DECLARE_WRITE8_MEMBER(osbexec_pia0_a_w); - DECLARE_READ8_MEMBER(osbexec_pia0_b_r); - DECLARE_WRITE8_MEMBER(osbexec_pia0_b_w); + uint8_t osbexec_pia0_a_r(); + void osbexec_pia0_a_w(uint8_t data); + uint8_t osbexec_pia0_b_r(); + void osbexec_pia0_b_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(osbexec_pia0_ca2_w); DECLARE_WRITE_LINE_MEMBER(osbexec_pia0_cb2_w); DECLARE_WRITE_LINE_MEMBER(modem_txclk_w); @@ -342,13 +342,13 @@ uint32_t osbexec_state::screen_update(screen_device &screen, bitmap_ind16 &bitma CB2 - 60/50 (?) */ -READ8_MEMBER(osbexec_state::osbexec_pia0_a_r) +uint8_t osbexec_state::osbexec_pia0_a_r() { return m_pia0_porta; } -WRITE8_MEMBER(osbexec_state::osbexec_pia0_a_w) +void osbexec_state::osbexec_pia0_a_w(uint8_t data) { //logerror("osbexec_pia0_a_w: %02x\n", data ); @@ -358,13 +358,13 @@ WRITE8_MEMBER(osbexec_state::osbexec_pia0_a_w) } -READ8_MEMBER(osbexec_state::osbexec_pia0_b_r) +uint8_t osbexec_state::osbexec_pia0_b_r() { return m_pia0_portb; } -WRITE8_MEMBER(osbexec_state::osbexec_pia0_b_w) +void osbexec_state::osbexec_pia0_b_w(uint8_t data) { m_pia0_portb = (m_pia0_portb & 0xc0) | (data & 0x3f); diff --git a/src/mame/drivers/osi.cpp b/src/mame/drivers/osi.cpp index cbef219c645..4ae92170c74 100644 --- a/src/mame/drivers/osi.cpp +++ b/src/mame/drivers/osi.cpp @@ -387,7 +387,7 @@ void sb2m600_state::floppy_index_callback(floppy_image_device *floppy, int state m_fdc_index = state; } -READ8_MEMBER( c1pmf_state::osi470_pia_pa_r ) +uint8_t c1pmf_state::osi470_pia_pa_r() { /* @@ -407,7 +407,7 @@ READ8_MEMBER( c1pmf_state::osi470_pia_pa_r ) return (m_fdc_index << 7); } -WRITE8_MEMBER( c1pmf_state::osi470_pia_pa_w ) +void c1pmf_state::osi470_pia_pa_w(uint8_t data) { /* @@ -425,7 +425,7 @@ WRITE8_MEMBER( c1pmf_state::osi470_pia_pa_w ) */ } -WRITE8_MEMBER( c1pmf_state::osi470_pia_pb_w ) +void c1pmf_state::osi470_pia_pb_w(uint8_t data) { /* diff --git a/src/mame/drivers/othello.cpp b/src/mame/drivers/othello.cpp index 5ccd1edd8d0..50287387f8e 100644 --- a/src/mame/drivers/othello.cpp +++ b/src/mame/drivers/othello.cpp @@ -114,9 +114,9 @@ private: DECLARE_WRITE8_MEMBER(ack_w); DECLARE_WRITE8_MEMBER(ay_address_w); DECLARE_WRITE8_MEMBER(ay_data_w); - DECLARE_READ8_MEMBER(n7751_rom_r); - DECLARE_READ8_MEMBER(n7751_command_r); - DECLARE_WRITE8_MEMBER(n7751_p2_w); + uint8_t n7751_rom_r(); + uint8_t n7751_command_r(); + void n7751_p2_w(uint8_t data); template<int Shift> void n7751_rom_addr_w(uint8_t data); void n7751_rom_select_w(uint8_t data); @@ -297,17 +297,17 @@ void othello_state::n7751_rom_select_w(uint8_t data) if (!BIT(data, 3)) m_sound_addr |= 0x3000; } -READ8_MEMBER(othello_state::n7751_rom_r) +uint8_t othello_state::n7751_rom_r() { return m_n7751_data[m_sound_addr]; } -READ8_MEMBER(othello_state::n7751_command_r) +uint8_t othello_state::n7751_command_r() { return 0x80 | ((m_n7751_command & 0x07) << 4); } -WRITE8_MEMBER(othello_state::n7751_p2_w) +void othello_state::n7751_p2_w(uint8_t data) { /* write to P2; low 4 bits go to 8243 */ m_i8243->p2_w(data & 0x0f); diff --git a/src/mame/drivers/p2000t.cpp b/src/mame/drivers/p2000t.cpp index 7cf4ae6624b..cfff839195d 100644 --- a/src/mame/drivers/p2000t.cpp +++ b/src/mame/drivers/p2000t.cpp @@ -216,7 +216,7 @@ INTERRUPT_GEN_MEMBER(p2000t_state::p2000_interrupt) m_maincpu->set_input_line(0, HOLD_LINE); } -READ8_MEMBER( p2000t_state::videoram_r ) +uint8_t p2000t_state::videoram_r(offs_t offset) { return m_videoram[offset]; } diff --git a/src/mame/drivers/palm.cpp b/src/mame/drivers/palm.cpp index b8c3e99a032..6929ae0ddfa 100644 --- a/src/mame/drivers/palm.cpp +++ b/src/mame/drivers/palm.cpp @@ -50,11 +50,11 @@ protected: virtual void machine_reset() override; private: - DECLARE_WRITE8_MEMBER(palm_port_f_out); - DECLARE_READ8_MEMBER(palm_port_c_in); - DECLARE_READ8_MEMBER(palm_port_f_in); - DECLARE_WRITE16_MEMBER(palm_spim_out); - DECLARE_READ16_MEMBER(palm_spim_in); + void palm_port_f_out(uint8_t data); + uint8_t palm_port_c_in(); + uint8_t palm_port_f_in(); + void palm_spim_out(uint16_t data); + uint16_t palm_spim_in(); DECLARE_WRITE_LINE_MEMBER(palm_spim_exchange); void palm_palette(palette_device &palette) const; @@ -92,27 +92,27 @@ INPUT_CHANGED_MEMBER(palm_state::button_check) m_maincpu->set_port_d_lines(button_state, (int)param); } -WRITE8_MEMBER(palm_state::palm_port_f_out) +void palm_state::palm_port_f_out(uint8_t data) { m_port_f_latch = data; } -READ8_MEMBER(palm_state::palm_port_c_in) +uint8_t palm_state::palm_port_c_in() { return 0x10; } -READ8_MEMBER(palm_state::palm_port_f_in) +uint8_t palm_state::palm_port_f_in() { return m_port_f_latch; } -WRITE16_MEMBER(palm_state::palm_spim_out) +void palm_state::palm_spim_out(uint16_t data) { m_spim_data = data; } -READ16_MEMBER(palm_state::palm_spim_in) +uint16_t palm_state::palm_spim_in() { return m_spim_data; } diff --git a/src/mame/drivers/palmz22.cpp b/src/mame/drivers/palmz22.cpp index af7a15b6790..8a23fdbe6a9 100644 --- a/src/mame/drivers/palmz22.cpp +++ b/src/mame/drivers/palmz22.cpp @@ -101,14 +101,14 @@ private: uint32_t m_port[8]; inline void verboselog(int n_level, const char *s_fmt, ...) ATTR_PRINTF(3,4); - DECLARE_WRITE8_MEMBER( s3c2410_nand_command_w ); - DECLARE_WRITE8_MEMBER( s3c2410_nand_address_w ); - DECLARE_READ8_MEMBER( s3c2410_nand_data_r ); - DECLARE_WRITE8_MEMBER( s3c2410_nand_data_w ); - DECLARE_READ32_MEMBER(s3c2410_gpio_port_r); - DECLARE_WRITE32_MEMBER(s3c2410_gpio_port_w); - DECLARE_READ32_MEMBER(s3c2410_core_pin_r); - DECLARE_READ32_MEMBER(s3c2410_adc_data_r ); + void s3c2410_nand_command_w(uint8_t data); + void s3c2410_nand_address_w(uint8_t data); + uint8_t s3c2410_nand_data_r(); + void s3c2410_nand_data_w(uint8_t data); + uint32_t s3c2410_gpio_port_r(offs_t offset); + void s3c2410_gpio_port_w(offs_t offset, uint32_t data); + uint32_t s3c2410_core_pin_r(offs_t offset); + uint32_t s3c2410_adc_data_r(offs_t offset); void map(address_map &map); }; @@ -133,33 +133,33 @@ inline void palmz22_state::verboselog(int n_level, const char *s_fmt, ...) // NAND -WRITE8_MEMBER( palmz22_state::s3c2410_nand_command_w ) +void palmz22_state::s3c2410_nand_command_w(uint8_t data) { verboselog(9, "s3c2410_nand_command_w %02X\n", data); m_nand->command_w(data); } -WRITE8_MEMBER( palmz22_state::s3c2410_nand_address_w ) +void palmz22_state::s3c2410_nand_address_w(uint8_t data) { verboselog(9, "s3c2410_nand_address_w %02X\n", data); m_nand->address_w(data); } -READ8_MEMBER( palmz22_state::s3c2410_nand_data_r ) +uint8_t palmz22_state::s3c2410_nand_data_r() { uint8_t data = m_nand->data_r(); verboselog(9, "s3c2410_nand_data_r %02X\n", data); return data; } -WRITE8_MEMBER( palmz22_state::s3c2410_nand_data_w ) +void palmz22_state::s3c2410_nand_data_w(uint8_t data) { verboselog(9, "s3c2410_nand_data_w %02X\n", data); m_nand->data_w(data); } /* -READ8_MEMBER( palmz22_state::s3c2410_nand_busy_r ) +uint8_t palmz22_state::s3c2410_nand_busy_r() { uint8_t data = m_nand->is_busy(); verboselog(9, "s3c2410_nand_busy_r %02X\n", data); @@ -169,7 +169,7 @@ READ8_MEMBER( palmz22_state::s3c2410_nand_busy_r ) // GPIO -READ32_MEMBER(palmz22_state::s3c2410_gpio_port_r) +uint32_t palmz22_state::s3c2410_gpio_port_r(offs_t offset) { uint32_t data = m_port[offset]; switch (offset) @@ -195,7 +195,7 @@ READ32_MEMBER(palmz22_state::s3c2410_gpio_port_r) return data; } -WRITE32_MEMBER(palmz22_state::s3c2410_gpio_port_w) +void palmz22_state::s3c2410_gpio_port_w(offs_t offset, uint32_t data) { m_port[offset] = data; } @@ -214,7 +214,7 @@ NCON : NAND flash memory address step selection */ -READ32_MEMBER(palmz22_state::s3c2410_core_pin_r) +uint32_t palmz22_state::s3c2410_core_pin_r(offs_t offset) { int data = 0; switch (offset) @@ -228,7 +228,7 @@ READ32_MEMBER(palmz22_state::s3c2410_core_pin_r) // ADC -READ32_MEMBER(palmz22_state::s3c2410_adc_data_r ) +uint32_t palmz22_state::s3c2410_adc_data_r(offs_t offset) { uint32_t data = 0; switch (offset) diff --git a/src/mame/drivers/pc100.cpp b/src/mame/drivers/pc100.cpp index d088eb9b209..c9b7f5c1907 100644 --- a/src/mame/drivers/pc100.cpp +++ b/src/mame/drivers/pc100.cpp @@ -119,12 +119,12 @@ private: DECLARE_WRITE8_MEMBER(pc100_vs_vreg_w); DECLARE_WRITE8_MEMBER(pc100_crtc_addr_w); DECLARE_WRITE8_MEMBER(pc100_crtc_data_w); - DECLARE_WRITE8_MEMBER(lower_mask_w); - DECLARE_WRITE8_MEMBER(upper_mask_w); - DECLARE_WRITE8_MEMBER(crtc_bank_w); - DECLARE_WRITE8_MEMBER(rtc_porta_w); - DECLARE_READ8_MEMBER(rtc_portc_r); - DECLARE_WRITE8_MEMBER(rtc_portc_w); + void lower_mask_w(uint8_t data); + void upper_mask_w(uint8_t data); + void crtc_bank_w(uint8_t data); + void rtc_porta_w(uint8_t data); + uint8_t rtc_portc_r(); + void rtc_portc_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(irqnmi_w); DECLARE_WRITE_LINE_MEMBER(drqnmi_w); uint16_t m_kanji_addr; @@ -519,7 +519,7 @@ static GFXDECODE_START( gfx_pc100 ) GFXDECODE_END /* TODO: untested */ -WRITE8_MEMBER( pc100_state::rtc_porta_w ) +void pc100_state::rtc_porta_w(uint8_t data) { /* ---- -x-- chip select @@ -534,7 +534,7 @@ WRITE8_MEMBER( pc100_state::rtc_porta_w ) m_rtc->cs1_w((data >> 2) & 1); } -WRITE8_MEMBER( pc100_state::rtc_portc_w ) +void pc100_state::rtc_portc_w(uint8_t data) { m_rtc->d0_w((data >> 0) & 1); m_rtc->d1_w((data >> 1) & 1); @@ -542,22 +542,22 @@ WRITE8_MEMBER( pc100_state::rtc_portc_w ) m_rtc->d3_w((data >> 3) & 1); } -READ8_MEMBER( pc100_state::rtc_portc_r ) +uint8_t pc100_state::rtc_portc_r() { return m_rtc_portc; } -WRITE8_MEMBER( pc100_state::lower_mask_w ) +void pc100_state::lower_mask_w(uint8_t data) { m_crtc.mask = (m_crtc.mask & 0xff00) | data; } -WRITE8_MEMBER( pc100_state::upper_mask_w ) +void pc100_state::upper_mask_w(uint8_t data) { m_crtc.mask = (m_crtc.mask & 0xff) | (data << 8); } -WRITE8_MEMBER( pc100_state::crtc_bank_w ) +void pc100_state::crtc_bank_w(uint8_t data) { if(data & 0x80) { diff --git a/src/mame/drivers/pc1500.cpp b/src/mame/drivers/pc1500.cpp index f36184f266b..af40cda61af 100644 --- a/src/mame/drivers/pc1500.cpp +++ b/src/mame/drivers/pc1500.cpp @@ -52,12 +52,12 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER( kb_matrix_w ); - DECLARE_READ8_MEMBER( port_a_r ); - DECLARE_READ8_MEMBER( port_b_r ); - DECLARE_WRITE8_MEMBER( port_c_w ); + void kb_matrix_w(uint8_t data); + uint8_t port_a_r(); + uint8_t port_b_r(); + void port_c_w(uint8_t data); - DECLARE_READ8_MEMBER( pc1500_kb_r ); + uint8_t pc1500_kb_r(); void pc1500_palette(palette_device &palette) const; void pc1500_mem(address_map &map); void pc1500_mem_io(address_map &map); @@ -81,7 +81,7 @@ void pc1500_state::pc1500_mem_io(address_map &map) map(0xf000, 0xf00f).rw("lh5810", FUNC(lh5810_device::data_r), FUNC(lh5810_device::data_w)); } -READ8_MEMBER( pc1500_state::pc1500_kb_r ) +uint8_t pc1500_state::pc1500_kb_r() { uint8_t data = 0xff; @@ -224,12 +224,12 @@ static INPUT_PORTS_START( pc1500 ) INPUT_PORTS_END -WRITE8_MEMBER( pc1500_state::kb_matrix_w ) +void pc1500_state::kb_matrix_w(uint8_t data) { m_kb_matrix = data; } -WRITE8_MEMBER( pc1500_state::port_c_w ) +void pc1500_state::port_c_w(uint8_t data) { m_rtc->data_in_w(BIT(data, 0)); m_rtc->stb_w(BIT(data, 1)); @@ -240,7 +240,7 @@ WRITE8_MEMBER( pc1500_state::port_c_w ) m_rtc->c2_w(BIT(data, 5)); } -READ8_MEMBER( pc1500_state::port_b_r ) +uint8_t pc1500_state::port_b_r() { /* x--- ---- ON/Break key @@ -261,7 +261,7 @@ READ8_MEMBER( pc1500_state::port_b_r ) return data; } -READ8_MEMBER( pc1500_state::port_a_r ) +uint8_t pc1500_state::port_a_r() { return 0xff; } diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp index 4ea82cb4ab5..489141cca63 100644 --- a/src/mame/drivers/pc6001.cpp +++ b/src/mame/drivers/pc6001.cpp @@ -1155,33 +1155,33 @@ IRQ_CALLBACK_MEMBER(pc6001_state::irq_callback) return m_irq_vector; } -READ8_MEMBER(pc6001_state::ppi_porta_r) +uint8_t pc6001_state::ppi_porta_r() { return 0; } -WRITE8_MEMBER(pc6001_state::ppi_porta_w) +void pc6001_state::ppi_porta_w(uint8_t data) { // if(data != 0x06) // printf("ppi_porta_w %02x\n",data); } -READ8_MEMBER(pc6001_state::ppi_portb_r) +uint8_t pc6001_state::ppi_portb_r() { return 0; } -WRITE8_MEMBER(pc6001_state::ppi_portb_w) +void pc6001_state::ppi_portb_w(uint8_t data) { //printf("ppi_portb_w %02x\n",data); } -WRITE8_MEMBER(pc6001_state::ppi_portc_w) +void pc6001_state::ppi_portc_w(uint8_t data) { //printf("ppi_portc_w %02x\n",data); } -READ8_MEMBER(pc6001_state::ppi_portc_r) +uint8_t pc6001_state::ppi_portc_r() { return 0x88; } diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp index a5a5be31e78..d46cb293930 100644 --- a/src/mame/drivers/pc8001.cpp +++ b/src/mame/drivers/pc8001.cpp @@ -416,7 +416,7 @@ WRITE_LINE_MEMBER( pc8001_state::hrq_w ) m_dma->hlda_w(state); } -READ8_MEMBER( pc8001_state::dma_mem_r ) +uint8_t pc8001_state::dma_mem_r(offs_t offset) { address_space &program = m_maincpu->space(AS_PROGRAM); diff --git a/src/mame/drivers/pc8401a.cpp b/src/mame/drivers/pc8401a.cpp index 770e7ad0505..c3dcd4be00b 100644 --- a/src/mame/drivers/pc8401a.cpp +++ b/src/mame/drivers/pc8401a.cpp @@ -530,7 +530,7 @@ void pc8401a_state::machine_start() save_item(NAME(m_io_addr)); } -READ8_MEMBER( pc8401a_state::ppi_pc_r ) +uint8_t pc8401a_state::ppi_pc_r() { /* @@ -550,7 +550,7 @@ READ8_MEMBER( pc8401a_state::ppi_pc_r ) return 0; } -WRITE8_MEMBER( pc8401a_state::ppi_pc_w ) +void pc8401a_state::ppi_pc_w(uint8_t data) { /* diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp index 051fa711d0c..a1a8764ee4e 100644 --- a/src/mame/drivers/pc8801.cpp +++ b/src/mame/drivers/pc8801.cpp @@ -1605,14 +1605,14 @@ void pc8801_state::pc8801_io(address_map &map) map(0xfc, 0xff).rw("d8255_master", FUNC(i8255_device::read), FUNC(i8255_device::write)); } -READ8_MEMBER(pc8801_state::cpu_8255_c_r) +uint8_t pc8801_state::cpu_8255_c_r() { // machine().scheduler().synchronize(); // force resync return m_i8255_1_pc >> 4; } -WRITE8_MEMBER(pc8801_state::cpu_8255_c_w) +void pc8801_state::cpu_8255_c_w(uint8_t data) { // machine().scheduler().synchronize(); // force resync @@ -1620,14 +1620,14 @@ WRITE8_MEMBER(pc8801_state::cpu_8255_c_w) } -READ8_MEMBER(pc8801_state::fdc_8255_c_r) +uint8_t pc8801_state::fdc_8255_c_r() { // machine().scheduler().synchronize(); // force resync return m_i8255_0_pc >> 4; } -WRITE8_MEMBER(pc8801_state::fdc_8255_c_w) +void pc8801_state::fdc_8255_c_w(uint8_t data) { // machine().scheduler().synchronize(); // force resync @@ -2311,7 +2311,7 @@ void pc8801_state::pc8801_palette(palette_device &palette) const /* YM2203 Interface */ -READ8_MEMBER(pc8801_state::opn_porta_r) +uint8_t pc8801_state::opn_porta_r() { if(ioport("BOARD_CONFIG")->read() & 2) { @@ -2327,7 +2327,7 @@ READ8_MEMBER(pc8801_state::opn_porta_r) return ioport("OPN_PA")->read(); } -READ8_MEMBER(pc8801_state::opn_portb_r){ return ioport("OPN_PB")->read(); } +uint8_t pc8801_state::opn_portb_r(){ return ioport("OPN_PB")->read(); } /* Cassette Configuration */ WRITE_LINE_MEMBER( pc8801_state::txdata_callback ) diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp index 9fc79be6024..350c09cbf77 100644 --- a/src/mame/drivers/pc88va.cpp +++ b/src/mame/drivers/pc88va.cpp @@ -1378,27 +1378,27 @@ static GFXDECODE_START( gfx_pc88va ) GFXDECODE_ENTRY( nullptr, 0x00000, pc88va_kanji_16x16, 0, 1 ) GFXDECODE_END -READ8_MEMBER(pc88va_state::cpu_8255_c_r) +uint8_t pc88va_state::cpu_8255_c_r() { return m_i8255_1_pc >> 4; } -WRITE8_MEMBER(pc88va_state::cpu_8255_c_w) +void pc88va_state::cpu_8255_c_w(uint8_t data) { m_i8255_0_pc = data; } -READ8_MEMBER(pc88va_state::fdc_8255_c_r) +uint8_t pc88va_state::fdc_8255_c_r() { return m_i8255_0_pc >> 4; } -WRITE8_MEMBER(pc88va_state::fdc_8255_c_w) +void pc88va_state::fdc_8255_c_w(uint8_t data) { m_i8255_1_pc = data; } -READ8_MEMBER(pc88va_state::r232_ctrl_porta_r) +uint8_t pc88va_state::r232_ctrl_porta_r() { uint8_t sw5, sw4, sw3, sw2,speed_sw; @@ -1411,7 +1411,7 @@ READ8_MEMBER(pc88va_state::r232_ctrl_porta_r) return 0xc1 | sw5 | sw4 | sw3 | sw2 | speed_sw; } -READ8_MEMBER(pc88va_state::r232_ctrl_portb_r) +uint8_t pc88va_state::r232_ctrl_portb_r() { uint8_t xsw1; @@ -1420,27 +1420,27 @@ READ8_MEMBER(pc88va_state::r232_ctrl_portb_r) return 0xf7 | xsw1; } -READ8_MEMBER(pc88va_state::r232_ctrl_portc_r) +uint8_t pc88va_state::r232_ctrl_portc_r() { return 0xff; } -WRITE8_MEMBER(pc88va_state::r232_ctrl_porta_w) +void pc88va_state::r232_ctrl_porta_w(uint8_t data) { // ... } -WRITE8_MEMBER(pc88va_state::r232_ctrl_portb_w) +void pc88va_state::r232_ctrl_portb_w(uint8_t data) { // ... } -WRITE8_MEMBER(pc88va_state::r232_ctrl_portc_w) +void pc88va_state::r232_ctrl_portc_w(uint8_t data) { // ... } -READ8_MEMBER(pc88va_state::get_slave_ack) +uint8_t pc88va_state::get_slave_ack(offs_t offset) { if (offset==7) { // IRQ = 7 return m_pic2->acknowledge(); @@ -1552,13 +1552,13 @@ WRITE_LINE_MEMBER( pc88va_state::pc88va_tc_w ) } -READ8_MEMBER(pc88va_state::fdc_dma_r) +uint8_t pc88va_state::fdc_dma_r() { printf("R DMA\n"); return m_fdc->dma_r(); } -WRITE8_MEMBER(pc88va_state::fdc_dma_w) +void pc88va_state::fdc_dma_w(uint8_t data) { printf("W DMA %08x\n",data); m_fdc->dma_w(data); @@ -1573,13 +1573,13 @@ static void pc88va_floppies(device_slot_interface &device) device.option_add("525hd", FLOPPY_525_HD); } -READ8_MEMBER(pc88va_state::dma_memr_cb) +uint8_t pc88va_state::dma_memr_cb(offs_t offset) { printf("%08x\n",offset); return 0; } -WRITE8_MEMBER(pc88va_state::dma_memw_cb) +void pc88va_state::dma_memw_cb(offs_t offset, uint8_t data) { printf("%08x %02x\n",offset,data); } diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index 56739a1dc7a..bf951c87ce8 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -517,7 +517,7 @@ WRITE16_MEMBER(pc9801_state::ide_cs1_w) m_ide[m_ide_sel]->cs1_w(offset, data, mem_mask); } -READ8_MEMBER( pc9801_state::sasi_data_r ) +uint8_t pc9801_state::sasi_data_r() { uint8_t data = m_sasi_data_in->read(); @@ -526,7 +526,7 @@ READ8_MEMBER( pc9801_state::sasi_data_r ) return data; } -WRITE8_MEMBER( pc9801_state::sasi_data_w ) +void pc9801_state::sasi_data_w(uint8_t data) { m_sasi_data = data; @@ -1816,7 +1816,7 @@ ir7 */ -READ8_MEMBER(pc9801_state::get_slave_ack) +uint8_t pc9801_state::get_slave_ack(offs_t offset) { if (offset==7) { // IRQ = 7 return m_pic2->acknowledge(); @@ -1864,7 +1864,7 @@ WRITE_LINE_MEMBER(pc9801_state::tc_w ) // logerror("TC %02x\n",state); } -READ8_MEMBER(pc9801_state::dma_read_byte) +uint8_t pc9801_state::dma_read_byte(offs_t offset) { address_space &program = m_maincpu->space(AS_PROGRAM); offs_t addr = (m_dma_offset[m_dack] << 16) | offset; @@ -1890,7 +1890,7 @@ READ8_MEMBER(pc9801_state::dma_read_byte) } -WRITE8_MEMBER(pc9801_state::dma_write_byte) +void pc9801_state::dma_write_byte(offs_t offset, uint8_t data) { address_space &program = m_maincpu->space(AS_PROGRAM); offs_t addr = (m_dma_offset[m_dack] << 16) | offset; @@ -1936,12 +1936,12 @@ ch3 SCSI * ****************************************/ -WRITE8_MEMBER(pc9801_state::ppi_sys_portc_w) +void pc9801_state::ppi_sys_portc_w(uint8_t data) { m_beeper->set_state(!(data & 0x08)); } -READ8_MEMBER(pc9801_state::ppi_mouse_porta_r) +uint8_t pc9801_state::ppi_mouse_porta_r() { uint8_t res; uint8_t isporthi; @@ -1964,17 +1964,17 @@ READ8_MEMBER(pc9801_state::ppi_mouse_porta_r) return res; } -WRITE8_MEMBER(pc9801_state::ppi_mouse_porta_w) +void pc9801_state::ppi_mouse_porta_w(uint8_t data) { // logerror("A %02x\n",data); } -WRITE8_MEMBER(pc9801_state::ppi_mouse_portb_w) +void pc9801_state::ppi_mouse_portb_w(uint8_t data) { // logerror("B %02x\n",data); } -WRITE8_MEMBER(pc9801_state::ppi_mouse_portc_w) +void pc9801_state::ppi_mouse_portc_w(uint8_t data) { if((m_mouse.control & 0x80) == 0 && data & 0x80) { diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp index 5024113dc7a..eb79fa5685a 100644 --- a/src/mame/drivers/pcd.cpp +++ b/src/mame/drivers/pcd.cpp @@ -56,7 +56,7 @@ public: void pcd(machine_config &config); private: - DECLARE_READ8_MEMBER( irq_callback ); + uint8_t irq_callback(offs_t offset); TIMER_DEVICE_CALLBACK_MEMBER( timer0_tick ); DECLARE_WRITE_LINE_MEMBER( i186_timer1_w ); @@ -140,7 +140,7 @@ void pcd_state::machine_reset() m_mmu.type = 0; } -READ8_MEMBER( pcd_state::irq_callback ) +uint8_t pcd_state::irq_callback(offs_t offset) { return (offset ? m_pic2 : m_pic1)->acknowledge(); } diff --git a/src/mame/drivers/pcipc.cpp b/src/mame/drivers/pcipc.cpp index ec763435de8..55b305f2ac1 100644 --- a/src/mame/drivers/pcipc.cpp +++ b/src/mame/drivers/pcipc.cpp @@ -54,9 +54,9 @@ public: private: void pcipc_map(address_map &map); void pcipc_map_io(address_map &map); - DECLARE_WRITE8_MEMBER(boot_state_phoenix_w); - DECLARE_WRITE8_MEMBER(boot_state_phoenix_ver40_rev6_w); - DECLARE_WRITE8_MEMBER(boot_state_award_w); + void boot_state_phoenix_w(uint8_t data); + void boot_state_phoenix_ver40_rev6_w(uint8_t data); + void boot_state_award_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; @@ -439,7 +439,7 @@ const pcipc_state::boot_state_info pcipc_state::boot_state_infos_award[] = { { 0, nullptr } }; -WRITE8_MEMBER(pcipc_state::boot_state_phoenix_w) +void pcipc_state::boot_state_phoenix_w(uint8_t data) { const char *desc = ""; for(int i=0; boot_state_infos_phoenix[i].message; i++) @@ -451,7 +451,7 @@ WRITE8_MEMBER(pcipc_state::boot_state_phoenix_w) } -WRITE8_MEMBER(pcipc_state::boot_state_phoenix_ver40_rev6_w) +void pcipc_state::boot_state_phoenix_ver40_rev6_w(uint8_t data) { const char *desc = ""; for(int i=0; boot_state_infos_phoenix_ver40_rev6[i].message; i++) @@ -464,7 +464,7 @@ WRITE8_MEMBER(pcipc_state::boot_state_phoenix_ver40_rev6_w) } -WRITE8_MEMBER(pcipc_state::boot_state_award_w) +void pcipc_state::boot_state_award_w(uint8_t data) { const char *desc = ""; for(int i=0; boot_state_infos_award[i].message; i++) diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp index 2d5168d910b..5f905a01f21 100644 --- a/src/mame/drivers/peoplepc.cpp +++ b/src/mame/drivers/peoplepc.cpp @@ -78,7 +78,7 @@ private: std::vector<uint8_t> m_charram; MC6845_UPDATE_ROW(update_row); - DECLARE_READ8_MEMBER(get_slave_ack); + uint8_t get_slave_ack(offs_t offset); DECLARE_WRITE16_MEMBER(charram_w); DECLARE_WRITE_LINE_MEMBER(tty_clock_tick_w); DECLARE_WRITE_LINE_MEMBER(kbd_clock_tick_w); @@ -86,8 +86,8 @@ private: DECLARE_WRITE8_MEMBER(p7c_w); DECLARE_WRITE_LINE_MEMBER(tc_w); DECLARE_WRITE_LINE_MEMBER(hrq_w); - DECLARE_READ8_MEMBER(memory_read_byte); - DECLARE_WRITE8_MEMBER(memory_write_byte); + uint8_t memory_read_byte(offs_t offset); + void memory_write_byte(offs_t offset, uint8_t data); DECLARE_FLOPPY_FORMATS( floppy_formats ); image_init_result floppy_load(floppy_image_device *dev); void floppy_unload(floppy_image_device *dev); @@ -141,7 +141,7 @@ MC6845_UPDATE_ROW(peoplepc_state::update_row) } } -READ8_MEMBER(peoplepc_state::get_slave_ack) +uint8_t peoplepc_state::get_slave_ack(offs_t offset) { if (offset == 7) return m_pic_1->acknowledge(); @@ -189,13 +189,13 @@ WRITE_LINE_MEMBER(peoplepc_state::hrq_w) m_dmac->hlda_w(state); } -READ8_MEMBER(peoplepc_state::memory_read_byte) +uint8_t peoplepc_state::memory_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); return prog_space.read_byte(offset | (m_dma0pg << 16)); } -WRITE8_MEMBER(peoplepc_state::memory_write_byte) +void peoplepc_state::memory_write_byte(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); prog_space.write_byte(offset | (m_dma0pg << 16), data); diff --git a/src/mame/drivers/phc25.cpp b/src/mame/drivers/phc25.cpp index 4a4632b98e9..b6f162e6690 100644 --- a/src/mame/drivers/phc25.cpp +++ b/src/mame/drivers/phc25.cpp @@ -266,7 +266,7 @@ INPUT_PORTS_END /* Video */ -READ8_MEMBER( phc25_state::video_ram_r ) +uint8_t phc25_state::video_ram_r(offs_t offset) { if (BIT(m_port40, 7)) // graphics { diff --git a/src/mame/drivers/photon.cpp b/src/mame/drivers/photon.cpp index 8dcb71f8453..b76998e7a50 100644 --- a/src/mame/drivers/photon.cpp +++ b/src/mame/drivers/photon.cpp @@ -43,9 +43,8 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE8_MEMBER(_80_porta_w); - DECLARE_READ8_MEMBER(_80_portb_r); - DECLARE_WRITE8_MEMBER(_80_portc_w); + uint8_t _80_portb_r(); + void _80_portc_w(uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -123,17 +122,12 @@ void photon_state::set_bank(uint8_t data) } } -WRITE8_MEMBER(photon_state::_80_porta_w) -{ - set_bank(data); -} - -READ8_MEMBER(photon_state::_80_portb_r) +uint8_t photon_state::_80_portb_r() { return 0xff; } -WRITE8_MEMBER(photon_state::_80_portc_w) +void photon_state::_80_portc_w(uint8_t data) { m_speaker->level_w(BIT(data, 7)); } @@ -235,7 +229,7 @@ void photon_state::photon(machine_config &config) PALETTE(config, "palette", FUNC(photon_state::pk8000_palette), 16); i8255_device &ppi1(I8255(config, "ppi8255_1")); - ppi1.out_pa_callback().set(FUNC(photon_state::_80_porta_w)); + ppi1.out_pa_callback().set(FUNC(photon_state::set_bank)); ppi1.in_pb_callback().set(FUNC(photon_state::_80_portb_r)); ppi1.out_pc_callback().set(FUNC(photon_state::_80_portc_w)); diff --git a/src/mame/drivers/piggypas.cpp b/src/mame/drivers/piggypas.cpp index 723e794241d..c816a490e07 100644 --- a/src/mame/drivers/piggypas.cpp +++ b/src/mame/drivers/piggypas.cpp @@ -42,12 +42,11 @@ private: void output_digits(); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE8_MEMBER(ctrl_w); - DECLARE_WRITE8_MEMBER(mcs51_tx_callback); - DECLARE_WRITE8_MEMBER(led_strobe_w); - DECLARE_READ8_MEMBER(lcd_latch_r); - DECLARE_WRITE8_MEMBER(lcd_latch_w); - DECLARE_WRITE8_MEMBER(lcd_control_w); + void ctrl_w(uint8_t data); + void mcs51_tx_callback(uint8_t data); + void led_strobe_w(uint8_t data); + void lcd_latch_w(uint8_t data); + void lcd_control_w(uint8_t data); HD44780_PIXEL_UPDATE(piggypas_pixel_update); required_device<mcs51_cpu_device> m_maincpu; @@ -72,7 +71,7 @@ void piggypas_state::output_digits() m_digits[3] = bitswap<8>((m_digit_latch >> 24) & 0xff, 7,6,4,3,2,1,0,5) & 0x7f; } -WRITE8_MEMBER(piggypas_state::ctrl_w) +void piggypas_state::ctrl_w(uint8_t data) { if (!BIT(data, 2) && BIT(m_ctrl, 2)) output_digits(); @@ -82,30 +81,25 @@ WRITE8_MEMBER(piggypas_state::ctrl_w) m_ctrl = data; } -WRITE8_MEMBER(piggypas_state::mcs51_tx_callback) +void piggypas_state::mcs51_tx_callback(uint8_t data) { m_digit_latch = (m_digit_latch >> 8) | (u32(data) << 24); } -WRITE8_MEMBER(piggypas_state::led_strobe_w) +void piggypas_state::led_strobe_w(uint8_t data) { if (!BIT(data, 0)) m_digit_latch = 0; } -READ8_MEMBER(piggypas_state::lcd_latch_r) -{ - return m_hd44780->db_r(); -} - -WRITE8_MEMBER(piggypas_state::lcd_latch_w) +void piggypas_state::lcd_latch_w(uint8_t data) { // P1.7 might also be used to reset DS1232 watchdog m_lcd_latch = data; m_hd44780->db_w(data); } -WRITE8_MEMBER(piggypas_state::lcd_control_w) +void piggypas_state::lcd_control_w(uint8_t data) { // RXD (P3.0) = chip select // TXD (P3.1) = register select @@ -240,7 +234,7 @@ void piggypas_state::fidlstix(machine_config &config) m_maincpu->set_addrmap(AS_IO, &piggypas_state::fidlstix_io); m_maincpu->serial_tx_cb().set_nop(); - m_maincpu->port_in_cb<1>().set(FUNC(piggypas_state::lcd_latch_r)); + m_maincpu->port_in_cb<1>().set(m_hd44780, FUNC(hd44780_device::db_r)); m_maincpu->port_out_cb<1>().set(FUNC(piggypas_state::lcd_latch_w)); m_maincpu->port_out_cb<3>().set(FUNC(piggypas_state::lcd_control_w)); } diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp index 5879f28940a..d20651108d8 100644 --- a/src/mame/drivers/pipeline.cpp +++ b/src/mame/drivers/pipeline.cpp @@ -105,10 +105,10 @@ protected: private: DECLARE_WRITE8_MEMBER(vram2_w); DECLARE_WRITE8_MEMBER(vram1_w); - DECLARE_WRITE8_MEMBER(mcu_porta_w); - DECLARE_WRITE8_MEMBER(vidctrl_w); - DECLARE_READ8_MEMBER(protection_r); - DECLARE_WRITE8_MEMBER(protection_w); + void mcu_porta_w(uint8_t data); + void vidctrl_w(uint8_t data); + uint8_t protection_r(); + void protection_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); TILE_GET_INFO_MEMBER(get_tile_info2); @@ -177,7 +177,7 @@ u32 pipeline_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c } -WRITE8_MEMBER(pipeline_state::vidctrl_w) +void pipeline_state::vidctrl_w(uint8_t data) { m_vidctrl = data; } @@ -206,7 +206,7 @@ WRITE8_MEMBER(pipeline_state::vram1_w) m_vram1[offset] = data; } -READ8_MEMBER(pipeline_state::protection_r) +uint8_t pipeline_state::protection_r() { return m_from_mcu; } @@ -216,7 +216,7 @@ TIMER_CALLBACK_MEMBER(pipeline_state::protection_deferred_w) m_mcu->pa_w(param); } -WRITE8_MEMBER(pipeline_state::protection_w) +void pipeline_state::protection_w(uint8_t data) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(pipeline_state::protection_deferred_w),this), data); machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(100)); @@ -248,7 +248,7 @@ void pipeline_state::sound_port(address_map &map) map(0x06, 0x07).noprw(); } -WRITE8_MEMBER(pipeline_state::mcu_porta_w) +void pipeline_state::mcu_porta_w(uint8_t data) { m_from_mcu = data; } diff --git a/src/mame/drivers/polyplay.cpp b/src/mame/drivers/polyplay.cpp index e1c572457b9..e1fa2775038 100644 --- a/src/mame/drivers/polyplay.cpp +++ b/src/mame/drivers/polyplay.cpp @@ -163,24 +163,24 @@ WRITE_LINE_MEMBER(polyplay_state::ctc_zc2_w) //osd_printf_verbose("ctc_z2_w: %02x\n", state); } -READ8_MEMBER(polyplay_state::pio_porta_r) +uint8_t polyplay_state::pio_porta_r() { return m_in0_port->read(); } -WRITE8_MEMBER(polyplay_state::pio_porta_w) +void polyplay_state::pio_porta_w(uint8_t data) { //osd_printf_verbose("pio_porta_w: %02x\n", data); } -READ8_MEMBER(polyplay_state::pio_portb_r) +uint8_t polyplay_state::pio_portb_r() { uint8_t result = 0x00; //osd_printf_verbose("pio_portb_r: %02x\n", result); return result; } -WRITE8_MEMBER(polyplay_state::pio_portb_w) +void polyplay_state::pio_portb_w(uint8_t data) { uint8_t const lightState = data & 0x07; //uint8_t soundState = data & 0xe0; diff --git a/src/mame/drivers/popeye.cpp b/src/mame/drivers/popeye.cpp index bbc3273da6b..7d35f994a83 100644 --- a/src/mame/drivers/popeye.cpp +++ b/src/mame/drivers/popeye.cpp @@ -84,7 +84,7 @@ void tpp2_state::decrypt_rom() std::copy_n(buffer.begin(), len, rom); } -WRITE8_MEMBER(tnx1_state::refresh_w) +void tnx1_state::refresh_w(offs_t offset, uint8_t data) { const bool nmi_enabled = ((offset >> 8) & 1) != 0; if (m_nmi_enabled != nmi_enabled) @@ -96,9 +96,9 @@ WRITE8_MEMBER(tnx1_state::refresh_w) } } -WRITE8_MEMBER(tpp2_state::refresh_w) +void tpp2_state::refresh_w(offs_t offset, uint8_t data) { - tnx1_state::refresh_w(space, offset, data, mem_mask); + tnx1_state::refresh_w(offset, data); m_watchdog_enabled = ((offset >> 9) & 1) != 0; } @@ -515,7 +515,7 @@ GFXDECODE_END -WRITE8_MEMBER(tnx1_state::popeye_portB_w) +void tnx1_state::popeye_portB_w(uint8_t data) { /* bit 0 flips screen */ flip_screen_set(data & 1); diff --git a/src/mame/drivers/proconn.cpp b/src/mame/drivers/proconn.cpp index 2aa1366d7cc..f57a6e7677f 100644 --- a/src/mame/drivers/proconn.cpp +++ b/src/mame/drivers/proconn.cpp @@ -59,72 +59,72 @@ public: void init_proconn(); private: - template <unsigned N> DECLARE_WRITE8_MEMBER( ay_w ) { m_ay->address_data_w(N, data); } + template <unsigned N> void ay_w(uint8_t data) { m_ay->address_data_w(N, data); } - template <unsigned N> DECLARE_WRITE8_MEMBER( ctc_w ) { m_z80ctc->write(N, data); } + template <unsigned N> void ctc_w(uint8_t data) { m_z80ctc->write(N, data); } - template <unsigned N> DECLARE_WRITE8_MEMBER( sio_w ) { m_z80sio->cd_ba_w(N, data); } + template <unsigned N> void sio_w(uint8_t data) { m_z80sio->cd_ba_w(N, data); } - template <unsigned N> DECLARE_WRITE8_MEMBER( pio1_w ) { m_z80pio[0]->write(N, data); } - template <unsigned N> DECLARE_WRITE8_MEMBER( pio2_w ) { m_z80pio[1]->write(N, data); } - template <unsigned N> DECLARE_WRITE8_MEMBER( pio3_w ) { m_z80pio[2]->write(N, data); } - template <unsigned N> DECLARE_WRITE8_MEMBER( pio4_w ) { m_z80pio[3]->write(N, data); } - template <unsigned N> DECLARE_WRITE8_MEMBER( pio5_w ) { m_z80pio[4]->write(N, data); } + template <unsigned N> void pio1_w(uint8_t data) { m_z80pio[0]->write(N, data); } + template <unsigned N> void pio2_w(uint8_t data) { m_z80pio[1]->write(N, data); } + template <unsigned N> void pio3_w(uint8_t data) { m_z80pio[2]->write(N, data); } + template <unsigned N> void pio4_w(uint8_t data) { m_z80pio[3]->write(N, data); } + template <unsigned N> void pio5_w(uint8_t data) { m_z80pio[4]->write(N, data); } - template <unsigned N> DECLARE_READ8_MEMBER( ctc_r ) { return m_z80ctc->read(N); } + template <unsigned N> uint8_t ctc_r() { return m_z80ctc->read(N); } - template <unsigned N> DECLARE_READ8_MEMBER( sio_r ) { return m_z80sio->cd_ba_r(N); } + template <unsigned N> uint8_t sio_r() { return m_z80sio->cd_ba_r(N); } - template <unsigned N> DECLARE_READ8_MEMBER( pio1_r ) { return m_z80pio[0]->read(N); } - template <unsigned N> DECLARE_READ8_MEMBER( pio2_r ) { return m_z80pio[1]->read(N); } - template <unsigned N> DECLARE_READ8_MEMBER( pio3_r ) { return m_z80pio[2]->read(N); } - template <unsigned N> DECLARE_READ8_MEMBER( pio4_r ) { return m_z80pio[3]->read(N); } - template <unsigned N> DECLARE_READ8_MEMBER( pio5_r ) { return m_z80pio[4]->read(N); } + template <unsigned N> uint8_t pio1_r() { return m_z80pio[0]->read(N); } + template <unsigned N> uint8_t pio2_r() { return m_z80pio[1]->read(N); } + template <unsigned N> uint8_t pio3_r() { return m_z80pio[2]->read(N); } + template <unsigned N> uint8_t pio4_r() { return m_z80pio[3]->read(N); } + template <unsigned N> uint8_t pio5_r() { return m_z80pio[4]->read(N); } /* PIO 1 */ DECLARE_WRITE_LINE_MEMBER(pio_1_m_out_int_w) { /* logerror("pio_1_m_out_int_w %02x\n", state); */ } - DECLARE_READ8_MEMBER(pio_1_m_in_pa_r) { logerror("pio_1_m_in_pa_r (INPUT MATRIX)\n"); return machine().rand(); } - DECLARE_WRITE8_MEMBER(pio_1_m_out_pa_w) { logerror("pio_1_m_out_pa_w %02x\n", data); } + uint8_t pio_1_m_in_pa_r() { logerror("pio_1_m_in_pa_r (INPUT MATRIX)\n"); return machine().rand(); } + void pio_1_m_out_pa_w(uint8_t data) { logerror("pio_1_m_out_pa_w %02x\n", data); } DECLARE_WRITE_LINE_MEMBER(pio_1_m_out_ardy_w) { logerror("pio_1_m_out_ardy_w %02x\n", state); } - DECLARE_READ8_MEMBER(pio_1_m_in_pb_r) { logerror("pio_1_m_in_pb_r\n"); return 0x00; } - DECLARE_WRITE8_MEMBER(pio_1_m_out_pb_w) { logerror("pio_1_m_out_pb_w %02x (REELS)\n", data); } + uint8_t pio_1_m_in_pb_r() { logerror("pio_1_m_in_pb_r\n"); return 0x00; } + void pio_1_m_out_pb_w(uint8_t data) { logerror("pio_1_m_out_pb_w %02x (REELS)\n", data); } DECLARE_WRITE_LINE_MEMBER(pio_1_m_out_brdy_w) { logerror("pio_1_m_out_brdy_w %02x\n", state); } /* PIO 2 */ DECLARE_WRITE_LINE_MEMBER(pio_2_m_out_int_w) { /* logerror("pio_2_m_out_int_w %02x\n", state); */ } - DECLARE_READ8_MEMBER(pio_2_m_in_pa_r) { logerror("pio_2_m_in_pa_r\n"); return 0x00; } - DECLARE_WRITE8_MEMBER(pio_2_m_out_pa_w) { logerror("pio_2_m_out_pa_w %02x\n", data); } + uint8_t pio_2_m_in_pa_r() { logerror("pio_2_m_in_pa_r\n"); return 0x00; } + void pio_2_m_out_pa_w(uint8_t data) { logerror("pio_2_m_out_pa_w %02x\n", data); } DECLARE_WRITE_LINE_MEMBER(pio_2_m_out_ardy_w) { logerror("pio_2_m_out_ardy_w %02x\n", state); } - DECLARE_READ8_MEMBER(pio_2_m_in_pb_r) { logerror("pio_2_m_in_pb_r\n"); return 0x00; } - DECLARE_WRITE8_MEMBER(pio_2_m_out_pb_w) { logerror("pio_2_m_out_pb_w %02x (ALPHA)\n", data); } + uint8_t pio_2_m_in_pb_r() { logerror("pio_2_m_in_pb_r\n"); return 0x00; } + void pio_2_m_out_pb_w(uint8_t data) { logerror("pio_2_m_out_pb_w %02x (ALPHA)\n", data); } DECLARE_WRITE_LINE_MEMBER(pio_2_m_out_brdy_w) { logerror("pio_2_m_out_brdy_w %02x\n", state); } /* PIO 3 */ DECLARE_WRITE_LINE_MEMBER(pio_3_m_out_int_w) { /* logerror("pio_3_m_out_int_w %02x\n", state); */ } - DECLARE_READ8_MEMBER(pio_3_m_in_pa_r) { logerror("pio_3_m_in_pa_r (REEL OPTICS)\n"); return 0x00; } - DECLARE_WRITE8_MEMBER(pio_3_m_out_pa_w) { logerror("pio_3_m_out_pa_w %02x (STROBE)\n", data); } + uint8_t pio_3_m_in_pa_r() { logerror("pio_3_m_in_pa_r (REEL OPTICS)\n"); return 0x00; } + void pio_3_m_out_pa_w(uint8_t data) { logerror("pio_3_m_out_pa_w %02x (STROBE)\n", data); } DECLARE_WRITE_LINE_MEMBER(pio_3_m_out_ardy_w) { logerror("pio_3_m_out_ardy_w %02x\n", state); } - DECLARE_READ8_MEMBER(pio_3_m_in_pb_r) { logerror("pio_3_m_in_pb_r (COIN INPUT)\n"); return 0x00; } - DECLARE_WRITE8_MEMBER(pio_3_m_out_pb_w) { logerror("pio_3_m_out_pb_w %02x\n", data); } + uint8_t pio_3_m_in_pb_r() { logerror("pio_3_m_in_pb_r (COIN INPUT)\n"); return 0x00; } + void pio_3_m_out_pb_w(uint8_t data) { logerror("pio_3_m_out_pb_w %02x\n", data); } DECLARE_WRITE_LINE_MEMBER(pio_3_m_out_brdy_w) { logerror("pio_3_m_out_brdy_w %02x\n", state); } /* PIO 4 */ DECLARE_WRITE_LINE_MEMBER(pio_4_m_out_int_w) { /* logerror("pio_4_m_out_int_w %02x\n", state); */ } - DECLARE_READ8_MEMBER(pio_4_m_in_pa_r) { logerror("pio_4_m_in_pa_r\n"); return 0x00; } - DECLARE_WRITE8_MEMBER(pio_4_m_out_pa_w) { logerror("pio_4_m_out_pa_w %02x (TRIAC)\n", data); } + uint8_t pio_4_m_in_pa_r() { logerror("pio_4_m_in_pa_r\n"); return 0x00; } + void pio_4_m_out_pa_w(uint8_t data) { logerror("pio_4_m_out_pa_w %02x (TRIAC)\n", data); } DECLARE_WRITE_LINE_MEMBER(pio_4_m_out_ardy_w) { logerror("pio_4_m_out_ardy_w %02x\n", state); } - DECLARE_READ8_MEMBER(pio_4_m_in_pb_r) { logerror("pio_4_m_in_pb_r\n"); return 0x00; } - DECLARE_WRITE8_MEMBER(pio_4_m_out_pb_w) { logerror("pio_4_m_out_pb_w %02x (7SEG)\n", data); } + uint8_t pio_4_m_in_pb_r() { logerror("pio_4_m_in_pb_r\n"); return 0x00; } + void pio_4_m_out_pb_w(uint8_t data) { logerror("pio_4_m_out_pb_w %02x (7SEG)\n", data); } DECLARE_WRITE_LINE_MEMBER(pio_4_m_out_brdy_w) { logerror("pio_4_m_out_brdy_w %02x\n", state); } /* PIO 5 */ DECLARE_WRITE_LINE_MEMBER(pio_5_m_out_int_w) { /* logerror("pio_5_m_out_int_w %02x\n", state); */ } - DECLARE_READ8_MEMBER(pio_5_m_in_pa_r) { logerror("pio_5_m_in_pa_r\n"); return 0x00; } - DECLARE_WRITE8_MEMBER(pio_5_m_out_pa_w) { logerror("pio_5_m_out_pa_w %02x (LAMPS0)\n", data); } + uint8_t pio_5_m_in_pa_r() { logerror("pio_5_m_in_pa_r\n"); return 0x00; } + void pio_5_m_out_pa_w(uint8_t data) { logerror("pio_5_m_out_pa_w %02x (LAMPS0)\n", data); } DECLARE_WRITE_LINE_MEMBER(pio_5_m_out_ardy_w) { logerror("pio_5_m_out_ardy_w %02x\n", state); } - DECLARE_READ8_MEMBER(pio_5_m_in_pb_r) { logerror("pio_5_m_in_pb_r\n"); return 0x00; } - DECLARE_WRITE8_MEMBER(pio_5_m_out_pb_w) { logerror("pio_5_m_out_pb_w %02x (LAMPS1)\n", data); } + uint8_t pio_5_m_in_pb_r() { logerror("pio_5_m_in_pb_r\n"); return 0x00; } + void pio_5_m_out_pb_w(uint8_t data) { logerror("pio_5_m_out_pb_w %02x (LAMPS1)\n", data); } DECLARE_WRITE_LINE_MEMBER(pio_5_m_out_brdy_w) { logerror("pio_5_m_out_brdy_w %02x\n", state); } void proconn_map(address_map &map); @@ -141,7 +141,7 @@ private: int m_meter; virtual void machine_reset() override; - DECLARE_WRITE8_MEMBER(meter_w); + void meter_w(uint8_t data); DECLARE_WRITE16_MEMBER(serial_transmit); DECLARE_READ16_MEMBER(serial_receive); }; @@ -239,7 +239,7 @@ READ16_MEMBER(proconn_state::serial_receive) return -1; } -WRITE8_MEMBER(proconn_state::meter_w) +void proconn_state::meter_w(uint8_t data) { for (int i=0; i<8; i++) { diff --git a/src/mame/drivers/pve500.cpp b/src/mame/drivers/pve500.cpp index 30e3be2c217..2f3fb13d468 100644 --- a/src/mame/drivers/pve500.cpp +++ b/src/mame/drivers/pve500.cpp @@ -88,13 +88,13 @@ private: DECLARE_WRITE_LINE_MEMBER(cxdio_reset_w); DECLARE_WRITE_LINE_MEMBER(external_monitor_w); - DECLARE_READ8_MEMBER(io_ky_r); - DECLARE_WRITE8_MEMBER(io_sc_w); - DECLARE_WRITE8_MEMBER(io_le_w); - DECLARE_WRITE8_MEMBER(io_ld_w); - DECLARE_WRITE8_MEMBER(io_sel_w); - DECLARE_WRITE8_MEMBER(eeprom_w); - DECLARE_READ8_MEMBER(eeprom_r); + uint8_t io_ky_r(); + void io_sc_w(uint8_t data); + void io_le_w(uint8_t data); + void io_ld_w(uint8_t data); + void io_sel_w(uint8_t data); + void eeprom_w(uint8_t data); + uint8_t eeprom_r(); void maincpu_io(address_map &map); void maincpu_prg(address_map &map); void subcpu_io(address_map &map); @@ -282,19 +282,19 @@ WRITE_LINE_MEMBER(pve500_state::mb8421_intr) m_subcpu->trg1(state); } -READ8_MEMBER(pve500_state::eeprom_r) +uint8_t pve500_state::eeprom_r() { return (m_eeprom->ready_read() << 1) | m_eeprom->do_read(); } -WRITE8_MEMBER(pve500_state::eeprom_w) +void pve500_state::eeprom_w(uint8_t data) { m_eeprom->di_write( (data & (1 << 2)) ? ASSERT_LINE : CLEAR_LINE); m_eeprom->clk_write( (data & (1 << 3)) ? ASSERT_LINE : CLEAR_LINE); m_eeprom->cs_write( (data & (1 << 4)) ? ASSERT_LINE : CLEAR_LINE); } -READ8_MEMBER(pve500_state::io_ky_r) +uint8_t pve500_state::io_ky_r() { io_KY = 0x00; if (!BIT(io_SC, 0)) io_KY |= ioport("SCAN0")->read(); @@ -311,7 +311,7 @@ READ8_MEMBER(pve500_state::io_ky_r) return io_KY; } -WRITE8_MEMBER(pve500_state::io_sc_w) +void pve500_state::io_sc_w(uint8_t data) { const int swap[4] = {2,1,0,3}; @@ -332,7 +332,7 @@ WRITE8_MEMBER(pve500_state::io_sc_w) } } -WRITE8_MEMBER(pve500_state::io_le_w) +void pve500_state::io_le_w(uint8_t data) { #if LOG_7SEG_DISPLAY_SIGNALS printf("CXD1095 PORTB (io_LE=%02X)\n", data); @@ -340,7 +340,7 @@ WRITE8_MEMBER(pve500_state::io_le_w) io_LE = data; } -WRITE8_MEMBER(pve500_state::io_ld_w) +void pve500_state::io_ld_w(uint8_t data) { #if LOG_7SEG_DISPLAY_SIGNALS printf("CXD1095 PORTD (io_LD=%02X)\n", data); @@ -348,7 +348,7 @@ WRITE8_MEMBER(pve500_state::io_ld_w) io_LD = data; } -WRITE8_MEMBER(pve500_state::io_sel_w) +void pve500_state::io_sel_w(uint8_t data) { #if LOG_7SEG_DISPLAY_SIGNALS printf("CXD1095 PORTE (io_SEL=%02X)\n", data); diff --git a/src/mame/drivers/ql.cpp b/src/mame/drivers/ql.cpp index 77651a30e25..6838aba0a7a 100644 --- a/src/mame/drivers/ql.cpp +++ b/src/mame/drivers/ql.cpp @@ -169,11 +169,11 @@ private: DECLARE_WRITE8_MEMBER( write ); DECLARE_WRITE8_MEMBER( ipc_w ); - DECLARE_WRITE8_MEMBER( ipc_port1_w ); - DECLARE_WRITE8_MEMBER( ipc_port2_w ); - DECLARE_READ8_MEMBER( ipc_port2_r ); + void ipc_port1_w(uint8_t data); + void ipc_port2_w(uint8_t data); + uint8_t ipc_port2_r(); DECLARE_READ_LINE_MEMBER( ipc_t1_r ); - DECLARE_READ8_MEMBER( ipc_bus_r ); + uint8_t ipc_bus_r(); DECLARE_WRITE_LINE_MEMBER( ql_baudx4_w ); DECLARE_WRITE_LINE_MEMBER( ql_comdata_w ); DECLARE_WRITE_LINE_MEMBER( zx8302_mdselck_w ); @@ -340,7 +340,7 @@ WRITE8_MEMBER( ql_state::ipc_w ) // ipc_port1_w - //------------------------------------------------- -WRITE8_MEMBER( ql_state::ipc_port1_w ) +void ql_state::ipc_port1_w(uint8_t data) { /* @@ -365,7 +365,7 @@ WRITE8_MEMBER( ql_state::ipc_port1_w ) // ipc_port2_r - //------------------------------------------------- -READ8_MEMBER( ql_state::ipc_port2_r ) +uint8_t ql_state::ipc_port2_r() { /* @@ -398,7 +398,7 @@ READ8_MEMBER( ql_state::ipc_port2_r ) // ipc_port2_w - //------------------------------------------------- -WRITE8_MEMBER( ql_state::ipc_port2_w ) +void ql_state::ipc_port2_w(uint8_t data) { /* @@ -458,7 +458,7 @@ READ_LINE_MEMBER( ql_state::ipc_t1_r ) // ipc_bus_r - //------------------------------------------------- -READ8_MEMBER( ql_state::ipc_bus_r ) +uint8_t ql_state::ipc_bus_r() { /* diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp index a427aba3a8a..cd4cebdbbba 100644 --- a/src/mame/drivers/quizpun2.cpp +++ b/src/mame/drivers/quizpun2.cpp @@ -154,21 +154,21 @@ private: uint32_t screen_update_quizpun2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); // quizpun2 - DECLARE_WRITE8_MEMBER(cop_d_w); - DECLARE_WRITE8_MEMBER(cop_g_w); - DECLARE_READ8_MEMBER(cop_l_r); - DECLARE_WRITE8_MEMBER(cop_l_w); - DECLARE_READ8_MEMBER(cop_in_r); + void cop_d_w(uint8_t data); + void cop_g_w(uint8_t data); + uint8_t cop_l_r(); + void cop_l_w(uint8_t data); + uint8_t cop_in_r(); // quizpun - DECLARE_READ8_MEMBER(quizpun_68705_port_a_r); - DECLARE_WRITE8_MEMBER(quizpun_68705_port_a_w); + uint8_t quizpun_68705_port_a_r(); + void quizpun_68705_port_a_w(uint8_t data); - DECLARE_READ8_MEMBER(quizpun_68705_port_b_r); - DECLARE_WRITE8_MEMBER(quizpun_68705_port_b_w); + uint8_t quizpun_68705_port_b_r(); + void quizpun_68705_port_b_w(uint8_t data); - DECLARE_READ8_MEMBER(quizpun_68705_port_c_r); - DECLARE_WRITE8_MEMBER(quizpun_68705_port_c_w); + uint8_t quizpun_68705_port_c_r(); + void quizpun_68705_port_c_w(uint8_t data); DECLARE_READ8_MEMBER(quizpun_protection_r); DECLARE_WRITE8_MEMBER(quizpun_protection_w); @@ -278,13 +278,13 @@ void quizpun2_state::machine_reset() m_mcu_pending = m_mcu_written = m_mcu_repeat = false; } -WRITE8_MEMBER(quizpun2_state::cop_d_w) +void quizpun2_state::cop_d_w(uint8_t data) { m_eeprom->cs_write(BIT(data, 0)); // bit 1 used to control second EEPROM??? } -WRITE8_MEMBER(quizpun2_state::cop_g_w) +void quizpun2_state::cop_g_w(uint8_t data) { if (BIT(m_mcu_control_port, 0) && !BIT(data, 0)) { @@ -295,18 +295,18 @@ WRITE8_MEMBER(quizpun2_state::cop_g_w) m_mcu_control_port = data; } -READ8_MEMBER(quizpun2_state::cop_l_r) +uint8_t quizpun2_state::cop_l_r() { return m_mcu_data_port; } -WRITE8_MEMBER(quizpun2_state::cop_l_w) +void quizpun2_state::cop_l_w(uint8_t data) { if (m_mcu_repeat) m_mcu_data_port = data; } -READ8_MEMBER(quizpun2_state::cop_in_r) +uint8_t quizpun2_state::cop_in_r() { return 8 | (m_mcu_written ? 4 : 2) | (m_mcu_pending ? 0 : 1); } @@ -411,13 +411,13 @@ WRITE8_MEMBER(quizpun2_state::quizpun_protection_w) // Port A - I/O with main cpu (data) -READ8_MEMBER(quizpun2_state::quizpun_68705_port_a_r) +uint8_t quizpun2_state::quizpun_68705_port_a_r() { // logerror("%s: port A read %02x\n", machine().describe_context(), m_mcu_data_port); return m_mcu_data_port; } -WRITE8_MEMBER(quizpun2_state::quizpun_68705_port_a_w) +void quizpun2_state::quizpun_68705_port_a_w(uint8_t data) { // logerror("%s: port A write %02x\n", machine().describe_context(), data); m_mcu_data_port = data; @@ -425,7 +425,7 @@ WRITE8_MEMBER(quizpun2_state::quizpun_68705_port_a_w) // Port B - I/O with main cpu (status) -READ8_MEMBER(quizpun2_state::quizpun_68705_port_b_r) +uint8_t quizpun2_state::quizpun_68705_port_b_r() { // bit 3: 0 = pending // bit 1: 0 = main cpu has written @@ -441,7 +441,7 @@ READ8_MEMBER(quizpun2_state::quizpun_68705_port_b_r) return ret; } -WRITE8_MEMBER(quizpun2_state::quizpun_68705_port_b_w) +void quizpun2_state::quizpun_68705_port_b_w(uint8_t data) { // logerror("%s: port B write %02x\n", machine().describe_context(), data); @@ -457,14 +457,14 @@ WRITE8_MEMBER(quizpun2_state::quizpun_68705_port_b_w) // Port C - EEPROM -READ8_MEMBER(quizpun2_state::quizpun_68705_port_c_r) +uint8_t quizpun2_state::quizpun_68705_port_c_r() { uint8_t const ret = 0xf7 | (m_eeprom->do_read() ? 0x08 : 0x00); // logerror("%s: port C read %02x\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(quizpun2_state::quizpun_68705_port_c_w) +void quizpun2_state::quizpun_68705_port_c_w(uint8_t data) { // latch the bit m_eeprom->di_write(BIT(data, 2)); diff --git a/src/mame/drivers/qvt102.cpp b/src/mame/drivers/qvt102.cpp index 5af6cd299a1..e84afe9ef5d 100644 --- a/src/mame/drivers/qvt102.cpp +++ b/src/mame/drivers/qvt102.cpp @@ -121,12 +121,12 @@ private: int m_kbd_data; // keyboard mcu - DECLARE_READ8_MEMBER(mcu_bus_r); - DECLARE_WRITE8_MEMBER(mcu_bus_w); + uint8_t mcu_bus_r(); + void mcu_bus_w(uint8_t data); DECLARE_READ_LINE_MEMBER(mcu_t0_r); DECLARE_READ_LINE_MEMBER(mcu_t1_r); - DECLARE_WRITE8_MEMBER(mcu_p1_w); - DECLARE_WRITE8_MEMBER(mcu_p2_w); + void mcu_p1_w(uint8_t data); + void mcu_p2_w(uint8_t data); uint8_t m_kbd_bus, m_kbd_p1, m_kbd_p2; }; @@ -354,12 +354,12 @@ INPUT_PORTS_END // -----21- unused // -------0 speaker -READ8_MEMBER(qvt102_state::mcu_bus_r) +uint8_t qvt102_state::mcu_bus_r() { return m_kbd_bus; } -WRITE8_MEMBER(qvt102_state::mcu_bus_w) +void qvt102_state::mcu_bus_w(uint8_t data) { m_speaker->level_w(BIT(data, 0)); m_kbd_bus = data; @@ -396,12 +396,12 @@ READ_LINE_MEMBER(qvt102_state::mcu_t1_r) return state; } -WRITE8_MEMBER(qvt102_state::mcu_p1_w) +void qvt102_state::mcu_p1_w(uint8_t data) { m_kbd_p1 = data; } -WRITE8_MEMBER(qvt102_state::mcu_p2_w) +void qvt102_state::mcu_p2_w(uint8_t data) { m_kbd_p2 = data; diff --git a/src/mame/drivers/qvt201.cpp b/src/mame/drivers/qvt201.cpp index 1a2733ab09f..cf2229f01aa 100644 --- a/src/mame/drivers/qvt201.cpp +++ b/src/mame/drivers/qvt201.cpp @@ -37,7 +37,7 @@ private: DECLARE_WRITE8_MEMBER(offset_w); DECLARE_WRITE8_MEMBER(keyboard_w); DECLARE_READ8_MEMBER(keyboard_r); - DECLARE_WRITE8_MEMBER(duart_out_w); + void duart_out_w(uint8_t data); void mem_map(address_map &map); @@ -68,7 +68,7 @@ READ8_MEMBER(qvt201_state::keyboard_r) return 1; } -WRITE8_MEMBER(qvt201_state::duart_out_w) +void qvt201_state::duart_out_w(uint8_t data) { // OP0 = RTS (EIA pin 4) // OP1 = DTR (EIA pin 20) diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp index bcda02f7285..19b05a18712 100644 --- a/src/mame/drivers/r9751.cpp +++ b/src/mame/drivers/r9751.cpp @@ -115,10 +115,10 @@ private: DECLARE_READ32_MEMBER(r9751_mmio_fff8_r); DECLARE_WRITE32_MEMBER(r9751_mmio_fff8_w); - DECLARE_READ8_MEMBER(pdc_dma_r); - DECLARE_WRITE8_MEMBER(pdc_dma_w); - DECLARE_READ8_MEMBER(smioc_dma_r); - DECLARE_WRITE8_MEMBER(smioc_dma_w); + uint8_t pdc_dma_r(offs_t offset); + void pdc_dma_w(uint8_t data); + uint8_t smioc_dma_r(offs_t offset); + void smioc_dma_w(offs_t offset, uint8_t data); void r9751_mem(address_map &map); @@ -529,7 +529,7 @@ void r9751_state::UnifiedTrace(u32 address, u32 data, const char* operation, con logerror("%s[%08X] => %08X (%s:%s) %s (%08X, %08X, %08X, %08X)\n", operation, address, data, Device, RegisterName==nullptr?"":RegisterName, extraText==nullptr?"":extraText, stacktrace[0], stacktrace[1], stacktrace[2], stacktrace[3]); } -READ8_MEMBER(r9751_state::pdc_dma_r) +uint8_t r9751_state::pdc_dma_r(offs_t offset) { /* This callback function takes the value written to 0xFF01000C as the bank offset */ uint32_t address = (fdd_dma_bank & 0x7FFFF800) + (offset & 0x3FFFF); @@ -537,7 +537,7 @@ READ8_MEMBER(r9751_state::pdc_dma_r) return m_maincpu->space(AS_PROGRAM).read_byte(address); } -WRITE8_MEMBER(r9751_state::pdc_dma_w) +void r9751_state::pdc_dma_w(uint8_t data) { /* This callback function takes the value written to 0xFF01000C as the bank offset */ uint32_t address = (fdd_dma_bank & 0x7FFFF800) + (m_pdc->fdd_68k_dma_address & 0x3FFFF); @@ -545,7 +545,7 @@ WRITE8_MEMBER(r9751_state::pdc_dma_w) if (TRACE_DMA) logerror("DMA WRITE: %08X DATA: %08X\n", address, data); } -READ8_MEMBER(r9751_state::smioc_dma_r) +uint8_t r9751_state::smioc_dma_r(offs_t offset) { /* This callback function takes the value written to 0xFF01000C as the bank offset */ uint32_t address = (smioc_dma_bank & 0x7FFFF800) + (offset*2 & 0x3FFFF); @@ -556,7 +556,7 @@ READ8_MEMBER(r9751_state::smioc_dma_r) return m_maincpu->space(AS_PROGRAM).read_word(address) & 0x00FF; } -WRITE8_MEMBER(r9751_state::smioc_dma_w) +void r9751_state::smioc_dma_w(offs_t offset, uint8_t data) { /* This callback function takes the value written to 0xFF01000C as the bank offset */ uint32_t address = (smioc_dma_bank & 0x7FFFF800) + (offset*2 & 0x3FFFF); diff --git a/src/mame/drivers/rbmk.cpp b/src/mame/drivers/rbmk.cpp index 21044699b3d..5e78c7a8dd1 100644 --- a/src/mame/drivers/rbmk.cpp +++ b/src/mame/drivers/rbmk.cpp @@ -115,7 +115,7 @@ private: DECLARE_WRITE16_MEMBER(tilebank_w); DECLARE_READ8_MEMBER(mcu_io_r); DECLARE_WRITE8_MEMBER(mcu_io_w); - DECLARE_WRITE8_MEMBER(mcu_io_mux_w); + void mcu_io_mux_w(uint8_t data); DECLARE_WRITE16_MEMBER(eeprom_w); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -240,7 +240,7 @@ WRITE8_MEMBER(rbmk_state::mcu_io_w) printf("Warning: mux data W = %02x",m_mux_data); } -WRITE8_MEMBER(rbmk_state::mcu_io_mux_w) +void rbmk_state::mcu_io_mux_w(uint8_t data) { m_mux_data = ~data; } diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp index 7c901446529..ed3f735b5e3 100644 --- a/src/mame/drivers/rc702.cpp +++ b/src/mame/drivers/rc702.cpp @@ -68,8 +68,8 @@ protected: virtual void machine_reset() override; private: - DECLARE_READ8_MEMBER(memory_read_byte); - DECLARE_WRITE8_MEMBER(memory_write_byte); + uint8_t memory_read_byte(offs_t offset); + void memory_write_byte(offs_t offset, uint8_t data); DECLARE_WRITE8_MEMBER(port14_w); DECLARE_WRITE8_MEMBER(port1c_w); DECLARE_WRITE_LINE_MEMBER(crtc_drq_w); @@ -301,12 +301,12 @@ WRITE_LINE_MEMBER( rc702_state::hreq_w ) m_dma->hack_w(state); // tell dma that bus has been granted } -READ8_MEMBER( rc702_state::memory_read_byte ) +uint8_t rc702_state::memory_read_byte(offs_t offset) { return m_maincpu->space(AS_PROGRAM).read_byte(offset); } -WRITE8_MEMBER( rc702_state::memory_write_byte ) +void rc702_state::memory_write_byte(offs_t offset, uint8_t data) { m_maincpu->space(AS_PROGRAM).write_byte(offset,data); } diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp index 4d8a899834d..31a64d73065 100644 --- a/src/mame/drivers/rc759.cpp +++ b/src/mame/drivers/rc759.cpp @@ -106,7 +106,7 @@ private: DECLARE_WRITE8_MEMBER(nvram_w); DECLARE_READ8_MEMBER(rtc_r); DECLARE_WRITE8_MEMBER(rtc_w); - DECLARE_READ8_MEMBER(irq_callback); + uint8_t irq_callback(); void rc759_io(address_map &map); void rc759_map(address_map &map); @@ -449,7 +449,7 @@ WRITE8_MEMBER( rc759_state::nvram_w ) m_nvram_mem[addr >> 1] = (m_nvram_mem[addr >> 1] & 0xf0) | (data & 0x0f); } -READ8_MEMBER( rc759_state::irq_callback ) +uint8_t rc759_state::irq_callback() { return m_pic->acknowledge(); } diff --git a/src/mame/drivers/re900.cpp b/src/mame/drivers/re900.cpp index f0727f18cb0..3835eb63de6 100644 --- a/src/mame/drivers/re900.cpp +++ b/src/mame/drivers/re900.cpp @@ -106,14 +106,14 @@ public: private: // common DECLARE_READ8_MEMBER(rom_r); - DECLARE_WRITE8_MEMBER(cpu_port_0_w); + void cpu_port_0_w(uint8_t data); DECLARE_WRITE8_MEMBER(watchdog_reset_w); // re900 specific - DECLARE_READ8_MEMBER(re_psg_portA_r); - DECLARE_READ8_MEMBER(re_psg_portB_r); - DECLARE_WRITE8_MEMBER(re_mux_port_A_w); - DECLARE_WRITE8_MEMBER(re_mux_port_B_w); + uint8_t re_psg_portA_r(); + uint8_t re_psg_portB_r(); + void re_mux_port_A_w(uint8_t data); + void re_mux_port_B_w(uint8_t data); void mem_io(address_map &map); void mem_prg(address_map &map); @@ -139,7 +139,7 @@ private: * Read Handlers * ****************/ -READ8_MEMBER(re900_state::re_psg_portA_r) +uint8_t re900_state::re_psg_portA_r() { if ((ioport("IN0")->read() & 0x01) == 0) { @@ -154,7 +154,7 @@ READ8_MEMBER(re900_state::re_psg_portA_r) return ioport("IN0")->read(); } -READ8_MEMBER(re900_state::re_psg_portB_r) +uint8_t re900_state::re_psg_portB_r() { uint8_t retval = 0xff; logerror("llamada a re_psg_portB_r\n"); @@ -214,13 +214,13 @@ READ8_MEMBER(re900_state::rom_r) * Write Handlers * ***********************/ -WRITE8_MEMBER(re900_state::re_mux_port_A_w) +void re900_state::re_mux_port_A_w(uint8_t data) { m_psg_pa = data; m_mux_data = ((data >> 2) & 0x3f) ^ 0x3f; } -WRITE8_MEMBER(re900_state::re_mux_port_B_w) +void re900_state::re_mux_port_B_w(uint8_t data) { uint8_t led; m_psg_pb = data; @@ -238,7 +238,7 @@ WRITE8_MEMBER(re900_state::re_mux_port_B_w) } } -WRITE8_MEMBER(re900_state::cpu_port_0_w) +void re900_state::cpu_port_0_w(uint8_t data) { // m_lamps[7] = 1 ^ ( (data >> 4) & 1); /* Cont. Sal */ // m_lamps[8] = 1 ^ ( (data >> 5) & 1); /* Cont. Ent */ diff --git a/src/mame/drivers/roland_cm32p.cpp b/src/mame/drivers/roland_cm32p.cpp index d595b02af8b..f6e693575c2 100644 --- a/src/mame/drivers/roland_cm32p.cpp +++ b/src/mame/drivers/roland_cm32p.cpp @@ -293,12 +293,12 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE16_MEMBER(midi_w); + void midi_w(u16 data); DECLARE_READ8_MEMBER(lcd_ctrl_r); DECLARE_WRITE8_MEMBER(lcd_ctrl_w); DECLARE_WRITE8_MEMBER(lcd_data_w); - DECLARE_READ16_MEMBER(port0_r); + u16 port0_r(); DECLARE_READ8_MEMBER(pcmrom_r); DECLARE_READ8_MEMBER(dsp_io_r); DECLARE_WRITE8_MEMBER(dsp_io_w); @@ -397,7 +397,7 @@ WRITE8_MEMBER(cm32p_state::lcd_data_w) lcd->data_w(data); } -WRITE16_MEMBER(cm32p_state::midi_w) +void cm32p_state::midi_w(u16 data) { logerror("midi_out %02x\n", data); midi = data; @@ -413,7 +413,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cm32p_state::midi_timer_cb) midi_timer->adjust(attotime::from_hz(1250)); } -READ16_MEMBER(cm32p_state::port0_r) +u16 cm32p_state::port0_r() { return service_port->read(); } diff --git a/src/mame/drivers/roland_mt32.cpp b/src/mame/drivers/roland_mt32.cpp index 2f6c0be316f..cb42651a018 100644 --- a/src/mame/drivers/roland_mt32.cpp +++ b/src/mame/drivers/roland_mt32.cpp @@ -212,12 +212,12 @@ private: DECLARE_WRITE8_MEMBER(bank_w); DECLARE_WRITE8_MEMBER(so_w); - DECLARE_WRITE16_MEMBER(midi_w); + void midi_w(uint16_t data); DECLARE_READ8_MEMBER(lcd_ctrl_r); DECLARE_WRITE8_MEMBER(lcd_ctrl_w); DECLARE_WRITE8_MEMBER(lcd_data_w); - DECLARE_READ16_MEMBER(port0_r); + uint16_t port0_r(); TIMER_DEVICE_CALLBACK_MEMBER(midi_timer_cb); TIMER_DEVICE_CALLBACK_MEMBER(samples_timer_cb); @@ -293,7 +293,7 @@ WRITE8_MEMBER(mt32_state::bank_w) membank("bank")->set_entry(data); } -WRITE16_MEMBER(mt32_state::midi_w) +void mt32_state::midi_w(uint16_t data) { logerror("midi_out %02x\n", data); midi = data; @@ -309,7 +309,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mt32_state::midi_timer_cb) midi_timer->adjust(attotime::from_hz(1250)); } -READ16_MEMBER(mt32_state::port0_r) +uint16_t mt32_state::port0_r() { return port0; } diff --git a/src/mame/drivers/roland_tb303.cpp b/src/mame/drivers/roland_tb303.cpp index 7596b78a4ce..ce9e8e003c5 100644 --- a/src/mame/drivers/roland_tb303.cpp +++ b/src/mame/drivers/roland_tb303.cpp @@ -50,15 +50,15 @@ private: u8 m_inp_mux; void refresh_ram(); - template<int N> DECLARE_WRITE8_MEMBER(ram_address_w); - DECLARE_WRITE8_MEMBER(ram_data_w); - DECLARE_READ8_MEMBER(ram_data_r); - DECLARE_WRITE8_MEMBER(strobe_w); + template<int N> void ram_address_w(u8 data); + void ram_data_w(u8 data); + u8 ram_data_r(); + void strobe_w(u8 data); void update_leds(); - DECLARE_WRITE8_MEMBER(led_w); - DECLARE_WRITE8_MEMBER(input_w); - DECLARE_READ8_MEMBER(input_r); + void led_w(u8 data); + void input_w(u8 data); + u8 input_r(offs_t offset); TIMER_DEVICE_CALLBACK_MEMBER(tp3_clock) { m_maincpu->set_input_line(0, ASSERT_LINE); } TIMER_DEVICE_CALLBACK_MEMBER(tp3_clear) { m_maincpu->set_input_line(0, CLEAR_LINE); } @@ -128,7 +128,7 @@ void tb303_state::refresh_ram() } template<int N> -WRITE8_MEMBER(tb303_state::ram_address_w) +void tb303_state::ram_address_w(u8 data) { // MCU D,F,E: RAM address m_ram_addrset[N] = data; @@ -138,14 +138,14 @@ WRITE8_MEMBER(tb303_state::ram_address_w) //.. } -WRITE8_MEMBER(tb303_state::ram_data_w) +void tb303_state::ram_data_w(u8 data) { // MCU C: RAM data m_ram_data = data; refresh_ram(); } -READ8_MEMBER(tb303_state::ram_data_r) +u8 tb303_state::ram_data_r() { // MCU C: RAM data if (m_ram_ce && !m_ram_we) @@ -154,7 +154,7 @@ READ8_MEMBER(tb303_state::ram_data_r) return 0; } -WRITE8_MEMBER(tb303_state::strobe_w) +void tb303_state::strobe_w(u8 data) { // MCU I0: RAM _WE m_ram_we = (data & 1) ? false : true; @@ -182,21 +182,21 @@ void tb303_state::update_leds() // todo: 4 more leds(see top-left part) } -WRITE8_MEMBER(tb303_state::led_w) +void tb303_state::led_w(u8 data) { // MCU G: leds state m_led_data = data; update_leds(); } -WRITE8_MEMBER(tb303_state::input_w) +void tb303_state::input_w(u8 data) { // MCU H: input/led mux m_inp_mux = data ^ 0xf; update_leds(); } -READ8_MEMBER(tb303_state::input_r) +u8 tb303_state::input_r(offs_t offset) { u8 data = 0; diff --git a/src/mame/drivers/rt1715.cpp b/src/mame/drivers/rt1715.cpp index 52a1d70f53c..9fb1a9b5baf 100644 --- a/src/mame/drivers/rt1715.cpp +++ b/src/mame/drivers/rt1715.cpp @@ -63,10 +63,10 @@ public: void rt1715w(machine_config &config); private: - DECLARE_READ8_MEMBER(memory_read_byte); - DECLARE_WRITE8_MEMBER(memory_write_byte); - DECLARE_READ8_MEMBER(io_read_byte); - DECLARE_WRITE8_MEMBER(io_write_byte); + uint8_t memory_read_byte(offs_t offset); + void memory_write_byte(offs_t offset, uint8_t data); + uint8_t io_read_byte(offs_t offset); + void io_write_byte(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(busreq_w); DECLARE_WRITE_LINE_MEMBER(tc_w); DECLARE_WRITE8_MEMBER(rt1715_floppy_enable); @@ -265,7 +265,7 @@ WRITE8_MEMBER(rt1715_state::rt1715w_set_bank) m_w = w; } -READ8_MEMBER(rt1715_state::memory_read_byte) +uint8_t rt1715_state::memory_read_byte(offs_t offset) { uint8_t data = 0; @@ -286,7 +286,7 @@ READ8_MEMBER(rt1715_state::memory_read_byte) return data; } -WRITE8_MEMBER(rt1715_state::memory_write_byte) +void rt1715_state::memory_write_byte(offs_t offset, uint8_t data) { switch (m_w) { @@ -304,13 +304,13 @@ WRITE8_MEMBER(rt1715_state::memory_write_byte) } } -READ8_MEMBER(rt1715_state::io_read_byte) +uint8_t rt1715_state::io_read_byte(offs_t offset) { address_space &prog_space = m_maincpu->space(AS_IO); return prog_space.read_byte(offset); } -WRITE8_MEMBER(rt1715_state::io_write_byte) +void rt1715_state::io_write_byte(offs_t offset, uint8_t data) { address_space &prog_space = m_maincpu->space(AS_IO); prog_space.write_byte(offset, data); diff --git a/src/mame/drivers/rulechan.cpp b/src/mame/drivers/rulechan.cpp index bcb87ddfc3c..4753c8e8da4 100644 --- a/src/mame/drivers/rulechan.cpp +++ b/src/mame/drivers/rulechan.cpp @@ -219,13 +219,13 @@ protected: virtual void machine_start() override { m_lamps.resolve(); m_digits.resolve(); } private: - DECLARE_WRITE8_MEMBER(port0_w); - DECLARE_READ8_MEMBER(port2_r); - DECLARE_READ8_MEMBER(port30_r); - DECLARE_WRITE8_MEMBER(port31_w); - DECLARE_WRITE8_MEMBER(port32_w); - DECLARE_READ8_MEMBER(psg_portA_r); - DECLARE_READ8_MEMBER(psg_portB_r); + void port0_w(uint8_t data); + uint8_t port2_r(); + uint8_t port30_r(); + void port31_w(uint8_t data); + void port32_w(uint8_t data); + uint8_t psg_portA_r(); + uint8_t psg_portB_r(); TIMER_DEVICE_CALLBACK_MEMBER( ball_speed ); TIMER_DEVICE_CALLBACK_MEMBER( wheel_speed ); @@ -318,7 +318,7 @@ void rulechan_state::main_io(address_map &map) * Read Handlers * **************************/ -READ8_MEMBER(rulechan_state::port2_r) +uint8_t rulechan_state::port2_r() { return m_keymx[m_sline]->read(); } @@ -328,22 +328,22 @@ READ8_MEMBER(rulechan_state::port2_r) * bit 2 - ball detector * * bit 3 - step detector * * bit 4 - Zero detector * -* bit 5 - Ball in shotter * +* bit 5 - Ball in shooter * ******************************/ -READ8_MEMBER(rulechan_state::port30_r) +uint8_t rulechan_state::port30_r() { return m_p30; } -READ8_MEMBER(rulechan_state::psg_portA_r) +uint8_t rulechan_state::psg_portA_r() { m_lamps[60] = (BIT(m_aux->read(), 3)) ? 0 : 1; // Show Operator Key via layout lamp. m_lamps[61] = (BIT(m_aux->read(), 7)) ? 0 : 1; // Show Page Key via layout lamp. return m_aux->read(); // Operator Key read. } -READ8_MEMBER(rulechan_state::psg_portB_r) +uint8_t rulechan_state::psg_portB_r() { return m_dsw->read(); // DIP Switch read. } @@ -353,7 +353,7 @@ READ8_MEMBER(rulechan_state::psg_portB_r) * Write Handlers * ***********************/ -WRITE8_MEMBER(rulechan_state::port0_w) +void rulechan_state::port0_w(uint8_t data) { m_sline = data & 0x07; // Matrix scan line selector. @@ -368,7 +368,7 @@ WRITE8_MEMBER(rulechan_state::port0_w) * bit 7 - ball shooter * ****************************************/ -WRITE8_MEMBER(rulechan_state::port31_w) +void rulechan_state::port31_w(uint8_t data) { m_p31 = data; @@ -394,7 +394,7 @@ WRITE8_MEMBER(rulechan_state::port31_w) * * ****************************************/ -WRITE8_MEMBER(rulechan_state::port32_w) +void rulechan_state::port32_w(uint8_t data) { m_p32 = data; } diff --git a/src/mame/drivers/rzone.cpp b/src/mame/drivers/rzone.cpp index f4e24b5cbbd..4631779e9ec 100644 --- a/src/mame/drivers/rzone.cpp +++ b/src/mame/drivers/rzone.cpp @@ -68,13 +68,13 @@ private: DECLARE_WRITE_LINE_MEMBER(sclock_w); DECLARE_READ_LINE_MEMBER(sdata_r); - DECLARE_WRITE8_MEMBER(t1_write_r); - DECLARE_WRITE8_MEMBER(t1_write_s); + void t1_write_r(u8 data); + void t1_write_s(u8 data); virtual u8 input_r() override; void t2_update_audio(); - DECLARE_WRITE8_MEMBER(t2_write_r); - DECLARE_WRITE8_MEMBER(t2_write_s); + void t2_write_r(u8 data); + void t2_write_s(u8 data); virtual void machine_start() override; }; @@ -156,7 +156,7 @@ READ_LINE_MEMBER(rzone_state::sdata_r) // cartridge type 1: simple SM510 -WRITE8_MEMBER(rzone_state::t1_write_r) +void rzone_state::t1_write_r(u8 data) { // R1: Audio audio_w(data & 1); @@ -165,7 +165,7 @@ WRITE8_MEMBER(rzone_state::t1_write_r) sctrl_w(data >> 1 & 1); } -WRITE8_MEMBER(rzone_state::t1_write_s) +void rzone_state::t1_write_s(u8 data) { // S1: LED led_w(data & 1); @@ -188,14 +188,14 @@ void rzone_state::t2_update_audio() audio_w((m_s >> 2 & 1) | (m_r & 1)); } -WRITE8_MEMBER(rzone_state::t2_write_r) +void rzone_state::t2_write_r(u8 data) { // R: Audio m_r = data; t2_update_audio(); } -WRITE8_MEMBER(rzone_state::t2_write_s) +void rzone_state::t2_write_s(u8 data) { // S1: SCTRL sctrl_w(data & 1); diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp index a6a656a3229..716e1c0f0ae 100644 --- a/src/mame/drivers/sage2.cpp +++ b/src/mame/drivers/sage2.cpp @@ -164,7 +164,7 @@ INPUT_PORTS_END // I8255A INTERFACE( ppi0_intf ) //------------------------------------------------- -WRITE8_MEMBER( sage2_state::ppi0_pc_w ) +void sage2_state::ppi0_pc_w(uint8_t data) { /* @@ -239,7 +239,7 @@ WRITE_LINE_MEMBER(sage2_state::write_centronics_fault) m_centronics_fault = state; } -READ8_MEMBER( sage2_state::ppi1_pb_r ) +uint8_t sage2_state::ppi1_pb_r() { /* @@ -277,7 +277,7 @@ READ8_MEMBER( sage2_state::ppi1_pb_r ) return data; } -WRITE8_MEMBER( sage2_state::ppi1_pc_w ) +void sage2_state::ppi1_pc_w(uint8_t data) { /* diff --git a/src/mame/drivers/saitek_chesstrv.cpp b/src/mame/drivers/saitek_chesstrv.cpp index 677d0f0bee8..15697092325 100644 --- a/src/mame/drivers/saitek_chesstrv.cpp +++ b/src/mame/drivers/saitek_chesstrv.cpp @@ -59,15 +59,15 @@ private: void chesstrv_io(address_map &map); void update_display(); - DECLARE_WRITE8_MEMBER(matrix_w); - DECLARE_WRITE8_MEMBER(digit_w); - DECLARE_READ8_MEMBER(input_r); + void matrix_w(u8 data); + void digit_w(u8 data); + u8 input_r(); // 256 bytes data RAM accessed via I/O ports - DECLARE_READ8_MEMBER(ram_address_r) { return m_ram_address; } - DECLARE_WRITE8_MEMBER(ram_address_w) { m_ram_address = data; } - DECLARE_READ8_MEMBER(ram_data_r) { return m_ram[m_ram_address]; } - DECLARE_WRITE8_MEMBER(ram_data_w) { m_ram[m_ram_address] = data; } + u8 ram_address_r() { return m_ram_address; } + void ram_address_w(u8 data) { m_ram_address = data; } + u8 ram_data_r() { return m_ram[m_ram_address]; } + void ram_data_w(u8 data) { m_ram[m_ram_address] = data; } std::unique_ptr<u8[]> m_ram; u8 m_ram_address; @@ -103,21 +103,21 @@ void chesstrv_state::update_display() m_display->matrix(~m_inp_mux, m_7seg_data); } -WRITE8_MEMBER(chesstrv_state::digit_w) +void chesstrv_state::digit_w(u8 data) { // digit segments m_7seg_data = bitswap<8>(data,0,1,2,3,4,5,6,7) & 0x7f; update_display(); } -WRITE8_MEMBER(chesstrv_state::matrix_w) +void chesstrv_state::matrix_w(u8 data) { // d0-d3: input/digit select (active low) m_inp_mux = data; update_display(); } -READ8_MEMBER(chesstrv_state::input_r) +u8 chesstrv_state::input_r() { u8 data = m_inp_mux; diff --git a/src/mame/drivers/saitek_mark5.cpp b/src/mame/drivers/saitek_mark5.cpp index a603213aca6..2badd34d8de 100644 --- a/src/mame/drivers/saitek_mark5.cpp +++ b/src/mame/drivers/saitek_mark5.cpp @@ -119,8 +119,8 @@ private: DECLARE_WRITE8_MEMBER(cb_w); DECLARE_READ8_MEMBER(cb_r); - template<int N> DECLARE_WRITE8_MEMBER(pwm_output_w); - template<int N> DECLARE_WRITE64_MEMBER(lcd_output_w); + template<int N> void pwm_output_w(offs_t offset, u8 data); + template<int N> void lcd_output_w(u64 data); u8 m_dac_data = 0; u8 m_lcd_lcd = 0; @@ -167,13 +167,13 @@ READ8_MEMBER(mark5_state::nvram_r) } template<int N> -WRITE8_MEMBER(mark5_state::pwm_output_w) +void mark5_state::pwm_output_w(offs_t offset, u8 data) { m_out_x[N][offset & 0x3f][offset >> 6] = data; } template<int N> -WRITE64_MEMBER(mark5_state::lcd_output_w) +void mark5_state::lcd_output_w(u64 data) { if (N == 0) { diff --git a/src/mame/drivers/saitek_ssystem3.cpp b/src/mame/drivers/saitek_ssystem3.cpp index 52ca087e903..28f7212cf28 100644 --- a/src/mame/drivers/saitek_ssystem3.cpp +++ b/src/mame/drivers/saitek_ssystem3.cpp @@ -122,13 +122,13 @@ private: void ssystem4_map(address_map &map); // I/O handlers - DECLARE_WRITE32_MEMBER(lcd_q_w) { m_lcd_q = data; } + void lcd_q_w(u32 data) { m_lcd_q = data; } DECLARE_WRITE8_MEMBER(nvram_w); DECLARE_READ8_MEMBER(nvram_r); - DECLARE_WRITE8_MEMBER(input_w); - DECLARE_READ8_MEMBER(input_r); - DECLARE_WRITE8_MEMBER(control_w); - DECLARE_READ8_MEMBER(control_r); + void input_w(u8 data); + u8 input_r(); + void control_w(u8 data); + u8 control_r(); u8 m_inp_mux = 0; u8 m_control = 0; @@ -164,13 +164,13 @@ READ8_MEMBER(ssystem3_state::nvram_r) return (m_inputs[5]->read() & 1) ? (m_nvram[offset] & 0x0f) : 0; } -WRITE8_MEMBER(ssystem3_state::input_w) +void ssystem3_state::input_w(u8 data) { // PA0-PA7: input mux m_inp_mux = ~data; } -READ8_MEMBER(ssystem3_state::input_r) +u8 ssystem3_state::input_r() { u8 data = m_inp_mux; @@ -192,7 +192,7 @@ READ8_MEMBER(ssystem3_state::input_r) return ~data; } -WRITE8_MEMBER(ssystem3_state::control_w) +void ssystem3_state::control_w(u8 data) { // PB0: speaker out m_dac->write(~data & m_inputs[4]->read() & 1); @@ -226,7 +226,7 @@ WRITE8_MEMBER(ssystem3_state::control_w) m_control = data; } -READ8_MEMBER(ssystem3_state::control_r) +u8 ssystem3_state::control_r() { // PB4: device busy // PB5: device attached? diff --git a/src/mame/drivers/sg1000.cpp b/src/mame/drivers/sg1000.cpp index 3d63c8fb6a9..cd4da9f7f2f 100644 --- a/src/mame/drivers/sg1000.cpp +++ b/src/mame/drivers/sg1000.cpp @@ -375,7 +375,7 @@ WRITE_LINE_MEMBER( sf7000_state::write_centronics_busy ) m_centronics_busy = state; } -READ8_MEMBER( sf7000_state::ppi_pa_r ) +uint8_t sf7000_state::ppi_pa_r() { /* Signal Description @@ -399,7 +399,7 @@ READ8_MEMBER( sf7000_state::ppi_pa_r ) return data; } -WRITE8_MEMBER( sf7000_state::ppi_pc_w ) +void sf7000_state::ppi_pc_w(uint8_t data) { /* Signal Description diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp index 2760cd9c401..745f173c151 100644 --- a/src/mame/drivers/shangkid.cpp +++ b/src/mame/drivers/shangkid.cpp @@ -132,14 +132,14 @@ WRITE_LINE_MEMBER(shangkid_state::coin_counter_2_w) machine().bookkeeping().coin_counter_w(1, state); } -WRITE8_MEMBER(shangkid_state::chinhero_ay8910_porta_w) +void shangkid_state::chinhero_ay8910_porta_w(uint8_t data) { if (BIT(data, 0)) /* 0->1 transition triggers interrupt on Sound CPU */ m_audiocpu->set_input_line(0, HOLD_LINE ); } -WRITE8_MEMBER(shangkid_state::shangkid_ay8910_porta_w) +void shangkid_state::shangkid_ay8910_porta_w(uint8_t data) { if (BIT(data, 0)) /* 0->1 transition triggers interrupt on Sound CPU */ @@ -148,7 +148,7 @@ WRITE8_MEMBER(shangkid_state::shangkid_ay8910_porta_w) membank("bank2")->set_entry((data & 0xfe) ? 0 : 1); } -WRITE8_MEMBER(shangkid_state::ay8910_portb_w) +void shangkid_state::ay8910_portb_w(uint8_t data) { m_sound_latch = data; } diff --git a/src/mame/drivers/skeetsht.cpp b/src/mame/drivers/skeetsht.cpp index 5d317a90dc1..74e9f460158 100644 --- a/src/mame/drivers/skeetsht.cpp +++ b/src/mame/drivers/skeetsht.cpp @@ -53,7 +53,7 @@ private: DECLARE_WRITE16_MEMBER(ramdac_w); DECLARE_WRITE8_MEMBER(tms_w); DECLARE_READ8_MEMBER(tms_r); - DECLARE_WRITE8_MEMBER(hc11_porta_w); + void hc11_porta_w(uint8_t data); DECLARE_WRITE8_MEMBER(ay8910_w); DECLARE_WRITE_LINE_MEMBER(tms_irq); TMS340X0_SCANLINE_RGB32_CB_MEMBER(scanline_update); @@ -160,7 +160,7 @@ READ8_MEMBER(skeetsht_state::tms_r) * *************************************/ -WRITE8_MEMBER(skeetsht_state::hc11_porta_w) +void skeetsht_state::hc11_porta_w(uint8_t data) { if (!(data & 0x8) && (m_porta_latch & 8)) m_ay_sel = m_porta_latch & 0x10; diff --git a/src/mame/drivers/slicer.cpp b/src/mame/drivers/slicer.cpp index 127c57ef842..d95430082c9 100644 --- a/src/mame/drivers/slicer.cpp +++ b/src/mame/drivers/slicer.cpp @@ -28,7 +28,7 @@ public: void slicer(machine_config &config); private: - DECLARE_WRITE8_MEMBER(sio_out_w); + void sio_out_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(drive_size_w); template<unsigned int drive> DECLARE_WRITE_LINE_MEMBER(drive_sel_w); @@ -39,7 +39,7 @@ private: required_device<scsi_port_device> m_sasi; }; -WRITE8_MEMBER(slicer_state::sio_out_w) +void slicer_state::sio_out_w(uint8_t data) { floppy_image_device *floppy; int state = (data & 0x80) ? 0 : 1; diff --git a/src/mame/drivers/sliver.cpp b/src/mame/drivers/sliver.cpp index 97a02dc5dc6..a8f234ad1d0 100644 --- a/src/mame/drivers/sliver.cpp +++ b/src/mame/drivers/sliver.cpp @@ -128,7 +128,7 @@ private: DECLARE_WRITE16_MEMBER(io_offset_w); DECLARE_WRITE16_MEMBER(io_data_w); DECLARE_WRITE16_MEMBER(sound_w); - DECLARE_WRITE8_MEMBER(oki_setbank); + void oki_setbank(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(obj_irq_cb); @@ -386,7 +386,7 @@ void sliver_state::sliver_map(address_map &map) // Sound CPU -WRITE8_MEMBER(sliver_state::oki_setbank) +void sliver_state::oki_setbank(uint8_t data) { int bank=(data^0xff)&3; //xor or not ? membank("okibank")->set_entry(bank); diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp index e65fe0782f6..1205938351b 100644 --- a/src/mame/drivers/spc1000.cpp +++ b/src/mame/drivers/spc1000.cpp @@ -163,9 +163,9 @@ private: DECLARE_WRITE_LINE_MEMBER(irq_w); DECLARE_WRITE8_MEMBER(gmode_w); DECLARE_READ8_MEMBER(gmode_r); - DECLARE_READ8_MEMBER(porta_r); + uint8_t porta_r(); DECLARE_WRITE_LINE_MEMBER( centronics_busy_w ) { m_centronics_busy = state; } - DECLARE_READ8_MEMBER(mc6847_videoram_r); + uint8_t mc6847_videoram_r(offs_t offset); DECLARE_WRITE8_MEMBER(cass_w); DECLARE_READ8_MEMBER(keyboard_r); MC6847_GET_CHARROM_MEMBER(get_char_rom) @@ -415,7 +415,7 @@ void spc1000_state::machine_reset() m_IPLK = 1; } -READ8_MEMBER(spc1000_state::mc6847_videoram_r) +uint8_t spc1000_state::mc6847_videoram_r(offs_t offset) { if (offset == ~0) return 0xff; @@ -436,7 +436,7 @@ READ8_MEMBER(spc1000_state::mc6847_videoram_r) } } -READ8_MEMBER( spc1000_state::porta_r ) +uint8_t spc1000_state::porta_r() { uint8_t data = 0x3f; data |= (m_cass->input() > 0.0038) ? 0x80 : 0; diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp index 963b729622f..a9853e47ddc 100644 --- a/src/mame/drivers/spc1500.cpp +++ b/src/mame/drivers/spc1500.cpp @@ -265,8 +265,8 @@ public: void spc1500(machine_config &config); private: - DECLARE_READ8_MEMBER(psga_r); - DECLARE_READ8_MEMBER(porta_r); + uint8_t psga_r(); + uint8_t porta_r(); DECLARE_WRITE_LINE_MEMBER( centronics_busy_w ) { m_centronics_busy = state; } DECLARE_READ8_MEMBER(mc6845_videoram_r); DECLARE_READ8_MEMBER(keyboard_r); @@ -284,10 +284,10 @@ private: DECLARE_READ8_MEMBER(crtc_r); DECLARE_WRITE8_MEMBER(romsel); DECLARE_WRITE8_MEMBER(ramsel); - DECLARE_WRITE8_MEMBER(portb_w); - DECLARE_WRITE8_MEMBER(psgb_w); - DECLARE_WRITE8_MEMBER(portc_w); - DECLARE_READ8_MEMBER(portb_r); + void portb_w(uint8_t data); + void psgb_w(uint8_t data); + void portc_w(uint8_t data); + uint8_t portb_r(); DECLARE_WRITE8_MEMBER(double_w); DECLARE_READ8_MEMBER(io_r); void spc_palette(palette_device &palette) const; @@ -361,12 +361,12 @@ WRITE8_MEMBER( spc1500_state::ramsel) membank("bank1")->set_entry(2); } -WRITE8_MEMBER( spc1500_state::portb_w) +void spc1500_state::portb_w(uint8_t data) { // m_ipl = data & (1 << 1); } -WRITE8_MEMBER( spc1500_state::psgb_w) +void spc1500_state::psgb_w(uint8_t data) { int elapsed_time = m_timer->elapsed().as_attoseconds()/ATTOSECONDS_PER_MICROSECOND; if (m_ipl != ((data>>1)&1)) @@ -383,7 +383,7 @@ WRITE8_MEMBER( spc1500_state::psgb_w) m_motor = BIT(data, 7); } -WRITE8_MEMBER( spc1500_state::portc_w) +void spc1500_state::portc_w(uint8_t data) { m_cass->output(BIT(data, 0) ? -1.0 : 1.0); m_centronics->write_strobe(BIT(data, 7)); @@ -392,7 +392,7 @@ WRITE8_MEMBER( spc1500_state::portc_w) m_vdg->set_unscaled_clock(VDP_CLOCK/(BIT(data, 2) ? 48 : 24)); } -READ8_MEMBER( spc1500_state::portb_r) +uint8_t spc1500_state::portb_r() { uint8_t data = 0; data |= ((m_cass->get_state() & CASSETTE_MASK_UISTATE) == CASSETTE_STOPPED || ((m_cass->get_state() & CASSETTE_MASK_MOTOR) == CASSETTE_MOTOR_DISABLED)); @@ -859,7 +859,7 @@ READ8_MEMBER(spc1500_state::mc6845_videoram_r) return m_p_videoram[offset]; } -READ8_MEMBER( spc1500_state::psga_r ) +uint8_t spc1500_state::psga_r() { uint8_t data = 0; data |= (BIT(m_dipsw->read(),1)<<4) | (BIT(m_dipsw->read(),2)<<7); @@ -867,7 +867,7 @@ READ8_MEMBER( spc1500_state::psga_r ) return data; } -READ8_MEMBER( spc1500_state::porta_r ) +uint8_t spc1500_state::porta_r() { uint8_t data = 0x3f; data |= (m_cass->input() > 0.0038) ? 0x80 : 0; diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp index 6f55b46c3eb..5a356207306 100644 --- a/src/mame/drivers/studio2.cpp +++ b/src/mame/drivers/studio2.cpp @@ -300,7 +300,7 @@ private: virtual void machine_start() override; - DECLARE_WRITE8_MEMBER( dma_w ); + void dma_w(offs_t offset, uint8_t data); void visicom_io_map(address_map &map); void visicom_map(address_map &map); }; @@ -322,7 +322,7 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE8_MEMBER( dma_w ); + void dma_w(offs_t offset, uint8_t data); DECLARE_READ_LINE_MEMBER( rdata_r ); DECLARE_READ_LINE_MEMBER( bdata_r ); DECLARE_READ_LINE_MEMBER( gdata_r ); @@ -506,7 +506,7 @@ WRITE_LINE_MEMBER( studio2_state::q_w ) m_beeper->set_state(state); } -WRITE8_MEMBER( visicom_state::dma_w ) +void visicom_state::dma_w(offs_t offset, uint8_t data) { int sx = m_screen->hpos() + 4; int y = m_screen->vpos(); @@ -524,7 +524,7 @@ WRITE8_MEMBER( visicom_state::dma_w ) } } -WRITE8_MEMBER( mpt02_state::dma_w ) +void mpt02_state::dma_w(offs_t offset, uint8_t data) { uint8_t addr = ((offset & 0xe0) >> 2) | (offset & 0x07); diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp index 39913af6bcb..4017cf800d8 100644 --- a/src/mame/drivers/stuntair.cpp +++ b/src/mame/drivers/stuntair.cpp @@ -145,7 +145,7 @@ private: DECLARE_WRITE_LINE_MEMBER(spritebank1_w); DECLARE_WRITE8_MEMBER(stuntair_coin_w); DECLARE_WRITE8_MEMBER(stuntair_sound_w); - DECLARE_WRITE8_MEMBER(ay8910_portb_w); + void ay8910_portb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(stuntair_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_stuntair(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -483,7 +483,7 @@ GFXDECODE_END ***************************************************************************/ -WRITE8_MEMBER(stuntair_state::ay8910_portb_w) +void stuntair_state::ay8910_portb_w(uint8_t data) { // it writes $e8 and $f0 for music drums? // possibly to discrete sound circuitry? diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp index 33170a0cddd..c8ad3c61672 100644 --- a/src/mame/drivers/svmu.cpp +++ b/src/mame/drivers/svmu.cpp @@ -47,7 +47,7 @@ protected: private: LC8670_LCD_UPDATE(svmu_lcd_update); void svmu_palette(palette_device &palette) const; - DECLARE_WRITE8_MEMBER(page_w); + void page_w(uint8_t data); DECLARE_READ8_MEMBER(prog_r); DECLARE_WRITE8_MEMBER(prog_w); DECLARE_READ8_MEMBER(p1_r); @@ -67,7 +67,7 @@ private: }; -WRITE8_MEMBER(svmu_state::page_w) +void svmu_state::page_w(uint8_t data) { m_page = data & 0x03; } diff --git a/src/mame/drivers/sym1.cpp b/src/mame/drivers/sym1.cpp index 009ddc32314..00894483427 100644 --- a/src/mame/drivers/sym1.cpp +++ b/src/mame/drivers/sym1.cpp @@ -78,11 +78,11 @@ private: DECLARE_WRITE_LINE_MEMBER(sym1_74145_output_3_w); DECLARE_WRITE_LINE_MEMBER(sym1_74145_output_4_w); DECLARE_WRITE_LINE_MEMBER(sym1_74145_output_5_w); - DECLARE_READ8_MEMBER(riot_a_r); - DECLARE_READ8_MEMBER(riot_b_r); - DECLARE_WRITE8_MEMBER(riot_a_w); - DECLARE_WRITE8_MEMBER(riot_b_w); - DECLARE_WRITE8_MEMBER(via3_a_w); + uint8_t riot_a_r(); + uint8_t riot_b_r(); + void riot_a_w(uint8_t data); + void riot_b_w(uint8_t data); + void via3_a_w(uint8_t data); void sym1_map(address_map &map); @@ -113,7 +113,7 @@ TIMER_CALLBACK_MEMBER(sym1_state::led_refresh) m_digits[param] = m_riot_port_a; } -READ8_MEMBER(sym1_state::riot_a_r) +uint8_t sym1_state::riot_a_r() { int data = 0x7f; @@ -130,7 +130,7 @@ READ8_MEMBER(sym1_state::riot_a_r) return data; } -READ8_MEMBER(sym1_state::riot_b_r) +uint8_t sym1_state::riot_b_r() { int data = 0x3f; @@ -155,7 +155,7 @@ READ8_MEMBER(sym1_state::riot_b_r) return data; } -WRITE8_MEMBER(sym1_state::riot_a_w) +void sym1_state::riot_a_w(uint8_t data) { logerror("%x: riot_a_w 0x%02x\n", m_maincpu->pc(), data); @@ -163,7 +163,7 @@ WRITE8_MEMBER(sym1_state::riot_a_w) m_riot_port_a = data; } -WRITE8_MEMBER(sym1_state::riot_b_w) +void sym1_state::riot_b_w(uint8_t data) { logerror("%x: riot_b_w 0x%02x\n", m_maincpu->pc(), data); @@ -252,7 +252,7 @@ INPUT_PORTS_END PA2: Write protect RAM 0x800-0xbff PA3: Write protect RAM 0xc00-0xfff */ -WRITE8_MEMBER( sym1_state::via3_a_w ) +void sym1_state::via3_a_w(uint8_t data) { address_space &cpu0space = m_maincpu->space( AS_PROGRAM ); diff --git a/src/mame/drivers/talkingbb.cpp b/src/mame/drivers/talkingbb.cpp index f70bf1def1a..8f8a8a62209 100644 --- a/src/mame/drivers/talkingbb.cpp +++ b/src/mame/drivers/talkingbb.cpp @@ -146,11 +146,11 @@ private: u8 m_inp_mux; // I/O handlers - DECLARE_WRITE8_MEMBER(bank_w); + void bank_w(u8 data); DECLARE_READ8_MEMBER(bank_r); DECLARE_WRITE8_MEMBER(input_w); DECLARE_READ8_MEMBER(input_r); - DECLARE_READ8_MEMBER(switch_r); + u8 switch_r(); }; void talkingbb_state::machine_start() @@ -170,7 +170,7 @@ void talkingbb_state::machine_start() I/O ******************************************************************************/ -WRITE8_MEMBER(talkingbb_state::bank_w) +void talkingbb_state::bank_w(u8 data) { // d0-d1: upper rom bank // d2-d4: upper rom enable (bus conflict possible) @@ -216,7 +216,7 @@ READ8_MEMBER(talkingbb_state::input_r) return ~data; } -READ8_MEMBER(talkingbb_state::switch_r) +u8 talkingbb_state::switch_r() { // d5: mode switch return ~m_inputs[4]->read(); diff --git a/src/mame/drivers/talkingfb.cpp b/src/mame/drivers/talkingfb.cpp index b1070044ea4..98335b3f60e 100644 --- a/src/mame/drivers/talkingfb.cpp +++ b/src/mame/drivers/talkingfb.cpp @@ -64,7 +64,7 @@ private: u8 m_inp_mux; // I/O handlers - DECLARE_WRITE8_MEMBER(bank_w); + void bank_w(u8 data); template<int Psen> DECLARE_READ8_MEMBER(bank_r); DECLARE_WRITE8_MEMBER(input_w); DECLARE_READ8_MEMBER(input_r); @@ -87,7 +87,7 @@ void talkingfb_state::machine_start() I/O ******************************************************************************/ -WRITE8_MEMBER(talkingfb_state::bank_w) +void talkingfb_state::bank_w(u8 data) { // d0-d2: upper rom bank // d3-d5: upper rom enable (bus conflict possible) diff --git a/src/mame/drivers/taxidriv.cpp b/src/mame/drivers/taxidriv.cpp index bc720f2d429..2a0e6bd0d76 100644 --- a/src/mame/drivers/taxidriv.cpp +++ b/src/mame/drivers/taxidriv.cpp @@ -33,33 +33,33 @@ void taxidriv_state::machine_start() save_item(NAME(m_spritectrl)); } -WRITE8_MEMBER(taxidriv_state::p2a_w){ spritectrl_w(space,0,data); } -WRITE8_MEMBER(taxidriv_state::p2b_w){ spritectrl_w(space,1,data); } -WRITE8_MEMBER(taxidriv_state::p2c_w){ spritectrl_w(space,2,data); } -WRITE8_MEMBER(taxidriv_state::p3a_w){ spritectrl_w(space,3,data); } -WRITE8_MEMBER(taxidriv_state::p3b_w){ spritectrl_w(space,4,data); } -WRITE8_MEMBER(taxidriv_state::p3c_w){ spritectrl_w(space,5,data); } -WRITE8_MEMBER(taxidriv_state::p4a_w){ spritectrl_w(space,6,data); } -WRITE8_MEMBER(taxidriv_state::p4b_w){ spritectrl_w(space,7,data); } -WRITE8_MEMBER(taxidriv_state::p4c_w){ spritectrl_w(space,8,data); } - - -READ8_MEMBER(taxidriv_state::p0a_r) +void taxidriv_state::p2a_w(uint8_t data) { spritectrl_w(0,data); } +void taxidriv_state::p2b_w(uint8_t data) { spritectrl_w(1,data); } +void taxidriv_state::p2c_w(uint8_t data) { spritectrl_w(2,data); } +void taxidriv_state::p3a_w(uint8_t data) { spritectrl_w(3,data); } +void taxidriv_state::p3b_w(uint8_t data) { spritectrl_w(4,data); } +void taxidriv_state::p3c_w(uint8_t data) { spritectrl_w(5,data); } +void taxidriv_state::p4a_w(uint8_t data) { spritectrl_w(6,data); } +void taxidriv_state::p4b_w(uint8_t data) { spritectrl_w(7,data); } +void taxidriv_state::p4c_w(uint8_t data) { spritectrl_w(8,data); } + + +uint8_t taxidriv_state::p0a_r() { return m_latchA; } -READ8_MEMBER(taxidriv_state::p0c_r) +uint8_t taxidriv_state::p0c_r() { return (m_s1 << 7); } -WRITE8_MEMBER(taxidriv_state::p0b_w) +void taxidriv_state::p0b_w(uint8_t data) { m_latchB = data; } -WRITE8_MEMBER(taxidriv_state::p0c_w) +void taxidriv_state::p0c_w(uint8_t data) { m_s2 = data & 1; @@ -72,40 +72,40 @@ WRITE8_MEMBER(taxidriv_state::p0c_w) // popmessage("%02x",data&0x0f); } -READ8_MEMBER(taxidriv_state::p1b_r) +uint8_t taxidriv_state::p1b_r() { return m_latchB; } -READ8_MEMBER(taxidriv_state::p1c_r) +uint8_t taxidriv_state::p1c_r() { return (m_s2 << 7) | (m_s4 << 6) | ((ioport("SERVCOIN")->read() & 1) << 4); } -WRITE8_MEMBER(taxidriv_state::p1a_w) +void taxidriv_state::p1a_w(uint8_t data) { m_latchA = data; } -WRITE8_MEMBER(taxidriv_state::p1c_w) +void taxidriv_state::p1c_w(uint8_t data) { m_s1 = data & 1; m_s3 = (data & 2) >> 1; } -READ8_MEMBER(taxidriv_state::p8910_0a_r) +uint8_t taxidriv_state::p8910_0a_r() { return m_latchA; } -READ8_MEMBER(taxidriv_state::p8910_1a_r) +uint8_t taxidriv_state::p8910_1a_r() { return m_s3; } /* note that a lot of writes happen with port B set as input. I think this is a bug in the original, since it works anyway even if the communication is flawed. */ -WRITE8_MEMBER(taxidriv_state::p8910_0b_w) +void taxidriv_state::p8910_0b_w(uint8_t data) { m_s4 = data & 1; } diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp index fc1e2ea4ece..1b780bd057e 100644 --- a/src/mame/drivers/thayers.cpp +++ b/src/mame/drivers/thayers.cpp @@ -84,14 +84,14 @@ private: DECLARE_READ8_MEMBER(irqstate_r); DECLARE_WRITE8_MEMBER(timer_int_ack_w); DECLARE_WRITE8_MEMBER(data_rdy_int_ack_w); - DECLARE_WRITE8_MEMBER(cop_d_w); + void cop_d_w(uint8_t data); DECLARE_READ8_MEMBER(cop_data_r); DECLARE_WRITE8_MEMBER(cop_data_w); - DECLARE_READ8_MEMBER(cop_l_r); - DECLARE_WRITE8_MEMBER(cop_l_w); - DECLARE_READ8_MEMBER(cop_g_r); + uint8_t cop_l_r(); + void cop_l_w(uint8_t data); + uint8_t cop_g_r(); DECLARE_WRITE8_MEMBER(control_w); - DECLARE_WRITE8_MEMBER(cop_g_w); + void cop_g_w(uint8_t data); DECLARE_READ_LINE_MEMBER(kbdata_r); DECLARE_WRITE_LINE_MEMBER(kbclk_w); DECLARE_WRITE8_MEMBER(control2_w); @@ -196,7 +196,7 @@ WRITE8_MEMBER(thayers_state::data_rdy_int_ack_w) check_interrupt(); } -WRITE8_MEMBER(thayers_state::cop_d_w) +void thayers_state::cop_d_w(uint8_t data) { /* @@ -244,7 +244,7 @@ WRITE8_MEMBER(thayers_state::cop_data_w) if (LOG) logerror("COP DATA %02x\n", m_cop_data_latch); } -READ8_MEMBER(thayers_state::cop_l_r) +uint8_t thayers_state::cop_l_r() { if (!m_cop_data_latch_enable) { @@ -256,13 +256,13 @@ READ8_MEMBER(thayers_state::cop_l_r) } } -WRITE8_MEMBER(thayers_state::cop_l_w) +void thayers_state::cop_l_w(uint8_t data) { m_cop_l = data; if (LOG) logerror("COP L %02x\n", m_cop_l); } -READ8_MEMBER(thayers_state::cop_g_r) +uint8_t thayers_state::cop_g_r() { /* @@ -299,7 +299,7 @@ WRITE8_MEMBER(thayers_state::control_w) if (LOG) logerror("COP G0..2 %u\n", m_cop_cmd_latch); } -WRITE8_MEMBER(thayers_state::cop_g_w) +void thayers_state::cop_g_w(uint8_t data) { /* diff --git a/src/mame/drivers/truco.cpp b/src/mame/drivers/truco.cpp index 4e06e5a6058..3fd05e658a5 100644 --- a/src/mame/drivers/truco.cpp +++ b/src/mame/drivers/truco.cpp @@ -220,7 +220,7 @@ * Read/Write Handlers * *******************************************/ -WRITE8_MEMBER(truco_state::porta_w) +void truco_state::porta_w(uint8_t data) { logerror("Port A writes: %2x\n", data); } @@ -238,7 +238,7 @@ WRITE_LINE_MEMBER(truco_state::pia_ca2_w) m_watchdog->watchdog_reset(); } -WRITE8_MEMBER(truco_state::portb_w) +void truco_state::portb_w(uint8_t data) { m_dac->write(BIT(data, 7)); /* Isolated the bit for Delta-Sigma DAC */ diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp index 89a2a71b62b..f92a10796be 100644 --- a/src/mame/drivers/tugboat.cpp +++ b/src/mame/drivers/tugboat.cpp @@ -78,8 +78,8 @@ private: DECLARE_WRITE8_MEMBER(hd46505_0_w); DECLARE_WRITE8_MEMBER(hd46505_1_w); DECLARE_WRITE8_MEMBER(score_w); - DECLARE_READ8_MEMBER(input_r); - DECLARE_WRITE8_MEMBER(ctrl_w); + uint8_t input_r(); + void ctrl_w(uint8_t data); void tugboat_palette(palette_device &palette) const; @@ -193,7 +193,7 @@ uint32_t tugboat_state::screen_update(screen_device &screen, bitmap_ind16 &bitma -READ8_MEMBER(tugboat_state::input_r) +uint8_t tugboat_state::input_r() { if (~m_ctrl & 0x80) return ioport("IN0")->read(); @@ -207,7 +207,7 @@ READ8_MEMBER(tugboat_state::input_r) return ioport("IN4")->read(); } -WRITE8_MEMBER(tugboat_state::ctrl_w) +void tugboat_state::ctrl_w(uint8_t data) { m_ctrl = data; } diff --git a/src/mame/drivers/uchroma68.cpp b/src/mame/drivers/uchroma68.cpp index f57f6df03d7..ca7eef4524e 100644 --- a/src/mame/drivers/uchroma68.cpp +++ b/src/mame/drivers/uchroma68.cpp @@ -176,10 +176,10 @@ private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - DECLARE_READ8_MEMBER(mc6847_videoram_r); - DECLARE_READ8_MEMBER(pia_pa_r); - DECLARE_READ8_MEMBER(pia_pb_r); - DECLARE_WRITE8_MEMBER(mc6846_out_w); + uint8_t mc6847_videoram_r(offs_t offset); + uint8_t pia_pa_r(); + uint8_t pia_pb_r(); + void mc6846_out_w(uint8_t data); void kbd_put(uint8_t data); emu_timer *m_kbd_strobe_timer; bool m_kbd_strobe; @@ -262,7 +262,7 @@ void uchroma68_state::device_timer(emu_timer &timer, device_timer_id id, int par } } -WRITE8_MEMBER(uchroma68_state::mc6846_out_w) +void uchroma68_state::mc6846_out_w(uint8_t data) { m_mc6847->css_w(!BIT(data, 0)); m_mc6847->intext_w(!BIT(data, 1)); @@ -275,7 +275,7 @@ WRITE8_MEMBER(uchroma68_state::mc6846_out_w) } -READ8_MEMBER(uchroma68_state::mc6847_videoram_r) +uint8_t uchroma68_state::mc6847_videoram_r(offs_t offset) { offset &= 0x1fff; if (offset > 0x17ff) return 0xff; @@ -303,13 +303,13 @@ void uchroma68_state::kbd_put(uint8_t data) m_kbd_strobe = 0; } -READ8_MEMBER(uchroma68_state::pia_pa_r) +uint8_t uchroma68_state::pia_pa_r() { uint8_t data = m_kbd_data; return (m_kbd_strobe << 7) | data; } -READ8_MEMBER(uchroma68_state::pia_pb_r) +uint8_t uchroma68_state::pia_pb_r() { // PB0 to PB4 are Up, Down, Left, Right, Home. // PB5 is NC diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp index 5d66f583be4..ecf231b4e92 100644 --- a/src/mame/drivers/unkhorse.cpp +++ b/src/mame/drivers/unkhorse.cpp @@ -52,8 +52,8 @@ private: DECLARE_READ8_MEMBER(colorram_r) { return m_colorram[(offset >> 2 & 0x1e0) | (offset & 0x1f)] | 0x0f; } DECLARE_WRITE8_MEMBER(colorram_w) { m_colorram[(offset >> 2 & 0x1e0) | (offset & 0x1f)] = data & 0xf0; } - DECLARE_READ8_MEMBER(input_r); - DECLARE_WRITE8_MEMBER(output_w); + uint8_t input_r(); + void output_w(uint8_t data); virtual void machine_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -115,12 +115,12 @@ void horse_state::horse_io_map(address_map &map) } -READ8_MEMBER(horse_state::input_r) +uint8_t horse_state::input_r() { return m_inputs[m_output >> 6 & 3]->read(); } -WRITE8_MEMBER(horse_state::output_w) +void horse_state::output_w(uint8_t data) { m_output = data; diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp index 5eb10c304ae..4936fff9160 100644 --- a/src/mame/drivers/vixen.cpp +++ b/src/mame/drivers/vixen.cpp @@ -456,7 +456,7 @@ DISCRETE_SOUND_END // I8155 interface //------------------------------------------------- -READ8_MEMBER( vixen_state::i8155_pa_r ) +uint8_t vixen_state::i8155_pa_r() { uint8_t data = 0xff; @@ -466,12 +466,12 @@ READ8_MEMBER( vixen_state::i8155_pa_r ) return data; } -WRITE8_MEMBER( vixen_state::i8155_pb_w ) +void vixen_state::i8155_pb_w(uint8_t data) { m_col = data; } -WRITE8_MEMBER( vixen_state::i8155_pc_w ) +void vixen_state::i8155_pc_w(uint8_t data) { /* @@ -513,7 +513,7 @@ WRITE8_MEMBER( vixen_state::i8155_pc_w ) // I8155 IO interface //------------------------------------------------- -WRITE8_MEMBER( vixen_state::io_i8155_pb_w ) +void vixen_state::io_i8155_pb_w(uint8_t data) { /* @@ -555,7 +555,7 @@ WRITE8_MEMBER( vixen_state::io_i8155_pb_w ) m_ieee488->host_ren_w(BIT(data, 7)); } -WRITE8_MEMBER( vixen_state::io_i8155_pc_w ) +void vixen_state::io_i8155_pc_w(uint8_t data) { /* diff --git a/src/mame/drivers/vt1682.cpp b/src/mame/drivers/vt1682.cpp index ae2e3653965..76a75557d54 100644 --- a/src/mame/drivers/vt1682.cpp +++ b/src/mame/drivers/vt1682.cpp @@ -629,17 +629,17 @@ public: void intech_interact(machine_config& config); void intech_interact_bank(machine_config& config); - virtual DECLARE_READ8_MEMBER(porta_r); - virtual DECLARE_READ8_MEMBER(portb_r) { return 0x00;/*uint8_t ret = machine().rand() & 0xf; LOGMASKED(LOG_OTHER, "%s: portb_r returning: %1x\n", machine().describe_context(), ret); return ret;*/ }; - virtual DECLARE_READ8_MEMBER(portc_r); - virtual DECLARE_READ8_MEMBER(portd_r) { return 0x00;/*uint8_t ret = machine().rand() & 0xf; LOGMASKED(LOG_OTHER, "%s: portd_r returning: %1x\n", machine().describe_context(), ret); return ret;*/ }; + virtual uint8_t porta_r(); + virtual uint8_t portb_r() { return 0x00;/*uint8_t ret = machine().rand() & 0xf; LOGMASKED(LOG_OTHER, "%s: portb_r returning: %1x\n", machine().describe_context(), ret); return ret;*/ }; + virtual uint8_t portc_r(); + virtual uint8_t portd_r() { return 0x00;/*uint8_t ret = machine().rand() & 0xf; LOGMASKED(LOG_OTHER, "%s: portd_r returning: %1x\n", machine().describe_context(), ret); return ret;*/ }; - DECLARE_WRITE8_MEMBER(porta_w); - DECLARE_WRITE8_MEMBER(portb_w); - DECLARE_WRITE8_MEMBER(portc_w) { LOGMASKED(LOG_OTHER, "%s: portc_w writing: %1x\n", machine().describe_context(), data & 0xf); }; - DECLARE_WRITE8_MEMBER(portd_w) { LOGMASKED(LOG_OTHER, "%s: portd_w writing: %1x\n", machine().describe_context(), data & 0xf); }; + void porta_w(uint8_t data); + void portb_w(uint8_t data); + void portc_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: portc_w writing: %1x\n", machine().describe_context(), data & 0xf); }; + void portd_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: portd_w writing: %1x\n", machine().describe_context(), data & 0xf); }; - DECLARE_WRITE8_MEMBER(ext_rombank_w); + void ext_rombank_w(uint8_t data); protected: virtual void machine_start() override; @@ -669,8 +669,8 @@ public: void vt1682_dance(machine_config& config); protected: - DECLARE_READ8_MEMBER(uio_porta_r); - DECLARE_WRITE8_MEMBER(uio_porta_w); + uint8_t uio_porta_r(); + void uio_porta_w(uint8_t data); private: required_ioport m_io_p1; @@ -688,8 +688,8 @@ public: void vt1682_exsport(machine_config& config); void vt1682_exsportp(machine_config& config); - virtual DECLARE_READ8_MEMBER(uiob_r); - DECLARE_WRITE8_MEMBER(uiob_w); + virtual uint8_t uiob_r(); + void uiob_w(uint8_t data); protected: virtual void machine_start() override; @@ -5570,7 +5570,7 @@ void vt1682_exsport_state::machine_reset() m_p2_latch = 0; } -WRITE8_MEMBER(intec_interact_state::ext_rombank_w) +void intec_interact_state::ext_rombank_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: ext_rombank_w writing: %1x\n", machine().describe_context(), data); @@ -5588,7 +5588,7 @@ WRITE8_MEMBER(intec_interact_state::ext_rombank_w) }; -WRITE8_MEMBER(intec_interact_state::porta_w) +void intec_interact_state::porta_w(uint8_t data) { if (data != 0xf) { @@ -5692,7 +5692,7 @@ INPUT_PORTS_END // to move between games, why not? ram address 0x6c contains current selection if you want to manually change it to start // other games. maybe it's waiting on some status from the sound cpu? -READ8_MEMBER(intec_interact_state::porta_r) +uint8_t intec_interact_state::porta_r() { uint8_t ret = 0x0;// = machine().rand() & 0xf; @@ -5708,7 +5708,7 @@ READ8_MEMBER(intec_interact_state::porta_r) return ret; } -READ8_MEMBER(intec_interact_state::portc_r) +uint8_t intec_interact_state::portc_r() { uint8_t ret = 0x0; ret |= m_input_sense ^1; @@ -5716,7 +5716,7 @@ READ8_MEMBER(intec_interact_state::portc_r) return ret; } -WRITE8_MEMBER(intec_interact_state::portb_w) +void intec_interact_state::portb_w(uint8_t data) { LOGMASKED(LOG_OTHER, "%s: portb_w writing: %1x\n", machine().describe_context(), data & 0xf); @@ -5779,7 +5779,7 @@ void vt1682_exsport_state::clock_joy2() m_portb_shiftpos++; } -READ8_MEMBER(vt1682_exsport_state::uiob_r) +uint8_t vt1682_exsport_state::uiob_r() { int p1bit = (m_p1_latch >> m_portb_shiftpos) & 1; int p2bit = (m_p2_latch >> m_portb_shiftpos) & 1; @@ -5787,7 +5787,7 @@ READ8_MEMBER(vt1682_exsport_state::uiob_r) return (p1bit << 1) | (p2bit << 3); }; -WRITE8_MEMBER(vt1682_exsport_state::uiob_w) +void vt1682_exsport_state::uiob_w(uint8_t data) { if ((m_old_portb & 0x01) != (data & 0x01)) { @@ -5835,14 +5835,14 @@ void intec_interact_state::intech_interact(machine_config& config) -READ8_MEMBER(vt1682_dance_state::uio_porta_r) +uint8_t vt1682_dance_state::uio_porta_r() { uint8_t ret = m_io_p1->read(); logerror("%s: porta_r returning: %02x (INPUTS)\n", machine().describe_context(), ret); return ret; } -WRITE8_MEMBER(vt1682_dance_state::uio_porta_w) +void vt1682_dance_state::uio_porta_w(uint8_t data) { logerror("%s: porta_w writing: %02x (INPUTS)\n", machine().describe_context(), data); } diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp index b78b4125894..b08bd08a8f2 100644 --- a/src/mame/drivers/wpc_an.cpp +++ b/src/mame/drivers/wpc_an.cpp @@ -60,12 +60,12 @@ private: DECLARE_WRITE_LINE_MEMBER(wpcsnd_reply_w); DECLARE_WRITE_LINE_MEMBER(wpc_irq_w); DECLARE_WRITE_LINE_MEMBER(wpc_firq_w); - DECLARE_READ8_MEMBER(wpc_sound_ctrl_r); - DECLARE_WRITE8_MEMBER(wpc_sound_ctrl_w); - DECLARE_READ8_MEMBER(wpc_sound_data_r); - DECLARE_WRITE8_MEMBER(wpc_sound_data_w); - DECLARE_WRITE8_MEMBER(wpc_sound_s11_w); - DECLARE_WRITE8_MEMBER(wpc_rombank_w); + uint8_t wpc_sound_ctrl_r(); + void wpc_sound_ctrl_w(uint8_t data); + uint8_t wpc_sound_data_r(); + void wpc_sound_data_w(uint8_t data); + void wpc_sound_s11_w(uint8_t data); + void wpc_rombank_w(uint8_t data); uint16_t m_vblank_count; uint32_t m_irq_count; @@ -221,7 +221,7 @@ void wpc_an_state::device_timer(emu_timer &timer, device_timer_id id, int param, } } -WRITE8_MEMBER(wpc_an_state::wpc_rombank_w) +void wpc_an_state::wpc_rombank_w(uint8_t data) { m_cpubank->set_entry(data & m_bankmask); } @@ -242,14 +242,14 @@ WRITE_LINE_MEMBER(wpc_an_state::wpc_firq_w) m_maincpu->set_input_line(M6809_FIRQ_LINE,CLEAR_LINE); } -READ8_MEMBER(wpc_an_state::wpc_sound_ctrl_r) +uint8_t wpc_an_state::wpc_sound_ctrl_r() { if(m_wpcsnd) return m_wpcsnd->ctrl_r(); // ack FIRQ? return 0; } -WRITE8_MEMBER(wpc_an_state::wpc_sound_ctrl_w) +void wpc_an_state::wpc_sound_ctrl_w(uint8_t data) { if(m_bg) { @@ -260,14 +260,14 @@ WRITE8_MEMBER(wpc_an_state::wpc_sound_ctrl_w) m_wpcsnd->ctrl_w(data); } -READ8_MEMBER(wpc_an_state::wpc_sound_data_r) +uint8_t wpc_an_state::wpc_sound_data_r() { if(m_wpcsnd) return m_wpcsnd->data_r(); return 0; } -WRITE8_MEMBER(wpc_an_state::wpc_sound_data_w) +void wpc_an_state::wpc_sound_data_w(uint8_t data) { if(m_bg) { @@ -278,7 +278,7 @@ WRITE8_MEMBER(wpc_an_state::wpc_sound_data_w) m_wpcsnd->data_w(data); } -WRITE8_MEMBER(wpc_an_state::wpc_sound_s11_w) +void wpc_an_state::wpc_sound_s11_w(uint8_t data) { if(m_bg) { diff --git a/src/mame/drivers/wpc_dot.cpp b/src/mame/drivers/wpc_dot.cpp index 3eca0079afe..aae24a9ba7b 100644 --- a/src/mame/drivers/wpc_dot.cpp +++ b/src/mame/drivers/wpc_dot.cpp @@ -206,12 +206,12 @@ WRITE8_MEMBER(wpc_dot_state::ram_w) logerror("WPC: Memory protection violation at 0x%04x (mask=0x%04x)\n",offset,m_wpc->get_memprotect_mask()); } -WRITE8_MEMBER(wpc_dot_state::wpc_rombank_w) +void wpc_dot_state::wpc_rombank_w(uint8_t data) { m_cpubank->set_entry(data & m_bankmask); } -WRITE8_MEMBER(wpc_dot_state::wpc_dmdbank_w) +void wpc_dot_state::wpc_dmdbank_w(offs_t offset, uint8_t data) { uint8_t const bank(offset & 0x07); uint8_t const page(offset >> 4); @@ -247,26 +247,6 @@ WRITE_LINE_MEMBER(wpc_dot_state::wpc_firq_w) m_maincpu->set_input_line(M6809_FIRQ_LINE,CLEAR_LINE); } -READ8_MEMBER(wpc_dot_state::wpc_sound_ctrl_r) -{ - return m_wpcsnd->ctrl_r(); // ack FIRQ? -} - -WRITE8_MEMBER(wpc_dot_state::wpc_sound_ctrl_w) -{ - m_wpcsnd->ctrl_w(data); -} - -READ8_MEMBER(wpc_dot_state::wpc_sound_data_r) -{ - return m_wpcsnd->data_r(); -} - -WRITE8_MEMBER(wpc_dot_state::wpc_sound_data_w) -{ - m_wpcsnd->data_w(data); -} - uint32_t wpc_dot_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { uint8_t x,y,bit; @@ -302,10 +282,10 @@ void wpc_dot_state::wpc_dot(machine_config &config) m_wpc->irq_callback().set(FUNC(wpc_dot_state::wpc_irq_w)); m_wpc->firq_callback().set(FUNC(wpc_dot_state::wpc_firq_w)); m_wpc->bank_write().set(FUNC(wpc_dot_state::wpc_rombank_w)); - m_wpc->sound_ctrl_read().set(FUNC(wpc_dot_state::wpc_sound_ctrl_r)); - m_wpc->sound_ctrl_write().set(FUNC(wpc_dot_state::wpc_sound_ctrl_w)); - m_wpc->sound_data_read().set(FUNC(wpc_dot_state::wpc_sound_data_r)); - m_wpc->sound_data_write().set(FUNC(wpc_dot_state::wpc_sound_data_w)); + m_wpc->sound_ctrl_read().set(m_wpcsnd, FUNC(wpcsnd_device::ctrl_r)); // ack FIRQ? + m_wpc->sound_ctrl_write().set(m_wpcsnd, FUNC(wpcsnd_device::ctrl_w)); + m_wpc->sound_data_read().set(m_wpcsnd, FUNC(wpcsnd_device::data_r)); + m_wpc->sound_data_write().set(m_wpcsnd, FUNC(wpcsnd_device::data_w)); m_wpc->dmdbank_write().set(FUNC(wpc_dot_state::wpc_dmdbank_w)); SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/wpc_flip1.cpp b/src/mame/drivers/wpc_flip1.cpp index 72136fbc4bb..b0d4e36dd25 100644 --- a/src/mame/drivers/wpc_flip1.cpp +++ b/src/mame/drivers/wpc_flip1.cpp @@ -168,10 +168,10 @@ void wpc_flip1_state::wpc_flip1(machine_config &config) m_wpc->irq_callback().set(FUNC(wpc_flip1_state::wpc_irq_w)); m_wpc->firq_callback().set(FUNC(wpc_flip1_state::wpc_firq_w)); m_wpc->bank_write().set(FUNC(wpc_flip1_state::wpc_rombank_w)); - m_wpc->sound_ctrl_read().set(FUNC(wpc_flip1_state::wpc_sound_ctrl_r)); - m_wpc->sound_ctrl_write().set(FUNC(wpc_flip1_state::wpc_sound_ctrl_w)); - m_wpc->sound_data_read().set(FUNC(wpc_flip1_state::wpc_sound_data_r)); - m_wpc->sound_data_write().set(FUNC(wpc_flip1_state::wpc_sound_data_w)); + m_wpc->sound_ctrl_read().set(m_wpcsnd, FUNC(wpcsnd_device::ctrl_r)); + m_wpc->sound_ctrl_write().set(m_wpcsnd, FUNC(wpcsnd_device::ctrl_w)); + m_wpc->sound_data_read().set(m_wpcsnd, FUNC(wpcsnd_device::data_r)); + m_wpc->sound_data_write().set(m_wpcsnd, FUNC(wpcsnd_device::data_w)); m_wpc->dmdbank_write().set(FUNC(wpc_flip1_state::wpc_dmdbank_w)); SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/wpc_flip2.cpp b/src/mame/drivers/wpc_flip2.cpp index 1adddba316d..cdaa24181e5 100644 --- a/src/mame/drivers/wpc_flip2.cpp +++ b/src/mame/drivers/wpc_flip2.cpp @@ -197,10 +197,10 @@ void wpc_flip2_state::wpc_flip2(machine_config &config) m_wpc->irq_callback().set(FUNC(wpc_flip2_state::wpc_irq_w)); m_wpc->firq_callback().set(FUNC(wpc_flip2_state::wpc_firq_w)); m_wpc->bank_write().set(FUNC(wpc_flip2_state::wpc_rombank_w)); - m_wpc->sound_ctrl_read().set(FUNC(wpc_flip2_state::wpc_sound_ctrl_r)); - m_wpc->sound_ctrl_write().set(FUNC(wpc_flip2_state::wpc_sound_ctrl_w)); - m_wpc->sound_data_read().set(FUNC(wpc_flip2_state::wpc_sound_data_r)); - m_wpc->sound_data_write().set(FUNC(wpc_flip2_state::wpc_sound_data_w)); + m_wpc->sound_ctrl_read().set(m_wpcsnd, FUNC(wpcsnd_device::ctrl_r)); + m_wpc->sound_ctrl_write().set(m_wpcsnd, FUNC(wpcsnd_device::ctrl_w)); + m_wpc->sound_data_read().set(m_wpcsnd, FUNC(wpcsnd_device::data_r)); + m_wpc->sound_data_write().set(m_wpcsnd, FUNC(wpcsnd_device::data_w)); m_wpc->dmdbank_write().set(FUNC(wpc_flip2_state::wpc_dmdbank_w)); SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index 16aa147837a..04a77ff8a7b 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -1445,14 +1445,14 @@ void x1_state::x1_io(address_map &map) * *************************************/ -READ8_MEMBER( x1_state::x1_porta_r ) +uint8_t x1_state::x1_porta_r() { logerror("PPI Port A read\n"); return 0xff; } /* this port is system related */ -READ8_MEMBER( x1_state::x1_portb_r ) +uint8_t x1_state::x1_portb_r() { //logerror("PPI Port B read\n"); /* @@ -1495,7 +1495,7 @@ READ8_MEMBER( x1_state::x1_portb_r ) } /* I/O system port */ -READ8_MEMBER( x1_state::x1_portc_r ) +uint8_t x1_state::x1_portc_r() { //logerror("PPI Port C read\n"); /* @@ -1508,17 +1508,17 @@ READ8_MEMBER( x1_state::x1_portc_r ) return (m_io_sys & 0x9f) | m_hres_320 | ~m_io_switch; } -WRITE8_MEMBER( x1_state::x1_porta_w ) +void x1_state::x1_porta_w(uint8_t data) { //logerror("PPI Port A write %02x\n",data); } -WRITE8_MEMBER( x1_state::x1_portb_w ) +void x1_state::x1_portb_w(uint8_t data) { //logerror("PPI Port B write %02x\n",data); } -WRITE8_MEMBER( x1_state::x1_portc_w ) +void x1_state::x1_portc_w(uint8_t data) { m_hres_320 = data & 0x40; @@ -1534,25 +1534,25 @@ WRITE8_MEMBER( x1_state::x1_portc_w ) m_cassette->output(BIT(data, 0) ? +1.0 : -1.0); } -READ8_MEMBER(x1_state::memory_read_byte) +uint8_t x1_state::memory_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); return prog_space.read_byte(offset); } -WRITE8_MEMBER(x1_state::memory_write_byte) +void x1_state::memory_write_byte(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); return prog_space.write_byte(offset, data); } -READ8_MEMBER(x1_state::io_read_byte) +uint8_t x1_state::io_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_IO); return prog_space.read_byte(offset); } -WRITE8_MEMBER(x1_state::io_write_byte) +void x1_state::io_write_byte(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_IO); return prog_space.write_byte(offset, data); diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index 15a33588b9b..2004230c84f 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -497,7 +497,7 @@ uint8_t x68k_state::xpd1lr_r(int port) } // Judging from the XM6 source code, PPI ports A and B are joystick inputs -READ8_MEMBER(x68k_state::ppi_port_a_r) +uint8_t x68k_state::ppi_port_a_r() { int ctrl = m_ctrltype->read() & 0x0f; @@ -519,7 +519,7 @@ READ8_MEMBER(x68k_state::ppi_port_a_r) return 0xff; } -READ8_MEMBER(x68k_state::ppi_port_b_r) +uint8_t x68k_state::ppi_port_b_r() { int ctrl = m_ctrltype->read() & 0xf0; @@ -541,7 +541,7 @@ READ8_MEMBER(x68k_state::ppi_port_b_r) return 0xff; } -READ8_MEMBER(x68k_state::ppi_port_c_r) +uint8_t x68k_state::ppi_port_c_r() { return m_ppi_port[2]; } @@ -554,7 +554,7 @@ READ8_MEMBER(x68k_state::ppi_port_c_r) bits 3,2 - ADPCM Sample rate bits 1,0 - ADPCM Pan (00 = Both, 01 = Right only, 10 = Left only, 11 = Off) */ -WRITE8_MEMBER(x68k_state::ppi_port_c_w) +void x68k_state::ppi_port_c_w(uint8_t data) { // ADPCM / Joystick control m_ppi_port[2] = data; @@ -685,7 +685,7 @@ WRITE_LINE_MEMBER( x68k_state::fdc_irq ) } } -WRITE8_MEMBER(x68k_state::ct_w) +void x68k_state::ct_w(uint8_t data) { // CT1 and CT2 bits from YM2151 port 0x1b // CT1 - ADPCM clock - 0 = 8MHz, 1 = 4MHz @@ -1001,7 +1001,7 @@ WRITE_LINE_MEMBER(x68k_state::dma_irq) update_ipl(); } -WRITE8_MEMBER(x68k_state::dma_end) +void x68k_state::dma_end(offs_t offset, uint8_t data) { if(offset == 0) { diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp index 77e3bbf9516..ac361f0687d 100644 --- a/src/mame/drivers/z1013.cpp +++ b/src/mame/drivers/z1013.cpp @@ -74,10 +74,10 @@ public: void z1013(machine_config &config); private: - DECLARE_WRITE8_MEMBER(z1013_keyboard_w); - DECLARE_READ8_MEMBER(port_b_r); - DECLARE_WRITE8_MEMBER(port_b_w); - DECLARE_READ8_MEMBER(k7659_port_b_r); + void z1013_keyboard_w(uint8_t data); + uint8_t port_b_r(); + void port_b_w(uint8_t data); + uint8_t k7659_port_b_r(); DECLARE_SNAPSHOT_LOAD_MEMBER(snapshot_cb); uint32_t screen_update_z1013(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -273,12 +273,12 @@ void z1013_state::machine_reset() m_keyboard_line = 0; } -WRITE8_MEMBER( z1013_state::z1013_keyboard_w ) +void z1013_state::z1013_keyboard_w(uint8_t data) { m_keyboard_line = data; } -READ8_MEMBER( z1013_state::port_b_r ) +uint8_t z1013_state::port_b_r() { char kbdrow[6]; sprintf(kbdrow,"X%d", m_keyboard_line & 7); @@ -295,13 +295,13 @@ READ8_MEMBER( z1013_state::port_b_r ) return data; } -WRITE8_MEMBER( z1013_state::port_b_w ) +void z1013_state::port_b_w(uint8_t data) { m_keyboard_part = BIT(data, 4); // for z1013a2 only m_cass->output(BIT(data, 7) ? -1.0 : +1.0); } -READ8_MEMBER( z1013_state::k7659_port_b_r ) +uint8_t z1013_state::k7659_port_b_r() { return 0xff; } diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp index 31d570d69e4..595a011de67 100644 --- a/src/mame/drivers/z9001.cpp +++ b/src/mame/drivers/z9001.cpp @@ -69,7 +69,7 @@ public: private: void kbd_put(u8 data); - DECLARE_WRITE8_MEMBER(port88_w); + void port88_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(cass_w); TIMER_DEVICE_CALLBACK_MEMBER(timer_callback); uint32_t screen_update_z9001(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -121,7 +121,7 @@ static const z80_daisy_config z9001_daisy_chain[] = }; //Bits0,1 not connected; 2,3,4,5 go to a connector; 6 goes to 'graphics' LED; 7 goes to speaker. -WRITE8_MEMBER( z9001_state::port88_w ) +void z9001_state::port88_w(uint8_t data) { m_beeper->set_state(BIT(data, 7)); } diff --git a/src/mame/includes/aim65.h b/src/mame/includes/aim65.h index f08125ba509..9172154495f 100644 --- a/src/mame/includes/aim65.h +++ b/src/mame/includes/aim65.h @@ -79,7 +79,7 @@ private: void z32_cb2_w(bool state); u8 z32_pb_r(); - template <unsigned D> DECLARE_WRITE16_MEMBER(update_ds); + template <unsigned D> void update_ds(offs_t offset, u16 data); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(z24_load) { return load_cart(image, m_z24, "z24"); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(z25_load) { return load_cart(image, m_z25, "z25"); } diff --git a/src/mame/includes/aussiebyte.h b/src/mame/includes/aussiebyte.h index 1de0934b549..7974d53210c 100644 --- a/src/mame/includes/aussiebyte.h +++ b/src/mame/includes/aussiebyte.h @@ -70,10 +70,10 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); protected: - DECLARE_READ8_MEMBER(memory_read_byte); - DECLARE_WRITE8_MEMBER(memory_write_byte); - DECLARE_READ8_MEMBER(io_read_byte); - DECLARE_WRITE8_MEMBER(io_write_byte); + uint8_t memory_read_byte(offs_t offset); + void memory_write_byte(offs_t offset, uint8_t data); + uint8_t io_read_byte(offs_t offset); + void io_write_byte(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); DECLARE_WRITE8_MEMBER(port15_w); DECLARE_WRITE8_MEMBER(port16_w); @@ -83,7 +83,7 @@ protected: DECLARE_WRITE8_MEMBER(port1a_w); DECLARE_WRITE8_MEMBER(port1b_w); DECLARE_WRITE8_MEMBER(port1c_w); - DECLARE_WRITE8_MEMBER(port20_w); + void port20_w(uint8_t data); DECLARE_READ8_MEMBER(port28_r); DECLARE_READ8_MEMBER(port33_r); DECLARE_WRITE8_MEMBER(port34_w); diff --git a/src/mame/includes/cosmicos.h b/src/mame/includes/cosmicos.h index 3359c0173d5..3d17661440f 100644 --- a/src/mame/includes/cosmicos.h +++ b/src/mame/includes/cosmicos.h @@ -79,8 +79,8 @@ public: DECLARE_READ_LINE_MEMBER( ef3_r ); DECLARE_READ_LINE_MEMBER( ef4_r ); DECLARE_WRITE_LINE_MEMBER( q_w ); - DECLARE_READ8_MEMBER( dma_r ); - DECLARE_WRITE8_MEMBER( sc_w ); + uint8_t dma_r(); + void sc_w(uint8_t data); DECLARE_INPUT_CHANGED_MEMBER( data ); DECLARE_INPUT_CHANGED_MEMBER( enter ); DECLARE_INPUT_CHANGED_MEMBER( single_step ); diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index dfcdc948c3b..9b94953c177 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -261,8 +261,8 @@ private: /* reverse address lookup map - hunchbkd */ int16_t m_rev_map[0x200]; - DECLARE_READ8_MEMBER(hb_dma_read_byte); - DECLARE_WRITE8_MEMBER(hb_dma_write_byte); + uint8_t hb_dma_read_byte(offs_t offset); + void hb_dma_write_byte(offs_t offset, uint8_t data); DECLARE_WRITE8_MEMBER(dkong3_coin_counter_w); DECLARE_READ8_MEMBER(dkong_in2_r); DECLARE_READ8_MEMBER(s2650_mirror_r); @@ -285,10 +285,10 @@ private: DECLARE_WRITE8_MEMBER(radarscp_grid_color_w); DECLARE_WRITE8_MEMBER(dkong_flipscreen_w); DECLARE_WRITE8_MEMBER(dkong_spritebank_w); - DECLARE_WRITE8_MEMBER(dkong_voice_w); + void dkong_voice_w(uint8_t data); DECLARE_WRITE8_MEMBER(dkong_audio_irq_w); - DECLARE_READ8_MEMBER(p8257_ctl_r); - DECLARE_WRITE8_MEMBER(p8257_ctl_w); + uint8_t p8257_ctl_r(); + void p8257_ctl_w(uint8_t data); DECLARE_WRITE8_MEMBER(p8257_drq_w); DECLARE_WRITE8_MEMBER(dkong_z80dma_rdy_w); DECLARE_READ8_MEMBER(braze_eeprom_r); @@ -310,10 +310,10 @@ private: DECLARE_MACHINE_START(s2650); DECLARE_MACHINE_RESET(strtheat); DECLARE_MACHINE_RESET(drakton); - DECLARE_WRITE8_MEMBER(m58817_command_w); - DECLARE_READ8_MEMBER(dkong_voice_status_r); - DECLARE_READ8_MEMBER(dkong_tune_r); - DECLARE_WRITE8_MEMBER(dkong_p1_w); + void m58817_command_w(uint8_t data); + uint8_t dkong_voice_status_r(); + uint8_t dkong_tune_r(offs_t offset); + void dkong_p1_w(uint8_t data); DECLARE_READ8_MEMBER(sound_t0_r); DECLARE_READ8_MEMBER(sound_t1_r); uint32_t screen_update_dkong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -327,8 +327,8 @@ private: void braze_decrypt_rom(uint8_t *dest); void dk_braze_decrypt(); void drakton_decrypt_rom(uint8_t mod, int offs, int *bs); - DECLARE_READ8_MEMBER(memory_read_byte); - DECLARE_WRITE8_MEMBER(memory_write_byte); + uint8_t memory_read_byte(offs_t offset); + void memory_write_byte(offs_t offset, uint8_t data); double CD4049(double x); void dkong3_io_map(address_map &map); diff --git a/src/mame/includes/elf.h b/src/mame/includes/elf.h index 1c7991fd80a..18a23c9135e 100644 --- a/src/mame/includes/elf.h +++ b/src/mame/includes/elf.h @@ -52,10 +52,10 @@ private: DECLARE_READ_LINE_MEMBER( clear_r ); DECLARE_READ_LINE_MEMBER( ef4_r ); DECLARE_WRITE_LINE_MEMBER( q_w ); - DECLARE_READ8_MEMBER( dma_r ); - DECLARE_WRITE8_MEMBER( sc_w ); + uint8_t dma_r(); + void sc_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( da_w ); - template <unsigned N> DECLARE_WRITE8_MEMBER( digit_w ) { m_7segs[N] = data; } + template <unsigned N> void digit_w(uint8_t data) { m_7segs[N] = data; } DECLARE_QUICKLOAD_LOAD_MEMBER( quickload_cb ); void elf2_io(address_map &map); diff --git a/src/mame/includes/exp85.h b/src/mame/includes/exp85.h index 20efc5efbbd..ed621213306 100644 --- a/src/mame/includes/exp85.h +++ b/src/mame/includes/exp85.h @@ -40,8 +40,8 @@ private: virtual void machine_start() override; - DECLARE_READ8_MEMBER( i8355_a_r ); - DECLARE_WRITE8_MEMBER( i8355_a_w ); + uint8_t i8355_a_r(); + void i8355_a_w(uint8_t data); DECLARE_READ_LINE_MEMBER( sid_r ); DECLARE_WRITE_LINE_MEMBER( sod_w ); diff --git a/src/mame/includes/gb.h b/src/mame/includes/gb.h index a00f34824bd..dd715923f38 100644 --- a/src/mame/includes/gb.h +++ b/src/mame/includes/gb.h @@ -82,7 +82,7 @@ public: DECLARE_MACHINE_START(gbc); DECLARE_MACHINE_RESET(gbc); void gbc_palette(palette_device &palette) const; - DECLARE_WRITE8_MEMBER(gb_timer_callback); + void gb_timer_callback(uint8_t data); DECLARE_READ8_MEMBER(gb_cart_r); DECLARE_READ8_MEMBER(gbc_cart_r); diff --git a/src/mame/includes/hh_sm510.h b/src/mame/includes/hh_sm510.h index 67de09dcbc6..37b56c338f2 100644 --- a/src/mame/includes/hh_sm510.h +++ b/src/mame/includes/hh_sm510.h @@ -53,15 +53,15 @@ protected: u8 read_inputs(int columns, int fixed = -1); virtual void update_k_line(); - virtual DECLARE_WRITE16_MEMBER(sm510_lcd_segment_w); - virtual DECLARE_WRITE16_MEMBER(sm500_lcd_segment_w); + virtual void sm510_lcd_segment_w(offs_t offset, u16 data); + virtual void sm500_lcd_segment_w(offs_t offset, u16 data); virtual u8 input_r(); - virtual DECLARE_WRITE8_MEMBER(input_w); - virtual DECLARE_WRITE8_MEMBER(piezo_r1_w); - virtual DECLARE_WRITE8_MEMBER(piezo_r2_w); - virtual DECLARE_WRITE8_MEMBER(piezo_input_w); - virtual DECLARE_WRITE8_MEMBER(piezo2bit_r1_w); - virtual DECLARE_WRITE8_MEMBER(piezo2bit_input_w); + virtual void input_w(u8 data); + virtual void piezo_r1_w(u8 data); + virtual void piezo_r2_w(u8 data); + virtual void piezo_input_w(u8 data); + virtual void piezo2bit_r1_w(u8 data); + virtual void piezo2bit_input_w(u8 data); // display common int m_decay_pivot; // lcd segment off-to-on delay in 1kHz ticks (affects input lag) diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index 9f1a6f2ba17..fd1dbde1ece 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -146,7 +146,7 @@ public: auto lamps6_out_cb() { return m_lamps_out_cb[6].bind(); } auto lamps7_out_cb() { return m_lamps_out_cb[7].bind(); } - DECLARE_WRITE8_MEMBER(lamps_w) { m_lamps_out_cb[offset](data); } + void lamps_w(offs_t offset, uint8_t data) { m_lamps_out_cb[offset](data); } protected: virtual void device_start() override; @@ -256,23 +256,23 @@ private: required_ioport_array<8> m_an_in; - DECLARE_WRITE8_MEMBER(hng64_default_lamps0_w) { logerror("lamps0 %02x\n", data); } - DECLARE_WRITE8_MEMBER(hng64_default_lamps1_w) { logerror("lamps1 %02x\n", data); } - DECLARE_WRITE8_MEMBER(hng64_default_lamps2_w) { logerror("lamps2 %02x\n", data); } - DECLARE_WRITE8_MEMBER(hng64_default_lamps3_w) { logerror("lamps3 %02x\n", data); } - DECLARE_WRITE8_MEMBER(hng64_default_lamps4_w) { logerror("lamps4 %02x\n", data); } - DECLARE_WRITE8_MEMBER(hng64_default_lamps5_w) { logerror("lamps5 %02x\n", data); } - DECLARE_WRITE8_MEMBER(hng64_default_lamps6_w) { logerror("lamps6 %02x\n", data); } - DECLARE_WRITE8_MEMBER(hng64_default_lamps7_w) { logerror("lamps7 %02x\n", data); } + void hng64_default_lamps0_w(uint8_t data) { logerror("lamps0 %02x\n", data); } + void hng64_default_lamps1_w(uint8_t data) { logerror("lamps1 %02x\n", data); } + void hng64_default_lamps2_w(uint8_t data) { logerror("lamps2 %02x\n", data); } + void hng64_default_lamps3_w(uint8_t data) { logerror("lamps3 %02x\n", data); } + void hng64_default_lamps4_w(uint8_t data) { logerror("lamps4 %02x\n", data); } + void hng64_default_lamps5_w(uint8_t data) { logerror("lamps5 %02x\n", data); } + void hng64_default_lamps6_w(uint8_t data) { logerror("lamps6 %02x\n", data); } + void hng64_default_lamps7_w(uint8_t data) { logerror("lamps7 %02x\n", data); } - DECLARE_WRITE8_MEMBER(hng64_drive_lamps7_w); - DECLARE_WRITE8_MEMBER(hng64_drive_lamps6_w); - DECLARE_WRITE8_MEMBER(hng64_drive_lamps5_w); + void hng64_drive_lamps7_w(uint8_t data); + void hng64_drive_lamps6_w(uint8_t data); + void hng64_drive_lamps5_w(uint8_t data); - DECLARE_WRITE8_MEMBER(hng64_shoot_lamps7_w); - DECLARE_WRITE8_MEMBER(hng64_shoot_lamps6_w); + void hng64_shoot_lamps7_w(uint8_t data); + void hng64_shoot_lamps6_w(uint8_t data); - DECLARE_WRITE8_MEMBER(hng64_fight_lamps6_w); + void hng64_fight_lamps6_w(uint8_t data); int m_samsho64_3d_hack; int m_roadedge_3d_hack; @@ -391,27 +391,27 @@ private: DECLARE_WRITE8_MEMBER(hng64_comm_mmu_w); // shared ram access - DECLARE_READ8_MEMBER(ioport0_r); - DECLARE_WRITE8_MEMBER(ioport0_w); - DECLARE_WRITE8_MEMBER(ioport7_w); + uint8_t ioport0_r(); + void ioport0_w(uint8_t data); + void ioport7_w(uint8_t data); // input port access - DECLARE_READ8_MEMBER(ioport3_r); - DECLARE_WRITE8_MEMBER(ioport3_w); - DECLARE_WRITE8_MEMBER(ioport1_w); + uint8_t ioport3_r(); + void ioport3_w(uint8_t data); + void ioport1_w(uint8_t data); // unknown access - DECLARE_WRITE8_MEMBER(ioport4_w); + void ioport4_w(uint8_t data); // analog input access - DECLARE_READ8_MEMBER(anport0_r); - DECLARE_READ8_MEMBER(anport1_r); - DECLARE_READ8_MEMBER(anport2_r); - DECLARE_READ8_MEMBER(anport3_r); - DECLARE_READ8_MEMBER(anport4_r); - DECLARE_READ8_MEMBER(anport5_r); - DECLARE_READ8_MEMBER(anport6_r); - DECLARE_READ8_MEMBER(anport7_r); + uint8_t anport0_r(); + uint8_t anport1_r(); + uint8_t anport2_r(); + uint8_t anport3_r(); + uint8_t anport4_r(); + uint8_t anport5_r(); + uint8_t anport6_r(); + uint8_t anport7_r(); DECLARE_WRITE_LINE_MEMBER( sio0_w ); @@ -507,8 +507,8 @@ private: void reset_net(); DECLARE_WRITE_LINE_MEMBER(dma_hreq_cb); - DECLARE_READ8_MEMBER(dma_memr_cb); - DECLARE_WRITE8_MEMBER(dma_iow3_cb); + uint8_t dma_memr_cb(offs_t offset); + void dma_iow3_cb(uint8_t data); DECLARE_WRITE_LINE_MEMBER(tcu_tm0_cb); DECLARE_WRITE_LINE_MEMBER(tcu_tm1_cb); DECLARE_WRITE_LINE_MEMBER(tcu_tm2_cb); diff --git a/src/mame/includes/m5.h b/src/mame/includes/m5.h index 1a01d695f87..b8333d78e4e 100644 --- a/src/mame/includes/m5.h +++ b/src/mame/includes/m5.h @@ -85,11 +85,11 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; private: - DECLARE_READ8_MEMBER( ppi_pa_r ); - DECLARE_WRITE8_MEMBER( ppi_pa_w ); - DECLARE_WRITE8_MEMBER( ppi_pb_w ); - DECLARE_READ8_MEMBER( ppi_pc_r ); - DECLARE_WRITE8_MEMBER( ppi_pc_w ); + uint8_t ppi_pa_r(); + void ppi_pa_w(uint8_t data); + void ppi_pb_w(uint8_t data); + uint8_t ppi_pc_r(); + void ppi_pc_w(uint8_t data); DECLARE_READ8_MEMBER( fd5_data_r ); DECLARE_WRITE8_MEMBER( fd5_data_w ); diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index 8d2767477d6..0e3564e2962 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -125,13 +125,13 @@ private: DECLARE_WRITE_LINE_MEMBER(palette_bank_w); DECLARE_WRITE8_MEMBER(mario_scroll_w); DECLARE_WRITE_LINE_MEMBER(flip_w); - DECLARE_READ8_MEMBER(mario_sh_p1_r); - DECLARE_READ8_MEMBER(mario_sh_p2_r); + uint8_t mario_sh_p1_r(); + uint8_t mario_sh_p2_r(); DECLARE_READ_LINE_MEMBER(mario_sh_t0_r); DECLARE_READ_LINE_MEMBER(mario_sh_t1_r); DECLARE_READ8_MEMBER(mario_sh_tune_r); - DECLARE_WRITE8_MEMBER(mario_sh_p1_w); - DECLARE_WRITE8_MEMBER(mario_sh_p2_w); + void mario_sh_p1_w(uint8_t data); + void mario_sh_p2_w(uint8_t data); DECLARE_WRITE8_MEMBER(masao_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(mario_sh_tuneselect_w); DECLARE_WRITE8_MEMBER(mario_sh3_w); @@ -145,8 +145,8 @@ private: DECLARE_WRITE8_MEMBER(mario_sh_sound_w); DECLARE_WRITE8_MEMBER(mario_sh1_w); DECLARE_WRITE8_MEMBER(mario_sh2_w); - DECLARE_READ8_MEMBER(memory_read_byte); - DECLARE_WRITE8_MEMBER(memory_write_byte); + uint8_t memory_read_byte(offs_t offset); + void memory_write_byte(offs_t offset, uint8_t data); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void set_ea(int ea); void mario_io_map(address_map &map); diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index 0310612a5d2..c7049a61a58 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -159,7 +159,7 @@ private: DECLARE_WRITE32_MEMBER(micro3d_mac2_w); DECLARE_READ16_MEMBER(micro3d_encoder_h_r); DECLARE_READ16_MEMBER(micro3d_encoder_l_r); - DECLARE_READ8_MEMBER(adc_volume_r); + uint8_t adc_volume_r(); DECLARE_READ16_MEMBER(botss_140000_r); DECLARE_READ16_MEMBER(botss_180000_r); DECLARE_WRITE16_MEMBER(micro3d_reset_w); @@ -175,18 +175,18 @@ private: DECLARE_READ32_MEMBER(micro3d_pipe_r); DECLARE_WRITE8_MEMBER(micro3d_snd_dac_a); DECLARE_WRITE8_MEMBER(micro3d_snd_dac_b); - DECLARE_WRITE8_MEMBER(micro3d_sound_p1_w); - DECLARE_WRITE8_MEMBER(micro3d_sound_p3_w); - DECLARE_READ8_MEMBER(micro3d_sound_p1_r); - DECLARE_READ8_MEMBER(micro3d_sound_p3_r); + void micro3d_sound_p1_w(uint8_t data); + void micro3d_sound_p3_w(uint8_t data); + uint8_t micro3d_sound_p1_r(); + uint8_t micro3d_sound_p3_r(); INTERRUPT_GEN_MEMBER(micro3d_vblank); TIMER_CALLBACK_MEMBER(mac_done_callback); DECLARE_WRITE8_MEMBER(micro3d_upd7759_w); - DECLARE_WRITE8_MEMBER(data_from_i8031); - DECLARE_READ8_MEMBER(data_to_i8031); + void data_from_i8031(uint8_t data); + uint8_t data_to_i8031(); DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); - DECLARE_READ8_MEMBER(duart_input_r); - DECLARE_WRITE8_MEMBER(duart_output_w); + uint8_t duart_input_r(); + void duart_output_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(duart_txb); DECLARE_WRITE_LINE_MEMBER(tms_interrupt); TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_update); diff --git a/src/mame/includes/mikromik.h b/src/mame/includes/mikromik.h index fbd5f080109..aba099ae6cb 100644 --- a/src/mame/includes/mikromik.h +++ b/src/mame/includes/mikromik.h @@ -117,8 +117,8 @@ private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER( a8_w ); DECLARE_WRITE_LINE_MEMBER( recall_w ); DECLARE_WRITE_LINE_MEMBER( rx21_w ); @@ -128,8 +128,8 @@ private: DECLARE_WRITE_LINE_MEMBER( llen_w ); DECLARE_WRITE_LINE_MEMBER( motor_on_w ); DECLARE_WRITE_LINE_MEMBER( dma_hrq_w ); - DECLARE_READ8_MEMBER( mpsc_dack_r ); - DECLARE_WRITE8_MEMBER( mpsc_dack_w ); + uint8_t mpsc_dack_r(); + void mpsc_dack_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( dma_eop_w ); DECLARE_WRITE_LINE_MEMBER( dack3_w ); DECLARE_WRITE_LINE_MEMBER( itxc_w ); diff --git a/src/mame/includes/mpf1.h b/src/mame/includes/mpf1.h index 7d9e7bfdc6d..fcac6f75e50 100644 --- a/src/mame/includes/mpf1.h +++ b/src/mame/includes/mpf1.h @@ -61,10 +61,10 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER( step_r ); - DECLARE_READ8_MEMBER( ppi_pa_r ); - DECLARE_WRITE8_MEMBER( ppi_pb_w ); - DECLARE_WRITE8_MEMBER( ppi_pc_w ); + uint8_t step_r(offs_t offset); + uint8_t ppi_pa_r(); + void ppi_pb_w(uint8_t data); + void ppi_pc_w(uint8_t data); int m_break; int m_m1; diff --git a/src/mame/includes/mz2500.h b/src/mame/includes/mz2500.h index 6cf34fe401c..a8bb9d560ea 100644 --- a/src/mame/includes/mz2500.h +++ b/src/mame/includes/mz2500.h @@ -179,16 +179,16 @@ private: DECLARE_WRITE8_MEMBER(floppy_select_w); DECLARE_WRITE8_MEMBER(floppy_side_w); - DECLARE_READ8_MEMBER(mz2500_porta_r); - DECLARE_READ8_MEMBER(mz2500_portb_r); - DECLARE_READ8_MEMBER(mz2500_portc_r); - DECLARE_WRITE8_MEMBER(mz2500_porta_w); - DECLARE_WRITE8_MEMBER(mz2500_portb_w); - DECLARE_WRITE8_MEMBER(mz2500_portc_w); - DECLARE_WRITE8_MEMBER(mz2500_pio1_porta_w); - DECLARE_READ8_MEMBER(mz2500_pio1_porta_r); - DECLARE_READ8_MEMBER(opn_porta_r); - DECLARE_WRITE8_MEMBER(opn_porta_w); + uint8_t mz2500_porta_r(); + uint8_t mz2500_portb_r(); + uint8_t mz2500_portc_r(); + void mz2500_porta_w(uint8_t data); + void mz2500_portb_w(uint8_t data); + void mz2500_portc_w(uint8_t data); + void mz2500_pio1_porta_w(uint8_t data); + uint8_t mz2500_pio1_porta_r(); + uint8_t opn_porta_r(); + void opn_porta_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(pit8253_clk0_irq); DECLARE_WRITE_LINE_MEMBER(mz2500_rtc_alarm_irq); IRQ_CALLBACK_MEMBER( mz2500_irq_ack ); diff --git a/src/mame/includes/mz700.h b/src/mame/includes/mz700.h index b6318fab99a..b795fd8fa55 100644 --- a/src/mame/includes/mz700.h +++ b/src/mame/includes/mz700.h @@ -82,13 +82,13 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(ne556_other_callback); DECLARE_WRITE_LINE_MEMBER(pit_out0_changed); DECLARE_WRITE_LINE_MEMBER(pit_irq_2); - DECLARE_READ8_MEMBER(pio_port_b_r); - DECLARE_READ8_MEMBER(pio_port_c_r); - DECLARE_WRITE8_MEMBER(pio_port_a_w); - DECLARE_WRITE8_MEMBER(pio_port_c_w); + uint8_t pio_port_b_r(); + uint8_t pio_port_c_r(); + void pio_port_a_w(uint8_t data); + void pio_port_c_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(mz800_z80pio_irq); - DECLARE_READ8_MEMBER(mz800_z80pio_port_a_r); - DECLARE_WRITE8_MEMBER(mz800_z80pio_port_a_w); + uint8_t mz800_z80pio_port_a_r(); + void mz800_z80pio_port_a_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); diff --git a/src/mame/includes/mz80.h b/src/mame/includes/mz80.h index 7b022d2ca89..73df51facdd 100644 --- a/src/mame/includes/mz80.h +++ b/src/mame/includes/mz80.h @@ -41,10 +41,10 @@ public: private: DECLARE_READ8_MEMBER(mz80k_strobe_r); DECLARE_WRITE8_MEMBER(mz80k_strobe_w); - DECLARE_READ8_MEMBER(mz80k_8255_portb_r); - DECLARE_READ8_MEMBER(mz80k_8255_portc_r); - DECLARE_WRITE8_MEMBER(mz80k_8255_porta_w); - DECLARE_WRITE8_MEMBER(mz80k_8255_portc_w); + uint8_t mz80k_8255_portb_r(); + uint8_t mz80k_8255_portc_r(); + void mz80k_8255_porta_w(uint8_t data); + void mz80k_8255_portc_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(pit_out0_changed); DECLARE_WRITE_LINE_MEMBER(pit_out2_changed); uint32_t screen_update_mz80k(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h index 3d32740b0ea..b7d9dc308cb 100644 --- a/src/mame/includes/norautp.h +++ b/src/mame/includes/norautp.h @@ -59,9 +59,9 @@ private: DECLARE_WRITE_LINE_MEMBER(ppi2_obf_w); TIMER_CALLBACK_MEMBER(ppi2_ack); DECLARE_READ8_MEMBER(test2_r); - DECLARE_WRITE8_MEMBER(mainlamps_w); - DECLARE_WRITE8_MEMBER(soundlamps_w); - DECLARE_WRITE8_MEMBER(counterlamps_w); + void mainlamps_w(uint8_t data); + void soundlamps_w(uint8_t data); + void counterlamps_w(uint8_t data); void norautp_palette(palette_device &palette) const; uint32_t screen_update_norautp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void cgidjp_map(address_map &map); diff --git a/src/mame/includes/orion.h b/src/mame/includes/orion.h index bde29a8b601..1f4b086b2bc 100644 --- a/src/mame/includes/orion.h +++ b/src/mame/includes/orion.h @@ -82,9 +82,9 @@ protected: void orion128_palette(palette_device &palette) const; uint32_t screen_update_orion128(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(orionz80_interrupt); - DECLARE_READ8_MEMBER(orion_romdisk_porta_r); - DECLARE_WRITE8_MEMBER(orion_romdisk_portb_w); - DECLARE_WRITE8_MEMBER(orion_romdisk_portc_w); + uint8_t orion_romdisk_porta_r(); + void orion_romdisk_portb_w(uint8_t data); + void orion_romdisk_portc_w(uint8_t data); DECLARE_FLOPPY_FORMATS( orion_floppy_formats ); void orion128_io(address_map &map); diff --git a/src/mame/includes/osborne1.h b/src/mame/includes/osborne1.h index d89d738227f..e06c6043604 100644 --- a/src/mame/includes/osborne1.h +++ b/src/mame/includes/osborne1.h @@ -98,12 +98,12 @@ protected: required_device<pia6821_device> m_pia1; private: - DECLARE_READ8_MEMBER(ieee_pia_pb_r); - DECLARE_WRITE8_MEMBER(ieee_pia_pb_w); + uint8_t ieee_pia_pb_r(); + void ieee_pia_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(ieee_pia_irq_a_func); - DECLARE_WRITE8_MEMBER(video_pia_port_a_w); - DECLARE_WRITE8_MEMBER(video_pia_port_b_w); + void video_pia_port_a_w(uint8_t data); + void video_pia_port_b_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(video_pia_out_cb2_dummy); DECLARE_WRITE_LINE_MEMBER(video_pia_irq_a_func); diff --git a/src/mame/includes/osi.h b/src/mame/includes/osi.h index 73e0457cf03..0f97df66a9d 100644 --- a/src/mame/includes/osi.h +++ b/src/mame/includes/osi.h @@ -136,9 +136,9 @@ public: protected: virtual void machine_start() override; - DECLARE_READ8_MEMBER( osi470_pia_pa_r ); - DECLARE_WRITE8_MEMBER( osi470_pia_pa_w ); - DECLARE_WRITE8_MEMBER( osi470_pia_pb_w ); + uint8_t osi470_pia_pa_r(); + void osi470_pia_pa_w(uint8_t data); + void osi470_pia_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( osi470_pia_cb2_w ); void c1pmf_mem(address_map &map); diff --git a/src/mame/includes/p2000t.h b/src/mame/includes/p2000t.h index 4c41f72e9fe..c4616a5a7e0 100644 --- a/src/mame/includes/p2000t.h +++ b/src/mame/includes/p2000t.h @@ -41,7 +41,7 @@ protected: DECLARE_WRITE8_MEMBER(p2000t_port_888b_w); DECLARE_WRITE8_MEMBER(p2000t_port_8c90_w); DECLARE_WRITE8_MEMBER(p2000t_port_9494_w); - DECLARE_READ8_MEMBER(videoram_r); + uint8_t videoram_r(offs_t offset); INTERRUPT_GEN_MEMBER(p2000_interrupt); diff --git a/src/mame/includes/pc1251.h b/src/mame/includes/pc1251.h index 7d7bfb4e75c..b452e946e66 100644 --- a/src/mame/includes/pc1251.h +++ b/src/mame/includes/pc1251.h @@ -39,12 +39,12 @@ protected: void pc1260_mem(address_map &map); void pc1261_mem(address_map &map); - DECLARE_WRITE8_MEMBER(out_b_w); - DECLARE_WRITE8_MEMBER(out_c_w); + void out_b_w(uint8_t data); + void out_c_w(uint8_t data); DECLARE_READ_LINE_MEMBER(reset_r); - DECLARE_READ8_MEMBER(in_a_r); - DECLARE_READ8_MEMBER(in_b_r); + uint8_t in_a_r(); + uint8_t in_b_r(); DECLARE_READ8_MEMBER(lcd_read); DECLARE_WRITE8_MEMBER(lcd_write); diff --git a/src/mame/includes/pc1350.h b/src/mame/includes/pc1350.h index 5c206b9bb7f..1c7f6181884 100644 --- a/src/mame/includes/pc1350.h +++ b/src/mame/includes/pc1350.h @@ -32,14 +32,14 @@ protected: void pc1350_mem(address_map &map); - DECLARE_WRITE8_MEMBER(out_b_w); - DECLARE_WRITE8_MEMBER(out_c_w); + void out_b_w(uint8_t data); + void out_c_w(uint8_t data); - DECLARE_READ8_MEMBER(in_a_r); - DECLARE_READ8_MEMBER(in_b_r); + uint8_t in_a_r(); + uint8_t in_b_r(); DECLARE_READ8_MEMBER(lcd_read); DECLARE_WRITE8_MEMBER(lcd_write); - DECLARE_READ8_MEMBER(keyboard_line_r); + uint8_t keyboard_line_r(); private: required_device<ram_device> m_ram; diff --git a/src/mame/includes/pc1401.h b/src/mame/includes/pc1401.h index 56fba456224..7914bdfd71d 100644 --- a/src/mame/includes/pc1401.h +++ b/src/mame/includes/pc1401.h @@ -35,10 +35,10 @@ protected: void pc1402_mem(address_map &map); DECLARE_READ_LINE_MEMBER(reset_r); - DECLARE_WRITE8_MEMBER(out_b_w); - DECLARE_WRITE8_MEMBER(out_c_w); - DECLARE_READ8_MEMBER(in_a_r); - DECLARE_READ8_MEMBER(in_b_r); + void out_b_w(uint8_t data); + void out_c_w(uint8_t data); + uint8_t in_a_r(); + uint8_t in_b_r(); DECLARE_READ8_MEMBER(lcd_read); DECLARE_WRITE8_MEMBER(lcd_write); diff --git a/src/mame/includes/pc1403.h b/src/mame/includes/pc1403.h index 0b6d1641150..56c285f80aa 100644 --- a/src/mame/includes/pc1403.h +++ b/src/mame/includes/pc1403.h @@ -36,8 +36,8 @@ protected: void pc1421_writemem(address_map &map); DECLARE_READ_LINE_MEMBER(reset_r); - DECLARE_WRITE8_MEMBER(out_c_w); - DECLARE_READ8_MEMBER(in_a_r); + void out_c_w(uint8_t data); + uint8_t in_a_r(); DECLARE_READ8_MEMBER(asic_read); DECLARE_WRITE8_MEMBER(asic_write); diff --git a/src/mame/includes/pc6001.h b/src/mame/includes/pc6001.h index 74b6919f16c..796968b9821 100644 --- a/src/mame/includes/pc6001.h +++ b/src/mame/includes/pc6001.h @@ -61,12 +61,12 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(cassette_callback); TIMER_DEVICE_CALLBACK_MEMBER(keyboard_callback); - DECLARE_READ8_MEMBER(ppi_porta_r); - DECLARE_WRITE8_MEMBER(ppi_porta_w); - DECLARE_READ8_MEMBER(ppi_portb_r); - DECLARE_WRITE8_MEMBER(ppi_portb_w); - DECLARE_WRITE8_MEMBER(ppi_portc_w); - DECLARE_READ8_MEMBER(ppi_portc_r); + uint8_t ppi_porta_r(); + void ppi_porta_w(uint8_t data); + uint8_t ppi_portb_r(); + void ppi_portb_w(uint8_t data); + void ppi_portc_w(uint8_t data); + uint8_t ppi_portc_r(); IRQ_CALLBACK_MEMBER(irq_callback); diff --git a/src/mame/includes/pc8001.h b/src/mame/includes/pc8001.h index 328372892e2..3481adc6438 100644 --- a/src/mame/includes/pc8001.h +++ b/src/mame/includes/pc8001.h @@ -64,7 +64,7 @@ public: DECLARE_READ8_MEMBER( port40_r ); DECLARE_WRITE8_MEMBER( port40_w ); DECLARE_WRITE_LINE_MEMBER( hrq_w ); - DECLARE_READ8_MEMBER( dma_mem_r ); + uint8_t dma_mem_r(offs_t offset); /* video state */ int m_width80; diff --git a/src/mame/includes/pc8401a.h b/src/mame/includes/pc8401a.h index d01cc5982a3..115abacb7d8 100644 --- a/src/mame/includes/pc8401a.h +++ b/src/mame/includes/pc8401a.h @@ -81,8 +81,8 @@ public: DECLARE_READ8_MEMBER( port71_r ); DECLARE_WRITE8_MEMBER( port70_w ); DECLARE_WRITE8_MEMBER( port71_w ); - DECLARE_READ8_MEMBER( ppi_pc_r ); - DECLARE_WRITE8_MEMBER( ppi_pc_w ); + uint8_t ppi_pc_r(); + void ppi_pc_w(uint8_t data); void pc8401a_palette(palette_device &palette) const; void scan_keyboard(); diff --git a/src/mame/includes/pc8801.h b/src/mame/includes/pc8801.h index 92c6963ecae..7a5f2b30000 100644 --- a/src/mame/includes/pc8801.h +++ b/src/mame/includes/pc8801.h @@ -248,12 +248,12 @@ private: INTERRUPT_GEN_MEMBER(pc8801_vrtc_irq); TIMER_CALLBACK_MEMBER(pc8801fd_upd765_tc_to_zero); TIMER_DEVICE_CALLBACK_MEMBER(pc8801_rtc_irq); - DECLARE_READ8_MEMBER(cpu_8255_c_r); - DECLARE_WRITE8_MEMBER(cpu_8255_c_w); - DECLARE_READ8_MEMBER(fdc_8255_c_r); - DECLARE_WRITE8_MEMBER(fdc_8255_c_w); - DECLARE_READ8_MEMBER(opn_porta_r); - DECLARE_READ8_MEMBER(opn_portb_r); + uint8_t cpu_8255_c_r(); + void cpu_8255_c_w(uint8_t data); + uint8_t fdc_8255_c_r(); + void fdc_8255_c_w(uint8_t data); + uint8_t opn_porta_r(); + uint8_t opn_portb_r(); IRQ_CALLBACK_MEMBER(pc8801_irq_callback); DECLARE_WRITE_LINE_MEMBER(pc8801_sound_irq); }; diff --git a/src/mame/includes/pc88va.h b/src/mame/includes/pc88va.h index 6563ed697d9..8d01eff1228 100644 --- a/src/mame/includes/pc88va.h +++ b/src/mame/includes/pc88va.h @@ -154,17 +154,17 @@ private: DECLARE_WRITE8_MEMBER(sys_port1_w); uint32_t screen_update_pc88va(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(pc88va_vrtc_irq); - DECLARE_READ8_MEMBER(cpu_8255_c_r); - DECLARE_WRITE8_MEMBER(cpu_8255_c_w); - DECLARE_READ8_MEMBER(fdc_8255_c_r); - DECLARE_WRITE8_MEMBER(fdc_8255_c_w); - DECLARE_READ8_MEMBER(r232_ctrl_porta_r); - DECLARE_READ8_MEMBER(r232_ctrl_portb_r); - DECLARE_READ8_MEMBER(r232_ctrl_portc_r); - DECLARE_WRITE8_MEMBER(r232_ctrl_porta_w); - DECLARE_WRITE8_MEMBER(r232_ctrl_portb_w); - DECLARE_WRITE8_MEMBER(r232_ctrl_portc_w); - DECLARE_READ8_MEMBER(get_slave_ack); + uint8_t cpu_8255_c_r(); + void cpu_8255_c_w(uint8_t data); + uint8_t fdc_8255_c_r(); + void fdc_8255_c_w(uint8_t data); + uint8_t r232_ctrl_porta_r(); + uint8_t r232_ctrl_portb_r(); + uint8_t r232_ctrl_portc_r(); + void r232_ctrl_porta_w(uint8_t data); + void r232_ctrl_portb_w(uint8_t data); + void r232_ctrl_portc_w(uint8_t data); + uint8_t get_slave_ack(offs_t offset); DECLARE_WRITE_LINE_MEMBER(pc88va_pit_out0_changed); // DECLARE_WRITE_LINE_MEMBER(pc88va_upd765_interrupt); uint8_t m_fdc_ctrl_2; @@ -177,10 +177,10 @@ private: // void m_fdc_dma_w(uint16_t data); DECLARE_WRITE_LINE_MEMBER(pc88va_hlda_w); DECLARE_WRITE_LINE_MEMBER(pc88va_tc_w); - DECLARE_READ8_MEMBER(fdc_dma_r); - DECLARE_WRITE8_MEMBER(fdc_dma_w); - DECLARE_READ8_MEMBER(dma_memr_cb); - DECLARE_WRITE8_MEMBER(dma_memw_cb); + uint8_t fdc_dma_r(); + void fdc_dma_w(uint8_t data); + uint8_t dma_memr_cb(offs_t offset); + void dma_memw_cb(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(fdc_irq); DECLARE_WRITE_LINE_MEMBER(fdc_drq); diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h index 042187cdc46..faf78f1bee7 100644 --- a/src/mame/includes/pc9801.h +++ b/src/mame/includes/pc9801.h @@ -204,8 +204,8 @@ private: DECLARE_READ16_MEMBER(ide_cs1_r); DECLARE_WRITE16_MEMBER(ide_cs1_w); - DECLARE_WRITE8_MEMBER(sasi_data_w); - DECLARE_READ8_MEMBER(sasi_data_r); + void sasi_data_w(uint8_t data); + uint8_t sasi_data_r(); DECLARE_WRITE_LINE_MEMBER(write_sasi_io); DECLARE_WRITE_LINE_MEMBER(write_sasi_req); DECLARE_READ8_MEMBER(sasi_status_r); @@ -288,25 +288,25 @@ private: void pc9801_palette(palette_device &palette) const; DECLARE_WRITE_LINE_MEMBER(vrtc_irq); - DECLARE_READ8_MEMBER(get_slave_ack); + uint8_t get_slave_ack(offs_t offset); DECLARE_WRITE_LINE_MEMBER(dma_hrq_changed); DECLARE_WRITE_LINE_MEMBER(tc_w); - DECLARE_READ8_MEMBER(dma_read_byte); - DECLARE_WRITE8_MEMBER(dma_write_byte); + uint8_t dma_read_byte(offs_t offset); + void dma_write_byte(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(dack0_w); DECLARE_WRITE_LINE_MEMBER(dack1_w); DECLARE_WRITE_LINE_MEMBER(dack2_w); DECLARE_WRITE_LINE_MEMBER(dack3_w); - DECLARE_WRITE8_MEMBER(ppi_sys_portc_w); + void ppi_sys_portc_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(fdc_2dd_irq); DECLARE_WRITE_LINE_MEMBER(pc9801rs_fdc_irq); DECLARE_WRITE_LINE_MEMBER(pc9801rs_fdc_drq); - DECLARE_READ8_MEMBER(ppi_mouse_porta_r); - DECLARE_WRITE8_MEMBER(ppi_mouse_porta_w); - DECLARE_WRITE8_MEMBER(ppi_mouse_portb_w); - DECLARE_WRITE8_MEMBER(ppi_mouse_portc_w); + uint8_t ppi_mouse_porta_r(); + void ppi_mouse_porta_w(uint8_t data); + void ppi_mouse_portb_w(uint8_t data); + void ppi_mouse_portc_w(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER( mouse_irq_cb ); DECLARE_READ8_MEMBER(unk_r); diff --git a/src/mame/includes/pce.h b/src/mame/includes/pce.h index 6ca8f8ce4cc..2a9538dfe2c 100644 --- a/src/mame/includes/pce.h +++ b/src/mame/includes/pce.h @@ -64,8 +64,8 @@ public: int m_joystick_port_select; int m_joystick_data_select; uint8_t m_joy_6b_packet[5]; - DECLARE_WRITE8_MEMBER(mess_pce_joystick_w); - DECLARE_READ8_MEMBER(mess_pce_joystick_r); + void mess_pce_joystick_w(uint8_t data); + uint8_t mess_pce_joystick_r(); DECLARE_WRITE8_MEMBER(pce_cd_intf_w); DECLARE_READ8_MEMBER(pce_cd_intf_r); DECLARE_READ8_MEMBER(pce_cd_acard_wram_r); diff --git a/src/mame/includes/phc25.h b/src/mame/includes/phc25.h index 256c307c799..839560480ef 100644 --- a/src/mame/includes/phc25.h +++ b/src/mame/includes/phc25.h @@ -38,7 +38,7 @@ public: DECLARE_READ8_MEMBER( port40_r ); DECLARE_WRITE8_MEMBER( port40_w ); DECLARE_WRITE_LINE_MEMBER(irq_w); - DECLARE_READ8_MEMBER( video_ram_r ); + uint8_t video_ram_r(offs_t offset); MC6847_GET_CHARROM_MEMBER(ntsc_char_rom_r); MC6847_GET_CHARROM_MEMBER(pal_char_rom_r); diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index 9c300ce4866..747f18c10ed 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -68,7 +68,7 @@ private: DECLARE_WRITE_LINE_MEMBER(dog_di_w); DECLARE_WRITE_LINE_MEMBER(ppu_reset_w); DECLARE_READ8_MEMBER(pc10_detectclr_r); - DECLARE_WRITE8_MEMBER(cart_sel_w); + void cart_sel_w(uint8_t data); DECLARE_READ8_MEMBER(pc10_prot_r); DECLARE_WRITE8_MEMBER(pc10_prot_w); DECLARE_WRITE8_MEMBER(pc10_in0_w); diff --git a/src/mame/includes/pocketc.h b/src/mame/includes/pocketc.h index 2eae2e05115..23bb199dae3 100644 --- a/src/mame/includes/pocketc.h +++ b/src/mame/includes/pocketc.h @@ -44,7 +44,7 @@ protected: void pocketc_draw_special(bitmap_ind16 &bitmap,int x, int y, const char* const *fig, int color); - DECLARE_WRITE8_MEMBER(out_a_w); + void out_a_w(uint8_t data); DECLARE_READ_LINE_MEMBER(brk_r); required_device<sc61860_device> m_maincpu; diff --git a/src/mame/includes/poly.h b/src/mame/includes/poly.h index 2bff9e146c1..c96de186760 100644 --- a/src/mame/includes/poly.h +++ b/src/mame/includes/poly.h @@ -98,11 +98,11 @@ private: void kbd_put(u8 data); // remove when KR2376 is implemented DECLARE_READ_LINE_MEMBER( kbd_shift_r ); DECLARE_READ_LINE_MEMBER( kbd_control_r ); - DECLARE_WRITE8_MEMBER( pia0_pa_w ); - DECLARE_WRITE8_MEMBER( pia0_pb_w ); - DECLARE_READ8_MEMBER( pia1_b_in ); - DECLARE_READ8_MEMBER( videoram_1_r ); - DECLARE_READ8_MEMBER( videoram_2_r ); + void pia0_pa_w(uint8_t data); + void pia0_pb_w(uint8_t data); + uint8_t pia1_b_in(); + uint8_t videoram_1_r(offs_t offset); + uint8_t videoram_2_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER( ptm_o2_callback ); DECLARE_WRITE_LINE_MEMBER( ptm_o3_callback ); DECLARE_WRITE8_MEMBER( baud_rate_w ); diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index 4e84d08d2e1..16823abeaf3 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -54,10 +54,10 @@ private: DECLARE_WRITE_LINE_MEMBER(ctc_zc1_w); DECLARE_WRITE_LINE_MEMBER(ctc_zc2_w); - DECLARE_READ8_MEMBER(pio_porta_r); - DECLARE_WRITE8_MEMBER(pio_porta_w); - DECLARE_READ8_MEMBER(pio_portb_r); - DECLARE_WRITE8_MEMBER(pio_portb_w); + uint8_t pio_porta_r(); + void pio_porta_w(uint8_t data); + uint8_t pio_portb_r(); + void pio_portb_w(uint8_t data); DECLARE_WRITE8_MEMBER(polyplay_characterram_w); void polyplay_palette(palette_device &palette) const; diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h index 660eba84864..2ddfe2bcee3 100644 --- a/src/mame/includes/popeye.h +++ b/src/mame/includes/popeye.h @@ -82,13 +82,13 @@ protected: int m_field; std::array<bitmap_ind16, 2> m_bitmap; // bitmaps for fields - virtual DECLARE_WRITE8_MEMBER(refresh_w); + virtual void refresh_w(offs_t offset, uint8_t data); DECLARE_READ8_MEMBER(protection_r); DECLARE_WRITE8_MEMBER(protection_w); DECLARE_WRITE8_MEMBER(popeye_videoram_w); DECLARE_WRITE8_MEMBER(popeye_colorram_w); virtual DECLARE_WRITE8_MEMBER(background_w); - DECLARE_WRITE8_MEMBER(popeye_portB_w); + void popeye_portB_w(uint8_t data); TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void driver_start() override; virtual void video_start() override; @@ -141,7 +141,7 @@ protected: uint8_t m_watchdog_counter; virtual void driver_start() override; - virtual DECLARE_WRITE8_MEMBER(refresh_w) override; + virtual void refresh_w(offs_t offset, uint8_t data) override; virtual DECLARE_WRITE_LINE_MEMBER(screen_vblank) override; virtual void maincpu_program_map(address_map &map) override; virtual void decrypt_rom() override; diff --git a/src/mame/includes/radio86.h b/src/mame/includes/radio86.h index f239b733e1d..3d323527a6a 100644 --- a/src/mame/includes/radio86.h +++ b/src/mame/includes/radio86.h @@ -63,7 +63,7 @@ public: uint8_t rk7007_8255_portc_r(); uint8_t kr03_8255_portb_r2(); void hrq_w(int state); - DECLARE_READ8_MEMBER(radio86rom_romdisk_porta_r); + uint8_t radio86rom_romdisk_porta_r(); uint8_t radio86ram_romdisk_porta_r(); void radio86_romdisk_portb_w(uint8_t data); void radio86_romdisk_portc_w(uint8_t data); diff --git a/src/mame/includes/rmnimbus.h b/src/mame/includes/rmnimbus.h index ad9feff9319..c93d72f53f2 100644 --- a/src/mame/includes/rmnimbus.h +++ b/src/mame/includes/rmnimbus.h @@ -132,18 +132,18 @@ private: DECLARE_READ8_MEMBER(scsi_r); DECLARE_WRITE8_MEMBER(scsi_w); DECLARE_WRITE8_MEMBER(fdc_ctl_w); - DECLARE_READ8_MEMBER(nimbus_pc8031_r); - DECLARE_WRITE8_MEMBER(nimbus_pc8031_w); + uint8_t nimbus_pc8031_r(offs_t offset); + void nimbus_pc8031_w(offs_t offset, uint8_t data); DECLARE_READ8_MEMBER(nimbus_pc8031_iou_r); DECLARE_WRITE8_MEMBER(nimbus_pc8031_iou_w); - DECLARE_READ8_MEMBER(nimbus_pc8031_port1_r); - DECLARE_WRITE8_MEMBER(nimbus_pc8031_port1_w); - DECLARE_READ8_MEMBER(nimbus_pc8031_port3_r); - DECLARE_WRITE8_MEMBER(nimbus_pc8031_port3_w); + uint8_t nimbus_pc8031_port1_r(); + void nimbus_pc8031_port1_w(uint8_t data); + uint8_t nimbus_pc8031_port3_r(); + void nimbus_pc8031_port3_w(uint8_t data); DECLARE_READ8_MEMBER(nimbus_iou_r); DECLARE_WRITE8_MEMBER(nimbus_iou_w); - DECLARE_WRITE8_MEMBER(nimbus_sound_ay8910_porta_w); - DECLARE_WRITE8_MEMBER(nimbus_sound_ay8910_portb_w); + void nimbus_sound_ay8910_porta_w(uint8_t data); + void nimbus_sound_ay8910_portb_w(uint8_t data); DECLARE_READ8_MEMBER(nimbus_mouse_js_r); DECLARE_WRITE8_MEMBER(nimbus_mouse_js_w); DECLARE_READ16_MEMBER(nimbus_video_io_r); @@ -156,7 +156,7 @@ private: DECLARE_WRITE_LINE_MEMBER(sio_interrupt); DECLARE_WRITE_LINE_MEMBER(nimbus_fdc_intrq_w); DECLARE_WRITE_LINE_MEMBER(nimbus_fdc_drq_w); - DECLARE_WRITE8_MEMBER(nimbus_via_write_portb); + void nimbus_via_write_portb(uint8_t data); DECLARE_WRITE_LINE_MEMBER(write_scsi_bsy); DECLARE_WRITE_LINE_MEMBER(write_scsi_cd); DECLARE_WRITE_LINE_MEMBER(write_scsi_io); @@ -175,7 +175,7 @@ private: void write_pixel_data(uint16_t x, uint16_t y, uint16_t data); void change_palette(uint8_t bank, uint16_t colours); void external_int(uint8_t vector, bool state); - DECLARE_READ8_MEMBER(cascade_callback); + uint8_t cascade_callback(); void nimbus_bank_memory(); void memory_reset(); void fdc_reset(); diff --git a/src/mame/includes/sage2.h b/src/mame/includes/sage2.h index 0ef2f11d127..fe6d1a54e98 100644 --- a/src/mame/includes/sage2.h +++ b/src/mame/includes/sage2.h @@ -58,9 +58,9 @@ private: DECLARE_READ16_MEMBER(rom_r); DECLARE_WRITE_LINE_MEMBER( br1_w ); DECLARE_WRITE_LINE_MEMBER( br2_w ); - DECLARE_WRITE8_MEMBER( ppi0_pc_w ); - DECLARE_READ8_MEMBER( ppi1_pb_r ); - DECLARE_WRITE8_MEMBER( ppi1_pc_w ); + void ppi0_pc_w(uint8_t data); + uint8_t ppi1_pb_r(); + void ppi1_pc_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( fdc_irq ); diff --git a/src/mame/includes/sg1000.h b/src/mame/includes/sg1000.h index ec939e35e9f..febdc1929c9 100644 --- a/src/mame/includes/sg1000.h +++ b/src/mame/includes/sg1000.h @@ -118,8 +118,8 @@ private: int m_centronics_busy; DECLARE_WRITE_LINE_MEMBER( write_centronics_busy ); - DECLARE_READ8_MEMBER( ppi_pa_r ); - DECLARE_WRITE8_MEMBER( ppi_pc_w ); + uint8_t ppi_pa_r(); + void ppi_pc_w(uint8_t data); DECLARE_FLOPPY_FORMATS( floppy_formats ); void sf7000_io_map(address_map &map); diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index b5173afeadf..f237ac7cd4d 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -65,11 +65,11 @@ private: DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); DECLARE_READ8_MEMBER(soundlatch_r); DECLARE_WRITE8_MEMBER(videoram_w); - DECLARE_WRITE8_MEMBER(ay8910_portb_w); + void ay8910_portb_w(uint8_t data); // game specific - DECLARE_WRITE8_MEMBER(chinhero_ay8910_porta_w); - DECLARE_WRITE8_MEMBER(shangkid_ay8910_porta_w); + void chinhero_ay8910_porta_w(uint8_t data); + void shangkid_ay8910_porta_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index 81eb75bd6c5..2f8e8a2d0c0 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -73,7 +73,7 @@ private: DECLARE_WRITE8_MEMBER(port_0_w); DECLARE_WRITE8_MEMBER(port_1_w); DECLARE_WRITE8_MEMBER(port_2_w); - DECLARE_READ8_MEMBER(audio_p2_r); + uint8_t audio_p2_r(); DECLARE_READ_LINE_MEMBER(audio_t0_r); DECLARE_READ_LINE_MEMBER(audio_t1_r); diff --git a/src/mame/includes/special.h b/src/mame/includes/special.h index 835df33f4b5..2f37552d329 100644 --- a/src/mame/includes/special.h +++ b/src/mame/includes/special.h @@ -82,13 +82,13 @@ private: DECLARE_WRITE8_MEMBER(erik_rc_reg_w); DECLARE_READ8_MEMBER(erik_disk_reg_r); DECLARE_WRITE8_MEMBER(erik_disk_reg_w); - DECLARE_READ8_MEMBER(specialist_8255_porta_r); - DECLARE_READ8_MEMBER(specialist_8255_portb_r); - DECLARE_READ8_MEMBER(specimx_8255_portb_r); - DECLARE_READ8_MEMBER(specialist_8255_portc_r); - DECLARE_WRITE8_MEMBER(specialist_8255_porta_w); - DECLARE_WRITE8_MEMBER(specialist_8255_portb_w); - DECLARE_WRITE8_MEMBER(specialist_8255_portc_w); + uint8_t specialist_8255_porta_r(); + uint8_t specialist_8255_portb_r(); + uint8_t specimx_8255_portb_r(); + uint8_t specialist_8255_portc_r(); + void specialist_8255_porta_w(uint8_t data); + void specialist_8255_portb_w(uint8_t data); + void specialist_8255_portc_w(uint8_t data); DECLARE_MACHINE_RESET(special); DECLARE_MACHINE_RESET(erik); diff --git a/src/mame/includes/swtpc09.h b/src/mame/includes/swtpc09.h index 10b76d24754..e83749130c9 100644 --- a/src/mame/includes/swtpc09.h +++ b/src/mame/includes/swtpc09.h @@ -75,8 +75,8 @@ private: DECLARE_FLOPPY_FORMATS(floppy_flex_formats); DECLARE_FLOPPY_FORMATS(floppy_uniflex_formats); - DECLARE_READ8_MEMBER(pia0_a_r); - DECLARE_READ8_MEMBER(pia0_ca1_r); + uint8_t pia0_a_r(); + uint8_t pia0_ca1_r(); DECLARE_WRITE_LINE_MEMBER( pia0_irq_a ); DECLARE_WRITE_LINE_MEMBER(io_irq_w); @@ -89,10 +89,10 @@ private: DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); DECLARE_WRITE_LINE_MEMBER( fdc_sso_w ); - DECLARE_READ8_MEMBER( dmaf3_via_read_porta ); - DECLARE_READ8_MEMBER( dmaf3_via_read_portb ); - DECLARE_WRITE8_MEMBER( dmaf3_via_write_porta ); - DECLARE_WRITE8_MEMBER( dmaf3_via_write_portb ); + uint8_t dmaf3_via_read_porta(); + uint8_t dmaf3_via_read_portb(); + void dmaf3_via_write_porta(uint8_t data); + void dmaf3_via_write_portb(uint8_t data); DECLARE_WRITE_LINE_MEMBER( dmaf3_via_irq ); TIMER_CALLBACK_MEMBER(floppy_motor_callback); diff --git a/src/mame/includes/taxidriv.h b/src/mame/includes/taxidriv.h index 3d7722dc9af..9c7a2834396 100644 --- a/src/mame/includes/taxidriv.h +++ b/src/mame/includes/taxidriv.h @@ -55,27 +55,27 @@ private: int m_bghide; int m_spritectrl[9]; - DECLARE_WRITE8_MEMBER(p2a_w); - DECLARE_WRITE8_MEMBER(p2b_w); - DECLARE_WRITE8_MEMBER(p2c_w); - DECLARE_WRITE8_MEMBER(p3a_w); - DECLARE_WRITE8_MEMBER(p3b_w); - DECLARE_WRITE8_MEMBER(p3c_w); - DECLARE_WRITE8_MEMBER(p4a_w); - DECLARE_WRITE8_MEMBER(p4b_w); - DECLARE_WRITE8_MEMBER(p4c_w); - DECLARE_READ8_MEMBER(p0a_r); - DECLARE_READ8_MEMBER(p0c_r); - DECLARE_WRITE8_MEMBER(p0b_w); - DECLARE_WRITE8_MEMBER(p0c_w); - DECLARE_READ8_MEMBER(p1b_r); - DECLARE_READ8_MEMBER(p1c_r); - DECLARE_WRITE8_MEMBER(p1a_w); - DECLARE_WRITE8_MEMBER(p1c_w); - DECLARE_READ8_MEMBER(p8910_0a_r); - DECLARE_READ8_MEMBER(p8910_1a_r); - DECLARE_WRITE8_MEMBER(p8910_0b_w); - DECLARE_WRITE8_MEMBER(spritectrl_w); + void p2a_w(uint8_t data); + void p2b_w(uint8_t data); + void p2c_w(uint8_t data); + void p3a_w(uint8_t data); + void p3b_w(uint8_t data); + void p3c_w(uint8_t data); + void p4a_w(uint8_t data); + void p4b_w(uint8_t data); + void p4c_w(uint8_t data); + uint8_t p0a_r(); + uint8_t p0c_r(); + void p0b_w(uint8_t data); + void p0c_w(uint8_t data); + uint8_t p1b_r(); + uint8_t p1c_r(); + void p1a_w(uint8_t data); + void p1c_w(uint8_t data); + uint8_t p8910_0a_r(); + uint8_t p8910_1a_r(); + void p8910_0b_w(uint8_t data); + void spritectrl_w(offs_t offset, uint8_t data); void taxidriv_palette(palette_device &palette) const; diff --git a/src/mame/includes/truco.h b/src/mame/includes/truco.h index b166a3e75d5..059f274717c 100644 --- a/src/mame/includes/truco.h +++ b/src/mame/includes/truco.h @@ -39,9 +39,9 @@ private: int m_trigger; - DECLARE_WRITE8_MEMBER(porta_w); + void porta_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(pia_ca2_w); - DECLARE_WRITE8_MEMBER(portb_w); + void portb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(pia_irqa_w); DECLARE_WRITE_LINE_MEMBER(pia_irqb_w); diff --git a/src/mame/includes/vectrex.h b/src/mame/includes/vectrex.h index cedbf0b60b5..880a3fcb28f 100644 --- a/src/mame/includes/vectrex.h +++ b/src/mame/includes/vectrex.h @@ -57,7 +57,7 @@ protected: m_screen(*this, "screen") { } - DECLARE_WRITE8_MEMBER(vectrex_psg_port_w); + void vectrex_psg_port_w(uint8_t data); DECLARE_READ8_MEMBER(vectrex_via_r); DECLARE_WRITE8_MEMBER(vectrex_via_w); virtual void driver_start() override; @@ -70,10 +70,10 @@ protected: TIMER_CALLBACK_MEMBER(vectrex_refresh); TIMER_CALLBACK_MEMBER(vectrex_zero_integrators); TIMER_CALLBACK_MEMBER(update_signal); - DECLARE_READ8_MEMBER(vectrex_via_pb_r); - DECLARE_READ8_MEMBER(vectrex_via_pa_r); - DECLARE_WRITE8_MEMBER(v_via_pb_w); - DECLARE_WRITE8_MEMBER(v_via_pa_w); + uint8_t vectrex_via_pb_r(); + uint8_t vectrex_via_pa_r(); + void v_via_pb_w(uint8_t data); + void v_via_pa_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(v_via_ca2_w); DECLARE_WRITE_LINE_MEMBER(v_via_cb2_w); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load); @@ -184,7 +184,7 @@ public: protected: DECLARE_WRITE8_MEMBER(raaspec_led_w); - DECLARE_READ8_MEMBER(vectrex_s1_via_pb_r); + uint8_t vectrex_s1_via_pb_r(); void raaspec_map(address_map &map); diff --git a/src/mame/includes/vixen.h b/src/mame/includes/vixen.h index dc5fea07047..0ec2411427f 100644 --- a/src/mame/includes/vixen.h +++ b/src/mame/includes/vixen.h @@ -65,11 +65,11 @@ private: DECLARE_WRITE8_MEMBER( cmd_w ); DECLARE_READ8_MEMBER( ieee488_r ); DECLARE_READ8_MEMBER( port3_r ); - DECLARE_READ8_MEMBER( i8155_pa_r ); - DECLARE_WRITE8_MEMBER( i8155_pb_w ); - DECLARE_WRITE8_MEMBER( i8155_pc_w ); - DECLARE_WRITE8_MEMBER( io_i8155_pb_w ); - DECLARE_WRITE8_MEMBER( io_i8155_pc_w ); + uint8_t i8155_pa_r(); + void i8155_pb_w(uint8_t data); + void i8155_pc_w(uint8_t data); + void io_i8155_pb_w(uint8_t data); + void io_i8155_pc_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( io_i8155_to_w ); DECLARE_WRITE_LINE_MEMBER( srq_w ); DECLARE_WRITE_LINE_MEMBER( atn_w ); diff --git a/src/mame/includes/wpc_dot.h b/src/mame/includes/wpc_dot.h index 29a8ffa44a1..c34dcdb36e7 100644 --- a/src/mame/includes/wpc_dot.h +++ b/src/mame/includes/wpc_dot.h @@ -55,12 +55,8 @@ protected: DECLARE_WRITE_LINE_MEMBER(wpcsnd_reply_w); DECLARE_WRITE_LINE_MEMBER(wpc_irq_w); DECLARE_WRITE_LINE_MEMBER(wpc_firq_w); - DECLARE_READ8_MEMBER(wpc_sound_ctrl_r); - DECLARE_WRITE8_MEMBER(wpc_sound_ctrl_w); - DECLARE_READ8_MEMBER(wpc_sound_data_r); - DECLARE_WRITE8_MEMBER(wpc_sound_data_w); - DECLARE_WRITE8_MEMBER(wpc_rombank_w); - DECLARE_WRITE8_MEMBER(wpc_dmdbank_w); + void wpc_rombank_w(uint8_t data); + void wpc_dmdbank_w(offs_t offset, uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h index b12867bc522..47d05b9985c 100644 --- a/src/mame/includes/x1.h +++ b/src/mame/includes/x1.h @@ -127,12 +127,12 @@ public: DECLARE_READ8_MEMBER(x1turboz_blackclip_r); DECLARE_READ8_MEMBER(x1turbo_bank_r); DECLARE_WRITE8_MEMBER(x1turbo_bank_w); - DECLARE_READ8_MEMBER(x1_porta_r); - DECLARE_READ8_MEMBER(x1_portb_r); - DECLARE_READ8_MEMBER(x1_portc_r); - DECLARE_WRITE8_MEMBER(x1_porta_w); - DECLARE_WRITE8_MEMBER(x1_portb_w); - DECLARE_WRITE8_MEMBER(x1_portc_w); + uint8_t x1_porta_r(); + uint8_t x1_portb_r(); + uint8_t x1_portc_r(); + void x1_porta_w(uint8_t data); + void x1_portb_w(uint8_t data); + void x1_portc_w(uint8_t data); void init_x1_kanji(); virtual void machine_start() override; DECLARE_MACHINE_RESET(x1); @@ -147,10 +147,10 @@ public: DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); DECLARE_WRITE_LINE_MEMBER(hdl_w); - DECLARE_READ8_MEMBER(memory_read_byte); - DECLARE_WRITE8_MEMBER(memory_write_byte); - DECLARE_READ8_MEMBER(io_read_byte); - DECLARE_WRITE8_MEMBER(io_write_byte); + uint8_t memory_read_byte(offs_t offset); + void memory_write_byte(offs_t offset, uint8_t data); + uint8_t io_read_byte(offs_t offset); + void io_write_byte(offs_t offset, uint8_t data); required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; optional_device<z80dma_device> m_dma; diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h index 7d47e09cb06..7bc1deee1dc 100644 --- a/src/mame/includes/x68k.h +++ b/src/mame/includes/x68k.h @@ -262,18 +262,18 @@ protected: TIMER_CALLBACK_MEMBER(md_6button_port1_timeout); TIMER_CALLBACK_MEMBER(md_6button_port2_timeout); TIMER_CALLBACK_MEMBER(bus_error); - DECLARE_READ8_MEMBER(ppi_port_a_r); - DECLARE_READ8_MEMBER(ppi_port_b_r); - DECLARE_READ8_MEMBER(ppi_port_c_r); - DECLARE_WRITE8_MEMBER(ppi_port_c_w); + uint8_t ppi_port_a_r(); + uint8_t ppi_port_b_r(); + uint8_t ppi_port_c_r(); + void ppi_port_c_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(fdc_irq); - DECLARE_WRITE8_MEMBER(ct_w); + void ct_w(uint8_t data); DECLARE_WRITE8_MEMBER(adpcm_w); DECLARE_WRITE_LINE_MEMBER(mfp_irq_callback); //dmac DECLARE_WRITE_LINE_MEMBER(dma_irq); - DECLARE_WRITE8_MEMBER(dma_end); + void dma_end(offs_t offset, uint8_t data); int read_mouse(); void set_adpcm(); @@ -315,10 +315,10 @@ protected: DECLARE_WRITE16_MEMBER(spritereg_w); DECLARE_READ16_MEMBER(spriteram_r); DECLARE_WRITE16_MEMBER(spriteram_w); - DECLARE_READ16_MEMBER(tvram_read); - DECLARE_WRITE16_MEMBER(tvram_write); - DECLARE_READ16_MEMBER(gvram_read); - DECLARE_WRITE16_MEMBER(gvram_write); + uint16_t tvram_read(offs_t offset); + void tvram_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t gvram_read(offs_t offset); + void gvram_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void update_ipl(); uint8_t iack1(); diff --git a/src/mame/includes/z80ne.h b/src/mame/includes/z80ne.h index 969a7800dda..747bdd26bd5 100644 --- a/src/mame/includes/z80ne.h +++ b/src/mame/includes/z80ne.h @@ -173,7 +173,7 @@ protected: DECLARE_READ_LINE_MEMBER(lx387_shift_r); DECLARE_READ_LINE_MEMBER(lx387_control_r); DECLARE_READ8_MEMBER(lx387_data_r); - DECLARE_READ8_MEMBER(lx388_mc6847_videoram_r); + uint8_t lx388_mc6847_videoram_r(offs_t offset); DECLARE_READ8_MEMBER(lx388_read_field_sync); required_shared_ptr<uint8_t> m_videoram; diff --git a/src/mame/includes/zx.h b/src/mame/includes/zx.h index 1ba1ffb6329..8603ad502c1 100644 --- a/src/mame/includes/zx.h +++ b/src/mame/includes/zx.h @@ -62,7 +62,7 @@ private: DECLARE_READ8_MEMBER(ula_high_r); DECLARE_READ8_MEMBER(ula_low_r); - DECLARE_WRITE8_MEMBER(refresh_w); + void refresh_w(offs_t offset, uint8_t data); DECLARE_READ8_MEMBER(zx80_io_r); DECLARE_READ8_MEMBER(zx81_io_r); DECLARE_READ8_MEMBER(pc8300_io_r); diff --git a/src/mame/machine/aim65.cpp b/src/mame/machine/aim65.cpp index 8707cf9a2a1..5c7ce8c221d 100644 --- a/src/mame/machine/aim65.cpp +++ b/src/mame/machine/aim65.cpp @@ -71,16 +71,16 @@ void aim65_state::u1_pb_w( u8 data ) } -template <unsigned D> WRITE16_MEMBER( aim65_state::update_ds ) +template <unsigned D> void aim65_state::update_ds(offs_t offset, u16 data) { m_digits[((D - 1) << 2) | (offset ^ 3)] = data; } -template WRITE16_MEMBER( aim65_state::update_ds<1> ); -template WRITE16_MEMBER( aim65_state::update_ds<2> ); -template WRITE16_MEMBER( aim65_state::update_ds<3> ); -template WRITE16_MEMBER( aim65_state::update_ds<4> ); -template WRITE16_MEMBER( aim65_state::update_ds<5> ); +template void aim65_state::update_ds<1>(offs_t offset, u16 data); +template void aim65_state::update_ds<2>(offs_t offset, u16 data); +template void aim65_state::update_ds<3>(offs_t offset, u16 data); +template void aim65_state::update_ds<4>(offs_t offset, u16 data); +template void aim65_state::update_ds<5>(offs_t offset, u16 data); /****************************************************************************** diff --git a/src/mame/machine/gb.cpp b/src/mame/machine/gb.cpp index c6333808378..8f475cd7ca5 100644 --- a/src/mame/machine/gb.cpp +++ b/src/mame/machine/gb.cpp @@ -565,7 +565,7 @@ void gb_state::gb_timer_increment() } // This gets called while the cpu is executing instructions to keep the timer state in sync -WRITE8_MEMBER(gb_state::gb_timer_callback) +void gb_state::gb_timer_callback(uint8_t data) { uint16_t old_gb_divcount = m_divcount; uint16_t old_internal_serial_clock = m_internal_serial_clock; diff --git a/src/mame/machine/micro3d.cpp b/src/mame/machine/micro3d.cpp index e96be82b856..3c5fb44d733 100644 --- a/src/mame/machine/micro3d.cpp +++ b/src/mame/machine/micro3d.cpp @@ -45,12 +45,12 @@ WRITE_LINE_MEMBER(micro3d_state::duart_txb) m_audiocpu->set_input_line(MCS51_RX_LINE, CLEAR_LINE); } -READ8_MEMBER(micro3d_state::data_to_i8031) +uint8_t micro3d_state::data_to_i8031() { return m_m68681_tx0; } -WRITE8_MEMBER(micro3d_state::data_from_i8031) +void micro3d_state::data_from_i8031(uint8_t data) { m_duart->rx_b_w(data); } @@ -63,7 +63,7 @@ WRITE8_MEMBER(micro3d_state::data_from_i8031) * 4: - * 5: - */ -READ8_MEMBER(micro3d_state::duart_input_r) +uint8_t micro3d_state::duart_input_r() { return 0x2; } @@ -72,7 +72,7 @@ READ8_MEMBER(micro3d_state::duart_input_r) * 5: /I8051 reset * 7: Status LED */ -WRITE8_MEMBER(micro3d_state::duart_output_w) +void micro3d_state::duart_output_w(uint8_t data) { m_audiocpu->set_input_line(INPUT_LINE_RESET, data & 0x20 ? CLEAR_LINE : ASSERT_LINE); } @@ -365,7 +365,7 @@ READ16_MEMBER(micro3d_state::micro3d_encoder_l_r) return ((y_encoder & 0xff) << 8) | (x_encoder & 0xff); } -READ8_MEMBER( micro3d_state::adc_volume_r ) +uint8_t micro3d_state::adc_volume_r() { return (uint8_t)((255.0/100.0) * m_volume->read() + 0.5); } @@ -465,7 +465,7 @@ WRITE8_MEMBER(micro3d_state::micro3d_snd_dac_b) /* TODO: This controls upd7759 volume */ } -WRITE8_MEMBER(micro3d_state::micro3d_sound_p1_w) +void micro3d_state::micro3d_sound_p1_w(uint8_t data) { m_sound_port_latch[1] = data; @@ -473,7 +473,7 @@ WRITE8_MEMBER(micro3d_state::micro3d_sound_p1_w) noise->noise_sh_w(data); } -WRITE8_MEMBER(micro3d_state::micro3d_sound_p3_w) +void micro3d_state::micro3d_sound_p3_w(uint8_t data) { m_sound_port_latch[3] = data; @@ -481,12 +481,12 @@ WRITE8_MEMBER(micro3d_state::micro3d_sound_p3_w) m_upd7759->reset_w(!BIT(data, 4)); } -READ8_MEMBER(micro3d_state::micro3d_sound_p1_r) +uint8_t micro3d_state::micro3d_sound_p1_r() { return (m_sound_port_latch[1] & 0x7f) | m_sound_sw->read(); } -READ8_MEMBER(micro3d_state::micro3d_sound_p3_r) +uint8_t micro3d_state::micro3d_sound_p3_r() { return (m_sound_port_latch[3] & 0xf7) | (m_upd7759->busy_r() ? 0x08 : 0); } diff --git a/src/mame/machine/mz700.cpp b/src/mame/machine/mz700.cpp index 5ca4bdb4f38..3c95d2f6386 100644 --- a/src/mame/machine/mz700.cpp +++ b/src/mame/machine/mz700.cpp @@ -469,7 +469,7 @@ WRITE_LINE_MEMBER(mz_state::pit_irq_2) 8255 PPI ***************************************************************************/ -READ8_MEMBER(mz_state::pio_port_b_r) +uint8_t mz_state::pio_port_b_r() { const int key_line = m_ls145->read(); const char *const keynames[10] = { "ROW0", "ROW1", "ROW2", "ROW3", "ROW4", "ROW5", "ROW6", "ROW7", "ROW8", "ROW9" }; @@ -490,7 +490,7 @@ READ8_MEMBER(mz_state::pio_port_b_r) * bit 5 in tape data (RDATA) * bit 4 in motor (1 = on) */ -READ8_MEMBER(mz_state::pio_port_c_r) +uint8_t mz_state::pio_port_c_r() { uint8_t data = 0; @@ -510,7 +510,7 @@ READ8_MEMBER(mz_state::pio_port_c_r) } -WRITE8_MEMBER(mz_state::pio_port_a_w) +void mz_state::pio_port_a_w(uint8_t data) { LOG(2,"mz700_pio_port_a_w",("%02X\n", data),machine()); @@ -522,7 +522,7 @@ WRITE8_MEMBER(mz_state::pio_port_a_w) } -WRITE8_MEMBER(mz_state::pio_port_c_w) +void mz_state::pio_port_c_w(uint8_t data) { /* * bit 3 out motor control (0 = on) @@ -585,7 +585,7 @@ WRITE_LINE_MEMBER(mz_state::write_centronics_perror) m_centronics_perror = state; } -READ8_MEMBER(mz_state::mz800_z80pio_port_a_r) +uint8_t mz_state::mz800_z80pio_port_a_r() { uint8_t result = 0; @@ -596,7 +596,7 @@ READ8_MEMBER(mz_state::mz800_z80pio_port_a_r) return result; } -WRITE8_MEMBER(mz_state::mz800_z80pio_port_a_w) +void mz_state::mz800_z80pio_port_a_w(uint8_t data) { m_centronics->write_init(BIT(data, 6)); m_centronics->write_strobe(BIT(data, 7)); diff --git a/src/mame/machine/mz80.cpp b/src/mame/machine/mz80.cpp index 4c8b5196c23..79d6c6ee321 100644 --- a/src/mame/machine/mz80.cpp +++ b/src/mame/machine/mz80.cpp @@ -26,7 +26,7 @@ void mz80_state::machine_reset() } -READ8_MEMBER( mz80_state::mz80k_8255_portb_r ) +uint8_t mz80_state::mz80k_8255_portb_r() { char kbdrow[8]; sprintf(kbdrow,"LINE%d", m_mz80k_keyboard_line); @@ -36,7 +36,7 @@ READ8_MEMBER( mz80_state::mz80k_8255_portb_r ) return ioport(kbdrow)->read(); } -READ8_MEMBER( mz80_state::mz80k_8255_portc_r ) +uint8_t mz80_state::mz80k_8255_portc_r() { uint8_t val = 0; val |= m_mz80k_vertical ? 0x80 : 0x00; @@ -49,12 +49,12 @@ READ8_MEMBER( mz80_state::mz80k_8255_portc_r ) return val; } -WRITE8_MEMBER( mz80_state::mz80k_8255_porta_w ) +void mz80_state::mz80k_8255_porta_w(uint8_t data) { m_mz80k_keyboard_line = data & 0x0f; } -WRITE8_MEMBER( mz80_state::mz80k_8255_portc_w ) +void mz80_state::mz80k_8255_portc_w(uint8_t data) { // logerror("mz80k_8255_portc_w %02x\n",data); m_cassette->output(BIT(data, 1) ? -1.0 : +1.0); diff --git a/src/mame/machine/nes_vt_soc.cpp b/src/mame/machine/nes_vt_soc.cpp index 489aad69713..446bddb966b 100644 --- a/src/mame/machine/nes_vt_soc.cpp +++ b/src/mame/machine/nes_vt_soc.cpp @@ -229,9 +229,9 @@ void nes_vt_soc_device::device_start() m_ppu->set_hblank_callback(*this, FUNC(nes_vt_soc_device::hblank_irq)); //m_ppu->set_hblank_callback(*m_cartslot->m_cart, FUNC(device_nes_cart_interface::hblank_irq))); - //m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(*m_cartslot->m_cart, FUNC(device_nes_cart_interface::chr_r)), write8_delegate(*m_cartslot->m_cart, FUNC(device_nes_cart_interface::chr_w))); + //m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8sm_delegate(*m_cartslot->m_cart, FUNC(device_nes_cart_interface::chr_r)), write8sm_delegate(*m_cartslot->m_cart, FUNC(device_nes_cart_interface::chr_w))); m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(*this, FUNC(nes_vt_soc_device::nt_r)), write8_delegate(*this, FUNC(nes_vt_soc_device::nt_w))); - m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(*this, FUNC(nes_vt_soc_device::chr_r)), write8_delegate(*this, FUNC(nes_vt_soc_device::chr_w))); + m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8sm_delegate(*this, FUNC(nes_vt_soc_device::chr_r)), write8sm_delegate(*this, FUNC(nes_vt_soc_device::chr_w))); m_write_0_callback.resolve_safe(); m_read_0_callback.resolve_safe(0xff); @@ -451,7 +451,7 @@ void nes_vt_soc_device::scrambled_410x_w(uint16_t offset, uint8_t data) -READ8_MEMBER(nes_vt_soc_device::spr_r) +uint8_t nes_vt_soc_device::spr_r(offs_t offset) { if (m_4242 & 0x1 || m_411d & 0x04) { @@ -466,7 +466,7 @@ READ8_MEMBER(nes_vt_soc_device::spr_r) } } -READ8_MEMBER(nes_vt_soc_device::chr_r) +uint8_t nes_vt_soc_device::chr_r(offs_t offset) { if (m_4242 & 0x1 || m_411d & 0x04) { @@ -482,7 +482,7 @@ READ8_MEMBER(nes_vt_soc_device::chr_r) } -WRITE8_MEMBER(nes_vt_soc_device::chr_w) +void nes_vt_soc_device::chr_w(offs_t offset, uint8_t data) { if (m_4242 & 0x1 || m_411d & 0x04) { @@ -1174,7 +1174,7 @@ WRITE_LINE_MEMBER(nes_vt_soc_device::apu_irq) // set_input_line(N2A03_APU_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); } -READ8_MEMBER(nes_vt_soc_device::apu_read_mem) +uint8_t nes_vt_soc_device::apu_read_mem(offs_t offset) { // TODO return 0x00;//mintf->program->read_byte(offset); diff --git a/src/mame/machine/nes_vt_soc.h b/src/mame/machine/nes_vt_soc.h index 6638a2ebd1e..05b595f8e9a 100644 --- a/src/mame/machine/nes_vt_soc.h +++ b/src/mame/machine/nes_vt_soc.h @@ -76,9 +76,9 @@ protected: DECLARE_WRITE8_MEMBER(vt03_410x_w); DECLARE_READ8_MEMBER(vt03_410x_r); void scrambled_410x_w(uint16_t offset, uint8_t data); - DECLARE_READ8_MEMBER(spr_r); - DECLARE_READ8_MEMBER(chr_r); - DECLARE_WRITE8_MEMBER(chr_w); + uint8_t spr_r(offs_t offset); + uint8_t chr_r(offs_t offset); + void chr_w(offs_t offset, uint8_t data); void scanline_irq(int scanline, int vblank, int blanked); void hblank_irq(int scanline, int vblank, int blanked); void video_irq(bool hblank, int scanline, int vblank, int blanked); @@ -130,7 +130,7 @@ protected: std::unique_ptr<uint8_t[]> m_chrram; DECLARE_WRITE_LINE_MEMBER(apu_irq); - DECLARE_READ8_MEMBER(apu_read_mem); + uint8_t apu_read_mem(offs_t offset); DECLARE_READ8_MEMBER(external_space_read); DECLARE_WRITE8_MEMBER(external_space_write); diff --git a/src/mame/machine/orion.cpp b/src/mame/machine/orion.cpp index b0ac5e4fa54..a5a457235f1 100644 --- a/src/mame/machine/orion.cpp +++ b/src/mame/machine/orion.cpp @@ -23,7 +23,7 @@ -READ8_MEMBER(orion_state::orion_romdisk_porta_r) +uint8_t orion_state::orion_romdisk_porta_r() { uint16_t addr = (m_romdisk_msb << 8) | m_romdisk_lsb; if (m_cart->exists() && addr < m_cart->get_rom_size()) @@ -32,12 +32,12 @@ READ8_MEMBER(orion_state::orion_romdisk_porta_r) return 0xff; } -WRITE8_MEMBER(orion_state::orion_romdisk_portb_w) +void orion_state::orion_romdisk_portb_w(uint8_t data) { m_romdisk_lsb = data; } -WRITE8_MEMBER(orion_state::orion_romdisk_portc_w) +void orion_state::orion_romdisk_portc_w(uint8_t data) { m_romdisk_msb = data; } diff --git a/src/mame/machine/osborne1.cpp b/src/mame/machine/osborne1.cpp index 807ba5229f5..c6322f9e403 100644 --- a/src/mame/machine/osborne1.cpp +++ b/src/mame/machine/osborne1.cpp @@ -167,7 +167,7 @@ WRITE_LINE_MEMBER( osborne1_state::irqack_w ) } -READ8_MEMBER( osborne1_state::ieee_pia_pb_r ) +uint8_t osborne1_state::ieee_pia_pb_r() { /* bit description @@ -191,7 +191,7 @@ READ8_MEMBER( osborne1_state::ieee_pia_pb_r ) return data; } -WRITE8_MEMBER( osborne1_state::ieee_pia_pb_w ) +void osborne1_state::ieee_pia_pb_w(uint8_t data) { /* bit description @@ -218,14 +218,14 @@ WRITE_LINE_MEMBER( osborne1_state::ieee_pia_irq_a_func ) } -WRITE8_MEMBER( osborne1_state::video_pia_port_a_w ) +void osborne1_state::video_pia_port_a_w(uint8_t data) { m_scroll_x = data >> 1; m_fdc->dden_w(BIT(data, 0)); } -WRITE8_MEMBER( osborne1_state::video_pia_port_b_w ) +void osborne1_state::video_pia_port_b_w(uint8_t data) { m_speaker->level_w((BIT(data, 5) && m_beep_state) ? 1 : 0); diff --git a/src/mame/machine/pc1251.cpp b/src/mame/machine/pc1251.cpp index 6f79918e5ed..cd9fcf7fa1c 100644 --- a/src/mame/machine/pc1251.cpp +++ b/src/mame/machine/pc1251.cpp @@ -8,16 +8,16 @@ /* C-CE while reset, program will not be destroyed! */ -WRITE8_MEMBER(pc1251_state::out_b_w) +void pc1251_state::out_b_w(uint8_t data) { m_outb = data; } -WRITE8_MEMBER(pc1251_state::out_c_w) +void pc1251_state::out_c_w(uint8_t data) { } -READ8_MEMBER(pc1251_state::in_a_r) +uint8_t pc1251_state::in_a_r() { int data = m_outa; @@ -43,7 +43,7 @@ READ8_MEMBER(pc1251_state::in_a_r) return data; } -READ8_MEMBER(pc1251_state::in_b_r) +uint8_t pc1251_state::in_b_r() { int data = m_outb; diff --git a/src/mame/machine/pc1350.cpp b/src/mame/machine/pc1350.cpp index b5f0d881877..edd02bf7ba7 100644 --- a/src/mame/machine/pc1350.cpp +++ b/src/mame/machine/pc1350.cpp @@ -7,19 +7,19 @@ #include "includes/pc1350.h" #include "machine/ram.h" -WRITE8_MEMBER(pc1350_state::out_b_w) +void pc1350_state::out_b_w(uint8_t data) { m_outb = data; } -WRITE8_MEMBER(pc1350_state::out_c_w) +void pc1350_state::out_c_w(uint8_t data) { } -READ8_MEMBER(pc1350_state::in_a_r) +uint8_t pc1350_state::in_a_r() { int data = m_outa; - int t = keyboard_line_r(space, 0); + int t = keyboard_line_r(); for (int bit = 0; bit < 6; bit++) if (BIT(t, bit)) @@ -50,7 +50,7 @@ READ8_MEMBER(pc1350_state::in_a_r) return data; } -READ8_MEMBER(pc1350_state::in_b_r) +uint8_t pc1350_state::in_b_r() { return m_outb; } diff --git a/src/mame/machine/pc1401.cpp b/src/mame/machine/pc1401.cpp index e9f595cacd5..66508b4c1d4 100644 --- a/src/mame/machine/pc1401.cpp +++ b/src/mame/machine/pc1401.cpp @@ -21,17 +21,17 @@ 8 i/o device error 9 other errors*/ -WRITE8_MEMBER(pc1401_state::out_b_w) +void pc1401_state::out_b_w(uint8_t data) { m_outb = data; } -WRITE8_MEMBER(pc1401_state::out_c_w) +void pc1401_state::out_c_w(uint8_t data) { m_portc = data; } -READ8_MEMBER(pc1401_state::in_a_r) +uint8_t pc1401_state::in_a_r() { int data = m_outa; @@ -55,7 +55,7 @@ READ8_MEMBER(pc1401_state::in_a_r) return data; } -READ8_MEMBER(pc1401_state::in_b_r) +uint8_t pc1401_state::in_b_r() { int data = m_outb; diff --git a/src/mame/machine/pc1403.cpp b/src/mame/machine/pc1403.cpp index 36cb2b0eaaa..358296b74cd 100644 --- a/src/mame/machine/pc1403.cpp +++ b/src/mame/machine/pc1403.cpp @@ -56,7 +56,7 @@ READ8_MEMBER(pc1403_state::asic_read) return data; } -READ8_MEMBER(pc1403_state::in_a_r) +uint8_t pc1403_state::in_a_r() { uint8_t data = m_outa; @@ -80,7 +80,7 @@ READ8_MEMBER(pc1403_state::in_a_r) return data; } -WRITE8_MEMBER(pc1403_state::out_c_w) +void pc1403_state::out_c_w(uint8_t data) { m_portc = data; } diff --git a/src/mame/machine/pce.cpp b/src/mame/machine/pce.cpp index b7cab0b62a2..1b02bf07575 100644 --- a/src/mame/machine/pce.cpp +++ b/src/mame/machine/pce.cpp @@ -131,7 +131,7 @@ MACHINE_RESET_MEMBER(pce_state,mess_pce) } /* todo: how many input ports does the PCE have? */ -WRITE8_MEMBER(pce_state::mess_pce_joystick_w) +void pce_state::mess_pce_joystick_w(uint8_t data) { int joy_i; uint8_t joy_type = m_joy_type->read(); @@ -158,7 +158,7 @@ WRITE8_MEMBER(pce_state::mess_pce_joystick_w) } } -READ8_MEMBER(pce_state::mess_pce_joystick_r) +uint8_t pce_state::mess_pce_joystick_r() { uint8_t joy_type = m_joy_type->read(); uint8_t ret, data; diff --git a/src/mame/machine/playch10.cpp b/src/mame/machine/playch10.cpp index 3fbb5b89018..a10cc9233a1 100644 --- a/src/mame/machine/playch10.cpp +++ b/src/mame/machine/playch10.cpp @@ -133,7 +133,7 @@ READ8_MEMBER(playch10_state::pc10_detectclr_r) return 0; } -WRITE8_MEMBER(playch10_state::cart_sel_w) +void playch10_state::cart_sel_w(uint8_t data) { m_cart_sel = data; } diff --git a/src/mame/machine/pocketc.cpp b/src/mame/machine/pocketc.cpp index 528084a5dbb..48ac3aa3d08 100644 --- a/src/mame/machine/pocketc.cpp +++ b/src/mame/machine/pocketc.cpp @@ -4,7 +4,7 @@ #include "emu.h" #include "includes/pocketc.h" -WRITE8_MEMBER(pocketc_state::out_a_w) +void pocketc_state::out_a_w(uint8_t data) { m_outa = data; } diff --git a/src/mame/machine/poly.cpp b/src/mame/machine/poly.cpp index cb8d7a35959..b865ab1c558 100644 --- a/src/mame/machine/poly.cpp +++ b/src/mame/machine/poly.cpp @@ -64,21 +64,21 @@ WRITE8_MEMBER(poly_state::select_map2_w) } -WRITE8_MEMBER(poly_state::pia0_pa_w) +void poly_state::pia0_pa_w(uint8_t data) { logerror("PIA0: Port A out: %02X\n", data); m_video_pa = data; m_ptm->set_g3(BIT(data, 7)); } -WRITE8_MEMBER(poly_state::pia0_pb_w) +void poly_state::pia0_pb_w(uint8_t data) { logerror("PIA0: Port B out: %02X\n", data); m_video_pb = data; } -READ8_MEMBER(poly_state::pia1_b_in) +uint8_t poly_state::pia1_b_in() { // B1 - D0 // B2 - D1 @@ -108,12 +108,12 @@ READ8_MEMBER(poly_state::pia1_b_in) } -READ8_MEMBER(poly_state::videoram_1_r) +uint8_t poly_state::videoram_1_r(offs_t offset) { return m_videoram[offset]; } -READ8_MEMBER(poly_state::videoram_2_r) +uint8_t poly_state::videoram_2_r(offs_t offset) { return m_videoram[offset + 0x400]; } diff --git a/src/mame/machine/radio86.cpp b/src/mame/machine/radio86.cpp index bb04bff254d..8bac08a48f2 100644 --- a/src/mame/machine/radio86.cpp +++ b/src/mame/machine/radio86.cpp @@ -173,7 +173,7 @@ void radio86_state::radio86_pagesel(uint8_t data) m_disk_sel = data; } -READ8_MEMBER(radio86_state::radio86rom_romdisk_porta_r) +uint8_t radio86_state::radio86rom_romdisk_porta_r() { uint16_t addr = (m_romdisk_msb << 8) | m_romdisk_lsb; if (m_cart->exists() && addr < m_cart->get_rom_size()) diff --git a/src/mame/machine/rmnimbus.cpp b/src/mame/machine/rmnimbus.cpp index 03dd21edead..5694da9302d 100644 --- a/src/mame/machine/rmnimbus.cpp +++ b/src/mame/machine/rmnimbus.cpp @@ -188,7 +188,7 @@ void rmnimbus_state::external_int(uint8_t vector, bool state) m_maincpu->int0_w(state); } -READ8_MEMBER(rmnimbus_state::cascade_callback) +uint8_t rmnimbus_state::cascade_callback() { m_maincpu->int0_w(0); return m_vector; @@ -1247,7 +1247,7 @@ void rmnimbus_state::ipc_dumpregs() } #endif -READ8_MEMBER(rmnimbus_state::nimbus_pc8031_r) +uint8_t rmnimbus_state::nimbus_pc8031_r(offs_t offset) { int pc=m_maincpu->pc(); uint8_t result; @@ -1271,7 +1271,7 @@ READ8_MEMBER(rmnimbus_state::nimbus_pc8031_r) return result; } -WRITE8_MEMBER(rmnimbus_state::nimbus_pc8031_w) +void rmnimbus_state::nimbus_pc8031_w(offs_t offset, uint8_t data) { int pc=m_maincpu->pc(); @@ -1361,7 +1361,7 @@ WRITE8_MEMBER(rmnimbus_state::nimbus_pc8031_iou_w) } } -READ8_MEMBER(rmnimbus_state::nimbus_pc8031_port1_r) +uint8_t rmnimbus_state::nimbus_pc8031_port1_r() { int pc=m_iocpu->pc(); uint8_t result = (m_eeprom_bits & ~4) | (m_eeprom->do_read() << 2); @@ -1372,7 +1372,7 @@ READ8_MEMBER(rmnimbus_state::nimbus_pc8031_port1_r) return result; } -READ8_MEMBER(rmnimbus_state::nimbus_pc8031_port3_r) +uint8_t rmnimbus_state::nimbus_pc8031_port3_r() { int pc=m_iocpu->pc(); uint8_t result = 0; @@ -1383,7 +1383,7 @@ READ8_MEMBER(rmnimbus_state::nimbus_pc8031_port3_r) return result; } -WRITE8_MEMBER(rmnimbus_state::nimbus_pc8031_port1_w) +void rmnimbus_state::nimbus_pc8031_port1_w(uint8_t data) { int pc=m_iocpu->pc(); @@ -1406,7 +1406,7 @@ WRITE8_MEMBER(rmnimbus_state::nimbus_pc8031_port1_w) logerror("8031 PCPORTW %04X write of %02X to P1\n",pc,data); } -WRITE8_MEMBER(rmnimbus_state::nimbus_pc8031_port3_w) +void rmnimbus_state::nimbus_pc8031_port3_w(uint8_t data) { int pc=m_iocpu->pc(); @@ -1476,7 +1476,7 @@ void rmnimbus_state::rmni_sound_reset() m_ay8910_a=0; } -WRITE8_MEMBER(rmnimbus_state::nimbus_sound_ay8910_porta_w) +void rmnimbus_state::nimbus_sound_ay8910_porta_w(uint8_t data) { m_msm->data_w(data); @@ -1484,7 +1484,7 @@ WRITE8_MEMBER(rmnimbus_state::nimbus_sound_ay8910_porta_w) m_ay8910_a=data; } -WRITE8_MEMBER(rmnimbus_state::nimbus_sound_ay8910_portb_w) +void rmnimbus_state::nimbus_sound_ay8910_portb_w(uint8_t data) { if ((data & 0x07) != m_last_playmode) { @@ -1699,6 +1699,6 @@ collector output only. It usially acts as the printer strobe line. ***********************************************************************/ /* USER VIA 6522 port B is connected to the BBC user port */ -WRITE8_MEMBER(rmnimbus_state::nimbus_via_write_portb) +void rmnimbus_state::nimbus_via_write_portb(uint8_t data) { } diff --git a/src/mame/machine/special.cpp b/src/mame/machine/special.cpp index ba7fc9330aa..a09d7d31668 100644 --- a/src/mame/machine/special.cpp +++ b/src/mame/machine/special.cpp @@ -25,7 +25,7 @@ void special_state::init_special() m_bank1->configure_entries(0, 2, RAM, 0xc000); } -READ8_MEMBER( special_state::specialist_8255_porta_r ) +uint8_t special_state::specialist_8255_porta_r() { for (int i = 0; i < 8; i++) if (m_io_line[i]->read() != 0xff) @@ -34,7 +34,7 @@ READ8_MEMBER( special_state::specialist_8255_porta_r ) return 0xff; } -READ8_MEMBER( special_state::specialist_8255_portb_r ) +uint8_t special_state::specialist_8255_portb_r() { uint8_t dat = 0xff; @@ -60,7 +60,7 @@ READ8_MEMBER( special_state::specialist_8255_portb_r ) return dat; } -READ8_MEMBER( special_state::specimx_8255_portb_r ) +uint8_t special_state::specimx_8255_portb_r() { uint8_t dat = 0xff; @@ -83,7 +83,7 @@ READ8_MEMBER( special_state::specimx_8255_portb_r ) return dat; } -READ8_MEMBER( special_state::specialist_8255_portc_r ) +uint8_t special_state::specialist_8255_portc_r() { for (int i = 0; i < 4; i++) if (m_io_line[8 + i]->read() != 0xff) @@ -92,17 +92,17 @@ READ8_MEMBER( special_state::specialist_8255_portc_r ) return 0x0f; } -WRITE8_MEMBER( special_state::specialist_8255_porta_w ) +void special_state::specialist_8255_porta_w(uint8_t data) { m_specialist_8255_porta = data; } -WRITE8_MEMBER( special_state::specialist_8255_portb_w ) +void special_state::specialist_8255_portb_w(uint8_t data) { m_specialist_8255_portb = data; } -WRITE8_MEMBER( special_state::specialist_8255_portc_w ) +void special_state::specialist_8255_portc_w(uint8_t data) { m_specialist_8255_portc = data; diff --git a/src/mame/machine/swtpc09.cpp b/src/mame/machine/swtpc09.cpp index f35285f9973..34da9f40b7e 100644 --- a/src/mame/machine/swtpc09.cpp +++ b/src/mame/machine/swtpc09.cpp @@ -71,12 +71,12 @@ WRITE_LINE_MEMBER( swtpc09_state::ptm_irq ) /******* MC6821 PIA on MPID Board *******/ /* Read/Write handlers for pia */ -READ8_MEMBER( swtpc09_state::pia0_a_r ) +uint8_t swtpc09_state::pia0_a_r() { return m_pia_counter; } -READ8_MEMBER( swtpc09_state::pia0_ca1_r ) +uint8_t swtpc09_state::pia0_ca1_r() { return 0; } @@ -435,12 +435,12 @@ WRITE8_MEMBER ( swtpc09_state::dmaf3_fdc_w ) } /* via on dmaf3 board */ -READ8_MEMBER( swtpc09_state::dmaf3_via_read_porta ) +uint8_t swtpc09_state::dmaf3_via_read_porta() { return m_dmaf3_via_porta; } -READ8_MEMBER( swtpc09_state::dmaf3_via_read_portb ) +uint8_t swtpc09_state::dmaf3_via_read_portb() { // Bit 0 - output ? // Bit 1 - output, tape drive request strobe. @@ -456,12 +456,12 @@ READ8_MEMBER( swtpc09_state::dmaf3_via_read_portb ) return m_dmaf3_via_portb | 0x20; } -WRITE8_MEMBER( swtpc09_state::dmaf3_via_write_porta ) +void swtpc09_state::dmaf3_via_write_porta(uint8_t data) { m_dmaf3_via_porta &= data; } -WRITE8_MEMBER( swtpc09_state::dmaf3_via_write_portb ) +void swtpc09_state::dmaf3_via_write_portb(uint8_t data) { m_dmaf3_via_portb &= data; } diff --git a/src/mame/machine/vectrex.cpp b/src/mame/machine/vectrex.cpp index 8563f3a9665..4f0646c783d 100644 --- a/src/mame/machine/vectrex.cpp +++ b/src/mame/machine/vectrex.cpp @@ -187,7 +187,7 @@ WRITE_LINE_MEMBER(vectrex_base_state::vectrex_via_irq) } -READ8_MEMBER(vectrex_base_state::vectrex_via_pb_r) +uint8_t vectrex_base_state::vectrex_via_pb_r() { int pot = m_io_contr[(m_via_out[PORTB] & 0x6) >> 1]->read() - 0x80; @@ -200,7 +200,7 @@ READ8_MEMBER(vectrex_base_state::vectrex_via_pb_r) } -READ8_MEMBER(vectrex_base_state::vectrex_via_pa_r) +uint8_t vectrex_base_state::vectrex_via_pa_r() { if ((!(m_via_out[PORTB] & 0x10)) && (m_via_out[PORTB] & 0x08)) /* BDIR inactive, we can read the PSG. BC1 has to be active. */ @@ -212,7 +212,7 @@ READ8_MEMBER(vectrex_base_state::vectrex_via_pa_r) } -READ8_MEMBER(raaspec_state::vectrex_s1_via_pb_r) +uint8_t raaspec_state::vectrex_s1_via_pb_r() { return (m_via_out[PORTB] & ~0x40) | (m_io_coin->read() & 0x40); } @@ -264,7 +264,7 @@ TIMER_CALLBACK_MEMBER(vectrex_base_state::vectrex_imager_eye) } -WRITE8_MEMBER(vectrex_base_state::vectrex_psg_port_w) +void vectrex_base_state::vectrex_psg_port_w(uint8_t data) { double wavel, ang_acc, tmp; int mcontrol; diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp index 36e8bb487b3..4613cd6316a 100644 --- a/src/mame/machine/z80ne.cpp +++ b/src/mame/machine/z80ne.cpp @@ -539,7 +539,7 @@ READ_LINE_MEMBER(z80net_state::lx387_control_r) return BIT(m_io_modifiers->read(), 1); } -READ8_MEMBER(z80net_state::lx388_mc6847_videoram_r) +uint8_t z80net_state::lx388_mc6847_videoram_r(offs_t offset) { if (offset == ~0) return 0xff; diff --git a/src/mame/video/pc1350.cpp b/src/mame/video/pc1350.cpp index 7f28f5f10e2..4d8876bcbbc 100644 --- a/src/mame/video/pc1350.cpp +++ b/src/mame/video/pc1350.cpp @@ -74,7 +74,7 @@ WRITE8_MEMBER(pc1350_state::lcd_write) m_reg[offset & 0xfff] = data; } -READ8_MEMBER(pc1350_state::keyboard_line_r) +uint8_t pc1350_state::keyboard_line_r() { return m_reg[0xe00]; } diff --git a/src/mame/video/taxidriv.cpp b/src/mame/video/taxidriv.cpp index 2816a55fbdd..148e133c12e 100644 --- a/src/mame/video/taxidriv.cpp +++ b/src/mame/video/taxidriv.cpp @@ -4,7 +4,7 @@ #include "includes/taxidriv.h" -WRITE8_MEMBER(taxidriv_state::spritectrl_w) +void taxidriv_state::spritectrl_w(offs_t offset, uint8_t data) { m_spritectrl[offset] = data; } diff --git a/src/mame/video/vectrex.cpp b/src/mame/video/vectrex.cpp index e819911e162..55e00e5b90f 100644 --- a/src/mame/video/vectrex.cpp +++ b/src/mame/video/vectrex.cpp @@ -275,7 +275,7 @@ void vectrex_base_state::vectrex_multiplexer(int mux) } -WRITE8_MEMBER(vectrex_base_state::v_via_pb_w) +void vectrex_base_state::v_via_pb_w(uint8_t data) { if (!(data & 0x80)) { @@ -339,7 +339,7 @@ WRITE8_MEMBER(vectrex_base_state::v_via_pb_w) /* Cartridge bank-switching */ if (m_cart && ((data ^ m_via_out[PORTB]) & 0x40)) - m_cart->write_bank(space, 0, data); + m_cart->write_bank(data); /* Sound */ if (data & 0x10) @@ -358,7 +358,7 @@ WRITE8_MEMBER(vectrex_base_state::v_via_pb_w) } -WRITE8_MEMBER(vectrex_base_state::v_via_pa_w) +void vectrex_base_state::v_via_pa_w(uint8_t data) { /* DAC output always goes to Y integrator */ m_via_out[PORTA] = data; diff --git a/src/mame/video/x68k.cpp b/src/mame/video/x68k.cpp index b049557a6bc..a00b4886299 100644 --- a/src/mame/video/x68k.cpp +++ b/src/mame/video/x68k.cpp @@ -93,22 +93,22 @@ bitmap_rgb32* ::x68k_get_gfx_page(int pri,int type) } */ -READ16_MEMBER(x68k_state::tvram_read) +uint16_t x68k_state::tvram_read(offs_t offset) { return m_tvram[offset]; } -WRITE16_MEMBER(x68k_state::tvram_write) +void x68k_state::tvram_write(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_tvram[offset]); } -READ16_MEMBER(x68k_state::gvram_read) +uint16_t x68k_state::gvram_read(offs_t offset) { return m_gvram[offset]; } -WRITE16_MEMBER(x68k_state::gvram_write) +void x68k_state::gvram_write(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_gvram[offset]); } diff --git a/src/mame/video/zx.cpp b/src/mame/video/zx.cpp index 755c2eb8b8b..d4b76714214 100644 --- a/src/mame/video/zx.cpp +++ b/src/mame/video/zx.cpp @@ -50,7 +50,7 @@ void zx_state::zx_ula_hsync() recalc_hsync(); } -WRITE8_MEMBER(zx_state::refresh_w) +void zx_state::refresh_w(offs_t offset, uint8_t data) { if((offset ^ m_prev_refresh) & 0x40) m_maincpu->set_input_line(INPUT_LINE_IRQ0, offset & 0x40 ? CLEAR_LINE : ASSERT_LINE); |