summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-01-19 21:35:59 -0500
committer AJR <ajrhacker@users.noreply.github.com>2019-01-19 21:35:59 -0500
commit93dff4fe7d3e3180a3e5ea229d0c60523ab29a52 (patch)
tree2524405f7e1b7cb57bbcf812a4cdc880918f6f03
parent7828367c10676e2be9778846baaa83d969574165 (diff)
fixfreq: Eliminate MCFG_ macros; internalize screen configuration (nw)
-rw-r--r--src/devices/video/fixfreq.cpp12
-rw-r--r--src/devices/video/fixfreq.h70
-rw-r--r--src/mame/drivers/a1supply.cpp13
-rw-r--r--src/mame/drivers/aleisttl.cpp13
-rw-r--r--src/mame/drivers/atarittl.cpp46
-rw-r--r--src/mame/drivers/bailey.cpp13
-rw-r--r--src/mame/drivers/chicago.cpp13
-rw-r--r--src/mame/drivers/electra.cpp13
-rw-r--r--src/mame/drivers/exidyttl.cpp26
-rw-r--r--src/mame/drivers/fungames.cpp13
-rw-r--r--src/mame/drivers/meadwttl.cpp13
-rw-r--r--src/mame/drivers/monacogp.cpp13
-rw-r--r--src/mame/drivers/pong.cpp41
-rw-r--r--src/mame/drivers/pse.cpp13
-rw-r--r--src/mame/drivers/ramtek.cpp13
-rw-r--r--src/mame/drivers/segattl.cpp13
-rw-r--r--src/mame/drivers/taitottl.cpp13
-rw-r--r--src/mame/drivers/testpat.cpp30
-rw-r--r--src/mame/drivers/usbilliards.cpp13
19 files changed, 202 insertions, 192 deletions
diff --git a/src/devices/video/fixfreq.cpp b/src/devices/video/fixfreq.cpp
index b548e7cd3d9..7316a05fc56 100644
--- a/src/devices/video/fixfreq.cpp
+++ b/src/devices/video/fixfreq.cpp
@@ -59,6 +59,18 @@ fixedfreq_device::fixedfreq_device(const machine_config &mconfig, const char *ta
{
}
+void fixedfreq_device::device_config_complete()
+{
+ if (!has_screen())
+ return;
+
+ if (!screen().refresh_attoseconds())
+ screen().set_raw(m_monitor_clock, m_hbackporch, 0, m_hbackporch, m_vbackporch, 0, m_vbackporch);
+
+ if (!screen().has_screen_update())
+ screen().set_screen_update(screen_update_rgb32_delegate(FUNC(fixedfreq_device::screen_update), this));
+}
+
void fixedfreq_device::device_start()
{
m_htotal = 0;
diff --git a/src/devices/video/fixfreq.h b/src/devices/video/fixfreq.h
index b6db82f1ae9..68dc829c650 100644
--- a/src/devices/video/fixfreq.h
+++ b/src/devices/video/fixfreq.h
@@ -18,60 +18,13 @@
#include "screen.h"
-#define FIXFREQ_INTERFACE(name) \
- const fixedfreq_interface (name) =
-
-#define MCFG_FIXFREQ_ADD(_tag, _screen_tag) \
- MCFG_SCREEN_ADD(_screen_tag, RASTER) \
- MCFG_SCREEN_RAW_PARAMS(13500000, 858, 0, 858, 525, 0, 525) \
- MCFG_SCREEN_UPDATE_DEVICE(_tag, fixedfreq_device, screen_update) \
- MCFG_DEVICE_ADD(_tag, FIXFREQ, 0) \
- MCFG_VIDEO_SET_SCREEN(_screen_tag)
-
-#define MCFG_FIXFREQ_MONITOR_CLOCK(_clock) \
- downcast<fixedfreq_device &>(*device).set_monitor_clock(_clock);
-
-#define MCFG_FIXFREQ_HORZ_PARAMS(_visible, _frontporch, _sync, _backporch) \
- downcast<fixedfreq_device &>(*device).set_horz_params(_visible, _frontporch, _sync, _backporch);
-
-#define MCFG_FIXFREQ_VERT_PARAMS(_visible, _frontporch, _sync, _backporch) \
- downcast<fixedfreq_device &>(*device).set_vert_params(_visible, _frontporch, _sync, _backporch);
-
-#define MCFG_FIXFREQ_FIELDCOUNT(_count) \
- downcast<fixedfreq_device &>(*device).set_fieldcount(_count);
-
-#define MCFG_FIXFREQ_SYNC_THRESHOLD(_threshold) \
- downcast<fixedfreq_device &>(*device).set_threshold(_threshold);
-
-#define MCFG_FIXFREQ_GAIN(_gain) \
- downcast<fixedfreq_device &>(*device).set_gain(_gain);
-
-// pre-defined configurations
-
-//ModeLine "720x480@30i" 13.5 720 736 799 858 480 486 492 525 interlace -hsync -vsync
-#define MCFG_FIXFREQ_MODE_NTSC720 \
- MCFG_FIXFREQ_MONITOR_CLOCK(13500000) \
- MCFG_FIXFREQ_HORZ_PARAMS(720, 736, 799, 858) \
- MCFG_FIXFREQ_VERT_PARAMS(480, 486, 492, 525) \
- MCFG_FIXFREQ_FIELDCOUNT(2) \
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.3)
-
-//ModeLine "704x480@30i" 13.5 704 728 791 858 480 486 492 525
-#define MCFG_FIXFREQ_MODE_NTSC704 \
- MCFG_FIXFREQ_MONITOR_CLOCK(13500000) \
- MCFG_FIXFREQ_HORZ_PARAMS(704, 728, 791, 858) \
- MCFG_FIXFREQ_VERT_PARAMS(480, 486, 492, 525) \
- MCFG_FIXFREQ_FIELDCOUNT(2) \
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.3)
-
-
-// ======================> vga_device
+// ======================> fixedfreq_device
class fixedfreq_device : public device_t, public device_video_interface
{
public:
// construction/destruction
- fixedfreq_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ fixedfreq_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
// inline configuration helpers
void set_monitor_clock(uint32_t clock) { m_monitor_clock = clock; }
@@ -93,6 +46,24 @@ public:
m_vbackporch = backporch;
}
+ // pre-defined configurations
+ void set_mode_ntsc720() //ModeLine "720x480@30i" 13.5 720 736 799 858 480 486 492 525 interlace -hsync -vsync
+ {
+ set_monitor_clock(13500000);
+ set_horz_params(720, 736, 799, 858);
+ set_vert_params(480, 486, 492, 525);
+ set_fieldcount(2);
+ set_threshold(0.3);
+ }
+ void set_mode_ntsc704() //ModeLine "704x480@30i" 13.5 704 728 791 858 480 486 492 525
+ {
+ set_monitor_clock(13500000);
+ set_horz_params(704, 728, 791, 858);
+ set_vert_params(480, 486, 492, 525);
+ set_fieldcount(2);
+ set_threshold(0.3);
+ }
+
virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
NETDEV_ANALOG_CALLBACK_MEMBER(update_composite_monochrome);
@@ -109,6 +80,7 @@ protected:
fixedfreq_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
+ virtual void device_config_complete() override;
virtual void device_start() override;
virtual void device_reset() override;
virtual void device_post_load() override;
diff --git a/src/mame/drivers/a1supply.cpp b/src/mame/drivers/a1supply.cpp
index 38dd35768df..991531caef3 100644
--- a/src/mame/drivers/a1supply.cpp
+++ b/src/mame/drivers/a1supply.cpp
@@ -94,12 +94,13 @@ MACHINE_CONFIG_START(a1supply_state::a1supply)
MCFG_NETLIST_SETUP(a1supply)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aleisttl.cpp b/src/mame/drivers/aleisttl.cpp
index 2ee923f5753..c5de63e532d 100644
--- a/src/mame/drivers/aleisttl.cpp
+++ b/src/mame/drivers/aleisttl.cpp
@@ -107,12 +107,13 @@ MACHINE_CONFIG_START(sburners_state::sburners)
MCFG_NETLIST_SETUP(sburners)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarittl.cpp b/src/mame/drivers/atarittl.cpp
index 51e99579760..f580f7a41b1 100644
--- a/src/mame/drivers/atarittl.cpp
+++ b/src/mame/drivers/atarittl.cpp
@@ -202,10 +202,14 @@ class gtrak10_state : public driver_device
public:
gtrak10_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
+ , m_video(*this, "fixfreq")
{
}
void gtrak10(machine_config &config);
+
+private:
+ required_device<fixedfreq_device> m_video;
};
static NETLIST_START(atarikee)
@@ -330,12 +334,13 @@ MACHINE_CONFIG_START(atarikee_state::atarikee)
MCFG_NETLIST_SETUP(atarikee)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
//#define STUNTCYC_NL_CLOCK (14318181*69)
@@ -360,12 +365,12 @@ MACHINE_CONFIG_START(stuntcyc_state::stuntcyc)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_UPDATE_DRIVER(stuntcyc_state, screen_update_stuntcyc)
MCFG_SCREEN_RAW_PARAMS(SC_HTOTAL*SC_VTOTAL*60, SC_HTOTAL, 0, SC_HTOTAL, SC_VTOTAL, 0, SC_VTOTAL)
- //MCFG_FIXFREQ_ADD("fixfreq", "screen")
- //MCFG_FIXFREQ_MONITOR_CLOCK(SC_VIDCLOCK)
- //MCFG_FIXFREQ_HORZ_PARAMS(SC_HTOTAL-67,SC_HTOTAL-40,SC_HTOTAL-8, SC_HTOTAL)
- //MCFG_FIXFREQ_VERT_PARAMS(SC_VTOTAL-22,SC_VTOTAL-19,SC_VTOTAL-12,SC_VTOTAL)
- //MCFG_FIXFREQ_FIELDCOUNT(1)
- //MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ //FIXFREQ(config, m_video).set_screen("screen");
+ //m_video->set_monitor_clock(SC_VIDCLOCK);
+ //m_video->set_horz_params(SC_HTOTAL-67,SC_HTOTAL-40,SC_HTOTAL-8, SC_HTOTAL);
+ //m_video->set_vert_params(SC_VTOTAL-22,SC_VTOTAL-19,SC_VTOTAL-12,SC_VTOTAL);
+ //m_video->set_fieldcount(1);
+ //m_video->set_threshold(0.30);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gtrak10_state::gtrak10)
@@ -396,15 +401,16 @@ MACHINE_CONFIG_START(gtrak10_state::gtrak10)
Vert Back Porch = 0
*/
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(GTRAK10_VIDCLOCK)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(GTRAK10_VIDCLOCK);
// Length of active video, end of front-porch, end of sync signal, end of line/frame
- MCFG_FIXFREQ_HORZ_PARAMS(GTRAK10_HTOTAL*1 - 32, GTRAK10_HTOTAL*1 - 32, GTRAK10_HTOTAL*1 - 31, GTRAK10_HTOTAL*1)
- //MCFG_FIXFREQ_HORZ_PARAMS(GTRAK10_HTOTAL - 32, GTRAK10_HTOTAL - 32, GTRAK10_HTOTAL - 31, GTRAK10_HTOTAL)
- MCFG_FIXFREQ_VERT_PARAMS( GTRAK10_VTOTAL - 8, GTRAK10_VTOTAL - 8, GTRAK10_VTOTAL, GTRAK10_VTOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(2)
- MCFG_FIXFREQ_SYNC_THRESHOLD(1.0)
- //MCFG_FIXFREQ_GAIN(1.50)
+ m_video->set_horz_params(GTRAK10_HTOTAL*1 - 32, GTRAK10_HTOTAL*1 - 32, GTRAK10_HTOTAL*1 - 31, GTRAK10_HTOTAL*1);
+ //m_video->set_horz_params(GTRAK10_HTOTAL - 32, GTRAK10_HTOTAL - 32, GTRAK10_HTOTAL - 31, GTRAK10_HTOTAL);
+ m_video->set_vert_params( GTRAK10_VTOTAL - 8, GTRAK10_VTOTAL - 8, GTRAK10_VTOTAL, GTRAK10_VTOTAL);
+ m_video->set_fieldcount(2);
+ m_video->set_threshold(1.0);
+ //m_video->set_gain(1.50);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bailey.cpp b/src/mame/drivers/bailey.cpp
index 5b3598ebf1b..4307c565800 100644
--- a/src/mame/drivers/bailey.cpp
+++ b/src/mame/drivers/bailey.cpp
@@ -95,12 +95,13 @@ MACHINE_CONFIG_START(bailey_state::bailey)
MCFG_NETLIST_SETUP(bailey)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/chicago.cpp b/src/mame/drivers/chicago.cpp
index 14b2d545572..e58d99d8501 100644
--- a/src/mame/drivers/chicago.cpp
+++ b/src/mame/drivers/chicago.cpp
@@ -101,12 +101,13 @@ MACHINE_CONFIG_START(chicago_state::chicago)
MCFG_NETLIST_SETUP(chicago)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/electra.cpp b/src/mame/drivers/electra.cpp
index 59dca302ffa..4f9ace92e5d 100644
--- a/src/mame/drivers/electra.cpp
+++ b/src/mame/drivers/electra.cpp
@@ -99,12 +99,13 @@ MACHINE_CONFIG_START(electra_state::electra)
MCFG_NETLIST_SETUP(electra)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exidyttl.cpp b/src/mame/drivers/exidyttl.cpp
index 55e9650b4a1..96059680e4b 100644
--- a/src/mame/drivers/exidyttl.cpp
+++ b/src/mame/drivers/exidyttl.cpp
@@ -102,12 +102,13 @@ MACHINE_CONFIG_START(exidyttl_state::attack)
MCFG_NETLIST_SETUP(attack)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(exidyttl_state::deathrac)
@@ -117,12 +118,13 @@ MACHINE_CONFIG_START(exidyttl_state::deathrac)
MCFG_NETLIST_SETUP(attack)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fungames.cpp b/src/mame/drivers/fungames.cpp
index 481c3ba604d..ee8735213d7 100644
--- a/src/mame/drivers/fungames.cpp
+++ b/src/mame/drivers/fungames.cpp
@@ -95,12 +95,13 @@ MACHINE_CONFIG_START(fungames_state::fungames)
MCFG_NETLIST_SETUP(fungames)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/meadwttl.cpp b/src/mame/drivers/meadwttl.cpp
index f042a4b7f81..71888ff3aa7 100644
--- a/src/mame/drivers/meadwttl.cpp
+++ b/src/mame/drivers/meadwttl.cpp
@@ -97,12 +97,13 @@ MACHINE_CONFIG_START(meadwttl_state::meadows)
MCFG_NETLIST_SETUP(meadows)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/monacogp.cpp b/src/mame/drivers/monacogp.cpp
index 2580c0d2e61..1c4caeef1d2 100644
--- a/src/mame/drivers/monacogp.cpp
+++ b/src/mame/drivers/monacogp.cpp
@@ -190,12 +190,13 @@ MACHINE_CONFIG_START(monacogp_state::monacogp)
MCFG_NETLIST_SETUP(monacogp)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pong.cpp b/src/mame/drivers/pong.cpp
index f00249b0ecb..fbd9e04442c 100644
--- a/src/mame/drivers/pong.cpp
+++ b/src/mame/drivers/pong.cpp
@@ -396,12 +396,13 @@ MACHINE_CONFIG_START(pong_state::pong)
MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "vid0", "videomix", fixedfreq_device, update_composite_monochrome, "fixfreq")
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL_PONG-67,H_TOTAL_PONG-40,H_TOTAL_PONG-8,H_TOTAL_PONG)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL_PONG-22,V_TOTAL_PONG-19,V_TOTAL_PONG-12,V_TOTAL_PONG)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.11)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL_PONG-67,H_TOTAL_PONG-40,H_TOTAL_PONG-8,H_TOTAL_PONG);
+ m_video->set_vert_params(V_TOTAL_PONG-22,V_TOTAL_PONG-19,V_TOTAL_PONG-12,V_TOTAL_PONG);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.11);
/* sound hardware */
SPEAKER(config, "speaker").front_center();
@@ -445,16 +446,17 @@ MACHINE_CONFIG_START(breakout_state::breakout)
MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "coin_counter", "CON_T", breakout_state, coin_counter_cb, "")
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
/* The Pixel width is a 2,1,2,1,2,1,1,1 repeating pattern
* Thus we must use double resolution horizontally
*/
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK_BREAKOUT*2)
- MCFG_FIXFREQ_HORZ_PARAMS((H_TOTAL_BREAKOUT-104)*2,(H_TOTAL_BREAKOUT-72)*2,(H_TOTAL_BREAKOUT-8)*2, (H_TOTAL_BREAKOUT)*2)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL_BREAKOUT-22,V_TOTAL_BREAKOUT-23,V_TOTAL_BREAKOUT-4, V_TOTAL_BREAKOUT)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(1.0)
- MCFG_FIXFREQ_GAIN(1.5)
+ m_video->set_monitor_clock(MASTER_CLOCK_BREAKOUT*2);
+ m_video->set_horz_params((H_TOTAL_BREAKOUT-104)*2,(H_TOTAL_BREAKOUT-72)*2,(H_TOTAL_BREAKOUT-8)*2, (H_TOTAL_BREAKOUT)*2);
+ m_video->set_vert_params(V_TOTAL_BREAKOUT-22,V_TOTAL_BREAKOUT-23,V_TOTAL_BREAKOUT-4, V_TOTAL_BREAKOUT);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(1.0);
+ m_video->set_gain(1.5);
/* sound hardware */
SPEAKER(config, "speaker").front_center();
@@ -494,12 +496,13 @@ MACHINE_CONFIG_START(pong_state::pongd)
MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "vid0", "videomix", fixedfreq_device, update_composite_monochrome, "fixfreq")
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL_PONG-67,H_TOTAL_PONG-52,H_TOTAL_PONG-8,H_TOTAL_PONG)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL_PONG-22,V_TOTAL_PONG-19,V_TOTAL_PONG-12,V_TOTAL_PONG)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.11)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL_PONG-67,H_TOTAL_PONG-52,H_TOTAL_PONG-8,H_TOTAL_PONG);
+ m_video->set_vert_params(V_TOTAL_PONG-22,V_TOTAL_PONG-19,V_TOTAL_PONG-12,V_TOTAL_PONG);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.11);
/* sound hardware */
SPEAKER(config, "speaker").front_center();
diff --git a/src/mame/drivers/pse.cpp b/src/mame/drivers/pse.cpp
index f4d72e12467..c6a1511ea3a 100644
--- a/src/mame/drivers/pse.cpp
+++ b/src/mame/drivers/pse.cpp
@@ -106,12 +106,13 @@ MACHINE_CONFIG_START(pse_state::pse)
MCFG_NETLIST_SETUP(pse)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ramtek.cpp b/src/mame/drivers/ramtek.cpp
index 5dfa5b77d83..b939c83ce5e 100644
--- a/src/mame/drivers/ramtek.cpp
+++ b/src/mame/drivers/ramtek.cpp
@@ -117,12 +117,13 @@ MACHINE_CONFIG_START(ramtek_state::ramtek)
MCFG_NETLIST_SETUP(ramtek)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segattl.cpp b/src/mame/drivers/segattl.cpp
index e582698a53a..aeb4e77ea1d 100644
--- a/src/mame/drivers/segattl.cpp
+++ b/src/mame/drivers/segattl.cpp
@@ -138,12 +138,13 @@ MACHINE_CONFIG_START(segattl_state::segattl)
MCFG_NETLIST_SETUP(segattl)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taitottl.cpp b/src/mame/drivers/taitottl.cpp
index 37fdc944bb8..74cdb371bd5 100644
--- a/src/mame/drivers/taitottl.cpp
+++ b/src/mame/drivers/taitottl.cpp
@@ -143,12 +143,13 @@ MACHINE_CONFIG_START(taitottl_state::taitottl)
MCFG_NETLIST_SETUP(taitottl)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/testpat.cpp b/src/mame/drivers/testpat.cpp
index 10a437b6fd0..60faab6b75a 100644
--- a/src/mame/drivers/testpat.cpp
+++ b/src/mame/drivers/testpat.cpp
@@ -106,13 +106,14 @@ MACHINE_CONFIG_START(tp1983_state::tp1983)
MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "vid0", "videomix", fixedfreq_device, update_composite_monochrome, "fixfreq")
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL_PONG-64,H_TOTAL_PONG-40,H_TOTAL_PONG-8,H_TOTAL_PONG)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL_PONG-19,V_TOTAL_PONG-16,V_TOTAL_PONG-12,V_TOTAL_PONG)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(1)
- MCFG_FIXFREQ_GAIN(0.36)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL_PONG-64,H_TOTAL_PONG-40,H_TOTAL_PONG-8,H_TOTAL_PONG);
+ m_video->set_vert_params(V_TOTAL_PONG-19,V_TOTAL_PONG-16,V_TOTAL_PONG-12,V_TOTAL_PONG);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(1);
+ m_video->set_gain(0.36);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tp1985_state::tp1985)
@@ -121,13 +122,14 @@ MACHINE_CONFIG_START(tp1985_state::tp1985)
MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "vid0", "videomix", tp1985_state, video_out_cb, "")
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL_PONG-64,H_TOTAL_PONG-40,H_TOTAL_PONG-8,H_TOTAL_PONG)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL_PONG-19,V_TOTAL_PONG-16,V_TOTAL_PONG-12,V_TOTAL_PONG)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(1)
- MCFG_FIXFREQ_GAIN(0.36)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL_PONG-64,H_TOTAL_PONG-40,H_TOTAL_PONG-8,H_TOTAL_PONG);
+ m_video->set_vert_params(V_TOTAL_PONG-19,V_TOTAL_PONG-16,V_TOTAL_PONG-12,V_TOTAL_PONG);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(1);
+ m_video->set_gain(0.36);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/usbilliards.cpp b/src/mame/drivers/usbilliards.cpp
index e77e5423ad5..079b7f03db7 100644
--- a/src/mame/drivers/usbilliards.cpp
+++ b/src/mame/drivers/usbilliards.cpp
@@ -96,12 +96,13 @@ MACHINE_CONFIG_START(usbilliards_state::usbilliards)
MCFG_NETLIST_SETUP(usbilliards)
/* video hardware */
- MCFG_FIXFREQ_ADD("fixfreq", "screen")
- MCFG_FIXFREQ_MONITOR_CLOCK(MASTER_CLOCK)
- MCFG_FIXFREQ_HORZ_PARAMS(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL)
- MCFG_FIXFREQ_VERT_PARAMS(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL)
- MCFG_FIXFREQ_FIELDCOUNT(1)
- MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
+ SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+ FIXFREQ(config, m_video).set_screen("screen");
+ m_video->set_monitor_clock(MASTER_CLOCK);
+ m_video->set_horz_params(H_TOTAL-67,H_TOTAL-40,H_TOTAL-8,H_TOTAL);
+ m_video->set_vert_params(V_TOTAL-22,V_TOTAL-19,V_TOTAL-12,V_TOTAL);
+ m_video->set_fieldcount(1);
+ m_video->set_threshold(0.30);
MACHINE_CONFIG_END