summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes
diff options
context:
space:
mode:
authorGravatarGravatar Ivan Vangelista <mesgnet@yahoo.it>2020-11-28 17:13:32 +0100
committerGravatarGravatar Ivan Vangelista <mesgnet@yahoo.it>2020-11-28 17:13:32 +0100
commitc02a51c9313459843b1e21fa1e839ee3f25c4c9a (patch)
treeef312f0105ddb49d2fdb88f11173cbb371fa5fb6 /src/mame/includes
parenta8979690ad91d7231cc8a01b626812a4c53b1e4c (diff)
astrohome, fromance, hyprduel, pipedrm, playmark, powerbal: removed MACHINE_*_MEMBER macrosHEADmaster
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/astrocde.h1
-rw-r--r--src/mame/includes/fromance.h30
-rw-r--r--src/mame/includes/playmark.h5
3 files changed, 12 insertions, 24 deletions
diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h
index 2535970886e..fe42331227b 100644
--- a/src/mame/includes/astrocde.h
+++ b/src/mame/includes/astrocde.h
@@ -141,7 +141,6 @@ public:
void init_demndrgn();
void init_ebases();
void init_gorf();
- void init_astrocde();
void astrocade_palette(palette_device &palette) const;
DECLARE_VIDEO_START(profpac);
void profpac_palette(palette_device &palette) const;
diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h
index c8b2f4a651e..4882cd897f0 100644
--- a/src/mame/includes/fromance.h
+++ b/src/mame/includes/fromance.h
@@ -28,14 +28,11 @@ public:
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_subcpu(*this, "sub"),
- m_spriteram(nullptr),
- m_spriteram_size(0),
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
m_gga(*this, "gga"),
- m_spr_old(*this, "vsystem_spr_old"),
- m_videoram(*this, "videoram"),
+ m_rombank(*this, "rombank"),
m_sublatch(*this, "sublatch"),
m_msm(*this, "msm")
{ }
@@ -46,23 +43,24 @@ public:
void init_common();
- void fromance_gga_data_w(offs_t offset, uint8_t data);
-
protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+ DECLARE_VIDEO_START(fromance);
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
- uint8_t *m_spriteram;
- u32 m_spriteram_size;
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
required_device<vsystem_gga_device> m_gga;
- optional_device<vsystem_spr2_device> m_spr_old; // only used by pipe dream, split this state up and clean things...
+ required_memory_bank m_rombank;
void fromance_gfxreg_w(uint8_t data);
uint8_t fromance_videoram_r(offs_t offset);
void fromance_videoram_w(offs_t offset, uint8_t data);
void fromance_scroll_w(offs_t offset, uint8_t data);
+ void fromance_gga_data_w(offs_t offset, uint8_t data);
uint32_t m_scrolly_ofs;
uint32_t m_scrollx_ofs;
@@ -73,23 +71,16 @@ protected:
uint8_t m_flipscreen_old;
uint8_t m_selected_videoram;
uint8_t m_selected_paletteram;
-
- DECLARE_VIDEO_START(hatris);
- DECLARE_VIDEO_START(pipedrm);
+ tilemap_t *m_bg_tilemap;
+ tilemap_t *m_fg_tilemap;
uint32_t screen_update_fromance(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_pipedrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
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;
/* video-related */
- tilemap_t *m_bg_tilemap;
- tilemap_t *m_fg_tilemap;
std::unique_ptr<uint8_t[]> m_local_videoram[2];
std::unique_ptr<uint8_t[]> m_local_paletteram;
@@ -116,10 +107,7 @@ private:
TILE_GET_INFO_MEMBER(get_fromance_fg_tile_info);
TILE_GET_INFO_MEMBER(get_nekkyoku_bg_tile_info);
TILE_GET_INFO_MEMBER(get_nekkyoku_fg_tile_info);
- DECLARE_MACHINE_START(fromance);
- DECLARE_MACHINE_RESET(fromance);
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);
diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h
index e0bc0d5035d..9a89b15c2ce 100644
--- a/src/mame/includes/playmark.h
+++ b/src/mame/includes/playmark.h
@@ -46,6 +46,9 @@ public:
void init_pic_decode();
protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
/* memory pointers */
optional_shared_ptr<uint16_t> m_bgvideoram;
required_shared_ptr<uint16_t> m_videoram1;
@@ -115,8 +118,6 @@ protected:
TILE_GET_INFO_MEMBER(bigtwinb_get_tx_tile_info);
TILE_GET_INFO_MEMBER(hrdtimes_get_fg_tile_info);
TILE_GET_INFO_MEMBER(hrdtimes_get_bg_tile_info);
- DECLARE_MACHINE_START(playmark);
- DECLARE_MACHINE_RESET(playmark);
DECLARE_VIDEO_START(bigtwin);
DECLARE_VIDEO_START(bigtwinb);
DECLARE_VIDEO_START(wbeachvl);