diff options
author | mooglyguy <therealmogminer@gmail.com> | 2018-06-12 07:04:57 +0200 |
---|---|---|
committer | mooglyguy <therealmogminer@gmail.com> | 2018-06-12 07:07:53 +0200 |
commit | 108c36547ccd890828a173752aa4f20bb456208c (patch) | |
tree | ae57de8ae17f313bb1dcb59b4930b6acecd007a1 /src/mame/drivers/lviv.cpp | |
parent | 62fc2e8f068a67b84b324b1c2e9b55791850247e (diff) |
lviv, gaplus: machine().device cleanup, other cleanup, nw
Diffstat (limited to 'src/mame/drivers/lviv.cpp')
-rw-r--r-- | src/mame/drivers/lviv.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mame/drivers/lviv.cpp b/src/mame/drivers/lviv.cpp index 86c89ce2c0e..7fe75206ebe 100644 --- a/src/mame/drivers/lviv.cpp +++ b/src/mame/drivers/lviv.cpp @@ -298,12 +298,12 @@ Timings: void lviv_state::io_map(address_map &map) { - map(0x00, 0xff).rw(FUNC(lviv_state::lviv_io_r), FUNC(lviv_state::lviv_io_w)); + map(0x00, 0xff).rw(FUNC(lviv_state::io_r), FUNC(lviv_state::io_w)); } /* memory w/r functions */ -void lviv_state::lviv_mem(address_map &map) +void lviv_state::mem_map(address_map &map) { map(0x0000, 0x3fff).bankrw(m_bank[0]); map(0x4000, 0x7fff).bankrw(m_bank[1]); @@ -407,7 +407,7 @@ static INPUT_PORTS_START (lviv) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Left") PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Down") PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_START("RESET") /* CPU */ - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Reset") PORT_CODE(KEYCODE_PGDN) PORT_CHAR(UCHAR_MAMEKEY(PGDN)) PORT_CHANGED_MEMBER(DEVICE_SELF, lviv_state, lviv_reset, 0) + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Reset") PORT_CODE(KEYCODE_PGDN) PORT_CHAR(UCHAR_MAMEKEY(PGDN)) PORT_CHANGED_MEMBER(DEVICE_SELF, lviv_state, reset_button, 0) PORT_START("JOY") /* Joystick */ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP) PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN) @@ -424,25 +424,25 @@ INPUT_PORTS_END MACHINE_CONFIG_START(lviv_state::lviv) /* basic machine hardware */ MCFG_DEVICE_ADD(m_maincpu, I8080, 2500000) - MCFG_DEVICE_PROGRAM_MAP(lviv_mem) + MCFG_DEVICE_PROGRAM_MAP(mem_map) MCFG_DEVICE_IO_MAP(io_map) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_DEVICE_ADD(m_ppi[0], I8255, 0) - MCFG_I8255_IN_PORTA_CB(READ8(*this, lviv_state, lviv_ppi_0_porta_r)) - MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, lviv_state, lviv_ppi_0_porta_w)) - MCFG_I8255_IN_PORTB_CB(READ8(*this, lviv_state, lviv_ppi_0_portb_r)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, lviv_state, lviv_ppi_0_portb_w)) - MCFG_I8255_IN_PORTC_CB(READ8(*this, lviv_state, lviv_ppi_0_portc_r)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, lviv_state, lviv_ppi_0_portc_w)) + MCFG_I8255_IN_PORTA_CB(READ8(*this, lviv_state, ppi_0_porta_r)) + MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, lviv_state, ppi_0_porta_w)) + MCFG_I8255_IN_PORTB_CB(READ8(*this, lviv_state, ppi_0_portb_r)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, lviv_state, ppi_0_portb_w)) + MCFG_I8255_IN_PORTC_CB(READ8(*this, lviv_state, ppi_0_portc_r)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, lviv_state, ppi_0_portc_w)) MCFG_DEVICE_ADD(m_ppi[1], I8255, 0) - MCFG_I8255_IN_PORTA_CB(READ8(*this, lviv_state, lviv_ppi_1_porta_r)) - MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, lviv_state, lviv_ppi_1_porta_w)) - MCFG_I8255_IN_PORTB_CB(READ8(*this, lviv_state, lviv_ppi_1_portb_r)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, lviv_state, lviv_ppi_1_portb_w)) - MCFG_I8255_IN_PORTC_CB(READ8(*this, lviv_state, lviv_ppi_1_portc_r)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, lviv_state, lviv_ppi_1_portc_w)) + MCFG_I8255_IN_PORTA_CB(READ8(*this, lviv_state, ppi_1_porta_r)) + MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, lviv_state, ppi_1_porta_w)) + MCFG_I8255_IN_PORTB_CB(READ8(*this, lviv_state, ppi_1_portb_r)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, lviv_state, ppi_1_portb_w)) + MCFG_I8255_IN_PORTC_CB(READ8(*this, lviv_state, ppi_1_portc_r)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, lviv_state, ppi_1_portc_w)) MCFG_SCREEN_ADD(m_screen, RASTER) MCFG_SCREEN_REFRESH_RATE(50) @@ -451,10 +451,10 @@ MACHINE_CONFIG_START(lviv_state::lviv) /* video hardware */ MCFG_SCREEN_SIZE(256, 256) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1) - MCFG_SCREEN_UPDATE_DRIVER(lviv_state, screen_update_lviv) + MCFG_SCREEN_UPDATE_DRIVER(lviv_state, screen_update) MCFG_SCREEN_PALETTE(m_palette) - MCFG_PALETTE_ADD(m_palette, sizeof (lviv_palette) / 3) + MCFG_PALETTE_ADD(m_palette, sizeof (s_palette) / 3) MCFG_PALETTE_INIT_OWNER(lviv_state, lviv) /* sound hardware */ |