summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/wwfsstar.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/wwfsstar.c')
-rw-r--r--src/mame/drivers/wwfsstar.c37
1 files changed, 18 insertions, 19 deletions
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index c4ccc00305d..ddd6734060c 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -148,10 +148,10 @@ Notes:
#define CPU_CLOCK MASTER_CLOCK / 2
#define PIXEL_CLOCK MASTER_CLOCK / 4
-static WRITE16_HANDLER( wwfsstar_irqack_w );
-static WRITE16_HANDLER( wwfsstar_flipscreen_w );
-static WRITE16_HANDLER ( wwfsstar_soundwrite );
-static WRITE16_HANDLER ( wwfsstar_scrollwrite );
+
+
+
+
/*******************************************************************************
Memory Maps
@@ -165,15 +165,15 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, wwfsstar_state )
AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE_LEGACY(wwfsstar_bg0_videoram_w) AM_BASE(m_bg0_videoram) /* BG0 Ram */
AM_RANGE(0x100000, 0x1003ff) AM_RAM AM_BASE(m_spriteram) /* SPR Ram */
AM_RANGE(0x140000, 0x140fff) AM_WRITE_LEGACY(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE_GENERIC(paletteram)
- AM_RANGE(0x180000, 0x180003) AM_WRITE_LEGACY(wwfsstar_irqack_w)
+ AM_RANGE(0x180000, 0x180003) AM_WRITE(wwfsstar_irqack_w)
AM_RANGE(0x180000, 0x180001) AM_READ_PORT("DSW1")
AM_RANGE(0x180002, 0x180003) AM_READ_PORT("DSW2")
AM_RANGE(0x180004, 0x180005) AM_READ_PORT("P1")
- AM_RANGE(0x180004, 0x180007) AM_WRITE_LEGACY(wwfsstar_scrollwrite)
+ AM_RANGE(0x180004, 0x180007) AM_WRITE(wwfsstar_scrollwrite)
AM_RANGE(0x180006, 0x180007) AM_READ_PORT("P2")
AM_RANGE(0x180008, 0x180009) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x180008, 0x180009) AM_WRITE_LEGACY(wwfsstar_soundwrite)
- AM_RANGE(0x18000a, 0x18000b) AM_WRITE_LEGACY(wwfsstar_flipscreen_w)
+ AM_RANGE(0x180008, 0x180009) AM_WRITE(wwfsstar_soundwrite)
+ AM_RANGE(0x18000a, 0x18000b) AM_WRITE(wwfsstar_flipscreen_w)
AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM /* Work Ram */
ADDRESS_MAP_END
@@ -192,39 +192,38 @@ ADDRESS_MAP_END
as used by the above memory map
*******************************************************************************/
-static WRITE16_HANDLER ( wwfsstar_scrollwrite )
+WRITE16_MEMBER(wwfsstar_state::wwfsstar_scrollwrite)
{
- wwfsstar_state *state = space->machine().driver_data<wwfsstar_state>();
switch (offset)
{
case 0x00:
- state->m_scrollx = data;
+ m_scrollx = data;
break;
case 0x01:
- state->m_scrolly = data;
+ m_scrolly = data;
break;
}
}
-static WRITE16_HANDLER ( wwfsstar_soundwrite )
+WRITE16_MEMBER(wwfsstar_state::wwfsstar_soundwrite)
{
soundlatch_w(space, 1, data & 0xff);
- cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_NMI, PULSE_LINE );
+ cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_NMI, PULSE_LINE );
}
-static WRITE16_HANDLER( wwfsstar_flipscreen_w )
+WRITE16_MEMBER(wwfsstar_state::wwfsstar_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 1);
+ flip_screen_set(machine(), data & 1);
}
-static WRITE16_HANDLER( wwfsstar_irqack_w )
+WRITE16_MEMBER(wwfsstar_state::wwfsstar_irqack_w)
{
if (offset == 0)
- cputag_set_input_line(space->machine(), "maincpu", 6, CLEAR_LINE);
+ cputag_set_input_line(machine(), "maincpu", 6, CLEAR_LINE);
else
- cputag_set_input_line(space->machine(), "maincpu", 5, CLEAR_LINE);
+ cputag_set_input_line(machine(), "maincpu", 5, CLEAR_LINE);
}
/*