diff options
Diffstat (limited to 'src/mame/drivers/malzak.c')
-rw-r--r-- | src/mame/drivers/malzak.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c index ef2c5b1c3c0..44065ce7ff1 100644 --- a/src/mame/drivers/malzak.c +++ b/src/mame/drivers/malzak.c @@ -74,8 +74,8 @@ static READ8_HANDLER( fake_VRLE_r ) { - malzak_state *state = space->machine->driver_data<malzak_state>(); - return (s2636_work_ram_r(state->s2636_0, 0xcb) & 0x3f) + (space->machine->primary_screen->vblank() * 0x40); + malzak_state *state = space->machine().driver_data<malzak_state>(); + return (s2636_work_ram_r(state->s2636_0, 0xcb) & 0x3f) + (space->machine().primary_screen->vblank() * 0x40); } static READ8_HANDLER( s2636_portA_r ) @@ -83,7 +83,7 @@ static READ8_HANDLER( s2636_portA_r ) // POT switch position, read from port A of the first S2636 // Not sure of the correct values to return, but these should // do based on the game code. - switch (input_port_read(space->machine, "POT")) + switch (input_port_read(space->machine(), "POT")) { case 0: // Normal play return 0xf0; @@ -153,27 +153,27 @@ static WRITE8_HANDLER( port40_w ) // Bits 1-3 are all set high upon death, until the game continues // Bit 6 is used only in Malzak II, and is set high after checking // the selected version -// logerror("S2650 [0x%04x]: port 0x40 write: 0x%02x\n", cpu_get_pc(space->machine->device("maincpu")), data); - memory_set_bank(space->machine, "bank1", (data & 0x40) >> 6); +// logerror("S2650 [0x%04x]: port 0x40 write: 0x%02x\n", cpu_get_pc(space->machine().device("maincpu")), data); + memory_set_bank(space->machine(), "bank1", (data & 0x40) >> 6); } static WRITE8_HANDLER( port60_w ) { - malzak_state *state = space->machine->driver_data<malzak_state>(); + malzak_state *state = space->machine().driver_data<malzak_state>(); state->malzak_x = data; // logerror("I/O: port 0x60 write 0x%02x\n", data); } static WRITE8_HANDLER( portc0_w ) { - malzak_state *state = space->machine->driver_data<malzak_state>(); + malzak_state *state = space->machine().driver_data<malzak_state>(); state->malzak_y = data; // logerror("I/O: port 0xc0 write 0x%02x\n", data); } static READ8_HANDLER( collision_r ) { - malzak_state *state = space->machine->driver_data<malzak_state>(); + malzak_state *state = space->machine().driver_data<malzak_state>(); // High 4 bits seem to refer to the row affected. if(++state->collision_counter > 15) @@ -372,13 +372,13 @@ static const saa5050_interface malzac_saa5050_intf = static MACHINE_START( malzak ) { - malzak_state *state = machine->driver_data<malzak_state>(); + malzak_state *state = machine.driver_data<malzak_state>(); - memory_configure_bank(machine, "bank1", 0, 2, machine->region("user2")->base(), 0x400); + memory_configure_bank(machine, "bank1", 0, 2, machine.region("user2")->base(), 0x400); - state->s2636_0 = machine->device("s2636_0"); - state->s2636_1 = machine->device("s2636_1"); - state->saa5050 = machine->device("saa5050"); + state->s2636_0 = machine.device("s2636_0"); + state->s2636_1 = machine.device("s2636_1"); + state->saa5050 = machine.device("saa5050"); state->save_item(NAME(state->playfield_code)); state->save_item(NAME(state->malzak_x)); @@ -387,7 +387,7 @@ static MACHINE_START( malzak ) static MACHINE_RESET( malzak ) { - malzak_state *state = machine->driver_data<malzak_state>(); + malzak_state *state = machine.driver_data<malzak_state>(); memset(state->playfield_code, 0, 256); |