diff options
author | 2013-04-14 10:46:03 +0000 | |
---|---|---|
committer | 2013-04-14 10:46:03 +0000 | |
commit | bd4514adde890b79733b63ea5bf11a5f23daf006 (patch) | |
tree | 848d70080af70e0d548658e54cb535f3f42f61bf /src/mess/drivers/multi8.c | |
parent | 629c98f86780ce12591ff5481dec529bccf36e8d (diff) |
Removal of machine().root_device() where appropriate (nw)
Diffstat (limited to 'src/mess/drivers/multi8.c')
-rw-r--r-- | src/mess/drivers/multi8.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mess/drivers/multi8.c b/src/mess/drivers/multi8.c index fd747614b4e..669c6119ab8 100644 --- a/src/mess/drivers/multi8.c +++ b/src/mess/drivers/multi8.c @@ -487,7 +487,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(multi8_state::keyboard_callback) { static const char *const portnames[3] = { "key1","key2","key3" }; int i,port_i,scancode; - UINT8 keymod = machine().root_device().ioport("key_modifiers")->read() & 0x1f; + UINT8 keymod = ioport("key_modifiers")->read() & 0x1f; scancode = 0; m_shift_press_flag = ((keymod & 0x02) >> 1); @@ -496,7 +496,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(multi8_state::keyboard_callback) { for(i=0;i<32;i++) { - if((machine().root_device().ioport(portnames[port_i])->read()>>i) & 1) + if((ioport(portnames[port_i])->read()>>i) & 1) { //key_flag = 1; if(!m_shift_press_flag) // shift not pressed @@ -648,8 +648,8 @@ static const ym2203_interface ym2203_config = void multi8_state::machine_start() { - m_p_vram = machine().root_device().memregion("vram")->base(); - m_p_wram = machine().root_device().memregion("wram")->base(); + m_p_vram = memregion("vram")->base(); + m_p_wram = memregion("wram")->base(); m_p_kanji = memregion("kanji")->base(); } |