diff options
Diffstat (limited to 'src/mame/drivers/jedi.c')
-rw-r--r-- | src/mame/drivers/jedi.c | 56 |
1 files changed, 26 insertions, 30 deletions
diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c index 0c7454a0a86..f3ebcc547d5 100644 --- a/src/mame/drivers/jedi.c +++ b/src/mame/drivers/jedi.c @@ -140,9 +140,9 @@ static TIMER_CALLBACK( generate_interrupt ) } -static WRITE8_HANDLER( main_irq_ack_w ) +WRITE8_MEMBER(jedi_state::main_irq_ack_w) { - cputag_set_input_line(space->machine(), "maincpu", M6502_IRQ_LINE, CLEAR_LINE); + cputag_set_input_line(machine(), "maincpu", M6502_IRQ_LINE, CLEAR_LINE); } @@ -193,11 +193,11 @@ static MACHINE_RESET( jedi ) * *************************************/ -static WRITE8_HANDLER( rom_banksel_w ) +WRITE8_MEMBER(jedi_state::rom_banksel_w) { - if (data & 0x01) memory_set_bank(space->machine(), "bank1", 0); - if (data & 0x02) memory_set_bank(space->machine(), "bank1", 1); - if (data & 0x04) memory_set_bank(space->machine(), "bank1", 2); + if (data & 0x01) memory_set_bank(machine(), "bank1", 0); + if (data & 0x02) memory_set_bank(machine(), "bank1", 1); + if (data & 0x04) memory_set_bank(machine(), "bank1", 2); } @@ -208,32 +208,30 @@ static WRITE8_HANDLER( rom_banksel_w ) * *************************************/ -static READ8_HANDLER( a2d_data_r ) +READ8_MEMBER(jedi_state::a2d_data_r) { - jedi_state *state = space->machine().driver_data<jedi_state>(); UINT8 ret = 0; - switch (state->m_a2d_select) + switch (m_a2d_select) { - case 0: ret = input_port_read(space->machine(), "STICKY"); break; - case 2: ret = input_port_read(space->machine(), "STICKX"); break; + case 0: ret = input_port_read(machine(), "STICKY"); break; + case 2: ret = input_port_read(machine(), "STICKX"); break; } return ret; } -static WRITE8_HANDLER( a2d_select_w ) +WRITE8_MEMBER(jedi_state::a2d_select_w) { - jedi_state *state = space->machine().driver_data<jedi_state>(); - state->m_a2d_select = offset; + m_a2d_select = offset; } -static WRITE8_HANDLER( jedi_coin_counter_w ) +WRITE8_MEMBER(jedi_state::jedi_coin_counter_w) { - coin_counter_w(space->machine(), offset, data); + coin_counter_w(machine(), offset, data); } @@ -244,20 +242,18 @@ static WRITE8_HANDLER( jedi_coin_counter_w ) * *************************************/ -static WRITE8_HANDLER( nvram_data_w ) +WRITE8_MEMBER(jedi_state::nvram_data_w) { - jedi_state *state = space->machine().driver_data<jedi_state>(); - if (state->m_nvram_enabled) - state->m_nvram[offset] = data; + if (m_nvram_enabled) + m_nvram[offset] = data; } -static WRITE8_HANDLER( nvram_enable_w ) +WRITE8_MEMBER(jedi_state::nvram_enable_w) { - jedi_state *state = space->machine().driver_data<jedi_state>(); - state->m_nvram_enabled = ~offset & 1; + m_nvram_enabled = ~offset & 1; } @@ -270,26 +266,26 @@ static WRITE8_HANDLER( nvram_enable_w ) static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, jedi_state ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x0800, 0x08ff) AM_MIRROR(0x0300) AM_RAM_WRITE_LEGACY(nvram_data_w) AM_SHARE("nvram") + AM_RANGE(0x0800, 0x08ff) AM_MIRROR(0x0300) AM_RAM_WRITE(nvram_data_w) AM_SHARE("nvram") AM_RANGE(0x0c00, 0x0c00) AM_MIRROR(0x03fe) AM_READ_PORT("0c00") AM_WRITENOP AM_RANGE(0x0c01, 0x0c01) AM_MIRROR(0x03fe) AM_READ_PORT("0c01") AM_WRITENOP AM_RANGE(0x1000, 0x13ff) AM_NOP AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x03ff) AM_READ_LEGACY(jedi_audio_ack_latch_r) AM_WRITENOP - AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x03ff) AM_READ_LEGACY(a2d_data_r) AM_WRITENOP - AM_RANGE(0x1c00, 0x1c01) AM_MIRROR(0x007f) AM_READNOP AM_WRITE_LEGACY(nvram_enable_w) - AM_RANGE(0x1c80, 0x1c82) AM_MIRROR(0x0078) AM_READNOP AM_WRITE_LEGACY(a2d_select_w) + AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x03ff) AM_READ(a2d_data_r) AM_WRITENOP + AM_RANGE(0x1c00, 0x1c01) AM_MIRROR(0x007f) AM_READNOP AM_WRITE(nvram_enable_w) + AM_RANGE(0x1c80, 0x1c82) AM_MIRROR(0x0078) AM_READNOP AM_WRITE(a2d_select_w) AM_RANGE(0x1c83, 0x1c87) AM_MIRROR(0x0078) AM_NOP AM_RANGE(0x1d00, 0x1d00) AM_MIRROR(0x007f) AM_NOP /* write: NVRAM store */ AM_RANGE(0x1d80, 0x1d80) AM_MIRROR(0x007f) AM_READNOP AM_WRITE_LEGACY(watchdog_reset_w) - AM_RANGE(0x1e00, 0x1e00) AM_MIRROR(0x007f) AM_READNOP AM_WRITE_LEGACY(main_irq_ack_w) - AM_RANGE(0x1e80, 0x1e81) AM_MIRROR(0x0078) AM_READNOP AM_WRITE_LEGACY(jedi_coin_counter_w) + AM_RANGE(0x1e00, 0x1e00) AM_MIRROR(0x007f) AM_READNOP AM_WRITE(main_irq_ack_w) + AM_RANGE(0x1e80, 0x1e81) AM_MIRROR(0x0078) AM_READNOP AM_WRITE(jedi_coin_counter_w) AM_RANGE(0x1e82, 0x1e83) AM_MIRROR(0x0078) AM_NOP /* write: LED control - not used */ AM_RANGE(0x1e84, 0x1e84) AM_MIRROR(0x0078) AM_READNOP AM_WRITEONLY AM_BASE(m_foreground_bank) AM_RANGE(0x1e85, 0x1e85) AM_MIRROR(0x0078) AM_NOP AM_RANGE(0x1e86, 0x1e86) AM_MIRROR(0x0078) AM_READNOP AM_WRITE_LEGACY(jedi_audio_reset_w) AM_RANGE(0x1e87, 0x1e87) AM_MIRROR(0x0078) AM_READNOP AM_WRITEONLY AM_BASE(m_video_off) AM_RANGE(0x1f00, 0x1f00) AM_MIRROR(0x007f) AM_READNOP AM_WRITE_LEGACY(jedi_audio_latch_w) - AM_RANGE(0x1f80, 0x1f80) AM_MIRROR(0x007f) AM_READNOP AM_WRITE_LEGACY(rom_banksel_w) + AM_RANGE(0x1f80, 0x1f80) AM_MIRROR(0x007f) AM_READNOP AM_WRITE(rom_banksel_w) AM_RANGE(0x2000, 0x27ff) AM_RAM AM_BASE(m_backgroundram) AM_RANGE(0x2800, 0x2fff) AM_RAM AM_BASE(m_paletteram) AM_RANGE(0x3000, 0x37bf) AM_RAM AM_BASE(m_foregroundram) |