summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/bullet.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/bullet.cpp')
-rw-r--r--src/mame/drivers/bullet.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp
index 186f4b9d8cd..ff4be802d9b 100644
--- a/src/mame/drivers/bullet.cpp
+++ b/src/mame/drivers/bullet.cpp
@@ -609,7 +609,7 @@ READ8_MEMBER( bulletf_state::hwsts_r )
void bullet_state::bullet_mem(address_map &map)
{
- map(0x0000, 0xffff).rw(this, FUNC(bullet_state::mreq_r), FUNC(bullet_state::mreq_w));
+ map(0x0000, 0xffff).rw(FUNC(bullet_state::mreq_r), FUNC(bullet_state::mreq_w));
}
@@ -623,15 +623,15 @@ void bullet_state::bullet_io(address_map &map)
map(0x00, 0x03).rw(m_dart, FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w));
map(0x04, 0x07).rw(Z80PIO_TAG, FUNC(z80pio_device::read), FUNC(z80pio_device::write));
map(0x08, 0x0b).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
- map(0x0c, 0x0c).mirror(0x03).rw(this, FUNC(bullet_state::win_r), FUNC(bullet_state::wstrobe_w));
+ map(0x0c, 0x0c).mirror(0x03).rw(FUNC(bullet_state::win_r), FUNC(bullet_state::wstrobe_w));
map(0x10, 0x13).rw(m_fdc, FUNC(mb8877_device::read), FUNC(mb8877_device::write));
- map(0x14, 0x14).rw(m_dmac, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
- map(0x15, 0x15).rw(this, FUNC(bullet_state::brom_r), FUNC(bullet_state::brom_w));
- map(0x16, 0x16).w(this, FUNC(bullet_state::exdsk_w));
- map(0x17, 0x17).w(this, FUNC(bullet_state::exdma_w));
- map(0x18, 0x18).w(this, FUNC(bullet_state::hdcon_w));
- map(0x19, 0x19).r(this, FUNC(bullet_state::info_r));
- map(0x1a, 0x1a).w(this, FUNC(bullet_state::segst_w));
+ map(0x14, 0x14).rw(m_dmac, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x15, 0x15).rw(FUNC(bullet_state::brom_r), FUNC(bullet_state::brom_w));
+ map(0x16, 0x16).w(FUNC(bullet_state::exdsk_w));
+ map(0x17, 0x17).w(FUNC(bullet_state::exdma_w));
+ map(0x18, 0x18).w(FUNC(bullet_state::hdcon_w));
+ map(0x19, 0x19).r(FUNC(bullet_state::info_r));
+ map(0x1a, 0x1a).w(FUNC(bullet_state::segst_w));
}
@@ -641,7 +641,7 @@ void bullet_state::bullet_io(address_map &map)
void bulletf_state::bulletf_mem(address_map &map)
{
- map(0x0000, 0xffff).rw(this, FUNC(bulletf_state::mreq_r), FUNC(bulletf_state::mreq_w));
+ map(0x0000, 0xffff).rw(FUNC(bulletf_state::mreq_r), FUNC(bulletf_state::mreq_w));
}
@@ -656,12 +656,12 @@ void bulletf_state::bulletf_io(address_map &map)
map(0x04, 0x07).rw(Z80PIO_TAG, FUNC(z80pio_device::read), FUNC(z80pio_device::write));
map(0x08, 0x0b).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
map(0x10, 0x13).rw(m_fdc, FUNC(mb8877_device::read), FUNC(mb8877_device::write));
- map(0x14, 0x14).w(this, FUNC(bulletf_state::xdma0_w));
- map(0x16, 0x16).w(this, FUNC(bulletf_state::xfdc_w));
- map(0x17, 0x17).w(this, FUNC(bulletf_state::mbank_w));
- map(0x19, 0x19).rw(this, FUNC(bulletf_state::scsi_r), FUNC(bulletf_state::scsi_w));
- map(0x1a, 0x1a).rw(m_dmac, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
- map(0x1b, 0x1b).r(this, FUNC(bulletf_state::hwsts_r));
+ map(0x14, 0x14).w(FUNC(bulletf_state::xdma0_w));
+ map(0x16, 0x16).w(FUNC(bulletf_state::xfdc_w));
+ map(0x17, 0x17).w(FUNC(bulletf_state::mbank_w));
+ map(0x19, 0x19).rw(FUNC(bulletf_state::scsi_r), FUNC(bulletf_state::scsi_w));
+ map(0x1a, 0x1a).rw(m_dmac, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
+ map(0x1b, 0x1b).r(FUNC(bulletf_state::hwsts_r));
}
@@ -1143,7 +1143,7 @@ MACHINE_CONFIG_START(bullet_state::bullet)
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 16_MHz_XTAL / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, bus_w))
MCFG_Z80PIO_IN_PB_CB(READ8(*this, bullet_state, pio_pb_r))
MCFG_DEVICE_ADD(MB8877_TAG, MB8877, 16_MHz_XTAL / 16)
@@ -1223,9 +1223,9 @@ MACHINE_CONFIG_START(bulletf_state::bulletf)
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 16_MHz_XTAL / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8("scsi_ctrl_in", input_buffer_device, read))
+ MCFG_Z80PIO_IN_PA_CB(READ8("scsi_ctrl_in", input_buffer_device, bus_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, bulletf_state, pio_pa_w))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITE8("cent_data_out", output_latch_device, bus_w))
MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, bulletf_state, cstrb_w))
MCFG_DEVICE_ADD(MB8877_TAG, MB8877, 16_MHz_XTAL / 16)