diff options
author | 2015-08-11 23:14:30 +0200 | |
---|---|---|
committer | 2015-08-11 23:14:30 +0200 | |
commit | 24f9770aebd00ae429343082c43e6f2ef947739b (patch) | |
tree | 63848c499595940f17e090c6d6e1c38262d45efd /src | |
parent | f749c73b26b1290fa7403f35b9e6a82ed1fbdc89 (diff) |
rmnimbus.c: reduce tagmap lookups (nw)
Diffstat (limited to 'src')
-rw-r--r-- | src/mess/includes/rmnimbus.h | 12 | ||||
-rw-r--r-- | src/mess/machine/rmnimbus.c | 10 |
2 files changed, 16 insertions, 6 deletions
diff --git a/src/mess/includes/rmnimbus.h b/src/mess/includes/rmnimbus.h index c857b808842..3d0cba8e05c 100644 --- a/src/mess/includes/rmnimbus.h +++ b/src/mess/includes/rmnimbus.h @@ -66,7 +66,12 @@ public: m_scsi_ctrl_out(*this, "scsi_ctrl_out"), m_fdc(*this, FDC_TAG), m_z80sio(*this, Z80SIO_TAG), - m_screen(*this, "screen") + m_screen(*this, "screen"), + m_io_config(*this, "config"), + m_io_joystick0(*this, JOYSTICK0_TAG), + m_io_mouse_button(*this, MOUSE_BUTTON_TAG), + m_io_mousex(*this, MOUSEX_TAG), + m_io_mousey(*this, MOUSEY_TAG) { } @@ -84,6 +89,11 @@ public: required_device<wd2793_t> m_fdc; required_device<z80sio2_device> m_z80sio; required_device<screen_device> m_screen; + required_ioport m_io_config; + required_ioport m_io_joystick0; + required_ioport m_io_mouse_button; + required_ioport m_io_mousex; + required_ioport m_io_mousey; bitmap_ind16 m_video_mem; diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c index 2670e1968c9..b8b2d79218b 100644 --- a/src/mess/machine/rmnimbus.c +++ b/src/mess/machine/rmnimbus.c @@ -1546,9 +1546,9 @@ void rmnimbus_state::device_timer(emu_timer &timer, device_timer_id id, int para int xint; int yint; - m_nimbus_mouse.m_reg0a4 = ioport(MOUSE_BUTTON_TAG)->read() | 0xC0; - x = ioport(MOUSEX_TAG)->read(); - y = ioport(MOUSEY_TAG)->read(); + m_nimbus_mouse.m_reg0a4 = m_io_mouse_button->read() | 0xC0; + x = m_io_mousex->read(); + y = m_io_mousey->read(); UINT8 mxa; UINT8 mxb; @@ -1683,14 +1683,14 @@ READ8_MEMBER(rmnimbus_state::nimbus_mouse_js_r) UINT8 result; //int pc=m_maincpu->_pc(); - if (ioport("config")->read() & 0x01) + if (m_io_config->read() & 0x01) { result=m_nimbus_mouse.m_reg0a4; //logerror("mouse_js_r: pc=%05X, result=%02X\n",pc,result); } else { - result=ioport(JOYSTICK0_TAG)->read_safe(0xff); + result = m_io_joystick0->read(); } return result; |