trunk/src/mess/drivers/astrocde.c
| r18028 | r18029 | |
|---|
| 100 | 100 | INPUT_CHANGED_MEMBER(astrocde_mess_state::set_write_protect) // run when RAM expansion write protect switch is changed |
| 101 | 101 | { |
| 102 | 102 | int ram_expansion_installed = 0, write_protect_on = 0, expansion_ram_start = 0, expansion_ram_end = 0, shadow_ram_end = 0; |
| 103 | | <<<<<<< .mine |
| 104 | | address_space &space = field.machine().device("maincpu")->memory().space(AS_PROGRAM); |
| 105 | | UINT8 *expram = field.machine().device<ram_device>("ram_tag")->pointer(); |
| 106 | | ======= |
| 107 | | address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM); |
| 103 | address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM); |
| 108 | 104 | UINT8 *expram = machine().device<ram_device>("ram_tag")->pointer(); |
| 109 | | >>>>>>> .r18023 |
| 110 | 105 | |
| 111 | 106 | get_ram_expansion_settings(ram_expansion_installed, write_protect_on, expansion_ram_start, expansion_ram_end, shadow_ram_end); // passing by reference |
| 112 | 107 | |
| r18028 | r18029 | |
|---|
| 325 | 320 | MACHINE_RESET_MEMBER(astrocde_mess_state, astrocde) |
| 326 | 321 | { |
| 327 | 322 | int ram_expansion_installed = 0, write_protect_on = 0, expansion_ram_start = 0, expansion_ram_end = 0, shadow_ram_end = 0; |
| 328 | | <<<<<<< .mine |
| 329 | | address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM); |
| 330 | | UINT8 *expram = machine.device<ram_device>("ram_tag")->pointer(); |
| 331 | | ======= |
| 332 | | address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM); |
| 323 | address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM); |
| 333 | 324 | UINT8 *expram = machine().device<ram_device>("ram_tag")->pointer(); |
| 334 | | >>>>>>> .r18023 |
| 335 | 325 | space.unmap_readwrite(0x5000, 0xffff); // unmap any previously installed expansion RAM |
| 336 | 326 | |
| 337 | 327 | get_ram_expansion_settings(ram_expansion_installed, write_protect_on, expansion_ram_start, expansion_ram_end, shadow_ram_end); // passing by reference |
trunk/src/mess/drivers/p8k.c
| r18028 | r18029 | |
|---|
| 175 | 175 | |
| 176 | 176 | WRITE8_MEMBER( p8k_state::kbd_put ) |
| 177 | 177 | { |
| 178 | | address_space &mem = *m_maincpu->space(AS_PROGRAM); |
| 178 | address_space &mem = m_maincpu->space(AS_PROGRAM); |
| 179 | 179 | m_term_data = data; |
| 180 | 180 | // This is a dreadful hack.. |
| 181 | 181 | // simulate interrupt by saving current pc on |
| r18028 | r18029 | |
|---|
| 439 | 439 | |
| 440 | 440 | WRITE8_MEMBER( p8k_state::kbd_put_16 ) |
| 441 | 441 | { |
| 442 | | address_space &mem = *m_maincpu->space(AS_PROGRAM); |
| 442 | address_space &mem = m_maincpu->space(AS_PROGRAM); |
| 443 | 443 | // keyboard int handler is at 0x0700 |
| 444 | 444 | m_term_data = data; |
| 445 | 445 | // This is another dire hack.. |