From 84f62ff4bf356665fc352d54ecafae9107f679d0 Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Sat, 15 Nov 2008 03:23:21 +0000 Subject: [PATCH] Another batch of compile fixes. --- src/mame/drivers/findout.c | 10 +++++++--- src/mame/drivers/firebeat.c | 12 ++++++------ src/mame/drivers/gameplan.c | 4 +++- src/mame/drivers/getrivia.c | 10 +++++++--- src/mame/video/combatsc.c | 4 ++-- src/mame/video/dooyong.c | 8 ++++++-- src/mame/video/gameplan.c | 7 +++++-- 7 files changed, 36 insertions(+), 19 deletions(-) diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c index 5259b93a171..c152408d69a 100644 --- a/src/mame/drivers/findout.c +++ b/src/mame/drivers/findout.c @@ -66,7 +66,9 @@ static READ8_DEVICE_HANDLER( portC_r ) static READ8_DEVICE_HANDLER( port1_r ) { - return input_port_read(device->machine, "IN0") | (ticket_dispenser_0_r(device->machine, 0) >> 5); + const address_space *space = cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + + return input_port_read(device->machine, "IN0") | (ticket_dispenser_0_r(space, 0) >> 5); } static WRITE8_DEVICE_HANDLER( lamps_w ) @@ -85,15 +87,17 @@ 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); + /* bit 3 - coin lockout (lamp6 in test modes, set to lamp 10 as in getrivia.c) */ coin_lockout_global_w(~data & 0x08); set_led_status(9,data & 0x08); /* bit 5 - ticket out in trivia games */ - ticket_dispenser_w(device->machine, 0, (data & 0x20)<< 2); + ticket_dispenser_w(space, 0, (data & 0x20)<< 2); /* bit 6 enables NMI */ - interrupt_enable_w(device->machine, 0,data & 0x40); + interrupt_enable_w(space, 0,data & 0x40); /* bit 7 goes directly to the sound amplifier */ dac_data_w(0,((data & 0x80) >> 7) * 255); diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c index 6da0dbe89a1..76d3df18d03 100644 --- a/src/mame/drivers/firebeat.c +++ b/src/mame/drivers/firebeat.c @@ -658,7 +658,7 @@ static READ32_HANDLER(gcu0_r) static WRITE32_HANDLER(gcu0_w) { - GCU_w(space, 0, offset, data, mem_mask); + GCU_w(space->machine, 0, offset, data, mem_mask); } static READ32_HANDLER(gcu1_r) @@ -668,7 +668,7 @@ static READ32_HANDLER(gcu1_r) static WRITE32_HANDLER(gcu1_w) { - GCU_w(space, 1, offset, data, mem_mask); + GCU_w(space->machine, 1, offset, data, mem_mask); } /*****************************************************************************/ @@ -1173,12 +1173,12 @@ static READ32_HANDLER( atapi_command_r ) // printf("atapi_command_r: %08X, %08X\n", offset, mem_mask); if (ACCESSING_BITS_16_31) { - r = atapi_command_reg_r(space, offset*2); + r = atapi_command_reg_r(space->machine, offset*2); return ATAPI_ENDIAN(r) << 16; } else { - r = atapi_command_reg_r(space, (offset*2) + 1); + r = atapi_command_reg_r(space->machine, (offset*2) + 1); return ATAPI_ENDIAN(r) << 0; } } @@ -1189,11 +1189,11 @@ static WRITE32_HANDLER( atapi_command_w ) if (ACCESSING_BITS_16_31) { - atapi_command_reg_w(space, offset*2, ATAPI_ENDIAN((data >> 16) & 0xffff)); + atapi_command_reg_w(space->machine, offset*2, ATAPI_ENDIAN((data >> 16) & 0xffff)); } else { - atapi_command_reg_w(space, (offset*2) + 1, ATAPI_ENDIAN((data >> 0) & 0xffff)); + atapi_command_reg_w(space->machine, (offset*2) + 1, ATAPI_ENDIAN((data >> 0) & 0xffff)); } } diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c index 19c0c2cf08f..0c37e3b8c80 100644 --- a/src/mame/drivers/gameplan.c +++ b/src/mame/drivers/gameplan.c @@ -178,7 +178,9 @@ static void r6532_irq(const device_config *device, int state) static void r6532_soundlatch_w(const device_config *device, UINT8 newdata, UINT8 olddata) { - soundlatch_w(device->machine, 0, newdata); + const address_space *space = cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + + soundlatch_w(space, 0, newdata); } diff --git a/src/mame/drivers/getrivia.c b/src/mame/drivers/getrivia.c index bc6fd5c3b4e..64594c1c1c5 100644 --- a/src/mame/drivers/getrivia.c +++ b/src/mame/drivers/getrivia.c @@ -137,15 +137,17 @@ 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); + /* bit 3 - coin lockout, lamp10 in poker / lamp6 in trivia test modes */ coin_lockout_global_w(~data & 0x08); set_led_status(9,data & 0x08); /* bit 5 - ticket out in trivia games */ - ticket_dispenser_w(device->machine,0, (data & 0x20)<< 2); + ticket_dispenser_w(space, 0, (data & 0x20)<< 2); /* bit 6 enables NMI */ - interrupt_enable_w(device->machine,0,data & 0x40); + interrupt_enable_w(space, 0, data & 0x40); /* bit 7 goes directly to the sound amplifier */ dac_data_w(0,((data & 0x80) >> 7) * 255); @@ -176,11 +178,13 @@ 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); + /* bit 4 - play/raise button lamp, lamp 9 in selection test mode */ set_led_status(8,data & 0x10); /* bit 6 enables NMI */ - interrupt_enable_w(device->machine,0,data & 0x40); + interrupt_enable_w(space, 0, data & 0x40); } static WRITE8_HANDLER( banksel_1_1_w ) diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index ddcb0560242..713d5cb5d71 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -431,7 +431,7 @@ WRITE8_HANDLER( combascb_bankselect_w ) MACHINE_RESET( combasc ) { UINT8 *MEM = memory_region(machine, "main") + 0x38000; - + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); combasc_io_ram = MEM + 0x0000; combasc_page[0] = MEM + 0x4000; @@ -442,7 +442,7 @@ MACHINE_RESET( combasc ) memset( combasc_page[1], 0x00, 0x2000 ); combasc_bank_select = -1; - combasc_bankselect_w( machine,0,0 ); + combasc_bankselect_w(space, 0, 0); } WRITE8_HANDLER( combasc_pf_control_w ) diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c index c8b0bb115c5..6c2dfab3663 100644 --- a/src/mame/video/dooyong.c +++ b/src/mame/video/dooyong.c @@ -904,10 +904,14 @@ VIDEO_START( popbingo ) VIDEO_EOF( dooyong ) { - buffer_spriteram_w(machine, 0, 0); + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + + buffer_spriteram_w(space, 0, 0); } VIDEO_EOF( rshark ) { - buffer_spriteram16_w(machine, 0, 0, 0xffff); + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + + buffer_spriteram16_w(space, 0, 0, 0xffff); } diff --git a/src/mame/video/gameplan.c b/src/mame/video/gameplan.c index 857d5ad8b02..a2fef88f043 100644 --- a/src/mame/video/gameplan.c +++ b/src/mame/video/gameplan.c @@ -142,8 +142,10 @@ static WRITE8_HANDLER( leprechn_video_command_w ) static TIMER_CALLBACK( clear_screen_done_callback ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + /* indicate that the we are done clearing the screen */ - via_0_ca1_w(machine, 0, 0); + via_0_ca1_w(space, 0, 0); } @@ -262,9 +264,10 @@ static const struct via6522_interface trvquest_via_0_interface = static TIMER_CALLBACK( via_0_ca1_timer_callback ) { gameplan_state *state = machine->driver_data; + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); /* !VBLANK is connected to CA1 */ - via_0_ca1_w(machine, 0, (UINT8)param); + via_0_ca1_w(space, 0, (UINT8)param); if (param) timer_adjust_oneshot(state->via_0_ca1_timer, video_screen_get_time_until_pos(machine->primary_screen, VBSTART, 0), 0);