From 4b68ae5dc69fb5b3e2afacfb176261c04cc7c949 Mon Sep 17 00:00:00 2001 From: cam900 Date: Mon, 15 Apr 2019 23:04:55 +0900 Subject: saa1099.cpp : Simplify handlers --- src/devices/bus/isa/gblaster.cpp | 4 ++-- src/devices/bus/isa/sblaster.cpp | 4 ++-- src/devices/sound/saa1099.cpp | 10 +++++----- src/devices/sound/saa1099.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/devices/bus/isa/gblaster.cpp b/src/devices/bus/isa/gblaster.cpp index cc838eabdc8..e579070fbf6 100644 --- a/src/devices/bus/isa/gblaster.cpp +++ b/src/devices/bus/isa/gblaster.cpp @@ -29,12 +29,12 @@ READ8_MEMBER( isa8_gblaster_device::saa1099_16_r ) WRITE8_MEMBER( isa8_gblaster_device::saa1099_1_16_w ) { - m_saa1099_1->write(space, offset, data); + m_saa1099_1->write(offset, data); } WRITE8_MEMBER( isa8_gblaster_device::saa1099_2_16_w ) { - m_saa1099_2->write(space, offset, data); + m_saa1099_2->write(offset, data); } READ8_MEMBER( isa8_gblaster_device::detect_r ) diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp index d8a47349918..73e98a297f8 100644 --- a/src/devices/bus/isa/sblaster.cpp +++ b/src/devices/bus/isa/sblaster.cpp @@ -103,12 +103,12 @@ READ8_MEMBER( isa8_sblaster1_0_device::saa1099_16_r ) WRITE8_MEMBER( isa8_sblaster1_0_device::saa1099_1_16_w ) { - m_saa1099_1->write(space, offset, data); + m_saa1099_1->write(offset, data); } WRITE8_MEMBER( isa8_sblaster1_0_device::saa1099_2_16_w ) { - m_saa1099_2->write(space, offset, data); + m_saa1099_2->write(offset, data); } void sb_device::queue(uint8_t data) diff --git a/src/devices/sound/saa1099.cpp b/src/devices/sound/saa1099.cpp index ca1232e13f4..b5566ab164f 100644 --- a/src/devices/sound/saa1099.cpp +++ b/src/devices/sound/saa1099.cpp @@ -358,7 +358,7 @@ void saa1099_device::envelope_w(int ch) } -WRITE8_MEMBER( saa1099_device::control_w ) +void saa1099_device::control_w(u8 data) { if ((data & 0xff) > 0x1c) { @@ -378,7 +378,7 @@ WRITE8_MEMBER( saa1099_device::control_w ) } -WRITE8_MEMBER( saa1099_device::data_w ) +void saa1099_device::data_w(u8 data) { int reg = m_selected_reg; int ch; @@ -462,10 +462,10 @@ WRITE8_MEMBER( saa1099_device::data_w ) } } -WRITE8_MEMBER(saa1099_device::write) +void saa1099_device::write(offs_t offset, u8 data) { if (offset & 1) - control_w(space, 0, data); + control_w(data); else - data_w(space, 0, data); + data_w(data); } diff --git a/src/devices/sound/saa1099.h b/src/devices/sound/saa1099.h index 49e2007319f..a322b391b19 100644 --- a/src/devices/sound/saa1099.h +++ b/src/devices/sound/saa1099.h @@ -21,10 +21,10 @@ class saa1099_device : public device_t, public: saa1099_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( control_w ); - DECLARE_WRITE8_MEMBER( data_w ); + void control_w(u8 data); + void data_w(u8 data); - DECLARE_WRITE8_MEMBER( write ); + void write(offs_t offset, u8 data); protected: // device-level overrides -- cgit v1.2.3