From 5a06342216d6bc7be22770263d103dbd0ed894c9 Mon Sep 17 00:00:00 2001 From: Fabio Priuli Date: Sat, 2 May 2009 10:53:04 +0000 Subject: [PATCH] number-to-tag conversions in CPU calls for most of drivers starting with 'G' --- src/mame/audio/gottlieb.c | 6 +++--- src/mame/drivers/gaelco.c | 16 ++++++++++------ src/mame/drivers/gaelco3d.c | 18 +++++++++--------- src/mame/drivers/gaiden.c | 20 ++++++++++---------- src/mame/drivers/galastrm.c | 2 +- src/mame/drivers/galivan.c | 16 ++++++++-------- src/mame/drivers/galpani2.c | 10 +++++----- src/mame/drivers/galspnbl.c | 4 ++-- src/mame/drivers/gamecstl.c | 29 +++++++++++++++++------------ src/mame/drivers/gameplan.c | 6 +++--- src/mame/drivers/gauntlet.c | 14 +++++++------- src/mame/drivers/gbusters.c | 4 ++-- src/mame/drivers/gcpinbal.c | 4 ++-- src/mame/drivers/getrivia.c | 4 ++-- src/mame/drivers/gijoe.c | 6 +++--- src/mame/drivers/gladiatr.c | 12 ++++++------ src/mame/drivers/gng.c | 3 +-- src/mame/drivers/go2000.c | 6 +++--- src/mame/drivers/goal92.c | 6 +++--- src/mame/drivers/goldstar.c | 36 ++++++++++++++++++------------------ src/mame/drivers/gotcha.c | 2 +- src/mame/drivers/gottlieb.c | 10 +++++----- src/mame/drivers/gpworld.c | 2 +- src/mame/drivers/gradius3.c | 8 ++++---- src/mame/drivers/grchamp.c | 6 +++--- src/mame/drivers/gridlee.c | 8 ++++---- src/mame/drivers/groundfx.c | 4 ++-- src/mame/drivers/gstream.c | 2 +- src/mame/drivers/gstriker.c | 21 ++++++++++----------- src/mame/drivers/guab.c | 14 +++++++------- src/mame/drivers/gunbustr.c | 4 ++-- src/mame/drivers/gundealr.c | 2 +- src/mame/video/gaelco2.c | 2 +- src/mame/video/gameplan.c | 2 +- src/mame/video/ginganin.c | 4 ++-- src/mame/video/gng.c | 2 +- src/mame/video/gradius3.c | 2 +- src/mame/video/groundfx.c | 2 +- 38 files changed, 163 insertions(+), 156 deletions(-) diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c index eb64cb73de7..65f13b476a6 100644 --- a/src/mame/audio/gottlieb.c +++ b/src/mame/audio/gottlieb.c @@ -96,7 +96,7 @@ static void gottlieb1_sh_w(const device_config *riot, UINT8 data) static void snd_interrupt(const device_config *device, int state) { - cpu_set_input_line(device->machine->cpu[1], M6502_IRQ_LINE, state); + cputag_set_input_line(device->machine, "audiocpu", M6502_IRQ_LINE, state); } @@ -109,7 +109,7 @@ static UINT8 r6532_portb_r(const device_config *device, UINT8 olddata) static void r6532_portb_w(const device_config *device, UINT8 newdata, UINT8 olddata) { /* unsure if this is ever used, but the NMI is connected to the RIOT's PB7 */ - cpu_set_input_line(device->machine->cpu[1], INPUT_LINE_NMI, (newdata & 0x80) ? CLEAR_LINE : ASSERT_LINE); + cputag_set_input_line(device->machine, "audiocpu", INPUT_LINE_NMI, (newdata & 0x80) ? CLEAR_LINE : ASSERT_LINE); } @@ -222,7 +222,7 @@ void gottlieb_knocker(running_machine *machine) /* callback for the timer */ static TIMER_CALLBACK( gottlieb_nmi_generate ) { - cpu_set_input_line(machine->cpu[1],INPUT_LINE_NMI,PULSE_LINE); + cputag_set_input_line(machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c index 8b2a193f4d4..908ca5e03d1 100644 --- a/src/mame/drivers/gaelco.c +++ b/src/mame/drivers/gaelco.c @@ -113,16 +113,19 @@ VIDEO_UPDATE( bigkarnk ); static WRITE16_HANDLER( bigkarnk_sound_command_w ) { - if (ACCESSING_BITS_0_7){ - soundlatch_w(space,0,data & 0xff); - cpu_set_input_line(space->machine->cpu[1],M6809_FIRQ_LINE,HOLD_LINE); + if (ACCESSING_BITS_0_7) + { + soundlatch_w(space, 0, data & 0xff); + cputag_set_input_line(space->machine, "audiocpu", M6809_FIRQ_LINE, HOLD_LINE); } } static WRITE16_HANDLER( bigkarnk_coin_w ) { - if (ACCESSING_BITS_0_7){ - switch ((offset >> 3)){ + if (ACCESSING_BITS_0_7) + { + switch ((offset >> 3)) + { case 0x00: /* Coin Lockouts */ case 0x01: coin_lockout_w( (offset >> 3) & 0x01, ~data & 0x01); @@ -277,7 +280,8 @@ static WRITE16_HANDLER( OKIM6295_bankswitch_w ) { UINT8 *RAM = memory_region(space->machine, "oki"); - if (ACCESSING_BITS_0_7){ + if (ACCESSING_BITS_0_7) + { memcpy(&RAM[0x30000], &RAM[0x40000 + (data & 0x0f)*0x10000], 0x10000); } } diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c index 579a1b48dac..2fbffff7297 100644 --- a/src/mame/drivers/gaelco3d.c +++ b/src/mame/drivers/gaelco3d.c @@ -202,7 +202,7 @@ static MACHINE_RESET( common ) memory_set_bank(machine, 1, 0); /* keep the TMS32031 halted until the code is ready to go */ - cpu_set_input_line(machine->cpu[1], INPUT_LINE_RESET, ASSERT_LINE); + cputag_set_input_line(machine, "tms", INPUT_LINE_RESET, ASSERT_LINE); for (i = 0; i < SOUND_CHANNELS; i++) { @@ -255,7 +255,7 @@ static INTERRUPT_GEN( vblank_gen ) static WRITE16_HANDLER( irq_ack_w ) { - cpu_set_input_line(space->machine->cpu[0], 2, CLEAR_LINE); + cputag_set_input_line(space->machine, "maincpu", 2, CLEAR_LINE); } @@ -308,7 +308,7 @@ static TIMER_CALLBACK( delayed_sound_w ) { logerror("delayed_sound_w(%02X)\n", param); sound_data = param; - cpu_set_input_line(machine->cpu[2], ADSP2115_IRQ2, ASSERT_LINE); + cputag_set_input_line(machine, "adsp", ADSP2115_IRQ2, ASSERT_LINE); } @@ -323,7 +323,7 @@ static WRITE16_HANDLER( sound_data_w ) static READ16_HANDLER( sound_data_r ) { logerror("sound_data_r(%02X)\n", sound_data); - cpu_set_input_line(space->machine->cpu[2], ADSP2115_IRQ2, CLEAR_LINE); + cputag_set_input_line(space->machine, "adsp", ADSP2115_IRQ2, CLEAR_LINE); return sound_data; } @@ -433,7 +433,7 @@ static WRITE16_HANDLER( tms_reset_w ) /* this is set to 0 while data is uploaded, then set to $ffff after it is done */ /* it does not ever appear to be touched after that */ logerror("%06X:tms_reset_w(%02X) = %08X & %08X\n", cpu_get_pc(space->cpu), offset, data, mem_mask); - cpu_set_input_line(space->machine->cpu[1], INPUT_LINE_RESET, (data == 0xffff) ? CLEAR_LINE : ASSERT_LINE); + cputag_set_input_line(space->machine, "tms", INPUT_LINE_RESET, (data == 0xffff) ? CLEAR_LINE : ASSERT_LINE); } @@ -443,7 +443,7 @@ static WRITE16_HANDLER( tms_irq_w ) /* done after uploading, and after modifying the comm area */ logerror("%06X:tms_irq_w(%02X) = %08X & %08X\n", cpu_get_pc(space->cpu), offset, data, mem_mask); if (ACCESSING_BITS_0_7) - cpu_set_input_line(space->machine->cpu[1], 0, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE); + cputag_set_input_line(space->machine, "tms", 0, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE); } @@ -550,7 +550,7 @@ static WRITE16_HANDLER( adsp_rombank_w ) static TIMER_CALLBACK( adsp_autobuffer_irq ) { /* get the index register */ - int reg = cpu_get_reg(machine->cpu[2], ADSP2100_I0 + adsp_ireg); + int reg = cpu_get_reg(cputag_get_cpu(machine, "adsp"), ADSP2100_I0 + adsp_ireg); /* copy the current data into the buffer */ // logerror("ADSP buffer: I%d=%04X incs=%04X size=%04X\n", adsp_ireg, reg, adsp_incs, adsp_size); @@ -567,11 +567,11 @@ static TIMER_CALLBACK( adsp_autobuffer_irq ) reg = adsp_ireg_base; /* generate the (internal, thats why the pulse) irq */ - generic_pulse_irq_line(machine->cpu[2], ADSP2105_IRQ1); + generic_pulse_irq_line(cputag_get_cpu(machine, "adsp"), ADSP2105_IRQ1); } /* store it */ - cpu_set_reg(machine->cpu[2], ADSP2100_I0 + adsp_ireg, reg); + cpu_set_reg(cputag_get_cpu(machine, "adsp"), ADSP2100_I0 + adsp_ireg, reg); } diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c index cdd998511a2..7f2f253e04d 100644 --- a/src/mame/drivers/gaiden.c +++ b/src/mame/drivers/gaiden.c @@ -162,17 +162,17 @@ WRITE16_HANDLER( gaiden_flip_w ); static WRITE16_HANDLER( gaiden_sound_command_w ) { - if (ACCESSING_BITS_0_7) soundlatch_w(space,0,data & 0xff); /* Ninja Gaiden */ - if (ACCESSING_BITS_8_15) soundlatch_w(space,0,data >> 8); /* Tecmo Knight */ - cpu_set_input_line(space->machine->cpu[1],INPUT_LINE_NMI,PULSE_LINE); + if (ACCESSING_BITS_0_7) soundlatch_w(space, 0, data & 0xff); /* Ninja Gaiden */ + if (ACCESSING_BITS_8_15) soundlatch_w(space, 0, data >> 8); /* Tecmo Knight */ + cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE); } static WRITE16_HANDLER( drgnbowl_sound_command_w ) { if (ACCESSING_BITS_8_15) { - soundlatch_w(space,0,data >> 8); - cpu_set_input_line(space->machine->cpu[1],0,HOLD_LINE); + soundlatch_w(space, 0, data >> 8); + cputag_set_input_line(space->machine, "audiocpu", 0, HOLD_LINE); } } @@ -806,7 +806,7 @@ GFXDECODE_END /* handler called by the 2203 emulator when the internal timers cause an IRQ */ static void irqhandler(const device_config *device, int irq) { - cpu_set_input_line(device->machine->cpu[1],0,irq ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(device->machine, "audiocpu", 0, irq ? ASSERT_LINE : CLEAR_LINE); } static const ym2203_interface ym2203_config = @@ -1333,8 +1333,8 @@ static DRIVER_INIT( wildfang ) /* sprite size Y = sprite size X */ gaiden_sprite_sizey = 0; - memory_install_read16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x07a006, 0x07a007, 0, 0, wildfang_protection_r); - memory_install_write16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x07a804, 0x07a805, 0, 0, wildfang_protection_w); + memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x07a006, 0x07a007, 0, 0, wildfang_protection_r); + memory_install_write16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x07a804, 0x07a805, 0, 0, wildfang_protection_w); } static DRIVER_INIT( raiga ) @@ -1342,8 +1342,8 @@ static DRIVER_INIT( raiga ) /* sprite size Y independent from sprite size X */ gaiden_sprite_sizey = 2; - memory_install_read16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x07a006, 0x07a007, 0, 0, raiga_protection_r); - memory_install_write16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x07a804, 0x07a805, 0, 0, raiga_protection_w); + memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x07a006, 0x07a007, 0, 0, raiga_protection_r); + memory_install_write16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x07a804, 0x07a805, 0, 0, raiga_protection_w); } static DRIVER_INIT( drgnbowl ) diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c index 911e9402f86..697ceaea1c1 100644 --- a/src/mame/drivers/galastrm.c +++ b/src/mame/drivers/galastrm.c @@ -64,7 +64,7 @@ static INTERRUPT_GEN( galastrm_interrupt ) static TIMER_CALLBACK( galastrm_interrupt6 ) { - cpu_set_input_line(machine->cpu[0], 6, HOLD_LINE); + cputag_set_input_line(machine, "maincpu", 6, HOLD_LINE); } diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c index d996be678a3..8923bdb1368 100644 --- a/src/mame/drivers/galivan.c +++ b/src/mame/drivers/galivan.c @@ -54,7 +54,7 @@ static MACHINE_RESET( galivan ) UINT8 *RAM = memory_region(machine, "maincpu"); memory_set_bankptr(machine, 1,&RAM[0x10000]); - device_reset(machine->cpu[0]); + device_reset(cputag_get_cpu(machine, "maincpu")); // layers = 0x60; } @@ -984,18 +984,18 @@ static WRITE8_HANDLER( youmab_84_w ) static DRIVER_INIT( youmab ) { - memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x82, 0x82, 0, 0, youmab_extra_bank_w); // banks rom at 0x8000? writes 0xff and 0x00 before executing code there - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x0000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(3)); + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x82, 0x82, 0, 0, youmab_extra_bank_w); // banks rom at 0x8000? writes 0xff and 0x00 before executing code there + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(3)); memory_set_bankptr(machine, 3, memory_region(machine, "maincpu") ); - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, (read8_space_func)SMH_BANK(2)); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, (read8_space_func)SMH_BANK(2)); memory_set_bankptr(machine, 2, memory_region(machine, "user2") ); - memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x81, 0x81, 0, 0, youmab_81_w); // ?? often, alternating values - memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x84, 0x84, 0, 0, youmab_84_w); // ?? often, sequence.. + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x81, 0x81, 0, 0, youmab_81_w); // ?? often, alternating values + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x84, 0x84, 0, 0, youmab_84_w); // ?? often, sequence.. - memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xd800, 0xd81f, 0, 0, (write8_space_func)SMH_NOP); // scrolling isn't here.. + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xd800, 0xd81f, 0, 0, (write8_space_func)SMH_NOP); // scrolling isn't here.. - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x8a, 0x8a, 0, 0, youmab_8a_r); // ??? + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x8a, 0x8a, 0, 0, youmab_8a_r); // ??? } diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c index 8262215ba7f..1727962628f 100644 --- a/src/mame/drivers/galpani2.c +++ b/src/mame/drivers/galpani2.c @@ -81,7 +81,7 @@ static MACHINE_RESET( galpani2 ) static void galpani2_write_kaneko(running_machine *machine) { - const address_space *dstspace = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + const address_space *dstspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); memory_write_byte(dstspace,0x100000,0x4b); memory_write_byte(dstspace,0x100001,0x41); memory_write_byte(dstspace,0x100002,0x4e); @@ -92,8 +92,8 @@ static void galpani2_write_kaneko(running_machine *machine) void galpani2_mcu_run(running_machine *machine) { - const address_space *srcspace = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); - const address_space *dstspace = cpu_get_address_space(machine->cpu[1], ADDRESS_SPACE_PROGRAM); + const address_space *srcspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); + const address_space *dstspace = cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM); int i,x; /* Write "KANEKO" to 100000-100005, but do not clash with ram test */ @@ -113,8 +113,8 @@ void galpani2_mcu_run(running_machine *machine) static void galpani2_mcu_nmi(running_machine *machine) { - const address_space *srcspace = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); - const address_space *dstspace = cpu_get_address_space(machine->cpu[1], ADDRESS_SPACE_PROGRAM); + const address_space *srcspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); + const address_space *dstspace = cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM); UINT32 mcu_list, mcu_command, mcu_address, mcu_src, mcu_dst, mcu_size; /* "Last Check" */ diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c index 586055fed0b..a9cbf896145 100644 --- a/src/mame/drivers/galspnbl.c +++ b/src/mame/drivers/galspnbl.c @@ -39,7 +39,7 @@ static WRITE16_HANDLER( soundcommand_w ) if (ACCESSING_BITS_0_7) { soundlatch_w(space,offset,data & 0xff); - cpu_set_input_line(space->machine->cpu[1],INPUT_LINE_NMI,PULSE_LINE); + cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE); } } @@ -196,7 +196,7 @@ GFXDECODE_END static void irqhandler(const device_config *device, int linestate) { - cpu_set_input_line(device->machine->cpu[1],0,linestate); + cputag_set_input_line(device->machine, "audiocpu", 0, linestate); } static const ym3812_interface ym3812_config = diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c index 4005dc81337..3599962bc68 100644 --- a/src/mame/drivers/gamecstl.c +++ b/src/mame/drivers/gamecstl.c @@ -379,7 +379,8 @@ static READ8_HANDLER(at_page8_r) { UINT8 data = at_pages[offset % 0x10]; - switch(offset % 8) { + switch(offset % 8) + { case 1: data = dma_offset[(offset / 8) & 1][2]; break; @@ -401,7 +402,8 @@ static WRITE8_HANDLER(at_page8_w) { at_pages[offset % 0x10] = data; - switch(offset % 8) { + switch(offset % 8) + { case 1: dma_offset[(offset / 8) & 1][2] = data; break; @@ -420,7 +422,7 @@ static WRITE8_HANDLER(at_page8_w) static DMA8237_MEM_READ( pc_dma_read_byte ) { - const address_space *space = cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM); offs_t page_offset = (((offs_t) dma_offset[0][channel]) << 16) & 0xFF0000; @@ -430,7 +432,7 @@ static DMA8237_MEM_READ( pc_dma_read_byte ) static DMA8237_MEM_WRITE( pc_dma_write_byte ) { - const address_space *space = cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM); offs_t page_offset = (((offs_t) dma_offset[0][channel]) << 16) & 0xFF0000; @@ -591,7 +593,7 @@ static MACHINE_RESET(gamecstl) { memory_set_bankptr(machine, 1, memory_region(machine, "user1") + 0x30000); - cpu_set_irq_callback(machine->cpu[0], irq_callback); + cpu_set_irq_callback(cputag_get_cpu(machine, "maincpu"), irq_callback); } @@ -601,12 +603,14 @@ static MACHINE_RESET(gamecstl) * *************************************************************/ -static PIC8259_SET_INT_LINE( gamecstl_pic8259_1_set_int_line ) { - cpu_set_input_line(device->machine->cpu[0], 0, interrupt ? HOLD_LINE : CLEAR_LINE); +static PIC8259_SET_INT_LINE( gamecstl_pic8259_1_set_int_line ) +{ + cputag_set_input_line(device->machine, "maincpu", 0, interrupt ? HOLD_LINE : CLEAR_LINE); } -static PIC8259_SET_INT_LINE( gamecstl_pic8259_2_set_int_line ) { +static PIC8259_SET_INT_LINE( gamecstl_pic8259_2_set_int_line ) +{ pic8259_set_irq_line( gamecstl_devices.pic8259_1, 2, interrupt); } @@ -694,7 +698,7 @@ MACHINE_DRIVER_END static void set_gate_a20(running_machine *machine, int a20) { - cpu_set_input_line(machine->cpu[0], INPUT_LINE_A20, a20); + cputag_set_input_line(machine, "maincpu", INPUT_LINE_A20, a20); } static void keyboard_interrupt(running_machine *machine, int state) @@ -707,7 +711,8 @@ static void ide_interrupt(const device_config *device, int state) pic8259_set_irq_line( gamecstl_devices.pic8259_2, 6, state); } -static int gamecstl_get_out2(running_machine *machine) { +static int gamecstl_get_out2(running_machine *machine) +{ return pit8253_get_output( gamecstl_devices.pit8254, 2 ); } @@ -716,7 +721,8 @@ static const struct kbdc8042_interface at8042 = KBDC8042_AT386, set_gate_a20, keyboard_interrupt, gamecstl_get_out2 }; -static void gamecstl_set_keyb_int(running_machine *machine, int state) { +static void gamecstl_set_keyb_int(running_machine *machine, int state) +{ pic8259_set_irq_line(gamecstl_devices.pic8259_1, 1, state); } @@ -761,4 +767,3 @@ ROM_END GAME(2002, gamecstl, 0, gamecstl, gamecstl, gamecstl, ROT0, "Cristaltec", "GameCristal", GAME_NOT_WORKING | GAME_NO_SOUND) GAME(2002, gamecst2, gamecstl, gamecstl, gamecstl, gamecstl, ROT0, "Cristaltec", "GameCristal (version 2.613)", GAME_NOT_WORKING | GAME_NO_SOUND) - diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c index 7e60ce1ddd8..c21cab5848f 100644 --- a/src/mame/drivers/gameplan.c +++ b/src/mame/drivers/gameplan.c @@ -140,7 +140,7 @@ static const via6522_interface via_1_interface = static WRITE8_DEVICE_HANDLER( audio_reset_w ) { gameplan_state *state = (gameplan_state *)device->machine->driver_data; - cpu_set_input_line(device->machine->cpu[1], INPUT_LINE_RESET, data ? CLEAR_LINE : ASSERT_LINE); + cputag_set_input_line(device->machine, "audiocpu", INPUT_LINE_RESET, data ? CLEAR_LINE : ASSERT_LINE); if (data == 0) { device_reset(state->riot); @@ -182,7 +182,7 @@ static const via6522_interface via_2_interface = static void r6532_irq(const device_config *device, int state) { - cpu_set_input_line(device->machine->cpu[1], 0, state); + cputag_set_input_line(device->machine, "audiocpu", 0, state); if (state == ASSERT_LINE) cpuexec_boost_interleave(device->machine, attotime_zero, ATTOTIME_IN_USEC(10)); } @@ -190,7 +190,7 @@ static void r6532_irq(const device_config *device, int state) static void r6532_soundlatch_w(const device_config *device, UINT8 newdata, UINT8 olddata) { - const address_space *space = cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM); soundlatch_w(space, 0, newdata); } diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c index 0de7849e485..90d03620b7d 100644 --- a/src/mame/drivers/gauntlet.c +++ b/src/mame/drivers/gauntlet.c @@ -149,18 +149,18 @@ static UINT16 sound_reset_val; static void update_interrupts(running_machine *machine) { - cpu_set_input_line(machine->cpu[0], 4, atarigen_video_int_state ? ASSERT_LINE : CLEAR_LINE); - cpu_set_input_line(machine->cpu[0], 6, atarigen_sound_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 4, atarigen_video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 6, atarigen_sound_int_state ? ASSERT_LINE : CLEAR_LINE); } static void scanline_update(const device_config *screen, int scanline) { - const address_space *space = cpu_get_address_space(screen->machine->cpu[1], ADDRESS_SPACE_PROGRAM); + const address_space *space = cputag_get_address_space(screen->machine, "audiocpu", ADDRESS_SPACE_PROGRAM); /* sound IRQ is on 32V */ if (scanline & 32) - atarigen_6502_irq_gen(screen->machine->cpu[1]); + atarigen_6502_irq_gen(cputag_get_cpu(screen->machine, "audiocpu")); else atarigen_6502_irq_ack_r(space, 0); } @@ -175,7 +175,7 @@ static MACHINE_RESET( gauntlet ) atarigen_slapstic_reset(); atarigen_interrupt_reset(update_interrupts); atarigen_scanline_timer_reset(machine->primary_screen, scanline_update, 32); - atarigen_sound_io_reset(machine->cpu[1]); + atarigen_sound_io_reset(cputag_get_cpu(machine, "audiocpu")); } @@ -211,7 +211,7 @@ static WRITE16_HANDLER( sound_reset_w ) if ((oldword ^ sound_reset_val) & 1) { - cpu_set_input_line(space->machine->cpu[1], INPUT_LINE_RESET, (sound_reset_val & 1) ? CLEAR_LINE : ASSERT_LINE); + cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_RESET, (sound_reset_val & 1) ? CLEAR_LINE : ASSERT_LINE); atarigen_sound_reset(space->machine); } } @@ -1630,7 +1630,7 @@ static void gauntlet_common_init(running_machine *machine, int slapstic, int vin { UINT8 *rom = memory_region(machine, "maincpu"); atarigen_eeprom_default = NULL; - atarigen_slapstic_init(machine->cpu[0], 0x038000, 0, slapstic); + atarigen_slapstic_init(cputag_get_cpu(machine, "maincpu"), 0x038000, 0, slapstic); /* swap the top and bottom halves of the main CPU ROM images */ atarigen_swap_mem(rom + 0x000000, rom + 0x008000, 0x8000); diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index 53136b73b09..0a3322387de 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -104,7 +104,7 @@ char baf[40]; static WRITE8_HANDLER( gbusters_sh_irqtrigger_w ) { - cpu_set_input_line_and_vector(space->machine->cpu[1],0,HOLD_LINE,0xff); + cputag_set_input_line_and_vector(space->machine, "audiocpu", 0, HOLD_LINE, 0xff); } static WRITE8_DEVICE_HANDLER( gbusters_snd_bankswitch_w ) @@ -368,7 +368,7 @@ static MACHINE_RESET( gbusters ) { UINT8 *RAM = memory_region(machine, "maincpu"); - konami_configure_set_lines(machine->cpu[0], gbusters_banking); + konami_configure_set_lines(cputag_get_cpu(machine, "maincpu"), gbusters_banking); /* mirror address for banked ROM */ memcpy(&RAM[0x18000], &RAM[0x10000], 0x08000 ); diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c index a0b42bdb173..9d30cefe0e0 100644 --- a/src/mame/drivers/gcpinbal.c +++ b/src/mame/drivers/gcpinbal.c @@ -46,7 +46,7 @@ static int start, end, bank; static TIMER_CALLBACK( gcpinbal_interrupt1 ) { - cpu_set_input_line(machine->cpu[0],1,HOLD_LINE); + cputag_set_input_line(machine, "maincpu", 1, HOLD_LINE); } #ifdef UNUSED_FUNCTION @@ -55,7 +55,7 @@ static TIMER_CALLBACK( gcpinbal_interrupt3 ) // IRQ3 is from the M6585 // if (!ADPCM_playing(0)) { - cpu_set_input_line(machine->cpu[0],3,HOLD_LINE); + cputag_set_input_line(machine, "maincpu", 3, HOLD_LINE); } } #endif diff --git a/src/mame/drivers/getrivia.c b/src/mame/drivers/getrivia.c index 08a48451d97..44efcea31b3 100644 --- a/src/mame/drivers/getrivia.c +++ b/src/mame/drivers/getrivia.c @@ -138,7 +138,7 @@ static WRITE8_DEVICE_HANDLER( lamps_w ) static WRITE8_DEVICE_HANDLER( sound_w ) { - const address_space *space = cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + const address_space *space = cputag_get_address_space(device->machine, "cpu", ADDRESS_SPACE_PROGRAM); /* bit 3 - coin lockout, lamp10 in poker / lamp6 in trivia test modes */ coin_lockout_global_w(~data & 0x08); @@ -179,7 +179,7 @@ static WRITE8_DEVICE_HANDLER( lamps2_w ) static WRITE8_DEVICE_HANDLER( nmi_w ) { - const address_space *space = cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + const address_space *space = cputag_get_address_space(device->machine, "cpu", ADDRESS_SPACE_PROGRAM); /* bit 4 - play/raise button lamp, lamp 9 in selection test mode */ set_led_status(8,data & 0x10); diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index aa82fd9c0a1..d094fea8898 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -151,7 +151,7 @@ static void gijoe_objdma(void) static TIMER_CALLBACK( dmaend_callback ) { if (cur_control2 & 0x0020) - cpu_set_input_line(machine->cpu[0], 6, HOLD_LINE); + cputag_set_input_line(machine, "maincpu", 6, HOLD_LINE); } static INTERRUPT_GEN( gijoe_interrupt ) @@ -182,7 +182,7 @@ static WRITE16_HANDLER( sound_cmd_w ) static WRITE16_HANDLER( sound_irq_w ) { - cpu_set_input_line(space->machine->cpu[1], 0, HOLD_LINE); + cputag_set_input_line(space->machine, "audiocpu", 0, HOLD_LINE); } static READ16_HANDLER( sound_status_r ) @@ -192,7 +192,7 @@ static READ16_HANDLER( sound_status_r ) static void sound_nmi(const device_config *device) { - cpu_set_input_line(device->machine->cpu[1], INPUT_LINE_NMI, PULSE_LINE); + cputag_set_input_line(device->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE); } static MACHINE_START( gijoe ) diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c index 5911756708a..1f3b646bf94 100644 --- a/src/mame/drivers/gladiatr.c +++ b/src/mame/drivers/gladiatr.c @@ -272,7 +272,7 @@ static MACHINE_RESET( gladiator ) { UINT8 *rom = memory_region(machine, "audiocpu") + 0x10000; memory_set_bankptr(machine, 2,rom); - device_reset(machine->cpu[2]); + device_reset(cputag_get_cpu(machine, "audiocpu")); } } @@ -287,7 +287,7 @@ static WRITE8_DEVICE_HANDLER( gladiator_int_control_w ) static void gladiator_ym_irq(const device_config *device, int irq) { /* NMI IRQ is not used by gladiator sound program */ - cpu_set_input_line(device->machine->cpu[1], INPUT_LINE_NMI, irq ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(device->machine, "sub", INPUT_LINE_NMI, irq ? ASSERT_LINE : CLEAR_LINE); } /*Sound Functions*/ @@ -306,12 +306,12 @@ static WRITE8_DEVICE_HANDLER( glad_adpcm_w ) static WRITE8_HANDLER( glad_cpu_sound_command_w ) { soundlatch_w(space,0,data); - cpu_set_input_line(space->machine->cpu[2], INPUT_LINE_NMI, ASSERT_LINE); + cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, ASSERT_LINE); } static READ8_HANDLER( glad_cpu_sound_command_r ) { - cpu_set_input_line(space->machine->cpu[2], INPUT_LINE_NMI, CLEAR_LINE); + cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, CLEAR_LINE); return soundlatch_r(space,0); } @@ -325,7 +325,7 @@ static WRITE8_HANDLER( gladiatr_flipscreen_w ) /* !!!!! patch to IRQ timming for 2nd CPU !!!!! */ static WRITE8_HANDLER( gladiatr_irq_patch_w ) { - cpu_set_input_line(space->machine->cpu[1],0,HOLD_LINE); + cputag_set_input_line(space->machine, "audiocpu", 0, HOLD_LINE); } #endif @@ -1047,7 +1047,7 @@ static DRIVER_INIT(ppking) } } - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xf6a3,0xf6a3,0,0, f6a3_r ); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf6a3,0xf6a3,0,0, f6a3_r ); } diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c index 152a250123c..3e3124f6dba 100644 --- a/src/mame/drivers/gng.c +++ b/src/mame/drivers/gng.c @@ -691,7 +691,7 @@ static READ8_HANDLER( diamond_hack_r ) static DRIVER_INIT( diamond ) { - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x6000, 0x6000, 0, 0, diamond_hack_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x6000, 0, 0, diamond_hack_r); } @@ -705,4 +705,3 @@ GAME( 1985, makaimur, gng, gng, makaimur, 0, ROT0, "Capcom", "Makai-Mura (Jap GAME( 1985, makaimuc, gng, gng, makaimur, 0, ROT0, "Capcom", "Makai-Mura (Japan Revision C)", GAME_SUPPORTS_SAVE ) GAME( 1985, makaimug, gng, gng, makaimur, 0, ROT0, "Capcom", "Makai-Mura (Japan Revision G)", GAME_SUPPORTS_SAVE ) GAME( 1989, diamond, 0, gng, diamond, diamond, ROT0, "KH Video", "Diamond Run", GAME_SUPPORTS_SAVE ) - diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index 6e110a5ddd0..32c0824008b 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -39,8 +39,8 @@ static UINT16* go2000_video2; static WRITE16_HANDLER( sound_cmd_w ) { - soundlatch_w(space,offset,data & 0xff); - cpu_set_input_line(space->machine->cpu[1], 0, HOLD_LINE); + soundlatch_w(space, offset, data & 0xff); + cputag_set_input_line(space->machine, "soundcpu", 0, HOLD_LINE); } static ADDRESS_MAP_START( go2000_map, ADDRESS_SPACE_PROGRAM, 16 ) @@ -283,7 +283,7 @@ static VIDEO_UPDATE(go2000) static MACHINE_RESET(go2000) { - const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); go2000_pcm_1_bankswitch_w(space, 0, 0); } diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c index 2f6bd634454..f7260518109 100644 --- a/src/mame/drivers/goal92.c +++ b/src/mame/drivers/goal92.c @@ -33,7 +33,7 @@ static WRITE16_HANDLER( goal92_sound_command_w ) if (ACCESSING_BITS_8_15) { soundlatch_w(space, 0, (data >> 8) & 0xff); - cpu_set_input_line(space->machine->cpu[1],0,HOLD_LINE); + cputag_set_input_line(space->machine, "audiocpu", 0, HOLD_LINE); } } @@ -228,7 +228,7 @@ INPUT_PORTS_END /* handler called by the 2203 emulator when the internal timers cause an IRQ */ static void irqhandler(const device_config *device, int irq) { - cpu_set_input_line(device->machine->cpu[1], INPUT_LINE_NMI, irq ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(device->machine, "audiocpu", INPUT_LINE_NMI, irq ? ASSERT_LINE : CLEAR_LINE); } static const ym2203_interface ym2203_config = @@ -250,7 +250,7 @@ static void goal92_adpcm_int(const device_config *device) toggle ^= 1; if(toggle) - cpu_set_input_line(device->machine->cpu[1], INPUT_LINE_NMI, PULSE_LINE); + cputag_set_input_line(device->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE); } static const msm5205_interface msm5205_config = diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index f04ecd98ae1..ab70cb0655b 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -7215,8 +7215,8 @@ static DRIVER_INIT( schery97 ) ROM[i] = x; } - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x1d, 0x1d, 0, 0, fixedvala8_r); - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x2a, 0x2a, 0, 0, fixedvalb4_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x1d, 0x1d, 0, 0, fixedvala8_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x2a, 0x2a, 0, 0, fixedvalb4_r); /* Oki 6295 at 0x20 */ } @@ -7245,7 +7245,7 @@ static DRIVER_INIT( schery97a ) - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x16, 0x16, 0, 0, fixedval38_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x16, 0x16, 0, 0, fixedval38_r); /* Oki 6295 at 0x20 */ } @@ -7272,7 +7272,7 @@ static DRIVER_INIT( skill98 ) ROM[i] = x; } - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x1e, 0x1e, 0, 0, fixedvalea_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x1e, 0x1e, 0, 0, fixedvalea_r); /* Oki 6295 at 0x20 */ } @@ -7299,7 +7299,7 @@ static DRIVER_INIT( fb36xc1 ) ROM[i] = x; } - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x31, 0x31, 0, 0, fixedval68_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x31, 0x31, 0, 0, fixedval68_r); } @@ -7335,11 +7335,11 @@ static DRIVER_INIT( fbse354 ) ROM[i] = x; } // nfb96b needs both of these - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x23, 0x23, 0, 0, fixedval80_r); - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x5a, 0x5a, 0, 0, fixedvalaa_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x23, 0x23, 0, 0, fixedval80_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x5a, 0x5a, 0, 0, fixedvalaa_r); // csel96b - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x6e, 0x6e, 0, 0, fixedval96_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x6e, 0x6e, 0, 0, fixedval96_r); } @@ -7366,7 +7366,7 @@ static DRIVER_INIT( fbse362 ) ROM[i] = x; } - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x2e, 0x2e, 0, 0, fixedvalbe_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x2e, 0x2e, 0, 0, fixedvalbe_r); } @@ -7397,8 +7397,8 @@ static DRIVER_INIT( rp35 ) ROM[i] = x; } - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x5e, 0x5e, 0, 0, fixedval84_r); - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x36, 0x36, 0, 0, fixedval90_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x5e, 0x5e, 0, 0, fixedval84_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x36, 0x36, 0, 0, fixedval90_r); } static READ8_HANDLER( fixedvalb2_r ) @@ -7424,7 +7424,7 @@ static DRIVER_INIT( rp36 ) ROM[i] = x; } - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x34, 0x34, 0, 0, fixedvalb2_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x34, 0x34, 0, 0, fixedvalb2_r); } static READ8_HANDLER( fixedval48_r ) @@ -7450,7 +7450,7 @@ static DRIVER_INIT( rp36c3 ) ROM[i] = x; } - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x17, 0x17, 0, 0, fixedval48_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x17, 0x17, 0, 0, fixedval48_r); } static READ8_HANDLER( fixedval09_r ) @@ -7481,8 +7481,8 @@ static DRIVER_INIT( po33 ) ROM[i] = x; } - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x32, 0x32, 0, 0, fixedval74_r); - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x12, 0x12, 0, 0, fixedval09_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x32, 0x32, 0, 0, fixedval74_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x12, 0x12, 0, 0, fixedval09_r); /* oki6295 at 0x20 */ } @@ -7509,7 +7509,7 @@ static DRIVER_INIT( tc132axt ) ROM[i] = x; } - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x21, 0x21, 0, 0, fixedval58_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x21, 0x21, 0, 0, fixedval58_r); } static READ8_HANDLER( fixedvale4_r ) @@ -7540,8 +7540,8 @@ static DRIVER_INIT( match133 ) ROM[i] = x; } - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x16, 0x16, 0, 0, fixedvalc7_r); - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x1a, 0x1a, 0, 0, fixedvale4_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x16, 0x16, 0, 0, fixedvalc7_r); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x1a, 0x1a, 0, 0, fixedvale4_r); } diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c index 726747c0203..df706912445 100644 --- a/src/mame/drivers/gotcha.c +++ b/src/mame/drivers/gotcha.c @@ -249,7 +249,7 @@ GFXDECODE_END static void irqhandler(const device_config *device, int linestate) { - cpu_set_input_line(device->machine->cpu[1],0,linestate); + cputag_set_input_line(device->machine, "audiocpu", 0, linestate); } static const ym2151_interface ym2151_config = diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c index 17319440d1e..ed0e6b859ba 100644 --- a/src/mame/drivers/gottlieb.c +++ b/src/mame/drivers/gottlieb.c @@ -257,9 +257,9 @@ static MACHINE_START( gottlieb ) if (laserdisc != NULL) { /* attach to the I/O ports */ - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x05805, 0x05807, 0, 0x07f8, laserdisc_status_r); - memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x05805, 0x05805, 0, 0x07f8, laserdisc_command_w); /* command for the player */ - memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x05806, 0x05806, 0, 0x07f8, laserdisc_select_w); + memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x05805, 0x05807, 0, 0x07f8, laserdisc_status_r); + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x05805, 0x05805, 0, 0x07f8, laserdisc_command_w); /* command for the player */ + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x05806, 0x05806, 0, 0x07f8, laserdisc_select_w); /* allocate a timer for serial transmission, and one for philips code processing */ laserdisc_bit_timer = timer_alloc(machine, laserdisc_bit_callback, NULL); @@ -664,7 +664,7 @@ static void laserdisc_audio_process(const device_config *device, int samplerate, static TIMER_CALLBACK( nmi_clear ) { - cpu_set_input_line(machine->cpu[0], INPUT_LINE_NMI, CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", INPUT_LINE_NMI, CLEAR_LINE); } @@ -2540,7 +2540,7 @@ static DRIVER_INIT( romtiles ) static DRIVER_INIT( stooges ) { DRIVER_INIT_CALL(ramtiles); - memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x05803, 0x05803, 0, 0x07f8, stooges_output_w); + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x05803, 0x05803, 0, 0x07f8, stooges_output_w); } diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c index f2f3952274d..e830bd47b7c 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -407,7 +407,7 @@ INPUT_PORTS_END static TIMER_CALLBACK( irq_stop ) { - cpu_set_input_line(machine->cpu[0], 0, CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 0, CLEAR_LINE); } static INTERRUPT_GEN( vblank_callback_gpworld ) diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c index 888c70c4a54..ca816a63026 100644 --- a/src/mame/drivers/gradius3.c +++ b/src/mame/drivers/gradius3.c @@ -83,7 +83,7 @@ static int irqAen,irqBmask; static MACHINE_RESET( gradius3 ) { /* start with cpu B halted */ - cpu_set_input_line(machine->cpu[1], INPUT_LINE_RESET, ASSERT_LINE); + cputag_set_input_line(machine, "sub", INPUT_LINE_RESET, ASSERT_LINE); irqAen = 0; irqBmask = 0; } @@ -102,7 +102,7 @@ static WRITE16_HANDLER( cpuA_ctrl_w ) gradius3_priority = data & 0x04; /* bit 3 enables cpu B */ - cpu_set_input_line(space->machine->cpu[1], INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE); + cputag_set_input_line(space->machine, "sub", INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE); /* bit 5 enables irq */ irqAen = data & 0x20; @@ -143,7 +143,7 @@ static WRITE16_HANDLER( cpuB_irqtrigger_w ) if (irqBmask & 4) { logerror("%04x trigger cpu B irq 4 %02x\n",cpu_get_pc(space->cpu),data); - cpu_set_input_line(space->machine->cpu[1],4,HOLD_LINE); + cputag_set_input_line(space->machine, "sub", 4, HOLD_LINE); } else logerror("%04x MISSED cpu B irq 4 %02x\n",cpu_get_pc(space->cpu),data); @@ -157,7 +157,7 @@ static WRITE16_HANDLER( sound_command_w ) static WRITE16_HANDLER( sound_irq_w ) { - cpu_set_input_line_and_vector(space->machine->cpu[2],0,HOLD_LINE,0xff); + cputag_set_input_line_and_vector(space->machine, "audiocpu", 0, HOLD_LINE, 0xff); } static WRITE8_DEVICE_HANDLER( sound_bank_w ) diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c index 690795b46cb..597ed2e5f0b 100644 --- a/src/mame/drivers/grchamp.c +++ b/src/mame/drivers/grchamp.c @@ -132,7 +132,7 @@ static WRITE8_HANDLER( cpu0_outputs_w ) /* bit 6: FOG OUT */ /* bit 7: RADARON */ if ((diff & 0x01) && !(data & 0x01)) - cpu_set_input_line(space->machine->cpu[0], 0, CLEAR_LINE); + cputag_set_input_line(space->machine, "maincpu", 0, CLEAR_LINE); if ((diff & 0x02) && !(data & 0x02)) state->collide = state->collmode = 0; break; @@ -191,7 +191,7 @@ static WRITE8_HANDLER( cpu0_outputs_w ) case 0x0e: /* OUT14 */ /* O-21 connector */ soundlatch_w(space, 0, data); - cpu_set_input_line(space->machine->cpu[2], INPUT_LINE_NMI, PULSE_LINE); + cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE); break; } } @@ -272,7 +272,7 @@ static WRITE8_HANDLER( cpu1_outputs_w ) case 0x04: /* OUT4 */ /* bit 0: interrupt enable for CPU 1 */ if ((diff & 0x01) && !(data & 0x01)) - cpu_set_input_line(space->machine->cpu[1], 0, CLEAR_LINE); + cputag_set_input_line(space->machine, "sub", 0, CLEAR_LINE); break; case 0x05: /* OUT5 - unused */ diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c index 4807359102e..ef5b0600ab7 100644 --- a/src/mame/drivers/gridlee.c +++ b/src/mame/drivers/gridlee.c @@ -113,7 +113,7 @@ static emu_timer *firq_timer; static TIMER_CALLBACK( irq_off_tick ) { - cpu_set_input_line(machine->cpu[0], M6809_IRQ_LINE, CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", M6809_IRQ_LINE, CLEAR_LINE); } @@ -126,7 +126,7 @@ static TIMER_CALLBACK( irq_timer_tick ) timer_adjust_oneshot(irq_timer, video_screen_get_time_until_pos(machine->primary_screen, param + 64, 0), param + 64); /* IRQ starts on scanline 0, 64, 128, etc. */ - cpu_set_input_line(machine->cpu[0], M6809_IRQ_LINE, ASSERT_LINE); + cputag_set_input_line(machine, "maincpu", M6809_IRQ_LINE, ASSERT_LINE); /* it will turn off on the next HBLANK */ timer_adjust_oneshot(irq_off, video_screen_get_time_until_pos(machine->primary_screen, param, BALSENTE_HBSTART), 0); @@ -135,7 +135,7 @@ static TIMER_CALLBACK( irq_timer_tick ) static TIMER_CALLBACK( firq_off_tick ) { - cpu_set_input_line(machine->cpu[0], M6809_FIRQ_LINE, CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", M6809_FIRQ_LINE, CLEAR_LINE); } @@ -145,7 +145,7 @@ static TIMER_CALLBACK( firq_timer_tick ) timer_adjust_oneshot(firq_timer, video_screen_get_time_until_pos(machine->primary_screen, FIRQ_SCANLINE, 0), 0); /* IRQ starts on scanline FIRQ_SCANLINE? */ - cpu_set_input_line(machine->cpu[0], M6809_FIRQ_LINE, ASSERT_LINE); + cputag_set_input_line(machine, "maincpu", M6809_FIRQ_LINE, ASSERT_LINE); /* it will turn off on the next HBLANK */ timer_adjust_oneshot(firq_off, video_screen_get_time_until_pos(machine->primary_screen, FIRQ_SCANLINE, BALSENTE_HBSTART), 0); diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c index 0139e027850..b6b5a6b8e5c 100644 --- a/src/mame/drivers/groundfx.c +++ b/src/mame/drivers/groundfx.c @@ -107,7 +107,7 @@ static WRITE32_HANDLER( color_ram_w ) static TIMER_CALLBACK( groundfx_interrupt5 ) { - cpu_set_input_line(machine->cpu[0],5,HOLD_LINE); //from 5... ADC port + cputag_set_input_line(machine, "maincpu", 5, HOLD_LINE); //from 5... ADC port } @@ -472,7 +472,7 @@ static DRIVER_INIT( groundfx ) int data; /* Speedup handlers */ - memory_install_read32_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x20b574, 0x20b577, 0, 0, irq_speedup_r_groundfx); + memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x20b574, 0x20b577, 0, 0, irq_speedup_r_groundfx); /* make piv tile GFX format suitable for gfxdecode */ offset = size/2; diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index aec54dc755c..f43bccf40cb 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -519,7 +519,7 @@ static READ32_HANDLER( gstream_speedup_r ) static DRIVER_INIT( gstream ) { - memory_install_read32_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xd1ee0, 0xd1ee3, 0, 0, gstream_speedup_r ); + memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xd1ee0, 0xd1ee3, 0, 0, gstream_speedup_r ); } diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c index fb901e2f28b..feaa29a8e9b 100644 --- a/src/mame/drivers/gstriker.c +++ b/src/mame/drivers/gstriker.c @@ -202,8 +202,8 @@ static WRITE16_HANDLER( sound_command_w ) if (ACCESSING_BITS_0_7) { pending_command = 1; - soundlatch_w(space,offset,data & 0xff); - cpu_set_input_line(space->machine->cpu[1], INPUT_LINE_NMI, PULSE_LINE); + soundlatch_w(space, offset, data & 0xff); + cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE); } } @@ -270,9 +270,9 @@ GFXDECODE_END static void gs_ym2610_irq(const device_config *device, int irq) { if (irq) - cpu_set_input_line(device->machine->cpu[1], 0, ASSERT_LINE); + cputag_set_input_line(device->machine, "audiocpu", 0, ASSERT_LINE); else - cpu_set_input_line(device->machine->cpu[1], 0, CLEAR_LINE); + cputag_set_input_line(device->machine, "audiocpu", 0, CLEAR_LINE); } static const ym2610_interface ym2610_config = @@ -975,11 +975,11 @@ static void mcu_init( running_machine *machine ) pending_command = 0; mcu_data = 0; - memory_install_write16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x20008a, 0x20008b, 0, 0, twrldc94_mcu_w); - memory_install_read16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x20008a, 0x20008b, 0, 0, twrldc94_mcu_r); + memory_install_write16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x20008a, 0x20008b, 0, 0, twrldc94_mcu_w); + memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x20008a, 0x20008b, 0, 0, twrldc94_mcu_r); - memory_install_write16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x20008e, 0x20008f, 0, 0, twrldc94_prot_reg_w); - memory_install_read16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x20008e, 0x20008f, 0, 0, twrldc94_prot_reg_r); + memory_install_write16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x20008e, 0x20008f, 0, 0, twrldc94_prot_reg_w); + memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x20008e, 0x20008f, 0, 0, twrldc94_prot_reg_r); } static DRIVER_INIT( twrldc94 ) @@ -999,8 +999,8 @@ static DRIVER_INIT( vgoalsoc ) gametype = 3; mcu_init( machine ); - memory_install_write16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x200090, 0x200091, 0, 0, vbl_toggle_w); // vblank toggle - memory_install_read16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x200090, 0x200091, 0, 0, vbl_toggle_r); + memory_install_write16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200090, 0x200091, 0, 0, vbl_toggle_w); // vblank toggle + memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200090, 0x200091, 0, 0, vbl_toggle_r); } /*** GAME DRIVERS ************************************************************/ @@ -1012,4 +1012,3 @@ GAME( 1994, vgoalsoc, 0, vgoal, vgoalsoc, vgoalsoc, ROT0, "Tecmo", " GAME( 1994, vgoalsca, vgoalsoc, vgoal, vgoalsoc, vgoalsoc, ROT0, "Tecmo", "V Goal Soccer (set 2)", GAME_NOT_WORKING ) GAME( 1994, twrldc94, 0, twrldc94, twrldc94, twrldc94, ROT0, "Tecmo", "Tecmo World Cup '94 (set 1)", GAME_NOT_WORKING | GAME_UNEMULATED_PROTECTION | GAME_IMPERFECT_GRAPHICS ) GAME( 1994, twrdc94a, twrldc94, twrldc94, twrldc94, twrldc94a, ROT0, "Tecmo", "Tecmo World Cup '94 (set 2)", GAME_NOT_WORKING | GAME_UNEMULATED_PROTECTION | GAME_IMPERFECT_GRAPHICS ) - diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c index bad27ecb4b1..98150608b0a 100644 --- a/src/mame/drivers/guab.c +++ b/src/mame/drivers/guab.c @@ -59,7 +59,7 @@ enum int_levels static void ptm_irq(running_machine *machine, int state) { - cpu_set_input_line(machine->cpu[0], INT_6840PTM, state); + cputag_set_input_line(machine, "maincpu", INT_6840PTM, state); } static const ptm6840_interface ptm_intf = @@ -83,7 +83,7 @@ static const ptm6840_interface ptm_intf = static void tms_interrupt(running_machine *machine, int state) { - cpu_set_input_line(machine->cpu[0], INT_TMS34061, state); + cputag_set_input_line(machine, "maincpu", INT_TMS34061, state); } static const struct tms34061_interface tms34061intf = @@ -350,7 +350,7 @@ static TIMER_CALLBACK( fdc_data_callback ) } fdc.status |= DATA_REQUEST; - cpu_set_input_line(machine->cpu[0], INT_FLOPPYCTRL, ASSERT_LINE); + cputag_set_input_line(machine, "maincpu", INT_FLOPPYCTRL, ASSERT_LINE); } @@ -444,7 +444,7 @@ static WRITE16_HANDLER( wd1770_w ) fdc.sector)); /* Trigger a DRQ interrupt on the CPU */ - cpu_set_input_line(space->machine->cpu[0], INT_FLOPPYCTRL, ASSERT_LINE); + cputag_set_input_line(space->machine, "maincpu", INT_FLOPPYCTRL, ASSERT_LINE); fdc.status |= DATA_REQUEST; break; } @@ -489,7 +489,7 @@ static WRITE16_HANDLER( wd1770_w ) fdc.data = data; /* Clear the DRQ */ - cpu_set_input_line(space->machine->cpu[0], INT_FLOPPYCTRL, CLEAR_LINE); + cputag_set_input_line(space->machine, "maincpu", INT_FLOPPYCTRL, CLEAR_LINE); /* Queue an event to write the data if write command was specified */ if (fdc.cmd & 0x20) @@ -526,7 +526,7 @@ static READ16_HANDLER( wd1770_r ) retval = fdc.data; /* Clear the DRQ */ - cpu_set_input_line(space->machine->cpu[0], INT_FLOPPYCTRL, CLEAR_LINE); + cputag_set_input_line(space->machine, "maincpu", INT_FLOPPYCTRL, CLEAR_LINE); fdc.status &= ~DATA_REQUEST; break; } @@ -572,7 +572,7 @@ static INPUT_CHANGED( coin_inserted ) if (newval == 0) { UINT32 credit; - const address_space *space = cpu_get_address_space(field->port->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + const address_space *space = cputag_get_address_space(field->port->machine, "maincpu", ADDRESS_SPACE_PROGRAM); /* Get the current credit value and add the new coin value */ credit = memory_read_dword(space, 0x8002c) + (UINT32)(FPTR)param; diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c index a6c67a5ba21..55de621caa4 100644 --- a/src/mame/drivers/gunbustr.c +++ b/src/mame/drivers/gunbustr.c @@ -64,7 +64,7 @@ static UINT32 *gunbustr_ram; static TIMER_CALLBACK( gunbustr_interrupt5 ) { - cpu_set_input_line(machine->cpu[0],5,HOLD_LINE); + cputag_set_input_line(machine, "maincpu", 5, HOLD_LINE); } static INTERRUPT_GEN( gunbustr_interrupt ) @@ -419,7 +419,7 @@ static READ32_HANDLER( main_cycle_r ) static DRIVER_INIT( gunbustr ) { /* Speedup handler */ - memory_install_read32_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x203acc, 0x203acf, 0, 0, main_cycle_r); + memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x203acc, 0x203acf, 0, 0, main_cycle_r); } GAME( 1992, gunbustr, 0, gunbustr, gunbustr, gunbustr, ORIENTATION_FLIP_X, "Taito Corporation", "Gunbuster (Japan)", 0 ) diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c index e945de056ae..3f2960c8f64 100644 --- a/src/mame/drivers/gundealr.c +++ b/src/mame/drivers/gundealr.c @@ -567,7 +567,7 @@ static DRIVER_INIT( gundealr ) static DRIVER_INIT( yamyam ) { input_ports_hack = 1; - memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xe000, 0xe000, 0, 0, yamyam_protection_w); + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xe000, 0xe000, 0, 0, yamyam_protection_w); } diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index f6ca3caf002..de87be42b3c 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -509,7 +509,7 @@ VIDEO_UPDATE( gaelco2_dual ) VIDEO_EOF( gaelco2 ) { - const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); /* sprites are one frame ahead */ buffer_spriteram16_w(space, 0, 0, 0xffff); diff --git a/src/mame/video/gameplan.c b/src/mame/video/gameplan.c index a46009cc82c..9c8e4e909fb 100644 --- a/src/mame/video/gameplan.c +++ b/src/mame/video/gameplan.c @@ -214,7 +214,7 @@ static WRITE8_DEVICE_HANDLER( video_command_trigger_w ) static TIMER_CALLBACK( via_irq_delayed ) { - cpu_set_input_line(machine->cpu[0], 0, param); + cputag_set_input_line(machine, "maincpu", 0, param); } diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c index 32c542b7247..b06cb5c8e57 100644 --- a/src/mame/video/ginganin.c +++ b/src/mame/video/ginganin.c @@ -181,8 +181,8 @@ WRITE16_HANDLER( ginganin_vregs16_w ) tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); break; case 7: - soundlatch_w(space,0,data); - cpu_set_input_line(space->machine->cpu[1], INPUT_LINE_NMI, PULSE_LINE); + soundlatch_w(space, 0, data); + cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE); break; default: logerror("CPU #0 PC %06X : Warning, videoreg %04X <- %04X\n",cpu_get_pc(space->cpu),offset,data); diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c index be2d123cd24..65cae79c891 100644 --- a/src/mame/video/gng.c +++ b/src/mame/video/gng.c @@ -156,7 +156,7 @@ VIDEO_UPDATE( gng ) VIDEO_EOF( gng ) { - const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); buffer_spriteram_w(space,0,0); } diff --git a/src/mame/video/gradius3.c b/src/mame/video/gradius3.c index 5bda96bd62c..ed20c0dc2c7 100644 --- a/src/mame/video/gradius3.c +++ b/src/mame/video/gradius3.c @@ -113,7 +113,7 @@ WRITE16_HANDLER( gradius3_gfxram_w ) VIDEO_UPDATE( gradius3 ) { - const address_space *space = cpu_get_address_space(screen->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + const address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM); /* TODO: this kludge enforces the char banks. For some reason, they don't work otherwise. */ K052109_w(space,0x1d80,0x10); diff --git a/src/mame/video/groundfx.c b/src/mame/video/groundfx.c index 053491ab7b8..0b1373a8e8c 100644 --- a/src/mame/video/groundfx.c +++ b/src/mame/video/groundfx.c @@ -220,7 +220,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( groundfx ) { - const address_space *space = cpu_get_address_space(screen->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + const address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM); UINT8 layer[5]; UINT8 pivlayer[3]; UINT16 priority;