From 2061fc6a22e3938b1ef48f8cdad9b424658b3ad3 Mon Sep 17 00:00:00 2001 From: Fabio Priuli Date: Fri, 22 Mar 2013 06:36:17 +0000 Subject: [PATCH] (MESS) megadriv.c: removed another static. nw. --- src/mame/includes/megadriv.h | 4 ++++ src/mame/machine/megadriv.c | 10 +++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index b3ffa074731..0bb850f54df 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -80,10 +80,14 @@ class md_base_state : public driver_device public: md_base_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), + m_maincpu(*this,"maincpu"), + m_z80snd(*this,"genesis_snd_z80"), m_vdp(*this,"gen_vdp"), m_segacd(*this,"segacd"), m_megadrive_ram(*this,"megadrive_ram") { } + optional_device m_maincpu; + optional_device m_z80snd; required_device m_vdp; optional_device m_segacd; optional_shared_ptr m_megadrive_ram; diff --git a/src/mame/machine/megadriv.c b/src/mame/machine/megadriv.c index fa202a535bb..f290c1d5c5c 100644 --- a/src/mame/machine/megadriv.c +++ b/src/mame/machine/megadriv.c @@ -28,8 +28,6 @@ Known Non-Issues (confirmed on Real Genesis) MACHINE_CONFIG_EXTERN( megadriv ); - -static cpu_device *_genesis_snd_z80_cpu; int genesis_other_hacks = 0; // misc hacks timer_device* megadriv_scanline_timer; @@ -1222,13 +1220,11 @@ UINT16 vdp_get_word_from_68k_mem_delayed(running_machine &machine, UINT32 source void md_base_state::megadriv_init_common() { /* Look to see if this system has the standard Sound Z80 */ - _genesis_snd_z80_cpu = machine().device("genesis_snd_z80"); - if (_genesis_snd_z80_cpu != NULL) + if (machine().device("genesis_snd_z80")) { - //printf("GENESIS Sound Z80 cpu found '%s'\n", _genesis_snd_z80_cpu->tag() ); - + //printf("GENESIS Sound Z80 cpu found '%s'\n", machine().device("genesis_snd_z80")->tag()); genz80.z80_prgram = auto_alloc_array(machine(), UINT8, 0x2000); - membank("bank1")->set_base(genz80.z80_prgram ); + membank("bank1")->set_base(genz80.z80_prgram); } /* Look to see if this system has the 32x Master SH2 */