diff options
Diffstat (limited to 'src/mame/machine/micro3d.c')
-rw-r--r-- | src/mame/machine/micro3d.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/machine/micro3d.c b/src/mame/machine/micro3d.c index 9d9eb6c7f99..4c207dfe28f 100644 --- a/src/mame/machine/micro3d.c +++ b/src/mame/machine/micro3d.c @@ -299,7 +299,7 @@ WRITE32_MEMBER(micro3d_state::micro3d_mac2_w) case 0x08: { int i; - const UINT16 *rom = (UINT16*)memregion("vertex")->base(); + const UINT16 *rom = (UINT16*)m_vertex->base(); for (i = 0; i <= cnt; ++i) { @@ -338,7 +338,7 @@ WRITE32_MEMBER(micro3d_state::micro3d_mac2_w) case 0x0c: { int i; - const UINT16 *rom = (UINT16*)memregion("vertex")->base(); + const UINT16 *rom = (UINT16*)m_vertex->base(); for (i = 0; i <= cnt; ++i) { @@ -371,7 +371,7 @@ WRITE32_MEMBER(micro3d_state::micro3d_mac2_w) case 0x0f: { int i; - const UINT16 *rom = (UINT16*)memregion("vertex")->base(); + const UINT16 *rom = (UINT16*)m_vertex->base(); for (i = 0; i <= cnt; ++i, vtx_addr += 4) { @@ -467,16 +467,16 @@ WRITE32_MEMBER(micro3d_state::micro3d_mac2_w) READ16_MEMBER(micro3d_state::micro3d_encoder_h_r) { - UINT16 x_encoder = ioport("JOYSTICK_X")->read_safe(0); - UINT16 y_encoder = ioport("JOYSTICK_Y")->read_safe(0); + UINT16 x_encoder = m_joystick_x ? m_joystick_x->read() : 0; + UINT16 y_encoder = m_joystick_y ? m_joystick_y->read() : 0; return (y_encoder & 0xf00) | ((x_encoder & 0xf00) >> 8); } READ16_MEMBER(micro3d_state::micro3d_encoder_l_r) { - UINT16 x_encoder = ioport("JOYSTICK_X")->read_safe(0); - UINT16 y_encoder = ioport("JOYSTICK_Y")->read_safe(0); + UINT16 x_encoder = m_joystick_x ? m_joystick_x->read() : 0; + UINT16 y_encoder = m_joystick_y ? m_joystick_y->read() : 0; return ((y_encoder & 0xff) << 8) | (x_encoder & 0xff); } @@ -485,9 +485,9 @@ TIMER_CALLBACK_MEMBER(micro3d_state::adc_done_callback) { switch (param) { - case 0: m_adc_val = ioport("THROTTLE")->read_safe(0); + case 0: m_adc_val = m_throttle ? m_throttle->read() : 0; break; - case 1: m_adc_val = (UINT8)((255.0/100.0) * ioport("VOLUME")->read() + 0.5); + case 1: m_adc_val = (UINT8)((255.0/100.0) * m_volume->read() + 0.5); break; case 2: break; case 3: break; |