diff options
author | Aaron Giles <aaron@aarongiles.com> | 2011-05-03 23:02:37 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2011-05-03 23:02:37 +0000 |
commit | 262a97b1650763e3e514919c29869ef50b4bb664 (patch) | |
tree | e878ea7d4a9cbf6863546fff82fc57c42bbd6fcb /src/mame/drivers/r2dtank.c | |
parent | d18a4b79e1af5d176f3f721e4adee5663aa05ea1 (diff) |
Clean up 6821 PIA modernization, removing all trampolines. Some
grossness remains, to be dealt with in the future.
Diffstat (limited to 'src/mame/drivers/r2dtank.c')
-rw-r--r-- | src/mame/drivers/r2dtank.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c index c461a575ed6..737cfbce2ed 100644 --- a/src/mame/drivers/r2dtank.c +++ b/src/mame/drivers/r2dtank.c @@ -83,10 +83,10 @@ static WRITE_LINE_DEVICE_HANDLER( flipscreen_w ); static WRITE_LINE_DEVICE_HANDLER( main_cpu_irq ) { - device_t *pia0 = device->machine().device("pia_main"); - device_t *pia1 = device->machine().device("pia_audio"); - int combined_state = pia6821_get_irq_a(pia0) | pia6821_get_irq_b(pia0) | - pia6821_get_irq_a(pia1) | pia6821_get_irq_b(pia1); + pia6821_device *pia0 = device->machine().device<pia6821_device>("pia_main"); + pia6821_device *pia1 = device->machine().device<pia6821_device>("pia_audio"); + int combined_state = pia0->irq_a_state() | pia0->irq_b_state() | + pia1->irq_a_state() | pia1->irq_b_state(); cputag_set_input_line(device->machine(), "maincpu", M6809_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE); } @@ -220,8 +220,8 @@ static const ay8910_interface ay8910_2_interface = static WRITE8_DEVICE_HANDLER( ttl74123_output_changed ) { r2dtank_state *state = device->machine().driver_data<r2dtank_state>(); - device_t *pia = device->machine().device("pia_main"); - pia6821_ca1_w(pia, data); + pia6821_device *pia = device->machine().device<pia6821_device>("pia_main"); + pia->ca1_w(data); state->m_ttl74123_output = data; } @@ -415,7 +415,7 @@ static SCREEN_UPDATE( r2dtank ) static WRITE8_DEVICE_HANDLER( pia_comp_w ) { - pia6821_w(device, offset, ~data); + downcast<pia6821_device *>(device)->write(*memory_nonspecific_space(device->machine()), offset, ~data); } @@ -424,7 +424,7 @@ static ADDRESS_MAP_START( r2dtank_main_map, AS_PROGRAM, 8 ) AM_RANGE(0x2000, 0x3fff) AM_RAM AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE_MEMBER(r2dtank_state, m_colorram) AM_RANGE(0x6000, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0x8003) AM_DEVREADWRITE("pia_main", pia6821_r, pia_comp_w) + AM_RANGE(0x8000, 0x8003) AM_DEVREAD_MODERN("pia_main", pia6821_device, read) AM_DEVWRITE("pia_main", pia_comp_w) AM_RANGE(0x8004, 0x8004) AM_READWRITE(audio_answer_r, audio_command_w) AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("crtc", mc6845_address_w) AM_RANGE(0xb001, 0xb001) AM_DEVWRITE("crtc", mc6845_register_w) @@ -435,7 +435,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( r2dtank_audio_map, AS_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */ - AM_RANGE(0xd000, 0xd003) AM_DEVREADWRITE("pia_audio", pia6821_r, pia6821_w) + AM_RANGE(0xd000, 0xd003) AM_DEVREADWRITE_MODERN("pia_audio", pia6821_device, read, write) AM_RANGE(0xf000, 0xf000) AM_READWRITE(audio_command_r, audio_answer_w) AM_RANGE(0xf800, 0xffff) AM_ROM ADDRESS_MAP_END |