Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-21 13:18:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

address space compilation fixes.

Browse Source
This commit is contained in:
smf- 2008-11-15 10:17:02 +00:00
parent 6ace92f89a
commit 4d78362d45
11 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mame/audio/starwars.c
View File

@ -51,13 +51,15 @@ static UINT8 r6532_porta_r(const device_config *device, UINT8 olddata)
static void r6532_porta_w(const device_config *device, UINT8 newdata, UINT8 olddata)
{
const address_space *space = cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM);
/* handle 5220 read */
if ((olddata & 2) != 0 && (newdata & 2) == 0)
riot6532_portb_in_set(riot, tms5220_status_r(device->machine, 0), 0xff);
riot6532_portb_in_set(riot, tms5220_status_r(space, 0), 0xff);
/* handle 5220 write */
if ((olddata & 1) != 0 && (newdata & 1) == 0)
tms5220_data_w(device->machine, 0, riot6532_portb_out_get(riot));
tms5220_data_w(space, 0, riot6532_portb_out_get(riot));
}

4
src/mame/machine/asic65.c
View File

@ -145,6 +145,8 @@ void asic65_config(running_machine *machine, int asictype)
void asic65_reset(running_machine *machine, int state)
{
const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
/* rom-based means reset and clear states */
if (asic65.type == ASIC65_ROMBASED)
cpu_set_input_line(machine->cpu[asic65.cpunum], INPUT_LINE_RESET, state ? ASSERT_LINE : CLEAR_LINE);
@ -162,7 +164,7 @@ void asic65_reset(running_machine *machine, int state)
else if (!state && asic65.reset_state)
{
if (asic65.command != -1)
asic65_data_w(machine, 1, asic65.command, 0xffff);
asic65_data_w(space, 1, asic65.command, 0xffff);
}
/* update the state */

4
src/mame/machine/nitedrvr.c
View File

@ -251,8 +251,10 @@ static TIMER_CALLBACK( nitedrvr_crash_toggle_callback )
{
if (nitedrvr_crash_en && nitedrvr_crash_data_en)
{
const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
nitedrvr_crash_data--;
discrete_sound_w(machine, NITEDRVR_BANG_DATA, nitedrvr_crash_data); // Crash Volume
discrete_sound_w(space, NITEDRVR_BANG_DATA, nitedrvr_crash_data); // Crash Volume
if (!nitedrvr_crash_data) nitedrvr_crash_data_en = 0; // Done counting?
if (nitedrvr_crash_data & 0x01)
{

4
src/mame/video/blstroid.c
View File

@ -98,8 +98,10 @@ VIDEO_START( blstroid )
static TIMER_CALLBACK( irq_off )
{
const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
/* clear the interrupt */
atarigen_scanline_int_ack_w(machine, 0, 0, 0xffff);
atarigen_scanline_int_ack_w(space, 0, 0, 0xffff);
}

4
src/mame/video/jaguar.c
View File

@ -709,13 +709,13 @@ WRITE16_HANDLER( jaguar_tom_regs_w )
READ32_HANDLER( jaguar_tom_regs32_r )
{
return read32be_with_16be_handler(jaguar_tom_regs_r, space->machine, offset, mem_mask);
return read32be_with_16be_handler(jaguar_tom_regs_r, space, offset, mem_mask);
}
WRITE32_HANDLER( jaguar_tom_regs32_w )
{
write32be_with_16be_handler(jaguar_tom_regs_w, space->machine, offset, data, mem_mask);
write32be_with_16be_handler(jaguar_tom_regs_w, space, offset, data, mem_mask);
}

18
src/mame/video/skydiver.c
View File

@ -17,19 +17,21 @@ static int width = 0;
MACHINE_RESET( skydiver )
{
const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
/* reset all latches */
skydiver_start_lamp_1_w(machine, 0, 0);
skydiver_start_lamp_2_w(machine, 0, 0);
skydiver_lamp_s_w(machine, 0, 0);
skydiver_lamp_k_w(machine, 0, 0);
skydiver_lamp_y_w(machine, 0, 0);
skydiver_lamp_d_w(machine, 0, 0);
skydiver_start_lamp_1_w(space, 0, 0);
skydiver_start_lamp_2_w(space, 0, 0);
skydiver_lamp_s_w(space, 0, 0);
skydiver_lamp_k_w(space, 0, 0);
skydiver_lamp_y_w(space, 0, 0);
skydiver_lamp_d_w(space, 0, 0);
output_set_value("lampi", 0);
output_set_value("lampv", 0);
output_set_value("lampe", 0);
output_set_value("lampr", 0);
skydiver_width_w(machine, 0, 0);
skydiver_coin_lockout_w(machine, 0, 0);
skydiver_width_w(space, 0, 0);
skydiver_coin_lockout_w(space, 0, 0);
}

10
src/mame/video/sprint4.c
View File

@ -95,6 +95,8 @@ VIDEO_EOF( sprint4 )
/* check for sprite-playfield collisions */
const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
for (i = 0; i < 4; i++)
{
rectangle rect;
@ -136,10 +138,10 @@ VIDEO_EOF( sprint4 )
/* update sound status */
discrete_sound_w(machine, SPRINT4_MOTOR_DATA_1, videoram[0x391] & 15);
discrete_sound_w(machine, SPRINT4_MOTOR_DATA_2, videoram[0x393] & 15);
discrete_sound_w(machine, SPRINT4_MOTOR_DATA_3, videoram[0x395] & 15);
discrete_sound_w(machine, SPRINT4_MOTOR_DATA_4, videoram[0x397] & 15);
discrete_sound_w(space, SPRINT4_MOTOR_DATA_1, videoram[0x391] & 15);
discrete_sound_w(space, SPRINT4_MOTOR_DATA_2, videoram[0x393] & 15);
discrete_sound_w(space, SPRINT4_MOTOR_DATA_3, videoram[0x395] & 15);
discrete_sound_w(space, SPRINT4_MOTOR_DATA_4, videoram[0x397] & 15);
}

5
src/mame/video/subs.c
View File

@ -43,6 +43,7 @@ VIDEO_UPDATE( subs )
const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left");
const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right");
const address_space *space = cpu_get_address_space(screen->machine->cpu[0], ADDRESS_SPACE_PROGRAM);
/* for every character in the Video RAM, check if it has been modified */
/* since last time and update it accordingly. */
@ -148,7 +149,7 @@ VIDEO_UPDATE( subs )
}
/* Update sound */
discrete_sound_w(screen->machine, SUBS_LAUNCH_DATA, spriteram[5] & 0x0f); // Launch data
discrete_sound_w(screen->machine, SUBS_CRASH_DATA, spriteram[5] >> 4); // Crash/explode data
discrete_sound_w(space, SUBS_LAUNCH_DATA, spriteram[5] & 0x0f); // Launch data
discrete_sound_w(space, SUBS_CRASH_DATA, spriteram[5] >> 4); // Crash/explode data
return 0;
}

20
src/mame/video/tia.c
View File

@ -876,7 +876,7 @@ static WRITE8_HANDLER( VSYNC_w )
video_screen_get_height(space->machine->primary_screen));
if ( tia_vsync_callback ) {
tia_vsync_callback( space->machine, 0, curr_y, 0xFFFF );
tia_vsync_callback( space, 0, curr_y, 0xFFFF );
}
prev_y = 0;
@ -1360,11 +1360,11 @@ static WRITE8_HANDLER( NUSIZ1_w )
static WRITE8_HANDLER( HMCLR_w )
{
HMP0_w( space->machine, offset, 0 );
HMP1_w( space->machine, offset, 0 );
HMM0_w( space->machine, offset, 0 );
HMM1_w( space->machine, offset, 0 );
HMBL_w( space->machine, offset, 0 );
HMP0_w( space, offset, 0 );
HMP1_w( space, offset, 0 );
HMM0_w( space, offset, 0 );
HMM1_w( space, offset, 0 );
HMBL_w( space, offset, 0 );
}
@ -1651,7 +1651,7 @@ static READ8_HANDLER( INPT_r )
int input = TIA_INPUT_PORT_ALWAYS_ON;
if ( tia_read_input_port )
{
input = tia_read_input_port(space->machine, offset & 3, 0xFFFF);
input = tia_read_input_port(space, offset & 3, 0xFFFF);
}
if ( input == TIA_INPUT_PORT_ALWAYS_ON )
@ -1674,7 +1674,7 @@ READ8_HANDLER( tia_r )
if ( tia_get_databus )
{
data = tia_get_databus(space->machine, offset) & 0x3f;
data = tia_get_databus(space, offset) & 0x3f;
}
if (!(offset & 0x8))
@ -1710,13 +1710,13 @@ READ8_HANDLER( tia_r )
return data | INPT_r(space,3);
case 0xC:
{
int button = tia_read_input_port ? ( tia_read_input_port(space->machine,4,0xFFFF) & 0x80 ) : 0x80;
int button = tia_read_input_port ? ( tia_read_input_port(space,4,0xFFFF) & 0x80 ) : 0x80;
INPT4 = ( VBLANK & 0x40) ? ( INPT4 & button ) : button;
}
return data | INPT4;
case 0xD:
{
int button = tia_read_input_port ? ( tia_read_input_port(space->machine,5,0xFFFF) & 0x80 ) : 0x80;
int button = tia_read_input_port ? ( tia_read_input_port(space,5,0xFFFF) & 0x80 ) : 0x80;
INPT5 = ( VBLANK & 0x40) ? ( INPT5 & button ) : button;
}
return data | INPT5;

6
src/mame/video/triplhnt.c
View File

@ -130,13 +130,15 @@ static void draw_sprites(running_machine *machine, bitmap_t* bitmap, const recta
VIDEO_UPDATE( triplhnt )
{
const address_space *space = cpu_get_address_space(screen->machine->cpu[0], ADDRESS_SPACE_PROGRAM);
tilemap_mark_all_tiles_dirty(bg_tilemap);
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
draw_sprites(screen->machine, bitmap, cliprect);
discrete_sound_w(screen->machine, TRIPLHNT_BEAR_ROAR_DATA, triplhnt_playfield_ram[0xfa] & 15);
discrete_sound_w(screen->machine, TRIPLHNT_SHOT_DATA, triplhnt_playfield_ram[0xfc] & 15);
discrete_sound_w(space, TRIPLHNT_BEAR_ROAR_DATA, triplhnt_playfield_ram[0xfa] & 15);
discrete_sound_w(space, TRIPLHNT_SHOT_DATA, triplhnt_playfield_ram[0xfc] & 15);
return 0;
}

5
src/mame/video/ultratnk.c
View File

@ -96,6 +96,7 @@ VIDEO_EOF( ultratnk )
{
int i;
UINT16 BG = colortable_entry_get_value(machine->colortable, 0);
const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
/* check for sprite-playfield collisions */
@ -140,8 +141,8 @@ VIDEO_EOF( ultratnk )
/* update sound status */
discrete_sound_w(machine, ULTRATNK_MOTOR_DATA_1, videoram[0x391] & 15);
discrete_sound_w(machine, ULTRATNK_MOTOR_DATA_2, videoram[0x393] & 15);
discrete_sound_w(space, ULTRATNK_MOTOR_DATA_1, videoram[0x391] & 15);
discrete_sound_w(space, ULTRATNK_MOTOR_DATA_2, videoram[0x393] & 15);
}