From 763ddc92e6c7a6ef3ec47b1d8f08f88dd64cc0ba Mon Sep 17 00:00:00 2001 From: smf- Date: Sat, 15 Nov 2008 10:31:01 +0000 Subject: [PATCH] address space compilation errors. --- src/mame/audio/cage.c | 10 +++++----- src/mame/drivers/airbustr.c | 2 +- src/mame/machine/atari.c | 3 ++- src/mame/video/atari.c | 22 ++++++++++++---------- src/mame/video/gaelco2.c | 4 +++- src/mame/video/gtia.c | 6 ++++-- src/mame/video/itech8.c | 8 ++++---- src/mame/video/leland.c | 20 +++++++++++--------- 8 files changed, 42 insertions(+), 33 deletions(-) diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c index ab33eba6224..0563b53ad74 100644 --- a/src/mame/audio/cage.c +++ b/src/mame/audio/cage.c @@ -457,7 +457,7 @@ static void update_control_lines(running_machine *machine) if ((cage_control & 2) && cage_to_cpu_ready) reason |= CAGE_IRQ_REASON_DATA_READY; - (*cage_irqhandler)(Machine, reason); + (*cage_irqhandler)(machine, reason); } /* set the IOF input lines */ @@ -513,9 +513,9 @@ static READ32_HANDLER( cage_io_status_r ) UINT16 main_from_cage_r(const address_space *space) { if (LOG_COMM) - logerror("%06X:main read data = %04X\n", cpu_get_pc(Machine->activecpu), soundlatch_word_r(space, 0, 0)); + logerror("%06X:main read data = %04X\n", cpu_get_pc(space->machine->activecpu), soundlatch_word_r(space, 0, 0)); cage_to_cpu_ready = 0; - update_control_lines(Machine); + update_control_lines(space->machine); return soundlatch_word_r(space, 0, 0xffff); } @@ -557,7 +557,7 @@ void cage_control_w(running_machine *machine, UINT16 data) /* CPU is reset if both control lines are 0 */ if (!(cage_control & 3)) { - cpu_set_input_line(Machine->cpu[cage_cpu], INPUT_LINE_RESET, ASSERT_LINE); + cpu_set_input_line(machine->cpu[cage_cpu], INPUT_LINE_RESET, ASSERT_LINE); dma_enabled = 0; dma_timer_enabled = 0; @@ -574,7 +574,7 @@ void cage_control_w(running_machine *machine, UINT16 data) cage_to_cpu_ready = 0; } else - cpu_set_input_line(Machine->cpu[cage_cpu], INPUT_LINE_RESET, CLEAR_LINE); + cpu_set_input_line(machine->cpu[cage_cpu], INPUT_LINE_RESET, CLEAR_LINE); /* update the control state */ update_control_lines(machine); diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c index bde7832928c..3a5f941ddea 100644 --- a/src/mame/drivers/airbustr.c +++ b/src/mame/drivers/airbustr.c @@ -591,7 +591,7 @@ static INTERRUPT_GEN( slave_interrupt ) static MACHINE_RESET( airbustr ) { - address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); soundlatch_status = soundlatch2_status = 0; master_addr = 0xff; slave_addr = 0xfd; diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c index dcb2beb8b9f..81bad0d30f8 100644 --- a/src/mame/machine/atari.c +++ b/src/mame/machine/atari.c @@ -692,7 +692,8 @@ static void a800_setbank(running_machine *machine, int n) static void pokey_reset(running_machine *machine) { - pokey1_w(machine,15,0); + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + pokey1_w(space,15,0); } diff --git a/src/mame/video/atari.c b/src/mame/video/atari.c index 9a04ae74ba6..856f6caed9a 100644 --- a/src/mame/video/atari.c +++ b/src/mame/video/atari.c @@ -1183,6 +1183,8 @@ static TIMER_CALLBACK( antic_steal_cycles ) *****************************************************************************/ static TIMER_CALLBACK( antic_scanline_render ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + VIDEO *video = antic.video[antic.scanline]; LOG((" @cycle #%3d render mode $%X lines to go #%d\n", cycle(machine), (antic.cmd & 0x0f), antic.modelines)); @@ -1198,16 +1200,16 @@ static TIMER_CALLBACK( antic_scanline_render ) if( antic.w.dmactl & DMA_MISSILE ) { antic.steal_cycles += 1; - atari_gtia_w(machine, 0x11, RDPMGFXD(machine->cpu[0], 3*256)); + atari_gtia_w(space, 0x11, RDPMGFXD(machine->cpu[0], 3*256)); } /* transport player data to GTIA ? */ if( antic.w.dmactl & DMA_PLAYER ) { antic.steal_cycles += 4; - atari_gtia_w(machine, 0x0d, RDPMGFXD(machine->cpu[0], 4*256)); - atari_gtia_w(machine, 0x0e, RDPMGFXD(machine->cpu[0], 5*256)); - atari_gtia_w(machine, 0x0f, RDPMGFXD(machine->cpu[0], 6*256)); - atari_gtia_w(machine, 0x10, RDPMGFXD(machine->cpu[0], 7*256)); + atari_gtia_w(space, 0x0d, RDPMGFXD(machine->cpu[0], 4*256)); + atari_gtia_w(space, 0x0e, RDPMGFXD(machine->cpu[0], 5*256)); + atari_gtia_w(space, 0x0f, RDPMGFXD(machine->cpu[0], 6*256)); + atari_gtia_w(space, 0x10, RDPMGFXD(machine->cpu[0], 7*256)); } } else @@ -1217,17 +1219,17 @@ static TIMER_CALLBACK( antic_scanline_render ) { if( (antic.scanline & 1) == 0 ) /* even line ? */ antic.steal_cycles += 1; - atari_gtia_w(machine, 0x11, RDPMGFXS(machine->cpu[0], 3*128)); + atari_gtia_w(space, 0x11, RDPMGFXS(machine->cpu[0], 3*128)); } /* transport player data to GTIA ? */ if( antic.w.dmactl & DMA_PLAYER ) { if( (antic.scanline & 1) == 0 ) /* even line ? */ antic.steal_cycles += 4; - atari_gtia_w(machine, 0x0d, RDPMGFXS(machine->cpu[0], 4*128)); - atari_gtia_w(machine, 0x0e, RDPMGFXS(machine->cpu[0], 5*128)); - atari_gtia_w(machine, 0x0f, RDPMGFXS(machine->cpu[0], 6*128)); - atari_gtia_w(machine, 0x10, RDPMGFXS(machine->cpu[0], 7*128)); + atari_gtia_w(space, 0x0d, RDPMGFXS(machine->cpu[0], 4*128)); + atari_gtia_w(space, 0x0e, RDPMGFXS(machine->cpu[0], 5*128)); + atari_gtia_w(space, 0x0f, RDPMGFXS(machine->cpu[0], 6*128)); + atari_gtia_w(space, 0x10, RDPMGFXS(machine->cpu[0], 7*128)); } } } diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index d59b097111c..b78b3b0cf24 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -509,6 +509,8 @@ VIDEO_UPDATE( gaelco2_dual ) VIDEO_EOF( gaelco2 ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + /* sprites are one frame ahead */ - buffer_spriteram16_w(machine, 0, 0, 0xffff); + buffer_spriteram16_w(space, 0, 0, 0xffff); } diff --git a/src/mame/video/gtia.c b/src/mame/video/gtia.c index a9d7c647524..304bc9fc4ae 100644 --- a/src/mame/video/gtia.c +++ b/src/mame/video/gtia.c @@ -155,9 +155,11 @@ static int is_ntsc(running_machine *machine) static void gtia_reset(running_machine *machine) { int i; - /* reset the GTIA read/write/helper registers */ + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + + /* reset the GTIA read/write/helper registers */ for (i = 0; i < 32; i++) - atari_gtia_w(machine,i,0); + atari_gtia_w(space,i,0); memset(>ia.r, 0, sizeof(gtia.r)); if (is_ntsc(machine)) gtia.r.pal = 0xff; diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c index 6d995ca1a9c..b060ddc6bbc 100644 --- a/src/mame/video/itech8.c +++ b/src/mame/video/itech8.c @@ -308,7 +308,7 @@ INLINE void consume_rle(int count) * *************************************/ -static void perform_blit(running_machine *machine) +static void perform_blit(const address_space *space) { offs_t addr = tms_state.regs[TMS34061_XYADDRESS] | ((tms_state.regs[TMS34061_XYOFFSET] & 0x300) << 8); UINT8 shift = (BLITTER_FLAGS & BLITFLAG_SHIFT) ? 4 : 0; @@ -317,7 +317,7 @@ static void perform_blit(running_machine *machine) int xdir = (BLITTER_FLAGS & BLITFLAG_XFLIP) ? -1 : 1; int xflip = (BLITTER_FLAGS & BLITFLAG_XFLIP); int rle = (BLITTER_FLAGS & BLITFLAG_RLE); - int color = tms34061_latch_r(machine, 0); + int color = tms34061_latch_r(space, 0); int width = BLITTER_WIDTH; int height = BLITTER_HEIGHT; UINT8 transmaskhi, transmasklo; @@ -328,7 +328,7 @@ static void perform_blit(running_machine *machine) /* debugging */ if (FULL_LOGGING) logerror("Blit: scan=%d src=%06x @ (%05x) for %dx%d ... flags=%02x\n", - video_screen_get_vpos(machine->primary_screen), + video_screen_get_vpos(space->machine->primary_screen), (*itech8_grom_bank << 16) | (BLITTER_ADDRHI << 8) | BLITTER_ADDRLO, tms_state.regs[TMS34061_XYADDRESS] | ((tms_state.regs[TMS34061_XYOFFSET] & 0x300) << 8), BLITTER_WIDTH, BLITTER_HEIGHT, BLITTER_FLAGS); @@ -519,7 +519,7 @@ WRITE8_HANDLER( itech8_blitter_w ) } /* perform the blit */ - perform_blit(space->machine); + perform_blit(space); blit_in_progress = 1; /* set a timer to go off when we're done */ diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c index 03987334e35..37e33dd2395 100644 --- a/src/mame/video/leland.c +++ b/src/mame/video/leland.c @@ -182,7 +182,7 @@ static void leland_video_addr_w(int offset, int data, int num) * *************************************/ -static int leland_vram_port_r(running_machine *machine, int offset, int num) +static int leland_vram_port_r(const address_space *space, int offset, int num) { struct vram_state_data *state = vram_state + num; int addr = state->addr; @@ -209,14 +209,14 @@ static int leland_vram_port_r(running_machine *machine, int offset, int num) default: logerror("CPU #%d %04x Warning: Unknown video port %02x read (address=%04x)\n", - cpunum_get_active(),cpu_get_pc(machine->activecpu), offset, addr); + cpunum_get_active(),cpu_get_pc(space->machine->activecpu), offset, addr); ret = 0; break; } state->addr = addr; if (LOG_COMM && addr >= 0xf000) - logerror("%04X:%s comm read %04X = %02X\n", cpu_get_previouspc(machine->activecpu), num ? "slave" : "master", addr, ret); + logerror("%04X:%s comm read %04X = %02X\n", cpu_get_previouspc(space->machine->activecpu), num ? "slave" : "master", addr, ret); return ret; } @@ -229,7 +229,7 @@ static int leland_vram_port_r(running_machine *machine, int offset, int num) * *************************************/ -static void leland_vram_port_w(running_machine *machine, int offset, int data, int num) +static void leland_vram_port_w(const address_space *space, int offset, int data, int num) { struct vram_state_data *state = vram_state + num; int addr = state->addr; @@ -238,12 +238,12 @@ static void leland_vram_port_w(running_machine *machine, int offset, int data, i /* don't fully understand why this is needed. Isn't the video RAM just one big RAM? */ - int scanline = video_screen_get_vpos(machine->primary_screen); + int scanline = video_screen_get_vpos(space->machine->primary_screen); if (scanline > 0) - video_screen_update_partial(machine->primary_screen, scanline - 1); + video_screen_update_partial(space->machine->primary_screen, scanline - 1); if (LOG_COMM && addr >= 0xf000) - logerror("%04X:%s comm write %04X = %02X\n", cpu_get_previouspc(machine->activecpu), num ? "slave" : "master", addr, data); + logerror("%04X:%s comm write %04X = %02X\n", cpu_get_previouspc(space->machine->activecpu), num ? "slave" : "master", addr, data); /* based on the low 3 bits of the offset, update the destination */ switch (offset & 7) @@ -295,7 +295,7 @@ static void leland_vram_port_w(running_machine *machine, int offset, int data, i default: logerror("CPU #%d %04x Warning: Unknown video port write (address=%04x value=%02x)\n", - cpunum_get_active(),cpu_get_pc(machine->activecpu), offset, addr); + cpunum_get_active(),cpu_get_pc(space->machine->activecpu), offset, addr); break; } @@ -319,10 +319,12 @@ WRITE8_HANDLER( leland_master_video_addr_w ) static TIMER_CALLBACK( leland_delayed_mvram_w ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + int num = (param >> 16) & 1; int offset = (param >> 8) & 0xff; int data = param & 0xff; - leland_vram_port_w(machine, offset, data, num); + leland_vram_port_w(space, offset, data, num); }