diff options
author | 2020-05-31 17:07:44 -0400 | |
---|---|---|
committer | 2020-05-31 17:07:44 -0400 | |
commit | f3c69775c9327e16f84d40d59aa72379be7ee55c (patch) | |
tree | e69e4297b622952926d9073988439db475ec35ad /src/devices/bus/isa/sblaster.cpp | |
parent | e9392e8b50b96e1d86a54d94652ad084b30d22fc (diff) |
bus/isa: Simplify signatures of most handlers (nw)
sb16_lle: Add device map for host I/O (nw)
Diffstat (limited to 'src/devices/bus/isa/sblaster.cpp')
-rw-r--r-- | src/devices/bus/isa/sblaster.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp index 8cefe5d70eb..542985f17d6 100644 --- a/src/devices/bus/isa/sblaster.cpp +++ b/src/devices/bus/isa/sblaster.cpp @@ -77,7 +77,7 @@ static const int m_cmd_fifo_length[256] = static const int protection_magic[4] = { 0x96, 0xa5, 0x69, 0x5a }; -READ8_MEMBER( sb8_device::ym3812_16_r ) +uint8_t sb8_device::ym3812_16_r(offs_t offset) { uint8_t retVal = 0xff; switch(offset) @@ -87,7 +87,7 @@ READ8_MEMBER( sb8_device::ym3812_16_r ) return retVal; } -WRITE8_MEMBER( sb8_device::ym3812_16_w ) +void sb8_device::ym3812_16_w(offs_t offset, uint8_t data) { switch(offset) { @@ -96,17 +96,17 @@ WRITE8_MEMBER( sb8_device::ym3812_16_w ) } } -READ8_MEMBER( isa8_sblaster1_0_device::saa1099_16_r ) +uint8_t isa8_sblaster1_0_device::saa1099_16_r(offs_t offset) { return 0xff; } -WRITE8_MEMBER( isa8_sblaster1_0_device::saa1099_1_16_w ) +void isa8_sblaster1_0_device::saa1099_1_16_w(offs_t offset, uint8_t data) { m_saa1099_1->write(offset, data); } -WRITE8_MEMBER( isa8_sblaster1_0_device::saa1099_2_16_w ) +void isa8_sblaster1_0_device::saa1099_2_16_w(offs_t offset, uint8_t data) { m_saa1099_2->write(offset, data); } @@ -164,7 +164,7 @@ uint8_t sb_device::dequeue_r() } -READ8_MEMBER( sb_device::dsp_reset_r ) +uint8_t sb_device::dsp_reset_r(offs_t offset) { // printf("read DSP reset @ %x\n", offset); if(offset) @@ -173,7 +173,7 @@ READ8_MEMBER( sb_device::dsp_reset_r ) return 0xff; } -WRITE8_MEMBER( sb_device::dsp_reset_w ) +void sb_device::dsp_reset_w(offs_t offset, uint8_t data) { // printf("%02x to DSP reset @ %x\n", data, offset); if(offset) @@ -219,7 +219,7 @@ WRITE8_MEMBER( sb_device::dsp_reset_w ) //printf("%02x\n",data); } -READ8_MEMBER( sb_device::dsp_data_r ) +uint8_t sb_device::dsp_data_r(offs_t offset) { // printf("read DSP data @ %x\n", offset); if(offset) @@ -244,7 +244,7 @@ READ8_MEMBER( sb_device::dsp_data_r ) return dequeue_r(); } -WRITE8_MEMBER( sb_device::dsp_data_w ) +void sb_device::dsp_data_w(offs_t offset, uint8_t data) { // printf("%02x to DSP data @ %x\n", data, offset); if(offset) @@ -252,7 +252,7 @@ WRITE8_MEMBER( sb_device::dsp_data_w ) logerror("Soundblaster DSP data port undocumented write\n"); } -READ8_MEMBER(sb_device::dsp_rbuf_status_r) +uint8_t sb_device::dsp_rbuf_status_r(offs_t offset) { // printf("read Rbufstat @ %x\n", offset); @@ -281,7 +281,7 @@ READ8_MEMBER(sb_device::dsp_rbuf_status_r) return m_dsp.rbuf_status; } -READ8_MEMBER(sb_device::dsp_wbuf_status_r) +uint8_t sb_device::dsp_wbuf_status_r(offs_t offset) { // printf("read Wbufstat @ %x\n", offset); @@ -303,7 +303,7 @@ READ8_MEMBER(sb_device::dsp_wbuf_status_r) return m_dsp.wbuf_status; } -WRITE8_MEMBER(sb_device::dsp_rbuf_status_w) +void sb_device::dsp_rbuf_status_w(offs_t offset, uint8_t data) { // printf("%02x to Rbufstat @ %x\n", data, offset); if(offset) @@ -640,7 +640,7 @@ void sb_device::process_fifo(uint8_t cmd) } } -WRITE8_MEMBER(sb_device::dsp_cmd_w) +void sb_device::dsp_cmd_w(offs_t offset, uint8_t data) { // printf("%02x to DSP command @ %x\n", data, offset); @@ -710,7 +710,7 @@ void sb_device::adpcm_decode(uint8_t sample, int size) m_rdac->write(m_dsp.adpcm_ref << 8); } -READ8_MEMBER( sb16_device::mpu401_r ) +uint8_t sb16_device::mpu401_r(offs_t offset) { uint8_t res; @@ -744,7 +744,7 @@ READ8_MEMBER( sb16_device::mpu401_r ) return res; } -WRITE8_MEMBER( sb16_device::mpu401_w ) +void sb16_device::mpu401_w(offs_t offset, uint8_t data) { if(offset == 0) // data { @@ -824,14 +824,14 @@ void sb16_device::mixer_reset() mixer_set(); } -READ8_MEMBER( sb16_device::mixer_r ) +uint8_t sb16_device::mixer_r(offs_t offset) { if(offset == 0) return m_mixer.status; return m_mixer.data; } -WRITE8_MEMBER( sb16_device::mixer_w ) +void sb16_device::mixer_w(offs_t offset, uint8_t data) { if(offset == 0) { @@ -1257,10 +1257,10 @@ isa16_sblaster16_device::isa16_sblaster16_device(const machine_config &mconfig, void sb8_device::device_start() { m_isa->install_device(0x0200, 0x0207, read8_delegate(*subdevice<pc_joy_device>("pc_joy"), FUNC(pc_joy_device::joy_port_r)), write8_delegate(*subdevice<pc_joy_device>("pc_joy"), FUNC(pc_joy_device::joy_port_w))); - m_isa->install_device(0x0226, 0x0227, read8_delegate(*this, FUNC(sb_device::dsp_reset_r)), write8_delegate(*this, FUNC(sb_device::dsp_reset_w))); - m_isa->install_device(0x022a, 0x022b, read8_delegate(*this, FUNC(sb_device::dsp_data_r)), write8_delegate(*this, FUNC(sb_device::dsp_data_w))); - m_isa->install_device(0x022c, 0x022d, read8_delegate(*this, FUNC(sb_device::dsp_wbuf_status_r)), write8_delegate(*this, FUNC(sb_device::dsp_cmd_w))); - m_isa->install_device(0x022e, 0x022f, read8_delegate(*this, FUNC(sb_device::dsp_rbuf_status_r)), write8_delegate(*this, FUNC(sb_device::dsp_rbuf_status_w))); + m_isa->install_device(0x0226, 0x0227, read8sm_delegate(*this, FUNC(sb_device::dsp_reset_r)), write8sm_delegate(*this, FUNC(sb_device::dsp_reset_w))); + m_isa->install_device(0x022a, 0x022b, read8sm_delegate(*this, FUNC(sb_device::dsp_data_r)), write8sm_delegate(*this, FUNC(sb_device::dsp_data_w))); + m_isa->install_device(0x022c, 0x022d, read8sm_delegate(*this, FUNC(sb_device::dsp_wbuf_status_r)), write8sm_delegate(*this, FUNC(sb_device::dsp_cmd_w))); + m_isa->install_device(0x022e, 0x022f, read8sm_delegate(*this, FUNC(sb_device::dsp_rbuf_status_r)), write8sm_delegate(*this, FUNC(sb_device::dsp_rbuf_status_w))); if(m_dsp.version >= 0x0301) { ymf262_device &ymf262 = *subdevice<ymf262_device>("ymf262"); @@ -1271,8 +1271,8 @@ void sb8_device::device_start() } else { - m_isa->install_device(0x0388, 0x0389, read8_delegate(*this, FUNC(sb8_device::ym3812_16_r)), write8_delegate(*this, FUNC(sb8_device::ym3812_16_w))); - m_isa->install_device(0x0228, 0x0229, read8_delegate(*this, FUNC(sb8_device::ym3812_16_r)), write8_delegate(*this, FUNC(sb8_device::ym3812_16_w))); + m_isa->install_device(0x0388, 0x0389, read8sm_delegate(*this, FUNC(sb8_device::ym3812_16_r)), write8sm_delegate(*this, FUNC(sb8_device::ym3812_16_w))); + m_isa->install_device(0x0228, 0x0229, read8sm_delegate(*this, FUNC(sb8_device::ym3812_16_r)), write8sm_delegate(*this, FUNC(sb8_device::ym3812_16_w))); } sb_device::device_start(); @@ -1282,8 +1282,8 @@ void isa8_sblaster1_0_device::device_start() { set_isa_device(); // 1.0 always has the SAA1099s for CMS back-compatibility - m_isa->install_device(0x0220, 0x0221, read8_delegate(*this, FUNC(isa8_sblaster1_0_device::saa1099_16_r)), write8_delegate(*this, FUNC(isa8_sblaster1_0_device::saa1099_1_16_w))); - m_isa->install_device(0x0222, 0x0223, read8_delegate(*this, FUNC(isa8_sblaster1_0_device::saa1099_16_r)), write8_delegate(*this, FUNC(isa8_sblaster1_0_device::saa1099_2_16_w))); + m_isa->install_device(0x0220, 0x0221, read8sm_delegate(*this, FUNC(isa8_sblaster1_0_device::saa1099_16_r)), write8sm_delegate(*this, FUNC(isa8_sblaster1_0_device::saa1099_1_16_w))); + m_isa->install_device(0x0222, 0x0223, read8sm_delegate(*this, FUNC(isa8_sblaster1_0_device::saa1099_16_r)), write8sm_delegate(*this, FUNC(isa8_sblaster1_0_device::saa1099_2_16_w))); m_isa->set_dma_channel(1, this, false); m_dsp.version = 0x0105; sb8_device::device_start(); @@ -1302,12 +1302,12 @@ void sb16_device::device_start() { ymf262_device &ymf262 = *subdevice<ymf262_device>("ymf262"); m_isa->install_device(0x0200, 0x0207, read8_delegate(*subdevice<pc_joy_device>("pc_joy"), FUNC(pc_joy_device::joy_port_r)), write8_delegate(*subdevice<pc_joy_device>("pc_joy"), FUNC(pc_joy_device::joy_port_w))); - m_isa->install_device(0x0226, 0x0227, read8_delegate(*this, FUNC(sb_device::dsp_reset_r)), write8_delegate(*this, FUNC(sb_device::dsp_reset_w))); - m_isa->install_device(0x022a, 0x022b, read8_delegate(*this, FUNC(sb_device::dsp_data_r)), write8_delegate(*this, FUNC(sb_device::dsp_data_w))); - m_isa->install_device(0x022c, 0x022d, read8_delegate(*this, FUNC(sb_device::dsp_wbuf_status_r)), write8_delegate(*this, FUNC(sb_device::dsp_cmd_w))); - m_isa->install_device(0x022e, 0x022f, read8_delegate(*this, FUNC(sb_device::dsp_rbuf_status_r)), write8_delegate(*this, FUNC(sb_device::dsp_rbuf_status_w))); - m_isa->install_device(0x0224, 0x0225, read8_delegate(*this, FUNC(sb16_device::mixer_r)), write8_delegate(*this, FUNC(sb16_device::mixer_w))); - m_isa->install_device(0x0330, 0x0331, read8_delegate(*this, FUNC(sb16_device::mpu401_r)), write8_delegate(*this, FUNC(sb16_device::mpu401_w))); + m_isa->install_device(0x0226, 0x0227, read8sm_delegate(*this, FUNC(sb_device::dsp_reset_r)), write8sm_delegate(*this, FUNC(sb_device::dsp_reset_w))); + m_isa->install_device(0x022a, 0x022b, read8sm_delegate(*this, FUNC(sb_device::dsp_data_r)), write8sm_delegate(*this, FUNC(sb_device::dsp_data_w))); + m_isa->install_device(0x022c, 0x022d, read8sm_delegate(*this, FUNC(sb_device::dsp_wbuf_status_r)), write8sm_delegate(*this, FUNC(sb_device::dsp_cmd_w))); + m_isa->install_device(0x022e, 0x022f, read8sm_delegate(*this, FUNC(sb_device::dsp_rbuf_status_r)), write8sm_delegate(*this, FUNC(sb_device::dsp_rbuf_status_w))); + m_isa->install_device(0x0224, 0x0225, read8sm_delegate(*this, FUNC(sb16_device::mixer_r)), write8sm_delegate(*this, FUNC(sb16_device::mixer_w))); + m_isa->install_device(0x0330, 0x0331, read8sm_delegate(*this, FUNC(sb16_device::mpu401_r)), write8sm_delegate(*this, FUNC(sb16_device::mpu401_w))); m_isa->install_device(0x0388, 0x038b, read8sm_delegate(ymf262, FUNC(ymf262_device::read)), write8sm_delegate(ymf262, FUNC(ymf262_device::write))); m_isa->install_device(0x0220, 0x0223, read8sm_delegate(ymf262, FUNC(ymf262_device::read)), write8sm_delegate(ymf262, FUNC(ymf262_device::write))); m_isa->install_device(0x0228, 0x0229, read8sm_delegate(ymf262, FUNC(ymf262_device::read)), write8sm_delegate(ymf262, FUNC(ymf262_device::write))); |