diff options
Diffstat (limited to 'src/mame/machine/micro3d.cpp')
-rw-r--r-- | src/mame/machine/micro3d.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mame/machine/micro3d.cpp b/src/mame/machine/micro3d.cpp index 3c5fb44d733..0353281c0ea 100644 --- a/src/mame/machine/micro3d.cpp +++ b/src/mame/machine/micro3d.cpp @@ -143,18 +143,18 @@ TIMER_CALLBACK_MEMBER(micro3d_state::mac_done_callback) m_mac_stat = 0; } -WRITE32_MEMBER(micro3d_state::micro3d_mac1_w) +void micro3d_state::micro3d_mac1_w(uint32_t data) { m_vtx_addr = (data & 0x3ffff); m_sram_w_addr = (data >> 18) & 0xfff; } -READ32_MEMBER(micro3d_state::micro3d_mac2_r) +uint32_t micro3d_state::micro3d_mac2_r() { return (m_mac_inst << 1) | m_mac_stat; } -WRITE32_MEMBER(micro3d_state::micro3d_mac2_w) +void micro3d_state::micro3d_mac2_w(uint32_t data) { uint32_t cnt = data & 0xff; uint32_t inst = (data >> 8) & 0x1f; @@ -349,7 +349,7 @@ WRITE32_MEMBER(micro3d_state::micro3d_mac2_w) * *************************************/ -READ16_MEMBER(micro3d_state::micro3d_encoder_h_r) +uint16_t micro3d_state::micro3d_encoder_h_r() { uint16_t x_encoder = m_joystick_x.read_safe(0); uint16_t y_encoder = m_joystick_y.read_safe(0); @@ -357,7 +357,7 @@ READ16_MEMBER(micro3d_state::micro3d_encoder_h_r) return (y_encoder & 0xf00) | ((x_encoder & 0xf00) >> 8); } -READ16_MEMBER(micro3d_state::micro3d_encoder_l_r) +uint16_t micro3d_state::micro3d_encoder_l_r() { uint16_t x_encoder = m_joystick_x.read_safe(0); uint16_t y_encoder = m_joystick_y.read_safe(0); @@ -375,13 +375,13 @@ READ_LINE_MEMBER(micro3d_state::botss_hwchk_r) return m_botss_latch; } -READ16_MEMBER(micro3d_state::botss_140000_r) +uint16_t micro3d_state::botss_140000_r() { m_botss_latch = 0; return 0xffff; } -READ16_MEMBER(micro3d_state::botss_180000_r) +uint16_t micro3d_state::botss_180000_r() { m_botss_latch = 1; return 0xffff; @@ -393,7 +393,7 @@ READ16_MEMBER(micro3d_state::botss_180000_r) * *************************************/ -WRITE16_MEMBER(micro3d_state::micro3d_reset_w) +void micro3d_state::micro3d_reset_w(uint16_t data) { data >>= 8; m_drmath->set_input_line(INPUT_LINE_RESET, data & 1 ? CLEAR_LINE : ASSERT_LINE); @@ -401,7 +401,7 @@ WRITE16_MEMBER(micro3d_state::micro3d_reset_w) /* TODO: Joystick reset? */ } -WRITE16_MEMBER(micro3d_state::host_drmath_int_w) +void micro3d_state::host_drmath_int_w(uint16_t data) { m_drmath->set_input_line(AM29000_INTR2, ASSERT_LINE); machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(10)); @@ -414,23 +414,23 @@ WRITE16_MEMBER(micro3d_state::host_drmath_int_w) * *************************************/ -WRITE32_MEMBER(micro3d_state::micro3d_shared_w) +void micro3d_state::micro3d_shared_w(offs_t offset, uint32_t data) { m_shared_ram[offset * 2 + 1] = data & 0xffff; m_shared_ram[offset * 2 + 0] = data >> 16; } -READ32_MEMBER(micro3d_state::micro3d_shared_r) +uint32_t micro3d_state::micro3d_shared_r(offs_t offset) { return (m_shared_ram[offset * 2] << 16) | m_shared_ram[offset * 2 + 1]; } -WRITE32_MEMBER(micro3d_state::drmath_int_w) +void micro3d_state::drmath_int_w(uint32_t data) { m_maincpu->set_input_line(5, HOLD_LINE); } -WRITE32_MEMBER(micro3d_state::drmath_intr2_ack) +void micro3d_state::drmath_intr2_ack(uint32_t data) { m_drmath->set_input_line(AM29000_INTR2, CLEAR_LINE); } @@ -524,8 +524,8 @@ void micro3d_state::init_botss() address_space &space = m_maincpu->space(AS_PROGRAM); /* Required to pass the hardware version check */ - space.install_read_handler(0x140000, 0x140001, read16_delegate(*this, FUNC(micro3d_state::botss_140000_r))); - space.install_read_handler(0x180000, 0x180001, read16_delegate(*this, FUNC(micro3d_state::botss_180000_r))); + space.install_read_handler(0x140000, 0x140001, read16smo_delegate(*this, FUNC(micro3d_state::botss_140000_r))); + space.install_read_handler(0x180000, 0x180001, read16smo_delegate(*this, FUNC(micro3d_state::botss_180000_r))); init_micro3d(); } |