diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp index c9a699cf539..dbd5eaecf58 100644 --- a/src/devices/bus/hp80_io/82937.cpp +++ b/src/devices/bus/hp80_io/82937.cpp @@ -158,7 +158,7 @@ READ8_MEMBER(hp82937_io_card_device::dio_r) if (m_dio_out) { return 0xff; } else { - return m_ieee488->read_dio(); + return m_ieee488->dio_r(); } } @@ -252,7 +252,7 @@ void hp82937_io_card_device::device_reset() void hp82937_io_card_device::update_data_out() { - m_ieee488->write_dio(m_dio_out ? m_cpu->p2_r() : 0xff); + m_ieee488->host_dio_w(m_dio_out ? m_cpu->p2_r() : 0xff); } void hp82937_io_card_device::update_signals() diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp index bec3e84d3c0..92e98efd38f 100644 --- a/src/devices/bus/hp9845_io/98034.cpp +++ b/src/devices/bus/hp9845_io/98034.cpp @@ -245,7 +245,7 @@ READ8_MEMBER(hp98034_io_card_device::hpib_ctrl_r) READ8_MEMBER(hp98034_io_card_device::hpib_data_r) { - return ~m_ieee488->read_dio(); + return ~m_ieee488->dio_r(); } READ8_MEMBER(hp98034_io_card_device::idr_r) @@ -331,7 +331,7 @@ void hp98034_io_card_device::update_data_out() if (m_clr_hpib) { m_data_out = 0; } - m_ieee488->write_dio(~m_data_out); + m_ieee488->host_dio_w(~m_data_out); } void hp98034_io_card_device::update_ctrl_out() diff --git a/src/devices/bus/hp_dio/human_interface.cpp b/src/devices/bus/hp_dio/human_interface.cpp index 0eddcde7f48..10ecb19e549 100644 --- a/src/devices/bus/hp_dio/human_interface.cpp +++ b/src/devices/bus/hp_dio/human_interface.cpp @@ -217,7 +217,7 @@ WRITE8_MEMBER(human_interface_device::gpib_w) if (m_ppoll_sc & PPOLL_IE) { LOG("%s: start parallel poll\n", __func__); - ieee488_dio_w(space, 0, m_ieee488->dio_r(space, 0)); + ieee488_dio_w(space, 0, m_ieee488->dio_r()); } break; case 4: diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp index 20abb161352..98c8c237af8 100644 --- a/src/devices/bus/ieee488/c2031.cpp +++ b/src/devices/bus/ieee488/c2031.cpp @@ -94,7 +94,7 @@ READ8_MEMBER( c2031_device::via0_pa_r ) */ - return m_bus->read_dio(); + return m_bus->dio_r(); } WRITE8_MEMBER( c2031_device::via0_pa_w ) diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp index 53a2f9f95e8..3684664325b 100644 --- a/src/devices/bus/ieee488/c2040.cpp +++ b/src/devices/bus/ieee488/c2040.cpp @@ -222,7 +222,7 @@ READ8_MEMBER( c2040_device::dio_r ) */ - return m_bus->read_dio(); + return m_bus->dio_r(); } WRITE8_MEMBER( c2040_device::dio_w ) diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp index 9594b26cf7e..81f64c271f0 100644 --- a/src/devices/bus/ieee488/c8050.cpp +++ b/src/devices/bus/ieee488/c8050.cpp @@ -274,7 +274,7 @@ READ8_MEMBER( c8050_device::dio_r ) */ - return m_bus->read_dio(); + return m_bus->dio_r(); } WRITE8_MEMBER( c8050_device::dio_w ) diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp index 63b5cbe2506..75e0d054874 100644 --- a/src/devices/bus/ieee488/c8280.cpp +++ b/src/devices/bus/ieee488/c8280.cpp @@ -127,7 +127,7 @@ READ8_MEMBER( c8280_device::dio_r ) */ - return m_bus->read_dio(); + return m_bus->dio_r(); } WRITE8_MEMBER( c8280_device::dio_w ) diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp index 58a34acae64..9bf524d9f64 100644 --- a/src/devices/bus/ieee488/d9060.cpp +++ b/src/devices/bus/ieee488/d9060.cpp @@ -153,7 +153,7 @@ READ8_MEMBER( d9060_device_base::dio_r ) */ - return m_bus->read_dio(); + return m_bus->dio_r(); } diff --git a/src/devices/bus/ieee488/grid2102.cpp b/src/devices/bus/ieee488/grid2102.cpp index a903ef1dc3e..d15e5a4bcdb 100644 --- a/src/devices/bus/ieee488/grid2102.cpp +++ b/src/devices/bus/ieee488/grid2102.cpp @@ -160,7 +160,7 @@ void grid210x_device::ieee488_dav(int state) { // read data and wait for transfer end int atn = m_bus->atn_r() ^ 1; m_bus->nrfd_w(this, 0); - uint8_t data = m_bus->read_dio() ^ 0xFF; + uint8_t data = m_bus->dio_r() ^ 0xFF; int eoi = m_bus->eoi_r() ^ 1; LOG_BYTES("grid210x_device byte recv %02x atn %d eoi %d\n", data, atn, eoi); m_last_recv_byte = data; @@ -235,7 +235,7 @@ void grid210x_device::ieee488_dav(int state) { void grid210x_device::ieee488_nrfd(int state) { if (state == 1 && m_gpib_loop_state == GRID210X_GPIB_STATE_SEND_DATA_START) { // set dio and assert dav - m_bus->write_dio(m_byte_to_send ^ 0xFF); + m_bus->host_dio_w(m_byte_to_send ^ 0xFF); m_bus->eoi_w(this, m_send_eoi ^ 1); m_bus->dav_w(this, 0); m_bus->ndac_w(this, 1); diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp index be648c1fa50..ed140734e13 100644 --- a/src/devices/bus/ieee488/hardbox.cpp +++ b/src/devices/bus/ieee488/hardbox.cpp @@ -131,7 +131,7 @@ void hardbox_device::hardbox_io(address_map &map) READ8_MEMBER( hardbox_device::ppi0_pa_r ) { - return m_bus->read_dio() ^ 0xff; + return m_bus->dio_r() ^ 0xff; } WRITE8_MEMBER( hardbox_device::ppi0_pb_w ) diff --git a/src/devices/bus/ieee488/hp9122c.cpp b/src/devices/bus/ieee488/hp9122c.cpp index 9217d9eda76..bef1fdd8ecb 100644 --- a/src/devices/bus/ieee488/hp9122c.cpp +++ b/src/devices/bus/ieee488/hp9122c.cpp @@ -257,7 +257,7 @@ void hp9122c_device::update_intsel() READ8_MEMBER(hp9122c_device::i8291a_dio_r) { - return m_bus->read_dio(); + return m_bus->dio_r(); } WRITE8_MEMBER(hp9122c_device::i8291a_dio_w) diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp index 89f64b75884..a1546668d3f 100644 --- a/src/devices/bus/ieee488/hp9895.cpp +++ b/src/devices/bus/ieee488/hp9895.cpp @@ -473,7 +473,7 @@ WRITE_LINE_MEMBER(hp9895_device::phi_ren_w) READ8_MEMBER(hp9895_device::phi_dio_r) { - return m_bus->read_dio(); + return m_bus->dio_r(); } WRITE8_MEMBER(hp9895_device::phi_dio_w) diff --git a/src/devices/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h index 67c5ca6be07..5a83d0fe927 100644 --- a/src/devices/bus/ieee488/ieee488.h +++ b/src/devices/bus/ieee488/ieee488.h @@ -61,8 +61,7 @@ public: void add_device(ieee488_slot_device *slot, device_t *target); // reads for both host and peripherals - uint8_t read_dio() { return get_data(); } - DECLARE_READ8_MEMBER( dio_r ) { return get_data(); } + uint8_t dio_r() { return get_data(); } DECLARE_READ_LINE_MEMBER( eoi_r ) { return get_signal(EOI); } DECLARE_READ_LINE_MEMBER( dav_r ) { return get_signal(DAV); } DECLARE_READ_LINE_MEMBER( nrfd_r ) { return get_signal(NRFD); } @@ -73,8 +72,7 @@ public: DECLARE_READ_LINE_MEMBER( ren_r ) { return get_signal(REN); } // writes for host (driver_device) - void write_dio(uint8_t data) { set_data(this, data); } - DECLARE_WRITE8_MEMBER( host_dio_w ) { set_data(this, data); } + void host_dio_w(uint8_t data) { set_data(this, data); } DECLARE_WRITE_LINE_MEMBER( host_eoi_w ) { set_signal(this, EOI, state); } DECLARE_WRITE_LINE_MEMBER( host_dav_w ) { set_signal(this, DAV, state); } DECLARE_WRITE_LINE_MEMBER( host_nrfd_w ) { set_signal(this, NRFD, state); } diff --git a/src/devices/bus/ieee488/remote488.cpp b/src/devices/bus/ieee488/remote488.cpp index b5eb0041632..233b5e9b758 100644 --- a/src/devices/bus/ieee488/remote488.cpp +++ b/src/devices/bus/ieee488/remote488.cpp @@ -707,7 +707,7 @@ void remote488_device::update_ah_fsm() if (m_bus->dav_r()) { m_ah_state = REM_AH_ACRS; } else if (!m_waiting_cp) { - uint8_t dio = ~m_bus->read_dio(); + uint8_t dio = ~m_bus->dio_r(); if (!m_bus->eoi_r()) { send_update(MSG_END_BYTE , dio); diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp index 8076a0d5432..ac2630c39cc 100644 --- a/src/devices/bus/ieee488/softbox.cpp +++ b/src/devices/bus/ieee488/softbox.cpp @@ -100,7 +100,7 @@ void softbox_device::softbox_io(address_map &map) READ8_MEMBER( softbox_device::ppi0_pa_r ) { - return m_bus->read_dio() ^ 0xff; + return m_bus->dio_r() ^ 0xff; } WRITE8_MEMBER( softbox_device::ppi0_pb_w ) diff --git a/src/devices/sound/l7a1045_l6028_dsp_a.h b/src/devices/sound/l7a1045_l6028_dsp_a.h index e8d5fa415e5..98a1d52a39f 100644 --- a/src/devices/sound/l7a1045_l6028_dsp_a.h +++ b/src/devices/sound/l7a1045_l6028_dsp_a.h @@ -24,8 +24,8 @@ public: DECLARE_READ8_MEMBER(dma_r_cb); DECLARE_WRITE8_MEMBER(dma_w_cb); - DECLARE_READ16_MEMBER(dma_r16_cb) { m_voice[0].pos++; return 0; } - DECLARE_WRITE16_MEMBER(dma_w16_cb) { m_voice[0].pos++; } + uint16_t dma_r16_cb() { m_voice[0].pos++; return 0; } + void dma_w16_cb(uint16_t data) { m_voice[0].pos++; } DECLARE_WRITE_LINE_MEMBER(dma_hreq_cb); protected: diff --git a/src/mame/audio/alesis.cpp b/src/mame/audio/alesis.cpp index 135a301dae7..ee62c0d6ab2 100644 --- a/src/mame/audio/alesis.cpp +++ b/src/mame/audio/alesis.cpp @@ -122,7 +122,7 @@ void alesis_dm3ag_device::device_timer(emu_timer &timer, device_timer_id id, int } } -WRITE8_MEMBER(alesis_dm3ag_device::write) +void alesis_dm3ag_device::write(uint8_t data) { if (LOG) logerror("DM3AG '%s' write: %02x\n", tag(), data); diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp index 119803cb1cd..36759cd6af8 100644 --- a/src/mame/drivers/alesis.cpp +++ b/src/mame/drivers/alesis.cpp @@ -18,12 +18,12 @@ #include "screen.h" -WRITE8_MEMBER( alesis_state::kb_matrix_w ) +void alesis_state::kb_matrix_w(uint8_t data) { m_kb_matrix = data; } -READ8_MEMBER( alesis_state::kb_r ) +uint8_t alesis_state::kb_r() { uint8_t data = 0xff; @@ -43,7 +43,7 @@ READ8_MEMBER( alesis_state::kb_r ) return data; } -WRITE8_MEMBER( alesis_state::led_w ) +void alesis_state::led_w(uint8_t data) { m_patt_led = BIT(data, 0) ? 1 : 0; m_song_led = BIT(data, 0) ? 0 : 1; @@ -56,7 +56,7 @@ WRITE8_MEMBER( alesis_state::led_w ) m_midi_led = BIT(data, 7) ? 0 : 1; } -READ8_MEMBER( alesis_state::p3_r ) +uint8_t alesis_state::p3_r() { uint8_t data = 0xff; @@ -65,17 +65,17 @@ READ8_MEMBER( alesis_state::p3_r ) return data; } -WRITE8_MEMBER( alesis_state::p3_w ) +void alesis_state::p3_w(uint8_t data) { m_cassette->output(data & 0x04 ? -1.0 : +1.0); } -WRITE8_MEMBER( alesis_state::sr16_lcd_w ) +void alesis_state::sr16_lcd_w(uint8_t data) { m_lcdc->write(BIT(m_kb_matrix,7), data); } -WRITE8_MEMBER( alesis_state::mmt8_led_w ) +void alesis_state::mmt8_led_w(uint8_t data) { m_play_led = BIT(data, 0) ? 0 : 1; m_record_led = BIT(data, 1) ? 0 : 1; @@ -88,18 +88,18 @@ WRITE8_MEMBER( alesis_state::mmt8_led_w ) m_leds = data; } -READ8_MEMBER( alesis_state::mmt8_led_r ) +uint8_t alesis_state::mmt8_led_r() { return m_leds; } -WRITE8_MEMBER( alesis_state::track_led_w ) +void alesis_state::track_led_w(uint8_t data) { for (int i=0; i < 8; i++) m_track_led[i] = BIT(data, i); } -READ8_MEMBER( alesis_state::mmt8_p3_r ) +uint8_t alesis_state::mmt8_p3_r() { // ---- -x-- Tape in // ---- x--- Start/Stop input @@ -110,7 +110,7 @@ READ8_MEMBER( alesis_state::mmt8_p3_r ) return data; } -WRITE8_MEMBER( alesis_state::mmt8_p3_w ) +void alesis_state::mmt8_p3_w(uint8_t data) { // ---x ---- Tape out // --x- ---- Click out diff --git a/src/mame/drivers/altos486.cpp b/src/mame/drivers/altos486.cpp index 0e976201b97..34bfef9944d 100644 --- a/src/mame/drivers/altos486.cpp +++ b/src/mame/drivers/altos486.cpp @@ -28,7 +28,7 @@ public: void altos486(machine_config &config); private: - DECLARE_READ8_MEMBER(read_rmx_ack); + uint8_t read_rmx_ack(offs_t offset); DECLARE_READ16_MEMBER(mmu_ram_r); DECLARE_READ16_MEMBER(mmu_io_r); @@ -49,7 +49,7 @@ private: uint8_t m_prot[256]; }; -READ8_MEMBER(altos486_state::read_rmx_ack) +uint8_t altos486_state::read_rmx_ack(offs_t offset) { if(offset == 4) return m_maincpu->int_callback(*this, 0); diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp index 59ccd2b936d..3c0d6f218c1 100644 --- a/src/mame/drivers/altos5.cpp +++ b/src/mame/drivers/altos5.cpp @@ -45,15 +45,15 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); 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); - DECLARE_READ8_MEMBER(port08_r); - DECLARE_READ8_MEMBER(port09_r); - DECLARE_WRITE8_MEMBER(port08_w); - DECLARE_WRITE8_MEMBER(port09_w); - DECLARE_WRITE8_MEMBER(port14_w); + 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); + uint8_t port08_r(); + uint8_t port09_r(); + void port08_w(uint8_t data); + void port09_w(uint8_t data); + void port14_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(busreq_w); DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); @@ -210,31 +210,31 @@ static const z80_daisy_config daisy_chain_intf[] = // turns off IPL mode, removes boot rom from memory map -WRITE8_MEMBER( altos5_state::port14_w ) +void altos5_state::port14_w(uint8_t data) { m_ipl = 0; setup_banks(2); } -READ8_MEMBER(altos5_state::memory_read_byte) +uint8_t altos5_state::memory_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); return prog_space.read_byte(offset); } -WRITE8_MEMBER(altos5_state::memory_write_byte) +void altos5_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(altos5_state::io_read_byte) +uint8_t altos5_state::io_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_IO); return prog_space.read_byte(offset); } -WRITE8_MEMBER(altos5_state::io_write_byte) +void altos5_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); @@ -255,7 +255,7 @@ d2: unused configuration input (must be H to skip HD boot) d3: selected floppy is single(L) or double sided(H) d7: IRQ from FDC */ -READ8_MEMBER( altos5_state::port08_r ) +uint8_t altos5_state::port08_r() { uint8_t data = m_port08 | 0x87; if (m_floppy) @@ -266,7 +266,7 @@ READ8_MEMBER( altos5_state::port08_r ) /* d0: HD IRQ */ -READ8_MEMBER( altos5_state::port09_r ) +uint8_t altos5_state::port09_r() { return m_port09 & 0xfe; } @@ -276,7 +276,7 @@ d4: DDEN (H = double density) d5: DS (H = drive 2) d6: SS (H = side 2) */ -WRITE8_MEMBER( altos5_state::port08_w ) +void altos5_state::port08_w(uint8_t data) { m_port08 = data & 0x70; @@ -302,7 +302,7 @@ d3, 4: CPU bank select d5: H = Write protect of common area d6, 7: DMA bank select (not emulated) */ -WRITE8_MEMBER( altos5_state::port09_w ) +void altos5_state::port09_w(uint8_t data) { m_port09 = data; setup_banks(2); diff --git a/src/mame/drivers/altos8600.cpp b/src/mame/drivers/altos8600.cpp index 4fb3c4c8bb0..35fca787dc1 100644 --- a/src/mame/drivers/altos8600.cpp +++ b/src/mame/drivers/altos8600.cpp @@ -53,7 +53,7 @@ private: DECLARE_WRITE16_MEMBER(mmuaddr_w); DECLARE_READ16_MEMBER(mmuflags_r); DECLARE_WRITE16_MEMBER(mmuflags_w); - DECLARE_READ8_MEMBER(get_slave_ack); + u8 get_slave_ack(offs_t offset); DECLARE_READ16_MEMBER(fault_r); DECLARE_READ16_MEMBER(errlo_r); DECLARE_READ16_MEMBER(errhi_r); @@ -495,7 +495,7 @@ WRITE16_MEMBER(altos8600_state::mode_w) m_user = true; } -READ8_MEMBER(altos8600_state::get_slave_ack) +u8 altos8600_state::get_slave_ack(offs_t offset) { if(offset == 2) return m_pic[1]->acknowledge(); diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp index 4ddfc719a62..d782dd9111d 100644 --- a/src/mame/drivers/apricot.cpp +++ b/src/mame/drivers/apricot.cpp @@ -76,16 +76,16 @@ private: DECLARE_FLOPPY_FORMATS(floppy_formats); DECLARE_WRITE_LINE_MEMBER(i8086_lock_w); - DECLARE_WRITE8_MEMBER(i8089_ca1_w); - DECLARE_WRITE8_MEMBER(i8089_ca2_w); - DECLARE_WRITE8_MEMBER(i8255_portb_w); - DECLARE_READ8_MEMBER(i8255_portc_r); - DECLARE_WRITE8_MEMBER(i8255_portc_w); + void i8089_ca1_w(uint8_t data); + void i8089_ca2_w(uint8_t data); + void i8255_portb_w(uint8_t data); + uint8_t i8255_portc_r(); + void i8255_portc_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); - DECLARE_READ8_MEMBER(sio_da_r); - DECLARE_READ8_MEMBER(sio_ca_r); - DECLARE_READ8_MEMBER(sio_db_r); - DECLARE_READ8_MEMBER(sio_cb_r); + uint8_t sio_da_r(); + uint8_t sio_ca_r(); + uint8_t sio_db_r(); + uint8_t sio_cb_r(); DECLARE_WRITE_LINE_MEMBER(write_centronics_fault); DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); @@ -133,14 +133,14 @@ private: // I/O //************************************************************************** -WRITE8_MEMBER( apricot_state::i8089_ca1_w ) +void apricot_state::i8089_ca1_w(uint8_t data) { m_iop->sel_w(0); m_iop->ca_w(1); m_iop->ca_w(0); } -WRITE8_MEMBER( apricot_state::i8089_ca2_w ) +void apricot_state::i8089_ca2_w(uint8_t data) { m_iop->sel_w(1); m_iop->ca_w(1); @@ -159,7 +159,7 @@ WRITE_LINE_MEMBER( apricot_state::write_centronics_perror ) m_centronics_perror = state; } -READ8_MEMBER( apricot_state::i8255_portc_r ) +uint8_t apricot_state::i8255_portc_r() { uint8_t data = 0; @@ -171,7 +171,7 @@ READ8_MEMBER( apricot_state::i8255_portc_r ) return data; } -WRITE8_MEMBER( apricot_state::i8255_portb_w ) +void apricot_state::i8255_portb_w(uint8_t data) { // bit 0, crt reset // bit 1, not connected @@ -200,14 +200,14 @@ WRITE8_MEMBER( apricot_state::i8255_portb_w ) // PB7 Centronics transceiver direction. 0 = output, 1 = input } -WRITE8_MEMBER( apricot_state::i8255_portc_w ) +void apricot_state::i8255_portc_w(uint8_t data) { // schematic page 294 says pc4 outputs to centronics pin 13, which is the "select" output from the printer. m_centronics->write_strobe(BIT(data, 5)); // schematic page 294 says pc6 outputs to centronics pin 15, which is unused } -READ8_MEMBER( apricot_state::sio_da_r ) +uint8_t apricot_state::sio_da_r() { if (m_bus_locked) return m_sio->m1_r(); @@ -215,7 +215,7 @@ READ8_MEMBER( apricot_state::sio_da_r ) return m_sio->da_r(); } -READ8_MEMBER( apricot_state::sio_ca_r ) +uint8_t apricot_state::sio_ca_r() { if (m_bus_locked) return m_sio->m1_r(); @@ -223,7 +223,7 @@ READ8_MEMBER( apricot_state::sio_ca_r ) return m_sio->ca_r(); } -READ8_MEMBER( apricot_state::sio_cb_r ) +uint8_t apricot_state::sio_cb_r() { if (m_bus_locked) return m_sio->m1_r(); @@ -231,7 +231,7 @@ READ8_MEMBER( apricot_state::sio_cb_r ) return m_sio->cb_r(); } -READ8_MEMBER( apricot_state::sio_db_r ) +uint8_t apricot_state::sio_db_r() { if (m_bus_locked) return m_sio->m1_r(); diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp index 34d0327143d..775147a910a 100644 --- a/src/mame/drivers/atom.cpp +++ b/src/mame/drivers/atom.cpp @@ -183,7 +183,7 @@ QUICKLOAD_LOAD_MEMBER(atom_state::quickload_cb) eprom_r - EPROM slot select read -------------------------------------------------*/ -READ8_MEMBER( atomeb_state::eprom_r ) +uint8_t atomeb_state::eprom_r() { return m_eprom; } @@ -192,7 +192,7 @@ READ8_MEMBER( atomeb_state::eprom_r ) eprom_w - EPROM slot select write -------------------------------------------------*/ -WRITE8_MEMBER( atomeb_state::eprom_w ) +void atomeb_state::eprom_w(uint8_t data) { /* @@ -217,7 +217,7 @@ WRITE8_MEMBER( atomeb_state::eprom_w ) ext_r - read external roms at 0xa000 -------------------------------------------------*/ -READ8_MEMBER( atomeb_state::ext_r ) +uint8_t atomeb_state::ext_r(offs_t offset) { if (m_ext[m_eprom & 0x0f]->exists()) return m_ext[m_eprom & 0x0f]->read_rom(offset); @@ -229,7 +229,7 @@ READ8_MEMBER( atomeb_state::ext_r ) dor_r - read DOS roms at 0xe000 -------------------------------------------------*/ -READ8_MEMBER( atomeb_state::dos_r ) +uint8_t atomeb_state::dos_r(offs_t offset) { if (m_e0->exists() && !BIT(m_eprom, 7)) return m_e0->read_rom(offset); @@ -452,7 +452,7 @@ INPUT_PORTS_END I8255 interface -------------------------------------------------*/ -WRITE8_MEMBER( atom_state::ppi_pa_w ) +void atom_state::ppi_pa_w(uint8_t data) { /* @@ -479,7 +479,7 @@ WRITE8_MEMBER( atom_state::ppi_pa_w ) m_vdg->gm2_w(BIT(data, 7)); } -READ8_MEMBER( atom_state::ppi_pb_r ) +uint8_t atom_state::ppi_pb_r() { /* @@ -517,7 +517,7 @@ READ8_MEMBER( atom_state::ppi_pb_r ) return data; } -READ8_MEMBER( atom_state::ppi_pc_r ) +uint8_t atom_state::ppi_pc_r() { /* @@ -551,7 +551,7 @@ READ8_MEMBER( atom_state::ppi_pc_r ) return data; } -WRITE8_MEMBER( atom_state::ppi_pc_w ) +void atom_state::ppi_pc_w(uint8_t data) { /* @@ -629,7 +629,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(atom_state::cassette_output_tick) mc6847 interface -------------------------------------------------*/ -READ8_MEMBER( atom_state::vdg_videoram_r ) +uint8_t atom_state::vdg_videoram_r(offs_t offset) { if (offset == ~0) return 0xff; diff --git a/src/mame/drivers/clayshoo.cpp b/src/mame/drivers/clayshoo.cpp index 7ee439fb337..87b59a9ad6f 100644 --- a/src/mame/drivers/clayshoo.cpp +++ b/src/mame/drivers/clayshoo.cpp @@ -35,10 +35,10 @@ public: void clayshoo(machine_config &config); protected: - DECLARE_WRITE8_MEMBER(analog_reset_w); - DECLARE_READ8_MEMBER(analog_r); - DECLARE_WRITE8_MEMBER(input_port_select_w); - DECLARE_READ8_MEMBER(input_port_r); + void analog_reset_w(uint8_t data); + uint8_t analog_r(); + void input_port_select_w(uint8_t data); + uint8_t input_port_r(); uint32_t screen_update_clayshoo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(reset_analog_bit); uint8_t difficulty_input_port_r(int bit); @@ -68,7 +68,7 @@ private: * *************************************/ -WRITE8_MEMBER(clayshoo_state::input_port_select_w) +void clayshoo_state::input_port_select_w(uint8_t data) { m_input_port_select = data; } @@ -92,7 +92,7 @@ uint8_t clayshoo_state::difficulty_input_port_r( int bit ) } -READ8_MEMBER(clayshoo_state::input_port_r) +uint8_t clayshoo_state::input_port_r() { uint8_t ret = 0; @@ -132,7 +132,7 @@ static attotime compute_duration( device_t *device, int analog_pos ) } -WRITE8_MEMBER(clayshoo_state::analog_reset_w) +void clayshoo_state::analog_reset_w(uint8_t data) { /* reset the analog value, and start the two times that will fire off in a short period proportional to the position of the @@ -145,7 +145,7 @@ WRITE8_MEMBER(clayshoo_state::analog_reset_w) } -READ8_MEMBER(clayshoo_state::analog_r) +uint8_t clayshoo_state::analog_r() { return m_analog_port_val; } diff --git a/src/mame/drivers/hh_amis2k.cpp b/src/mame/drivers/hh_amis2k.cpp index 0030abd77c2..67778048e8a 100644 --- a/src/mame/drivers/hh_amis2k.cpp +++ b/src/mame/drivers/hh_amis2k.cpp @@ -146,8 +146,8 @@ public: { } void update_display(); - DECLARE_WRITE8_MEMBER(write_d); - DECLARE_WRITE16_MEMBER(write_a); + void write_d(u8 data); + void write_a(u16 data); DECLARE_WRITE_LINE_MEMBER(write_f); void speaker_update(); @@ -190,14 +190,14 @@ void wildfire_state::update_display() m_display->matrix(~m_a, m_d); } -WRITE8_MEMBER(wildfire_state::write_d) +void wildfire_state::write_d(u8 data) { // D0-D7: led/7seg data m_d = bitswap<8>(data,7,0,1,2,3,4,5,6); update_display(); } -WRITE16_MEMBER(wildfire_state::write_a) +void wildfire_state::write_a(u16 data) { // A0-A2: digit select // A3-A11: led select diff --git a/src/mame/drivers/mpc3000.cpp b/src/mame/drivers/mpc3000.cpp index fddecf2138b..22bffe0c350 100644 --- a/src/mame/drivers/mpc3000.cpp +++ b/src/mame/drivers/mpc3000.cpp @@ -107,8 +107,8 @@ private: DECLARE_READ16_MEMBER(dsp_0008_hack_r); DECLARE_WRITE16_MEMBER(dsp_0008_hack_w); - DECLARE_READ16_MEMBER(dma_memr_cb); - DECLARE_WRITE16_MEMBER(dma_memw_cb); + uint16_t dma_memr_cb(offs_t offset); + void dma_memw_cb(offs_t offset, uint16_t data); void mpc3000_palette(palette_device &palette) const; }; @@ -161,13 +161,13 @@ void mpc3000_state::mpc3000_io_map(address_map &map) map(0x00f8, 0x00ff).rw("adcexp", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff); } -READ16_MEMBER(mpc3000_state::dma_memr_cb) +uint16_t mpc3000_state::dma_memr_cb(offs_t offset) { //logerror("dma_memr_cb: offset %x\n", offset); return m_maincpu->space(AS_PROGRAM).read_word(offset); } -WRITE16_MEMBER(mpc3000_state::dma_memw_cb) +void mpc3000_state::dma_memw_cb(offs_t offset, uint16_t data) { m_maincpu->space(AS_PROGRAM).write_word(offset, data); } diff --git a/src/mame/drivers/softbox.cpp b/src/mame/drivers/softbox.cpp index f5c18764eff..939c39d54d8 100644 --- a/src/mame/drivers/softbox.cpp +++ b/src/mame/drivers/softbox.cpp @@ -170,12 +170,12 @@ INPUT_PORTS_END READ8_MEMBER( softbox_state::ppi0_pa_r ) { - return m_ieee->read_dio() ^ 0xff; + return m_ieee->dio_r() ^ 0xff; } WRITE8_MEMBER( softbox_state::ppi0_pb_w ) { - m_ieee->write_dio(data ^ 0xff); + m_ieee->host_dio_w(data ^ 0xff); } //------------------------------------------------- diff --git a/src/mame/drivers/ssfindo.cpp b/src/mame/drivers/ssfindo.cpp index 9da40d82f0c..9ad1e3d5b5f 100644 --- a/src/mame/drivers/ssfindo.cpp +++ b/src/mame/drivers/ssfindo.cpp @@ -195,8 +195,8 @@ private: void ppcar_map(address_map &map); void ssfindo_map(address_map &map); - DECLARE_READ8_MEMBER(iolines_r); - DECLARE_WRITE8_MEMBER(iolines_w); + uint8_t iolines_r(); + void iolines_w(uint8_t data); bool m_flash_bank_select; }; @@ -227,7 +227,7 @@ private: //TODO: eeprom 24c01 & 24c02 // TODO: untangle, kill hacks -READ8_MEMBER(ssfindo_state::iolines_r) +uint8_t ssfindo_state::iolines_r() { if(m_flashType == 1) return 0; @@ -235,7 +235,7 @@ READ8_MEMBER(ssfindo_state::iolines_r) return machine().rand(); } -WRITE8_MEMBER(ssfindo_state::iolines_w) +void ssfindo_state::iolines_w(uint8_t data) { if(data&0xc0) m_adrLatch=0; diff --git a/src/mame/drivers/stellafr.cpp b/src/mame/drivers/stellafr.cpp index 8e52d6f08bb..97c6c0cb781 100644 --- a/src/mame/drivers/stellafr.cpp +++ b/src/mame/drivers/stellafr.cpp @@ -29,11 +29,11 @@ public: void stellafr(machine_config &config); private: - DECLARE_WRITE8_MEMBER(write_8000c1); - DECLARE_READ8_MEMBER(read_800101); - DECLARE_WRITE8_MEMBER(write_800101); - DECLARE_WRITE8_MEMBER(duart_output_w); - DECLARE_WRITE8_MEMBER(ay8910_portb_w); + void write_8000c1(uint8_t data); + uint8_t read_800101(); + void write_800101(uint8_t data); + void duart_output_w(uint8_t data); + void ay8910_portb_w(uint8_t data); void mem_map(address_map &map); void fc7_map(address_map &map); @@ -44,24 +44,24 @@ private: }; -WRITE8_MEMBER(stellafr_state::write_8000c1) +void stellafr_state::write_8000c1(uint8_t data) { } -READ8_MEMBER(stellafr_state::read_800101) +uint8_t stellafr_state::read_800101() { return 0xff; } -WRITE8_MEMBER(stellafr_state::write_800101) +void stellafr_state::write_800101(uint8_t data) { } -WRITE8_MEMBER(stellafr_state::duart_output_w) +void stellafr_state::duart_output_w(uint8_t data) { } -WRITE8_MEMBER(stellafr_state::ay8910_portb_w) +void stellafr_state::ay8910_portb_w(uint8_t data) { } diff --git a/src/mame/drivers/super6.cpp b/src/mame/drivers/super6.cpp index f34c23e9f42..0c10fc07470 100644 --- a/src/mame/drivers/super6.cpp +++ b/src/mame/drivers/super6.cpp @@ -100,7 +100,7 @@ void super6_state::bankswitch() // s100_w - S-100 bus extended address A16-A23 //------------------------------------------------- -WRITE8_MEMBER( super6_state::s100_w ) +void super6_state::s100_w(uint8_t data) { /* @@ -125,7 +125,7 @@ WRITE8_MEMBER( super6_state::s100_w ) // bank0_w - on-board memory control port #0 //------------------------------------------------- -WRITE8_MEMBER( super6_state::bank0_w ) +void super6_state::bank0_w(uint8_t data) { /* @@ -152,7 +152,7 @@ WRITE8_MEMBER( super6_state::bank0_w ) // bank1_w - on-board memory control port #1 //------------------------------------------------- -WRITE8_MEMBER( super6_state::bank1_w ) +void super6_state::bank1_w(uint8_t data) { /* @@ -184,7 +184,7 @@ WRITE8_MEMBER( super6_state::bank1_w ) // floppy_r - FDC synchronization/drive/density //------------------------------------------------- -READ8_MEMBER( super6_state::fdc_r ) +uint8_t super6_state::fdc_r() { /* @@ -211,7 +211,7 @@ READ8_MEMBER( super6_state::fdc_r ) // floppy_w - FDC synchronization/drive/density //------------------------------------------------- -WRITE8_MEMBER( super6_state::fdc_w ) +void super6_state::fdc_w(uint8_t data) { /* @@ -345,25 +345,25 @@ INPUT_PORTS_END // Z80DMA //------------------------------------------------- -READ8_MEMBER(super6_state::memory_read_byte) +uint8_t super6_state::memory_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); return prog_space.read_byte(offset); } -WRITE8_MEMBER(super6_state::memory_write_byte) +void super6_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(super6_state::io_read_byte) +uint8_t super6_state::io_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_IO); return prog_space.read_byte(offset); } -WRITE8_MEMBER(super6_state::io_write_byte) +void super6_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/tek405x.cpp b/src/mame/drivers/tek405x.cpp index 46b12281e6c..3032ca8983c 100644 --- a/src/mame/drivers/tek405x.cpp +++ b/src/mame/drivers/tek405x.cpp @@ -697,7 +697,7 @@ WRITE8_MEMBER( tek4051_state::dio_w ) if (m_talk) { - m_gpib->write_dio(data); + m_gpib->host_dio_w(data); } } @@ -780,7 +780,7 @@ WRITE_LINE_MEMBER( tek4051_state::talk_w ) if (!m_talk) { - m_gpib->write_dio(0xff); + m_gpib->host_dio_w(0xff); m_gpib->host_nrfd_w(1); m_gpib->host_ndac_w(1); } diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp index f5fac9fa3e3..fae63959c6e 100644 --- a/src/mame/drivers/victor9k.cpp +++ b/src/mame/drivers/victor9k.cpp @@ -122,18 +122,18 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE8_MEMBER( via1_pa_w ); + void via1_pa_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( write_nfrd ); DECLARE_WRITE_LINE_MEMBER( write_ndac ); - DECLARE_WRITE8_MEMBER( via1_pb_w ); + void via1_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( via1_irq_w ); DECLARE_WRITE_LINE_MEMBER( codec_vol_w ); - DECLARE_WRITE8_MEMBER( via2_pa_w ); - DECLARE_WRITE8_MEMBER( via2_pb_w ); + void via2_pa_w(uint8_t data); + void via2_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( via2_irq_w ); - DECLARE_WRITE8_MEMBER( via3_pb_w ); + void via3_pb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( via3_irq_w ); DECLARE_WRITE_LINE_MEMBER( fdc_irq_w ); @@ -367,7 +367,7 @@ WRITE_LINE_MEMBER( victor9k_state::ssda_sm_dtr_w ) } -WRITE8_MEMBER( victor9k_state::via1_pa_w ) +void victor9k_state::via1_pa_w(uint8_t data) { /* @@ -395,7 +395,7 @@ WRITE8_MEMBER( victor9k_state::via1_pa_w ) m_centronics->write_data7(BIT(data, 7)); // IEEE-488 - m_ieee488->write_dio(data); + m_ieee488->host_dio_w(data); } DECLARE_WRITE_LINE_MEMBER( victor9k_state::write_nfrd ) @@ -410,7 +410,7 @@ DECLARE_WRITE_LINE_MEMBER( victor9k_state::write_ndac ) m_via1->write_ca2(state); } -WRITE8_MEMBER( victor9k_state::via1_pb_w ) +void victor9k_state::via1_pb_w(uint8_t data) { /* @@ -452,7 +452,7 @@ WRITE_LINE_MEMBER( victor9k_state::via1_irq_w ) m_pic->ir3_w(m_ssda_irq || m_via1_irq || m_via3_irq || m_fdc_irq); } -WRITE8_MEMBER( victor9k_state::via2_pa_w ) +void victor9k_state::via2_pa_w(uint8_t data) { /* @@ -477,7 +477,7 @@ void victor9k_state::update_kback() m_kb->kback_w(kback); } -WRITE8_MEMBER( victor9k_state::via2_pb_w ) +void victor9k_state::via2_pb_w(uint8_t data) { /* @@ -541,7 +541,7 @@ WRITE_LINE_MEMBER( victor9k_state::via2_irq_w ) CB2 J5-50 */ -WRITE8_MEMBER( victor9k_state::via3_pb_w ) +void victor9k_state::via3_pb_w(uint8_t data) { // codec clock output m_ssda->rx_clk_w(!BIT(data, 7)); diff --git a/src/mame/drivers/z88.cpp b/src/mame/drivers/z88.cpp index 286d302cb1d..8ea8d8ab527 100644 --- a/src/mame/drivers/z88.cpp +++ b/src/mame/drivers/z88.cpp @@ -571,7 +571,7 @@ void z88_state::machine_reset() m_bank_type[0] = m_bank_type[1] = m_bank_type[2] = m_bank_type[3] = 0; } -READ8_MEMBER(z88_state::kb_r) +uint8_t z88_state::kb_r(offs_t offset) { uint8_t data = 0xff; diff --git a/src/mame/includes/alesis.h b/src/mame/includes/alesis.h index 088754efdad..b15a3c32ae8 100644 --- a/src/mame/includes/alesis.h +++ b/src/mame/includes/alesis.h @@ -28,7 +28,7 @@ public: alesis_dm3ag_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // device interface - DECLARE_WRITE8_MEMBER(write); + void write(uint8_t data); protected: // device-level overrides @@ -140,17 +140,17 @@ protected: virtual void machine_reset() override; void update_lcd_symbols(bitmap_ind16 &bitmap, uint8_t pos, uint8_t y, uint8_t x, int state); - DECLARE_WRITE8_MEMBER( led_w ); - DECLARE_WRITE8_MEMBER( mmt8_led_w ); - DECLARE_READ8_MEMBER( mmt8_led_r ); - DECLARE_WRITE8_MEMBER( track_led_w ); - DECLARE_WRITE8_MEMBER( kb_matrix_w ); - DECLARE_READ8_MEMBER( kb_r ); - DECLARE_READ8_MEMBER( p3_r ); - DECLARE_WRITE8_MEMBER( p3_w ); - DECLARE_READ8_MEMBER( mmt8_p3_r ); - DECLARE_WRITE8_MEMBER( mmt8_p3_w ); - DECLARE_WRITE8_MEMBER( sr16_lcd_w ); + void led_w(uint8_t data); + void mmt8_led_w(uint8_t data); + uint8_t mmt8_led_r(); + void track_led_w(uint8_t data); + void kb_matrix_w(uint8_t data); + uint8_t kb_r(); + uint8_t p3_r(); + void p3_w(uint8_t data); + uint8_t mmt8_p3_r(); + void mmt8_p3_w(uint8_t data); + void sr16_lcd_w(uint8_t data); HD44780_PIXEL_UPDATE(sr16_pixel_update); void hr16_io(address_map &map); diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 13d0eb4d51f..488ff56c410 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -366,12 +366,12 @@ public: m_chip_ram.write(byteoffs >> 1, data); } - DECLARE_READ16_MEMBER(chip_ram_r) + uint16_t chip_ram_r(offs_t offset, uint16_t mem_mask = ~0) { return read_chip_ram(offset & ~1) & mem_mask; } - DECLARE_WRITE16_MEMBER(chip_ram_w) + void chip_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { uint16_t val = read_chip_ram(offset & ~1) & ~mem_mask; write_chip_ram(offset & ~1, val | data); diff --git a/src/mame/includes/atom.h b/src/mame/includes/atom.h index f32cbb04441..846bc6cfbb3 100644 --- a/src/mame/includes/atom.h +++ b/src/mame/includes/atom.h @@ -90,11 +90,11 @@ public: virtual void machine_start() override; - DECLARE_WRITE8_MEMBER( ppi_pa_w ); - DECLARE_READ8_MEMBER( ppi_pb_r ); - DECLARE_READ8_MEMBER( ppi_pc_r ); - DECLARE_WRITE8_MEMBER( ppi_pc_w ); - DECLARE_READ8_MEMBER( vdg_videoram_r ); + void ppi_pa_w(uint8_t data); + uint8_t ppi_pb_r(); + uint8_t ppi_pc_r(); + void ppi_pc_w(uint8_t data); + uint8_t vdg_videoram_r(offs_t offset); DECLARE_INPUT_CHANGED_MEMBER( trigger_reset ); DECLARE_WRITE_LINE_MEMBER( atom_8271_interrupt_callback ); DECLARE_WRITE_LINE_MEMBER( motor_w ); @@ -138,10 +138,10 @@ public: virtual void machine_start() override; - DECLARE_READ8_MEMBER(eprom_r); - DECLARE_WRITE8_MEMBER(eprom_w); - DECLARE_READ8_MEMBER(ext_r); - DECLARE_READ8_MEMBER(dos_r); + uint8_t eprom_r(); + void eprom_w(uint8_t data); + uint8_t ext_r(offs_t offset); + uint8_t dos_r(offs_t offset); /* eprom state */ int m_eprom; diff --git a/src/mame/includes/bbc.h b/src/mame/includes/bbc.h index ee94d248bf1..c74cf7a4b5f 100644 --- a/src/mame/includes/bbc.h +++ b/src/mame/includes/bbc.h @@ -115,40 +115,40 @@ public: DECLARE_FLOPPY_FORMATS(floppy_formats); - DECLARE_READ8_MEMBER(bbc_ram_r); - DECLARE_WRITE8_MEMBER(bbc_ram_w); - DECLARE_READ8_MEMBER(bbc_romsel_r); - DECLARE_WRITE8_MEMBER(bbc_romsel_w); - DECLARE_READ8_MEMBER(bbc_paged_r); - DECLARE_WRITE8_MEMBER(bbc_paged_w); - DECLARE_READ8_MEMBER(bbc_mos_r); - DECLARE_WRITE8_MEMBER(bbc_mos_w); - DECLARE_READ8_MEMBER(bbc_fred_r); - DECLARE_WRITE8_MEMBER(bbc_fred_w); - DECLARE_READ8_MEMBER(bbc_jim_r); - DECLARE_WRITE8_MEMBER(bbc_jim_w); - DECLARE_READ8_MEMBER(bbcbp_fetch_r); - DECLARE_WRITE8_MEMBER(bbcbp_romsel_w); - DECLARE_READ8_MEMBER(bbcbp_paged_r); - DECLARE_WRITE8_MEMBER(bbcbp_paged_w); - DECLARE_READ8_MEMBER(bbcm_fetch_r); - DECLARE_READ8_MEMBER(bbcm_acccon_r); - DECLARE_WRITE8_MEMBER(bbcm_acccon_w); - DECLARE_WRITE8_MEMBER(bbcm_romsel_w); - DECLARE_READ8_MEMBER(bbcm_paged_r); - DECLARE_WRITE8_MEMBER(bbcm_paged_w); - DECLARE_READ8_MEMBER(bbcm_hazel_r); - DECLARE_WRITE8_MEMBER(bbcm_hazel_w); - DECLARE_READ8_MEMBER(bbcm_tube_r); - DECLARE_WRITE8_MEMBER(bbcm_tube_w); - DECLARE_READ8_MEMBER(bbcmc_paged_r); - DECLARE_WRITE8_MEMBER(bbcmc_paged_w); - DECLARE_WRITE8_MEMBER(bbcbp_drive_control_w); - DECLARE_WRITE8_MEMBER(bbcm_drive_control_w); - DECLARE_WRITE8_MEMBER(bbcmc_drive_control_w); - DECLARE_WRITE8_MEMBER(serial_ula_w); - DECLARE_WRITE8_MEMBER(video_ula_w); - DECLARE_READ8_MEMBER(bbc_fe_r) { return 0xfe; }; + uint8_t bbc_ram_r(offs_t offset); + void bbc_ram_w(offs_t offset, uint8_t data); + uint8_t bbc_romsel_r(offs_t offset); + void bbc_romsel_w(offs_t offset, uint8_t data); + uint8_t bbc_paged_r(offs_t offset); + void bbc_paged_w(offs_t offset, uint8_t data); + uint8_t bbc_mos_r(offs_t offset); + void bbc_mos_w(offs_t offset, uint8_t data); + uint8_t bbc_fred_r(offs_t offset); + void bbc_fred_w(offs_t offset, uint8_t data); + uint8_t bbc_jim_r(offs_t offset); + void bbc_jim_w(offs_t offset, uint8_t data); + uint8_t bbcbp_fetch_r(offs_t offset); + void bbcbp_romsel_w(offs_t offset, uint8_t data); + uint8_t bbcbp_paged_r(offs_t offset); + void bbcbp_paged_w(offs_t offset, uint8_t data); + uint8_t bbcm_fetch_r(offs_t offset); + uint8_t bbcm_acccon_r(); + void bbcm_acccon_w(uint8_t data); + void bbcm_romsel_w(offs_t offset, uint8_t data); + uint8_t bbcm_paged_r(offs_t offset); + void bbcm_paged_w(offs_t offset, uint8_t data); + uint8_t bbcm_hazel_r(offs_t offset); + void bbcm_hazel_w(offs_t offset, uint8_t data); + uint8_t bbcm_tube_r(offs_t offset); + void bbcm_tube_w(offs_t offset, uint8_t data); + uint8_t bbcmc_paged_r(offs_t offset); + void bbcmc_paged_w(offs_t offset, uint8_t data); + void bbcbp_drive_control_w(uint8_t data); + void bbcm_drive_control_w(uint8_t data); + void bbcmc_drive_control_w(uint8_t data); + void serial_ula_w(uint8_t data); + void video_ula_w(offs_t offset, uint8_t data); + uint8_t bbc_fe_r() { return 0xfe; }; DECLARE_VIDEO_START(bbc); @@ -165,10 +165,10 @@ public: DECLARE_WRITE_LINE_MEMBER(kbd_enable_w); DECLARE_WRITE_LINE_MEMBER(capslock_led_w); DECLARE_WRITE_LINE_MEMBER(shiftlock_led_w); - DECLARE_READ8_MEMBER(via_system_porta_r); - DECLARE_WRITE8_MEMBER(via_system_porta_w); - DECLARE_READ8_MEMBER(via_system_portb_r); - DECLARE_WRITE8_MEMBER(via_system_portb_w); + uint8_t via_system_porta_r(); + void via_system_porta_w(uint8_t data); + uint8_t via_system_portb_r(); + void via_system_portb_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(lpstb_w); DECLARE_WRITE_LINE_MEMBER(bbc_hsync_changed); DECLARE_WRITE_LINE_MEMBER(bbc_vsync_changed); diff --git a/src/mame/includes/super6.h b/src/mame/includes/super6.h index 2aa8bd2621f..fb2189b93dd 100644 --- a/src/mame/includes/super6.h +++ b/src/mame/includes/super6.h @@ -52,17 +52,17 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER( fdc_r ); - DECLARE_WRITE8_MEMBER( fdc_w ); - DECLARE_WRITE8_MEMBER( s100_w ); - DECLARE_WRITE8_MEMBER( bank0_w ); - DECLARE_WRITE8_MEMBER( bank1_w ); + uint8_t fdc_r(); + void fdc_w(uint8_t data); + void s100_w(uint8_t data); + void bank0_w(uint8_t data); + void bank1_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); DECLARE_WRITE_LINE_MEMBER( fdc_drq_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); void super6_io(address_map &map); void super6_mem(address_map &map); diff --git a/src/mame/includes/z88.h b/src/mame/includes/z88.h index 90fb78de122..ade59a27a67 100644 --- a/src/mame/includes/z88.h +++ b/src/mame/includes/z88.h @@ -67,7 +67,7 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER(kb_r); + uint8_t kb_r(offs_t offset); UPD65031_MEMORY_UPDATE(bankswitch_update); UPD65031_SCREEN_UPDATE(lcd_update); diff --git a/src/mame/machine/bbc.cpp b/src/mame/machine/bbc.cpp index d022ae919e1..9c5ed4228b4 100644 --- a/src/mame/machine/bbc.cpp +++ b/src/mame/machine/bbc.cpp @@ -31,7 +31,7 @@ TIMER_CALLBACK_MEMBER(bbc_state::reset_timer_cb) BBC Model B memory handling functions ****************************************/ -READ8_MEMBER(bbc_state::bbc_ram_r) +uint8_t bbc_state::bbc_ram_r(offs_t offset) { if (m_internal && m_internal->overrides_ram()) return m_internal->ram_r(offset); @@ -39,7 +39,7 @@ READ8_MEMBER(bbc_state::bbc_ram_r) return m_ram->pointer()[offset & m_ram->mask()]; } -WRITE8_MEMBER(bbc_state::bbc_ram_w) +void bbc_state::bbc_ram_w(offs_t offset, uint8_t data) { if (m_internal && m_internal->overrides_ram()) m_internal->ram_w(offset, data); @@ -47,7 +47,7 @@ WRITE8_MEMBER(bbc_state::bbc_ram_w) m_ram->pointer()[offset & m_ram->mask()] = data; } -READ8_MEMBER(bbc_state::bbc_romsel_r) +uint8_t bbc_state::bbc_romsel_r(offs_t offset) { if (m_internal && m_internal->overrides_rom()) return m_internal->romsel_r(offset); @@ -55,7 +55,7 @@ READ8_MEMBER(bbc_state::bbc_romsel_r) return 0xfe; } -WRITE8_MEMBER(bbc_state::bbc_romsel_w) +void bbc_state::bbc_romsel_w(offs_t offset, uint8_t data) { /* no sideways expansion board fitted so address only the 4 on board ROM sockets */ m_romsel = data & 0x03; @@ -65,7 +65,7 @@ WRITE8_MEMBER(bbc_state::bbc_romsel_w) m_internal->romsel_w(offset, data); } -READ8_MEMBER(bbc_state::bbc_paged_r) +uint8_t bbc_state::bbc_paged_r(offs_t offset) { uint8_t data; @@ -88,7 +88,7 @@ READ8_MEMBER(bbc_state::bbc_paged_r) return data; } -WRITE8_MEMBER(bbc_state::bbc_paged_w) +void bbc_state::bbc_paged_w(offs_t offset, uint8_t data) { if (m_internal && m_internal->overrides_rom()) { @@ -103,7 +103,7 @@ WRITE8_MEMBER(bbc_state::bbc_paged_w) } } -READ8_MEMBER(bbc_state::bbc_mos_r) +uint8_t bbc_state::bbc_mos_r(offs_t offset) { if (m_internal && m_internal->overrides_mos()) return m_internal->mos_r(offset); @@ -111,13 +111,13 @@ READ8_MEMBER(bbc_state::bbc_mos_r) return m_region_mos->base()[offset]; } -WRITE8_MEMBER(bbc_state::bbc_mos_w) +void bbc_state::bbc_mos_w(offs_t offset, uint8_t data) { if (m_internal && m_internal->overrides_mos()) m_internal->mos_w(offset, data); } -READ8_MEMBER(bbc_state::bbc_fred_r) +uint8_t bbc_state::bbc_fred_r(offs_t offset) { uint8_t data = 0xff; @@ -131,7 +131,7 @@ READ8_MEMBER(bbc_state::bbc_fred_r) return data; } -WRITE8_MEMBER(bbc_state::bbc_fred_w) +void bbc_state::bbc_fred_w(offs_t offset, uint8_t data) { m_1mhzbus->fred_w(offset, data); @@ -141,7 +141,7 @@ WRITE8_MEMBER(bbc_state::bbc_fred_w) m_cart[1]->write(offset, data, 1, 0, m_romsel & 0x01, 0, 0); } -READ8_MEMBER(bbc_state::bbc_jim_r) +uint8_t bbc_state::bbc_jim_r(offs_t offset) { uint8_t data = 0xff; @@ -155,7 +155,7 @@ READ8_MEMBER(bbc_state::bbc_jim_r) return data; } -WRITE8_MEMBER(bbc_state::bbc_jim_w) +void bbc_state::bbc_jim_w(offs_t offset, uint8_t data) { m_1mhzbus->jim_w(offset, data); @@ -170,7 +170,7 @@ WRITE8_MEMBER(bbc_state::bbc_jim_w) BBC Model B+ memory handling functions ****************************************/ -READ8_MEMBER(bbc_state::bbcbp_fetch_r) +uint8_t bbc_state::bbcbp_fetch_r(offs_t offset) { switch (offset & 0xf000) { @@ -206,7 +206,7 @@ READ8_MEMBER(bbc_state::bbcbp_fetch_r) return m_maincpu->space(AS_PROGRAM).read_byte(offset); } -WRITE8_MEMBER(bbc_state::bbcbp_romsel_w) +void bbc_state::bbcbp_romsel_w(offs_t offset, uint8_t data) { /* the BBC Model B+ addresses all 16 ROM sockets and extra 12K of RAM at 0x8000 and 20K of shadow RAM at 0x3000 */ switch (offset & 0x07) @@ -229,7 +229,7 @@ WRITE8_MEMBER(bbc_state::bbcbp_romsel_w) m_internal->romsel_w(offset, data); } -READ8_MEMBER(bbc_state::bbcbp_paged_r) +uint8_t bbc_state::bbcbp_paged_r(offs_t offset) { uint8_t data; std::string region_tag; @@ -261,7 +261,7 @@ READ8_MEMBER(bbc_state::bbcbp_paged_r) return data; } -WRITE8_MEMBER(bbc_state::bbcbp_paged_w) +void bbc_state::bbcbp_paged_w(offs_t offset, uint8_t data) { if (m_paged_ram && offset < 0x3000) { @@ -319,7 +319,7 @@ WRITE8_MEMBER(bbc_state::bbcbp_paged_w) ANDY is the name of the 4K of RAM used by the MOS at &8000-&8FFF */ -READ8_MEMBER(bbc_state::bbcm_fetch_r) +uint8_t bbc_state::bbcm_fetch_r(offs_t offset) { if (m_acccon_x || (m_acccon_e && offset >= 0xc000 && offset <= 0xdfff)) { @@ -332,12 +332,12 @@ READ8_MEMBER(bbc_state::bbcm_fetch_r) return m_maincpu->space(AS_PROGRAM).read_byte(offset); } -READ8_MEMBER(bbc_state::bbcm_acccon_r) +uint8_t bbc_state::bbcm_acccon_r() { return m_acccon; } -WRITE8_MEMBER(bbc_state::bbcm_acccon_w) +void bbc_state::bbcm_acccon_w(uint8_t data) { m_acccon = data; @@ -372,7 +372,7 @@ WRITE8_MEMBER(bbc_state::bbcm_acccon_w) m_bankdev->set_bank(m_acccon_tst); } -WRITE8_MEMBER(bbc_state::bbcm_romsel_w) +void bbc_state::bbcm_romsel_w(offs_t offset, uint8_t data) { m_paged_ram = BIT(data, 7); m_romsel = data & 0x0f; @@ -382,7 +382,7 @@ WRITE8_MEMBER(bbc_state::bbcm_romsel_w) m_internal->romsel_w(offset, data); } -READ8_MEMBER(bbc_state::bbcm_paged_r) +uint8_t bbc_state::bbcm_paged_r(offs_t offset) { uint8_t data = 0xff; @@ -454,7 +454,7 @@ READ8_MEMBER(bbc_state::bbcm_paged_r) return data; } -WRITE8_MEMBER(bbc_state::bbcm_paged_w) +void bbc_state::bbcm_paged_w(offs_t offset, uint8_t data) { if (m_paged_ram && offset < 0x1000) { @@ -506,7 +506,7 @@ WRITE8_MEMBER(bbc_state::bbcm_paged_w) } } -READ8_MEMBER(bbc_state::bbcmc_paged_r) +uint8_t bbc_state::bbcmc_paged_r(offs_t offset) { uint8_t data = 0xff; @@ -553,7 +553,7 @@ READ8_MEMBER(bbc_state::bbcmc_paged_r) return data; } -WRITE8_MEMBER(bbc_state::bbcmc_paged_w) +void bbc_state::bbcmc_paged_w(offs_t offset, uint8_t data) { if (m_paged_ram && offset < 0x1000) { @@ -588,7 +588,7 @@ WRITE8_MEMBER(bbc_state::bbcmc_paged_w) } } -READ8_MEMBER(bbc_state::bbcm_hazel_r) +uint8_t bbc_state::bbcm_hazel_r(offs_t offset) { uint8_t data; @@ -607,7 +607,7 @@ READ8_MEMBER(bbc_state::bbcm_hazel_r) return data; } -WRITE8_MEMBER(bbc_state::bbcm_hazel_w) +void bbc_state::bbcm_hazel_w(offs_t offset, uint8_t data) { if (m_acccon_y) { @@ -615,7 +615,7 @@ WRITE8_MEMBER(bbc_state::bbcm_hazel_w) } } -READ8_MEMBER(bbc_state::bbcm_tube_r) +uint8_t bbc_state::bbcm_tube_r(offs_t offset) { uint8_t data = 0xfe; @@ -633,7 +633,7 @@ READ8_MEMBER(bbc_state::bbcm_tube_r) return data; } -WRITE8_MEMBER(bbc_state::bbcm_tube_w) +void bbc_state::bbcm_tube_w(offs_t offset, uint8_t data) { if (m_acccon_itu) { @@ -888,12 +888,12 @@ void bbc_state::mc146818_set() } -READ8_MEMBER(bbc_state::via_system_porta_r) +uint8_t bbc_state::via_system_porta_r() { return m_via_system_porta; } -WRITE8_MEMBER(bbc_state::via_system_porta_w) +void bbc_state::via_system_porta_w(uint8_t data) { m_via_system_porta = data; @@ -915,7 +915,7 @@ WRITE8_MEMBER(bbc_state::via_system_porta_w) } -READ8_MEMBER(bbc_state::via_system_portb_r) +uint8_t bbc_state::via_system_portb_r() { uint8_t data = 0xff; @@ -945,7 +945,7 @@ READ8_MEMBER(bbc_state::via_system_portb_r) return data; } -WRITE8_MEMBER(bbc_state::via_system_portb_w) +void bbc_state::via_system_portb_w(uint8_t data) { m_latch->write_nibble_d3(data); @@ -1233,7 +1233,7 @@ void bbc_state::cassette_motor(bool motor_state) 110 - 16MHz / 13 / 256 - 75 baud */ -WRITE8_MEMBER(bbc_state::serial_ula_w) +void bbc_state::serial_ula_w(uint8_t data) { static const int serial_clocks[8] = { @@ -1347,7 +1347,7 @@ WRITE_LINE_MEMBER(bbc_state::fdc_drq_w) 0 Drive select 0. */ -WRITE8_MEMBER(bbc_state::bbcbp_drive_control_w) +void bbc_state::bbcbp_drive_control_w(uint8_t data) { floppy_image_device *floppy = nullptr; @@ -1383,7 +1383,7 @@ WRITE8_MEMBER(bbc_state::bbcbp_drive_control_w) 0 Drive select 0. */ -WRITE8_MEMBER(bbc_state::bbcm_drive_control_w) +void bbc_state::bbcm_drive_control_w(uint8_t data) { floppy_image_device *floppy = nullptr; @@ -1403,7 +1403,7 @@ WRITE8_MEMBER(bbc_state::bbcm_drive_control_w) m_wd1770->mr_w(BIT(data, 2)); } -WRITE8_MEMBER(bbc_state::bbcmc_drive_control_w) +void bbc_state::bbcmc_drive_control_w(uint8_t data) { floppy_image_device *floppy = nullptr; @@ -1680,7 +1680,7 @@ void bbc_state::machine_reset() if (m_bbcconfig.read_safe(0) & 0x04) m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfea0, 0xfebf, read8sm_delegate(*m_adlc, FUNC(mc6854_device::read)), write8sm_delegate(*m_adlc, FUNC(mc6854_device::write))); else - m_maincpu->space(AS_PROGRAM).install_read_handler(0xfea0, 0xfebf, read8_delegate(*this, FUNC(bbc_state::bbc_fe_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xfea0, 0xfebf, read8smo_delegate(*this, FUNC(bbc_state::bbc_fe_r))); /* power-on reset timer, should produce "boo...beep" startup sound before sn76496 is initialised */ //m_maincpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); diff --git a/src/mame/video/bbc.cpp b/src/mame/video/bbc.cpp index 24d8d0f5a4b..6970117aa5d 100644 --- a/src/mame/video/bbc.cpp +++ b/src/mame/video/bbc.cpp @@ -141,7 +141,7 @@ void bbc_state::set_pixel_lookup() } -WRITE8_MEMBER(bbc_state::video_ula_w) +void bbc_state::video_ula_w(offs_t offset, uint8_t data) { // Make sure vpos is never <0 int vpos = m_screen->vpos();