From 94c5464c72b36a39b93bb8a10daa3ba61fa4b89f Mon Sep 17 00:00:00 2001 From: David Haywood Date: Tue, 25 Jun 2013 16:20:03 +0000 Subject: [PATCH] fix debug crashes / asserts. --- src/mame/machine/megavdp.c | 4 ++-- src/mame/machine/megavdp.h | 3 ++- src/mess/includes/lisa.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mame/machine/megavdp.c b/src/mame/machine/megavdp.c index 478be4c05e5..8bb6014b812 100644 --- a/src/mame/machine/megavdp.c +++ b/src/mame/machine/megavdp.c @@ -196,8 +196,8 @@ void sega_genesis_vdp_device::device_start() irq4_on_timer = machine().scheduler().timer_alloc(FUNC(irq4_on_timer_callback), (void*)this); megadriv_render_timer = machine().scheduler().timer_alloc(FUNC(megadriv_render_timer_callback), (void*)this); - m_space68k = &machine().device(":maincpu")->space(); - m_cpu68k = machine().device(":maincpu"); + m_space68k = &machine().device(":maincpu")->space(); + m_cpu68k = machine().device(":maincpu"); } void sega_genesis_vdp_device::device_reset() diff --git a/src/mame/machine/megavdp.h b/src/mame/machine/megavdp.h index 3ea20a2ff15..94577ece5f7 100644 --- a/src/mame/machine/megavdp.h +++ b/src/mame/machine/megavdp.h @@ -3,6 +3,7 @@ #pragma once #include "video/315_5124.h" +#include "cpu/m68000/m68000.h" /* The VDP occupies addresses C00000h to C0001Fh. @@ -299,7 +300,7 @@ private: UINT16* megadrive_vdp_palette_lookup_highlight; address_space *m_space68k; - legacy_cpu_device* m_cpu68k; + m68000_base_device* m_cpu68k; }; diff --git a/src/mess/includes/lisa.h b/src/mess/includes/lisa.h index 4cbac241722..b31f1af6326 100644 --- a/src/mess/includes/lisa.h +++ b/src/mess/includes/lisa.h @@ -120,7 +120,7 @@ public: m_io_mouse_y(*this, "MOUSE_Y") { } - required_device m_maincpu; + required_device m_maincpu; required_device m_via0; required_device m_via1; optional_device m_fdc;