diff --git a/src/mame/machine/ajax.c b/src/mame/machine/ajax.c index e034e41c48b..4e43fa0aed8 100644 --- a/src/mame/machine/ajax.c +++ b/src/mame/machine/ajax.c @@ -200,8 +200,9 @@ WRITE8_HANDLER( ajax_bankswitch_2_w ) MACHINE_RESET( ajax ) { - ajax_bankswitch_w(machine, 0, 0); - ajax_bankswitch_2_w(machine, 0, 0); + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + ajax_bankswitch_w(space, 0, 0); + ajax_bankswitch_2_w(space, 0, 0); } INTERRUPT_GEN( ajax_interrupt ) diff --git a/src/mame/machine/bagman.c b/src/mame/machine/bagman.c index 45fdeb39edc..f176c6b4d00 100644 --- a/src/mame/machine/bagman.c +++ b/src/mame/machine/bagman.c @@ -219,14 +219,15 @@ UINT8 line; MACHINE_RESET( bagman ) { - bagman_pal16r6_w(machine,0,1); /*pin 2*/ - bagman_pal16r6_w(machine,1,1); /*pin 3*/ - bagman_pal16r6_w(machine,2,1); /*pin 4*/ - bagman_pal16r6_w(machine,3,1); /*pin 5*/ - bagman_pal16r6_w(machine,4,1); /*pin 6*/ - bagman_pal16r6_w(machine,5,1); /*pin 7*/ - bagman_pal16r6_w(machine,6,1); /*pin 8*/ - bagman_pal16r6_w(machine,7,1); /*pin 9*/ + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + bagman_pal16r6_w(space,0,1); /*pin 2*/ + bagman_pal16r6_w(space,1,1); /*pin 3*/ + bagman_pal16r6_w(space,2,1); /*pin 4*/ + bagman_pal16r6_w(space,3,1); /*pin 5*/ + bagman_pal16r6_w(space,4,1); /*pin 6*/ + bagman_pal16r6_w(space,5,1); /*pin 7*/ + bagman_pal16r6_w(space,6,1); /*pin 8*/ + bagman_pal16r6_w(space,7,1); /*pin 9*/ update_pal(); } diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c index 79806e497b2..3bc050eb9fb 100644 --- a/src/mame/machine/balsente.c +++ b/src/mame/machine/balsente.c @@ -147,6 +147,7 @@ static TIMER_CALLBACK( interrupt_timer ) MACHINE_RESET( balsente ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); int numbanks, i; /* create the polynomial tables */ @@ -176,8 +177,8 @@ MACHINE_RESET( balsente ) grudge_steering_result = 0; /* reset the 6850 chips */ - balsente_m6850_w(machine, 0, 3); - balsente_m6850_sound_w(machine, 0, 3); + balsente_m6850_w(space, 0, 3); + balsente_m6850_sound_w(space, 0, 3); /* reset the noise generator */ memset(noise_position, 0, sizeof(noise_position)); diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c index e60b74c84f5..63751020b1a 100644 --- a/src/mame/machine/decocass.c +++ b/src/mame/machine/decocass.c @@ -1522,7 +1522,7 @@ READ8_HANDLER( decocass_e5xx_r ) else { if (decocass_dongle_r) - data = (*decocass_dongle_r)(space->machine, offset); + data = (*decocass_dongle_r)(space, offset); else data = 0xff; } @@ -1533,7 +1533,7 @@ WRITE8_HANDLER( decocass_e5xx_w ) { if (decocass_dongle_w) { - (*decocass_dongle_w)(space->machine, offset, data); + (*decocass_dongle_w)(space, offset, data); return; } diff --git a/src/mame/machine/galaxold.c b/src/mame/machine/galaxold.c index 6ac9c89c03c..6db464d9439 100644 --- a/src/mame/machine/galaxold.c +++ b/src/mame/machine/galaxold.c @@ -386,6 +386,7 @@ Pin layout is such that links can replace the PAL if encryption is not used. DRIVER_INIT( 4in1 ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); offs_t i, len = memory_region_length(machine, "main"); UINT8 *RAM = memory_region(machine, "main"); @@ -396,7 +397,7 @@ DRIVER_INIT( 4in1 ) /* games are banked at 0x0000 - 0x3fff */ memory_configure_bank(1, 0, 4, &RAM[0x10000], 0x4000); - _4in1_bank_w(machine, 0, 0); /* set the initial CPU bank */ + _4in1_bank_w(space, 0, 0); /* set the initial CPU bank */ state_save_register_global(_4in1_bank); } diff --git a/src/mame/machine/konamiic.c b/src/mame/machine/konamiic.c index 8bb9ac29d18..2dfe6be557c 100644 --- a/src/mame/machine/konamiic.c +++ b/src/mame/machine/konamiic.c @@ -20,13 +20,13 @@ static UINT8 K056800_host_reg_r(int reg) return value; } -static void K056800_host_reg_w(running_machine *machine, int reg, UINT8 data) +static void K056800_host_reg_w(const address_space *space, int reg, UINT8 data) { K056800_sound_reg[reg] = data; if (reg == 7) { - K056800_sound_irq_callback(machine, 1); + K056800_sound_irq_callback(space->machine, 1); } } diff --git a/src/mame/machine/konppc.c b/src/mame/machine/konppc.c index 733b68b613b..17d5c230be0 100644 --- a/src/mame/machine/konppc.c +++ b/src/mame/machine/konppc.c @@ -212,7 +212,7 @@ static UINT32 dsp_comm_sharc_r(int board, int offset) return dsp_comm_ppc[board][offset]; } -static void dsp_comm_sharc_w(running_machine *machine, int board, int offset, UINT32 data) +static void dsp_comm_sharc_w(const address_space *space, int board, int offset, UINT32 data) { if (offset >= 2) { @@ -225,14 +225,14 @@ static void dsp_comm_sharc_w(running_machine *machine, int board, int offset, UI case CGBOARD_TYPE_GTICLUB: { //cpu_set_input_line(machine->cpu[2], SHARC_INPUT_FLAG0, ASSERT_LINE); - cpu_push_context(machine->cpu[2]); + cpu_push_context(space->machine->cpu[2]); sharc_set_flag_input(0, ASSERT_LINE); cpu_pop_context(); if (offset == 1) { if (data & 0x03) - cpu_set_input_line(machine->cpu[2], INPUT_LINE_IRQ2, ASSERT_LINE); + cpu_set_input_line(space->machine->cpu[2], INPUT_LINE_IRQ2, ASSERT_LINE); } break; } @@ -246,7 +246,7 @@ static void dsp_comm_sharc_w(running_machine *machine, int board, int offset, UI if (data & 0x01 || data & 0x10) { - cpu_push_context(machine->cpu[board == 0 ? 2 : 3]); + cpu_push_context(space->machine->cpu[board == 0 ? 2 : 3]); sharc_set_flag_input(1, ASSERT_LINE); cpu_pop_context(); } @@ -523,7 +523,7 @@ WRITE32_HANDLER(K033906_0_w) { if (pci_bridge_enable[0]) { - K033906_w(space, 0, offset, data); + K033906_w(space->machine, 0, offset, data); } else { @@ -554,7 +554,7 @@ WRITE32_HANDLER(K033906_1_w) { if (pci_bridge_enable[1]) { - K033906_w(space, 1, offset, data); + K033906_w(space->machine, 1, offset, data); } else { diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c index 421fe21d457..e26ea692fab 100644 --- a/src/mame/machine/leland.c +++ b/src/mame/machine/leland.c @@ -373,11 +373,12 @@ MACHINE_START( leland ) MACHINE_RESET( leland ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); timer_adjust_oneshot(master_int_timer, video_screen_get_time_until_pos(machine->primary_screen, 8, 0), 8); /* reset globals */ leland_gfx_control = 0x00; - leland_sound_port_w(machine, 0, 0xff); + leland_sound_port_w(space, 0, 0xff); wcol_enable = 0; dangerz_x = 512; @@ -1100,7 +1101,7 @@ READ8_HANDLER( leland_master_analog_key_r ) break; case 0x02: /* FF = keycard serial data read */ - result = keycard_r(space); + result = keycard_r(space->machine); /* bit 7 indicates the analog input is busy for some games */ result &= ~0x80; @@ -1132,7 +1133,7 @@ WRITE8_HANDLER( leland_master_analog_key_w ) break; case 0x02: /* FF = keycard data write */ - keycard_w(space, data); + keycard_w(space->machine, data); break; } } diff --git a/src/mame/machine/mcr.c b/src/mame/machine/mcr.c index a672b07c97c..b7632fdb257 100644 --- a/src/mame/machine/mcr.c +++ b/src/mame/machine/mcr.c @@ -596,7 +596,8 @@ static void zwackery_pia_irq(running_machine *machine, int state) static TIMER_CALLBACK( zwackery_493_off_callback ) { - pia_2_ca1_w(machine, 0, 0); + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + pia_2_ca1_w(space, 0, 0); } @@ -885,26 +886,26 @@ static READ16_HANDLER( mcr68_6840_r_common ) WRITE16_HANDLER( mcr68_6840_upper_w ) { if (ACCESSING_BITS_8_15) - mcr68_6840_w_common(space->machine, offset, (data >> 8) & 0xff); + mcr68_6840_w_common(space, offset, (data >> 8) & 0xff); } WRITE16_HANDLER( mcr68_6840_lower_w ) { if (ACCESSING_BITS_0_7) - mcr68_6840_w_common(space->machine, offset, data & 0xff); + mcr68_6840_w_common(space, offset, data & 0xff); } READ16_HANDLER( mcr68_6840_upper_r ) { - return (mcr68_6840_r_common(space->machine,offset,0) << 8) | 0x00ff; + return (mcr68_6840_r_common(space,offset,0) << 8) | 0x00ff; } READ16_HANDLER( mcr68_6840_lower_r ) { - return mcr68_6840_r_common(space->machine,offset,0) | 0xff00; + return mcr68_6840_r_common(space,offset,0) | 0xff00; } diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c index 9b1dc676efd..c2b980332fc 100644 --- a/src/mame/machine/mhavoc.c +++ b/src/mame/machine/mhavoc.c @@ -84,6 +84,7 @@ WRITE8_HANDLER( mhavoc_gamma_irq_ack_w ) MACHINE_RESET( mhavoc ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); has_gamma_cpu = (machine->cpu[1] != NULL); memory_configure_bank(1, 0, 1, mhavoc_zram0, 0); @@ -91,8 +92,8 @@ MACHINE_RESET( mhavoc ) memory_configure_bank(2, 0, 4, memory_region(machine, "alpha") + 0x10000, 0x2000); /* reset RAM/ROM banks to 0 */ - mhavoc_ram_banksel_w(machine, 0, 0); - mhavoc_rom_banksel_w(machine, 0, 0); + mhavoc_ram_banksel_w(space, 0, 0); + mhavoc_rom_banksel_w(space, 0, 0); /* reset alpha comm status */ alpha_data = 0; diff --git a/src/mame/machine/midwayic.c b/src/mame/machine/midwayic.c index 92756969362..234e695ec79 100644 --- a/src/mame/machine/midwayic.c +++ b/src/mame/machine/midwayic.c @@ -1001,14 +1001,14 @@ WRITE32_HANDLER( midway_ioasic_w ) { if ((oldreg ^ newreg) & 1) { - cage_control_w(space, 0); + cage_control_w(space->machine, 0); if (!(~newreg & 1)) - cage_control_w(space, 3); + cage_control_w(space->machine, 3); } } /* FIFO reset? */ - midway_ioasic_fifo_reset_w(space, ~newreg & 4); + midway_ioasic_fifo_reset_w(space->machine, ~newreg & 4); break; case IOASIC_SOUNDOUT: @@ -1025,11 +1025,11 @@ WRITE32_HANDLER( midway_ioasic_w ) case IOASIC_PICOUT: if (ioasic.shuffle_type == MIDWAY_IOASIC_VAPORTRX) - midway_serial_pic2_w(space, newreg ^ 0x0a); + midway_serial_pic2_w(space->machine, newreg ^ 0x0a); else if (ioasic.shuffle_type == MIDWAY_IOASIC_SFRUSHRK) - midway_serial_pic2_w(space, newreg ^ 0x05); + midway_serial_pic2_w(space->machine, newreg ^ 0x05); else - midway_serial_pic2_w(space, newreg); + midway_serial_pic2_w(space->machine, newreg); break; case IOASIC_INTCTL: diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c index 072c5ff6b60..2496cd1c9d7 100644 --- a/src/mame/machine/namcos1.c +++ b/src/mame/machine/namcos1.c @@ -30,39 +30,39 @@ typedef struct static bankhandler namcos1_bank_element[NAMCOS1_MAX_BANK]; static bankhandler namcos1_active_bank[16]; -static READ8_HANDLER( bank1_r ) { return (*namcos1_active_bank[0].bank_handler_r )(space->machine, offset + namcos1_active_bank[0].bank_offset); } -static READ8_HANDLER( bank2_r ) { return (*namcos1_active_bank[1].bank_handler_r )(space->machine, offset + namcos1_active_bank[1].bank_offset); } -static READ8_HANDLER( bank3_r ) { return (*namcos1_active_bank[2].bank_handler_r )(space->machine, offset + namcos1_active_bank[2].bank_offset); } -static READ8_HANDLER( bank4_r ) { return (*namcos1_active_bank[3].bank_handler_r )(space->machine, offset + namcos1_active_bank[3].bank_offset); } -static READ8_HANDLER( bank5_r ) { return (*namcos1_active_bank[4].bank_handler_r )(space->machine, offset + namcos1_active_bank[4].bank_offset); } -static READ8_HANDLER( bank6_r ) { return (*namcos1_active_bank[5].bank_handler_r )(space->machine, offset + namcos1_active_bank[5].bank_offset); } -static READ8_HANDLER( bank7_r ) { return (*namcos1_active_bank[6].bank_handler_r )(space->machine, offset + namcos1_active_bank[6].bank_offset); } -static READ8_HANDLER( bank8_r ) { return (*namcos1_active_bank[7].bank_handler_r )(space->machine, offset + namcos1_active_bank[7].bank_offset); } -static READ8_HANDLER( bank9_r ) { return (*namcos1_active_bank[8].bank_handler_r )(space->machine, offset + namcos1_active_bank[8].bank_offset); } -static READ8_HANDLER( bank10_r ) { return (*namcos1_active_bank[9].bank_handler_r )(space->machine, offset + namcos1_active_bank[9].bank_offset); } -static READ8_HANDLER( bank11_r ) { return (*namcos1_active_bank[10].bank_handler_r)(space->machine, offset + namcos1_active_bank[10].bank_offset); } -static READ8_HANDLER( bank12_r ) { return (*namcos1_active_bank[11].bank_handler_r)(space->machine, offset + namcos1_active_bank[11].bank_offset); } -static READ8_HANDLER( bank13_r ) { return (*namcos1_active_bank[12].bank_handler_r)(space->machine, offset + namcos1_active_bank[12].bank_offset); } -static READ8_HANDLER( bank14_r ) { return (*namcos1_active_bank[13].bank_handler_r)(space->machine, offset + namcos1_active_bank[13].bank_offset); } -static READ8_HANDLER( bank15_r ) { return (*namcos1_active_bank[14].bank_handler_r)(space->machine, offset + namcos1_active_bank[14].bank_offset); } -static READ8_HANDLER( bank16_r ) { return (*namcos1_active_bank[15].bank_handler_r)(space->machine, offset + namcos1_active_bank[15].bank_offset); } +static READ8_HANDLER( bank1_r ) { return (*namcos1_active_bank[0].bank_handler_r )(space, offset + namcos1_active_bank[0].bank_offset); } +static READ8_HANDLER( bank2_r ) { return (*namcos1_active_bank[1].bank_handler_r )(space, offset + namcos1_active_bank[1].bank_offset); } +static READ8_HANDLER( bank3_r ) { return (*namcos1_active_bank[2].bank_handler_r )(space, offset + namcos1_active_bank[2].bank_offset); } +static READ8_HANDLER( bank4_r ) { return (*namcos1_active_bank[3].bank_handler_r )(space, offset + namcos1_active_bank[3].bank_offset); } +static READ8_HANDLER( bank5_r ) { return (*namcos1_active_bank[4].bank_handler_r )(space, offset + namcos1_active_bank[4].bank_offset); } +static READ8_HANDLER( bank6_r ) { return (*namcos1_active_bank[5].bank_handler_r )(space, offset + namcos1_active_bank[5].bank_offset); } +static READ8_HANDLER( bank7_r ) { return (*namcos1_active_bank[6].bank_handler_r )(space, offset + namcos1_active_bank[6].bank_offset); } +static READ8_HANDLER( bank8_r ) { return (*namcos1_active_bank[7].bank_handler_r )(space, offset + namcos1_active_bank[7].bank_offset); } +static READ8_HANDLER( bank9_r ) { return (*namcos1_active_bank[8].bank_handler_r )(space, offset + namcos1_active_bank[8].bank_offset); } +static READ8_HANDLER( bank10_r ) { return (*namcos1_active_bank[9].bank_handler_r )(space, offset + namcos1_active_bank[9].bank_offset); } +static READ8_HANDLER( bank11_r ) { return (*namcos1_active_bank[10].bank_handler_r)(space, offset + namcos1_active_bank[10].bank_offset); } +static READ8_HANDLER( bank12_r ) { return (*namcos1_active_bank[11].bank_handler_r)(space, offset + namcos1_active_bank[11].bank_offset); } +static READ8_HANDLER( bank13_r ) { return (*namcos1_active_bank[12].bank_handler_r)(space, offset + namcos1_active_bank[12].bank_offset); } +static READ8_HANDLER( bank14_r ) { return (*namcos1_active_bank[13].bank_handler_r)(space, offset + namcos1_active_bank[13].bank_offset); } +static READ8_HANDLER( bank15_r ) { return (*namcos1_active_bank[14].bank_handler_r)(space, offset + namcos1_active_bank[14].bank_offset); } +static READ8_HANDLER( bank16_r ) { return (*namcos1_active_bank[15].bank_handler_r)(space, offset + namcos1_active_bank[15].bank_offset); } -static WRITE8_HANDLER( bank1_w ) { (*namcos1_active_bank[0].bank_handler_w )(space->machine, offset + namcos1_active_bank[0].bank_offset, data); } -static WRITE8_HANDLER( bank2_w ) { (*namcos1_active_bank[1].bank_handler_w )(space->machine, offset + namcos1_active_bank[1].bank_offset, data); } -static WRITE8_HANDLER( bank3_w ) { (*namcos1_active_bank[2].bank_handler_w )(space->machine, offset + namcos1_active_bank[2].bank_offset, data); } -static WRITE8_HANDLER( bank4_w ) { (*namcos1_active_bank[3].bank_handler_w )(space->machine, offset + namcos1_active_bank[3].bank_offset, data); } -static WRITE8_HANDLER( bank5_w ) { (*namcos1_active_bank[4].bank_handler_w )(space->machine, offset + namcos1_active_bank[4].bank_offset, data); } -static WRITE8_HANDLER( bank6_w ) { (*namcos1_active_bank[5].bank_handler_w )(space->machine, offset + namcos1_active_bank[5].bank_offset, data); } -static WRITE8_HANDLER( bank7_w ) { (*namcos1_active_bank[6].bank_handler_w )(space->machine, offset + namcos1_active_bank[6].bank_offset, data); } -static WRITE8_HANDLER( bank8_w ) { (*namcos1_active_bank[7].bank_handler_w )(space->machine, offset + namcos1_active_bank[7].bank_offset, data); } -static WRITE8_HANDLER( bank9_w ) { (*namcos1_active_bank[8].bank_handler_w )(space->machine, offset + namcos1_active_bank[8].bank_offset, data); } -static WRITE8_HANDLER( bank10_w ) { (*namcos1_active_bank[9].bank_handler_w )(space->machine, offset + namcos1_active_bank[9].bank_offset, data); } -static WRITE8_HANDLER( bank11_w ) { (*namcos1_active_bank[10].bank_handler_w)(space->machine, offset + namcos1_active_bank[10].bank_offset, data); } -static WRITE8_HANDLER( bank12_w ) { (*namcos1_active_bank[11].bank_handler_w)(space->machine, offset + namcos1_active_bank[11].bank_offset, data); } -static WRITE8_HANDLER( bank13_w ) { (*namcos1_active_bank[12].bank_handler_w)(space->machine, offset + namcos1_active_bank[12].bank_offset, data); } -static WRITE8_HANDLER( bank14_w ) { (*namcos1_active_bank[13].bank_handler_w)(space->machine, offset + namcos1_active_bank[13].bank_offset, data); } -static WRITE8_HANDLER( bank15_w ) { (*namcos1_active_bank[14].bank_handler_w)(space->machine, offset + namcos1_active_bank[14].bank_offset, data); } -static WRITE8_HANDLER( bank16_w ) { (*namcos1_active_bank[15].bank_handler_w)(space->machine, offset + namcos1_active_bank[15].bank_offset, data); } +static WRITE8_HANDLER( bank1_w ) { (*namcos1_active_bank[0].bank_handler_w )(space, offset + namcos1_active_bank[0].bank_offset, data); } +static WRITE8_HANDLER( bank2_w ) { (*namcos1_active_bank[1].bank_handler_w )(space, offset + namcos1_active_bank[1].bank_offset, data); } +static WRITE8_HANDLER( bank3_w ) { (*namcos1_active_bank[2].bank_handler_w )(space, offset + namcos1_active_bank[2].bank_offset, data); } +static WRITE8_HANDLER( bank4_w ) { (*namcos1_active_bank[3].bank_handler_w )(space, offset + namcos1_active_bank[3].bank_offset, data); } +static WRITE8_HANDLER( bank5_w ) { (*namcos1_active_bank[4].bank_handler_w )(space, offset + namcos1_active_bank[4].bank_offset, data); } +static WRITE8_HANDLER( bank6_w ) { (*namcos1_active_bank[5].bank_handler_w )(space, offset + namcos1_active_bank[5].bank_offset, data); } +static WRITE8_HANDLER( bank7_w ) { (*namcos1_active_bank[6].bank_handler_w )(space, offset + namcos1_active_bank[6].bank_offset, data); } +static WRITE8_HANDLER( bank8_w ) { (*namcos1_active_bank[7].bank_handler_w )(space, offset + namcos1_active_bank[7].bank_offset, data); } +static WRITE8_HANDLER( bank9_w ) { (*namcos1_active_bank[8].bank_handler_w )(space, offset + namcos1_active_bank[8].bank_offset, data); } +static WRITE8_HANDLER( bank10_w ) { (*namcos1_active_bank[9].bank_handler_w )(space, offset + namcos1_active_bank[9].bank_offset, data); } +static WRITE8_HANDLER( bank11_w ) { (*namcos1_active_bank[10].bank_handler_w)(space, offset + namcos1_active_bank[10].bank_offset, data); } +static WRITE8_HANDLER( bank12_w ) { (*namcos1_active_bank[11].bank_handler_w)(space, offset + namcos1_active_bank[11].bank_offset, data); } +static WRITE8_HANDLER( bank13_w ) { (*namcos1_active_bank[12].bank_handler_w)(space, offset + namcos1_active_bank[12].bank_offset, data); } +static WRITE8_HANDLER( bank14_w ) { (*namcos1_active_bank[13].bank_handler_w)(space, offset + namcos1_active_bank[13].bank_offset, data); } +static WRITE8_HANDLER( bank15_w ) { (*namcos1_active_bank[14].bank_handler_w)(space, offset + namcos1_active_bank[14].bank_offset, data); } +static WRITE8_HANDLER( bank16_w ) { (*namcos1_active_bank[15].bank_handler_w)(space, offset + namcos1_active_bank[15].bank_offset, data); } static const read8_machine_func ram_bank_handler_r[16] = { diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c index 9bd9176cf4e..4a8983208a7 100644 --- a/src/mame/machine/namcos2.c +++ b/src/mame/machine/namcos2.c @@ -105,6 +105,7 @@ MACHINE_START( namcos2 ) MACHINE_RESET( namcos2 ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); int loop; mFinalLapProtCount = 0; namcos2_mcu_analog_ctrl=0; @@ -113,7 +114,7 @@ MACHINE_RESET( namcos2 ) sendval = 0; /* Initialise the bank select in the sound CPU */ - namcos2_sound_bankselect_w(machine,0,0); /* Page in bank 0 */ + namcos2_sound_bankselect_w(space,0,0); /* Page in bank 0 */ cpu_set_input_line(machine->cpu[CPU_SOUND], INPUT_LINE_RESET, ASSERT_LINE ); diff --git a/src/mame/machine/nmk004.c b/src/mame/machine/nmk004.c index 6eb4db17309..5990b885551 100644 --- a/src/mame/machine/nmk004.c +++ b/src/mame/machine/nmk004.c @@ -133,7 +133,7 @@ static UINT16 read16(int address) *****************************/ -static void oki_play_sample(running_machine *machine, int sample_no) +static void oki_play_sample(const address_space *space, int sample_no) { UINT16 table_start = (sample_no & 0x80) ? read16(SAMPLE_TABLE_1) : read16(SAMPLE_TABLE_0); UINT8 byte1 = read8(table_start + 2 * (sample_no & 0x7f) + 0); @@ -144,9 +144,9 @@ static void oki_play_sample(running_machine *machine, int sample_no) { // stop all channels if (chip == 0) - okim6295_data_0_w(machine, 0, 0x78 ); + okim6295_data_0_w(space, 0, 0x78 ); else - okim6295_data_1_w(machine, 0, 0x78 ); + okim6295_data_1_w(space, 0, 0x78 ); } else { @@ -161,13 +161,13 @@ static void oki_play_sample(running_machine *machine, int sample_no) // stop channel if (chip == 0) - okim6295_data_0_w(machine, 0, (0x08 << ch) ); + okim6295_data_0_w(space, 0, (0x08 << ch) ); else - okim6295_data_1_w(machine, 0, (0x08 << ch) ); + okim6295_data_1_w(space, 0, (0x08 << ch) ); if (sample != 0) { - UINT8 *rom = memory_region(machine, (chip == 0) ? "oki1" : "oki2"); + UINT8 *rom = memory_region(space->machine, (chip == 0) ? "oki1" : "oki2"); int bank = (byte2 & 0x0c) >> 2; int vol = (byte2 & 0x70) >> 4; @@ -176,21 +176,21 @@ static void oki_play_sample(running_machine *machine, int sample_no) if (chip == 0) { - okim6295_data_0_w(machine, 0, 0x80 | sample ); - okim6295_data_0_w(machine, 0, (0x10 << ch) | vol ); + okim6295_data_0_w(space, 0, 0x80 | sample ); + okim6295_data_0_w(space, 0, (0x10 << ch) | vol ); } else { - okim6295_data_1_w(machine, 0, 0x80 | sample ); - okim6295_data_1_w(machine, 0, (0x10 << ch) | vol ); + okim6295_data_1_w(space, 0, 0x80 | sample ); + okim6295_data_1_w(space, 0, (0x10 << ch) | vol ); } } } } -static void oki_update_state(running_machine *machine) +static void oki_update_state(const address_space *space) { - NMK004_state.oki_playing = ((okim6295_status_1_r(machine, 0) & 0x0f) << 4) | (okim6295_status_0_r(machine, 0) & 0x0f); + NMK004_state.oki_playing = ((okim6295_status_1_r(space, 0) & 0x0f) << 4) | (okim6295_status_0_r(space, 0) & 0x0f); } @@ -201,7 +201,7 @@ static void oki_update_state(running_machine *machine) *****************************/ -static void effects_update(running_machine *machine, int channel) +static void effects_update(const address_space *space, int channel) { struct effects_control *effects = &NMK004_state.effects_control[channel]; @@ -233,7 +233,7 @@ static void effects_update(running_machine *machine, int channel) switch (token) { case 0xef: // play sample - oki_play_sample(machine, read8(effects->current++)); + oki_play_sample(space, read8(effects->current++)); break; case 0xf6: // jump @@ -308,7 +308,7 @@ static void effects_update(running_machine *machine, int channel) *****************************/ -static void fm_update(running_machine *machine, int channel) +static void fm_update(const address_space *space, int channel) { struct fm_control *fm = &NMK004_state.fm_control[channel]; @@ -356,8 +356,8 @@ static void fm_update(running_machine *machine, int channel) fm->slot = read8(fm->current++); if (channel < 3 || !(NMK004_state.fm_control[channel-3].flags & FM_FLAG_ACTIVE)) { - ym2203_control_port_0_w(machine, 0, 0x28); // keyon/off - ym2203_write_port_0_w(machine, 0, channel % 3); + ym2203_control_port_0_w(space, 0, 0x28); // keyon/off + ym2203_write_port_0_w(space, 0, channel % 3); } break; @@ -585,7 +585,7 @@ popmessage("%02x %02x%02x%02x%02x %02x %02x%02x%02x%02x %02x %02x%02x%02x%02x", } -static void fm_voices_update(running_machine *machine) +static void fm_voices_update(const address_space *space ) { static const int ym2203_registers[0x18] = { @@ -605,8 +605,8 @@ static void fm_voices_update(running_machine *machine) for (i = 0; i < 0x18; i++) { - ym2203_control_port_0_w(machine, 0, ym2203_registers[i] + channel); - ym2203_write_port_0_w(machine, 0, fm1->voice_params[i]); + ym2203_control_port_0_w(space, 0, ym2203_registers[i] + channel); + ym2203_write_port_0_w(space, 0, fm1->voice_params[i]); } } @@ -618,8 +618,8 @@ static void fm_voices_update(running_machine *machine) { for (i = 0; i < 0x18; i++) { - ym2203_control_port_0_w(machine, 0, ym2203_registers[i] + channel); - ym2203_write_port_0_w(machine, 0, fm2->voice_params[i]); + ym2203_control_port_0_w(space, 0, ym2203_registers[i] + channel); + ym2203_write_port_0_w(space, 0, fm2->voice_params[i]); } } } @@ -627,25 +627,25 @@ static void fm_voices_update(running_machine *machine) if (fm1->flags & FM_FLAG_ACTIVE) { - ym2203_control_port_0_w(machine, 0, 0xb0 + channel); // self-feedback - ym2203_write_port_0_w(machine, 0, fm1->self_feedback); + ym2203_control_port_0_w(space, 0, 0xb0 + channel); // self-feedback + ym2203_write_port_0_w(space, 0, fm1->self_feedback); - ym2203_control_port_0_w(machine, 0, 0xa4 + channel); // F-number - ym2203_write_port_0_w(machine, 0, fm1->f_number >> 8); + ym2203_control_port_0_w(space, 0, 0xa4 + channel); // F-number + ym2203_write_port_0_w(space, 0, fm1->f_number >> 8); - ym2203_control_port_0_w(machine, 0, 0xa0 + channel); // F-number - ym2203_write_port_0_w(machine, 0, fm1->f_number & 0xff); + ym2203_control_port_0_w(space, 0, 0xa0 + channel); // F-number + ym2203_write_port_0_w(space, 0, fm1->f_number & 0xff); } else { - ym2203_control_port_0_w(machine, 0, 0xb0 + channel); // self-feedback - ym2203_write_port_0_w(machine, 0, fm2->self_feedback); + ym2203_control_port_0_w(space, 0, 0xb0 + channel); // self-feedback + ym2203_write_port_0_w(space, 0, fm2->self_feedback); - ym2203_control_port_0_w(machine, 0, 0xa4 + channel); // F-number - ym2203_write_port_0_w(machine, 0, fm2->f_number >> 8); + ym2203_control_port_0_w(space, 0, 0xa4 + channel); // F-number + ym2203_write_port_0_w(space, 0, fm2->f_number >> 8); - ym2203_control_port_0_w(machine, 0, 0xa0 + channel); // F-number - ym2203_write_port_0_w(machine, 0, fm2->f_number & 0xff); + ym2203_control_port_0_w(space, 0, 0xa0 + channel); // F-number + ym2203_write_port_0_w(space, 0, fm2->f_number & 0xff); } @@ -654,8 +654,8 @@ static void fm_voices_update(running_machine *machine) { fm1->flags &= ~FM_FLAG_MUST_SEND_KEYON; - ym2203_control_port_0_w(machine, 0, 0x28); // keyon/off - ym2203_write_port_0_w(machine, 0, fm1->slot | channel); + ym2203_control_port_0_w(space, 0, 0x28); // keyon/off + ym2203_write_port_0_w(space, 0, fm1->slot | channel); } if (fm2->flags & FM_FLAG_MUST_SEND_KEYON) @@ -664,8 +664,8 @@ static void fm_voices_update(running_machine *machine) if (!(fm1->flags & FM_FLAG_ACTIVE)) { - ym2203_control_port_0_w(machine, 0, 0x28); // keyon/off - ym2203_write_port_0_w(machine, 0, fm2->slot | channel); + ym2203_control_port_0_w(space, 0, 0x28); // keyon/off + ym2203_write_port_0_w(space, 0, fm2->slot | channel); } } } @@ -679,7 +679,7 @@ static void fm_voices_update(running_machine *machine) *****************************/ -static void psg_update(running_machine *machine, int channel) +static void psg_update(const address_space *space, int channel) { struct psg_control *psg = &NMK004_state.psg_control[channel]; @@ -703,11 +703,11 @@ static void psg_update(running_machine *machine, int channel) psg->flags &= ~PSG_FLAG_NOISE_NOT_ENABLED; // enable noise, disable tone on this channel - ym2203_control_port_0_w(machine, 0, 0x07); - enable = ym2203_read_port_0_r(machine, 0); + ym2203_control_port_0_w(space, 0, 0x07); + enable = ym2203_read_port_0_r(space, 0); enable |= (0x01 << channel); // disable tone enable &= ~(0x08 << channel); // enable noise - ym2203_write_port_0_w(machine, 0, enable); + ym2203_write_port_0_w(space, 0, enable); } @@ -741,11 +741,11 @@ static void psg_update(running_machine *machine, int channel) psg->flags &= ~PSG_FLAG_NOISE_NOT_ENABLED; // enable noise, disable tone on this channel - ym2203_control_port_0_w(machine, 0, 0x07); - enable = ym2203_read_port_0_r(machine, 0); + ym2203_control_port_0_w(space, 0, 0x07); + enable = ym2203_read_port_0_r(space, 0); enable |= (0x01 << channel); // disable tone enable &= ~(0x08 << channel); // enable noise - ym2203_write_port_0_w(machine, 0, enable); + ym2203_write_port_0_w(space, 0, enable); break; case 0xf2: // set volume shape @@ -790,8 +790,8 @@ static void psg_update(running_machine *machine, int channel) psg->volume_shape = 0; // mute channel - ym2203_control_port_0_w(machine, 0, 8 + channel); - ym2203_write_port_0_w(machine, 0, 0); + ym2203_control_port_0_w(space, 0, 8 + channel); + ym2203_write_port_0_w(space, 0, 0); return; } } @@ -831,10 +831,10 @@ static void psg_update(running_machine *machine, int channel) period >>= octave; - ym2203_control_port_0_w(machine, 0, 2 * channel + 1); - ym2203_write_port_0_w(machine, 0, (period & 0x0f00) >> 8); - ym2203_control_port_0_w(machine, 0, 2 * channel + 0); - ym2203_write_port_0_w(machine, 0, (period & 0x00ff)); + ym2203_control_port_0_w(space, 0, 2 * channel + 1); + ym2203_write_port_0_w(space, 0, (period & 0x0f00) >> 8); + ym2203_control_port_0_w(space, 0, 2 * channel + 0); + ym2203_write_port_0_w(space, 0, (period & 0x00ff)); psg->note_period_hi_bits = (period & 0x0f00) >> 8; } @@ -847,15 +847,15 @@ static void psg_update(running_machine *machine, int channel) psg->flags |= PSG_FLAG_NOISE_NOT_ENABLED; // disable noise, enable tone on this channel - ym2203_control_port_0_w(machine, 0, 0x07); - enable = ym2203_read_port_0_r(machine, 0); + ym2203_control_port_0_w(space, 0, 0x07); + enable = ym2203_read_port_0_r(space, 0); enable &= ~(0x01 << channel); // enable tone enable |= (0x08 << channel); // disable noise - ym2203_write_port_0_w(machine, 0, enable); + ym2203_write_port_0_w(space, 0, enable); } - ym2203_control_port_0_w(machine, 0, 0x06); // noise period - ym2203_write_port_0_w(machine, 0, psg->note); + ym2203_control_port_0_w(space, 0, 0x06); // noise period + ym2203_write_port_0_w(space, 0, psg->note); psg->note_period_hi_bits = psg->note; } } @@ -880,8 +880,8 @@ static void psg_update(running_machine *machine, int channel) volume = 0; // set volume - ym2203_control_port_0_w(machine, 0, 8 + channel); - ym2203_write_port_0_w(machine, 0, volume & 0x0f); + ym2203_control_port_0_w(space, 0, 8 + channel); + ym2203_write_port_0_w(space, 0, volume & 0x0f); } } } @@ -894,7 +894,7 @@ static void psg_update(running_machine *machine, int channel) *****************************/ -static void get_command(running_machine *machine) +static void get_command(const address_space *space) { static const UINT8 from_main[] = { @@ -931,7 +931,7 @@ static void get_command(running_machine *machine) if ((cmd_table & 0xff00) == 0) { - oki_play_sample(machine, cmd_table); + oki_play_sample(space, cmd_table); } else { @@ -979,46 +979,47 @@ static void get_command(running_machine *machine) -static void update_music(running_machine *machine) +static void update_music(const address_space *space) { int channel; for (channel = 0; channel < FM_CHANNELS; channel++) - fm_update(machine, channel); - fm_voices_update(machine); + fm_update(space, channel); + fm_voices_update(space); for (channel = 0; channel < PSG_CHANNELS; channel++) - psg_update(machine, channel); + psg_update(space, channel); for (channel = 0; channel < EFFECTS_CHANNELS; channel++) - effects_update(machine, channel); + effects_update(space, channel); } -void NMK004_irq(running_machine *machine, int irq) +void NMK004_irq(const address_space *space, int irq) { int status; if (!irq) return; - status = ym2203_status_port_0_r(machine,0); + status = ym2203_status_port_0_r(space,0); if (status & 1) // timer A expired { - oki_update_state(machine); - get_command(machine); - update_music(machine); + oki_update_state(space); + get_command(space); + update_music(space); // restart timer - ym2203_control_port_0_w(machine, 0, 0x27); - ym2203_write_port_0_w(machine, 0, 0x15); + ym2203_control_port_0_w(space, 0, 0x27); + ym2203_write_port_0_w(space, 0, 0x15); } } static TIMER_CALLBACK( real_nmk004_init ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); static const UINT8 ym2203_init[] = { 0x07,0x38,0x08,0x00,0x09,0x00,0x0A,0x00,0x24,0xB3,0x25,0x00,0x26,0xF9,0x27,0x15, @@ -1031,18 +1032,18 @@ static TIMER_CALLBACK( real_nmk004_init ) NMK004_state.rom = memory_region(machine, "audio"); - ym2203_control_port_0_w(machine, 0, 0x2f); + ym2203_control_port_0_w(space, 0, 0x2f); i = 0; while (ym2203_init[i] != 0xff) { - ym2203_control_port_0_w(machine, 0, ym2203_init[i++]); - ym2203_write_port_0_w(machine, 0, ym2203_init[i++]); + ym2203_control_port_0_w(space, 0, ym2203_init[i++]); + ym2203_write_port_0_w(space, 0, ym2203_init[i++]); } NMK004_state.oki_playing = 0; - oki_play_sample(machine, 0); + oki_play_sample(space, 0); NMK004_state.protection_check = 0; } diff --git a/src/mame/machine/nmk004.h b/src/mame/machine/nmk004.h index 504dbf97bcf..1cab2191130 100644 --- a/src/mame/machine/nmk004.h +++ b/src/mame/machine/nmk004.h @@ -1,4 +1,4 @@ void NMK004_init(void); -void NMK004_irq(running_machine *machine, int irq); +void NMK004_irq(const address_space *space, int irq); READ16_HANDLER( NMK004_r ); WRITE16_HANDLER( NMK004_w ); diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c index 859816c5029..acee6d3c3b3 100644 --- a/src/mame/machine/playch10.c +++ b/src/mame/machine/playch10.c @@ -29,6 +29,7 @@ static int MMC2_bank[4], MMC2_bank_latch[2]; *************************************/ MACHINE_RESET( pc10 ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); /* initialize latches and flip-flops */ pc10_nmi_enable = pc10_dog_di = pc10_dispmask = pc10_sdcs = pc10_int_detect = 0; @@ -45,8 +46,8 @@ MACHINE_RESET( pc10 ) /* reset the security chip */ RP5H01_enable_w( 0, 0 ); - RP5H01_0_reset_w( machine, 0, 0 ); - RP5H01_0_reset_w( machine, 0, 1 ); + RP5H01_0_reset_w( space, 0, 0 ); + RP5H01_0_reset_w( space, 0, 1 ); RP5H01_enable_w( 0, 1 ); /* reset the ppu */ @@ -144,10 +145,10 @@ READ8_HANDLER( pc10_prot_r ) /* we only support a single cart connected at slot 0 */ if ( cart_sel == 0 ) { - RP5H01_0_enable_w( space->machine, 0, 0 ); + RP5H01_0_enable_w( space, 0, 0 ); data |= ( ( ~RP5H01_counter_r( 0 ) ) << 4 ) & 0x10; /* D4 */ data |= ( ( RP5H01_data_r( 0 ) ) << 3 ) & 0x08; /* D3 */ - RP5H01_0_enable_w( space->machine, 0, 1 ); + RP5H01_0_enable_w( space, 0, 1 ); } return data; } @@ -157,11 +158,11 @@ WRITE8_HANDLER( pc10_prot_w ) /* we only support a single cart connected at slot 0 */ if ( cart_sel == 0 ) { - RP5H01_0_enable_w( space->machine, 0, 0 ); - RP5H01_0_test_w( space->machine, 0, data & 0x10 ); /* D4 */ - RP5H01_0_clock_w( space->machine, 0, data & 0x08 ); /* D3 */ - RP5H01_0_reset_w( space->machine, 0, ~data & 0x01 ); /* D0 */ - RP5H01_0_enable_w( space->machine, 0, 1 ); + RP5H01_0_enable_w( space, 0, 0 ); + RP5H01_0_test_w( space, 0, data & 0x10 ); /* D4 */ + RP5H01_0_clock_w( space, 0, data & 0x08 ); /* D3 */ + RP5H01_0_reset_w( space, 0, ~data & 0x01 ); /* D0 */ + RP5H01_0_enable_w( space, 0, 1 ); /* this thing gets dense at some point */ /* it wants to jump and execute an opcode at $ffff, wich */ diff --git a/src/mame/machine/qix.c b/src/mame/machine/qix.c index 2e54f28b0a8..2d1c318624b 100644 --- a/src/mame/machine/qix.c +++ b/src/mame/machine/qix.c @@ -262,7 +262,8 @@ MACHINE_START( slither ) MC6845_ON_VSYNC_CHANGED( qix_vsync_changed ) { - pia_3_cb1_w(device->machine, 0, vsync); + const address_space *space = cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + pia_3_cb1_w(space, 0, vsync); } @@ -356,7 +357,8 @@ READ8_HANDLER( qix_video_firq_ack_r ) static TIMER_CALLBACK( deferred_pia_4_porta_w ) { - pia_4_porta_w(machine, 0, param); + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + pia_4_porta_w(space, 0, param); } @@ -524,7 +526,8 @@ WRITE8_HANDLER( qix_68705_portC_w ) static TIMER_CALLBACK( pia_0_w_callback ) { - pia_0_w(machine, param >> 8, param & 0xff); + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + pia_0_w(space, param >> 8, param & 0xff); } diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c index b5bf053c85b..ebb2843b00f 100644 --- a/src/mame/machine/scramble.c +++ b/src/mame/machine/scramble.c @@ -174,7 +174,11 @@ WRITE8_HANDLER( hunchbks_mirror_w ) program_write_byte(0x1000+offset,data); } -static WRITE8_DEVICE_HANDLER( sound_latch_w ) { soundlatch_w(device->machine, offset, data); } +static WRITE8_DEVICE_HANDLER( sound_latch_w ) +{ + const address_space *space = cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + soundlatch_w(space, offset, data); +} const ppi8255_interface scramble_ppi_0_intf = { diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c index da4c8119cce..64f78480602 100644 --- a/src/mame/machine/segaic16.c +++ b/src/mame/machine/segaic16.c @@ -195,7 +195,7 @@ void segaic16_memory_mapper_set_decrypted(running_machine *machine, UINT8 *decry } -static void memory_mapper_w(running_machine *machine, struct memory_mapper_chip *chip, offs_t offset, UINT8 data) +static void memory_mapper_w(const address_space *space, struct memory_mapper_chip *chip, offs_t offset, UINT8 data) { UINT8 oldval; @@ -215,9 +215,9 @@ static void memory_mapper_w(running_machine *machine, struct memory_mapper_chip /* 03 - maybe controls halt and reset lines together? */ if ((oldval ^ chip->regs[offset]) & 3) { - cputag_set_input_line(machine, chip->cpu, INPUT_LINE_RESET, (chip->regs[offset] & 3) == 3 ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(space->machine, chip->cpu, INPUT_LINE_RESET, (chip->regs[offset] & 3) == 3 ? ASSERT_LINE : CLEAR_LINE); if ((chip->regs[offset] & 3) == 3) - fd1094_machine_init(machine->cpu[0]); + fd1094_machine_init(space->machine->cpu[0]); } break; @@ -229,7 +229,7 @@ static void memory_mapper_w(running_machine *machine, struct memory_mapper_chip case 0x04: /* controls IRQ lines to 68000, negative logic -- write $B to signal IRQ4 */ if ((chip->regs[offset] & 7) != 7) - cputag_set_input_line(machine, chip->cpu, (~chip->regs[offset] & 7), HOLD_LINE); + cputag_set_input_line(space->machine, chip->cpu, (~chip->regs[offset] & 7), HOLD_LINE); break; case 0x05: @@ -239,7 +239,7 @@ static void memory_mapper_w(running_machine *machine, struct memory_mapper_chip if (data == 0x01) { offs_t addr = (chip->regs[0x0a] << 17) | (chip->regs[0x0b] << 9) | (chip->regs[0x0c] << 1); - cpu_push_context(machine->cpu[mame_find_cpu_index(machine, chip->cpu)]); + cpu_push_context(space->machine->cpu[mame_find_cpu_index(space->machine, chip->cpu)]); program_write_word_16be(addr, (chip->regs[0x00] << 8) | chip->regs[0x01]); cpu_pop_context(); } @@ -247,7 +247,7 @@ static void memory_mapper_w(running_machine *machine, struct memory_mapper_chip { offs_t addr = (chip->regs[0x07] << 17) | (chip->regs[0x08] << 9) | (chip->regs[0x09] << 1); UINT16 result; - cpu_push_context(machine->cpu[mame_find_cpu_index(machine, chip->cpu)]); + cpu_push_context(space->machine->cpu[mame_find_cpu_index(space->machine, chip->cpu)]); result = program_read_word_16be(addr); cpu_pop_context(); chip->regs[0x00] = result >> 8; @@ -272,7 +272,7 @@ static void memory_mapper_w(running_machine *machine, struct memory_mapper_chip case 0x1c: case 0x1d: case 0x1e: case 0x1f: if (oldval != data) - update_memory_mapping(machine, chip); + update_memory_mapping(space->machine, chip); break; default: @@ -545,12 +545,12 @@ static UINT16 divide_r(int which, offs_t offset, UINT16 mem_mask) } -static void divide_w(running_machine *machine, int which, offs_t offset, UINT16 data, UINT16 mem_mask) +static void divide_w(const address_space *space, int which, offs_t offset, UINT16 data, UINT16 mem_mask) { int a4 = offset & 8; int a3 = offset & 4; - if (LOG_DIVIDE) logerror("%06X:divide%d_w(%X) = %04X\n", cpu_get_pc(machine->activecpu), which, offset, data); + if (LOG_DIVIDE) logerror("%06X:divide%d_w(%X) = %04X\n", cpu_get_pc(space->machine->activecpu), which, offset, data); /* only 4 effective write registers */ offset &= 3; @@ -645,10 +645,10 @@ static void timer_interrupt_ack(running_machine *machine, int which) } -static UINT16 compare_timer_r(running_machine *machine, int which, offs_t offset, UINT16 mem_mask) +static UINT16 compare_timer_r(const address_space *space, int which, offs_t offset, UINT16 mem_mask) { offset &= 0xf; - if (LOG_COMPARE) logerror("%06X:compare%d_r(%X) = %04X\n", cpu_get_pc(machine->activecpu), which, offset, compare_timer[which].regs[offset]); + if (LOG_COMPARE) logerror("%06X:compare%d_r(%X) = %04X\n", cpu_get_pc(space->machine->activecpu), which, offset, compare_timer[which].regs[offset]); switch (offset) { case 0x0: return compare_timer[which].regs[0]; @@ -660,16 +660,16 @@ static UINT16 compare_timer_r(running_machine *machine, int which, offs_t offset case 0x6: return compare_timer[which].regs[2]; case 0x7: return compare_timer[which].regs[7]; case 0x9: - case 0xd: timer_interrupt_ack(machine, which); break; + case 0xd: timer_interrupt_ack(space->machine, which); break; } return 0xffff; } -static void compare_timer_w(running_machine *machine, int which, offs_t offset, UINT16 data, UINT16 mem_mask) +static void compare_timer_w(const address_space *space, int which, offs_t offset, UINT16 data, UINT16 mem_mask) { offset &= 0xf; - if (LOG_COMPARE) logerror("%06X:compare%d_w(%X) = %04X\n", cpu_get_pc(machine->activecpu), which, offset, data); + if (LOG_COMPARE) logerror("%06X:compare%d_w(%X) = %04X\n", cpu_get_pc(space->machine->activecpu), which, offset, data); switch (offset) { case 0x0: COMBINE_DATA(&compare_timer[which].regs[0]); update_compare(which, 0); break; @@ -680,7 +680,7 @@ static void compare_timer_w(running_machine *machine, int which, offs_t offset, case 0x8: case 0xc: COMBINE_DATA(&compare_timer[which].regs[8]); break; case 0x9: - case 0xd: timer_interrupt_ack(machine, which); break; + case 0xd: timer_interrupt_ack(space->machine, which); break; case 0xa: case 0xe: COMBINE_DATA(&compare_timer[which].regs[10]); break; case 0xb: diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c index 5ea5743e334..674bcaeec64 100644 --- a/src/mame/machine/snes.c +++ b/src/mame/machine/snes.c @@ -1178,11 +1178,11 @@ READ8_HANDLER( snes_r_bank1 ) if (address < 0x2000) /* Mirror of Low RAM */ value = program_read_byte(0x7e0000 + address); else if (address < 0x6000) /* I/O */ - value = snes_r_io(space->machine, address); + value = snes_r_io(space, address); else if (address < 0x8000) { if (has_addon_chip == HAS_OBC1) - value = obc1_read(space->machine, offset); + value = obc1_read(space, offset); else if ((has_addon_chip == HAS_DSP2) && (offset >= 0x200000)) value = (address < 0x7000) ? DSP2_read() : 0x00; else if ((snes_cart.mode == SNES_MODE_21) && (has_addon_chip == HAS_DSP1) && (offset < 0x100000)) @@ -1209,11 +1209,11 @@ READ8_HANDLER( snes_r_bank2 ) if (address < 0x2000) /* Mirror of Low RAM */ value = program_read_byte(0x7e0000 + address); else if (address < 0x6000) /* I/O */ - value = snes_r_io(space->machine, address); + value = snes_r_io(space, address); else if (address < 0x8000) /* SRAM for mode_21, Reserved othewise */ { if (has_addon_chip == HAS_OBC1) - value = obc1_read (space->machine, offset); + value = obc1_read (space, offset); else if (has_addon_chip == HAS_DSP2) value = (address < 0x7000) ? DSP2_read() : 0x00; else if ((snes_cart.mode == SNES_MODE_21) && (snes_cart.sram > 0)) @@ -1361,11 +1361,11 @@ WRITE8_HANDLER( snes_w_bank1 ) if (address < 0x2000) /* Mirror of Low RAM */ program_write_byte(0x7e0000 + address, data); else if (address < 0x6000) /* I/O */ - snes_w_io(space->machine, address, data); + snes_w_io(space, address, data); else if (address < 0x8000) { if (has_addon_chip == HAS_OBC1) - obc1_write(space->machine, offset, data); + obc1_write(space, offset, data); else if ((has_addon_chip == HAS_DSP2) && (offset >= 0x200000)) DSP2_write(data); else if ((snes_cart.mode == SNES_MODE_21) && (has_addon_chip == HAS_DSP1) && (offset < 0x100000)) @@ -1389,11 +1389,11 @@ WRITE8_HANDLER( snes_w_bank2 ) if (address < 0x2000) /* Mirror of Low RAM */ program_write_byte(0x7e0000 + address, data); else if (address < 0x6000) /* I/O */ - snes_w_io(space->machine, address, data); + snes_w_io(space, address, data); else if (address < 0x8000) /* SRAM for mode_21, Reserved othewise */ { if (has_addon_chip == HAS_OBC1) - obc1_write(space->machine, offset, data); + obc1_write(space, offset, data); else if (has_addon_chip == HAS_DSP2) DSP2_write(data); else if ((snes_cart.mode == SNES_MODE_21) && (snes_cart.sram > 0)) @@ -1462,18 +1462,18 @@ WRITE8_HANDLER( snes_w_bank6 ) if (snes_cart.mode != SNES_MODE_25) { if (offset < 0x300000) - snes_w_bank1(space->machine, offset, data); + snes_w_bank1(space, offset, data); else - snes_w_bank2(space->machine, offset - 0x300000, data); + snes_w_bank2(space, offset - 0x300000, data); } else /* Mode 25 has SRAM not mirrored from lower banks */ { if (address < 0x6000) { if (offset < 0x300000) - snes_w_bank1(space->machine, offset, data); + snes_w_bank1(space, offset, data); else - snes_w_bank2(space->machine, offset - 0x300000, data); + snes_w_bank2(space, offset - 0x300000, data); } else if ((offset >= 0x300000) && (snes_cart.sram > 0)) { @@ -1506,9 +1506,9 @@ WRITE8_HANDLER( snes_w_bank7 ) if (offset >= 0x3e0000) logerror("Attempt to write to banks 0xfe - 0xff address: %X\n", offset); else if (offset >= 0x300000) - snes_w_bank5(space->machine, offset - 0x300000, data); + snes_w_bank5(space, offset - 0x300000, data); else if (offset >= 0x200000) - snes_w_bank4(space->machine, offset - 0x200000, data); + snes_w_bank4(space, offset - 0x200000, data); } else logerror("Attempt to write to ROM address: %X\n", offset + 0xc00000); @@ -1676,6 +1676,7 @@ MACHINE_RESET( snes ) /* for mame we use an init, maybe we will need more for the different games */ DRIVER_INIT( snes ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); UINT16 total_blocks, read_blocks; UINT8 *rom; @@ -1730,7 +1731,7 @@ DRIVER_INIT( snes ) } /* Find the amount of sram */ - snes_cart.sram = snes_r_bank1(machine, 0x00ffd8); + snes_cart.sram = snes_r_bank1(space, 0x00ffd8); if (snes_cart.sram > 0) { snes_cart.sram = ((1 << (snes_cart.sram + 3)) / 8); @@ -1741,6 +1742,7 @@ DRIVER_INIT( snes ) DRIVER_INIT( snes_hirom ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); UINT16 total_blocks, read_blocks; UINT8 *rom; @@ -1788,7 +1790,7 @@ DRIVER_INIT( snes_hirom ) } /* Find the amount of sram */ - snes_cart.sram = snes_r_bank1(machine, 0x00ffd8); + snes_cart.sram = snes_r_bank1(space, 0x00ffd8); if (snes_cart.sram > 0) { snes_cart.sram = ((1 << (snes_cart.sram + 3)) / 8); diff --git a/src/mame/machine/stfight.c b/src/mame/machine/stfight.c index ff315c569f9..935d59cd990 100644 --- a/src/mame/machine/stfight.c +++ b/src/mame/machine/stfight.c @@ -92,6 +92,7 @@ DRIVER_INIT( stfight ) MACHINE_RESET( stfight ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); adpcm_data_offs = adpcm_data_end = 0; toggle = 0; fm_data = 0; @@ -102,7 +103,7 @@ MACHINE_RESET( stfight ) stfight_coin_mech_query = 0; // initialise rom bank - stfight_bank_w( machine, 0, 0 ); + stfight_bank_w( space, 0, 0 ); } // It's entirely possible that this bank is never switched out diff --git a/src/mame/machine/tait8741.c b/src/mame/machine/tait8741.c index a0951089ee7..baca1514507 100644 --- a/src/mame/machine/tait8741.c +++ b/src/mame/machine/tait8741.c @@ -121,7 +121,7 @@ void TAITO8741_reset(int num) } /* 8741 update */ -static void taito8741_update(running_machine *machine, int num) +static void taito8741_update(const address_space *space, int num) { I8741 *st,*sst; int next = num; @@ -176,7 +176,7 @@ static void taito8741_update(running_machine *machine, int num) else { /* port select */ st->parallelselect = data & 0x07; - taito8741_hostdata_w(st,st->portHandler ? st->portHandler(machine,st->parallelselect) : 0); + taito8741_hostdata_w(st,st->portHandler ? st->portHandler(space,st->parallelselect) : 0); } } } @@ -187,7 +187,7 @@ static void taito8741_update(running_machine *machine, int num) case -1: /* no command data */ break; case 0x00: /* read from parallel port */ - taito8741_hostdata_w(st,st->portHandler ? st->portHandler(machine,0) : 0 ); + taito8741_hostdata_w(st,st->portHandler ? st->portHandler(space,0) : 0 ); break; case 0x01: /* read receive buffer 0 */ case 0x02: /* read receive buffer 1 */ @@ -200,7 +200,7 @@ static void taito8741_update(running_machine *machine, int num) taito8741_hostdata_w(st,st->rxd[data-1]); break; case 0x08: /* latch received serial data */ - st->txd[0] = st->portHandler ? st->portHandler(machine,0) : 0; + st->txd[0] = st->portHandler ? st->portHandler(space,0) : 0; if( sst ) { timer_call_after_resynch(NULL, num, taito8741_serial_tx); @@ -271,54 +271,54 @@ int TAITO8741_start(const struct TAITO8741interface *taito8741intf) } /* read status port */ -static int I8741_status_r(running_machine *machine, int num) +static int I8741_status_r(const address_space *space, int num) { I8741 *st = &taito8741[num]; - taito8741_update(machine, num); - LOG(("8741-%d ST Read %02x PC=%04x\n",num,st->status,cpu_get_pc(machine->activecpu))); + taito8741_update(space, num); + LOG(("8741-%d ST Read %02x PC=%04x\n",num,st->status,cpu_get_pc(space->machine->activecpu))); return st->status; } /* read data port */ -static int I8741_data_r(running_machine *machine, int num) +static int I8741_data_r(const address_space *space, int num) { I8741 *st = &taito8741[num]; int ret = st->toData; st->status &= 0xfe; - LOG(("8741-%d DATA Read %02x PC=%04x\n",num,ret,cpu_get_pc(machine->activecpu))); + LOG(("8741-%d DATA Read %02x PC=%04x\n",num,ret,cpu_get_pc(space->machine->activecpu))); /* update chip */ - taito8741_update(machine, num); + taito8741_update(space, num); switch( st->mode ) { case TAITO8741_PORT: /* parallel data */ - taito8741_hostdata_w(st,st->portHandler ? st->portHandler(machine, st->parallelselect) : 0); + taito8741_hostdata_w(st,st->portHandler ? st->portHandler(space, st->parallelselect) : 0); break; } return ret; } /* Write data port */ -static void I8741_data_w(running_machine *machine, int num, int data) +static void I8741_data_w(const address_space *space, int num, int data) { I8741 *st = &taito8741[num]; - LOG(("8741-%d DATA Write %02x PC=%04x\n",num,data,cpu_get_pc(machine->activecpu))); + LOG(("8741-%d DATA Write %02x PC=%04x\n",num,data,cpu_get_pc(space->machine->activecpu))); st->fromData = data; st->status |= 0x02; /* update chip */ - taito8741_update(machine, num); + taito8741_update(space, num); } /* Write command port */ -static void I8741_command_w(running_machine *machine, int num, int data) +static void I8741_command_w(const address_space *space, int num, int data) { I8741 *st = &taito8741[num]; - LOG(("8741-%d CMD Write %02x PC=%04x\n",num,data,cpu_get_pc(machine->activecpu))); + LOG(("8741-%d CMD Write %02x PC=%04x\n",num,data,cpu_get_pc(space->machine->activecpu))); st->fromCmd = data; st->status |= 0x04; /* update chip */ - taito8741_update(machine,num); + taito8741_update(space,num); } /* Write port handler */ @@ -441,13 +441,13 @@ static void josvolly_8741_do(int num) } } -static void josvolly_8741_w(running_machine *machine,int num,int offset,int data) +static void josvolly_8741_w(const address_space *space,int num,int offset,int data) { JV8741 *mcu = &i8741[num]; if(offset==1) { - LOG(("PC=%04X 8741[%d] CW %02X\n",cpu_get_pc(machine->activecpu),num,data)); + LOG(("PC=%04X 8741[%d] CW %02X\n",cpu_get_pc(space->machine->activecpu),num,data)); /* read pointer */ mcu->cmd = data; @@ -469,7 +469,7 @@ static void josvolly_8741_w(running_machine *machine,int num,int offset,int data break; case 2: #if 1 - mcu->rxd = input_port_read(machine, "DSW2"); + mcu->rxd = input_port_read(space->machine, "DSW2"); mcu->sts |= 0x01; /* RD ready */ #endif break; @@ -485,7 +485,7 @@ static void josvolly_8741_w(running_machine *machine,int num,int offset,int data else { /* data */ - LOG(("PC=%04X 8741[%d] DW %02X\n",cpu_get_pc(machine->activecpu),num,data)); + LOG(("PC=%04X 8741[%d] DW %02X\n",cpu_get_pc(space->machine->activecpu),num,data)); mcu->txd = data^0x40; /* parity reverce ? */ mcu->sts |= 0x02; /* TXD busy */ @@ -495,7 +495,7 @@ static void josvolly_8741_w(running_machine *machine,int num,int offset,int data { if(josvolly_nmi_enable) { - cpu_set_input_line(machine->cpu[1], INPUT_LINE_NMI, PULSE_LINE); + cpu_set_input_line(space->machine->cpu[1], INPUT_LINE_NMI, PULSE_LINE); josvolly_nmi_enable = 0; } } @@ -504,7 +504,7 @@ static void josvolly_8741_w(running_machine *machine,int num,int offset,int data josvolly_8741_do(num); } -static INT8 josvolly_8741_r(running_machine *machine,int num,int offset) +static INT8 josvolly_8741_r(const address_space *space,int num,int offset) { JV8741 *mcu = &i8741[num]; int ret; @@ -512,16 +512,16 @@ static INT8 josvolly_8741_r(running_machine *machine,int num,int offset) if(offset==1) { if(mcu->rst) - mcu->rxd = (mcu->initReadPort)(machine,0); /* port in */ + mcu->rxd = (mcu->initReadPort)(space,0); /* port in */ ret = mcu->sts; - LOG(("PC=%04X 8741[%d] SR %02X\n",cpu_get_pc(machine->activecpu),num,ret)); + LOG(("PC=%04X 8741[%d] SR %02X\n",cpu_get_pc(space->machine->activecpu),num,ret)); } else { /* clear status port */ mcu->sts &= ~0x01; /* RD ready */ ret = mcu->rxd; - LOG(("PC=%04X 8741[%d] DR %02X\n",cpu_get_pc(machine->activecpu),num,ret)); + LOG(("PC=%04X 8741[%d] DR %02X\n",cpu_get_pc(space->machine->activecpu),num,ret)); mcu->rst = 0; } return ret; diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c index 4e32aa5e7fb..ae65cc70cdd 100644 --- a/src/mame/machine/taitosj.c +++ b/src/mame/machine/taitosj.c @@ -44,9 +44,10 @@ MACHINE_START( taitosj ) MACHINE_RESET( taitosj ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); /* set the default ROM bank (many games only have one bank and */ /* never write to the bank selector register) */ - taitosj_bankswitch_w(machine, 0, 0); + taitosj_bankswitch_w(space, 0, 0); zaccept = 1; diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c index aa1c61ddee2..fff19b98759 100644 --- a/src/mame/machine/twincobr.c +++ b/src/mame/machine/twincobr.c @@ -241,13 +241,13 @@ WRITE16_HANDLER( twincobr_control_w ) { if (ACCESSING_BITS_0_7) { - toaplan0_control_w(space, offset, data & 0xff); + toaplan0_control_w(space->machine, offset, data & 0xff); } } WRITE8_HANDLER( wardner_control_w ) { - toaplan0_control_w(space, offset, data); + toaplan0_control_w(space->machine, offset, data); } @@ -265,10 +265,10 @@ WRITE16_HANDLER( twincobr_sharedram_w ) } -static void toaplan0_coin_dsp_w(running_machine *machine, int offset, int data) +static void toaplan0_coin_dsp_w(const address_space *space, int offset, int data) { if (data > 1) - LOG(("CPU0:%08x Writing %08x to %08x.\n",cpu_get_pc(machine->activecpu),data,toaplan_port_type[toaplan_main_cpu] - offset)); + LOG(("CPU0:%08x Writing %08x to %08x.\n",cpu_get_pc(space->machine->activecpu),data,toaplan_port_type[toaplan_main_cpu] - offset)); switch (data) { case 0x08: coin_counter_w(0,0); break; case 0x09: coin_counter_w(0,1); break; @@ -281,14 +281,14 @@ static void toaplan0_coin_dsp_w(running_machine *machine, int offset, int data) /****** The following apply to Flying Shark/Wardner only ******/ case 0x00: /* This means assert the INT line to the DSP */ LOG(("Turning DSP on and main CPU off\n")); - cpu_set_input_line(machine->cpu[2], INPUT_LINE_HALT, CLEAR_LINE); - cpu_set_input_line(machine->cpu[2], 0, ASSERT_LINE); /* TMS32010 INT */ - cpu_set_input_line(machine->cpu[0], INPUT_LINE_HALT, ASSERT_LINE); + cpu_set_input_line(space->machine->cpu[2], INPUT_LINE_HALT, CLEAR_LINE); + cpu_set_input_line(space->machine->cpu[2], 0, ASSERT_LINE); /* TMS32010 INT */ + cpu_set_input_line(space->machine->cpu[0], INPUT_LINE_HALT, ASSERT_LINE); break; case 0x01: /* This means inhibit the INT line to the DSP */ LOG(("Turning DSP off\n")); - cpu_set_input_line(machine->cpu[2], 0, CLEAR_LINE); /* TMS32010 INT */ - cpu_set_input_line(machine->cpu[2], INPUT_LINE_HALT, ASSERT_LINE); + cpu_set_input_line(space->machine->cpu[2], 0, CLEAR_LINE); /* TMS32010 INT */ + cpu_set_input_line(space->machine->cpu[2], INPUT_LINE_HALT, ASSERT_LINE); break; } } diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c index 15740b0439b..0ccaa92e5cf 100644 --- a/src/mame/machine/vsnes.c +++ b/src/mame/machine/vsnes.c @@ -285,7 +285,7 @@ static WRITE8_HANDLER( vsnormal_vrom_banking ) /* bit 1 ( data & 2 ) enables writes to extra ram, we ignore it */ /* move along */ - vsnes_in0_w( space->machine, offset, data ); + vsnes_in0_w( space, offset, data ); } /* Most games switch VROM Banks in controller 0 write */ @@ -302,11 +302,11 @@ static WRITE8_HANDLER( ppuRC2C05_protection ) /* and no remapped color */ if ( offset == 0 ) { - ppu2c0x_0_w( space->machine, 1, data ); + ppu2c0x_0_w( space, 1, data ); return; } - ppu2c0x_0_w( space->machine, 0, data ); + ppu2c0x_0_w( space, 0, data ); } /**********************************************************************************/ @@ -499,7 +499,7 @@ DRIVER_INIT( hogalley ) static READ8_HANDLER( vsgshoe_security_r ) { /* low part must be 0x1c */ - return ppu2c0x_0_r( space->machine, 2 ) | 0x1c; + return ppu2c0x_0_r( space, 2 ) | 0x1c; } static WRITE8_HANDLER( vsgshoe_gun_in0_w ) @@ -779,7 +779,7 @@ DRIVER_INIT( cstlevna ) static READ8_HANDLER( topgun_security_r ) { /* low part must be 0x1b */ - return ppu2c0x_0_r( space->machine, 2 ) | 0x1b; + return ppu2c0x_0_r( space, 2 ) | 0x1b; } DRIVER_INIT( topgun ) @@ -1221,7 +1221,7 @@ DRIVER_INIT( bnglngby ) static READ8_HANDLER( jajamaru_security_r ) { /* low part must be 0x40 */ - return ppu2c0x_0_r( space->machine, 2 ) | 0x40; + return ppu2c0x_0_r( space, 2 ) | 0x40; } DRIVER_INIT( jajamaru ) @@ -1248,7 +1248,7 @@ DRIVER_INIT( jajamaru ) static READ8_HANDLER( mightybj_security_r ) { /* low part must be 0x3d */ - return ppu2c0x_0_r( space->machine, 2 ) | 0x3d; + return ppu2c0x_0_r( space, 2 ) | 0x3d; } DRIVER_INIT( mightybj ) @@ -1276,9 +1276,9 @@ static WRITE8_HANDLER( vstennis_vrom_banking ) /* move along */ if ( cpunum_get_active() == 0 ) - vsnes_in0_w( space->machine, offset, data ); + vsnes_in0_w( space, offset, data ); else - vsnes_in0_1_w( space->machine, offset, data ); + vsnes_in0_1_w( space, offset, data ); } DRIVER_INIT( vstennis )