diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index 33b38a12ff3..095bf0e32a7 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -400,7 +400,9 @@ static WRITE8_DEVICE_HANDLER( konami_portc_1_w ) static WRITE8_DEVICE_HANDLER( sound_latch_w ) { - soundlatch_w(device->machine, offset, data); + const address_space *space = cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + + soundlatch_w(space, offset, data); } @@ -585,7 +587,9 @@ static WRITE8_HANDLER( sfx_sample_control_w ) static READ8_DEVICE_HANDLER( sound_data2_r ) { - return soundlatch2_r(device->machine, offset); + const address_space *space = cpu_get_address_space(device->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + + return soundlatch2_r(space, offset); } @@ -798,15 +802,17 @@ static const ppi8255_interface scorpion_ppi8255_1_intf = static INPUT_CHANGED( gmgalax_game_changed ) { + const address_space *space = cpu_get_address_space(field->port->machine->cpu[0], ADDRESS_SPACE_PROGRAM); + /* new value is the selected game */ gmgalax_selected_game = newval; /* select the bank and graphics bank based on it */ memory_set_bank(1, gmgalax_selected_game); - galaxian_gfxbank_w(field->port->machine, 0, gmgalax_selected_game); + galaxian_gfxbank_w(space, 0, gmgalax_selected_game); /* reset the starts */ - galaxian_stars_enable_w(field->port->machine, 0, 0); + galaxian_stars_enable_w(space, 0, 0); /* reset the CPU */ cpu_set_input_line(field->port->machine->cpu[0], INPUT_LINE_RESET, PULSE_LINE); @@ -2456,6 +2462,8 @@ static DRIVER_INIT( devilfsg ) static DRIVER_INIT( zigzag ) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + /* video extensions */ common_init(machine, NULL, galaxian_draw_background, NULL, NULL); @@ -2467,7 +2475,7 @@ static DRIVER_INIT( zigzag ) /* handler for doing the swaps */ memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x7002, 0x7002, 0, 0x07f8, zigzag_bankswap_w); - zigzag_bankswap_w(machine, 0, 0); + zigzag_bankswap_w(space, 0, 0); /* coin lockout disabled */ memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x6002, 0x6002, 0, 0x7f8, SMH_UNMAP); diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 220bbaaf33c..0fb50df716b 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -153,9 +153,11 @@ static READ16_HANDLER( metro_irq_cause_r ) /* Update the IRQ state based on all possible causes */ static void update_irq_state(running_machine *machine) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + /* Get the pending IRQs (only the enabled ones, e.g. where irq_enable is *0*) */ - UINT16 irq = metro_irq_cause_r(machine,0,0xffff) & ~*metro_irq_enable; + UINT16 irq = metro_irq_cause_r(space, 0, 0xffff) & ~*metro_irq_enable; if (irq_line == -1) /* mouja, gakusai, gakusai2, dokyusei, dokyusp */ { @@ -2138,9 +2140,9 @@ static WRITE8_HANDLER( puzzlet_portb_w ) } static ADDRESS_MAP_START( puzzlet_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE( H8_PORT7, H8_PORT7 ) AM_READ_PORT("IN2") - AM_RANGE( H8_SERIAL_B, H8_SERIAL_B ) AM_READ_PORT("IN0") // coin - AM_RANGE( H8_PORTB, H8_PORTB ) AM_READ_PORT("DSW0") AM_WRITE( puzzlet_portb_w ) + AM_RANGE( H8_PORT_7, H8_PORT_7 ) AM_READ_PORT("IN2") + AM_RANGE( H8_SERIAL_1, H8_SERIAL_1 ) AM_READ_PORT("IN0") // coin + AM_RANGE( H8_PORT_B, H8_PORT_B ) AM_READ_PORT("DSW0") AM_WRITE( puzzlet_portb_w ) ADDRESS_MAP_END diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c index f0e257842ed..b81cc3e0415 100644 --- a/src/mame/drivers/namcona1.c +++ b/src/mame/drivers/namcona1.c @@ -498,6 +498,7 @@ static READ16_HANDLER( namcona1_vreg_r ) static int transfer_dword( running_machine *machine, UINT32 dest, UINT32 source ) { UINT16 data; + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); if( source>=0x400000 && source<0xc00000 ) { @@ -518,15 +519,15 @@ static int transfer_dword( running_machine *machine, UINT32 dest, UINT32 source } if( dest>=0xf00000 && dest<0xf02000 ) { - namcona1_paletteram_w( machine, (dest-0xf00000)/2, data, 0xffff ); + namcona1_paletteram_w(space, (dest-0xf00000)/2, data, 0xffff ); } else if( dest>=0xf40000 && dest<0xf80000 ) { - namcona1_gfxram_w( machine, (dest-0xf40000)/2, data, 0xffff ); + namcona1_gfxram_w(space, (dest-0xf40000)/2, data, 0xffff ); } else if( dest>=0xff0000 && dest<0xffc000 ) - { - namcona1_videoram_w( machine, (dest-0xff0000)/2, data, 0xffff ); + { + namcona1_videoram_w(space, (dest-0xff0000)/2, data, 0xffff ); } else if( dest>=0xfff000 && dest<0x1000000 ) { diff --git a/src/mame/machine/namcoio.c b/src/mame/machine/namcoio.c index 428e5cc31ac..2bc0b07552a 100644 --- a/src/mame/machine/namcoio.c +++ b/src/mame/machine/namcoio.c @@ -283,6 +283,8 @@ static const int joy_map[16] = static UINT8 namcoio_51XX_read(running_machine *machine, int chip) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + LOG(("%04x: custom 51XX read\n",cpu_get_pc(machine->activecpu))); if (io[chip].mode == 0) /* switch mode */ @@ -290,8 +292,8 @@ static UINT8 namcoio_51XX_read(running_machine *machine, int chip) switch ((io[chip].in_count++) % 3) { default: - case 0: return READ_PORT(machine,0) | (READ_PORT(machine,1) << 4); - case 1: return READ_PORT(machine,2) | (READ_PORT(machine,3) << 4); + case 0: return READ_PORT(space,0) | (READ_PORT(space,1) << 4); + case 1: return READ_PORT(space,2) | (READ_PORT(space,3) << 4); case 2: return 0; // nothing? } } @@ -304,7 +306,7 @@ static UINT8 namcoio_51XX_read(running_machine *machine, int chip) { int in,toggle; - in = ~(READ_PORT(machine,0) | (READ_PORT(machine,1) << 4)); + in = ~(READ_PORT(space,0) | (READ_PORT(space,1) << 4)); toggle = in ^ io[chip].lastcoins; io[chip].lastcoins = in; @@ -312,17 +314,17 @@ static UINT8 namcoio_51XX_read(running_machine *machine, int chip) { if (io[chip].credits >= 99) { - WRITE_PORT(machine,1,1); // coin lockout + WRITE_PORT(space,1,1); // coin lockout } else { - WRITE_PORT(machine,1,0); // coin lockout + WRITE_PORT(space,1,0); // coin lockout /* check if the user inserted a coin */ if (toggle & in & 0x10) { io[chip].coins[0]++; - WRITE_PORT(machine,0,0x04); // coin counter - WRITE_PORT(machine,0,0x0c); + WRITE_PORT(space,0,0x04); // coin counter + WRITE_PORT(space,0,0x0c); if (io[chip].coins[0] >= io[chip].coins_per_cred[0]) { io[chip].credits += io[chip].creds_per_coin[0]; @@ -332,8 +334,8 @@ static UINT8 namcoio_51XX_read(running_machine *machine, int chip) if (toggle & in & 0x20) { io[chip].coins[1]++; - WRITE_PORT(machine,0,0x08); // coin counter - WRITE_PORT(machine,0,0x0c); + WRITE_PORT(space,0,0x08); // coin counter + WRITE_PORT(space,0,0x0c); if (io[chip].coins[1] >= io[chip].coins_per_cred[1]) { io[chip].credits += io[chip].creds_per_coin[1]; @@ -353,11 +355,11 @@ static UINT8 namcoio_51XX_read(running_machine *machine, int chip) int on = (video_screen_get_frame_number(machine->primary_screen) & 0x10) >> 4; if (io[chip].credits >= 2) - WRITE_PORT(machine,0,0x0c | 3*on); // lamps + WRITE_PORT(space,0,0x0c | 3*on); // lamps else if (io[chip].credits >= 1) - WRITE_PORT(machine,0,0x0c | 2*on); // lamps + WRITE_PORT(space,0,0x0c | 2*on); // lamps else - WRITE_PORT(machine,0,0x0c); // lamps off + WRITE_PORT(space,0,0x0c); // lamps off /* check for 1 player start button */ if (toggle & in & 0x04) @@ -366,7 +368,7 @@ static UINT8 namcoio_51XX_read(running_machine *machine, int chip) { io[chip].credits--; io[chip].mode = 2; - WRITE_PORT(machine,0,0x0c); // lamps off + WRITE_PORT(space,0,0x0c); // lamps off } } /* check for 2 players start button */ @@ -376,7 +378,7 @@ static UINT8 namcoio_51XX_read(running_machine *machine, int chip) { io[chip].credits -= 2; io[chip].mode = 2; - WRITE_PORT(machine,0,0x0c); // lamps off + WRITE_PORT(space, 0,0x0c); // lamps off } } } @@ -389,10 +391,10 @@ static UINT8 namcoio_51XX_read(running_machine *machine, int chip) case 1: { - int joy = READ_PORT(machine,2) & 0x0f; + int joy = READ_PORT(space,2) & 0x0f; int in,toggle; - in = ~READ_PORT(machine,0); + in = ~READ_PORT(space,0); toggle = in ^ io[chip].lastbuttons; io[chip].lastbuttons = (io[chip].lastbuttons & 2) | (in & 1); @@ -408,10 +410,10 @@ static UINT8 namcoio_51XX_read(running_machine *machine, int chip) case 2: { - int joy = READ_PORT(machine,3) & 0x0f; + int joy = READ_PORT(space,3) & 0x0f; int in,toggle; - in = ~READ_PORT(machine,0); + in = ~READ_PORT(space,0); toggle = in ^ io[chip].lastbuttons; io[chip].lastbuttons = (io[chip].lastbuttons & 1) | (in & 2); @@ -444,10 +446,11 @@ static void handle_coins(running_machine *machine,int chip,int swap) int credit_add = 0; int credit_sub = 0; int button; + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); //popmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15)); - val = ~READ_PORT(machine,0); // pins 38-41 + val = ~READ_PORT(space,0); // pins 38-41 toggled = val ^ io[chip].lastcoins; io[chip].lastcoins = val; @@ -479,7 +482,7 @@ static void handle_coins(running_machine *machine,int chip,int swap) credit_add = 1; } - val = ~READ_PORT(machine,3); // pins 30-33 + val = ~READ_PORT(space,3); // pins 30-33 toggled = val ^ io[chip].lastbuttons; io[chip].lastbuttons = val; @@ -503,10 +506,10 @@ static void handle_coins(running_machine *machine,int chip,int swap) IORAM_WRITE(1 ^ swap, io[chip].credits % 10); // BCD credits IORAM_WRITE(2 ^ swap, credit_add); // credit increment (coin inputs) IORAM_WRITE(3 ^ swap, credit_sub); // credit decrement (start buttons) - IORAM_WRITE(4, ~READ_PORT(machine,1)); // pins 22-25 + IORAM_WRITE(4, ~READ_PORT(space,1)); // pins 22-25 button = ((val & 0x05) << 1) | (val & toggled & 0x05); IORAM_WRITE(5, button); // pins 30 & 32 normal and impulse - IORAM_WRITE(6, ~READ_PORT(machine,2)); // pins 26-29 + IORAM_WRITE(6, ~READ_PORT(space,2)); // pins 26-29 button = (val & 0x0a) | ((val & toggled & 0x0a) >> 1); IORAM_WRITE(7, button); // pins 31 & 33 normal and impulse } @@ -515,6 +518,8 @@ static void handle_coins(running_machine *machine,int chip,int swap) static void namco_customio_56XX_run(running_machine *machine, int chip) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + LOG(("execute 56XX %d mode %d\n",chip,IORAM_READ(8))); switch (IORAM_READ(8)) @@ -523,15 +528,15 @@ static void namco_customio_56XX_run(running_machine *machine, int chip) break; case 1: // read switch inputs - IORAM_WRITE(0, ~READ_PORT(machine,0)); // pins 38-41 - IORAM_WRITE(1, ~READ_PORT(machine,1)); // pins 22-25 - IORAM_WRITE(2, ~READ_PORT(machine,2)); // pins 26-29 - IORAM_WRITE(3, ~READ_PORT(machine,3)); // pins 30-33 + IORAM_WRITE(0, ~READ_PORT(space,0)); // pins 38-41 + IORAM_WRITE(1, ~READ_PORT(space,1)); // pins 22-25 + IORAM_WRITE(2, ~READ_PORT(space,2)); // pins 26-29 + IORAM_WRITE(3, ~READ_PORT(space,3)); // pins 30-33 //popmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15)); - WRITE_PORT(machine,0,IORAM_READ(9)); // output to pins 13-16 (motos, pacnpal, gaplus) - WRITE_PORT(machine,1,IORAM_READ(10)); // output to pins 17-20 (gaplus) + WRITE_PORT(space,0,IORAM_READ(9)); // output to pins 13-16 (motos, pacnpal, gaplus) + WRITE_PORT(space,1,IORAM_READ(10)); // output to pins 17-20 (gaplus) break; case 2: // initialize coinage settings @@ -574,16 +579,16 @@ static void namco_customio_56XX_run(running_machine *machine, int chip) break; case 9: // read dip switches and inputs - WRITE_PORT(machine,0,0); // set pin 13 = 0 - IORAM_WRITE(0, ~READ_PORT(machine,0)); // pins 38-41, pin 13 = 0 - IORAM_WRITE(2, ~READ_PORT(machine,1)); // pins 22-25, pin 13 = 0 - IORAM_WRITE(4, ~READ_PORT(machine,2)); // pins 26-29, pin 13 = 0 - IORAM_WRITE(6, ~READ_PORT(machine,3)); // pins 30-33, pin 13 = 0 - WRITE_PORT(machine,0,1); // set pin 13 = 1 - IORAM_WRITE(1, ~READ_PORT(machine,0)); // pins 38-41, pin 13 = 1 - IORAM_WRITE(3, ~READ_PORT(machine,1)); // pins 22-25, pin 13 = 1 - IORAM_WRITE(5, ~READ_PORT(machine,2)); // pins 26-29, pin 13 = 1 - IORAM_WRITE(7, ~READ_PORT(machine,3)); // pins 30-33, pin 13 = 1 + WRITE_PORT(space,0,0); // set pin 13 = 0 + IORAM_WRITE(0, ~READ_PORT(space,0)); // pins 38-41, pin 13 = 0 + IORAM_WRITE(2, ~READ_PORT(space,1)); // pins 22-25, pin 13 = 0 + IORAM_WRITE(4, ~READ_PORT(space,2)); // pins 26-29, pin 13 = 0 + IORAM_WRITE(6, ~READ_PORT(space,3)); // pins 30-33, pin 13 = 0 + WRITE_PORT(space,0,1); // set pin 13 = 1 + IORAM_WRITE(1, ~READ_PORT(space,0)); // pins 38-41, pin 13 = 1 + IORAM_WRITE(3, ~READ_PORT(space,1)); // pins 22-25, pin 13 = 1 + IORAM_WRITE(5, ~READ_PORT(space,2)); // pins 26-29, pin 13 = 1 + IORAM_WRITE(7, ~READ_PORT(space,3)); // pins 30-33, pin 13 = 1 break; default: @@ -595,6 +600,8 @@ static void namco_customio_56XX_run(running_machine *machine, int chip) static void namco_customio_59XX_run(running_machine *machine, int chip) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + LOG(("execute 59XX %d mode %d\n",chip,IORAM_READ(8))); switch (IORAM_READ(8)) @@ -603,10 +610,10 @@ static void namco_customio_59XX_run(running_machine *machine, int chip) break; case 3: // pacnpal chip #1: read dip switches and inputs - IORAM_WRITE(4, ~READ_PORT(machine,0)); // pins 38-41, pin 13 = 0 ? - IORAM_WRITE(5, ~READ_PORT(machine,2)); // pins 26-29 ? - IORAM_WRITE(6, ~READ_PORT(machine,1)); // pins 22-25 ? - IORAM_WRITE(7, ~READ_PORT(machine,3)); // pins 30-33 + IORAM_WRITE(4, ~READ_PORT(space,0)); // pins 38-41, pin 13 = 0 ? + IORAM_WRITE(5, ~READ_PORT(space,2)); // pins 26-29 ? + IORAM_WRITE(6, ~READ_PORT(space,1)); // pins 22-25 ? + IORAM_WRITE(7, ~READ_PORT(space,3)); // pins 30-33 break; default: @@ -618,6 +625,8 @@ static void namco_customio_59XX_run(running_machine *machine, int chip) static void namco_customio_58XX_run(running_machine *machine, int chip) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + LOG(("execute 58XX %d mode %d\n",chip,IORAM_READ(8))); switch (IORAM_READ(8)) @@ -626,15 +635,15 @@ static void namco_customio_58XX_run(running_machine *machine, int chip) break; case 1: // read switch inputs - IORAM_WRITE(4, ~READ_PORT(machine,0)); // pins 38-41 - IORAM_WRITE(5, ~READ_PORT(machine,1)); // pins 22-25 - IORAM_WRITE(6, ~READ_PORT(machine,2)); // pins 26-29 - IORAM_WRITE(7, ~READ_PORT(machine,3)); // pins 30-33 + IORAM_WRITE(4, ~READ_PORT(space,0)); // pins 38-41 + IORAM_WRITE(5, ~READ_PORT(space,1)); // pins 22-25 + IORAM_WRITE(6, ~READ_PORT(space,2)); // pins 26-29 + IORAM_WRITE(7, ~READ_PORT(space,3)); // pins 30-33 //popmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15)); - WRITE_PORT(machine,0,IORAM_READ(9)); // output to pins 13-16 (toypop) - WRITE_PORT(machine,1,IORAM_READ(10)); // output to pins 17-20 (toypop) + WRITE_PORT(space,0,IORAM_READ(9)); // output to pins 13-16 (toypop) + WRITE_PORT(space,1,IORAM_READ(10)); // output to pins 17-20 (toypop) break; case 2: // initialize coinage settings @@ -652,16 +661,16 @@ static void namco_customio_58XX_run(running_machine *machine, int chip) break; case 4: // read dip switches and inputs - WRITE_PORT(machine,0,0); // set pin 13 = 0 - IORAM_WRITE(0, ~READ_PORT(machine,0)); // pins 38-41, pin 13 = 0 - IORAM_WRITE(2, ~READ_PORT(machine,1)); // pins 22-25, pin 13 = 0 - IORAM_WRITE(4, ~READ_PORT(machine,2)); // pins 26-29, pin 13 = 0 - IORAM_WRITE(6, ~READ_PORT(machine,3)); // pins 30-33, pin 13 = 0 - WRITE_PORT(machine,0,1); // set pin 13 = 1 - IORAM_WRITE(1, ~READ_PORT(machine,0)); // pins 38-41, pin 13 = 1 - IORAM_WRITE(3, ~READ_PORT(machine,1)); // pins 22-25, pin 13 = 1 - IORAM_WRITE(5, ~READ_PORT(machine,2)); // pins 26-29, pin 13 = 1 - IORAM_WRITE(7, ~READ_PORT(machine,3)); // pins 30-33, pin 13 = 1 + WRITE_PORT(space,0,0); // set pin 13 = 0 + IORAM_WRITE(0, ~READ_PORT(space,0)); // pins 38-41, pin 13 = 0 + IORAM_WRITE(2, ~READ_PORT(space,1)); // pins 22-25, pin 13 = 0 + IORAM_WRITE(4, ~READ_PORT(space,2)); // pins 26-29, pin 13 = 0 + IORAM_WRITE(6, ~READ_PORT(space,3)); // pins 30-33, pin 13 = 0 + WRITE_PORT(space,0,1); // set pin 13 = 1 + IORAM_WRITE(1, ~READ_PORT(space,0)); // pins 38-41, pin 13 = 1 + IORAM_WRITE(3, ~READ_PORT(space,1)); // pins 22-25, pin 13 = 1 + IORAM_WRITE(5, ~READ_PORT(space,2)); // pins 26-29, pin 13 = 1 + IORAM_WRITE(7, ~READ_PORT(space,3)); // pins 30-33, pin 13 = 1 break; case 5: // bootup check @@ -868,25 +877,29 @@ void namco_06xx_init(int chipnum, int cpu, static UINT8 namcoio_53XX_digdug_read(running_machine *machine, int chip) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + LOG(("%04x: custom 53XX read\n",cpu_get_pc(machine->activecpu))); switch ((io[chip].in_count++) % 2) { default: - case 0: return READ_PORT(machine,0) | (READ_PORT(machine,1) << 4); - case 1: return READ_PORT(machine,2) | (READ_PORT(machine,3) << 4); + case 0: return READ_PORT(space,0) | (READ_PORT(space,1) << 4); + case 1: return READ_PORT(space,2) | (READ_PORT(space,3) << 4); } } static UINT8 namcoio_53XX_polepos_read(running_machine *machine,int chip) { + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + LOG(("%04x: custom 53XX read\n",cpu_get_pc(machine->activecpu))); switch ((io[chip].in_count++) % 8) { - case 0: return READ_PORT(machine,0) | (READ_PORT(machine,1) << 4); // steering - case 4: return READ_PORT(machine,2) | (READ_PORT(machine,3) << 4); // dip switches + case 0: return READ_PORT(space,0) | (READ_PORT(space,1) << 4); // steering + case 4: return READ_PORT(space,2) | (READ_PORT(space,3) << 4); // dip switches default: return 0xff; // polepos2 hangs if 0 is returned } } @@ -1033,11 +1046,11 @@ static void namco_06xx_ctrl_w(running_machine *machine, int chip,int data) -READ8_HANDLER( namco_06xx_0_data_r ) { return namco_06xx_data_r(space,0,offset); } -READ8_HANDLER( namco_06xx_1_data_r ) { return namco_06xx_data_r(space,1,offset); } -WRITE8_HANDLER( namco_06xx_0_data_w ) { namco_06xx_data_w(space,0,offset,data); } -WRITE8_HANDLER( namco_06xx_1_data_w ) { namco_06xx_data_w(space,1,offset,data); } -READ8_HANDLER( namco_06xx_0_ctrl_r ) { return namco_06xx_ctrl_r(space,0); } -READ8_HANDLER( namco_06xx_1_ctrl_r ) { return namco_06xx_ctrl_r(space,1); } -WRITE8_HANDLER( namco_06xx_0_ctrl_w ) { namco_06xx_ctrl_w(space, 0,data); } -WRITE8_HANDLER( namco_06xx_1_ctrl_w ) { namco_06xx_ctrl_w(space, 1,data); } +READ8_HANDLER( namco_06xx_0_data_r ) { return namco_06xx_data_r(space->machine,0,offset); } +READ8_HANDLER( namco_06xx_1_data_r ) { return namco_06xx_data_r(space->machine,1,offset); } +WRITE8_HANDLER( namco_06xx_0_data_w ) { namco_06xx_data_w(space->machine,0,offset,data); } +WRITE8_HANDLER( namco_06xx_1_data_w ) { namco_06xx_data_w(space->machine,1,offset,data); } +READ8_HANDLER( namco_06xx_0_ctrl_r ) { return namco_06xx_ctrl_r(space->machine,0); } +READ8_HANDLER( namco_06xx_1_ctrl_r ) { return namco_06xx_ctrl_r(space->machine,1); } +WRITE8_HANDLER( namco_06xx_0_ctrl_w ) { namco_06xx_ctrl_w(space->machine, 0,data); } +WRITE8_HANDLER( namco_06xx_1_ctrl_w ) { namco_06xx_ctrl_w(space->machine, 1,data); } diff --git a/src/mame/video/psx.c b/src/mame/video/psx.c index db863d94590..c9b333fcfbc 100644 --- a/src/mame/video/psx.c +++ b/src/mame/video/psx.c @@ -3907,7 +3907,9 @@ INTERRUPT_GEN( psx_vblank ) void psx_gpu_reset( running_machine *machine ) { - psx_gpu_w( machine, 1, 0, 0xffffffff ); + const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); + + psx_gpu_w(space, 1, 0, 0xffffffff ); } void psx_lightgun_set( int n_x, int n_y )