summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/vcombat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/vcombat.cpp')
-rw-r--r--src/mame/drivers/vcombat.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mame/drivers/vcombat.cpp b/src/mame/drivers/vcombat.cpp
index 5381fd8fc8e..ef93aec1594 100644
--- a/src/mame/drivers/vcombat.cpp
+++ b/src/mame/drivers/vcombat.cpp
@@ -133,19 +133,19 @@ private:
std::unique_ptr<uint16_t[]> m_i860_framebuffer[2][2];
int m_crtc_select;
- DECLARE_WRITE16_MEMBER(main_video_write);
- DECLARE_READ16_MEMBER(control_1_r);
- DECLARE_READ16_MEMBER(control_2_r);
- DECLARE_READ16_MEMBER(control_3_r);
+ void main_video_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t control_1_r();
+ uint16_t control_2_r();
+ uint16_t control_3_r();
void wiggle_i860_common(int which, uint16_t data);
- DECLARE_WRITE16_MEMBER(wiggle_i860p0_pins_w);
- DECLARE_WRITE16_MEMBER(wiggle_i860p1_pins_w);
- DECLARE_READ16_MEMBER(main_irqiack_r);
- DECLARE_READ16_MEMBER(sound_resetmain_r);
- DECLARE_WRITE64_MEMBER(v0_fb_w);
- DECLARE_WRITE64_MEMBER(v1_fb_w);
- DECLARE_WRITE16_MEMBER(crtc_w);
- DECLARE_WRITE16_MEMBER(vcombat_dac_w);
+ void wiggle_i860p0_pins_w(uint16_t data);
+ void wiggle_i860p1_pins_w(uint16_t data);
+ uint16_t main_irqiack_r();
+ uint16_t sound_resetmain_r();
+ void v0_fb_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ void v1_fb_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
+ void crtc_w(uint16_t data);
+ void vcombat_dac_w(uint16_t data);
DECLARE_WRITE_LINE_MEMBER(sound_update);
uint32_t update_screen(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int index);
@@ -210,7 +210,7 @@ uint32_t vcombat_state::screen_update_vcombat_main(screen_device &screen, bitmap
uint32_t vcombat_state::screen_update_vcombat_aux(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 1); }
-WRITE16_MEMBER(vcombat_state::main_video_write)
+void vcombat_state::main_video_write(offs_t offset, uint16_t data, uint16_t mem_mask)
{
int fb = (*m_framebuffer_ctrl & 0x20) ? 0 : 1;
uint16_t old_data = m_m68k_framebuffer[fb][offset];
@@ -234,17 +234,17 @@ WRITE16_MEMBER(vcombat_state::main_video_write)
}
}
-READ16_MEMBER(vcombat_state::control_1_r)
+uint16_t vcombat_state::control_1_r()
{
return (ioport("IN0")->read() << 8);
}
-READ16_MEMBER(vcombat_state::control_2_r)
+uint16_t vcombat_state::control_2_r()
{
return (ioport("IN1")->read() << 8);
}
-READ16_MEMBER(vcombat_state::control_3_r)
+uint16_t vcombat_state::control_3_r()
{
return (ioport("IN2")->read() << 8);
}
@@ -277,17 +277,17 @@ void vcombat_state::wiggle_i860_common(int which, uint16_t data)
device.i860_set_pin(DEC_PIN_RESET, 0);
}
-WRITE16_MEMBER(vcombat_state::wiggle_i860p0_pins_w)
+void vcombat_state::wiggle_i860p0_pins_w(uint16_t data)
{
wiggle_i860_common(0, data);
}
-WRITE16_MEMBER(vcombat_state::wiggle_i860p1_pins_w)
+void vcombat_state::wiggle_i860p1_pins_w(uint16_t data)
{
wiggle_i860_common(1, data);
}
-READ16_MEMBER(vcombat_state::main_irqiack_r)
+uint16_t vcombat_state::main_irqiack_r()
{
//LOG("M0: irq iack\n");
m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE);
@@ -295,14 +295,14 @@ READ16_MEMBER(vcombat_state::main_irqiack_r)
return 0;
}
-READ16_MEMBER(vcombat_state::sound_resetmain_r)
+uint16_t vcombat_state::sound_resetmain_r()
{
//LOG("M1: reset line to M0\n");
//m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
return 0;
}
-WRITE64_MEMBER(vcombat_state::v0_fb_w)
+void vcombat_state::v0_fb_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
/* The frame buffer seems to sit on a 32-bit data bus, while the
i860 uses a 64-bit data bus. Adjust accordingly. */
@@ -325,7 +325,7 @@ WRITE64_MEMBER(vcombat_state::v0_fb_w)
/* This is just temporary so we can see what each i860 is doing to the
framebuffer. */
-WRITE64_MEMBER(vcombat_state::v1_fb_w)
+void vcombat_state::v1_fb_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
/* The frame buffer seems to sit on a 32-bit data bus, while the
i860 uses a 64-bit data bus. Adjust accordingly. */
@@ -346,7 +346,7 @@ WRITE64_MEMBER(vcombat_state::v1_fb_w)
}
}
-WRITE16_MEMBER(vcombat_state::crtc_w)
+void vcombat_state::crtc_w(uint16_t data)
{
if (m_crtc == nullptr)
return;
@@ -359,7 +359,7 @@ WRITE16_MEMBER(vcombat_state::crtc_w)
m_crtc_select ^= 1;
}
-WRITE16_MEMBER(vcombat_state::vcombat_dac_w)
+void vcombat_state::vcombat_dac_w(uint16_t data)
{
m_dac->write(data >> 5);
if (data & 0x801f)