From fd15adb7f02143eefedcd1cda03d9ea15eff9b36 Mon Sep 17 00:00:00 2001
From: Ivan Vangelista <mesgnet@yahoo.it>
Date: Wed, 21 Nov 2018 18:33:42 +0100
Subject: [PATCH] video/st0020: removed MCFG macros (nw)

---
 src/mame/drivers/jclub2.cpp | 14 +++++++-------
 src/mame/drivers/ssv.cpp    |  4 ++--
 src/mame/video/st0020.h     |  8 --------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp
index a37893cb845..a1caa4b7656 100644
--- a/src/mame/drivers/jclub2.cpp
+++ b/src/mame/drivers/jclub2.cpp
@@ -1160,9 +1160,9 @@ MACHINE_CONFIG_START(jclub2o_state::jclub2o)
 	MCFG_PALETTE_ADD("palette", 0x10000)
 	MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
 
-	MCFG_DEVICE_ADD("st0020", ST0020_SPRITES, 0)
-	MCFG_ST0020_IS_JCLUB2(1)
-	MCFG_ST0020_SPRITES_PALETTE("palette")
+	ST0020_SPRITES(config, m_st0020, 0);
+	m_st0020->set_is_jclub2(1);
+	m_st0020->set_palette(m_palette);
 
 	// layout
 	config.set_default_layout(layout_jclub2o);
@@ -1195,10 +1195,10 @@ MACHINE_CONFIG_START(jclub2_state::jclub2)
 	MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
 
 	// NOT an ST0020 but instead ST0032, ram format isn't compatible at least
-	MCFG_DEVICE_ADD("st0020", ST0020_SPRITES, 0)
-	MCFG_ST0020_IS_ST0032(1)
-	MCFG_ST0020_IS_JCLUB2(1) // offsets
-	MCFG_ST0020_SPRITES_PALETTE("palette")
+	ST0020_SPRITES(config, m_st0020, 0);
+	m_st0020->set_is_st0032(1);
+	m_st0020->set_is_jclub2(1); // offsets
+	m_st0020->set_palette(m_palette);
 
 	// layout
 	config.set_default_layout(layout_jclub2o);
diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp
index f8513657799..5553430d78e 100644
--- a/src/mame/drivers/ssv.cpp
+++ b/src/mame/drivers/ssv.cpp
@@ -2620,8 +2620,8 @@ MACHINE_CONFIG_START(ssv_state::gdfs)
 	MCFG_SCREEN_VISIBLE_AREA(0, (0xd5-0x2c)*2-1, 0, (0x102-0x12)-1)
 	MCFG_SCREEN_UPDATE_DRIVER(ssv_state, screen_update_gdfs)
 
-	MCFG_DEVICE_ADD("st0020_spr", ST0020_SPRITES, 0)
-	MCFG_ST0020_SPRITES_PALETTE("palette")
+	ST0020_SPRITES(config, m_gdfs_st0020, 0);
+	m_gdfs_st0020->set_palette(m_palette);
 
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_gdfs)
 	MCFG_VIDEO_START_OVERRIDE(ssv_state,gdfs)
diff --git a/src/mame/video/st0020.h b/src/mame/video/st0020.h
index bfbbd22fce8..d7409365ca3 100644
--- a/src/mame/video/st0020.h
+++ b/src/mame/video/st0020.h
@@ -70,13 +70,5 @@ private:
 
 DECLARE_DEVICE_TYPE(ST0020_SPRITES, st0020_device)
 
-#define MCFG_ST0020_SPRITES_PALETTE(_palette_tag) \
-	MCFG_GFX_PALETTE(_palette_tag)
-
-#define MCFG_ST0020_IS_ST0032(_st0032) \
-	downcast<st0020_device &>(*device).set_is_st0032(_st0032);
-
-#define MCFG_ST0020_IS_JCLUB2(_jclub2) \
-	downcast<st0020_device &>(*device).set_is_jclub2(_jclub2);
 
 #endif // MAME_VIDEO_ST0020_H