diff options
author | Aaron Giles <aaron@aarongiles.com> | 2010-07-07 19:27:01 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2010-07-07 19:27:01 +0000 |
commit | 65f8a15555ffecb57a65e447e428a4212ec33e4c (patch) | |
tree | 7ad726c0120ddb9238d48bdc9021bc765e481625 /src/mame/drivers/r2dtank.c | |
parent | b797437b3b3c356e0c39ed6eef44d15468167acf (diff) |
Time to kill off some deadwood.
First to go is devtag_get_device() (what a stupid name).
Use machine->device() instead.
This was strictly a bulk replace:
Search: devtag_get_device([ \t]*)\(([ \t]*)([^,]+),[ \t]*
Replace: \3->device\1\(\2
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 9f5fafccb59..c1bc32e5041 100644 --- a/src/mame/drivers/r2dtank.c +++ b/src/mame/drivers/r2dtank.c @@ -73,8 +73,8 @@ static WRITE_LINE_DEVICE_HANDLER( flipscreen_w ); static WRITE_LINE_DEVICE_HANDLER( main_cpu_irq ) { - running_device *pia0 = devtag_get_device(device->machine, "pia_main"); - running_device *pia1 = devtag_get_device(device->machine, "pia_audio"); + running_device *pia0 = device->machine->device("pia_main"); + running_device *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); @@ -150,10 +150,10 @@ static READ8_DEVICE_HANDLER( AY8910_port_r ) UINT8 ret = 0; if (AY8910_selected & 0x08) - ret = ay8910_r(devtag_get_device(device->machine, "ay1"), 0); + ret = ay8910_r(device->machine->device("ay1"), 0); if (AY8910_selected & 0x10) - ret = ay8910_r(devtag_get_device(device->machine, "ay2"), 0); + ret = ay8910_r(device->machine->device("ay2"), 0); return ret; } @@ -162,10 +162,10 @@ static READ8_DEVICE_HANDLER( AY8910_port_r ) static WRITE8_DEVICE_HANDLER( AY8910_port_w ) { if (AY8910_selected & 0x08) - ay8910_data_address_w(devtag_get_device(device->machine, "ay1"), AY8910_selected >> 2, data); + ay8910_data_address_w(device->machine->device("ay1"), AY8910_selected >> 2, data); if (AY8910_selected & 0x10) - ay8910_data_address_w(devtag_get_device(device->machine, "ay2"), AY8910_selected >> 2, data); + ay8910_data_address_w(device->machine->device("ay2"), AY8910_selected >> 2, data); } @@ -206,7 +206,7 @@ static const ay8910_interface ay8910_2_interface = static WRITE8_DEVICE_HANDLER( ttl74123_output_changed ) { - running_device *pia = devtag_get_device(device->machine, "pia_main"); + running_device *pia = device->machine->device("pia_main"); pia6821_ca1_w(pia, 0, data); ttl74123_output = data; } @@ -362,7 +362,7 @@ static MC6845_UPDATE_ROW( update_row ) static WRITE_LINE_DEVICE_HANDLER( display_enable_changed ) { - ttl74123_a_w(devtag_get_device(device->machine, "74123"), 0, state); + ttl74123_a_w(device->machine->device("74123"), 0, state); } @@ -383,7 +383,7 @@ static const mc6845_interface mc6845_intf = static VIDEO_UPDATE( r2dtank ) { - running_device *mc6845 = devtag_get_device(screen->machine, "crtc"); + running_device *mc6845 = screen->machine->device("crtc"); mc6845_update(mc6845, bitmap, cliprect); return 0; |