diff options
Diffstat (limited to 'src/mame/drivers/flkatck.c')
-rw-r--r-- | src/mame/drivers/flkatck.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index 152c5501a9c..204c0b62fef 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -28,18 +28,18 @@ static INTERRUPT_GEN( flkatck_interrupt ) device_set_input_line(device, HD6309_IRQ_LINE, HOLD_LINE); } -static WRITE8_HANDLER( flkatck_bankswitch_w ) +WRITE8_MEMBER(flkatck_state::flkatck_bankswitch_w) { /* bits 3-4: coin counters */ - coin_counter_w(space->machine(), 0, data & 0x08); - coin_counter_w(space->machine(), 1, data & 0x10); + coin_counter_w(machine(), 0, data & 0x08); + coin_counter_w(machine(), 1, data & 0x10); /* bits 0-1: bank # */ if ((data & 0x03) != 0x03) /* for safety */ - memory_set_bank(space->machine(), "bank1", data & 0x03); + memory_set_bank(machine(), "bank1", data & 0x03); } -static READ8_HANDLER( flkatck_ls138_r ) +READ8_MEMBER(flkatck_state::flkatck_ls138_r) { int data = 0; @@ -47,22 +47,21 @@ static READ8_HANDLER( flkatck_ls138_r ) { case 0x00: if (offset & 0x02) - data = input_port_read(space->machine(), (offset & 0x01) ? "COIN" : "DSW3"); + data = input_port_read(machine(), (offset & 0x01) ? "COIN" : "DSW3"); else - data = input_port_read(space->machine(), (offset & 0x01) ? "P2" : "P1"); + data = input_port_read(machine(), (offset & 0x01) ? "P2" : "P1"); break; case 0x01: if (offset & 0x02) - data = input_port_read(space->machine(), (offset & 0x01) ? "DSW1" : "DSW2"); + data = input_port_read(machine(), (offset & 0x01) ? "DSW1" : "DSW2"); break; } return data; } -static WRITE8_HANDLER( flkatck_ls138_w ) +WRITE8_MEMBER(flkatck_state::flkatck_ls138_w) { - flkatck_state *state = space->machine().driver_data<flkatck_state>(); switch ((offset & 0x1c) >> 2) { @@ -73,7 +72,7 @@ static WRITE8_HANDLER( flkatck_ls138_w ) soundlatch_w(space, 0, data); break; case 0x06: /* Cause interrupt on audio CPU */ - device_set_input_line(state->m_audiocpu, 0, HOLD_LINE); + device_set_input_line(m_audiocpu, 0, HOLD_LINE); break; case 0x07: /* watchdog reset */ watchdog_reset_w(space, 0, data); @@ -82,23 +81,21 @@ static WRITE8_HANDLER( flkatck_ls138_w ) } /* Protection - an external multiplyer connected to the sound CPU */ -static READ8_HANDLER( multiply_r ) +READ8_MEMBER(flkatck_state::multiply_r) { - flkatck_state *state = space->machine().driver_data<flkatck_state>(); - return (state->m_multiply_reg[0] * state->m_multiply_reg[1]) & 0xff; + return (m_multiply_reg[0] * m_multiply_reg[1]) & 0xff; } -static WRITE8_HANDLER( multiply_w ) +WRITE8_MEMBER(flkatck_state::multiply_w) { - flkatck_state *state = space->machine().driver_data<flkatck_state>(); - state->m_multiply_reg[offset] = data; + m_multiply_reg[offset] = data; } static ADDRESS_MAP_START( flkatck_map, AS_PROGRAM, 8, flkatck_state ) AM_RANGE(0x0000, 0x0007) AM_RAM_WRITE_LEGACY(flkatck_k007121_regs_w) /* 007121 registers */ AM_RANGE(0x0008, 0x03ff) AM_RAM /* RAM */ - AM_RANGE(0x0400, 0x041f) AM_READWRITE_LEGACY(flkatck_ls138_r, flkatck_ls138_w) /* inputs, DIPS, bankswitch, counters, sound command */ + AM_RANGE(0x0400, 0x041f) AM_READWRITE(flkatck_ls138_r, flkatck_ls138_w) /* inputs, DIPS, bankswitch, counters, sound command */ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE_LEGACY(paletteram_xBBBBBGGGGGRRRRR_le_w) AM_BASE_GENERIC(paletteram) /* palette */ AM_RANGE(0x1000, 0x1fff) AM_RAM /* RAM */ AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE_LEGACY(flkatck_k007121_w) AM_BASE(m_k007121_ram) /* Video RAM (007121) */ @@ -109,7 +106,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( flkatck_sound_map, AS_PROGRAM, 8, flkatck_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM */ AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */ - AM_RANGE(0x9000, 0x9000) AM_READWRITE_LEGACY(multiply_r, multiply_w) /* ??? */ + AM_RANGE(0x9000, 0x9000) AM_READWRITE(multiply_r, multiply_w) /* ??? */ // AM_RANGE(0x9001, 0x9001) AM_RAM /* ??? */ AM_RANGE(0x9004, 0x9004) AM_READNOP /* ??? */ AM_RANGE(0x9006, 0x9006) AM_WRITENOP /* ??? */ |