summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers')
-rw-r--r--src/mame/drivers/2mindril.cpp2
-rw-r--r--src/mame/drivers/acefruit.cpp14
-rw-r--r--src/mame/drivers/amust.cpp2
-rw-r--r--src/mame/drivers/argo.cpp2
-rw-r--r--src/mame/drivers/aristmk4.cpp2
-rw-r--r--src/mame/drivers/artmagic.cpp2
-rw-r--r--src/mame/drivers/asterix.cpp2
-rw-r--r--src/mame/drivers/astinvad.cpp2
-rw-r--r--src/mame/drivers/asuka.cpp2
-rw-r--r--src/mame/drivers/atarist.cpp2
-rw-r--r--src/mame/drivers/beezer.cpp2
-rw-r--r--src/mame/drivers/boxer.cpp2
-rw-r--r--src/mame/drivers/c10.cpp2
-rw-r--r--src/mame/drivers/capbowl.cpp2
-rw-r--r--src/mame/drivers/cat.cpp2
-rw-r--r--src/mame/drivers/cball.cpp2
-rw-r--r--src/mame/drivers/cidelsa.cpp2
-rw-r--r--src/mame/drivers/clpoker.cpp19
-rw-r--r--src/mame/drivers/dec8.cpp2
-rw-r--r--src/mame/drivers/dectalk.cpp2
-rw-r--r--src/mame/drivers/destroyr.cpp2
-rw-r--r--src/mame/drivers/fgoal.cpp2
-rw-r--r--src/mame/drivers/flyball.cpp2
-rw-r--r--src/mame/drivers/fm7.cpp2
-rw-r--r--src/mame/drivers/fuukifg2.cpp2
-rw-r--r--src/mame/drivers/fuukifg3.cpp2
-rw-r--r--src/mame/drivers/gaplus.cpp2
-rw-r--r--src/mame/drivers/gottlieb.cpp2
-rw-r--r--src/mame/drivers/gpworld.cpp2
-rw-r--r--src/mame/drivers/gunbustr.cpp2
-rw-r--r--src/mame/drivers/h19.cpp4
-rw-r--r--src/mame/drivers/intv.cpp2
-rw-r--r--src/mame/drivers/itech8.cpp2
-rw-r--r--src/mame/drivers/jclub2.cpp23
-rw-r--r--src/mame/drivers/kinst.cpp2
-rw-r--r--src/mame/drivers/laserbat.cpp2
-rw-r--r--src/mame/drivers/m10.cpp2
-rw-r--r--src/mame/drivers/mekd2.cpp2
-rw-r--r--src/mame/drivers/metro.cpp2
-rw-r--r--src/mame/drivers/mgolf.cpp2
-rw-r--r--src/mame/drivers/mjsister.cpp2
-rw-r--r--src/mame/drivers/mlanding.cpp10
-rw-r--r--src/mame/drivers/nightmare.cpp2
-rw-r--r--src/mame/drivers/notetaker.cpp2
-rw-r--r--src/mame/drivers/okean240.cpp2
-rw-r--r--src/mame/drivers/osi.cpp2
-rw-r--r--src/mame/drivers/parodius.cpp2
-rw-r--r--src/mame/drivers/pc88va.cpp2
-rw-r--r--src/mame/drivers/pcfx.cpp2
-rw-r--r--src/mame/drivers/pentagon.cpp2
-rw-r--r--src/mame/drivers/plan80.cpp2
-rw-r--r--src/mame/drivers/ptcsol.cpp2
-rw-r--r--src/mame/drivers/rabbit.cpp2
-rw-r--r--src/mame/drivers/rollerg.cpp2
-rw-r--r--src/mame/drivers/samcoupe.cpp2
-rw-r--r--src/mame/drivers/segaorun.cpp2
-rw-r--r--src/mame/drivers/simpsons.cpp2
-rw-r--r--src/mame/drivers/slapshot.cpp2
-rw-r--r--src/mame/drivers/socrates.cpp2
-rw-r--r--src/mame/drivers/spacefb.cpp2
-rw-r--r--src/mame/drivers/spectrum.cpp2
-rw-r--r--src/mame/drivers/sprint4.cpp2
-rw-r--r--src/mame/drivers/swyft.cpp19
-rw-r--r--src/mame/drivers/symbolics.cpp2
-rw-r--r--src/mame/drivers/sys2900.cpp2
-rw-r--r--src/mame/drivers/taito_f2.cpp2
-rw-r--r--src/mame/drivers/taito_f3.cpp2
-rw-r--r--src/mame/drivers/taito_z.cpp2
-rw-r--r--src/mame/drivers/tehkanwc.cpp2
-rw-r--r--src/mame/drivers/thayers.cpp2
-rw-r--r--src/mame/drivers/thunderx.cpp13
-rw-r--r--src/mame/drivers/tickee.cpp2
-rw-r--r--src/mame/drivers/tmc1800.cpp2
-rw-r--r--src/mame/drivers/tmnt.cpp2
-rw-r--r--src/mame/drivers/trucocl.cpp2
-rw-r--r--src/mame/drivers/tubep.cpp2
-rw-r--r--src/mame/drivers/tugboat.cpp2
-rw-r--r--src/mame/drivers/ultratnk.cpp2
-rw-r--r--src/mame/drivers/vegaeo.cpp9
-rw-r--r--src/mame/drivers/vendetta.cpp2
-rw-r--r--src/mame/drivers/videopin.cpp2
-rw-r--r--src/mame/drivers/videopkr.cpp7
-rw-r--r--src/mame/drivers/vk100.cpp2
-rw-r--r--src/mame/drivers/wgp.cpp2
-rw-r--r--src/mame/drivers/wolfpack.cpp2
-rw-r--r--src/mame/drivers/x1.cpp5
-rw-r--r--src/mame/drivers/x1twin.cpp3
-rw-r--r--src/mame/drivers/x68k.cpp2
-rw-r--r--src/mame/drivers/zrt80.cpp2
89 files changed, 143 insertions, 139 deletions
diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp
index ecb9912134e..6301efc8d0f 100644
--- a/src/mame/drivers/2mindril.cpp
+++ b/src/mame/drivers/2mindril.cpp
@@ -143,7 +143,7 @@ void _2mindril_state::device_timer(emu_timer &timer, device_timer_id id, int par
m_defender_sensor = param;
break;
default:
- assert_always(false, "Unknown id in _2mindril_state::device_timer");
+ throw emu_fatalerror("Unknown id in _2mindril_state::device_timer");
}
}
#endif
diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp
index 96d9c1219ef..810937ac4e2 100644
--- a/src/mame/drivers/acefruit.cpp
+++ b/src/mame/drivers/acefruit.cpp
@@ -101,7 +101,7 @@ void acefruit_state::acefruit_update_irq(int vpos)
switch( color )
{
case 0x0c:
- m_maincpu->set_input_line(0, HOLD_LINE );
+ m_maincpu->set_input_line(0, HOLD_LINE);
break;
}
}
@@ -116,15 +116,15 @@ void acefruit_state::device_timer(emu_timer &timer, device_timer_id id, int para
{
case TIMER_ACEFRUIT_REFRESH:
- m_screen->update_partial(vpos );
- acefruit_update_irq(vpos);
+ m_screen->update_partial(vpos);
+ acefruit_update_irq(vpos);
- vpos = ( ( vpos / 8 ) + 1 ) * 8;
+ vpos = ((vpos / 8) + 1) * 8;
- m_refresh_timer->adjust( m_screen->time_until_pos(vpos) );
- break;
+ m_refresh_timer->adjust(m_screen->time_until_pos(vpos));
+ break;
default:
- assert_always(false, "Unknown id in acefruit_state::device_timer");
+ throw emu_fatalerror("Unknown id in acefruit_state::device_timer");
}
}
diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp
index 7c8dd90d45c..58cd91fd1ee 100644
--- a/src/mame/drivers/amust.cpp
+++ b/src/mame/drivers/amust.cpp
@@ -168,7 +168,7 @@ void amust_state::device_timer(emu_timer &timer, device_timer_id id, int param,
m_beep->set_state(0);
break;
default:
- assert_always(false, "Unknown id in amust_state::device_timer");
+ throw emu_fatalerror("Unknown id in amust_state::device_timer");
}
}
diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp
index 869cf2da03b..afb228bed4b 100644
--- a/src/mame/drivers/argo.cpp
+++ b/src/mame/drivers/argo.cpp
@@ -434,7 +434,7 @@ void argo_state::device_timer(emu_timer &timer, device_timer_id id, int param, v
membank("boot")->set_entry(0);
break;
default:
- assert_always(false, "Unknown id in argo_state::device_timer");
+ throw emu_fatalerror("Unknown id in argo_state::device_timer");
}
}
diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp
index 434531d1d29..f9faaf5c073 100644
--- a/src/mame/drivers/aristmk4.cpp
+++ b/src/mame/drivers/aristmk4.cpp
@@ -1754,7 +1754,7 @@ void aristmk4_state::device_timer(emu_timer &timer, device_timer_id id, int para
switch (id)
{
case TIMER_POWER_FAIL: power_fail(); break;
- default: assert_always(false, "Unknown id in aristmk4_state::device_timer");
+ default: throw emu_fatalerror("Unknown id in aristmk4_state::device_timer");
}
}
diff --git a/src/mame/drivers/artmagic.cpp b/src/mame/drivers/artmagic.cpp
index 3189eb3d0f0..17f2081eb28 100644
--- a/src/mame/drivers/artmagic.cpp
+++ b/src/mame/drivers/artmagic.cpp
@@ -128,7 +128,7 @@ void artmagic_state::device_timer(emu_timer &timer, device_timer_id id, int para
update_irq_state();
break;
default:
- assert_always(false, "Unknown id in artmagic_state::device_timer");
+ throw emu_fatalerror("Unknown id in artmagic_state::device_timer");
}
}
diff --git a/src/mame/drivers/asterix.cpp b/src/mame/drivers/asterix.cpp
index 9e63c1d90ec..94019c13c53 100644
--- a/src/mame/drivers/asterix.cpp
+++ b/src/mame/drivers/asterix.cpp
@@ -73,7 +73,7 @@ void asterix_state::device_timer(emu_timer &timer, device_timer_id id, int param
m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
break;
default:
- assert_always(false, "Unknown id in asterix_state::device_timer");
+ throw emu_fatalerror("Unknown id in asterix_state::device_timer");
}
}
diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp
index 81af8cee125..cdf277b5356 100644
--- a/src/mame/drivers/astinvad.cpp
+++ b/src/mame/drivers/astinvad.cpp
@@ -262,7 +262,7 @@ void astinvad_state::device_timer(emu_timer &timer, device_timer_id id, int para
kamizake_int_gen(ptr, param);
break;
default:
- assert_always(false, "Unknown id in astinvad_state::device_timer");
+ throw emu_fatalerror("Unknown id in astinvad_state::device_timer");
}
}
diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp
index 871aa31f7b8..1556a996993 100644
--- a/src/mame/drivers/asuka.cpp
+++ b/src/mame/drivers/asuka.cpp
@@ -243,7 +243,7 @@ void asuka_state::device_timer(emu_timer &timer, device_timer_id id, int param,
m_maincpu->set_input_line(5, HOLD_LINE);
break;
default:
- assert_always(false, "Unknown id in asuka_state::device_timer");
+ throw emu_fatalerror("Unknown id in asuka_state::device_timer");
}
}
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index 8ef9ff076b9..e9245d092ee 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -69,7 +69,7 @@ void st_state::device_timer(emu_timer &timer, device_timer_id id, int param, voi
blitter_tick();
break;
default:
- assert_always(false, "Unknown id in st_state::device_timer");
+ throw emu_fatalerror("Unknown id in st_state::device_timer");
}
}
diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp
index 9796313388f..950bd9f2a94 100644
--- a/src/mame/drivers/beezer.cpp
+++ b/src/mame/drivers/beezer.cpp
@@ -302,7 +302,7 @@ void beezer_state::device_timer(emu_timer &timer, device_timer_id id, int param,
{
case TIMER_DAC: dac_update_cb(); break;
case TIMER_SCANLINE: scanline_cb(); break;
- default: assert_always(false, "Unknown id in beezer_state::device_timer");
+ default: throw emu_fatalerror("Unknown id in beezer_state::device_timer");
}
}
diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp
index 0eccc410514..8a6c13cd1b5 100644
--- a/src/mame/drivers/boxer.cpp
+++ b/src/mame/drivers/boxer.cpp
@@ -103,7 +103,7 @@ void boxer_state::device_timer(emu_timer &timer, device_timer_id id, int param,
periodic_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in boxer_state::device_timer");
+ throw emu_fatalerror("Unknown id in boxer_state::device_timer");
}
}
diff --git a/src/mame/drivers/c10.cpp b/src/mame/drivers/c10.cpp
index 59462dfbea2..511b6741ffe 100644
--- a/src/mame/drivers/c10.cpp
+++ b/src/mame/drivers/c10.cpp
@@ -81,7 +81,7 @@ void c10_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
membank("boot")->set_entry(0);
break;
default:
- assert_always(false, "Unknown id in c10_state::device_timer");
+ throw emu_fatalerror("Unknown id in c10_state::device_timer");
}
}
diff --git a/src/mame/drivers/capbowl.cpp b/src/mame/drivers/capbowl.cpp
index 9fdb8438fb9..96a31ab31ea 100644
--- a/src/mame/drivers/capbowl.cpp
+++ b/src/mame/drivers/capbowl.cpp
@@ -130,7 +130,7 @@ void capbowl_state::device_timer(emu_timer &timer, device_timer_id id, int param
update(ptr, param);
break;
default:
- assert_always(false, "Unknown id in capbowl_state::device_timer");
+ throw emu_fatalerror("Unknown id in capbowl_state::device_timer");
}
}
diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp
index 950b7dd2d1b..d1ed24efad5 100644
--- a/src/mame/drivers/cat.cpp
+++ b/src/mame/drivers/cat.cpp
@@ -902,7 +902,7 @@ void cat_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
counter_6ms_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in cat_state::device_timer");
+ throw emu_fatalerror("Unknown id in cat_state::device_timer");
}
}
diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp
index b022aeade1a..38d9d82e31c 100644
--- a/src/mame/drivers/cball.cpp
+++ b/src/mame/drivers/cball.cpp
@@ -110,7 +110,7 @@ void cball_state::device_timer(emu_timer &timer, device_timer_id id, int param,
interrupt_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in cball_state::device_timer");
+ throw emu_fatalerror("Unknown id in cball_state::device_timer");
}
}
diff --git a/src/mame/drivers/cidelsa.cpp b/src/mame/drivers/cidelsa.cpp
index 7a484d6d181..4e998a5bc26 100644
--- a/src/mame/drivers/cidelsa.cpp
+++ b/src/mame/drivers/cidelsa.cpp
@@ -364,7 +364,7 @@ void cidelsa_state::device_timer(emu_timer &timer, device_timer_id id, int param
m_reset = 1;
break;
default:
- assert_always(false, "Unknown id in cidelsa_state::device_timer");
+ throw emu_fatalerror("Unknown id in cidelsa_state::device_timer");
}
}
diff --git a/src/mame/drivers/clpoker.cpp b/src/mame/drivers/clpoker.cpp
index 10a41c9ec71..372c788d257 100644
--- a/src/mame/drivers/clpoker.cpp
+++ b/src/mame/drivers/clpoker.cpp
@@ -27,9 +27,7 @@ There also are unpopulated locations that might fit a YM3812 and YM3014.
*/
#include "emu.h"
-#include "screen.h"
-#include "speaker.h"
-#include "tilemap.h"
+
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/nvram.h"
@@ -37,6 +35,11 @@ There also are unpopulated locations that might fit a YM3812 and YM3014.
#include "sound/ay8910.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
+#include "tilemap.h"
+
+
class clpoker_state : public driver_device
{
public:
@@ -49,6 +52,12 @@ public:
{
}
+ void clpoker(machine_config &config);
+
+protected:
+ virtual void video_start() override;
+
+private:
DECLARE_WRITE8_MEMBER(output_a_w);
DECLARE_WRITE8_MEMBER(output_b_w);
DECLARE_WRITE8_MEMBER(output_c_w);
@@ -58,14 +67,10 @@ public:
u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void clpoker(machine_config &config);
void io_map(address_map &map);
void prg_map(address_map &map);
void ramdac_map(address_map &map);
-protected:
- virtual void video_start() override;
-private:
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp
index a3d16e67156..dbc7d5f5d02 100644
--- a/src/mame/drivers/dec8.cpp
+++ b/src/mame/drivers/dec8.cpp
@@ -149,7 +149,7 @@ void dec8_state::device_timer(emu_timer &timer, device_timer_id id, int param, v
m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
break;
default:
- assert_always(false, "Unknown id in dec8_state::device_timer");
+ throw emu_fatalerror("Unknown id in dec8_state::device_timer");
}
}
diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp
index 9eec753da43..1f406494e97 100644
--- a/src/mame/drivers/dectalk.cpp
+++ b/src/mame/drivers/dectalk.cpp
@@ -854,7 +854,7 @@ void dectalk_state::device_timer(emu_timer &timer, device_timer_id id, int param
outfifo_read_cb(ptr, param);
break;
default:
- assert_always(false, "Unknown id in dectalk_state::device_timer");
+ throw emu_fatalerror("Unknown id in dectalk_state::device_timer");
}
}
diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp
index 50fd0907ca7..cc1cf82d3b2 100644
--- a/src/mame/drivers/destroyr.cpp
+++ b/src/mame/drivers/destroyr.cpp
@@ -170,7 +170,7 @@ void destroyr_state::device_timer(emu_timer &timer, device_timer_id id, int para
frame_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in destroyr_state::device_timer");
+ throw emu_fatalerror("Unknown id in destroyr_state::device_timer");
}
}
diff --git a/src/mame/drivers/fgoal.cpp b/src/mame/drivers/fgoal.cpp
index b3aca7a63ef..c8031505a03 100644
--- a/src/mame/drivers/fgoal.cpp
+++ b/src/mame/drivers/fgoal.cpp
@@ -72,7 +72,7 @@ void fgoal_state::device_timer(emu_timer &timer, device_timer_id id, int param,
interrupt_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in fgoal_state::device_timer");
+ throw emu_fatalerror("Unknown id in fgoal_state::device_timer");
}
}
diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp
index b7f4f04bb05..f9f24738a17 100644
--- a/src/mame/drivers/flyball.cpp
+++ b/src/mame/drivers/flyball.cpp
@@ -186,7 +186,7 @@ void flyball_state::device_timer(emu_timer &timer, device_timer_id id, int param
break;
default:
- assert_always(false, "Unknown id in flyball_state::device_timer");
+ throw emu_fatalerror("Unknown id in flyball_state::device_timer");
}
}
diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp
index ca6703e6b8a..dc6b256e815 100644
--- a/src/mame/drivers/fm7.cpp
+++ b/src/mame/drivers/fm7.cpp
@@ -210,7 +210,7 @@ void fm7_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
fm77av_vsync(ptr, param);
break;
default:
- assert_always(false, "Unknown id in fm7_state::device_timer");
+ throw emu_fatalerror("Unknown id in fm7_state::device_timer");
}
}
diff --git a/src/mame/drivers/fuukifg2.cpp b/src/mame/drivers/fuukifg2.cpp
index d57f965ceec..45ab3b8efd5 100644
--- a/src/mame/drivers/fuukifg2.cpp
+++ b/src/mame/drivers/fuukifg2.cpp
@@ -434,7 +434,7 @@ void fuuki16_state::device_timer(emu_timer &timer, device_timer_id id, int param
m_raster_interrupt_timer->adjust(m_screen->frame_period());
break;
default:
- assert_always(false, "Unknown id in fuuki16_state::device_timer");
+ throw emu_fatalerror("Unknown id in fuuki16_state::device_timer");
}
}
diff --git a/src/mame/drivers/fuukifg3.cpp b/src/mame/drivers/fuukifg3.cpp
index 789f009a704..e81b0077e8e 100644
--- a/src/mame/drivers/fuukifg3.cpp
+++ b/src/mame/drivers/fuukifg3.cpp
@@ -492,7 +492,7 @@ void fuuki32_state::device_timer(emu_timer &timer, device_timer_id id, int param
m_raster_interrupt_timer->adjust(m_screen->frame_period());
break;
default:
- assert_always(false, "Unknown id in fuuki32_state::device_timer");
+ throw emu_fatalerror("Unknown id in fuuki32_state::device_timer");
}
}
diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp
index b40f5b20252..38aa479c683 100644
--- a/src/mame/drivers/gaplus.cpp
+++ b/src/mame/drivers/gaplus.cpp
@@ -221,7 +221,7 @@ void gaplus_base_state::device_timer(emu_timer &timer, device_timer_id id, int p
namcoio1_run(ptr, param);
break;
default:
- assert_always(false, "Unknown id in gaplus_base_state::device_timer");
+ throw emu_fatalerror("Unknown id in gaplus_base_state::device_timer");
}
}
diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp
index 3ae77dcb246..87f168784c1 100644
--- a/src/mame/drivers/gottlieb.cpp
+++ b/src/mame/drivers/gottlieb.cpp
@@ -707,7 +707,7 @@ void gottlieb_state::device_timer(emu_timer &timer, device_timer_id id, int para
nmi_clear(ptr, param);
break;
default:
- assert_always(false, "Unknown id in gottlieb_state::device_timer");
+ throw emu_fatalerror("Unknown id in gottlieb_state::device_timer");
}
}
diff --git a/src/mame/drivers/gpworld.cpp b/src/mame/drivers/gpworld.cpp
index df0edef9ad1..5bafebbd9d9 100644
--- a/src/mame/drivers/gpworld.cpp
+++ b/src/mame/drivers/gpworld.cpp
@@ -462,7 +462,7 @@ void gpworld_state::device_timer(emu_timer &timer, device_timer_id id, int param
m_maincpu->set_input_line(0, CLEAR_LINE);
break;
default:
- assert_always(false, "Unknown id in gpworld_state::device_timer");
+ throw emu_fatalerror("Unknown id in gpworld_state::device_timer");
}
}
diff --git a/src/mame/drivers/gunbustr.cpp b/src/mame/drivers/gunbustr.cpp
index 6c52edd33f3..4b425dda742 100644
--- a/src/mame/drivers/gunbustr.cpp
+++ b/src/mame/drivers/gunbustr.cpp
@@ -66,7 +66,7 @@ void gunbustr_state::device_timer(emu_timer &timer, device_timer_id id, int para
m_maincpu->set_input_line(5, HOLD_LINE);
break;
default:
- assert_always(false, "Unknown id in gunbustr_state::device_timer");
+ throw emu_fatalerror("Unknown id in gunbustr_state::device_timer");
}
}
diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp
index d445b869756..bd431361b89 100644
--- a/src/mame/drivers/h19.cpp
+++ b/src/mame/drivers/h19.cpp
@@ -148,13 +148,11 @@ void h19_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
m_bellactive = false;
break;
default:
- assert_always(false, "Unknown id in h19_state::device_timer");
+ throw emu_fatalerror("Unknown id in h19_state::device_timer");
}
if (!m_keyclickactive && !m_bellactive)
- {
m_beep->set_state(0);
- }
}
diff --git a/src/mame/drivers/intv.cpp b/src/mame/drivers/intv.cpp
index 34fdf36526d..90a3ac14a61 100644
--- a/src/mame/drivers/intv.cpp
+++ b/src/mame/drivers/intv.cpp
@@ -438,7 +438,7 @@ void intv_state::device_timer(emu_timer &timer, device_timer_id id, int param, v
intv_btb_fill(ptr, param);
break;
default:
- assert_always(false, "Unknown id in intv_state::device_timer");
+ throw emu_fatalerror("Unknown id in intv_state::device_timer");
}
}
diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp
index f3ec9da347d..dd1bfe80380 100644
--- a/src/mame/drivers/itech8.cpp
+++ b/src/mame/drivers/itech8.cpp
@@ -692,7 +692,7 @@ void itech8_state::device_timer(emu_timer &timer, device_timer_id id, int param,
delayed_z80_control_w(ptr, param);
break;
default:
- assert_always(false, "Unknown id in itech8_state::device_timer");
+ throw emu_fatalerror("Unknown id in itech8_state::device_timer");
}
}
diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp
index 75a13ac9a58..fbbfde0d7a2 100644
--- a/src/mame/drivers/jclub2.cpp
+++ b/src/mame/drivers/jclub2.cpp
@@ -114,6 +114,8 @@
#include "jclub2o.lh"
#include "jclub2.lh"
+namespace {
+
// Common between all hardware (jclub2o, jclub2 and darkhors)
class common_state : public driver_device
{
@@ -235,6 +237,14 @@ public:
m_gfxdecode(*this, "gfxdecode")
{ }
+ void init_darkhors();
+
+ void darkhors(machine_config &config);
+
+protected:
+ virtual void video_start() override;
+
+private:
DECLARE_WRITE32_MEMBER(input_sel_w);
DECLARE_READ32_MEMBER(input_r);
DECLARE_WRITE32_MEMBER(out1_w);
@@ -248,12 +258,8 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
- void init_darkhors();
- DECLARE_VIDEO_START(darkhors);
-
- void darkhors(machine_config &config);
void darkhors_map(address_map &map);
-private:
+
required_shared_ptr<uint32_t> m_tmapram;
required_shared_ptr<uint32_t> m_tmapscroll;
required_shared_ptr<uint32_t> m_tmapram2;
@@ -391,8 +397,10 @@ void darkhors_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec
}
}
-VIDEO_START_MEMBER(darkhors_state,darkhors)
+void darkhors_state::video_start()
{
+ common_state::video_start();
+
m_tmap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(darkhors_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS,16,16, 0x40,0x40);
m_tmap2= &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(darkhors_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS,16,16, 0x40,0x40);
m_tmap->set_transparent_pen(0);
@@ -1232,7 +1240,6 @@ void darkhors_state::darkhors(machine_config &config)
PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x10000);
GFXDECODE(config, m_gfxdecode, m_palette, gfx_darkhors);
- MCFG_VIDEO_START_OVERRIDE(darkhors_state, darkhors)
// layout
config.set_default_layout(layout_jclub2);
@@ -1531,6 +1538,8 @@ void darkhors_state::init_darkhors()
}
}
+} // anonymous namespace
+
// Older hardware (ST-0020 + ST-0016)
GAME( 1994, jclub2v100, jclub2v112, jclub2o, jclub2v100, jclub2o_state, init_jclub2o, ROT0, "Seta", "Jockey Club II (v1.00, older hardware)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/kinst.cpp b/src/mame/drivers/kinst.cpp
index 69b198b2b00..fd03c272bff 100644
--- a/src/mame/drivers/kinst.cpp
+++ b/src/mame/drivers/kinst.cpp
@@ -354,7 +354,7 @@ void kinst_state::device_timer(emu_timer &timer, device_timer_id id, int param,
m_maincpu->set_input_line(0, CLEAR_LINE);
break;
default:
- assert_always(false, "Unknown id in kinst_state::device_timer");
+ throw emu_fatalerror("Unknown id in kinst_state::device_timer");
}
}
diff --git a/src/mame/drivers/laserbat.cpp b/src/mame/drivers/laserbat.cpp
index e0ae530cfe0..ecf2b427351 100644
--- a/src/mame/drivers/laserbat.cpp
+++ b/src/mame/drivers/laserbat.cpp
@@ -457,7 +457,7 @@ void laserbat_state_base::device_timer(emu_timer &timer, device_timer_id id, int
video_line(ptr, param);
break;
default:
- assert_always(false, "Unknown id in laserbat_state_base::device_timer");
+ throw emu_fatalerror("Unknown id in laserbat_state_base::device_timer");
}
}
diff --git a/src/mame/drivers/m10.cpp b/src/mame/drivers/m10.cpp
index 1ad63866911..e7abdf087f7 100644
--- a/src/mame/drivers/m10.cpp
+++ b/src/mame/drivers/m10.cpp
@@ -488,7 +488,7 @@ void m10_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
interrupt_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in m10_state::device_timer");
+ throw emu_fatalerror("Unknown id in m10_state::device_timer");
}
}
diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp
index 242de177330..7810c6bbbfb 100644
--- a/src/mame/drivers/mekd2.cpp
+++ b/src/mame/drivers/mekd2.cpp
@@ -211,7 +211,7 @@ void mekd2_state::device_timer(emu_timer &timer, device_timer_id id, int param,
m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
break;
default:
- assert_always(false, "Unknown id in mekd2_state::device_timer");
+ throw emu_fatalerror("Unknown id in mekd2_state::device_timer");
}
}
diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp
index 41600286900..82c18c784ee 100644
--- a/src/mame/drivers/metro.cpp
+++ b/src/mame/drivers/metro.cpp
@@ -207,7 +207,7 @@ void metro_state::device_timer(emu_timer &timer, device_timer_id id, int param,
update_irq_state();
break;
default:
- assert_always(false, "Unknown id in metro_state::device_timer");
+ throw emu_fatalerror("Unknown id in metro_state::device_timer");
}
}
diff --git a/src/mame/drivers/mgolf.cpp b/src/mame/drivers/mgolf.cpp
index a04d2c47e9e..54bf8ac3854 100644
--- a/src/mame/drivers/mgolf.cpp
+++ b/src/mame/drivers/mgolf.cpp
@@ -154,7 +154,7 @@ void mgolf_state::device_timer(emu_timer &timer, device_timer_id id, int param,
interrupt_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in mgolf_state::device_timer");
+ throw emu_fatalerror("Unknown id in mgolf_state::device_timer");
}
}
diff --git a/src/mame/drivers/mjsister.cpp b/src/mame/drivers/mjsister.cpp
index 37a2378a550..8ce399fdefd 100644
--- a/src/mame/drivers/mjsister.cpp
+++ b/src/mame/drivers/mjsister.cpp
@@ -212,7 +212,7 @@ void mjsister_state::device_timer(emu_timer &timer, device_timer_id id, int para
dac_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in mjsister_state::device_timer");
+ throw emu_fatalerror("Unknown id in mjsister_state::device_timer");
}
}
diff --git a/src/mame/drivers/mlanding.cpp b/src/mame/drivers/mlanding.cpp
index 4dfb1572506..b4d53d3f304 100644
--- a/src/mame/drivers/mlanding.cpp
+++ b/src/mame/drivers/mlanding.cpp
@@ -425,12 +425,12 @@ void mlanding_state::device_timer(emu_timer &timer, device_timer_id id, int para
{
switch (id)
{
- case TIMER_DMA_COMPLETE:
- m_dma_busy = 0;
- break;
+ case TIMER_DMA_COMPLETE:
+ m_dma_busy = 0;
+ break;
- default:
- assert_always(false, "Unknown id in mlanding_state::device_timer");
+ default:
+ throw emu_fatalerror("Unknown id in mlanding_state::device_timer");
}
}
diff --git a/src/mame/drivers/nightmare.cpp b/src/mame/drivers/nightmare.cpp
index e3b89a4614d..5ec73035356 100644
--- a/src/mame/drivers/nightmare.cpp
+++ b/src/mame/drivers/nightmare.cpp
@@ -271,7 +271,7 @@ void nightmare_state::device_timer(emu_timer &timer, device_timer_id id, int par
m_reset = 1;
break;
default:
- assert_always(false, "Unknown id in nightmare_state::device_timer");
+ throw emu_fatalerror("Unknown id in nightmare_state::device_timer");
}
}
diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp
index e1936339928..26141e200cc 100644
--- a/src/mame/drivers/notetaker.cpp
+++ b/src/mame/drivers/notetaker.cpp
@@ -251,7 +251,7 @@ void notetaker_state::device_timer(emu_timer &timer, device_timer_id id, int par
timer_fifoclk(ptr, param);
break;
default:
- assert_always(false, "Unknown id in notetaker_state::device_timer");
+ throw emu_fatalerror("Unknown id in notetaker_state::device_timer");
}
}
diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp
index a12bee1167d..8ea2f8b31d5 100644
--- a/src/mame/drivers/okean240.cpp
+++ b/src/mame/drivers/okean240.cpp
@@ -414,7 +414,7 @@ void okean240_state::device_timer(emu_timer &timer, device_timer_id id, int para
membank("boot")->set_entry(0);
break;
default:
- assert_always(false, "Unknown id in okean240_state::device_timer");
+ throw emu_fatalerror("Unknown id in okean240_state::device_timer");
}
}
diff --git a/src/mame/drivers/osi.cpp b/src/mame/drivers/osi.cpp
index 2b89d4f3811..cbef219c645 100644
--- a/src/mame/drivers/osi.cpp
+++ b/src/mame/drivers/osi.cpp
@@ -918,7 +918,7 @@ void c1p_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
m_beeper->set_clock(300);
break;
default:
- assert_always(false, "Unknown id in sb2m600_state::device_timer");
+ throw emu_fatalerror("Unknown id in c1p_state::device_timer");
}
}
diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp
index a79d49cda8d..f450fc04769 100644
--- a/src/mame/drivers/parodius.cpp
+++ b/src/mame/drivers/parodius.cpp
@@ -74,7 +74,7 @@ void parodius_state::device_timer(emu_timer &timer, device_timer_id id, int para
m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
break;
default:
- assert_always(false, "Unknown id in parodius_state::device_timer");
+ throw emu_fatalerror("Unknown id in parodius_state::device_timer");
}
}
diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp
index 7ddec08e2c1..aa590135464 100644
--- a/src/mame/drivers/pc88va.cpp
+++ b/src/mame/drivers/pc88va.cpp
@@ -404,7 +404,7 @@ void pc88va_state::device_timer(emu_timer &timer, device_timer_id id, int param,
pc88va_fdc_motor_start_1(ptr, param);
break;
default:
- assert_always(false, "Unknown id in pc88va_state::device_timer");
+ throw emu_fatalerror("Unknown id in pc88va_state::device_timer");
}
}
diff --git a/src/mame/drivers/pcfx.cpp b/src/mame/drivers/pcfx.cpp
index b478d2c5ebd..1a40a8a32a7 100644
--- a/src/mame/drivers/pcfx.cpp
+++ b/src/mame/drivers/pcfx.cpp
@@ -145,7 +145,7 @@ void pcfx_state::device_timer(emu_timer &timer, device_timer_id id, int param, v
pad_func(ptr, param);
break;
default:
- assert_always(false, "Unknown id in pcfx_state::device_timer");
+ throw emu_fatalerror("Unknown id in pcfx_state::device_timer");
}
}
diff --git a/src/mame/drivers/pentagon.cpp b/src/mame/drivers/pentagon.cpp
index d3ac8ce3d3a..83708376c0e 100644
--- a/src/mame/drivers/pentagon.cpp
+++ b/src/mame/drivers/pentagon.cpp
@@ -137,7 +137,7 @@ void pentagon_state::device_timer(emu_timer &timer, device_timer_id id, int para
irq_off(ptr, param);
break;
default:
- assert_always(false, "Unknown id in pentagon_state::device_timer");
+ throw emu_fatalerror("Unknown id in pentagon_state::device_timer");
}
}
diff --git a/src/mame/drivers/plan80.cpp b/src/mame/drivers/plan80.cpp
index b4678cafb24..73cb4580ebe 100644
--- a/src/mame/drivers/plan80.cpp
+++ b/src/mame/drivers/plan80.cpp
@@ -181,7 +181,7 @@ void plan80_state::device_timer(emu_timer &timer, device_timer_id id, int param,
membank("boot")->set_entry(0);
break;
default:
- assert_always(false, "Unknown id in plan80_state::device_timer");
+ throw emu_fatalerror("Unknown id in plan80_state::device_timer");
}
}
diff --git a/src/mame/drivers/ptcsol.cpp b/src/mame/drivers/ptcsol.cpp
index 3cb2478fb85..17f7a8055ce 100644
--- a/src/mame/drivers/ptcsol.cpp
+++ b/src/mame/drivers/ptcsol.cpp
@@ -250,7 +250,7 @@ void sol20_state::device_timer(emu_timer &timer, device_timer_id id, int param,
sol20_boot(ptr, param);
break;
default:
- assert_always(false, "Unknown id in sol20_state::device_timer");
+ throw emu_fatalerror("Unknown id in sol20_state::device_timer");
}
}
diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp
index e84e0781c59..ab112f18b34 100644
--- a/src/mame/drivers/rabbit.cpp
+++ b/src/mame/drivers/rabbit.cpp
@@ -590,7 +590,7 @@ void rabbit_state::device_timer(emu_timer &timer, device_timer_id id, int param,
m_maincpu->set_input_line(m_bltirqlevel, HOLD_LINE);
break;
default:
- assert_always(false, "Unknown id in rabbit_state::device_timer");
+ throw emu_fatalerror("Unknown id in rabbit_state::device_timer");
}
}
diff --git a/src/mame/drivers/rollerg.cpp b/src/mame/drivers/rollerg.cpp
index 528994e61a0..b6aefa297eb 100644
--- a/src/mame/drivers/rollerg.cpp
+++ b/src/mame/drivers/rollerg.cpp
@@ -62,7 +62,7 @@ void rollerg_state::device_timer(emu_timer &timer, device_timer_id id, int param
m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
break;
default:
- assert_always(false, "Unknown id in rollerg_state::device_timer");
+ throw emu_fatalerror("Unknown id in rollerg_state::device_timer");
}
}
diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp
index 4b7ae972852..9f6d677dccf 100644
--- a/src/mame/drivers/samcoupe.cpp
+++ b/src/mame/drivers/samcoupe.cpp
@@ -65,7 +65,7 @@ void samcoupe_state::device_timer(emu_timer &timer, device_timer_id id, int para
sam_video_update_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in samcoupe_state::device_timer");
+ throw emu_fatalerror("Unknown id in samcoupe_state::device_timer");
}
}
diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp
index b17c0975289..e108111ee1c 100644
--- a/src/mame/drivers/segaorun.cpp
+++ b/src/mame/drivers/segaorun.cpp
@@ -605,7 +605,7 @@ void segaorun_state::device_timer(emu_timer &timer, device_timer_id id, int para
}
default:
- assert_always(false, "Unknown id in segaorun_state::device_timer");
+ throw emu_fatalerror("Unknown id in segaorun_state::device_timer");
}
}
diff --git a/src/mame/drivers/simpsons.cpp b/src/mame/drivers/simpsons.cpp
index 33c3b1ae671..172ef67ad3f 100644
--- a/src/mame/drivers/simpsons.cpp
+++ b/src/mame/drivers/simpsons.cpp
@@ -178,7 +178,7 @@ void simpsons_state::device_timer(emu_timer &timer, device_timer_id id, int para
m_maincpu->set_input_line(KONAMI_FIRQ_LINE, HOLD_LINE);
break;
default:
- assert_always(false, "Unknown id in simpsons_state::device_timer");
+ throw emu_fatalerror("Unknown id in simpsons_state::device_timer");
}
}
diff --git a/src/mame/drivers/slapshot.cpp b/src/mame/drivers/slapshot.cpp
index 280c547b272..f9c0708d87a 100644
--- a/src/mame/drivers/slapshot.cpp
+++ b/src/mame/drivers/slapshot.cpp
@@ -157,7 +157,7 @@ void slapshot_state::device_timer(emu_timer &timer, device_timer_id id, int para
m_maincpu->set_input_line(6, HOLD_LINE);
break;
default:
- assert_always(false, "Unknown id in slapshot_state::device_timer");
+ throw emu_fatalerror("Unknown id in slapshot_state::device_timer");
}
}
diff --git a/src/mame/drivers/socrates.cpp b/src/mame/drivers/socrates.cpp
index 78a5a1b64df..3ea5d4d7c64 100644
--- a/src/mame/drivers/socrates.cpp
+++ b/src/mame/drivers/socrates.cpp
@@ -399,7 +399,7 @@ void socrates_state::device_timer(emu_timer &timer, device_timer_id id, int para
clear_irq_cb(ptr, param);
break;
default:
- assert_always(false, "Unknown id in socrates_state::device_timer");
+ throw emu_fatalerror("Unknown id in socrates_state::device_timer");
}
}
diff --git a/src/mame/drivers/spacefb.cpp b/src/mame/drivers/spacefb.cpp
index 6049b8876a3..fb22b3b12a7 100644
--- a/src/mame/drivers/spacefb.cpp
+++ b/src/mame/drivers/spacefb.cpp
@@ -136,7 +136,7 @@ void spacefb_state::device_timer(emu_timer &timer, device_timer_id id, int param
interrupt_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in spacefb_state::device_timer");
+ throw emu_fatalerror("Unknown id in spacefb_state::device_timer");
}
}
diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp
index c3c496109dc..a59235f7904 100644
--- a/src/mame/drivers/spectrum.cpp
+++ b/src/mame/drivers/spectrum.cpp
@@ -689,7 +689,7 @@ void spectrum_state::device_timer(emu_timer &timer, device_timer_id id, int para
spectrum_UpdateScreenBitmap();
break;
default:
- assert_always(false, "Unknown id in spectrum_state::device_timer");
+ throw emu_fatalerror("Unknown id in spectrum_state::device_timer");
}
}
diff --git a/src/mame/drivers/sprint4.cpp b/src/mame/drivers/sprint4.cpp
index 21a43489004..04199682982 100644
--- a/src/mame/drivers/sprint4.cpp
+++ b/src/mame/drivers/sprint4.cpp
@@ -51,7 +51,7 @@ void sprint4_state::device_timer(emu_timer &timer, device_timer_id id, int param
nmi_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in sprint4_state::device_timer");
+ throw emu_fatalerror("Unknown id in sprint4_state::device_timer");
}
}
diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp
index af132f2be56..f685584eb22 100644
--- a/src/mame/drivers/swyft.cpp
+++ b/src/mame/drivers/swyft.cpp
@@ -326,6 +326,11 @@ public:
void swyft(machine_config &config);
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+ virtual void video_start() override;
+
private:
required_device<m68008_device> m_maincpu;
optional_device<centronics_device> m_ctx;
@@ -344,10 +349,6 @@ private:
optional_ioport m_y6;
optional_ioport m_y7;*/
- DECLARE_MACHINE_START(swyft);
- DECLARE_MACHINE_RESET(swyft);
- DECLARE_VIDEO_START(swyft);
-
uint32_t screen_update_swyft(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_READ8_MEMBER(bitlatch_r);
@@ -577,7 +578,7 @@ void swyft_state::swyft_mem(address_map &map)
map(0x0e4000, 0x0e4fff).rw(FUNC(swyft_state::swyft_via1_r), FUNC(swyft_state::swyft_via1_w));
}
-MACHINE_START_MEMBER(swyft_state,swyft)
+void swyft_state::machine_start()
{
for (auto &via : m_via)
{
@@ -588,11 +589,11 @@ MACHINE_START_MEMBER(swyft_state,swyft)
}
}
-MACHINE_RESET_MEMBER(swyft_state,swyft)
+void swyft_state::machine_reset()
{
}
-VIDEO_START_MEMBER(swyft_state,swyft)
+void swyft_state::video_start()
{
}
@@ -757,10 +758,6 @@ void swyft_state::swyft(machine_config &config)
M68008(config, m_maincpu, XTAL(15'897'600)/2); //MC68008P8, Y1=15.8976Mhz, clock GUESSED at Y1 / 2
m_maincpu->set_addrmap(AS_PROGRAM, &swyft_state::swyft_mem);
- MCFG_MACHINE_START_OVERRIDE(swyft_state,swyft)
- MCFG_MACHINE_RESET_OVERRIDE(swyft_state,swyft)
- MCFG_VIDEO_START_OVERRIDE(swyft_state,swyft)
-
/* video hardware */
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
screen.set_raw(15.8976_MHz_XTAL / 2, 500, 0, 320, 265, 0, 242); // total guess
diff --git a/src/mame/drivers/symbolics.cpp b/src/mame/drivers/symbolics.cpp
index f5460953f9c..70680a78de1 100644
--- a/src/mame/drivers/symbolics.cpp
+++ b/src/mame/drivers/symbolics.cpp
@@ -289,7 +289,7 @@ INPUT_PORTS_END
outfifo_read_cb(ptr, param);
break;
default:
- assert_always(false, "Unknown id in symbolics_state::device_timer");
+ throw emu_fatalerror("Unknown id in symbolics_state::device_timer");
}
}
diff --git a/src/mame/drivers/sys2900.cpp b/src/mame/drivers/sys2900.cpp
index b4d27a20a64..8e5c8fa390d 100644
--- a/src/mame/drivers/sys2900.cpp
+++ b/src/mame/drivers/sys2900.cpp
@@ -116,7 +116,7 @@ void sys2900_state::device_timer(emu_timer &timer, device_timer_id id, int param
membank("boot")->set_entry(0);
break;
default:
- assert_always(false, "Unknown id in sys2900_state::device_timer");
+ throw emu_fatalerror("Unknown id in sys2900_state::device_timer");
}
}
diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp
index 5fdd5257d23..9e5964ede5f 100644
--- a/src/mame/drivers/taito_f2.cpp
+++ b/src/mame/drivers/taito_f2.cpp
@@ -537,7 +537,7 @@ void taitof2_state::device_timer(emu_timer &timer, device_timer_id id, int param
m_maincpu->set_input_line(6, HOLD_LINE);
break;
default:
- assert_always(false, "Unknown id in taitof2_state::device_timer");
+ throw emu_fatalerror("Unknown id in taitof2_state::device_timer");
}
}
diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp
index c867b19e8f8..6af1a3dd60c 100644
--- a/src/mame/drivers/taito_f3.cpp
+++ b/src/mame/drivers/taito_f3.cpp
@@ -432,7 +432,7 @@ void taito_f3_state::device_timer(emu_timer &timer, device_timer_id id, int para
m_maincpu->set_input_line(3, HOLD_LINE); // some signal from video hardware?
break;
default:
- assert_always(false, "Unknown id in taito_f3_state::device_timer");
+ throw emu_fatalerror("Unknown id in taito_f3_state::device_timer");
}
}
diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp
index cc024428558..ea00979d01c 100644
--- a/src/mame/drivers/taito_z.cpp
+++ b/src/mame/drivers/taito_z.cpp
@@ -1330,7 +1330,7 @@ void taitoz_state::device_timer(emu_timer &timer, device_timer_id id, int param,
m_maincpu->set_input_line(6, HOLD_LINE);
break;
default:
- assert_always(false, "Unknown id in taitoz_state::device_timer");
+ throw emu_fatalerror("Unknown id in taitoz_state::device_timer");
}
}
diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp
index f14ac0b5601..d7270c31dd7 100644
--- a/src/mame/drivers/tehkanwc.cpp
+++ b/src/mame/drivers/tehkanwc.cpp
@@ -169,7 +169,7 @@ void tehkanwc_state::device_timer(emu_timer &timer, device_timer_id id, int para
m_audiocpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
break;
default:
- assert_always(false, "Unknown id in tehkanwc_state::device_timer");
+ throw emu_fatalerror("Unknown id in tehkanwc_state::device_timer");
}
}
diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp
index b0c9c7d7f76..fc1e2ea4ece 100644
--- a/src/mame/drivers/thayers.cpp
+++ b/src/mame/drivers/thayers.cpp
@@ -133,7 +133,7 @@ void thayers_state::device_timer(emu_timer &timer, device_timer_id id, int param
check_interrupt();
break;
default:
- assert_always(false, "Unknown id in thayers_state::device_timer");
+ throw emu_fatalerror("Unknown id in thayers_state::device_timer");
}
}
diff --git a/src/mame/drivers/thunderx.cpp b/src/mame/drivers/thunderx.cpp
index 0358d968d0a..9f50f97de8a 100644
--- a/src/mame/drivers/thunderx.cpp
+++ b/src/mame/drivers/thunderx.cpp
@@ -42,6 +42,9 @@
#include "sound/ym2151.h"
#include "speaker.h"
+//#define VERBOSE 1
+#include "logmacro.h"
+
void thunderx_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
@@ -51,12 +54,10 @@ void thunderx_state::device_timer(emu_timer &timer, device_timer_id id, int para
m_maincpu->set_input_line(KONAMI_FIRQ_LINE, HOLD_LINE);
break;
default:
- assert_always(false, "Unknown id in thunderx_state::device_timer");
+ throw emu_fatalerror("Unknown id in thunderx_state::device_timer");
}
}
-#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
#define PMC_BK (m_1f98_latch & 0x02)
READ8_MEMBER(thunderx_state::pmc_r)
@@ -68,7 +69,7 @@ READ8_MEMBER(thunderx_state::pmc_r)
}
else
{
- LOG(("%04x read pmc internal ram %04x\n",m_audiocpu->pc(),offset));
+ LOG("%04x read pmc internal ram %04x\n",m_audiocpu->pc(),offset);
return 0;
}
}
@@ -77,12 +78,12 @@ WRITE8_MEMBER(thunderx_state::pmc_w)
{
if (PMC_BK)
{
- LOG(("%04x pmcram %04x = %02x\n",m_audiocpu->pc(),offset,data));
+ LOG("%04x pmcram %04x = %02x\n",m_audiocpu->pc(),offset,data);
m_pmcram[offset] = data;
}
else
{
- LOG(("%04x pmc internal ram %04x = %02x\n",m_audiocpu->pc(),offset,data));
+ LOG("%04x pmc internal ram %04x = %02x\n",m_audiocpu->pc(),offset,data);
}
}
diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp
index 48698080c09..94a9543181b 100644
--- a/src/mame/drivers/tickee.cpp
+++ b/src/mame/drivers/tickee.cpp
@@ -147,7 +147,7 @@ void tickee_state::device_timer(emu_timer &timer, device_timer_id id, int param,
setup_gun_interrupts(ptr, param);
break;
default:
- assert_always(false, "Unknown id in tickee_state::device_timer");
+ throw emu_fatalerror("Unknown id in tickee_state::device_timer");
}
}
diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp
index bea8a3a837c..48ae70db106 100644
--- a/src/mame/drivers/tmc1800.cpp
+++ b/src/mame/drivers/tmc1800.cpp
@@ -932,7 +932,7 @@ void tmc1800_state::device_timer(emu_timer &timer, device_timer_id id, int param
m_beeper->set_clock(0);
break;
default:
- assert_always(false, "Unknown id in tmc1800_state::device_timer");
+ throw emu_fatalerror("Unknown id in tmc1800_state::device_timer");
}
}
diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp
index c6491d387da..271ec6a9d97 100644
--- a/src/mame/drivers/tmnt.cpp
+++ b/src/mame/drivers/tmnt.cpp
@@ -268,7 +268,7 @@ void tmnt_state::device_timer(emu_timer &timer, device_timer_id id, int param, v
m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
break;
default:
- assert_always(false, "Unknown id in tmnt_state::device_timer");
+ throw emu_fatalerror("Unknown id in tmnt_state::device_timer");
}
}
diff --git a/src/mame/drivers/trucocl.cpp b/src/mame/drivers/trucocl.cpp
index 94735cdf7f5..b41f03821a4 100644
--- a/src/mame/drivers/trucocl.cpp
+++ b/src/mame/drivers/trucocl.cpp
@@ -59,7 +59,7 @@ void trucocl_state::device_timer(emu_timer &timer, device_timer_id id, int param
m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
break;
default:
- assert_always(false, "Unknown id in trucocl_state::device_timer");
+ throw emu_fatalerror("Unknown id in trucocl_state::device_timer");
}
}
diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp
index f0fd25ade8a..0796a90ba95 100644
--- a/src/mame/drivers/tubep.cpp
+++ b/src/mame/drivers/tubep.cpp
@@ -261,7 +261,7 @@ void tubep_state::device_timer(emu_timer &timer, device_timer_id id, int param,
rjammer_scanline_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in tubep_state::device_timer");
+ throw emu_fatalerror("Unknown id in tubep_state::device_timer");
}
}
diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp
index 93e6e1863d6..aca5d649683 100644
--- a/src/mame/drivers/tugboat.cpp
+++ b/src/mame/drivers/tugboat.cpp
@@ -221,7 +221,7 @@ void tugboat_state::device_timer(emu_timer &timer, device_timer_id id, int param
m_interrupt_timer->adjust(m_screen->frame_period());
break;
default:
- assert_always(false, "Unknown id in tugboat_state::device_timer");
+ throw emu_fatalerror("Unknown id in tugboat_state::device_timer");
}
}
diff --git a/src/mame/drivers/ultratnk.cpp b/src/mame/drivers/ultratnk.cpp
index b4fae269996..d3cf768e5b0 100644
--- a/src/mame/drivers/ultratnk.cpp
+++ b/src/mame/drivers/ultratnk.cpp
@@ -56,7 +56,7 @@ void ultratnk_state::device_timer(emu_timer &timer, device_timer_id id, int para
nmi_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in ultratnk_state::device_timer");
+ throw emu_fatalerror("Unknown id in ultratnk_state::device_timer");
}
}
diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp
index 13e92abd15e..1fa59a8173f 100644
--- a/src/mame/drivers/vegaeo.cpp
+++ b/src/mame/drivers/vegaeo.cpp
@@ -37,6 +37,9 @@ public:
void init_vegaeo();
+protected:
+ void video_start() override;
+
private:
required_device<generic_latch_8_device> m_soundlatch;
required_ioport m_system_io;
@@ -52,8 +55,6 @@ private:
DECLARE_WRITE8_MEMBER(qs1000_p2_w);
DECLARE_WRITE8_MEMBER(qs1000_p3_w);
- DECLARE_VIDEO_START(vega);
-
uint32_t screen_update_vega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void vega_map(address_map &map);
};
@@ -153,7 +154,7 @@ static INPUT_PORTS_START( crazywar )
INPUT_PORTS_END
-VIDEO_START_MEMBER(vegaeo_state,vega)
+void vegaeo_state::video_start()
{
m_vram = std::make_unique<uint8_t[]>(0x14000*2);
save_pointer(NAME(m_vram), 0x14000*2);
@@ -192,8 +193,6 @@ void vegaeo_state::vega(machine_config &config)
PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 256);
m_palette->set_membits(16);
- MCFG_VIDEO_START_OVERRIDE(vegaeo_state,vega)
-
/* sound hardware */
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp
index 79dbe54f851..1fbbff36241 100644
--- a/src/mame/drivers/vendetta.cpp
+++ b/src/mame/drivers/vendetta.cpp
@@ -173,7 +173,7 @@ void vendetta_state::device_timer(emu_timer &timer, device_timer_id id, int para
m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
break;
default:
- assert_always(false, "Unknown id in vendetta_state::device_timer");
+ throw emu_fatalerror("Unknown id in vendetta_state::device_timer");
}
}
diff --git a/src/mame/drivers/videopin.cpp b/src/mame/drivers/videopin.cpp
index e93c6154ac8..d10b44855bf 100644
--- a/src/mame/drivers/videopin.cpp
+++ b/src/mame/drivers/videopin.cpp
@@ -57,7 +57,7 @@ void videopin_state::device_timer(emu_timer &timer, device_timer_id id, int para
interrupt_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in videopin_state::device_timer");
+ throw emu_fatalerror("Unknown id in videopin_state::device_timer");
}
}
diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp
index 45dfbfe6e99..4e536d2988c 100644
--- a/src/mame/drivers/videopkr.cpp
+++ b/src/mame/drivers/videopkr.cpp
@@ -316,11 +316,11 @@ public:
, m_lamps(*this, "lamp%u", 0U)
{ }
- void babypkr(machine_config &config);
- void videodad(machine_config &config);
void videopkr(machine_config &config);
- void fortune1(machine_config &config);
void blckjack(machine_config &config);
+ void videodad(machine_config &config);
+ void babypkr(machine_config &config);
+ void fortune1(machine_config &config);
void bpoker(machine_config &config);
private:
@@ -1339,6 +1339,7 @@ void videopkr_state::fortune1(machine_config &config)
void videopkr_state::bpoker(machine_config &config)
{
babypkr(config);
+
i8751_device &maincpu(I8751(config.replace(), m_maincpu, XTAL(6'000'000)));
maincpu.set_addrmap(AS_PROGRAM, &videopkr_state::i8751_map);
maincpu.set_addrmap(AS_IO, &videopkr_state::i8751_io_port);
diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp
index 98daff46239..95ed5aaa601 100644
--- a/src/mame/drivers/vk100.cpp
+++ b/src/mame/drivers/vk100.cpp
@@ -342,7 +342,7 @@ void vk100_state::device_timer(emu_timer &timer, device_timer_id id, int param,
execute_vg(ptr, param);
break;
default:
- assert_always(false, "Unknown id in vk100_state::device_timer");
+ throw emu_fatalerror("Unknown id in vk100_state::device_timer");
}
}
diff --git a/src/mame/drivers/wgp.cpp b/src/mame/drivers/wgp.cpp
index 9bfe2c258c5..e60d4adf1ea 100644
--- a/src/mame/drivers/wgp.cpp
+++ b/src/mame/drivers/wgp.cpp
@@ -450,7 +450,7 @@ void wgp_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
m_subcpu->set_input_line(6, HOLD_LINE); /* assumes Z80 sandwiched between the 68Ks */
break;
default:
- assert_always(false, "Unknown id in wgp_state::device_timer");
+ throw emu_fatalerror("Unknown id in wgp_state::device_timer");
}
}
diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp
index 21d6d76776d..29364110e13 100644
--- a/src/mame/drivers/wolfpack.cpp
+++ b/src/mame/drivers/wolfpack.cpp
@@ -22,7 +22,7 @@ void wolfpack_state::device_timer(emu_timer &timer, device_timer_id id, int para
periodic_callback(ptr, param);
break;
default:
- assert_always(false, "Unknown id in wolfpack_state::device_timer");
+ throw emu_fatalerror("Unknown id in wolfpack_state::device_timer");
}
}
diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp
index 999024d83ce..fe379981f14 100644
--- a/src/mame/drivers/x1.cpp
+++ b/src/mame/drivers/x1.cpp
@@ -2153,7 +2153,7 @@ static const gfx_layout x1_pcg_8x8 =
8*8
};
-MACHINE_START_MEMBER(x1_state,x1)
+void x1_state::machine_start()
{
/* set up RTC */
{
@@ -2217,7 +2217,6 @@ void x1_state::x1(machine_config &config)
ppi.out_pb_callback().set(FUNC(x1_state::x1_portb_w));
ppi.out_pc_callback().set(FUNC(x1_state::x1_portc_w));
- MCFG_MACHINE_START_OVERRIDE(x1_state,x1)
MCFG_MACHINE_RESET_OVERRIDE(x1_state,x1)
/* video hardware */
@@ -2237,8 +2236,6 @@ void x1_state::x1(machine_config &config)
GFXDECODE(config, m_gfxdecode, m_palette, gfx_x1);
- MCFG_VIDEO_START_OVERRIDE(x1_state,x1)
-
MB8877(config, m_fdc, MAIN_CLOCK / 16);
// TODO: guesswork, try to implicitly start the motor
m_fdc->hld_wr_callback().set(FUNC(x1_state::hdl_w));
diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp
index 056201271c3..b0a07189520 100644
--- a/src/mame/drivers/x1twin.cpp
+++ b/src/mame/drivers/x1twin.cpp
@@ -436,7 +436,6 @@ void x1twin_state::x1twin(machine_config &config)
ppi.out_pb_callback().set(FUNC(x1_state::x1_portb_w));
ppi.out_pc_callback().set(FUNC(x1_state::x1_portc_w));
- MCFG_MACHINE_START_OVERRIDE(x1twin_state,x1)
MCFG_MACHINE_RESET_OVERRIDE(x1twin_state,x1)
#if 0
@@ -475,8 +474,6 @@ void x1twin_state::x1twin(machine_config &config)
GFXDECODE(config, m_gfxdecode, m_palette, gfx_x1);
- MCFG_VIDEO_START_OVERRIDE(x1twin_state,x1)
-
MB8877(config, m_fdc, MAIN_CLOCK / 16);
// TODO: guesswork, try to implicitly start the motor
m_fdc->hld_wr_callback().set(FUNC(x1_state::hdl_w));
diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp
index 813c15760be..8478428a4c8 100644
--- a/src/mame/drivers/x68k.cpp
+++ b/src/mame/drivers/x68k.cpp
@@ -175,7 +175,7 @@ void x68k_state::device_timer(emu_timer &timer, device_timer_id id, int param, v
m_hd63450->drq3_w(0);
break;
default:
- assert_always(false, "Unknown id in x68k_state::device_timer");
+ throw emu_fatalerror("Unknown id in x68k_state::device_timer");
}
}
diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp
index b8c03b1e6d2..f008e38453f 100644
--- a/src/mame/drivers/zrt80.cpp
+++ b/src/mame/drivers/zrt80.cpp
@@ -86,7 +86,7 @@ void zrt80_state::device_timer(emu_timer &timer, device_timer_id id, int param,
m_beep->set_state(0);
break;
default:
- assert_always(false, "Unknown id in zrt80_state::device_timer");
+ throw emu_fatalerror("Unknown id in zrt80_state::device_timer");
}
}