diff options
Diffstat (limited to 'src/mame/includes/gstriker.h')
| -rw-r--r-- | src/mame/includes/gstriker.h | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index 95bb6de33f2..a154e075250 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -4,6 +4,7 @@ #ifndef __GSTRIKER_H #define __GSTRIKER_H +#include "machine/6850acia.h" #include "machine/gen_latch.h" #include "machine/mb3773.h" #include "video/vsystem_spr.h" @@ -28,10 +29,10 @@ public: m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch"), m_watchdog(*this, "watchdog"), + m_acia(*this, "acia"), m_CG10103_m_vram(*this, "cg10103_m_vram"), m_work_ram(*this, "work_ram"), - m_mixerregs1(*this, "mixerregs1"), - m_mixerregs2(*this, "mixerregs2") + m_mixerregs(*this, "mixerregs") { } required_device<cpu_device> m_maincpu; @@ -44,21 +45,27 @@ public: required_device<palette_device> m_palette; required_device<generic_latch_8_device> m_soundlatch; required_device<mb3773_device> m_watchdog; + optional_device<acia6850_device> m_acia; required_shared_ptr<uint16_t> m_CG10103_m_vram; + std::unique_ptr<uint16_t[]> m_buffered_spriteram; + std::unique_ptr<uint16_t[]> m_buffered_spriteram2; required_shared_ptr<uint16_t> m_work_ram; - required_shared_ptr<uint16_t> m_mixerregs1; - required_shared_ptr<uint16_t> m_mixerregs2; + required_shared_ptr<uint16_t> m_mixerregs; + enum { + TECMO_WCUP94_MCU = 1, + TECMO_WCUP94A_MCU, + VGOAL_SOCCER_MCU + }m_mcutype; int m_gametype; - uint16_t m_mcu_data; uint16_t m_prot_reg[2]; // common DECLARE_WRITE8_MEMBER(sh_bankswitch_w); // vgoalsoc and twrldc - DECLARE_WRITE8_MEMBER(twrldc94_prot_reg_w); + DECLARE_WRITE8_MEMBER(twcup94_prot_reg_w); // vgoalsoc only DECLARE_READ16_MEMBER(vbl_toggle_r); @@ -66,11 +73,12 @@ public: virtual void machine_start() override; virtual void video_start() override; - DECLARE_DRIVER_INIT(twrldc94a); + DECLARE_DRIVER_INIT(twcup94a); DECLARE_DRIVER_INIT(vgoalsoc); - DECLARE_DRIVER_INIT(twrldc94); + DECLARE_DRIVER_INIT(twcup94); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + DECLARE_WRITE_LINE_MEMBER(screen_vblank); void mcu_init(); }; |