summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/igs017.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/igs017.cpp')
-rw-r--r--src/mame/drivers/igs017.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp
index 0cd875582a4..7849ed274a8 100644
--- a/src/mame/drivers/igs017.cpp
+++ b/src/mame/drivers/igs017.cpp
@@ -1251,7 +1251,7 @@ void igs017_state::init_lhzb2()
lhzb2_patch_rom();
// install and configure protection device(s)
-// m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xda5610, 0xda5613, read16_delegate(FUNC(igs025_device::killbld_igs025_prot_r), (igs025_device*)m_igs025), write16_delegate(FUNC(igs025_device::killbld_igs025_prot_w), (igs025_device*)m_igs025));
+// m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xda5610, 0xda5613, read16_delegate(*m_igs025, FUNC(igs025_device::killbld_igs025_prot_r)), write16_delegate(*m_igs025, FUNC(igs025_device::killbld_igs025_prot_w)));
// m_igs025->m_kb_source_data = dw3_source_data;
// m_igs025->m_kb_source_data_offset = 0;
// m_igs025->m_kb_game_id = 0x00060000;
@@ -1424,7 +1424,7 @@ void igs017_state::init_slqz2()
slqz2_patch_rom();
// install and configure protection device(s)
-// m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xda5610, 0xda5613, read16_delegate(FUNC(igs025_device::killbld_igs025_prot_r), (igs025_device*)m_igs025), write16_delegate(FUNC(igs025_device::killbld_igs025_prot_w), (igs025_device*)m_igs025));
+// m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xda5610, 0xda5613, read16_delegate(*m_igs025, FUNC(igs025_device::killbld_igs025_prot_r)), write16_delegate(*m_igs025, FUNC(igs025_device::killbld_igs025_prot_w)));
// m_igs025->m_kb_source_data = dw3_source_data;
// m_igs025->m_kb_source_data_offset = 0;
// m_igs025->m_kb_game_id = 0x00060000;
@@ -1525,10 +1525,10 @@ void igs017_state::iqblocka_remap_addr_w(offs_t offset, u8 data)
// Add new memory ranges
address_space &prg_space = m_maincpu->space(AS_PROGRAM);
- prg_space.install_write_handler(m_remap_addr + 0x0, m_remap_addr + 0x0, write8smo_delegate(FUNC(igs_incdec_device::reset_w), &(*m_igs_incdec)));
- prg_space.install_write_handler(m_remap_addr + 0x1, m_remap_addr + 0x1, write8smo_delegate(FUNC(igs_incdec_device::dec_w), &(*m_igs_incdec)));
- prg_space.install_write_handler(m_remap_addr + 0x3, m_remap_addr + 0x3, write8smo_delegate(FUNC(igs_incdec_device::inc_w), &(*m_igs_incdec)));
- prg_space.install_read_handler (m_remap_addr + 0x5, m_remap_addr + 0x5, read8smo_delegate (FUNC(igs_incdec_device::val_r), &(*m_igs_incdec)));
+ prg_space.install_write_handler(m_remap_addr + 0x0, m_remap_addr + 0x0, write8smo_delegate(*m_igs_incdec, FUNC(igs_incdec_device::reset_w)));
+ prg_space.install_write_handler(m_remap_addr + 0x1, m_remap_addr + 0x1, write8smo_delegate(*m_igs_incdec, FUNC(igs_incdec_device::dec_w)));
+ prg_space.install_write_handler(m_remap_addr + 0x3, m_remap_addr + 0x3, write8smo_delegate(*m_igs_incdec, FUNC(igs_incdec_device::inc_w)));
+ prg_space.install_read_handler (m_remap_addr + 0x5, m_remap_addr + 0x5, read8smo_delegate (*m_igs_incdec, FUNC(igs_incdec_device::val_r)));
logerror("%s: incdec protection remapped at %04x\n", machine().describe_context(), m_remap_addr);
}
@@ -2254,11 +2254,11 @@ void igs017_state::lhzb2a_remap_addr_w(address_space &space, u16 data)
m_remap_addr = data & 0xff;
// Add new memory ranges
- space.install_write_handler (m_remap_addr * 0x10000 + 0x4001, m_remap_addr * 0x10000 + 0x4001, write8smo_delegate(FUNC(igs_bitswap_device::address_w), &(*m_igs_bitswap)));
- space.install_readwrite_handler(m_remap_addr * 0x10000 + 0x4003, m_remap_addr * 0x10000 + 0x4003, read8smo_delegate (FUNC(igs_bitswap_device::data_r), &(*m_igs_bitswap)), write8smo_delegate(FUNC(igs_bitswap_device::data_w), &(*m_igs_bitswap)));
+ space.install_write_handler (m_remap_addr * 0x10000 + 0x4001, m_remap_addr * 0x10000 + 0x4001, write8smo_delegate(*m_igs_bitswap, FUNC(igs_bitswap_device::address_w)));
+ space.install_readwrite_handler(m_remap_addr * 0x10000 + 0x4003, m_remap_addr * 0x10000 + 0x4003, read8smo_delegate (*m_igs_bitswap, FUNC(igs_bitswap_device::data_r)), write8smo_delegate(*m_igs_bitswap, FUNC(igs_bitswap_device::data_w)));
- space.install_read_handler (m_remap_addr * 0x10000 + 0x8000, m_remap_addr * 0x10000 + 0x8005, read16sm_delegate (FUNC(igs017_state::lhzb2a_input_r), this));
- space.install_write_handler (m_remap_addr * 0x10000 + 0xc000, m_remap_addr * 0x10000 + 0xc001, write16mo_delegate(FUNC(igs017_state::lhzb2a_remap_addr_w), this));
+ space.install_read_handler (m_remap_addr * 0x10000 + 0x8000, m_remap_addr * 0x10000 + 0x8005, read16sm_delegate (*this, FUNC(igs017_state::lhzb2a_input_r)));
+ space.install_write_handler (m_remap_addr * 0x10000 + 0xc000, m_remap_addr * 0x10000 + 0xc001, write16mo_delegate(*this, FUNC(igs017_state::lhzb2a_remap_addr_w)));
logerror("%s: inputs and protection remapped at %02xxxxx\n", machine().describe_context(), m_remap_addr);
}
@@ -3618,7 +3618,7 @@ void igs017_state::mgcs(machine_config &config)
m_screen->set_palette("igs017_igs031:palette");
IGS017_IGS031(config, m_igs017_igs031, 0);
- m_igs017_igs031->set_palette_scramble_cb(FUNC(igs017_state::mgcs_palette_bitswap), this);
+ m_igs017_igs031->set_palette_scramble_cb(FUNC(igs017_state::mgcs_palette_bitswap));
m_igs017_igs031->set_i8255_tag("ppi8255");
// sound
@@ -3645,7 +3645,7 @@ void igs017_state::lhzb2(machine_config &config)
// protection
IGS025(config, m_igs025, 0);
- m_igs025->set_external_cb(FUNC(igs017_state::igs025_to_igs022_callback), this);
+ m_igs025->set_external_cb(FUNC(igs017_state::igs025_to_igs022_callback));
IGS022(config, m_igs022, 0);
@@ -3659,7 +3659,7 @@ void igs017_state::lhzb2(machine_config &config)
m_screen->set_palette("igs017_igs031:palette");
IGS017_IGS031(config, m_igs017_igs031, 0);
- m_igs017_igs031->set_palette_scramble_cb(FUNC(igs017_state::lhzb2a_palette_bitswap), this);
+ m_igs017_igs031->set_palette_scramble_cb(FUNC(igs017_state::lhzb2a_palette_bitswap));
m_igs017_igs031->set_i8255_tag("ppi8255");
// sound
@@ -3708,7 +3708,7 @@ void igs017_state::lhzb2a(machine_config &config)
m_screen->set_palette("igs017_igs031:palette");
IGS017_IGS031(config, m_igs017_igs031, 0);
- m_igs017_igs031->set_palette_scramble_cb(FUNC(igs017_state::lhzb2a_palette_bitswap), this);
+ m_igs017_igs031->set_palette_scramble_cb(FUNC(igs017_state::lhzb2a_palette_bitswap));
// m_igs017_igs031->set_i8255_tag("ppi8255");
// sound
@@ -3735,7 +3735,7 @@ void igs017_state::slqz2(machine_config &config)
// protection
IGS025(config, m_igs025, 0);
- m_igs025->set_external_cb(FUNC(igs017_state::igs025_to_igs022_callback), this);
+ m_igs025->set_external_cb(FUNC(igs017_state::igs025_to_igs022_callback));
IGS022(config, m_igs022, 0);
@@ -3749,7 +3749,7 @@ void igs017_state::slqz2(machine_config &config)
m_screen->set_palette("igs017_igs031:palette");
IGS017_IGS031(config, m_igs017_igs031, 0);
- m_igs017_igs031->set_palette_scramble_cb(FUNC(igs017_state::slqz2_palette_bitswap), this);
+ m_igs017_igs031->set_palette_scramble_cb(FUNC(igs017_state::slqz2_palette_bitswap));
m_igs017_igs031->set_i8255_tag("ppi8255");
// sound
@@ -3861,7 +3861,7 @@ void igs017_state::tjsb(machine_config &config)
m_screen->set_palette("igs017_igs031:palette");
IGS017_IGS031(config, m_igs017_igs031, 0);
- m_igs017_igs031->set_palette_scramble_cb(FUNC(igs017_state::tjsb_palette_bitswap), this);
+ m_igs017_igs031->set_palette_scramble_cb(FUNC(igs017_state::tjsb_palette_bitswap));
m_igs017_igs031->set_i8255_tag("ppi8255");
// sound