address space compilation errors.

This commit is contained in:
smf- 2008-11-15 11:17:05 +00:00
parent 1ae79e5da7
commit 272b3f6725
8 changed files with 27 additions and 17 deletions

View File

@ -984,13 +984,13 @@ WRITE16_HANDLER( megadriv_vdp_w )
data = (data&0xff00) | data>>8; data = (data&0xff00) | data>>8;
// mame_printf_debug("8-bit write VDP data port access, offset %04x data %04x mem_mask %04x\n",offset,data,mem_mask); // mame_printf_debug("8-bit write VDP data port access, offset %04x data %04x mem_mask %04x\n",offset,data,mem_mask);
} }
megadriv_vdp_data_port_w(space, data); megadriv_vdp_data_port_w(space->machine, data);
break; break;
case 0x04: case 0x04:
case 0x06: case 0x06:
if ((!ACCESSING_BITS_8_15) || (!ACCESSING_BITS_0_7)) mame_printf_debug("8-bit write VDP control port access, offset %04x data %04x mem_mask %04x\n",offset,data,mem_mask); if ((!ACCESSING_BITS_8_15) || (!ACCESSING_BITS_0_7)) mame_printf_debug("8-bit write VDP control port access, offset %04x data %04x mem_mask %04x\n",offset,data,mem_mask);
megadriv_vdp_ctrl_port_w(space, data); megadriv_vdp_ctrl_port_w(space->machine, data);
break; break;
case 0x08: case 0x08:
@ -1373,7 +1373,7 @@ READ16_HANDLER( megadriv_vdp_r )
case 0x00: case 0x00:
case 0x02: case 0x02:
if ((!ACCESSING_BITS_8_15) || (!ACCESSING_BITS_0_7)) mame_printf_debug("8-bit VDP read data port access, offset %04x mem_mask %04x\n",offset,mem_mask); if ((!ACCESSING_BITS_8_15) || (!ACCESSING_BITS_0_7)) mame_printf_debug("8-bit VDP read data port access, offset %04x mem_mask %04x\n",offset,mem_mask);
retvalue = megadriv_vdp_data_port_r(space); retvalue = megadriv_vdp_data_port_r(space->machine);
break; break;
case 0x04: case 0x04:
@ -1441,12 +1441,12 @@ static WRITE16_HANDLER( megadriv_68k_YM2612_write)
switch (offset) switch (offset)
{ {
case 0: case 0:
if (ACCESSING_BITS_8_15) ym2612_control_port_0_a_w (space->machine, 0, (data >> 8) & 0xff); if (ACCESSING_BITS_8_15) ym2612_control_port_0_a_w (space, 0, (data >> 8) & 0xff);
else ym2612_data_port_0_a_w (space->machine, 0, (data >> 0) & 0xff); else ym2612_data_port_0_a_w (space, 0, (data >> 0) & 0xff);
break; break;
case 1: case 1:
if (ACCESSING_BITS_8_15) ym2612_control_port_0_b_w (space->machine, 0, (data >> 8) & 0xff); if (ACCESSING_BITS_8_15) ym2612_control_port_0_b_w (space, 0, (data >> 8) & 0xff);
else ym2612_data_port_0_b_w (space->machine, 0, (data >> 0) & 0xff); else ym2612_data_port_0_b_w (space, 0, (data >> 0) & 0xff);
break; break;
} }
} }

View File

@ -744,7 +744,7 @@ static WRITE8_HANDLER (megaplay_bios_port_be_bf_w)
switch (offset) switch (offset)
{ {
case 0: /* port 0xbe, VDP 1 DATA Write */ case 0: /* port 0xbe, VDP 1 DATA Write */
segae_vdp_data_w(space, 0, data); break; segae_vdp_data_w(space->machine, 0, data); break;
case 1: /* port 0xbf, VDP 1 CTRL Write */ case 1: /* port 0xbf, VDP 1 CTRL Write */
segae_vdp_ctrl_w(0, data); break; segae_vdp_ctrl_w(0, data); break;
} }

View File

@ -1342,7 +1342,7 @@ static WRITE64_HANDLER(model3_sound_w)
// serial configuration writes // serial configuration writes
if ((mem_mask == U64(0xff00000000000000)) && (offset == 0)) if ((mem_mask == U64(0xff00000000000000)) && (offset == 0))
{ {
scsp_midi_in(space->machine, 0, (data>>56)&0xff, 0); scsp_midi_in(space, 0, (data>>56)&0xff, 0);
// give the 68k time to notice // give the 68k time to notice
cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(40)); cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(40));

View File

@ -591,6 +591,8 @@ static UINT8 mahmajn_io_r(running_machine *machine, int port)
static void mahmajn_io_w(running_machine *machine, int port, UINT8 data) static void mahmajn_io_w(running_machine *machine, int port, UINT8 data)
{ {
const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
switch(port) switch(port)
{ {
case 3: case 3:
@ -598,7 +600,7 @@ static void mahmajn_io_w(running_machine *machine, int port, UINT8 data)
cur_input_line = (cur_input_line + 1) & 7; cur_input_line = (cur_input_line + 1) & 7;
break; break;
case 7: // DAC case 7: // DAC
dac_0_signed_data_w(machine, 0, data); dac_0_signed_data_w(space, 0, data);
break; break;
default: default:
fprintf(stderr, "Port %d : %02x\n", port, data & 0xff); fprintf(stderr, "Port %d : %02x\n", port, data & 0xff);
@ -607,12 +609,14 @@ static void mahmajn_io_w(running_machine *machine, int port, UINT8 data)
static void hotrod_io_w(running_machine *machine, int port, UINT8 data) static void hotrod_io_w(running_machine *machine, int port, UINT8 data)
{ {
const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
switch(port) switch(port)
{ {
case 3: // Lamps case 3: // Lamps
break; break;
case 7: // DAC case 7: // DAC
dac_0_signed_data_w(machine,0, data); dac_0_signed_data_w(space,0, data);
break; break;
default: default:
fprintf(stderr, "Port %d : %02x\n", port, data & 0xff); fprintf(stderr, "Port %d : %02x\n", port, data & 0xff);

View File

@ -165,12 +165,14 @@ static void timer_ack_callback(running_machine *machine)
static TIMER_CALLBACK( delayed_sound_data_w ) static TIMER_CALLBACK( delayed_sound_data_w )
{ {
soundlatch_w(machine, 0, param); const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
soundlatch_w(space, 0, param);
cpu_set_input_line(machine->cpu[2], INPUT_LINE_NMI, ASSERT_LINE); cpu_set_input_line(machine->cpu[2], INPUT_LINE_NMI, ASSERT_LINE);
} }
static void sound_data_w(UINT8 data) static void sound_data_w(running_machine *machine, UINT8 data)
{ {
timer_call_after_resynch(NULL, data, delayed_sound_data_w); timer_call_after_resynch(NULL, data, delayed_sound_data_w);
} }

View File

@ -199,7 +199,9 @@ static void sound_cpu_irq(running_machine *machine, int state)
static TIMER_CALLBACK( delayed_sound_data_w ) static TIMER_CALLBACK( delayed_sound_data_w )
{ {
soundlatch_w(machine, 0, param); const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
soundlatch_w(space, 0, param);
cpu_set_input_line(machine->cpu[3], INPUT_LINE_NMI, ASSERT_LINE); cpu_set_input_line(machine->cpu[3], INPUT_LINE_NMI, ASSERT_LINE);
} }

View File

@ -50,7 +50,7 @@ READ16_HANDLER ( system24temp_sys16_io_r )
{ {
// logerror("IO read %02x (%d:%x)\n", offset, cpunum_get_active(), cpu_get_pc(space->cpu)); // logerror("IO read %02x (%d:%x)\n", offset, cpunum_get_active(), cpu_get_pc(space->cpu));
if(offset < 8) if(offset < 8)
return system24temp_sys16_io_io_r ? system24temp_sys16_io_io_r(space,offset) : 0xff; return system24temp_sys16_io_io_r ? system24temp_sys16_io_io_r(space->machine,offset) : 0xff;
else if (offset < 0x20) { else if (offset < 0x20) {
switch(offset) { switch(offset) {
case 0x8: case 0x8:
@ -88,7 +88,7 @@ WRITE16_HANDLER( system24temp_sys16_io_w )
return; return;
} }
if(system24temp_sys16_io_io_w) if(system24temp_sys16_io_io_w)
system24temp_sys16_io_io_w(space, offset, data); system24temp_sys16_io_io_w(space->machine, offset, data);
} else if (offset < 0x20) { } else if (offset < 0x20) {
switch(offset) { switch(offset) {
case 0xe: case 0xe:

View File

@ -244,5 +244,7 @@ VIDEO_UPDATE( dynduke )
VIDEO_EOF( dynduke ) VIDEO_EOF( dynduke )
{ {
buffer_spriteram16_w(machine,0,0,0xffff); // Could be a memory location instead const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space,0,0,0xffff); // Could be a memory location instead
} }