summaryrefslogtreecommitdiffstats
path: root/src/mame/includes/gaplus.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/gaplus.h')
-rw-r--r--src/mame/includes/gaplus.h87
1 files changed, 45 insertions, 42 deletions
diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h
index c45f4c9efd0..8c36493ff90 100644
--- a/src/mame/includes/gaplus.h
+++ b/src/mame/includes/gaplus.h
@@ -30,45 +30,20 @@ public:
};
gaplus_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_subcpu(*this, "sub"),
- m_subcpu2(*this, "sub2"),
- m_namco_15xx(*this, "namco"),
- m_samples(*this, "samples") ,
- m_gfxdecode(*this, "gfxdecode"),
- m_screen(*this, "screen"),
- m_palette(*this, "palette"),
- m_customio_3(*this,"customio_3"),
- m_videoram(*this,"videoram"),
- m_spriteram(*this,"spriteram") { }
-
- required_device<cpu_device> m_maincpu;
- required_device<cpu_device> m_subcpu;
- required_device<cpu_device> m_subcpu2;
- required_device<namco_15xx_device> m_namco_15xx;
- required_device<samples_device> m_samples;
- required_device<gfxdecode_device> m_gfxdecode;
- required_device<screen_device> m_screen;
- required_device<palette_device> m_palette;
- namco58xx_device *m_namco58xx;
- namco56xx_device *m_namco56xx;
-
- required_shared_ptr<uint8_t> m_customio_3;
- required_shared_ptr<uint8_t> m_videoram;
- required_shared_ptr<uint8_t> m_spriteram;
-
- int m_type;
-
- tilemap_t *m_bg_tilemap;
- uint8_t m_starfield_control[4];
- int m_total_stars;
- struct star m_stars[MAX_STARS];
- uint8_t m_main_irq_mask;
- uint8_t m_sub_irq_mask;
- uint8_t m_sub2_irq_mask;
- emu_timer *m_namcoio0_run_timer;
- emu_timer *m_namcoio1_run_timer;
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_subcpu(*this, "sub")
+ , m_subcpu2(*this, "sub2")
+ , m_namco_15xx(*this, "namco")
+ , m_samples(*this, "samples")
+ , m_gfxdecode(*this, "gfxdecode")
+ , m_screen(*this, "screen")
+ , m_palette(*this, "palette")
+ , m_customio_3(*this,"customio_3")
+ , m_videoram(*this,"videoram")
+ , m_spriteram(*this,"spriteram")
+ , m_lamp(*this, "lamp%u", 0U)
+ { }
DECLARE_WRITE8_MEMBER(irq_1_ctrl_w);
DECLARE_WRITE8_MEMBER(irq_2_ctrl_w);
@@ -85,9 +60,6 @@ public:
void init_gaplus();
void init_gaplusd();
void init_galaga3();
- virtual void machine_start() override;
- virtual void machine_reset() override;
- virtual void video_start() override;
DECLARE_PALETTE_INIT(gaplus);
TILEMAP_MAPPER_MEMBER(tilemap_scan);
@@ -112,4 +84,35 @@ public:
void cpu3_map(address_map &map);
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+ virtual void video_start() override;
+
+ required_device<cpu_device> m_maincpu;
+ required_device<cpu_device> m_subcpu;
+ required_device<cpu_device> m_subcpu2;
+ required_device<namco_15xx_device> m_namco_15xx;
+ required_device<samples_device> m_samples;
+ required_device<gfxdecode_device> m_gfxdecode;
+ required_device<screen_device> m_screen;
+ required_device<palette_device> m_palette;
+ namco58xx_device *m_namco58xx;
+ namco56xx_device *m_namco56xx;
+
+ required_shared_ptr<uint8_t> m_customio_3;
+ required_shared_ptr<uint8_t> m_videoram;
+ required_shared_ptr<uint8_t> m_spriteram;
+ output_finder<2> m_lamp;
+
+ int m_type;
+
+ tilemap_t *m_bg_tilemap;
+ uint8_t m_starfield_control[4];
+ int m_total_stars;
+ struct star m_stars[MAX_STARS];
+ uint8_t m_main_irq_mask;
+ uint8_t m_sub_irq_mask;
+ uint8_t m_sub2_irq_mask;
+ emu_timer *m_namcoio0_run_timer;
+ emu_timer *m_namcoio1_run_timer;
};