From ddd9555b7f815f7204635c09692ab7852dc9e232 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Wed, 19 Sep 2012 20:59:42 +0000 Subject: [PATCH] MESS fixes. --- src/mess/drivers/astrocde.c | 14 ++------------ src/mess/drivers/bigbord2.c | 2 +- src/mess/drivers/p8k.c | 4 ++-- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/mess/drivers/astrocde.c b/src/mess/drivers/astrocde.c index 92e6a5942de..15ae0b12df8 100644 --- a/src/mess/drivers/astrocde.c +++ b/src/mess/drivers/astrocde.c @@ -100,13 +100,8 @@ ADDRESS_MAP_END INPUT_CHANGED_MEMBER(astrocde_mess_state::set_write_protect) // run when RAM expansion write protect switch is changed { int ram_expansion_installed = 0, write_protect_on = 0, expansion_ram_start = 0, expansion_ram_end = 0, shadow_ram_end = 0; -<<<<<<< .mine - address_space &space = field.machine().device("maincpu")->memory().space(AS_PROGRAM); - UINT8 *expram = field.machine().device("ram_tag")->pointer(); -======= - address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM); + address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM); UINT8 *expram = machine().device("ram_tag")->pointer(); ->>>>>>> .r18023 get_ram_expansion_settings(ram_expansion_installed, write_protect_on, expansion_ram_start, expansion_ram_end, shadow_ram_end); // passing by reference @@ -325,13 +320,8 @@ DRIVER_INIT_MEMBER(astrocde_state,astrocde) MACHINE_RESET_MEMBER(astrocde_mess_state, astrocde) { int ram_expansion_installed = 0, write_protect_on = 0, expansion_ram_start = 0, expansion_ram_end = 0, shadow_ram_end = 0; -<<<<<<< .mine - address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM); - UINT8 *expram = machine.device("ram_tag")->pointer(); -======= - address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM); + address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM); UINT8 *expram = machine().device("ram_tag")->pointer(); ->>>>>>> .r18023 space.unmap_readwrite(0x5000, 0xffff); // unmap any previously installed expansion RAM get_ram_expansion_settings(ram_expansion_installed, write_protect_on, expansion_ram_start, expansion_ram_end, shadow_ram_end); // passing by reference diff --git a/src/mess/drivers/bigbord2.c b/src/mess/drivers/bigbord2.c index 455d69d6930..d375d4b38e2 100644 --- a/src/mess/drivers/bigbord2.c +++ b/src/mess/drivers/bigbord2.c @@ -175,7 +175,7 @@ READ8_MEMBER( bigbord2_state::portd0_r ) WRITE8_MEMBER( bigbord2_state::bigbord2_kbd_put ) { - address_space &mem = *m_maincpu->space(AS_PROGRAM); + address_space &mem = m_maincpu->space(AS_PROGRAM); if (data) { diff --git a/src/mess/drivers/p8k.c b/src/mess/drivers/p8k.c index bbdf2c5a038..e60c46226f6 100644 --- a/src/mess/drivers/p8k.c +++ b/src/mess/drivers/p8k.c @@ -175,7 +175,7 @@ WRITE8_MEMBER( p8k_state::p8k_port24_w ) WRITE8_MEMBER( p8k_state::kbd_put ) { - address_space &mem = *m_maincpu->space(AS_PROGRAM); + address_space &mem = m_maincpu->space(AS_PROGRAM); m_term_data = data; // This is a dreadful hack.. // simulate interrupt by saving current pc on @@ -439,7 +439,7 @@ DRIVER_INIT_MEMBER(p8k_state,p8k) WRITE8_MEMBER( p8k_state::kbd_put_16 ) { - address_space &mem = *m_maincpu->space(AS_PROGRAM); + address_space &mem = m_maincpu->space(AS_PROGRAM); // keyboard int handler is at 0x0700 m_term_data = data; // This is another dire hack..