diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2020-05-20 18:13:10 +0200 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2020-05-20 18:13:10 +0200 |
commit | b6c5f7c9dae9c353593d165a100b20279e4f401b (patch) | |
tree | 7309737b05e8b29b8b1d21ac71226d45889043a8 /src/devices/bus | |
parent | 96336f741bc22642169dd2ba7d197b6e159a245d (diff) |
another bunch of READ* / WRITE* macros removal (nw)
Diffstat (limited to 'src/devices/bus')
86 files changed, 397 insertions, 398 deletions
diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp index 98b106e1f79..93d8ba084c9 100644 --- a/src/devices/bus/a2bus/a2mockingboard.cpp +++ b/src/devices/bus/a2bus/a2mockingboard.cpp @@ -229,12 +229,12 @@ WRITE_LINE_MEMBER( a2bus_ayboard_device::via2_irq_w ) lower_slot_irq(); } -WRITE8_MEMBER( a2bus_ayboard_device::via1_out_a ) +void a2bus_ayboard_device::via1_out_a(uint8_t data) { m_porta1 = data; } -WRITE8_MEMBER( a2bus_ayboard_device::via1_out_b ) +void a2bus_ayboard_device::via1_out_b(uint8_t data) { if (!BIT(data, 2)) { @@ -262,7 +262,7 @@ WRITE8_MEMBER( a2bus_ayboard_device::via1_out_b ) } } -WRITE8_MEMBER( a2bus_phasor_device::via1_out_b ) +void a2bus_phasor_device::via1_out_b(uint8_t data) { if (!(data & 4)) { @@ -311,12 +311,12 @@ WRITE8_MEMBER( a2bus_phasor_device::via1_out_b ) } } -WRITE8_MEMBER( a2bus_ayboard_device::via2_out_a ) +void a2bus_ayboard_device::via2_out_a(uint8_t data) { m_porta2 = data; } -WRITE8_MEMBER( a2bus_ayboard_device::via2_out_b ) +void a2bus_ayboard_device::via2_out_b(uint8_t data) { if (!BIT(data, 2)) { @@ -344,7 +344,7 @@ WRITE8_MEMBER( a2bus_ayboard_device::via2_out_b ) } } -WRITE8_MEMBER( a2bus_phasor_device::via2_out_b ) +void a2bus_phasor_device::via2_out_b(uint8_t data) { if (!BIT(data, 2)) { diff --git a/src/devices/bus/a2bus/a2mockingboard.h b/src/devices/bus/a2bus/a2mockingboard.h index b7d6b7f3b97..a7287f8e734 100644 --- a/src/devices/bus/a2bus/a2mockingboard.h +++ b/src/devices/bus/a2bus/a2mockingboard.h @@ -27,10 +27,10 @@ class a2bus_ayboard_device: public: DECLARE_WRITE_LINE_MEMBER( via1_irq_w ); DECLARE_WRITE_LINE_MEMBER( via2_irq_w ); - DECLARE_WRITE8_MEMBER(via1_out_a); - virtual DECLARE_WRITE8_MEMBER(via1_out_b); - DECLARE_WRITE8_MEMBER(via2_out_a); - virtual DECLARE_WRITE8_MEMBER(via2_out_b); + void via1_out_a(uint8_t data); + virtual void via1_out_b(uint8_t data); + void via2_out_a(uint8_t data); + virtual void via2_out_b(uint8_t data); protected: // construction/destruction @@ -68,8 +68,8 @@ class a2bus_phasor_device : public a2bus_ayboard_device public: a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER(via1_out_b) override; - DECLARE_WRITE8_MEMBER(via2_out_b) override; + void via1_out_b(uint8_t data) override; + void via2_out_b(uint8_t data) override; protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/a2bus/agat7ports.cpp b/src/devices/bus/a2bus/agat7ports.cpp index d284ad2a935..afd196d6549 100644 --- a/src/devices/bus/a2bus/agat7ports.cpp +++ b/src/devices/bus/a2bus/agat7ports.cpp @@ -158,7 +158,7 @@ void a2bus_agat7_ports_device::write_c0nx(uint8_t offset, uint8_t data) * 6 /INIT * 7 /STROBE */ -WRITE8_MEMBER(a2bus_agat7_ports_device::write_portb) +void a2bus_agat7_ports_device::write_portb(uint8_t data) { m_centronics->write_strobe(BIT(data, 5)); m_centronics->write_init(BIT(data, 4)); @@ -173,7 +173,7 @@ WRITE8_MEMBER(a2bus_agat7_ports_device::write_portb) * 6 dip ABRLEV (0: BUSY, /ACK. 1: READY, ACK) * 7 ready signal from device */ -READ8_MEMBER(a2bus_agat7_ports_device::read_portc) +uint8_t a2bus_agat7_ports_device::read_portc() { return (m_centronics_busy << 7) | m_printer_cfg->read(); } diff --git a/src/devices/bus/a2bus/agat7ports.h b/src/devices/bus/a2bus/agat7ports.h index 6b96ee0d783..2ee4f38b4dd 100644 --- a/src/devices/bus/a2bus/agat7ports.h +++ b/src/devices/bus/a2bus/agat7ports.h @@ -50,8 +50,8 @@ protected: required_device<i8251_device> m_d10; required_device<centronics_device> m_centronics; - DECLARE_WRITE8_MEMBER(write_portb); - DECLARE_READ8_MEMBER(read_portc); + void write_portb(uint8_t data); + uint8_t read_portc(); DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); private: diff --git a/src/devices/bus/a2bus/agat840k_hle.cpp b/src/devices/bus/a2bus/agat840k_hle.cpp index 2a2e74d98ef..f46d9ae7251 100644 --- a/src/devices/bus/a2bus/agat840k_hle.cpp +++ b/src/devices/bus/a2bus/agat840k_hle.cpp @@ -336,7 +336,7 @@ uint8_t a2bus_agat840k_hle_device::read_cnxx(uint8_t offset) * * C0x1 */ -READ8_MEMBER(a2bus_agat840k_hle_device::d14_i_b) +uint8_t a2bus_agat840k_hle_device::d14_i_b() { u8 data = 0x3; @@ -366,7 +366,7 @@ READ8_MEMBER(a2bus_agat840k_hle_device::d14_i_b) * * C0x2 */ -WRITE8_MEMBER(a2bus_agat840k_hle_device::d14_o_c) +void a2bus_agat840k_hle_device::d14_o_c(uint8_t data) { m_unit = BIT(data, 3); m_floppy = m_floppy_image[m_unit].target(); @@ -399,7 +399,7 @@ WRITE8_MEMBER(a2bus_agat840k_hle_device::d14_o_c) // C0x4 // // data are latched in by write to PC4 -READ8_MEMBER(a2bus_agat840k_hle_device::d15_i_a) +uint8_t a2bus_agat840k_hle_device::d15_i_a() { const u16 data = m_tracks[(2 * m_floppy->floppy_drive_get_current_track()) + m_side][m_count_read]; LOG("sector data: %02x @ %4d (head %d track %2d)%s\n", data & 0xff, m_count_read, @@ -413,7 +413,7 @@ READ8_MEMBER(a2bus_agat840k_hle_device::d15_i_a) // // b6 AL desync detected // b7 AH read or write data ready -READ8_MEMBER(a2bus_agat840k_hle_device::d15_i_c) +uint8_t a2bus_agat840k_hle_device::d15_i_c() { LOG("status B: @ %4d %s %s (%s)\n", m_count_read, BIT(m_mxcs, 7) ? "ready" : "READY", BIT(m_mxcs, 6) ? "SYNC" : "sync", @@ -428,7 +428,7 @@ READ8_MEMBER(a2bus_agat840k_hle_device::d15_i_c) // b2 AH b7 = ready for write data // b3 -- connected to b7, set if m_intr[PORT_A] // b4 AH b7 = read data ready -WRITE8_MEMBER(a2bus_agat840k_hle_device::d15_o_c) +void a2bus_agat840k_hle_device::d15_o_c(uint8_t data) { if (BIT(data, 0) || BIT(data, 3)) { diff --git a/src/devices/bus/a2bus/agat840k_hle.h b/src/devices/bus/a2bus/agat840k_hle.h index 2d95599bcff..f5aba6818dc 100644 --- a/src/devices/bus/a2bus/agat840k_hle.h +++ b/src/devices/bus/a2bus/agat840k_hle.h @@ -37,12 +37,12 @@ public: // construction/destruction a2bus_agat840k_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(d14_i_b); - DECLARE_READ8_MEMBER(d15_i_a); - DECLARE_READ8_MEMBER(d15_i_c); - DECLARE_WRITE8_MEMBER(d14_o_c); - DECLARE_WRITE8_MEMBER(d15_o_b); - DECLARE_WRITE8_MEMBER(d15_o_c); + uint8_t d14_i_b(); + uint8_t d15_i_a(); + uint8_t d15_i_c(); + void d14_o_c(uint8_t data); + void d15_o_b(uint8_t data); + void d15_o_c(uint8_t data); DECLARE_WRITE_LINE_MEMBER(index_0_w); DECLARE_WRITE_LINE_MEMBER(index_1_w); diff --git a/src/devices/bus/a2bus/agat_fdc.cpp b/src/devices/bus/a2bus/agat_fdc.cpp index 4a9737aecbe..bc995dde0bb 100644 --- a/src/devices/bus/a2bus/agat_fdc.cpp +++ b/src/devices/bus/a2bus/agat_fdc.cpp @@ -382,7 +382,7 @@ uint8_t a2bus_agat_fdc_device::read_cnxx(uint8_t offset) * * C0x1 */ -READ8_MEMBER(a2bus_agat_fdc_device::d14_i_b) +uint8_t a2bus_agat_fdc_device::d14_i_b() { u8 data = 0x3; @@ -417,7 +417,7 @@ READ8_MEMBER(a2bus_agat_fdc_device::d14_i_b) * * C0x2 */ -WRITE8_MEMBER(a2bus_agat_fdc_device::d14_o_c) +void a2bus_agat_fdc_device::d14_o_c(uint8_t data) { m_unit = BIT(data, 3); @@ -451,7 +451,7 @@ WRITE8_MEMBER(a2bus_agat_fdc_device::d14_o_c) } // data are latched in by write to PC4 -READ8_MEMBER(a2bus_agat_fdc_device::d15_i_a) +uint8_t a2bus_agat_fdc_device::d15_i_a() { return data_reg; } @@ -460,7 +460,7 @@ READ8_MEMBER(a2bus_agat_fdc_device::d15_i_a) // // b6 AL desync detected // b7 AH read or write data ready -READ8_MEMBER(a2bus_agat_fdc_device::d15_i_c) +uint8_t a2bus_agat_fdc_device::d15_i_c() { LOG("status B: @ %4d %s %s\n", 0, BIT(m_mxcs, 7) ? "ready" : "READY", BIT(m_mxcs, 6) ? "SYNC" : "sync"); @@ -474,7 +474,7 @@ READ8_MEMBER(a2bus_agat_fdc_device::d15_i_c) // b2 AH b7 = ready for write data // b3 -- connected to b7, set if m_intr[PORT_A] // b4 AH b7 = read data ready -WRITE8_MEMBER(a2bus_agat_fdc_device::d15_o_c) +void a2bus_agat_fdc_device::d15_o_c(uint8_t data) { if (BIT(data, 0) || BIT(data, 3)) { diff --git a/src/devices/bus/a2bus/agat_fdc.h b/src/devices/bus/a2bus/agat_fdc.h index 7ba7d4c3752..fe2b787655b 100644 --- a/src/devices/bus/a2bus/agat_fdc.h +++ b/src/devices/bus/a2bus/agat_fdc.h @@ -34,12 +34,12 @@ public: // construction/destruction a2bus_agat_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(d14_i_b); - DECLARE_READ8_MEMBER(d15_i_a); - DECLARE_READ8_MEMBER(d15_i_c); - DECLARE_WRITE8_MEMBER(d14_o_c); - DECLARE_WRITE8_MEMBER(d15_o_b); - DECLARE_WRITE8_MEMBER(d15_o_c); + uint8_t d14_i_b(); + uint8_t d15_i_a(); + uint8_t d15_i_c(); + void d14_o_c(uint8_t data); + void d15_o_b(uint8_t data); + void d15_o_c(uint8_t data); DECLARE_FLOPPY_FORMATS(floppy_formats); diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp index e61e50db9a6..03b219cf72e 100644 --- a/src/devices/bus/a2bus/mouse.cpp +++ b/src/devices/bus/a2bus/mouse.cpp @@ -224,12 +224,12 @@ uint8_t a2bus_mouse_device::read_cnxx(uint8_t offset) return m_rom[offset+m_rom_bank]; } -WRITE8_MEMBER(a2bus_mouse_device::pia_out_a) +void a2bus_mouse_device::pia_out_a(uint8_t data) { m_port_a_in = data; } -WRITE8_MEMBER(a2bus_mouse_device::pia_out_b) +void a2bus_mouse_device::pia_out_b(uint8_t data) { m_mcu->pc_w(0xf0 | ((data >> 4) & 0x0f)); @@ -244,17 +244,17 @@ WRITE_LINE_MEMBER(a2bus_mouse_device::pia_irqb_w) { } -READ8_MEMBER(a2bus_mouse_device::mcu_port_a_r) +uint8_t a2bus_mouse_device::mcu_port_a_r() { return m_port_a_in; } -WRITE8_MEMBER(a2bus_mouse_device::mcu_port_a_w) +void a2bus_mouse_device::mcu_port_a_w(uint8_t data) { m_pia->set_a_input(data); } -READ8_MEMBER(a2bus_mouse_device::mcu_port_b_r) +uint8_t a2bus_mouse_device::mcu_port_b_r() { enum { XAXIS, YAXIS }; constexpr u8 BUTTON = 0x80; @@ -280,7 +280,7 @@ READ8_MEMBER(a2bus_mouse_device::mcu_port_b_r) return m_port_b_in; } -WRITE8_MEMBER(a2bus_mouse_device::mcu_port_b_w) +void a2bus_mouse_device::mcu_port_b_w(uint8_t data) { if (!BIT(data, 6)) { @@ -292,7 +292,7 @@ WRITE8_MEMBER(a2bus_mouse_device::mcu_port_b_w) } } -WRITE8_MEMBER(a2bus_mouse_device::mcu_port_c_w) +void a2bus_mouse_device::mcu_port_c_w(uint8_t data) { m_pia->portb_w(data << 4); } diff --git a/src/devices/bus/a2bus/mouse.h b/src/devices/bus/a2bus/mouse.h index 1afca2d948f..7dc0e4c984d 100644 --- a/src/devices/bus/a2bus/mouse.h +++ b/src/devices/bus/a2bus/mouse.h @@ -45,16 +45,16 @@ protected: virtual void write_c0nx(uint8_t offset, uint8_t data) override; virtual uint8_t read_cnxx(uint8_t offset) override; - DECLARE_WRITE8_MEMBER(pia_out_a); - DECLARE_WRITE8_MEMBER(pia_out_b); + void pia_out_a(uint8_t data); + void pia_out_b(uint8_t data); DECLARE_WRITE_LINE_MEMBER(pia_irqa_w); DECLARE_WRITE_LINE_MEMBER(pia_irqb_w); - DECLARE_READ8_MEMBER(mcu_port_a_r); - DECLARE_READ8_MEMBER(mcu_port_b_r); - DECLARE_WRITE8_MEMBER(mcu_port_a_w); - DECLARE_WRITE8_MEMBER(mcu_port_b_w); - DECLARE_WRITE8_MEMBER(mcu_port_c_w); + uint8_t mcu_port_a_r(); + uint8_t mcu_port_b_r(); + void mcu_port_a_w(uint8_t data); + void mcu_port_b_w(uint8_t data); + void mcu_port_c_w(uint8_t data); required_device<pia6821_device> m_pia; required_device<m68705p_device> m_mcu; diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp index 305da9aa868..8550f5cd6b1 100644 --- a/src/devices/bus/a2bus/pc_xporter.cpp +++ b/src/devices/bus/a2bus/pc_xporter.cpp @@ -489,7 +489,7 @@ WRITE_LINE_MEMBER( a2bus_pcxporter_device::pc_dma_hrq_changed ) } -READ8_MEMBER( a2bus_pcxporter_device::pc_dma_read_byte ) +uint8_t a2bus_pcxporter_device::pc_dma_read_byte(offs_t offset) { if(m_dma_channel == -1) return 0xff; @@ -499,7 +499,7 @@ READ8_MEMBER( a2bus_pcxporter_device::pc_dma_read_byte ) } -WRITE8_MEMBER( a2bus_pcxporter_device::pc_dma_write_byte ) +void a2bus_pcxporter_device::pc_dma_write_byte(offs_t offset, uint8_t data) { if(m_dma_channel == -1) return; @@ -510,41 +510,41 @@ WRITE8_MEMBER( a2bus_pcxporter_device::pc_dma_write_byte ) } -READ8_MEMBER( a2bus_pcxporter_device::pc_dma8237_1_dack_r ) +uint8_t a2bus_pcxporter_device::pc_dma8237_1_dack_r() { return m_isabus->dack_r(1); } -READ8_MEMBER( a2bus_pcxporter_device::pc_dma8237_2_dack_r ) +uint8_t a2bus_pcxporter_device::pc_dma8237_2_dack_r() { return m_isabus->dack_r(2); } -READ8_MEMBER( a2bus_pcxporter_device::pc_dma8237_3_dack_r ) +uint8_t a2bus_pcxporter_device::pc_dma8237_3_dack_r() { return m_isabus->dack_r(3); } -WRITE8_MEMBER( a2bus_pcxporter_device::pc_dma8237_1_dack_w ) +void a2bus_pcxporter_device::pc_dma8237_1_dack_w(uint8_t data) { m_isabus->dack_w(1,data); } -WRITE8_MEMBER( a2bus_pcxporter_device::pc_dma8237_2_dack_w ) +void a2bus_pcxporter_device::pc_dma8237_2_dack_w(uint8_t data) { m_isabus->dack_w(2,data); } -WRITE8_MEMBER( a2bus_pcxporter_device::pc_dma8237_3_dack_w ) +void a2bus_pcxporter_device::pc_dma8237_3_dack_w(uint8_t data) { m_isabus->dack_w(3,data); } -WRITE8_MEMBER( a2bus_pcxporter_device::pc_dma8237_0_dack_w ) +void a2bus_pcxporter_device::pc_dma8237_0_dack_w(uint8_t data) { m_u73_q2 = 0; m_dma8237->dreq0_w( m_u73_q2 ); diff --git a/src/devices/bus/a2bus/pc_xporter.h b/src/devices/bus/a2bus/pc_xporter.h index 2a449ed4019..354a98b0037 100644 --- a/src/devices/bus/a2bus/pc_xporter.h +++ b/src/devices/bus/a2bus/pc_xporter.h @@ -92,15 +92,15 @@ private: DECLARE_WRITE_LINE_MEMBER( pc_dma_hrq_changed ); DECLARE_WRITE_LINE_MEMBER( pc_dma8237_out_eop ); - DECLARE_READ8_MEMBER( pc_dma_read_byte ); - DECLARE_WRITE8_MEMBER( pc_dma_write_byte ); - DECLARE_READ8_MEMBER( pc_dma8237_1_dack_r ); - DECLARE_READ8_MEMBER( pc_dma8237_2_dack_r ); - DECLARE_READ8_MEMBER( pc_dma8237_3_dack_r ); - DECLARE_WRITE8_MEMBER( pc_dma8237_1_dack_w ); - DECLARE_WRITE8_MEMBER( pc_dma8237_2_dack_w ); - DECLARE_WRITE8_MEMBER( pc_dma8237_3_dack_w ); - DECLARE_WRITE8_MEMBER( pc_dma8237_0_dack_w ); + uint8_t pc_dma_read_byte(offs_t offset); + void pc_dma_write_byte(offs_t offset, uint8_t data); + uint8_t pc_dma8237_1_dack_r(); + uint8_t pc_dma8237_2_dack_r(); + uint8_t pc_dma8237_3_dack_r(); + void pc_dma8237_1_dack_w(uint8_t data); + void pc_dma8237_2_dack_w(uint8_t data); + void pc_dma8237_3_dack_w(uint8_t data); + void pc_dma8237_0_dack_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( pc_dack0_w ); DECLARE_WRITE_LINE_MEMBER( pc_dack1_w ); DECLARE_WRITE_LINE_MEMBER( pc_dack2_w ); diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp index 6bab78c845e..abf1b2e8695 100644 --- a/src/devices/bus/a2bus/timemasterho.cpp +++ b/src/devices/bus/a2bus/timemasterho.cpp @@ -203,12 +203,12 @@ uint8_t a2bus_timemasterho_device::read_c800(uint16_t offset) return m_rom[offset+0xc00]; } -WRITE8_MEMBER(a2bus_timemasterho_device::pia_out_a) +void a2bus_timemasterho_device::pia_out_a(uint8_t data) { // port A appears to be input only } -WRITE8_MEMBER(a2bus_timemasterho_device::pia_out_b) +void a2bus_timemasterho_device::pia_out_b(uint8_t data) { m_msm5832->address_w(data & 0xf); m_msm5832->hold_w((data>>4) & 1 ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/devices/bus/a2bus/timemasterho.h b/src/devices/bus/a2bus/timemasterho.h index fcc71d6194f..47f5ba84ae7 100644 --- a/src/devices/bus/a2bus/timemasterho.h +++ b/src/devices/bus/a2bus/timemasterho.h @@ -50,8 +50,8 @@ protected: private: void update_irqs(); - DECLARE_WRITE8_MEMBER(pia_out_a); - DECLARE_WRITE8_MEMBER(pia_out_b); + void pia_out_a(uint8_t data); + void pia_out_b(uint8_t data); DECLARE_WRITE_LINE_MEMBER(pia_irqa_w); DECLARE_WRITE_LINE_MEMBER(pia_irqb_w); diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp index 12607f51699..59734f69fff 100644 --- a/src/devices/bus/abcbus/fd2.cpp +++ b/src/devices/bus/abcbus/fd2.cpp @@ -86,7 +86,7 @@ const tiny_rom_entry *abc_fd2_device::device_rom_region() const // status_w - //------------------------------------------------- -WRITE8_MEMBER( abc_fd2_device::status_w ) +void abc_fd2_device::status_w(uint8_t data) { /* @@ -138,17 +138,17 @@ void abc_fd2_device::abc_fd2_io(address_map &map) // Z80PIO //------------------------------------------------- -READ8_MEMBER( abc_fd2_device::pio_pa_r ) +uint8_t abc_fd2_device::pio_pa_r() { return m_data; } -WRITE8_MEMBER( abc_fd2_device::pio_pa_w ) +void abc_fd2_device::pio_pa_w(uint8_t data) { m_data = data; } -READ8_MEMBER( abc_fd2_device::pio_pb_r ) +uint8_t abc_fd2_device::pio_pb_r() { /* @@ -174,7 +174,7 @@ READ8_MEMBER( abc_fd2_device::pio_pb_r ) return data; } -WRITE8_MEMBER( abc_fd2_device::pio_pb_w ) +void abc_fd2_device::pio_pb_w(uint8_t data) { /* diff --git a/src/devices/bus/abcbus/fd2.h b/src/devices/bus/abcbus/fd2.h index ff635575472..0c587f0c776 100644 --- a/src/devices/bus/abcbus/fd2.h +++ b/src/devices/bus/abcbus/fd2.h @@ -53,12 +53,12 @@ protected: virtual uint8_t abcbus_xmemfl(offs_t offset) override; private: - DECLARE_READ8_MEMBER( pio_pa_r ); - DECLARE_WRITE8_MEMBER( pio_pa_w ); - DECLARE_READ8_MEMBER( pio_pb_r ); - DECLARE_WRITE8_MEMBER( pio_pb_w ); + uint8_t pio_pa_r(); + void pio_pa_w(uint8_t data); + uint8_t pio_pb_r(); + void pio_pb_w(uint8_t data); - DECLARE_WRITE8_MEMBER( status_w ); + void status_w(uint8_t data); DECLARE_FLOPPY_FORMATS( floppy_formats ); diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp index 28b44388d27..1dfc47c639e 100644 --- a/src/devices/bus/abcbus/lux10828.cpp +++ b/src/devices/bus/abcbus/lux10828.cpp @@ -197,17 +197,17 @@ void luxor_55_10828_device::luxor_55_10828_io(address_map &map) // Z80PIO //------------------------------------------------- -READ8_MEMBER( luxor_55_10828_device::pio_pa_r ) +uint8_t luxor_55_10828_device::pio_pa_r() { return m_data; } -WRITE8_MEMBER( luxor_55_10828_device::pio_pa_w ) +void luxor_55_10828_device::pio_pa_w(uint8_t data) { m_data = data; } -READ8_MEMBER( luxor_55_10828_device::pio_pb_r ) +uint8_t luxor_55_10828_device::pio_pb_r() { /* @@ -252,7 +252,7 @@ READ8_MEMBER( luxor_55_10828_device::pio_pb_r ) return data; } -WRITE8_MEMBER( luxor_55_10828_device::pio_pb_w ) +void luxor_55_10828_device::pio_pb_w(uint8_t data) { /* diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h index 97ecb787880..e0fa36d95c0 100644 --- a/src/devices/bus/abcbus/lux10828.h +++ b/src/devices/bus/abcbus/lux10828.h @@ -75,10 +75,10 @@ protected: virtual void abcbus_c3(uint8_t data) override; private: - DECLARE_READ8_MEMBER( pio_pa_r ); - DECLARE_WRITE8_MEMBER( pio_pa_w ); - DECLARE_READ8_MEMBER( pio_pb_r ); - DECLARE_WRITE8_MEMBER( pio_pb_w ); + uint8_t pio_pa_r(); + void pio_pa_w(uint8_t data); + uint8_t pio_pb_r(); + void pio_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index 3ec543ead6a..c1a96f155a4 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -232,22 +232,22 @@ WRITE_LINE_MEMBER( luxor_55_21046_device::dma_int_w ) m_maincpu->set_input_line(INPUT_LINE_IRQ0, m_fdc_irq || m_dma_irq); } -READ8_MEMBER( luxor_55_21046_device::memory_read_byte ) +uint8_t luxor_55_21046_device::memory_read_byte(offs_t offset) { return m_maincpu->space(AS_PROGRAM).read_byte(offset); } -WRITE8_MEMBER( luxor_55_21046_device::memory_write_byte ) +void luxor_55_21046_device::memory_write_byte(offs_t offset, uint8_t data) { return m_maincpu->space(AS_PROGRAM).write_byte(offset, data); } -READ8_MEMBER( luxor_55_21046_device::io_read_byte ) +uint8_t luxor_55_21046_device::io_read_byte(offs_t offset) { return m_maincpu->space(AS_IO).read_byte(offset); } -WRITE8_MEMBER( luxor_55_21046_device::io_write_byte ) +void luxor_55_21046_device::io_write_byte(offs_t offset, uint8_t data) { return m_maincpu->space(AS_IO).write_byte(offset, data); } diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h index 703c419e776..db460700fb0 100644 --- a/src/devices/bus/abcbus/lux21046.h +++ b/src/devices/bus/abcbus/lux21046.h @@ -85,10 +85,10 @@ protected: private: DECLARE_WRITE_LINE_MEMBER( dma_int_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); DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp index 30a5ee1d258..65ae4ff06de 100644 --- a/src/devices/bus/abcbus/lux21056.cpp +++ b/src/devices/bus/abcbus/lux21056.cpp @@ -177,22 +177,22 @@ static const z80_daisy_config daisy_chain[] = // Z80DMA //------------------------------------------------- -READ8_MEMBER( luxor_55_21056_device::memory_read_byte ) +uint8_t luxor_55_21056_device::memory_read_byte(offs_t offset) { return m_maincpu->space(AS_PROGRAM).read_byte(offset); } -WRITE8_MEMBER( luxor_55_21056_device::memory_write_byte ) +void luxor_55_21056_device::memory_write_byte(offs_t offset, uint8_t data) { return m_maincpu->space(AS_PROGRAM).write_byte(offset, data); } -READ8_MEMBER( luxor_55_21056_device::io_read_byte ) +uint8_t luxor_55_21056_device::io_read_byte(offs_t offset) { return m_maincpu->space(AS_IO).read_byte(offset); } -WRITE8_MEMBER( luxor_55_21056_device::io_write_byte ) +void luxor_55_21056_device::io_write_byte(offs_t offset, uint8_t data) { return m_maincpu->space(AS_IO).write_byte(offset, data); } diff --git a/src/devices/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h index e9976307b0a..2a6c071ff3a 100644 --- a/src/devices/bus/abcbus/lux21056.h +++ b/src/devices/bus/abcbus/lux21056.h @@ -53,10 +53,10 @@ protected: private: void set_rdy(int state); - 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_sasi_req ); DECLARE_WRITE_LINE_MEMBER( write_sasi_io ); diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp index c2bdceceaa6..782ab6ecab1 100644 --- a/src/devices/bus/abckb/abc77.cpp +++ b/src/devices/bus/abckb/abc77.cpp @@ -501,7 +501,7 @@ void abc77_device::txd_w(int state) // p1_r - //------------------------------------------------- -READ8_MEMBER( abc77_device::p1_r ) +uint8_t abc77_device::p1_r() { /* @@ -536,7 +536,7 @@ READ8_MEMBER( abc77_device::p1_r ) // p2_w - //------------------------------------------------- -WRITE8_MEMBER( abc77_device::p2_w ) +void abc77_device::p2_w(uint8_t data) { /* diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h index b217a0fca47..4726e86f2f5 100644 --- a/src/devices/bus/abckb/abc77.h +++ b/src/devices/bus/abckb/abc77.h @@ -79,8 +79,8 @@ private: emu_timer *m_serial_timer; emu_timer *m_reset_timer; - DECLARE_READ8_MEMBER( p1_r ); - DECLARE_WRITE8_MEMBER( p2_w ); + uint8_t p1_r(); + void p2_w(uint8_t data); DECLARE_READ_LINE_MEMBER( t1_r ); DECLARE_WRITE_LINE_MEMBER( prog_w ); DECLARE_WRITE8_MEMBER( j3_w ); diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp index fa20b40d317..c69515eafbd 100644 --- a/src/devices/bus/abckb/abc800kb.cpp +++ b/src/devices/bus/abckb/abc800kb.cpp @@ -382,7 +382,7 @@ void abc800_keyboard_device::txd_w(int state) // kb_p1_r - keyboard column data read //------------------------------------------------- -READ8_MEMBER( abc800_keyboard_device::kb_p1_r ) +uint8_t abc800_keyboard_device::kb_p1_r() { uint8_t data = 0xff; @@ -402,7 +402,7 @@ READ8_MEMBER( abc800_keyboard_device::kb_p1_r ) // kb_p1_w - keyboard row write //------------------------------------------------- -WRITE8_MEMBER( abc800_keyboard_device::kb_p1_w ) +void abc800_keyboard_device::kb_p1_w(uint8_t data) { /* @@ -431,7 +431,7 @@ WRITE8_MEMBER( abc800_keyboard_device::kb_p1_w ) // kb_p2_w - keyboard control write //------------------------------------------------- -WRITE8_MEMBER( abc800_keyboard_device::kb_p2_w ) +void abc800_keyboard_device::kb_p2_w(uint8_t data) { /* diff --git a/src/devices/bus/abckb/abc800kb.h b/src/devices/bus/abckb/abc800kb.h index 50fde4beac9..f076beeb102 100644 --- a/src/devices/bus/abckb/abc800kb.h +++ b/src/devices/bus/abckb/abc800kb.h @@ -50,9 +50,9 @@ private: inline void serial_clock(); inline void key_down(int state); - DECLARE_READ8_MEMBER( kb_p1_r ); - DECLARE_WRITE8_MEMBER( kb_p1_w ); - DECLARE_WRITE8_MEMBER( kb_p2_w ); + uint8_t kb_p1_r(); + void kb_p1_w(uint8_t data); + void kb_p2_w(uint8_t data); DECLARE_READ_LINE_MEMBER( kb_t1_r ); required_device<i8048_device> m_maincpu; diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp index b784487062a..461bbaa0ffd 100644 --- a/src/devices/bus/abckb/abc99.cpp +++ b/src/devices/bus/abckb/abc99.cpp @@ -572,7 +572,7 @@ void abc99_device::txd_w(int state) // z2_bus_w - //------------------------------------------------- -WRITE8_MEMBER( abc99_device::z2_led_w ) +void abc99_device::z2_led_w(uint8_t data) { if (m_led_en) return; @@ -591,7 +591,7 @@ WRITE8_MEMBER( abc99_device::z2_led_w ) // z2_p1_w - //------------------------------------------------- -WRITE8_MEMBER( abc99_device::z2_p1_w ) +void abc99_device::z2_p1_w(uint8_t data) { /* @@ -635,7 +635,7 @@ WRITE8_MEMBER( abc99_device::z2_p1_w ) // z2_p2_r - //------------------------------------------------- -READ8_MEMBER( abc99_device::z2_p2_r ) +uint8_t abc99_device::z2_p2_r() { /* @@ -682,7 +682,7 @@ READ_LINE_MEMBER( abc99_device::z2_t1_r ) // z5_p1_r - //------------------------------------------------- -READ8_MEMBER( abc99_device::z5_p1_r ) +uint8_t abc99_device::z5_p1_r() { /* @@ -715,7 +715,7 @@ READ8_MEMBER( abc99_device::z5_p1_r ) // z5_p2_w - //------------------------------------------------- -WRITE8_MEMBER( abc99_device::z5_p2_w ) +void abc99_device::z5_p2_w(uint8_t data) { /* @@ -764,7 +764,7 @@ WRITE8_MEMBER( abc99_device::z5_p2_w ) // z5_t1_r - //------------------------------------------------- -READ8_MEMBER( abc99_device::z5_t1_r ) +uint8_t abc99_device::z5_t1_r() { return m_t1_z5; } diff --git a/src/devices/bus/abckb/abc99.h b/src/devices/bus/abckb/abc99.h index cae72ac0675..8adb348d6c5 100644 --- a/src/devices/bus/abckb/abc99.h +++ b/src/devices/bus/abckb/abc99.h @@ -75,15 +75,15 @@ private: inline void key_down(int state); inline void scan_mouse(); - DECLARE_WRITE8_MEMBER( z2_p1_w ); - DECLARE_READ8_MEMBER( z2_p2_r ); + void z2_p1_w(uint8_t data); + uint8_t z2_p2_r(); DECLARE_READ_LINE_MEMBER( z2_t0_r ); DECLARE_READ_LINE_MEMBER( z2_t1_r ); - DECLARE_WRITE8_MEMBER( z2_led_w ); - DECLARE_READ8_MEMBER( z5_p1_r ); - DECLARE_WRITE8_MEMBER( z5_p2_w ); - DECLARE_READ8_MEMBER( z5_t1_r ); + void z2_led_w(uint8_t data); + uint8_t z5_p1_r(); + void z5_p2_w(uint8_t data); + uint8_t z5_t1_r(); void abc99_z2_io(address_map &map); void abc99_z2_mem(address_map &map); diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp index cc4c62ccd5b..6e05689cb29 100644 --- a/src/devices/bus/adamnet/ddp.cpp +++ b/src/devices/bus/adamnet/ddp.cpp @@ -140,7 +140,7 @@ void adam_digital_data_pack_device::adamnet_reset_w(int state) // p1_w - //------------------------------------------------- -WRITE8_MEMBER( adam_digital_data_pack_device::p1_w ) +void adam_digital_data_pack_device::p1_w(uint8_t data) { /* @@ -185,7 +185,7 @@ WRITE8_MEMBER( adam_digital_data_pack_device::p1_w ) // p2_r - //------------------------------------------------- -READ8_MEMBER( adam_digital_data_pack_device::p2_r ) +uint8_t adam_digital_data_pack_device::p2_r() { /* @@ -217,7 +217,7 @@ READ8_MEMBER( adam_digital_data_pack_device::p2_r ) // p2_w - //------------------------------------------------- -WRITE8_MEMBER( adam_digital_data_pack_device::p2_w ) +void adam_digital_data_pack_device::p2_w(uint8_t data) { /* @@ -252,7 +252,7 @@ WRITE8_MEMBER( adam_digital_data_pack_device::p2_w ) // p4_r - //------------------------------------------------- -READ8_MEMBER( adam_digital_data_pack_device::p4_r ) +uint8_t adam_digital_data_pack_device::p4_r() { /* diff --git a/src/devices/bus/adamnet/ddp.h b/src/devices/bus/adamnet/ddp.h index 0232fad9d06..c6fa66f98d3 100644 --- a/src/devices/bus/adamnet/ddp.h +++ b/src/devices/bus/adamnet/ddp.h @@ -51,10 +51,10 @@ private: int m_wr1; int m_track; - DECLARE_WRITE8_MEMBER( p1_w ); - DECLARE_READ8_MEMBER( p2_r ); - DECLARE_WRITE8_MEMBER( p2_w ); - DECLARE_READ8_MEMBER( p4_r ); + void p1_w(uint8_t data); + uint8_t p2_r(); + void p2_w(uint8_t data); + uint8_t p4_r(); void adam_ddp_mem(address_map &map); }; diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp index cd576e546be..867c7cd8103 100644 --- a/src/devices/bus/adamnet/fdc.cpp +++ b/src/devices/bus/adamnet/fdc.cpp @@ -213,7 +213,7 @@ READ8_MEMBER( adam_fdc_device::data_r ) // p1_r - //------------------------------------------------- -READ8_MEMBER( adam_fdc_device::p1_r ) +uint8_t adam_fdc_device::p1_r() { /* @@ -250,7 +250,7 @@ READ8_MEMBER( adam_fdc_device::p1_r ) // p1_w - //------------------------------------------------- -WRITE8_MEMBER( adam_fdc_device::p1_w ) +void adam_fdc_device::p1_w(uint8_t data) { /* @@ -292,7 +292,7 @@ WRITE8_MEMBER( adam_fdc_device::p1_w ) // p2_r - //------------------------------------------------- -READ8_MEMBER( adam_fdc_device::p2_r ) +uint8_t adam_fdc_device::p2_r() { /* @@ -319,7 +319,7 @@ READ8_MEMBER( adam_fdc_device::p2_r ) // p2_w - //------------------------------------------------- -WRITE8_MEMBER( adam_fdc_device::p2_w ) +void adam_fdc_device::p2_w(uint8_t data) { /* diff --git a/src/devices/bus/adamnet/fdc.h b/src/devices/bus/adamnet/fdc.h index 2ed2eb24ccb..d0d1cd1df55 100644 --- a/src/devices/bus/adamnet/fdc.h +++ b/src/devices/bus/adamnet/fdc.h @@ -55,10 +55,10 @@ private: DECLARE_FLOPPY_FORMATS( floppy_formats ); DECLARE_READ8_MEMBER( data_r ); - DECLARE_READ8_MEMBER( p1_r ); - DECLARE_WRITE8_MEMBER( p1_w ); - DECLARE_READ8_MEMBER( p2_r ); - DECLARE_WRITE8_MEMBER( p2_w ); + uint8_t p1_r(); + void p1_w(uint8_t data); + uint8_t p2_r(); + void p2_w(uint8_t data); void adam_fdc_mem(address_map &map); }; diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp index 37ed72669e1..a401dbfb335 100644 --- a/src/devices/bus/adamnet/kb.cpp +++ b/src/devices/bus/adamnet/kb.cpp @@ -243,7 +243,7 @@ void adam_keyboard_device::adamnet_reset_w(int state) // p1_r - //------------------------------------------------- -READ8_MEMBER( adam_keyboard_device::p1_r ) +uint8_t adam_keyboard_device::p1_r() { /* @@ -275,7 +275,7 @@ READ8_MEMBER( adam_keyboard_device::p1_r ) // p2_r - //------------------------------------------------- -READ8_MEMBER( adam_keyboard_device::p2_r ) +uint8_t adam_keyboard_device::p2_r() { /* @@ -302,7 +302,7 @@ READ8_MEMBER( adam_keyboard_device::p2_r ) // p2_w - //------------------------------------------------- -WRITE8_MEMBER( adam_keyboard_device::p2_w ) +void adam_keyboard_device::p2_w(uint8_t data) { /* @@ -324,7 +324,7 @@ WRITE8_MEMBER( adam_keyboard_device::p2_w ) // p3_r - //------------------------------------------------- -READ8_MEMBER( adam_keyboard_device::p3_r ) +uint8_t adam_keyboard_device::p3_r() { return 0xff; } @@ -334,7 +334,7 @@ READ8_MEMBER( adam_keyboard_device::p3_r ) // p3_w - //------------------------------------------------- -WRITE8_MEMBER( adam_keyboard_device::p3_w ) +void adam_keyboard_device::p3_w(uint8_t data) { /* @@ -359,7 +359,7 @@ WRITE8_MEMBER( adam_keyboard_device::p3_w ) // p4_r - //------------------------------------------------- -READ8_MEMBER( adam_keyboard_device::p4_r ) +uint8_t adam_keyboard_device::p4_r() { return 0xff; } @@ -369,7 +369,7 @@ READ8_MEMBER( adam_keyboard_device::p4_r ) // p4_w - //------------------------------------------------- -WRITE8_MEMBER( adam_keyboard_device::p4_w ) +void adam_keyboard_device::p4_w(uint8_t data) { /* diff --git a/src/devices/bus/adamnet/kb.h b/src/devices/bus/adamnet/kb.h index 2af2834e7e8..167ff1fc46d 100644 --- a/src/devices/bus/adamnet/kb.h +++ b/src/devices/bus/adamnet/kb.h @@ -47,13 +47,13 @@ private: uint16_t m_key_y; - DECLARE_READ8_MEMBER( p1_r ); - DECLARE_READ8_MEMBER( p2_r ); - DECLARE_WRITE8_MEMBER( p2_w ); - DECLARE_READ8_MEMBER( p3_r ); - DECLARE_WRITE8_MEMBER( p3_w ); - DECLARE_READ8_MEMBER( p4_r ); - DECLARE_WRITE8_MEMBER( p4_w ); + uint8_t p1_r(); + uint8_t p2_r(); + void p2_w(uint8_t data); + uint8_t p3_r(); + void p3_w(uint8_t data); + uint8_t p4_r(); + void p4_w(uint8_t data); void adam_kb_mem(address_map &map); }; diff --git a/src/devices/bus/adamnet/printer.cpp b/src/devices/bus/adamnet/printer.cpp index dcadb1a5a58..841fa76b138 100644 --- a/src/devices/bus/adamnet/printer.cpp +++ b/src/devices/bus/adamnet/printer.cpp @@ -116,7 +116,7 @@ void adam_printer_device::adamnet_reset_w(int state) // p1_w - //------------------------------------------------- -WRITE8_MEMBER( adam_printer_device::p1_w ) +void adam_printer_device::p1_w(uint8_t data) { /* @@ -139,7 +139,7 @@ WRITE8_MEMBER( adam_printer_device::p1_w ) // p2_r - //------------------------------------------------- -READ8_MEMBER( adam_printer_device::p2_r ) +uint8_t adam_printer_device::p2_r() { /* @@ -166,7 +166,7 @@ READ8_MEMBER( adam_printer_device::p2_r ) // p2_w - //------------------------------------------------- -WRITE8_MEMBER( adam_printer_device::p2_w ) +void adam_printer_device::p2_w(uint8_t data) { /* @@ -188,7 +188,7 @@ WRITE8_MEMBER( adam_printer_device::p2_w ) // p3_r - //------------------------------------------------- -READ8_MEMBER( adam_printer_device::p3_r ) +uint8_t adam_printer_device::p3_r() { return 0xff; } @@ -198,7 +198,7 @@ READ8_MEMBER( adam_printer_device::p3_r ) // p4_r - //------------------------------------------------- -READ8_MEMBER( adam_printer_device::p4_r ) +uint8_t adam_printer_device::p4_r() { /* @@ -223,7 +223,7 @@ READ8_MEMBER( adam_printer_device::p4_r ) // p4_w - //------------------------------------------------- -WRITE8_MEMBER( adam_printer_device::p4_w ) +void adam_printer_device::p4_w(uint8_t data) { /* diff --git a/src/devices/bus/adamnet/printer.h b/src/devices/bus/adamnet/printer.h index bbb2617405e..376db4a9a99 100644 --- a/src/devices/bus/adamnet/printer.h +++ b/src/devices/bus/adamnet/printer.h @@ -43,12 +43,12 @@ protected: private: required_device<m6801_cpu_device> m_maincpu; - DECLARE_WRITE8_MEMBER( p1_w ); - DECLARE_READ8_MEMBER( p2_r ); - DECLARE_WRITE8_MEMBER( p2_w ); - DECLARE_READ8_MEMBER( p3_r ); - DECLARE_READ8_MEMBER( p4_r ); - DECLARE_WRITE8_MEMBER( p4_w ); + void p1_w(uint8_t data); + uint8_t p2_r(); + void p2_w(uint8_t data); + uint8_t p3_r(); + uint8_t p4_r(); + void p4_w(uint8_t data); void adam_prn_mem(address_map &map); }; diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp index e5aafceafa1..008a99a2bfa 100644 --- a/src/devices/bus/adamnet/spi.cpp +++ b/src/devices/bus/adamnet/spi.cpp @@ -114,7 +114,7 @@ void adam_spi_device::adamnet_reset_w(int state) // p2_r - //------------------------------------------------- -READ8_MEMBER( adam_spi_device::p2_r ) +uint8_t adam_spi_device::p2_r() { /* @@ -141,7 +141,7 @@ READ8_MEMBER( adam_spi_device::p2_r ) // p2_w - //------------------------------------------------- -WRITE8_MEMBER( adam_spi_device::p2_w ) +void adam_spi_device::p2_w(uint8_t data) { /* diff --git a/src/devices/bus/adamnet/spi.h b/src/devices/bus/adamnet/spi.h index 89d61f10f01..36e2ba60789 100644 --- a/src/devices/bus/adamnet/spi.h +++ b/src/devices/bus/adamnet/spi.h @@ -46,8 +46,8 @@ protected: private: required_device<m6801_cpu_device> m_maincpu; - DECLARE_READ8_MEMBER( p2_r ); - DECLARE_WRITE8_MEMBER( p2_w ); + uint8_t p2_r(); + void p2_w(uint8_t data); void adam_spi_mem(address_map &map); }; diff --git a/src/devices/bus/amiga/keyboard/a1200.cpp b/src/devices/bus/amiga/keyboard/a1200.cpp index 8cf0c9ec2af..74d0f98518d 100644 --- a/src/devices/bus/amiga/keyboard/a1200.cpp +++ b/src/devices/bus/amiga/keyboard/a1200.cpp @@ -130,7 +130,7 @@ INPUT_CHANGED_MEMBER(a1200_kbd_device::layout_changed) m_mpu->set_input_line(M68HC05_IRQ_LINE, newval ? CLEAR_LINE : ASSERT_LINE); } -READ8_MEMBER(a1200_kbd_device::mpu_portb_r) +u8 a1200_kbd_device::mpu_portb_r() { u8 result(m_host_kdat ? 0xff : 0xfe); for (unsigned row = 0; m_rows.size() > row; ++row) @@ -141,12 +141,12 @@ READ8_MEMBER(a1200_kbd_device::mpu_portb_r) return result; } -WRITE8_MEMBER(a1200_kbd_device::mpu_porta_w) +void a1200_kbd_device::mpu_porta_w(offs_t offset, u8 data, u8 mem_mask) { m_row_drive = (m_row_drive & 0xff00) | u16(u8(data | ~mem_mask)); } -WRITE8_MEMBER(a1200_kbd_device::mpu_portb_w) +void a1200_kbd_device::mpu_portb_w(offs_t offset, u8 data, u8 mem_mask) { u8 const kdat(BIT(data, 0) | BIT(~mem_mask, 0)); m_host->kdat_w(kdat ? 1 : 0); @@ -161,7 +161,7 @@ WRITE8_MEMBER(a1200_kbd_device::mpu_portb_w) } } -WRITE8_MEMBER(a1200_kbd_device::mpu_portc_w) +void a1200_kbd_device::mpu_portc_w(offs_t offset, u8 data, u8 mem_mask) { m_row_drive = (m_row_drive & 0x80ff) | (u16(u8(data | ~mem_mask) & 0x7f) << 8); m_led_kbd_caps = BIT(~data, 7); diff --git a/src/devices/bus/amiga/keyboard/a1200.h b/src/devices/bus/amiga/keyboard/a1200.h index 42bc7fc933b..edb946699f2 100644 --- a/src/devices/bus/amiga/keyboard/a1200.h +++ b/src/devices/bus/amiga/keyboard/a1200.h @@ -33,10 +33,10 @@ public: protected: // MPU I/O - DECLARE_READ8_MEMBER(mpu_portb_r); - DECLARE_WRITE8_MEMBER(mpu_porta_w); - DECLARE_WRITE8_MEMBER(mpu_portb_w); - DECLARE_WRITE8_MEMBER(mpu_portc_w); + u8 mpu_portb_r(); + void mpu_porta_w(offs_t offset, u8 data, u8 mem_mask = ~0); + void mpu_portb_w(offs_t offset, u8 data, u8 mem_mask = ~0); + void mpu_portc_w(offs_t offset, u8 data, u8 mem_mask = ~0); DECLARE_WRITE_LINE_MEMBER(mpu_tcmp); virtual tiny_rom_entry const *device_rom_region() const override; diff --git a/src/devices/bus/amiga/keyboard/a2000.cpp b/src/devices/bus/amiga/keyboard/a2000.cpp index ed462318c97..656881eefe2 100644 --- a/src/devices/bus/amiga/keyboard/a2000.cpp +++ b/src/devices/bus/amiga/keyboard/a2000.cpp @@ -515,7 +515,7 @@ WRITE_LINE_MEMBER(a2000_kbd_g80_device::kdat_w) } } -READ8_MEMBER(a2000_kbd_g80_device::mcu_bus_r) +u8 a2000_kbd_g80_device::mcu_bus_r(offs_t offset) { // when jumpered for external ROM, offset latched by U2 is 0x60 + (row << 1) uint8_t result(0U); @@ -528,12 +528,12 @@ READ8_MEMBER(a2000_kbd_g80_device::mcu_bus_r) return result; } -WRITE8_MEMBER(a2000_kbd_g80_device::mcu_p1_w) +void a2000_kbd_g80_device::mcu_p1_w(u8 data) { m_row_drive = (m_row_drive & 0x1f00U) | uint16_t(data); } -WRITE8_MEMBER(a2000_kbd_g80_device::mcu_p2_w) +void a2000_kbd_g80_device::mcu_p2_w(u8 data) { m_row_drive = (m_row_drive & 0x00ffU) | (uint16_t(data & 0x1fU) << 8); diff --git a/src/devices/bus/amiga/keyboard/a2000.h b/src/devices/bus/amiga/keyboard/a2000.h index 89bb9d77016..bcc7016ed8b 100644 --- a/src/devices/bus/amiga/keyboard/a2000.h +++ b/src/devices/bus/amiga/keyboard/a2000.h @@ -33,9 +33,9 @@ protected: a2000_kbd_g80_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, uint32_t clock); // MCU I/O - DECLARE_READ8_MEMBER(mcu_bus_r); - DECLARE_WRITE8_MEMBER(mcu_p1_w); - DECLARE_WRITE8_MEMBER(mcu_p2_w); + u8 mcu_bus_r(offs_t offset); + void mcu_p1_w(u8 data); + void mcu_p2_w(u8 data); virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/amiga/zorro/a2065.cpp b/src/devices/bus/amiga/zorro/a2065.cpp index a3c0437aa17..ec74d08ffad 100644 --- a/src/devices/bus/amiga/zorro/a2065.cpp +++ b/src/devices/bus/amiga/zorro/a2065.cpp @@ -142,14 +142,14 @@ WRITE16_MEMBER( a2065_device::host_ram_w ) COMBINE_DATA(&m_ram[offset]); } -READ16_MEMBER( a2065_device::lance_ram_r ) +uint16_t a2065_device::lance_ram_r(offs_t offset) { offset = (offset >> 1) & 0x3fff; // logerror("lance read offset %04x\n", offset); return m_ram[offset]; } -WRITE16_MEMBER( a2065_device::lance_ram_w ) +void a2065_device::lance_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { offset = (offset >> 1) & 0x3fff; // logerror("lance write %04x = %04x\n", offset, data); diff --git a/src/devices/bus/amiga/zorro/a2065.h b/src/devices/bus/amiga/zorro/a2065.h index c3311eb2a53..ee0a82541fd 100644 --- a/src/devices/bus/amiga/zorro/a2065.h +++ b/src/devices/bus/amiga/zorro/a2065.h @@ -35,8 +35,8 @@ public: DECLARE_READ16_MEMBER( host_ram_r ); DECLARE_WRITE16_MEMBER( host_ram_w ); - DECLARE_READ16_MEMBER( lance_ram_r ); - DECLARE_WRITE16_MEMBER( lance_ram_w ); + uint16_t lance_ram_r(offs_t offset); + void lance_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); DECLARE_WRITE_LINE_MEMBER( lance_irq_w ); protected: diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp index 3243a6c7286..5e7e6733a50 100644 --- a/src/devices/bus/amiga/zorro/a2232.cpp +++ b/src/devices/bus/amiga/zorro/a2232.cpp @@ -357,17 +357,17 @@ WRITE8_MEMBER( a2232_device::cia_w ) m_cia->write(offset >> 1, data); } -READ8_MEMBER( a2232_device::cia_port_a_r ) +uint8_t a2232_device::cia_port_a_r() { return m_cia_port_a; } -READ8_MEMBER( a2232_device::cia_port_b_r ) +uint8_t a2232_device::cia_port_b_r() { return m_cia_port_b; } -WRITE8_MEMBER( a2232_device::cia_port_b_w ) +void a2232_device::cia_port_b_w(uint8_t data) { // tod clock connected to pb7 m_cia->tod_w(BIT(data, 7)); diff --git a/src/devices/bus/amiga/zorro/a2232.h b/src/devices/bus/amiga/zorro/a2232.h index 14a452f65d2..9c4a6b05da1 100644 --- a/src/devices/bus/amiga/zorro/a2232.h +++ b/src/devices/bus/amiga/zorro/a2232.h @@ -73,9 +73,9 @@ private: template<int N> DECLARE_WRITE8_MEMBER( acia_w ); // cia - DECLARE_READ8_MEMBER( cia_port_a_r ); - DECLARE_READ8_MEMBER( cia_port_b_r ); - DECLARE_WRITE8_MEMBER( cia_port_b_w ); + uint8_t cia_port_a_r(); + uint8_t cia_port_b_r(); + void cia_port_b_w(uint8_t data); DECLARE_READ8_MEMBER( cia_r ); DECLARE_WRITE8_MEMBER( cia_w ); diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp index cba4f706fed..5f4944d29ad 100644 --- a/src/devices/bus/amiga/zorro/a590.cpp +++ b/src/devices/bus/amiga/zorro/a590.cpp @@ -338,7 +338,7 @@ WRITE_LINE_MEMBER( a2091_device::cfgin_w ) m_dmac->configin_w(state); } -READ8_MEMBER( dmac_hdc_device_base::dmac_scsi_r ) +uint8_t dmac_hdc_device_base::dmac_scsi_r(offs_t offset) { switch (offset) { @@ -349,7 +349,7 @@ READ8_MEMBER( dmac_hdc_device_base::dmac_scsi_r ) return 0xff; } -WRITE8_MEMBER( dmac_hdc_device_base::dmac_scsi_w ) +void dmac_hdc_device_base::dmac_scsi_w(offs_t offset, uint8_t data) { switch (offset) { diff --git a/src/devices/bus/amiga/zorro/a590.h b/src/devices/bus/amiga/zorro/a590.h index 36b6ecf0a2e..bdf9ad1ec0c 100644 --- a/src/devices/bus/amiga/zorro/a590.h +++ b/src/devices/bus/amiga/zorro/a590.h @@ -58,8 +58,8 @@ protected: std::vector<uint8_t> m_ram; private: - DECLARE_READ8_MEMBER( dmac_scsi_r ); - DECLARE_WRITE8_MEMBER( dmac_scsi_w ); + uint8_t dmac_scsi_r(offs_t offset); + void dmac_scsi_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER( dmac_int_w ); DECLARE_WRITE_LINE_MEMBER( dmac_cfgout_w ) { cfgout_w(state); } DECLARE_WRITE_LINE_MEMBER( scsi_irq_w ); diff --git a/src/devices/bus/bbc/internal/cumana68k.cpp b/src/devices/bus/bbc/internal/cumana68k.cpp index 9e51485ec13..b81c44c6e5c 100644 --- a/src/devices/bus/bbc/internal/cumana68k.cpp +++ b/src/devices/bus/bbc/internal/cumana68k.cpp @@ -306,7 +306,7 @@ void bbc_cumana68k_device::mc146818_set(int as, int ds, int rw) } -WRITE8_MEMBER(bbc_cumana68k_device::pia_rtc_pb_w) +void bbc_cumana68k_device::pia_rtc_pb_w(uint8_t data) { /* bit 0, 1: drive select */ floppy_image_device *floppy = m_floppy[data & 0x03]->get_device(); @@ -328,7 +328,7 @@ WRITE8_MEMBER(bbc_cumana68k_device::pia_rtc_pb_w) } -WRITE8_MEMBER(bbc_cumana68k_device::pia_sasi_pb_w) +void bbc_cumana68k_device::pia_sasi_pb_w(uint8_t data) { /* bit 0: masknmi */ m_masknmi = BIT(data, 0); diff --git a/src/devices/bus/bbc/internal/cumana68k.h b/src/devices/bus/bbc/internal/cumana68k.h index e07c79617d0..273ff2edb9c 100644 --- a/src/devices/bus/bbc/internal/cumana68k.h +++ b/src/devices/bus/bbc/internal/cumana68k.h @@ -34,8 +34,8 @@ public: // construction/destruction bbc_cumana68k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER(pia_rtc_pb_w); - DECLARE_WRITE8_MEMBER(pia_sasi_pb_w); + void pia_rtc_pb_w(uint8_t data); + void pia_sasi_pb_w(uint8_t data); DECLARE_READ8_MEMBER(mem6502_r); DECLARE_WRITE8_MEMBER(mem6502_w); diff --git a/src/devices/bus/c64/buscard.cpp b/src/devices/bus/c64/buscard.cpp index e386b6839bc..aef66ef022b 100644 --- a/src/devices/bus/c64/buscard.cpp +++ b/src/devices/bus/c64/buscard.cpp @@ -91,7 +91,7 @@ ioport_constructor c64_buscard_device::device_input_ports() const // PPI interface //------------------------------------------------- -READ8_MEMBER( c64_buscard_device::ppi_pa_r ) +uint8_t c64_buscard_device::ppi_pa_r() { uint8_t data = 0xff; @@ -108,7 +108,7 @@ READ8_MEMBER( c64_buscard_device::ppi_pa_r ) return data; } -WRITE8_MEMBER( c64_buscard_device::ppi_pa_w ) +void c64_buscard_device::ppi_pa_w(uint8_t data) { m_ieee1->write(data); @@ -122,7 +122,7 @@ WRITE8_MEMBER( c64_buscard_device::ppi_pa_w ) m_centronics->write_data7(BIT(data, 7)); } -WRITE8_MEMBER( c64_buscard_device::ppi_pb_w ) +void c64_buscard_device::ppi_pb_w(uint8_t data) { /* @@ -147,7 +147,7 @@ WRITE8_MEMBER( c64_buscard_device::ppi_pb_w ) m_dipsw = BIT(data, 7); } -READ8_MEMBER( c64_buscard_device::ppi_pc_r ) +uint8_t c64_buscard_device::ppi_pc_r() { /* @@ -177,7 +177,7 @@ READ8_MEMBER( c64_buscard_device::ppi_pc_r ) return data; } -WRITE8_MEMBER( c64_buscard_device::ppi_pc_w ) +void c64_buscard_device::ppi_pc_w(uint8_t data) { /* diff --git a/src/devices/bus/c64/buscard.h b/src/devices/bus/c64/buscard.h index 5f6badff969..151598060ad 100644 --- a/src/devices/bus/c64/buscard.h +++ b/src/devices/bus/c64/buscard.h @@ -66,11 +66,11 @@ private: bool m_dipsw; bool m_busy; - 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_WRITE_LINE_MEMBER( busy_w ); bool pd_pgm1(offs_t offset, int sphi2); diff --git a/src/devices/bus/c64/ieee488.cpp b/src/devices/bus/c64/ieee488.cpp index c3afe6ff26c..dc588dfc136 100644 --- a/src/devices/bus/c64/ieee488.cpp +++ b/src/devices/bus/c64/ieee488.cpp @@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(C64_IEEE488, c64_ieee488_device, "c64_ieee488", "C64 IEEE-488 // tpi6525_interface tpi_intf //------------------------------------------------- -READ8_MEMBER( c64_ieee488_device::tpi_pa_r ) +uint8_t c64_ieee488_device::tpi_pa_r() { /* @@ -59,7 +59,7 @@ READ8_MEMBER( c64_ieee488_device::tpi_pa_r ) return data; } -WRITE8_MEMBER( c64_ieee488_device::tpi_pa_w ) +void c64_ieee488_device::tpi_pa_w(uint8_t data) { /* @@ -84,7 +84,7 @@ WRITE8_MEMBER( c64_ieee488_device::tpi_pa_w ) m_bus->host_nrfd_w(BIT(data, 7)); } -READ8_MEMBER( c64_ieee488_device::tpi_pc_r ) +uint8_t c64_ieee488_device::tpi_pc_r(offs_t offset) { /* @@ -111,7 +111,7 @@ READ8_MEMBER( c64_ieee488_device::tpi_pc_r ) return data; } -WRITE8_MEMBER( c64_ieee488_device::tpi_pc_w ) +void c64_ieee488_device::tpi_pc_w(uint8_t data) { /* diff --git a/src/devices/bus/c64/ieee488.h b/src/devices/bus/c64/ieee488.h index ab3c7748b8d..60919029bf7 100644 --- a/src/devices/bus/c64/ieee488.h +++ b/src/devices/bus/c64/ieee488.h @@ -44,10 +44,10 @@ protected: virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; private: - DECLARE_READ8_MEMBER( tpi_pa_r ); - DECLARE_WRITE8_MEMBER( tpi_pa_w ); - DECLARE_READ8_MEMBER( tpi_pc_r ); - DECLARE_WRITE8_MEMBER( tpi_pc_w ); + uint8_t tpi_pa_r(); + void tpi_pa_w(uint8_t data); + uint8_t tpi_pc_r(offs_t offset); + void tpi_pc_w(uint8_t data); required_device<tpi6525_device> m_tpi; required_device<ieee488_device> m_bus; diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp index e47795a9eb0..8d43fd05810 100644 --- a/src/devices/bus/c64/magic_formel.cpp +++ b/src/devices/bus/c64/magic_formel.cpp @@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(C64_MAGIC_FORMEL, c64_magic_formel_cartridge_device, "c64_magic_formel", "C64 Magic Formel cartridge") -WRITE8_MEMBER( c64_magic_formel_cartridge_device::pia_pa_w ) +void c64_magic_formel_cartridge_device::pia_pa_w(uint8_t data) { /* @@ -56,7 +56,7 @@ WRITE8_MEMBER( c64_magic_formel_cartridge_device::pia_pa_w ) m_ram_oe = BIT(data, 4); } -WRITE8_MEMBER( c64_magic_formel_cartridge_device::pia_pb_w ) +void c64_magic_formel_cartridge_device::pia_pb_w(uint8_t data) { /* diff --git a/src/devices/bus/c64/magic_formel.h b/src/devices/bus/c64/magic_formel.h index 818342d3c3f..43fb7c69fe5 100644 --- a/src/devices/bus/c64/magic_formel.h +++ b/src/devices/bus/c64/magic_formel.h @@ -46,8 +46,8 @@ protected: virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; private: - DECLARE_WRITE8_MEMBER( pia_pa_w ); - DECLARE_WRITE8_MEMBER( pia_pb_w ); + void pia_pa_w(uint8_t data); + void pia_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( pia_cb2_w ); required_device<pia6821_device> m_pia; diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp index 3b6c0ebdb62..faac3bc0a33 100644 --- a/src/devices/bus/c64/magic_voice.cpp +++ b/src/devices/bus/c64/magic_voice.cpp @@ -78,7 +78,7 @@ WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::tpi_irq_w ) m_slot->nmi_w(state); } -READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pa_r ) +uint8_t c64_magic_voice_cartridge_device::tpi_pa_r() { /* @@ -104,7 +104,7 @@ READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pa_r ) return data; } -WRITE8_MEMBER( c64_magic_voice_cartridge_device::tpi_pa_w ) +void c64_magic_voice_cartridge_device::tpi_pa_w(uint8_t data) { /* @@ -125,7 +125,7 @@ WRITE8_MEMBER( c64_magic_voice_cartridge_device::tpi_pa_w ) m_fifo->si_w(BIT(data, 4)); } -READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pb_r ) +uint8_t c64_magic_voice_cartridge_device::tpi_pb_r() { /* @@ -149,7 +149,7 @@ READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pb_r ) return data; } -WRITE8_MEMBER( c64_magic_voice_cartridge_device::tpi_pb_w ) +void c64_magic_voice_cartridge_device::tpi_pb_w(uint8_t data) { /* diff --git a/src/devices/bus/c64/magic_voice.h b/src/devices/bus/c64/magic_voice.h index bf6f081fd67..f6c4a4d138e 100644 --- a/src/devices/bus/c64/magic_voice.h +++ b/src/devices/bus/c64/magic_voice.h @@ -48,10 +48,10 @@ private: offs_t get_offset(offs_t offset); DECLARE_WRITE_LINE_MEMBER( tpi_irq_w ); - DECLARE_READ8_MEMBER( tpi_pa_r ); - DECLARE_WRITE8_MEMBER( tpi_pa_w ); - DECLARE_READ8_MEMBER( tpi_pb_r ); - DECLARE_WRITE8_MEMBER( tpi_pb_w ); + uint8_t tpi_pa_r(); + void tpi_pa_w(uint8_t data); + uint8_t tpi_pb_r(); + void tpi_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( tpi_ca_w ); DECLARE_WRITE_LINE_MEMBER( tpi_cb_w ); diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp index 0bedd729b0e..fb18a9a4092 100644 --- a/src/devices/bus/cbmiec/c1541.cpp +++ b/src/devices/bus/cbmiec/c1541.cpp @@ -716,13 +716,13 @@ WRITE_LINE_MEMBER( c1541_device_base::via0_irq_w ) m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq) ? ASSERT_LINE : CLEAR_LINE); } -READ8_MEMBER( c1541_device_base::via0_pa_r ) +uint8_t c1541_device_base::via0_pa_r() { // dummy read to acknowledge ATN IN interrupt return m_parallel_data; } -WRITE8_MEMBER( c1541_device_base::via0_pa_w ) +void c1541_device_base::via0_pa_w(uint8_t data) { if (m_other != nullptr) { @@ -730,7 +730,7 @@ WRITE8_MEMBER( c1541_device_base::via0_pa_w ) } } -READ8_MEMBER( c1541_device_base::via0_pb_r ) +uint8_t c1541_device_base::via0_pb_r() { /* @@ -764,7 +764,7 @@ READ8_MEMBER( c1541_device_base::via0_pb_r ) return data; } -WRITE8_MEMBER( c1541_device_base::via0_pb_w ) +void c1541_device_base::via0_pb_w(uint8_t data) { /* @@ -799,7 +799,7 @@ WRITE_LINE_MEMBER( c1541_device_base::via0_ca2_w ) } } -READ8_MEMBER( c1541c_device::via0_pa_r ) +uint8_t c1541c_device::via0_pa_r() { /* @@ -827,7 +827,7 @@ WRITE_LINE_MEMBER( c1541_device_base::via1_irq_w ) m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq) ? ASSERT_LINE : CLEAR_LINE); } -READ8_MEMBER( c1541_device_base::via1_pb_r ) +uint8_t c1541_device_base::via1_pb_r() { /* @@ -855,7 +855,7 @@ READ8_MEMBER( c1541_device_base::via1_pb_r ) return data; } -WRITE8_MEMBER( c1541_device_base::via1_pb_w ) +void c1541_device_base::via1_pb_w(uint8_t data) { /* @@ -923,7 +923,7 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_w ) m_pia->write((offset >> 2) & 0x03, data); } -WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pa_w ) +void c1541_prologic_dos_classic_device::pia_pa_w(uint8_t data) { /* @@ -941,12 +941,12 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pa_w ) */ } -READ8_MEMBER( c1541_prologic_dos_classic_device::pia_pb_r ) +uint8_t c1541_prologic_dos_classic_device::pia_pb_r() { return m_parallel_data; } -WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pb_w ) +void c1541_prologic_dos_classic_device::pia_pb_w(uint8_t data) { m_parallel_data = data; diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h index 36310429f63..2dca91499dc 100644 --- a/src/devices/bus/cbmiec/c1541.h +++ b/src/devices/bus/cbmiec/c1541.h @@ -69,14 +69,14 @@ private: inline void set_iec_data(); DECLARE_WRITE_LINE_MEMBER( via0_irq_w ); - virtual DECLARE_READ8_MEMBER( via0_pa_r ); - DECLARE_WRITE8_MEMBER( via0_pa_w ); - DECLARE_READ8_MEMBER( via0_pb_r ); - DECLARE_WRITE8_MEMBER( via0_pb_w ); + virtual uint8_t via0_pa_r(); + void via0_pa_w(uint8_t data); + uint8_t via0_pb_r(); + void via0_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( via0_ca2_w ); DECLARE_WRITE_LINE_MEMBER( via1_irq_w ); - DECLARE_READ8_MEMBER( via1_pb_r ); - DECLARE_WRITE8_MEMBER( via1_pb_w ); + uint8_t via1_pb_r(); + void via1_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( atn_w ); DECLARE_WRITE_LINE_MEMBER( byte_w ); @@ -139,8 +139,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - // not really public - virtual DECLARE_READ8_MEMBER( via0_pa_r ) override; + virtual uint8_t via0_pa_r() override; }; @@ -267,9 +266,9 @@ private: DECLARE_READ8_MEMBER( pia_r ); DECLARE_WRITE8_MEMBER( pia_w ); - DECLARE_WRITE8_MEMBER( pia_pa_w ); - DECLARE_READ8_MEMBER( pia_pb_r ); - DECLARE_WRITE8_MEMBER( pia_pb_w ); + void pia_pa_w(uint8_t data); + uint8_t pia_pb_r(); + void pia_pb_w(uint8_t data); DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp index dc0bae13ed3..c725892753b 100644 --- a/src/devices/bus/cbmiec/c1571.cpp +++ b/src/devices/bus/cbmiec/c1571.cpp @@ -179,7 +179,7 @@ WRITE_LINE_MEMBER( c1571_device::via0_irq_w ) m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq || m_cia_irq) ? ASSERT_LINE : CLEAR_LINE); } -READ8_MEMBER( c1571_device::via0_pa_r ) +uint8_t c1571_device::via0_pa_r() { /* @@ -207,7 +207,7 @@ READ8_MEMBER( c1571_device::via0_pa_r ) return data; } -WRITE8_MEMBER( c1571_device::via0_pa_w ) +void c1571_device::via0_pa_w(uint8_t data) { /* @@ -252,7 +252,7 @@ WRITE8_MEMBER( c1571_device::via0_pa_w ) update_iec(); } -WRITE8_MEMBER( c1571cr_device::via0_pa_w ) +void c1571cr_device::via0_pa_w(uint8_t data) { /* @@ -289,7 +289,7 @@ WRITE8_MEMBER( c1571cr_device::via0_pa_w ) } } -READ8_MEMBER( c1571_device::via0_pb_r ) +uint8_t c1571_device::via0_pb_r() { /* @@ -323,7 +323,7 @@ READ8_MEMBER( c1571_device::via0_pb_r ) return data; } -WRITE8_MEMBER( c1571_device::via0_pb_w ) +void c1571_device::via0_pb_w(uint8_t data) { /* @@ -352,7 +352,7 @@ WRITE8_MEMBER( c1571_device::via0_pb_w ) update_iec(); } -WRITE8_MEMBER( c1571cr_device::via0_pb_w ) +void c1571cr_device::via0_pb_w(uint8_t data) { /* @@ -407,7 +407,7 @@ WRITE_LINE_MEMBER( c1571_device::via1_irq_w ) m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq || m_cia_irq) ? ASSERT_LINE : CLEAR_LINE); } -READ8_MEMBER( c1571_device::via1_pb_r ) +uint8_t c1571_device::via1_pb_r() { /* @@ -435,7 +435,7 @@ READ8_MEMBER( c1571_device::via1_pb_r ) return data; } -WRITE8_MEMBER( c1571_device::via1_pb_w ) +void c1571_device::via1_pb_w(uint8_t data) { /* @@ -499,12 +499,12 @@ WRITE_LINE_MEMBER( c1571_device::cia_sp_w ) update_iec(); } -READ8_MEMBER( c1571_device::cia_pb_r ) +uint8_t c1571_device::cia_pb_r() { return m_parallel_data; } -WRITE8_MEMBER( c1571_device::cia_pb_w ) +void c1571_device::cia_pb_w(uint8_t data) { if (m_other != nullptr) { @@ -517,19 +517,19 @@ WRITE8_MEMBER( c1571_device::cia_pb_w ) // MOS6526_INTERFACE( mini_chief_cia_intf ) //------------------------------------------------- -READ8_MEMBER( mini_chief_device::cia_pa_r ) +uint8_t mini_chief_device::cia_pa_r() { // TODO read from ISA bus @ 0x320 | A2 A1 A0 return 0; } -WRITE8_MEMBER( mini_chief_device::cia_pa_w ) +void mini_chief_device::cia_pa_w(uint8_t data) { // TODO write to ISA bus @ 0x320 | A2 A1 A0 } -WRITE8_MEMBER( mini_chief_device::cia_pb_w ) +void mini_chief_device::cia_pb_w(uint8_t data) { /* diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h index 467c959963e..26bc3f43ba7 100644 --- a/src/devices/bus/cbmiec/c1571.h +++ b/src/devices/bus/cbmiec/c1571.h @@ -44,23 +44,23 @@ public: c1571_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); DECLARE_WRITE_LINE_MEMBER( via0_irq_w ); - DECLARE_READ8_MEMBER( via0_pa_r ); - DECLARE_WRITE8_MEMBER( via0_pa_w ); - DECLARE_READ8_MEMBER( via0_pb_r ); - DECLARE_WRITE8_MEMBER( via0_pb_w ); + uint8_t via0_pa_r(); + void via0_pa_w(uint8_t data); + uint8_t via0_pb_r(); + void via0_pb_w(uint8_t data); DECLARE_READ8_MEMBER( via1_r ); DECLARE_WRITE8_MEMBER( via1_w ); DECLARE_WRITE_LINE_MEMBER( via1_irq_w ); - DECLARE_READ8_MEMBER( via1_pb_r ); - DECLARE_WRITE8_MEMBER( via1_pb_w ); + uint8_t via1_pb_r(); + void via1_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( cia_irq_w ); DECLARE_WRITE_LINE_MEMBER( cia_pc_w ); DECLARE_WRITE_LINE_MEMBER( cia_cnt_w ); DECLARE_WRITE_LINE_MEMBER( cia_sp_w ); - DECLARE_READ8_MEMBER( cia_pb_r ); - DECLARE_WRITE8_MEMBER( cia_pb_w ); + uint8_t cia_pb_r(); + void cia_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( byte_w ); @@ -157,8 +157,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE8_MEMBER( via0_pa_w ); - DECLARE_WRITE8_MEMBER( via0_pb_w ); + void via0_pa_w(uint8_t data); + void via0_pb_w(uint8_t data); }; @@ -176,9 +176,9 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_READ8_MEMBER( cia_pa_r ); - DECLARE_WRITE8_MEMBER( cia_pa_w ); - DECLARE_WRITE8_MEMBER( cia_pb_w ); + uint8_t cia_pa_r(); + void cia_pa_w(uint8_t data); + void cia_pb_w(uint8_t data); void mini_chief_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp index 57282efc9c3..ad2b4e054e2 100644 --- a/src/devices/bus/cbmiec/c1581.cpp +++ b/src/devices/bus/cbmiec/c1581.cpp @@ -116,7 +116,7 @@ WRITE_LINE_MEMBER( c1581_device::sp_w ) update_iec(); } -READ8_MEMBER( c1581_device::cia_pa_r ) +uint8_t c1581_device::cia_pa_r() { /* @@ -147,7 +147,7 @@ READ8_MEMBER( c1581_device::cia_pa_r ) return data; } -WRITE8_MEMBER( c1581_device::cia_pa_w ) +void c1581_device::cia_pa_w(uint8_t data) { /* @@ -177,7 +177,7 @@ WRITE8_MEMBER( c1581_device::cia_pa_w ) m_leds[LED_ACT] = BIT(data, 6); } -READ8_MEMBER( c1581_device::cia_pb_r ) +uint8_t c1581_device::cia_pb_r() { /* @@ -211,7 +211,7 @@ READ8_MEMBER( c1581_device::cia_pb_r ) return data; } -WRITE8_MEMBER( c1581_device::cia_pb_w ) +void c1581_device::cia_pb_w(uint8_t data) { /* diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h index 811375dbdaa..b9aef830039 100644 --- a/src/devices/bus/cbmiec/c1581.h +++ b/src/devices/bus/cbmiec/c1581.h @@ -69,10 +69,10 @@ private: DECLARE_WRITE_LINE_MEMBER( cnt_w ); DECLARE_WRITE_LINE_MEMBER( sp_w ); - DECLARE_READ8_MEMBER( cia_pa_r ); - DECLARE_WRITE8_MEMBER( cia_pa_w ); - DECLARE_READ8_MEMBER( cia_pb_r ); - DECLARE_WRITE8_MEMBER( cia_pb_w ); + uint8_t cia_pa_r(); + void cia_pa_w(uint8_t data); + uint8_t cia_pb_r(); + void cia_pb_w(uint8_t data); void c1581_mem(address_map &map); diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp index c4d1bd311c1..0ac6321c359 100644 --- a/src/devices/bus/cbmiec/fd2000.cpp +++ b/src/devices/bus/cbmiec/fd2000.cpp @@ -113,7 +113,7 @@ void fd4000_device::fd4000_mem(address_map &map) } -READ8_MEMBER( fd2000_device::via_pa_r ) +uint8_t fd2000_device::via_pa_r() { /* @@ -133,7 +133,7 @@ READ8_MEMBER( fd2000_device::via_pa_r ) return 0; } -WRITE8_MEMBER( fd2000_device::via_pa_w ) +void fd2000_device::via_pa_w(uint8_t data) { /* @@ -151,7 +151,7 @@ WRITE8_MEMBER( fd2000_device::via_pa_w ) */ } -READ8_MEMBER( fd2000_device::via_pb_r ) +uint8_t fd2000_device::via_pb_r() { /* @@ -176,7 +176,7 @@ READ8_MEMBER( fd2000_device::via_pb_r ) return data; } -WRITE8_MEMBER( fd2000_device::via_pb_w ) +void fd2000_device::via_pb_w(uint8_t data) { /* diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h index cb47bca4fa2..0f0ecdd2485 100644 --- a/src/devices/bus/cbmiec/fd2000.h +++ b/src/devices/bus/cbmiec/fd2000.h @@ -33,10 +33,10 @@ public: // construction/destruction fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( via_pa_r ); - DECLARE_WRITE8_MEMBER( via_pa_w ); - DECLARE_READ8_MEMBER( via_pb_r ); - DECLARE_WRITE8_MEMBER( via_pb_w ); + uint8_t via_pa_r(); + void via_pa_w(uint8_t data); + uint8_t via_pb_r(); + void via_pb_w(uint8_t data); //DECLARE_FLOPPY_FORMATS( floppy_formats ); diff --git a/src/devices/bus/cbus/pc9801_amd98.cpp b/src/devices/bus/cbus/pc9801_amd98.cpp index 684dc8978df..c89e88bc632 100644 --- a/src/devices/bus/cbus/pc9801_amd98.cpp +++ b/src/devices/bus/cbus/pc9801_amd98.cpp @@ -180,12 +180,12 @@ WRITE8_MEMBER(pc9801_amd98_device::write) } } -WRITE8_MEMBER(pc9801_amd98_device::ay3_address_w) +void pc9801_amd98_device::ay3_address_w(uint8_t data) { m_ay3_latch = data; } -WRITE8_MEMBER(pc9801_amd98_device::ay3_data_latch_w) +void pc9801_amd98_device::ay3_data_latch_w(uint8_t data) { // TODO: this actually uses a flip flop mechanism, not quite sure about how it works yet switch(data) diff --git a/src/devices/bus/cbus/pc9801_amd98.h b/src/devices/bus/cbus/pc9801_amd98.h index 993cd6e9e4b..f116166fc9e 100644 --- a/src/devices/bus/cbus/pc9801_amd98.h +++ b/src/devices/bus/cbus/pc9801_amd98.h @@ -42,8 +42,8 @@ protected: virtual ioport_constructor device_input_ports() const override; private: - DECLARE_WRITE8_MEMBER(ay3_address_w); - DECLARE_WRITE8_MEMBER(ay3_data_latch_w); + void ay3_address_w(uint8_t data); + void ay3_data_latch_w(uint8_t data); uint8_t m_ay3_latch; diff --git a/src/devices/bus/cbus/pc9801_snd.cpp b/src/devices/bus/cbus/pc9801_snd.cpp index 670e423e4d3..6a611d77e78 100644 --- a/src/devices/bus/cbus/pc9801_snd.cpp +++ b/src/devices/bus/cbus/pc9801_snd.cpp @@ -17,7 +17,7 @@ pc9801_snd_device::pc9801_snd_device(const machine_config &mconfig, device_type { } -READ8_MEMBER(pc9801_snd_device::opn_porta_r) +uint8_t pc9801_snd_device::opn_porta_r() { if(m_joy_sel & 0x80) return ioport(m_joy_sel & 0x40 ? "PA2" : "PA1")->read(); @@ -25,7 +25,7 @@ READ8_MEMBER(pc9801_snd_device::opn_porta_r) return 0xff; } -WRITE8_MEMBER(pc9801_snd_device::opn_portb_w) { m_joy_sel = data; } +void pc9801_snd_device::opn_portb_w(uint8_t data) { m_joy_sel = data; } INPUT_PORTS_START(pc9801_joy_port) PORT_START("PA1") diff --git a/src/devices/bus/cbus/pc9801_snd.h b/src/devices/bus/cbus/pc9801_snd.h index 600e555b329..c7408c09383 100644 --- a/src/devices/bus/cbus/pc9801_snd.h +++ b/src/devices/bus/cbus/pc9801_snd.h @@ -18,8 +18,8 @@ public: pc9801_snd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); protected: - DECLARE_READ8_MEMBER(opn_porta_r); - DECLARE_WRITE8_MEMBER(opn_portb_w); + uint8_t opn_porta_r(); + void opn_portb_w(uint8_t data); private: uint8_t m_joy_sel; diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp index 1ec3dccb338..986678300f8 100644 --- a/src/devices/bus/centronics/epson_ex800.cpp +++ b/src/devices/bus/centronics/epson_ex800.cpp @@ -372,25 +372,25 @@ void epson_ex800_device::device_reset() } -READ8_MEMBER(epson_ex800_device::porta_r) +uint8_t epson_ex800_device::porta_r() { logerror("PA R %s\n", machine().describe_context()); return machine().rand(); } -READ8_MEMBER(epson_ex800_device::portb_r) +uint8_t epson_ex800_device::portb_r() { logerror("PB R %s\n", machine().describe_context()); return machine().rand(); } -READ8_MEMBER(epson_ex800_device::portc_r) +uint8_t epson_ex800_device::portc_r() { logerror("PC R %s\n", machine().describe_context()); return machine().rand(); } -WRITE8_MEMBER(epson_ex800_device::porta_w) +void epson_ex800_device::porta_w(uint8_t data) { if (PA6) logerror("BNK0 selected.\n"); if (PA7) logerror("BNK1 selected.\n"); @@ -398,7 +398,7 @@ WRITE8_MEMBER(epson_ex800_device::porta_w) logerror("PA W %x %s\n", data, machine().describe_context()); } -WRITE8_MEMBER(epson_ex800_device::portb_w) +void epson_ex800_device::portb_w(uint8_t data) { if (data & 3) logerror("PB0/1 Line feed %s\n", machine().describe_context()); @@ -422,7 +422,7 @@ WRITE8_MEMBER(epson_ex800_device::portb_w) // logerror("PB W %x %s\n", data, machine().describe_context()); } -WRITE8_MEMBER(epson_ex800_device::portc_w) +void epson_ex800_device::portc_w(uint8_t data) { if (data & 0x80) m_beeper->set_state(0); diff --git a/src/devices/bus/centronics/epson_ex800.h b/src/devices/bus/centronics/epson_ex800.h index f1f74002820..750eb8a771f 100644 --- a/src/devices/bus/centronics/epson_ex800.h +++ b/src/devices/bus/centronics/epson_ex800.h @@ -42,12 +42,12 @@ protected: virtual ioport_constructor device_input_ports() const override; private: - DECLARE_READ8_MEMBER(porta_r); - DECLARE_READ8_MEMBER(portb_r); - DECLARE_READ8_MEMBER(portc_r); - DECLARE_WRITE8_MEMBER(porta_w); - DECLARE_WRITE8_MEMBER(portb_w); - DECLARE_WRITE8_MEMBER(portc_w); + uint8_t porta_r(); + uint8_t portb_r(); + uint8_t portc_r(); + void porta_w(uint8_t data); + void portb_w(uint8_t data); + void portc_w(uint8_t data); DECLARE_READ8_MEMBER(devsel_r); DECLARE_WRITE8_MEMBER(devsel_w); DECLARE_READ8_MEMBER(gate5a_r); diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp index 32988311b3b..0ef9b942f53 100644 --- a/src/devices/bus/centronics/epson_lx800.cpp +++ b/src/devices/bus/centronics/epson_lx800.cpp @@ -232,7 +232,7 @@ void epson_lx800_device::device_reset() * PA6 not used * PA7 R P/S P/S signal from the optional interface */ -READ8_MEMBER( epson_lx800_device::porta_r ) +uint8_t epson_lx800_device::porta_r(offs_t offset) { uint8_t result = 0; @@ -247,7 +247,7 @@ READ8_MEMBER( epson_lx800_device::porta_r ) return result; } -WRITE8_MEMBER( epson_lx800_device::porta_w ) +void epson_lx800_device::porta_w(offs_t offset, uint8_t data) { logerror("%s: lx800_porta_w(%02x): %02x\n", machine().describe_context(), offset, data); logerror("--> carriage: %d, paper feed: %d\n", BIT(data, 0), BIT(data, 2)); @@ -262,7 +262,7 @@ WRITE8_MEMBER( epson_lx800_device::porta_w ) * PC6 W FIRE drive pulse width signal * PC7 W BUZZER buzzer signal */ -READ8_MEMBER( epson_lx800_device::portc_r ) +uint8_t epson_lx800_device::portc_r(offs_t offset) { uint8_t result = 0; @@ -273,7 +273,7 @@ READ8_MEMBER( epson_lx800_device::portc_r ) return result; } -WRITE8_MEMBER( epson_lx800_device::portc_w ) +void epson_lx800_device::portc_w(offs_t offset, uint8_t data) { logerror("%s: lx800_portc_w(%02x): %02x\n", machine().describe_context(), offset, data); logerror("--> err: %d, ack: %d, fire: %d, buzzer: %d\n", BIT(data, 4), BIT(data, 5), BIT(data, 6), BIT(data, 7)); @@ -317,7 +317,7 @@ READ_LINE_MEMBER( epson_lx800_device::an5_r ) GATE ARRAY ***************************************************************************/ -READ8_MEMBER( epson_lx800_device::centronics_data_r ) +uint8_t epson_lx800_device::centronics_data_r() { logerror("centronics: data read\n"); return 0x55; diff --git a/src/devices/bus/centronics/epson_lx800.h b/src/devices/bus/centronics/epson_lx800.h index 86e71838c97..d7e092e31a5 100644 --- a/src/devices/bus/centronics/epson_lx800.h +++ b/src/devices/bus/centronics/epson_lx800.h @@ -43,10 +43,10 @@ protected: virtual ioport_constructor device_input_ports() const override; private: - DECLARE_READ8_MEMBER(porta_r); - DECLARE_WRITE8_MEMBER(porta_w); - DECLARE_READ8_MEMBER(portc_r); - DECLARE_WRITE8_MEMBER(portc_w); + uint8_t porta_r(offs_t offset); + void porta_w(offs_t offset, uint8_t data); + uint8_t portc_r(offs_t offset); + void portc_w(offs_t offset, uint8_t data); DECLARE_READ_LINE_MEMBER(an0_r); DECLARE_READ_LINE_MEMBER(an1_r); @@ -55,7 +55,7 @@ private: DECLARE_READ_LINE_MEMBER(an4_r); DECLARE_READ_LINE_MEMBER(an5_r); - DECLARE_READ8_MEMBER(centronics_data_r); + uint8_t centronics_data_r(); DECLARE_WRITE_LINE_MEMBER(centronics_pe_w); DECLARE_WRITE_LINE_MEMBER(reset_w); diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp index 11f474fc689..00d0ef866b4 100644 --- a/src/devices/bus/centronics/epson_lx810l.cpp +++ b/src/devices/bus/centronics/epson_lx810l.cpp @@ -372,7 +372,7 @@ WRITE8_MEMBER(epson_lx810l_device::fakemem_w) * PA6 R Line Feed SWITCH * PA7 R Form Feed SWITCH */ -READ8_MEMBER( epson_lx810l_device::porta_r ) +uint8_t epson_lx810l_device::porta_r(offs_t offset) { uint8_t result = 0; uint8_t hp_sensor = m_cr_pos_abs <= 0 ? 0 : 1; @@ -388,7 +388,7 @@ READ8_MEMBER( epson_lx810l_device::porta_r ) return result; } -WRITE8_MEMBER( epson_lx810l_device::porta_w ) +void epson_lx810l_device::porta_w(offs_t offset, uint8_t data) { LOG("%s: lx810l_PA_w(%02x): %02x: stepper vref %d\n", machine().describe_context(), offset, data, BIT(data, 3) | (BIT(data, 4)<<1) | (BIT(data, 5)<<2)); } @@ -403,7 +403,7 @@ WRITE8_MEMBER( epson_lx810l_device::porta_w ) * PB6 R DIP1.6 * PB7 R DIP1.7 */ -READ8_MEMBER( epson_lx810l_device::portb_r ) +uint8_t epson_lx810l_device::portb_r(offs_t offset) { uint8_t result = ~ioport("DIPSW1")->read(); @@ -419,7 +419,7 @@ READ8_MEMBER( epson_lx810l_device::portb_r ) return result; } -WRITE8_MEMBER( epson_lx810l_device::portb_w ) +void epson_lx810l_device::portb_w(offs_t offset, uint8_t data) { uint8_t data_in = BIT(data, 1); @@ -440,7 +440,7 @@ WRITE8_MEMBER( epson_lx810l_device::portb_w ) * PC6 W FIRE drive pulse width signal, also E05A30.57 * PC7 W BUZZER buzzer signal */ -READ8_MEMBER( epson_lx810l_device::portc_r ) +uint8_t epson_lx810l_device::portc_r(offs_t offset) { uint8_t result = 0; @@ -454,7 +454,7 @@ READ8_MEMBER( epson_lx810l_device::portc_r ) return result; } -WRITE8_MEMBER( epson_lx810l_device::portc_w ) +void epson_lx810l_device::portc_w(offs_t offset, uint8_t data) { /* ioport("serial")->write(BIT(data, 0)); */ @@ -474,12 +474,12 @@ WRITE8_MEMBER( epson_lx810l_device::portc_w ) GATE ARRAY ***************************************************************************/ -WRITE16_MEMBER( epson_lx810l_device::printhead ) +void epson_lx810l_device::printhead(uint16_t data) { m_printhead = data; } -WRITE8_MEMBER( epson_lx810l_device::pf_stepper ) +void epson_lx810l_device::pf_stepper(uint8_t data) { int changed = m_pf_stepper->update(data); m_pf_pos_abs = -m_pf_stepper->get_absolute_position(); @@ -493,7 +493,7 @@ WRITE8_MEMBER( epson_lx810l_device::pf_stepper ) LOG("%s: %s(%02x); abs %d\n", machine().describe_context(), __func__, data, m_pf_pos_abs); } -WRITE8_MEMBER( epson_lx810l_device::cr_stepper ) +void epson_lx810l_device::cr_stepper(uint8_t data) { int m_cr_pos_abs_prev = m_cr_pos_abs; @@ -571,47 +571,47 @@ WRITE_LINE_MEMBER( epson_lx810l_device::co0_w ) ADC ***************************************************************************/ -READ8_MEMBER(epson_lx810l_device::an0_r) +uint8_t epson_lx810l_device::an0_r() { uint8_t res = !!(ioport("DIPSW2")->read() & 0x01); return res - 1; /* DIPSW2.1 */ } -READ8_MEMBER(epson_lx810l_device::an1_r) +uint8_t epson_lx810l_device::an1_r() { uint8_t res = !!(ioport("DIPSW2")->read() & 0x02); return res - 1; /* DIPSW2.2 */ } -READ8_MEMBER(epson_lx810l_device::an2_r) +uint8_t epson_lx810l_device::an2_r() { uint8_t res = !!(ioport("DIPSW2")->read() & 0x04); return res - 1; /* DIPSW2.3 */ } -READ8_MEMBER(epson_lx810l_device::an3_r) +uint8_t epson_lx810l_device::an3_r() { uint8_t res = !!(ioport("DIPSW2")->read() & 0x08); return res - 1; /* DIPSW2.4 */ } -READ8_MEMBER(epson_lx810l_device::an4_r) +uint8_t epson_lx810l_device::an4_r() { return 0xff; } -READ8_MEMBER(epson_lx810l_device::an5_r) +uint8_t epson_lx810l_device::an5_r() { return 0xCB; /* motor voltage, 0xcb = 24V */ } -READ8_MEMBER(epson_lx810l_device::an6_r) +uint8_t epson_lx810l_device::an6_r() { uint8_t res = !ioport("LOADEJECT")->read(); return res - 1; } -READ8_MEMBER(epson_lx810l_device::an7_r) +uint8_t epson_lx810l_device::an7_r() { return 0xff; } diff --git a/src/devices/bus/centronics/epson_lx810l.h b/src/devices/bus/centronics/epson_lx810l.h index f952244d6a2..670ad10dae5 100644 --- a/src/devices/bus/centronics/epson_lx810l.h +++ b/src/devices/bus/centronics/epson_lx810l.h @@ -69,12 +69,12 @@ protected: virtual ioport_constructor device_input_ports() const override; private: - DECLARE_READ8_MEMBER(porta_r); - DECLARE_WRITE8_MEMBER(porta_w); - DECLARE_READ8_MEMBER(portb_r); - DECLARE_WRITE8_MEMBER(portb_w); - DECLARE_READ8_MEMBER(portc_r); - DECLARE_WRITE8_MEMBER(portc_w); + uint8_t porta_r(offs_t offset); + void porta_w(offs_t offset, uint8_t data); + uint8_t portb_r(offs_t offset); + void portb_w(offs_t offset, uint8_t data); + uint8_t portc_r(offs_t offset); + void portc_w(offs_t offset, uint8_t data); /* fake memory I/O to get past memory reset check */ DECLARE_READ8_MEMBER(fakemem_r); @@ -84,20 +84,20 @@ private: DECLARE_WRITE_LINE_MEMBER(co0_w); /* ADC */ - DECLARE_READ8_MEMBER(an0_r); - DECLARE_READ8_MEMBER(an1_r); - DECLARE_READ8_MEMBER(an2_r); - DECLARE_READ8_MEMBER(an3_r); - DECLARE_READ8_MEMBER(an4_r); - DECLARE_READ8_MEMBER(an5_r); - DECLARE_READ8_MEMBER(an6_r); - DECLARE_READ8_MEMBER(an7_r); + uint8_t an0_r(); + uint8_t an1_r(); + uint8_t an2_r(); + uint8_t an3_r(); + uint8_t an4_r(); + uint8_t an5_r(); + uint8_t an6_r(); + uint8_t an7_r(); /* GATE ARRAY */ - DECLARE_WRITE16_MEMBER(printhead); - DECLARE_WRITE8_MEMBER(pf_stepper); - DECLARE_WRITE8_MEMBER(cr_stepper); + void printhead(uint16_t data); + void pf_stepper(uint8_t data); + void cr_stepper(uint8_t data); DECLARE_WRITE_LINE_MEMBER(e05a30_ready); DECLARE_WRITE_LINE_MEMBER(e05a30_centronics_ack) { output_ack(state); } diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp index cc50f7cf6ad..4e96d57699b 100644 --- a/src/devices/bus/coco/coco_ssc.cpp +++ b/src/devices/bus/coco/coco_ssc.cpp @@ -84,12 +84,12 @@ namespace virtual void device_add_mconfig(machine_config &config) override; virtual void device_reset() override; - DECLARE_READ8_MEMBER(ssc_port_a_r); - DECLARE_WRITE8_MEMBER(ssc_port_b_w); - DECLARE_READ8_MEMBER(ssc_port_c_r); - DECLARE_WRITE8_MEMBER(ssc_port_c_w); - DECLARE_READ8_MEMBER(ssc_port_d_r); - DECLARE_WRITE8_MEMBER(ssc_port_d_w); + uint8_t ssc_port_a_r(); + void ssc_port_b_w(uint8_t data); + uint8_t ssc_port_c_r(); + void ssc_port_c_w(uint8_t data); + uint8_t ssc_port_d_r(); + void ssc_port_d_w(uint8_t data); protected: // device-level overrides @@ -391,7 +391,7 @@ WRITE8_MEMBER(coco_ssc_device::ff7d_write) // Handlers for secondary CPU ports //------------------------------------------------- -READ8_MEMBER(coco_ssc_device::ssc_port_a_r) +uint8_t coco_ssc_device::ssc_port_a_r() { if (LOG_SSC) { @@ -403,7 +403,7 @@ READ8_MEMBER(coco_ssc_device::ssc_port_a_r) return m_tms7000_porta; } -WRITE8_MEMBER(coco_ssc_device::ssc_port_b_w) +void coco_ssc_device::ssc_port_b_w(uint8_t data) { if (LOG_SSC) { @@ -413,7 +413,7 @@ WRITE8_MEMBER(coco_ssc_device::ssc_port_b_w) m_tms7000_portb = data; } -READ8_MEMBER(coco_ssc_device::ssc_port_c_r) +uint8_t coco_ssc_device::ssc_port_c_r() { if (LOG_SSC) { @@ -423,7 +423,7 @@ READ8_MEMBER(coco_ssc_device::ssc_port_c_r) return m_tms7000_portc; } -WRITE8_MEMBER(coco_ssc_device::ssc_port_c_w) +void coco_ssc_device::ssc_port_c_w(uint8_t data) { if( (data & C_RCS) == 0 && (data & C_RRW) == 0) /* static RAM write */ { @@ -475,7 +475,7 @@ WRITE8_MEMBER(coco_ssc_device::ssc_port_c_w) m_tms7000_portc = data; } -READ8_MEMBER(coco_ssc_device::ssc_port_d_r) +uint8_t coco_ssc_device::ssc_port_d_r() { if( ((m_tms7000_portc & C_RCS) == 0) && ((m_tms7000_portc & C_ACS) == 0)) logerror( "[%s] Warning: Reading RAM and PSG at the same time!\n", machine().describe_context() ); @@ -505,7 +505,7 @@ READ8_MEMBER(coco_ssc_device::ssc_port_d_r) return m_tms7000_portd; } -WRITE8_MEMBER(coco_ssc_device::ssc_port_d_w) +void coco_ssc_device::ssc_port_d_w(uint8_t data) { if (LOG_SSC) { diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp index 4bb44e5949a..47a1421ed1a 100644 --- a/src/devices/bus/coco/coco_t4426.cpp +++ b/src/devices/bus/coco/coco_t4426.cpp @@ -103,7 +103,7 @@ namespace virtual ioport_constructor device_input_ports() const override; virtual uint8_t* get_cart_base() override; - DECLARE_WRITE8_MEMBER(pia_A_w); + void pia_A_w(uint8_t data); // Clocks void write_acia_clocks(int id, int state); @@ -397,7 +397,7 @@ WRITE8_MEMBER(coco_t4426_device::scs_write) #define ROM6 (~0x40 & 0xff) #define ROM7 (~0x80 & 0xff) -WRITE8_MEMBER( coco_t4426_device::pia_A_w ) +void coco_t4426_device::pia_A_w(uint8_t data) { LOGPIA("%s(%02x)\n", FUNCNAME, data); m_select = data; diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp index 090a7ef732e..4495f16a629 100644 --- a/src/devices/bus/cpc/magicsound.cpp +++ b/src/devices/bus/cpc/magicsound.cpp @@ -159,7 +159,7 @@ WRITE_LINE_MEMBER(al_magicsound_device::sam1_w) { m_current_channel = 1; if(m_da WRITE_LINE_MEMBER(al_magicsound_device::sam2_w) { m_current_channel = 2; if(m_dack[2] && state) m_dmac->dreq2_w(1); } WRITE_LINE_MEMBER(al_magicsound_device::sam3_w) { m_current_channel = 3; if(m_dack[3] && state) m_dmac->dreq3_w(1); } -READ8_MEMBER(al_magicsound_device::dma_read_byte) +uint8_t al_magicsound_device::dma_read_byte(offs_t offset) { uint8_t ret = 0xff; uint8_t page = (offset & 0xc000) >> 14; @@ -169,7 +169,7 @@ READ8_MEMBER(al_magicsound_device::dma_read_byte) return ret; } -WRITE8_MEMBER(al_magicsound_device::dma_write_byte) +void al_magicsound_device::dma_write_byte(uint8_t data) { m_output[m_current_channel] = data; } diff --git a/src/devices/bus/cpc/magicsound.h b/src/devices/bus/cpc/magicsound.h index b90bbf4e897..ae31b962c2a 100644 --- a/src/devices/bus/cpc/magicsound.h +++ b/src/devices/bus/cpc/magicsound.h @@ -57,8 +57,8 @@ protected: private: DECLARE_WRITE_LINE_MEMBER(da0_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(uint8_t data); DECLARE_WRITE_LINE_MEMBER(dack0_w); DECLARE_WRITE_LINE_MEMBER(dack1_w); DECLARE_WRITE_LINE_MEMBER(dack2_w); diff --git a/src/devices/bus/jakks_gamekey/rom.cpp b/src/devices/bus/jakks_gamekey/rom.cpp index c18d24d06ba..4d3e3d61d7f 100644 --- a/src/devices/bus/jakks_gamekey/rom.cpp +++ b/src/devices/bus/jakks_gamekey/rom.cpp @@ -84,7 +84,7 @@ uint8_t jakks_gamekey_rom_i2c_base_device::read_cart_seeprom(void) return m_i2cmem->read_sda(); } -WRITE16_MEMBER(jakks_gamekey_rom_i2c_base_device::write_cart_seeprom) +void jakks_gamekey_rom_i2c_base_device::write_cart_seeprom(offs_t offset, uint16_t data, uint16_t mem_mask) { if (BIT(mem_mask, 1)) m_i2cmem->write_scl(BIT(data, 1)); diff --git a/src/devices/bus/jakks_gamekey/rom.h b/src/devices/bus/jakks_gamekey/rom.h index 7f85e9f21fb..6e5c40e5407 100644 --- a/src/devices/bus/jakks_gamekey/rom.h +++ b/src/devices/bus/jakks_gamekey/rom.h @@ -22,7 +22,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_cart) override; virtual uint8_t read_cart_seeprom(void) override { return 1; }; - virtual DECLARE_WRITE16_MEMBER(write_cart_seeprom) override { }; + virtual void write_cart_seeprom(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override { }; virtual READ16_MEMBER(read_rom); virtual WRITE16_MEMBER(write_rom); @@ -53,7 +53,7 @@ protected: optional_device<i2cmem_device> m_i2cmem; virtual uint8_t read_cart_seeprom(void) override; - virtual DECLARE_WRITE16_MEMBER(write_cart_seeprom) override; + virtual void write_cart_seeprom(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override; }; diff --git a/src/devices/bus/jakks_gamekey/slot.cpp b/src/devices/bus/jakks_gamekey/slot.cpp index f8f385b1a58..226a4ea5540 100644 --- a/src/devices/bus/jakks_gamekey/slot.cpp +++ b/src/devices/bus/jakks_gamekey/slot.cpp @@ -231,7 +231,7 @@ uint8_t jakks_gamekey_slot_device::read_cart_seeprom(void) write seeprom -------------------------------------------------*/ -WRITE16_MEMBER(jakks_gamekey_slot_device::write_cart_seeprom) +void jakks_gamekey_slot_device::write_cart_seeprom(offs_t offset, uint16_t data, uint16_t mem_mask) { - m_cart->write_cart_seeprom(space, offset, data); + m_cart->write_cart_seeprom(offset, data); } diff --git a/src/devices/bus/jakks_gamekey/slot.h b/src/devices/bus/jakks_gamekey/slot.h index aa1f5e121e9..9862c82ab60 100644 --- a/src/devices/bus/jakks_gamekey/slot.h +++ b/src/devices/bus/jakks_gamekey/slot.h @@ -32,7 +32,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_cart) { } virtual uint8_t read_cart_seeprom(void) { return 1; } - virtual DECLARE_WRITE16_MEMBER(write_cart_seeprom) { } + virtual void write_cart_seeprom(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { } void rom_alloc(uint32_t size, const char *tag); uint8_t* get_rom_base() { return m_rom; } @@ -92,7 +92,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_cart); virtual uint8_t read_cart_seeprom(void); - virtual DECLARE_WRITE16_MEMBER(write_cart_seeprom); + virtual void write_cart_seeprom(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); bool has_cart() { return m_cart ? true : false; } diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp index 5813fed47b5..a9d928abd30 100644 --- a/src/devices/bus/lpci/southbridge.cpp +++ b/src/devices/bus/lpci/southbridge.cpp @@ -361,7 +361,7 @@ WRITE_LINE_MEMBER( southbridge_device::pc_dma_hrq_changed ) m_dma8237_2->hack_w( state ); } -READ8_MEMBER(southbridge_device::pc_dma_read_byte) +uint8_t southbridge_device::pc_dma_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space if(m_dma_channel == -1) @@ -374,7 +374,7 @@ READ8_MEMBER(southbridge_device::pc_dma_read_byte) } -WRITE8_MEMBER(southbridge_device::pc_dma_write_byte) +void southbridge_device::pc_dma_write_byte(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space if(m_dma_channel == -1) @@ -385,7 +385,7 @@ WRITE8_MEMBER(southbridge_device::pc_dma_write_byte) } -READ8_MEMBER(southbridge_device::pc_dma_read_word) +uint8_t southbridge_device::pc_dma_read_word(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space if(m_dma_channel == -1) @@ -400,7 +400,7 @@ READ8_MEMBER(southbridge_device::pc_dma_read_word) } -WRITE8_MEMBER(southbridge_device::pc_dma_write_word) +void southbridge_device::pc_dma_write_word(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space if(m_dma_channel == -1) diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h index 5f97f2716f4..c5a647acacf 100644 --- a/src/devices/bus/lpci/southbridge.h +++ b/src/devices/bus/lpci/southbridge.h @@ -128,10 +128,10 @@ private: DECLARE_READ8_MEMBER(at_dma8237_2_r); DECLARE_WRITE8_MEMBER(at_dma8237_2_w); - DECLARE_READ8_MEMBER(pc_dma_read_byte); - DECLARE_WRITE8_MEMBER(pc_dma_write_byte); - DECLARE_READ8_MEMBER(pc_dma_read_word); - DECLARE_WRITE8_MEMBER(pc_dma_write_word); + uint8_t pc_dma_read_byte(offs_t offset); + void pc_dma_write_byte(offs_t offset, uint8_t data); + uint8_t pc_dma_read_word(offs_t offset); + void pc_dma_write_word(offs_t offset, uint8_t data); DECLARE_READ8_MEMBER(eisa_irq_read); DECLARE_WRITE8_MEMBER(eisa_irq_write); }; |