summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/bombjack.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/bombjack.h')
-rw-r--r--src/mame/includes/bombjack.h37
1 files changed, 20 insertions, 17 deletions
diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h
index 9432c5fd09a..fb3d2d08fe4 100644
--- a/src/mame/includes/bombjack.h
+++ b/src/mame/includes/bombjack.h
@@ -6,6 +6,8 @@
*************************************************************************/
+#include "machine/gen_latch.h"
+
class bombjack_state : public driver_device
{
public:
@@ -16,24 +18,10 @@ public:
m_spriteram(*this, "spriteram"),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette") { }
+ m_palette(*this, "palette"),
+ m_soundlatch(*this, "soundlatch") { }
- /* memory pointers */
- required_shared_ptr<uint8_t> m_videoram;
- required_shared_ptr<uint8_t> m_colorram;
- required_shared_ptr<uint8_t> m_spriteram;
-
- /* video-related */
- tilemap_t *m_fg_tilemap;
- tilemap_t *m_bg_tilemap;
- uint8_t m_background_image;
-
- /* sound-related */
- uint8_t m_latch;
-
- uint8_t m_nmi_mask;
- DECLARE_WRITE8_MEMBER(bombjack_soundlatch_w);
- DECLARE_READ8_MEMBER(bombjack_soundlatch_r);
+ DECLARE_READ8_MEMBER(soundlatch_read_and_clear);
DECLARE_WRITE8_MEMBER(irq_mask_w);
DECLARE_WRITE8_MEMBER(bombjack_videoram_w);
DECLARE_WRITE8_MEMBER(bombjack_colorram_w);
@@ -48,7 +36,22 @@ public:
INTERRUPT_GEN_MEMBER(vblank_irq);
TIMER_CALLBACK_MEMBER(soundlatch_callback);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
+
+private:
+ /* memory pointers */
+ required_shared_ptr<uint8_t> m_videoram;
+ required_shared_ptr<uint8_t> m_colorram;
+ required_shared_ptr<uint8_t> m_spriteram;
+
+ /* video-related */
+ tilemap_t *m_fg_tilemap;
+ tilemap_t *m_bg_tilemap;
+ uint8_t m_background_image;
+
+ uint8_t m_nmi_mask;
+
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
+ required_device<generic_latch_8_device> m_soundlatch;
};