summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/fromance.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/fromance.h')
-rw-r--r--src/mame/includes/fromance.h21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h
index bdcda416618..108730614a3 100644
--- a/src/mame/includes/fromance.h
+++ b/src/mame/includes/fromance.h
@@ -8,6 +8,10 @@
and Bryan McPhail, Nicola Salmoria, Aaron Giles
***************************************************************************/
+#ifndef MAME_INCLUDES_FROMANCE_H
+#define MAME_INCLUDES_FROMANCE_H
+
+#pragma once
#include "machine/gen_latch.h"
#include "sound/msm5205.h"
@@ -19,8 +23,8 @@
class fromance_state : public driver_device
{
public:
- fromance_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ fromance_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_spriteram(*this, "spriteram"),
@@ -76,6 +80,10 @@ private:
/* memory pointers (used by pipedrm) */
optional_shared_ptr<uint8_t> m_videoram;
+ optional_device<generic_latch_8_device> m_sublatch;
+ optional_device<msm5205_device> m_msm;
+ required_device<screen_device> m_screen;
+
/* video-related */
tilemap_t *m_bg_tilemap;
tilemap_t *m_fg_tilemap;
@@ -110,13 +118,10 @@ private:
DECLARE_VIDEO_START(nekkyoku);
DECLARE_VIDEO_START(fromance);
TIMER_CALLBACK_MEMBER(crtc_interrupt_gen);
- inline void get_fromance_tile_info( tile_data &tileinfo, int tile_index, int layer );
- inline void get_nekkyoku_tile_info( tile_data &tileinfo, int tile_index, int layer );
+ inline void get_fromance_tile_info(tile_data &tileinfo, int tile_index, int layer);
+ inline void get_nekkyoku_tile_info(tile_data &tileinfo, int tile_index, int layer);
void crtc_refresh();
DECLARE_WRITE_LINE_MEMBER(fromance_adpcm_int);
- optional_device<generic_latch_8_device> m_sublatch;
- optional_device<msm5205_device> m_msm;
- required_device<screen_device> m_screen;
void fromance_main_map(address_map &map);
void fromance_sub_io_map(address_map &map);
void fromance_sub_map(address_map &map);
@@ -125,3 +130,5 @@ private:
void nekkyoku_sub_io_map(address_map &map);
void nekkyoku_sub_map(address_map &map);
};
+
+#endif // MAME_INCLUDES_FROMANCE_H