diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2020-06-16 18:11:46 +0200 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2020-06-16 18:11:46 +0200 |
commit | da639365600fab4edad4b4ede11333cfd5da218a (patch) | |
tree | 1287207f24714054cecaf17094aa1de3cde615e6 /src/mame/audio | |
parent | b681607a543255a237036cadb0931a41444ede3d (diff) |
drivers starting with t, u, v, w and most of drivers starting with x: removed read* and write* macros (nw)
Diffstat (limited to 'src/mame/audio')
-rw-r--r-- | src/mame/audio/tranqgun.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/turrett.cpp | 4 | ||||
-rw-r--r-- | src/mame/audio/tx1.cpp | 22 | ||||
-rw-r--r-- | src/mame/audio/tx1.h | 22 | ||||
-rw-r--r-- | src/mame/audio/vicdual.cpp | 10 |
5 files changed, 30 insertions, 30 deletions
diff --git a/src/mame/audio/tranqgun.cpp b/src/mame/audio/tranqgun.cpp index c63845f5097..afa28fe3591 100644 --- a/src/mame/audio/tranqgun.cpp +++ b/src/mame/audio/tranqgun.cpp @@ -52,7 +52,7 @@ enum }; -WRITE8_MEMBER( vicdual_state::tranqgun_audio_w ) +void vicdual_state::tranqgun_audio_w(uint8_t data) { int bitsChanged; int bitsGoneHigh; diff --git a/src/mame/audio/turrett.cpp b/src/mame/audio/turrett.cpp index 34b0866399e..397c27c55e1 100644 --- a/src/mame/audio/turrett.cpp +++ b/src/mame/audio/turrett.cpp @@ -128,7 +128,7 @@ void turrett_device::sound_stream_update(sound_stream &stream, stream_sample_t * // read - host CPU read access //------------------------------------------------- -READ32_MEMBER( turrett_device::read ) +uint32_t turrett_device::read(offs_t offset) { m_stream->update(); @@ -142,7 +142,7 @@ READ32_MEMBER( turrett_device::read ) // write - host CPU write access //------------------------------------------------- -WRITE32_MEMBER( turrett_device::write ) +void turrett_device::write(offs_t offset, uint32_t data) { m_stream->update(); diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp index 2cdd596a8cf..e415fb54669 100644 --- a/src/mame/audio/tx1.cpp +++ b/src/mame/audio/tx1.cpp @@ -131,23 +131,23 @@ void tx1_sound_device::device_reset() } /* Main CPU and Z80 synchronisation */ -WRITE16_MEMBER( tx1_sound_device::z80_busreq_w ) +void tx1_sound_device::z80_busreq_w(uint16_t data) { m_audiocpu->set_input_line(INPUT_LINE_HALT, (data & 1) ? CLEAR_LINE : ASSERT_LINE); } /* Z80 can trigger its own interrupts */ -WRITE8_MEMBER( tx1_sound_device::z80_intreq_w ) +void tx1_sound_device::z80_intreq_w(uint8_t data) { m_audiocpu->set_input_line(0, HOLD_LINE); } -READ16_MEMBER( tx1_sound_device::z80_shared_r ) +uint16_t tx1_sound_device::z80_shared_r(offs_t offset) { return m_audiocpu->space(AS_PROGRAM).read_byte(offset); } -WRITE16_MEMBER( tx1_sound_device::z80_shared_w ) +void tx1_sound_device::z80_shared_w(offs_t offset, uint16_t data) { m_audiocpu->space(AS_PROGRAM).write_byte(offset, data & 0xff); } @@ -156,13 +156,13 @@ WRITE16_MEMBER( tx1_sound_device::z80_shared_w ) (TODO) TS: Connected in place of dipswitch A bit 0 Accessed on startup as some sort of acknowledgement */ -WRITE8_MEMBER( tx1_sound_device::ts_w ) +void tx1_sound_device::ts_w(offs_t offset, uint8_t data) { // TS = 1; m_z80_ram[offset] = data; } -READ8_MEMBER( tx1_sound_device::ts_r ) +uint8_t tx1_sound_device::ts_r(offs_t offset) { // TS = 1; return m_z80_ram[offset]; @@ -177,13 +177,13 @@ static uint8_t bit_reverse8(uint8_t val) return val; } -READ16_MEMBER( tx1_sound_device::dipswitches_r ) +uint16_t tx1_sound_device::dipswitches_r() { return (m_dsw->read() & 0xfffe) | m_ts; } // Tazmi TZ2103 custom 4-channel A/D converter @ 7.5 MHz -READ8_MEMBER( buggyboy_sound_device::bb_analog_r ) +uint8_t buggyboy_sound_device::bb_analog_r(offs_t offset) { if (offset == 0) return bit_reverse8(((m_accelerator->read() & 0xf) << 4) | m_steering->read()); @@ -191,7 +191,7 @@ READ8_MEMBER( buggyboy_sound_device::bb_analog_r ) return bit_reverse8((m_brake->read() & 0xf) << 4); } -READ8_MEMBER( buggyboyjr_sound_device::bbjr_analog_r ) +uint8_t buggyboyjr_sound_device::bbjr_analog_r(offs_t offset) { if (offset == 0) return ((m_accelerator->read() & 0xf) << 4) | m_steering->read(); @@ -229,7 +229,7 @@ uint8_t tx1_sound_device::tx1_ppi_portb_r() return m_ppi_portd->read() | m_ppi_latch_b; } -WRITE8_MEMBER( tx1_sound_device::pit8253_w ) +void tx1_sound_device::pit8253_w(offs_t offset, uint8_t data) { m_stream->update(); @@ -261,7 +261,7 @@ WRITE8_MEMBER( tx1_sound_device::pit8253_w ) } } -READ8_MEMBER( tx1_sound_device::pit8253_r ) +uint8_t tx1_sound_device::pit8253_r(offs_t offset) { osd_printf_debug("PIT R: %x", offset); return 0; diff --git a/src/mame/audio/tx1.h b/src/mame/audio/tx1.h index bf3e2505167..f212121ae9f 100644 --- a/src/mame/audio/tx1.h +++ b/src/mame/audio/tx1.h @@ -19,18 +19,18 @@ class tx1_sound_device : public device_t, public device_sound_interface public: tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE16_MEMBER( z80_busreq_w ); - DECLARE_READ16_MEMBER( dipswitches_r ); - DECLARE_READ16_MEMBER( z80_shared_r ); - DECLARE_WRITE16_MEMBER( z80_shared_w ); + void z80_busreq_w(uint16_t data); + uint16_t dipswitches_r(); + uint16_t z80_shared_r(offs_t offset); + void z80_shared_w(offs_t offset, uint16_t data); - DECLARE_WRITE8_MEMBER( z80_intreq_w ); + void z80_intreq_w(uint8_t data); - DECLARE_WRITE8_MEMBER( ts_w ); - DECLARE_READ8_MEMBER( ts_r ); + void ts_w(offs_t offset, uint8_t data); + uint8_t ts_r(offs_t offset); - DECLARE_READ8_MEMBER( pit8253_r ); - DECLARE_WRITE8_MEMBER( pit8253_w ); + uint8_t pit8253_r(offs_t offset); + void pit8253_w(offs_t offset, uint8_t data); INTERRUPT_GEN_MEMBER( z80_irq ); @@ -159,7 +159,7 @@ protected: void ym1_a_w(uint8_t data); - DECLARE_READ8_MEMBER( bb_analog_r ); + uint8_t bb_analog_r(offs_t offset); void bb_coin_cnt_w(uint8_t data); virtual bool has_coin_counters() { return false; } @@ -180,7 +180,7 @@ protected: virtual ioport_constructor device_input_ports() const override; virtual void device_add_mconfig(machine_config &config) override; - DECLARE_READ8_MEMBER( bbjr_analog_r ); + uint8_t bbjr_analog_r(offs_t offset); virtual bool has_coin_counters() override { return true; } diff --git a/src/mame/audio/vicdual.cpp b/src/mame/audio/vicdual.cpp index 8a21e9fd788..b3bd59c288f 100644 --- a/src/mame/audio/vicdual.cpp +++ b/src/mame/audio/vicdual.cpp @@ -137,7 +137,7 @@ MACHINE_START_MEMBER(vicdual_state,frogs_audio) } -WRITE8_MEMBER( vicdual_state::frogs_audio_w ) +void vicdual_state::frogs_audio_w(uint8_t data) { static int last_croak = 0; static int last_buzzz = 0; @@ -451,7 +451,7 @@ void vicdual_state::headon_audio(machine_config &config) m_discrete->add_route(ALL_OUTPUTS, "mono", 1.0); } -WRITE8_MEMBER( vicdual_state::headon_audio_w ) +void vicdual_state::headon_audio_w(uint8_t data) { if (m_discrete == nullptr) return; @@ -465,7 +465,7 @@ WRITE8_MEMBER( vicdual_state::headon_audio_w ) } -WRITE8_MEMBER( vicdual_state::invho2_audio_w ) +void vicdual_state::invho2_audio_w(uint8_t data) { if (m_discrete == nullptr) return; @@ -599,7 +599,7 @@ void vicdual_state::brdrline_audio(machine_config &config) m_samples->add_route(ALL_OUTPUTS, "mono", 0.35); } -WRITE8_MEMBER( vicdual_state::brdrline_audio_w ) +void vicdual_state::brdrline_audio_w(uint8_t data) { uint8_t res = data ^ 0xff; @@ -623,7 +623,7 @@ WRITE8_MEMBER( vicdual_state::brdrline_audio_w ) //printf("%02x\n",res); } -WRITE8_MEMBER( vicdual_state::brdrline_audio_aux_w ) +void vicdual_state::brdrline_audio_aux_w(uint8_t data) { if(data & 0xfc) // coin, unknown which is the trigger m_samples->start(1, 1); |