diff options
Diffstat (limited to 'src/mame/includes/megadriv.h')
-rw-r--r-- | src/mame/includes/megadriv.h | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index c208c0a1af0..f1950f2113a 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -1,9 +1,5 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_MEGADRIV_H -#define MAME_INCLUDES_MEGADRIV_H - -#pragma once #include "coreutil.h" #include "cpu/m68000/m68000.h" @@ -44,8 +40,8 @@ struct genesis_z80_vars 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), + 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_ymsnd(*this,"ymsnd"), @@ -54,7 +50,6 @@ public: m_megadrive_ram(*this,"megadrive_ram"), m_io_reset(*this, "RESET") { } - required_device<m68000_base_device> m_maincpu; optional_device<cpu_device> m_z80snd; optional_device<ym2612_device> m_ymsnd; @@ -62,6 +57,7 @@ public: required_device<sega315_5313_device> m_vdp; optional_shared_ptr<uint16_t> m_megadrive_ram; + optional_ioport m_io_reset; ioport_port *m_io_pad_3b[4]; ioport_port *m_io_pad_6b[4]; @@ -149,12 +145,12 @@ public: class md_cons_state : public md_base_state { public: - md_cons_state(const machine_config &mconfig, device_type type, const char *tag) : - md_base_state(mconfig, type, tag), - m_32x(*this,"sega32x"), - m_segacd(*this,"segacd"), - m_cart(*this, "mdslot"), - m_tmss(*this, "tmss") + md_cons_state(const machine_config &mconfig, device_type type, const char *tag) + : md_base_state(mconfig, type, tag), + m_32x(*this,"sega32x"), + m_segacd(*this,"segacd"), + m_cart(*this, "mdslot"), + m_tmss(*this, "tmss") { } ioport_port *m_io_ctrlr; @@ -206,5 +202,3 @@ public: void genesis_scd(machine_config &config); void genesis_tmss(machine_config &config); }; - -#endif // MAME_INCLUDES_MEGADRIV_H |