summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/iqblock.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/iqblock.c')
-rw-r--r--src/mame/drivers/iqblock.c34
1 files changed, 16 insertions, 18 deletions
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index a65dc26b906..76154e5941e 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -57,20 +57,18 @@ Grndtour:
#include "sound/2413intf.h"
-static WRITE8_HANDLER( iqblock_prot_w )
+WRITE8_MEMBER(iqblock_state::iqblock_prot_w)
{
- iqblock_state *state = space->machine().driver_data<iqblock_state>();
- state->m_rambase[0xe26] = data;
- state->m_rambase[0xe27] = data;
- state->m_rambase[0xe1c] = data;
+ m_rambase[0xe26] = data;
+ m_rambase[0xe27] = data;
+ m_rambase[0xe1c] = data;
}
-static WRITE8_HANDLER( grndtour_prot_w )
+WRITE8_MEMBER(iqblock_state::grndtour_prot_w)
{
- iqblock_state *state = space->machine().driver_data<iqblock_state>();
- state->m_rambase[0xe39] = data;
- state->m_rambase[0xe3a] = data;
- state->m_rambase[0xe2f] = data;
+ m_rambase[0xe39] = data;
+ m_rambase[0xe3a] = data;
+ m_rambase[0xe2f] = data;
}
@@ -90,14 +88,14 @@ static TIMER_DEVICE_CALLBACK( iqblock_irq )
}
-static WRITE8_HANDLER( iqblock_irqack_w )
+WRITE8_MEMBER(iqblock_state::iqblock_irqack_w)
{
- cputag_set_input_line(space->machine(), "maincpu", 0, CLEAR_LINE);
+ cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
}
-static READ8_HANDLER( extrarom_r )
+READ8_MEMBER(iqblock_state::extrarom_r)
{
- return space->machine().region("user1")->base()[offset];
+ return machine().region("user1")->base()[offset];
}
@@ -143,9 +141,9 @@ static ADDRESS_MAP_START( main_portmap, AS_IO, 8, iqblock_state )
AM_RANGE(0x5090, 0x5090) AM_READ_PORT("SW0")
AM_RANGE(0x50a0, 0x50a0) AM_READ_PORT("SW1")
AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE_LEGACY("ymsnd", ym2413_w) // UM3567_data_port_0_w
- AM_RANGE(0x50c0, 0x50c0) AM_WRITE_LEGACY(iqblock_irqack_w)
+ AM_RANGE(0x50c0, 0x50c0) AM_WRITE(iqblock_irqack_w)
AM_RANGE(0x7000, 0x7fff) AM_READ_LEGACY(iqblock_bgvideoram_r)
- AM_RANGE(0x8000, 0xffff) AM_READ_LEGACY(extrarom_r)
+ AM_RANGE(0x8000, 0xffff) AM_READ(extrarom_r)
ADDRESS_MAP_END
static INPUT_PORTS_START( iqblock )
@@ -449,7 +447,7 @@ static DRIVER_INIT( iqblock )
machine.generic.paletteram2.u8 = rom + 0x12800;
state->m_fgvideoram = rom + 0x16800;
state->m_bgvideoram = rom + 0x17000;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfe26, 0xfe26, FUNC(iqblock_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xfe26, 0xfe26, write8_delegate(FUNC(iqblock_state::iqblock_prot_w),state));
state->m_video_type=1;
}
@@ -472,7 +470,7 @@ static DRIVER_INIT( grndtour )
machine.generic.paletteram2.u8 = rom + 0x12800;
state->m_fgvideoram = rom + 0x16800;
state->m_bgvideoram = rom + 0x17000;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfe39, 0xfe39, FUNC(grndtour_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xfe39, 0xfe39, write8_delegate(FUNC(iqblock_state::grndtour_prot_w),state));
state->m_video_type=0;
}