summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-06-29 23:59:26 +1000
committer Vas Crabb <vas@vastheman.com>2018-06-29 23:59:26 +1000
commitf369cf9945ca7b1fea6c47dc88247431f0681b93 (patch)
treee9c777ef26c8699bd246a5976d62208e750f8f93
parent94635c5ca0e4a1f4c0dcf438e589aba9071db5a5 (diff)
misc cleanup (nw)
-rw-r--r--src/mame/drivers/ddenlovr.cpp38
-rw-r--r--src/mame/drivers/dynax.cpp96
-rw-r--r--src/mame/drivers/fidelz80.cpp2
-rw-r--r--src/mame/drivers/guab.cpp4
-rw-r--r--src/mame/drivers/hp16500.cpp6
-rw-r--r--src/mame/drivers/hp9845.cpp44
-rw-r--r--src/mame/drivers/pimps.cpp4
-rw-r--r--src/mame/drivers/qx10.cpp4
-rw-r--r--src/mame/drivers/royalmah.cpp7
-rw-r--r--src/mame/drivers/videopkr.cpp4
-rw-r--r--src/mame/includes/capbowl.h7
-rw-r--r--src/mame/includes/cgc7900.h46
-rw-r--r--src/mame/includes/divebomb.h11
-rw-r--r--src/mame/includes/dynax.h10
-rw-r--r--src/mame/includes/hnayayoi.h14
-rw-r--r--src/mame/includes/hp9845.h6
-rw-r--r--src/mame/includes/nemesis.h13
-rw-r--r--src/mame/includes/pandoras.h13
-rw-r--r--src/mame/includes/runaway.h6
-rw-r--r--src/mame/includes/splash.h31
-rw-r--r--src/mame/machine/ms7004.cpp2
-rw-r--r--src/mame/video/dynax_blitter_rev2.h4
22 files changed, 213 insertions, 159 deletions
diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp
index 04187ea3bd7..f2594ab4691 100644
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@@ -4306,7 +4306,7 @@ WRITE8_MEMBER(ddenlovr_state::htengoku_blit_romregion_w)
void ddenlovr_state::htengoku_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x01, 0x07).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
+ map(0x01, 0x07).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
map(0x20, 0x20).w(FUNC(ddenlovr_state::htengoku_select_w)); // Controls
map(0x21, 0x21).w(FUNC(ddenlovr_state::htengoku_coin_w)); //
map(0x22, 0x22).r(FUNC(ddenlovr_state::htengoku_coin_r)); //
@@ -4329,7 +4329,7 @@ void ddenlovr_state::htengoku_io_map(address_map &map)
map(0xc0, 0xc0).w(FUNC(ddenlovr_state::dynax_extra_scrollx_w)); // screen scroll X
map(0xc1, 0xc1).w(FUNC(ddenlovr_state::dynax_extra_scrolly_w)); // screen scroll Y
map(0xc3, 0xc3).w(FUNC(ddenlovr_state::dynax_vblank_ack_w)); // VBlank IRQ Ack
- map(0xc4, 0xc4).w("blitter", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
+ map(0xc4, 0xc4).w(m_blitter, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
map(0xc5, 0xc5).w(FUNC(ddenlovr_state::dynax_blit_dest_w)); // Destination Layer
map(0xc6, 0xc6).w(FUNC(ddenlovr_state::htengoku_blit_romregion_w)); // Blitter ROM bank
map(0xe0, 0xe7).w(m_mainlatch, FUNC(ls259_device::write_d1));
@@ -4382,7 +4382,7 @@ MACHINE_CONFIG_START(ddenlovr_state::htengoku)
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, dynax_state, blitter_ack_w)) // Blitter IRQ Ack
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(512, 256)
@@ -4392,7 +4392,7 @@ MACHINE_CONFIG_START(ddenlovr_state::htengoku)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddenlovr_state, sprtmtch_vblank_w))
- MCFG_DEVICE_ADD("blitter", DYNAX_BLITTER_REV2, 0)
+ MCFG_DEVICE_ADD(m_blitter, DYNAX_BLITTER_REV2, 0)
MCFG_DYNAX_BLITTER_REV2_VRAM_OUT_CB(WRITE8(*this, dynax_state, hnoridur_blit_pixel_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLX_CB(WRITE8(*this, dynax_state, dynax_blit_scrollx_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLY_CB(WRITE8(*this, dynax_state, dynax_blit_scrolly_w))
@@ -9731,7 +9731,7 @@ MACHINE_CONFIG_START(ddenlovr_state::ddenlovr)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(336, 256)
@@ -9948,7 +9948,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mmpanic)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(336, 256+22)
@@ -10036,7 +10036,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hanakanz)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(336, 256+22)
@@ -10083,7 +10083,7 @@ MACHINE_CONFIG_START(ddenlovr_state::kotbinyo)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60.1656) // HSync 15.1015kHz
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(336, 256+22)
@@ -10208,7 +10208,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjschuka)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(336, 256+22)
@@ -10260,7 +10260,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyster)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(mjmyster_map)
MCFG_DEVICE_IO_MAP(mjmyster_portmap)
- MCFG_TMPZ84C015_IN_PA_CB(NOOP)
+ MCFG_TMPZ84C015_IN_PA_CB(CONSTANT(0))
MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, mjmyster_rambank_w))
MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mmpanic_rombank_w))
@@ -10298,7 +10298,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hginga)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(hginga_map)
MCFG_DEVICE_IO_MAP(hginga_portmap)
- MCFG_TMPZ84C015_IN_PA_CB(NOOP)
+ MCFG_TMPZ84C015_IN_PA_CB(CONSTANT(0))
MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, mjmyster_rambank_w))
MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, hginga_rombank_w))
@@ -10325,7 +10325,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hgokou)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(hgokou_map)
MCFG_DEVICE_IO_MAP(hgokou_portmap)
- MCFG_TMPZ84C015_IN_PA_CB(NOOP)
+ MCFG_TMPZ84C015_IN_PA_CB(CONSTANT(0))
MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, mjmyster_rambank_w))
MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, hginga_rombank_w))
@@ -10371,7 +10371,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyuniv)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(mjmyster_map)
MCFG_DEVICE_IO_MAP(mjmyster_portmap)
- MCFG_TMPZ84C015_IN_PA_CB(NOOP)
+ MCFG_TMPZ84C015_IN_PA_CB(CONSTANT(0))
MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, mjmyster_rambank_w))
MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mmpanic_rombank_w))
@@ -10397,7 +10397,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyornt)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(quizchq_map)
MCFG_DEVICE_IO_MAP(mjmyster_portmap)
- MCFG_TMPZ84C015_IN_PA_CB(NOOP)
+ MCFG_TMPZ84C015_IN_PA_CB(CONSTANT(0))
MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, mjmyster_rambank_w))
MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mmpanic_rombank_w))
@@ -10501,7 +10501,7 @@ MACHINE_CONFIG_START(ddenlovr_state::jongtei)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(336, 256)
@@ -10558,7 +10558,7 @@ MACHINE_CONFIG_START(ddenlovr_state::sryudens)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60.8532) // VSync 60.8532Hz, HSync 15.2790kHz
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(336, 256+22)
@@ -10609,7 +10609,7 @@ MACHINE_CONFIG_START(ddenlovr_state::janshinp)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60.8532) // VSync 60.8532Hz, HSync 15.2790kHz ?
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(336, 256+22)
@@ -10681,7 +10681,7 @@ MACHINE_CONFIG_START(ddenlovr_state::seljan2)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60.8532) // VSync 60.8532Hz, HSync 15.2790kHz ?
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(336, 256+22)
@@ -10733,7 +10733,7 @@ MACHINE_CONFIG_START(ddenlovr_state::daimyojn)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(59.7922) // HSync 15.4248kHz
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(336, 256+22)
diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp
index 245ccd85752..9fadb6e3b8d 100644
--- a/src/mame/drivers/dynax.cpp
+++ b/src/mame/drivers/dynax.cpp
@@ -487,7 +487,7 @@ void dynax_state::hanamai_io_map(address_map &map)
map.global_mask(0xff);
map(0x00, 0x00).w(FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X
map(0x20, 0x20).w(FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y
- map(0x41, 0x47).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
+ map(0x41, 0x47).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
map(0x50, 0x50).w(FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select hnkochou only
map(0x60, 0x60).r(FUNC(dynax_state::hanamai_keyboard_0_r)); // P1
map(0x61, 0x61).r(FUNC(dynax_state::hanamai_keyboard_1_r)); // P2
@@ -500,7 +500,7 @@ void dynax_state::hanamai_io_map(address_map &map)
map(0x68, 0x68).w(FUNC(dynax_state::dynax_layer_enable_w)); // Layers Enable
map(0x69, 0x69).w(FUNC(dynax_state::hanamai_priority_w)); // layer priority
map(0x6a, 0x6a).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer
- map(0x6b, 0x6b).w("blitter", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
+ map(0x6b, 0x6b).w(m_blitter, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
map(0x6c, 0x6c).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits)
map(0x6d, 0x6d).w(FUNC(dynax_state::dynax_blit_palette23_w)); //
map(0x6e, 0x6e).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color
@@ -516,7 +516,7 @@ void dynax_state::hanamai_io_map(address_map &map)
void dynax_state::hnoridur_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x01, 0x07).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
+ map(0x01, 0x07).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller
map(0x20, 0x20).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select
@@ -532,7 +532,7 @@ void dynax_state::hnoridur_io_map(address_map &map)
map(0x36, 0x36).r("aysnd", FUNC(ay8912_device::data_r)); // AY8912, DSW0
map(0x38, 0x38).w("aysnd", FUNC(ay8912_device::data_w)); // AY8912
map(0x3a, 0x3a).w("aysnd", FUNC(ay8912_device::address_w)); //
- map(0x40, 0x40).w("blitter", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
+ map(0x40, 0x40).w(m_blitter, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
map(0x41, 0x41).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer
map(0x42, 0x42).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes
map(0x43, 0x43).w(FUNC(dynax_state::dynax_blit_palette23_w)); //
@@ -597,7 +597,7 @@ void dynax_state::hjingi_banked_map(address_map &map)
void dynax_state::hjingi_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x01, 0x07).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
+ map(0x01, 0x07).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller
@@ -618,7 +618,7 @@ void dynax_state::hjingi_io_map(address_map &map)
map(0x38, 0x38).w("aysnd", FUNC(ay8912_device::data_w)); // AY8912
map(0x3a, 0x3a).w("aysnd", FUNC(ay8912_device::address_w)); //
- map(0x40, 0x40).w("blitter", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
+ map(0x40, 0x40).w(m_blitter, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
map(0x41, 0x41).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer
map(0x42, 0x42).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes
map(0x43, 0x43).w(FUNC(dynax_state::dynax_blit_palette23_w)); //
@@ -727,7 +727,7 @@ void dynax_state::yarunara_io_map(address_map &map)
map.global_mask(0xff);
map(0x00, 0x01).w(FUNC(dynax_state::yarunara_input_w)); // Controls
map(0x02, 0x03).r(FUNC(dynax_state::yarunara_input_r)); //
- map(0x11, 0x17).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
+ map(0x11, 0x17).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
map(0x20, 0x20).w(FUNC(dynax_state::adpcm_reset_w)); // MSM5205 reset
map(0x22, 0x22).w(FUNC(dynax_state::adpcm_data_w)); // MSM5205 data
map(0x24, 0x25).w("ym2413", FUNC(ym2413_device::write)); //
@@ -740,7 +740,7 @@ void dynax_state::yarunara_io_map(address_map &map)
map(0x4c, 0x4c).portr("DSW0"); // DSW 1
map(0x4f, 0x4f).portr("DSW1"); // DSW 2
map(0x50, 0x57).w(m_mainlatch, FUNC(ls259_device::write_d1));
- map(0x68, 0x68).w("blitter", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
+ map(0x68, 0x68).w(m_blitter, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
map(0x69, 0x69).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer
map(0x6a, 0x6a).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes
map(0x6b, 0x6b).w(FUNC(dynax_state::dynax_blit_palette23_w)); //
@@ -754,7 +754,7 @@ void dynax_state::yarunara_io_map(address_map &map)
void dynax_state::mcnpshnt_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x01, 0x07).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
+ map(0x01, 0x07).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller
map(0x20, 0x20).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select
@@ -768,7 +768,7 @@ void dynax_state::mcnpshnt_io_map(address_map &map)
map(0x34, 0x35).w("ym2413", FUNC(ym2413_device::write)); //
map(0x38, 0x38).w("aysnd", FUNC(ay8912_device::data_w)); // AY8912
map(0x3a, 0x3a).w("aysnd", FUNC(ay8912_device::address_w)); //
- map(0x40, 0x40).w("blitter", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
+ map(0x40, 0x40).w(m_blitter, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
map(0x41, 0x41).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer
map(0x42, 0x42).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes
map(0x43, 0x43).w(FUNC(dynax_state::dynax_blit_palette23_w)); //
@@ -789,7 +789,7 @@ void dynax_state::mcnpshnt_io_map(address_map &map)
void dynax_state::sprtmtch_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x01, 0x07).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
+ map(0x01, 0x07).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
map(0x10, 0x11).rw("ym2203", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); // 2 x DSW
// AM_RANGE( 0x12, 0x12 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x13, 0x13 ) AM_WRITENOP // CRT Controller
@@ -800,7 +800,7 @@ void dynax_state::sprtmtch_io_map(address_map &map)
map(0x30, 0x30).w(FUNC(dynax_state::dynax_layer_enable_w)); // Layers Enable
map(0x31, 0x31).w(FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select
map(0x32, 0x32).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer
- map(0x33, 0x33).w("blitter", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
+ map(0x33, 0x33).w(m_blitter, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
map(0x34, 0x34).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits)
map(0x35, 0x35).w(FUNC(dynax_state::dynax_blit_palette23_w)); //
map(0x36, 0x36).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color
@@ -813,12 +813,12 @@ void dynax_state::sprtmtch_io_map(address_map &map)
void dynax_state::mjfriday_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x00).w("blitter", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
+ map(0x00, 0x00).w(m_blitter, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
map(0x01, 0x01).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits)
map(0x02, 0x02).w(FUNC(dynax_state::dynax_rombank_w)); // BANK ROM Select
map(0x03, 0x03).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color
map(0x10, 0x17).w(m_mainlatch, FUNC(ls259_device::write_d0));
- map(0x41, 0x47).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
+ map(0x41, 0x47).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
// AM_RANGE( 0x50, 0x50 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x51, 0x51 ) AM_WRITENOP // CRT Controller
map(0x60, 0x60).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select
@@ -848,14 +848,14 @@ void dynax_state::nanajign_io_map(address_map &map)
map(0x15, 0x15).portr("DSW1"); // DSW2
map(0x16, 0x16).portr("DSW2"); // DSW3
// AM_RANGE( 0x20, 0x21 ) AM_WRITENOP // CRT Controller
- map(0x31, 0x37).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
+ map(0x31, 0x37).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
map(0x40, 0x47).w("outlatch", FUNC(ls259_device::write_d0)); // Coin Counter
map(0x50, 0x57).w(m_mainlatch, FUNC(ls259_device::write_d0));
map(0x60, 0x60).w(FUNC(dynax_state::dynax_extra_scrollx_w)); // screen scroll X
map(0x62, 0x62).w(FUNC(dynax_state::dynax_extra_scrolly_w)); // screen scroll Y
map(0x6a, 0x6a).w(FUNC(dynax_state::hnoridur_rombank_w)); // BANK ROM Select
map(0x6c, 0x6c).w(FUNC(dynax_state::dynax_vblank_ack_w)); // VBlank IRQ Ack
- map(0x70, 0x70).w("blitter", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
+ map(0x70, 0x70).w(m_blitter, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
map(0x71, 0x71).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer
map(0x72, 0x72).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes
map(0x73, 0x73).w(FUNC(dynax_state::dynax_blit_palette23_w)); //
@@ -909,11 +909,11 @@ void dynax_state::jantouki_io_map(address_map &map)
map(0x62, 0x62).w(FUNC(dynax_state::dynax_blit_palette23_w)); //
map(0x63, 0x63).w(FUNC(dynax_state::dynax_blit_palette01_w)); //
map(0x64, 0x64).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color
- map(0x65, 0x65).w("blitter2", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen 2
- map(0x66, 0x66).w("blitter", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
+ map(0x65, 0x65).w(m_blitter2, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen 2
+ map(0x66, 0x66).w(m_blitter, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
map(0x67, 0x67).r(FUNC(dynax_state::jantouki_blitter_busy_r)); //
- map(0x69, 0x6f).w("blitter2", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter 2
- map(0x71, 0x77).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
+ map(0x69, 0x6f).w(m_blitter2, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter 2
+ map(0x71, 0x77).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
map(0x78, 0x7e).w(FUNC(dynax_state::jantouki_layer_enable_w)); // Layers Enable
}
@@ -982,9 +982,9 @@ void dynax_state::mjelctrn_io_map(address_map &map)
map(0x83, 0x83).r(FUNC(dynax_state::hanamai_keyboard_0_r)); // P1
map(0x84, 0x84).r(FUNC(dynax_state::mjelctrn_dsw_r)); // DSW8 x 4
map(0x85, 0x85).portr("SW1"); // DSW2
- map(0xa1, 0xa7).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
+ map(0xa1, 0xa7).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
map(0xc0, 0xc7).w(m_mainlatch, FUNC(ls259_device::write_d0));
- map(0xe0, 0xe0).w("blitter", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
+ map(0xe0, 0xe0).w(m_blitter, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
map(0xe1, 0xe1).w(FUNC(dynax_state::dynax_blit_dest_w)); // Destination Layer
map(0xe2, 0xe2).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes
map(0xe3, 0xe3).w(FUNC(dynax_state::dynax_blit_palette23_w)); //
@@ -1008,10 +1008,10 @@ void dynax_state::mjembase_io_map(address_map &map)
map(0x24, 0x24).portr("DSW3");
// AM_RANGE( 0x40, 0x40 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x41, 0x41 ) AM_WRITENOP // CRT Controller
- map(0x61, 0x67).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
+ map(0x61, 0x67).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
map(0x80, 0x87).w(m_mainlatch, FUNC(ls259_device::write_d0));
map(0xa0, 0xa0).w(FUNC(dynax_state::hnoridur_rombank_w)); // BANK ROM Select
- map(0xc0, 0xc0).w("blitter", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
+ map(0xc0, 0xc0).w(m_blitter, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
map(0xc1, 0xc1).w(FUNC(dynax_state::mjembase_blit_dest_w)); // Destination Layer
map(0xc2, 0xc2).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes
map(0xc3, 0xc3).w(FUNC(dynax_state::mjembase_blit_palette23_w)); //
@@ -1236,7 +1236,7 @@ void dynax_state::tenkai_map(address_map &map)
map(0x10008, 0x10008).w("aysnd", FUNC(ay8910_device::data_w)); //
map(0x10010, 0x10010).w("aysnd", FUNC(ay8910_device::address_w)); //
map(0x10020, 0x10021).w("ym2413", FUNC(ym2413_device::write)); //
- map(0x10040, 0x10040).w("blitter", FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
+ map(0x10040, 0x10040).w(m_blitter, FUNC(dynax_blitter_rev2_device::pen_w)); // Destination Pen
map(0x10044, 0x10044).w(FUNC(dynax_state::tenkai_blit_dest_w)); // Destination Layer
map(0x10048, 0x10048).w(FUNC(dynax_state::tenkai_blit_palette23_w)); // Layers Palettes
map(0x1004c, 0x1004c).w(FUNC(dynax_state::tenkai_blit_palette01_w)); //
@@ -1250,7 +1250,7 @@ void dynax_state::tenkai_map(address_map &map)
map(0x100c0, 0x100c0).w(FUNC(dynax_state::tenkai_ipsel_w));
map(0x100c1, 0x100c1).w(FUNC(dynax_state::tenkai_ip_w));
map(0x100c2, 0x100c3).r(FUNC(dynax_state::tenkai_ip_r));
- map(0x100e1, 0x100e7).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter (inverted scroll values)
+ map(0x100e1, 0x100e7).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter (inverted scroll values)
}
void dynax_state::tenkai_banked_map(address_map &map)
@@ -1322,7 +1322,7 @@ void dynax_state::gekisha_banked_map(address_map &map)
map(0x10003, 0x10003).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color
map(0x10010, 0x10017).w(m_mainlatch, FUNC(ls259_device::write_d0));
map(0x10020, 0x10021).w(FUNC(dynax_state::gekisha_hopper_w));
- map(0x10041, 0x10047).w("blitter", FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
+ map(0x10041, 0x10047).w(m_blitter, FUNC(dynax_blitter_rev2_device::regs_w)); // Blitter
// AM_RANGE( 0x10050, 0x10050 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x10051, 0x10051 ) AM_WRITENOP // CRT Controller
map(0x10060, 0x10060).w(FUNC(dynax_state::hanamai_keyboard_w)); // keyboard row select
@@ -1356,7 +1356,7 @@ WRITE8_MEMBER(dynax_state::cdracula_sound_rombank_w)
void dynax_state::cdracula_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x01, 0x07).w("blitter", FUNC(cdracula_blitter_device::regs_w)); // Blitter + Destination Layers
+ map(0x01, 0x07).w(m_blitter, FUNC(cdracula_blitter_device::regs_w)); // Blitter + Destination Layers
map(0x10, 0x10).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write));
map(0x11, 0x11).noprw(); // unpopulated oki
// AM_RANGE( 0x12, 0x12 ) AM_WRITENOP // CRT Controller
@@ -1366,8 +1366,8 @@ void dynax_state::cdracula_io_map(address_map &map)
map(0x22, 0x22).portr("COINS"); // Coins
map(0x30, 0x30).w(FUNC(dynax_state::dynax_layer_enable_w)); // Layers Enable
// AM_RANGE( 0x31, 0x31 ) AM_WRITE(dynax_rombank_w) // BANK ROM Select
- map(0x32, 0x32).w("blitter", FUNC(cdracula_blitter_device::pen_w)); // Destination Pen
- map(0x33, 0x33).w("blitter", FUNC(cdracula_blitter_device::flags_w)); // Flags + Do Blit
+ map(0x32, 0x32).w(m_blitter, FUNC(cdracula_blitter_device::pen_w)); // Destination Pen
+ map(0x33, 0x33).w(m_blitter, FUNC(cdracula_blitter_device::flags_w)); // Flags + Do Blit
map(0x34, 0x34).w(FUNC(dynax_state::dynax_blit_palette01_w)); // Layers Palettes (Low Bits)
map(0x35, 0x35).w(FUNC(dynax_state::dynax_blit_palette23_w)); //
map(0x36, 0x36).w(FUNC(dynax_state::dynax_blit_backpen_w)); // Background Color
@@ -4214,7 +4214,7 @@ MACHINE_CONFIG_START(dynax_state::cdracula)
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, dynax_state, blit_palbank_w)) // Layers Palettes (High Bit)
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(58.56)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(512, 256)
@@ -4223,7 +4223,7 @@ MACHINE_CONFIG_START(dynax_state::cdracula)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, sprtmtch_vblank_w))
- MCFG_DEVICE_ADD("blitter", CDRACULA_BLITTER, 0)
+ MCFG_DEVICE_ADD(m_blitter, CDRACULA_BLITTER, 0)
MCFG_CDRACULA_BLITTER_VRAM_OUT_CB(WRITE8(*this, dynax_state, cdracula_blit_pixel_w))
MCFG_CDRACULA_BLITTER_SCROLLX_CB(WRITE8(*this, dynax_state, dynax_blit_scrollx_w))
MCFG_CDRACULA_BLITTER_SCROLLY_CB(WRITE8(*this, dynax_state, dynax_blit_scrolly_w))
@@ -4273,7 +4273,7 @@ MACHINE_CONFIG_START(dynax_state::hanamai)
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, dynax_state, layer_half_w)) // half of the interleaved layer to write to
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(512, 256)
@@ -4282,7 +4282,7 @@ MACHINE_CONFIG_START(dynax_state::hanamai)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, sprtmtch_vblank_w))
- MCFG_DEVICE_ADD("blitter", DYNAX_BLITTER_REV2, 0)
+ MCFG_DEVICE_ADD(m_blitter, DYNAX_BLITTER_REV2, 0)
MCFG_DYNAX_BLITTER_REV2_VRAM_OUT_CB(WRITE8(*this, dynax_state, hanamai_blit_pixel_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLX_CB(WRITE8(*this, dynax_state, dynax_blit_scrollx_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLY_CB(WRITE8(*this, dynax_state, dynax_blit_scrolly_w))
@@ -4353,7 +4353,7 @@ MACHINE_CONFIG_START(dynax_state::hnoridur)
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, dynax_state, coincounter_1_w))
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(512, 256+22)
@@ -4362,7 +4362,7 @@ MACHINE_CONFIG_START(dynax_state::hnoridur)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, sprtmtch_vblank_w))
- MCFG_DEVICE_ADD("blitter", DYNAX_BLITTER_REV2, 0)
+ MCFG_DEVICE_ADD(m_blitter, DYNAX_BLITTER_REV2, 0)
MCFG_DYNAX_BLITTER_REV2_VRAM_OUT_CB(WRITE8(*this, dynax_state, hnoridur_blit_pixel_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLX_CB(WRITE8(*this, dynax_state, dynax_blit_scrollx_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLY_CB(WRITE8(*this, dynax_state, dynax_blit_scrolly_w))
@@ -4428,7 +4428,7 @@ MACHINE_CONFIG_START(dynax_state::hjingi)
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, dynax_state, hjingi_lockout_w))
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(512, 256)
@@ -4437,7 +4437,7 @@ MACHINE_CONFIG_START(dynax_state::hjingi)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, sprtmtch_vblank_w))
- MCFG_DEVICE_ADD("blitter", DYNAX_BLITTER_REV2, 0)
+ MCFG_DEVICE_ADD(m_blitter, DYNAX_BLITTER_REV2, 0)
MCFG_DYNAX_BLITTER_REV2_VRAM_OUT_CB(WRITE8(*this, dynax_state, hnoridur_blit_pixel_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLX_CB(WRITE8(*this, dynax_state, dynax_blit_scrollx_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLY_CB(WRITE8(*this, dynax_state, dynax_blit_scrolly_w))
@@ -4492,7 +4492,7 @@ MACHINE_CONFIG_START(dynax_state::sprtmtch)
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, dynax_state, blit_palbank_w))
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(512, 256)
@@ -4501,7 +4501,7 @@ MACHINE_CONFIG_START(dynax_state::sprtmtch)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, sprtmtch_vblank_w))
- MCFG_DEVICE_ADD("blitter", DYNAX_BLITTER_REV2, 0)
+ MCFG_DEVICE_ADD(m_blitter, DYNAX_BLITTER_REV2, 0)
MCFG_DYNAX_BLITTER_REV2_VRAM_OUT_CB(WRITE8(*this, dynax_state, drgpunch_blit_pixel_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLX_CB(WRITE8(*this, dynax_state, dynax_blit_scrollx_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLY_CB(WRITE8(*this, dynax_state, dynax_blit_scrolly_w))
@@ -4559,7 +4559,7 @@ MACHINE_CONFIG_START(dynax_state::mjfriday)
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, dynax_state, mjdialq2_layer0_enable_w))
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(256, 256)
@@ -4568,7 +4568,7 @@ MACHINE_CONFIG_START(dynax_state::mjfriday)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, mjfriday_vblank_w))
- MCFG_DEVICE_ADD("blitter", DYNAX_BLITTER_REV2, 0)
+ MCFG_DEVICE_ADD(m_blitter, DYNAX_BLITTER_REV2, 0)
MCFG_DYNAX_BLITTER_REV2_VRAM_OUT_CB(WRITE8(*this, dynax_state, mjdialq2_blit_pixel_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLX_CB(WRITE8(*this, dynax_state, dynax_blit_scrollx_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLY_CB(WRITE8(*this, dynax_state, dynax_blit_scrolly_w))
@@ -4739,7 +4739,7 @@ MACHINE_CONFIG_START(dynax_state::jantouki)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, jantouki_vblank_w))
- MCFG_DEVICE_ADD("blitter", DYNAX_BLITTER_REV2, 0)
+ MCFG_DEVICE_ADD(m_blitter, DYNAX_BLITTER_REV2, 0)
MCFG_DYNAX_BLITTER_REV2_VRAM_OUT_CB(WRITE8(*this, dynax_state, jantouki_blit_pixel_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLX_CB(WRITE8(*this, dynax_state, dynax_blit_scrollx_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLY_CB(WRITE8(*this, dynax_state, dynax_blit_scrolly_w))
@@ -4753,7 +4753,7 @@ MACHINE_CONFIG_START(dynax_state::jantouki)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_jantouki_bottom)
MCFG_SCREEN_PALETTE("palette")
- MCFG_DEVICE_ADD("blitter2", DYNAX_BLITTER_REV2, 0)
+ MCFG_DEVICE_ADD(m_blitter2, DYNAX_BLITTER_REV2, 0)
MCFG_DYNAX_BLITTER_REV2_VRAM_OUT_CB(WRITE8(*this, dynax_state, jantouki_blit2_pixel_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLX_CB(WRITE8(*this, dynax_state, dynax_blit2_scrollx_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLY_CB(WRITE8(*this, dynax_state, dynax_blit2_scrolly_w))
@@ -4910,7 +4910,7 @@ MACHINE_CONFIG_START(dynax_state::tenkai)
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, dynax_state, tenkai_blitter_ack_w))
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(512, 256+22)
@@ -4919,7 +4919,7 @@ MACHINE_CONFIG_START(dynax_state::tenkai)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ1))
- MCFG_DEVICE_ADD("blitter", DYNAX_BLITTER_REV2, 0)
+ MCFG_DEVICE_ADD(m_blitter, DYNAX_BLITTER_REV2, 0)
MCFG_DYNAX_BLITTER_REV2_VRAM_OUT_CB(WRITE8(*this, dynax_state, hnoridur_blit_pixel_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLX_CB(WRITE8(*this, dynax_state, tenkai_blit_scrollx_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLY_CB(WRITE8(*this, dynax_state, tenkai_blit_scrolly_w))
@@ -4991,7 +4991,7 @@ MACHINE_CONFIG_START(dynax_state::gekisha)
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, dynax_state, mjdialq2_layer0_enable_w))
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(256, 256)
@@ -5000,7 +5000,7 @@ MACHINE_CONFIG_START(dynax_state::gekisha)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("blitter", DYNAX_BLITTER_REV2, 0)
+ MCFG_DEVICE_ADD(m_blitter, DYNAX_BLITTER_REV2, 0)
MCFG_DYNAX_BLITTER_REV2_VRAM_OUT_CB(WRITE8(*this, dynax_state, mjdialq2_blit_pixel_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLX_CB(WRITE8(*this, dynax_state, dynax_blit_scrollx_w))
MCFG_DYNAX_BLITTER_REV2_SCROLLY_CB(WRITE8(*this, dynax_state, dynax_blit_scrolly_w))
diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp
index 08d930583ae..0335655277d 100644
--- a/src/mame/drivers/fidelz80.cpp
+++ b/src/mame/drivers/fidelz80.cpp
@@ -1791,7 +1791,7 @@ MACHINE_CONFIG_START(fidelz80_state::vbrc)
MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, fidelz80_state, vbrc_mcu_t0_r))
MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, fidelz80_state, vbrc_mcu_t1_r))
- MCFG_I8243_ADD("i8243", NOOP, WRITE8(*this, fidelz80_state, vbrc_ioexp_port_w))
+ MCFG_I8243_ADD("i8243", CONSTANT(0), WRITE8(*this, fidelz80_state, vbrc_ioexp_port_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_fidel_vbrc)
diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp
index eb057f4fdc9..e3fc569a2cd 100644
--- a/src/mame/drivers/guab.cpp
+++ b/src/mame/drivers/guab.cpp
@@ -71,8 +71,8 @@
class guab_state : public driver_device
{
public:
- guab_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ guab_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_tms34061(*this, "tms34061"),
m_sn(*this, "snsnd"),
diff --git a/src/mame/drivers/hp16500.cpp b/src/mame/drivers/hp16500.cpp
index d5801d017d5..b025eb3c835 100644
--- a/src/mame/drivers/hp16500.cpp
+++ b/src/mame/drivers/hp16500.cpp
@@ -59,11 +59,11 @@
class hp16500_state : public driver_device
{
public:
- hp16500_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ hp16500_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_mlc(*this, "mlc")
- { }
+ { }
void hp16500(machine_config &config);
void hp16500a(machine_config &config);
diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp
index 6cdff36239a..725bbeca997 100644
--- a/src/mame/drivers/hp9845.cpp
+++ b/src/mame/drivers/hp9845.cpp
@@ -506,7 +506,7 @@ void hp9845_base_state::machine_reset()
m_irh_pending = 0;
m_pa = 0;
- sts_w(GVIDEO_PA , true);
+ set_sts(GVIDEO_PA , true);
memset(&m_kb_state[ 0 ] , 0 , sizeof(m_kb_state));
m_kb_scancode = 0x7f;
@@ -560,10 +560,10 @@ void hp9845_base_state::update_irq()
WRITE8_MEMBER(hp9845_base_state::irq_w)
{
- irq_w((uint8_t)offset , data != 0);
+ set_irq(uint8_t(offset) , data != 0);
}
-void hp9845_base_state::irq_w(uint8_t sc , int state)
+void hp9845_base_state::set_irq(uint8_t sc , int state)
{
unsigned bit_n = sc % 8;
@@ -593,10 +593,10 @@ void hp9845_base_state::update_flg_sts()
WRITE8_MEMBER(hp9845_base_state::sts_w)
{
- sts_w((uint8_t)offset , data != 0);
+ set_sts(uint8_t(offset) , data != 0);
}
-void hp9845_base_state::sts_w(uint8_t sc , int state)
+void hp9845_base_state::set_sts(uint8_t sc , int state)
{
if (state) {
BIT_SET(m_sts_status, sc);
@@ -610,10 +610,10 @@ void hp9845_base_state::sts_w(uint8_t sc , int state)
WRITE8_MEMBER(hp9845_base_state::flg_w)
{
- flg_w((uint8_t)offset , data != 0);
+ set_flg(uint8_t(offset) , data != 0);
}
-void hp9845_base_state::flg_w(uint8_t sc , int state)
+void hp9845_base_state::set_flg(uint8_t sc , int state)
{
if (state) {
BIT_SET(m_flg_status, sc);
@@ -737,7 +737,7 @@ WRITE16_MEMBER(hp9845_base_state::kb_irq_clear_w)
void hp9845_base_state::update_kb_prt_irq()
{
bool state = BIT(m_kb_status , 0) || m_prt_irl;
- irq_w(0 , state);
+ set_irq(0 , state);
}
TIMER_DEVICE_CALLBACK_MEMBER(hp9845_base_state::beeper_off)
@@ -761,42 +761,42 @@ WRITE_LINE_MEMBER(hp9845_base_state::prt_irl_w)
WRITE_LINE_MEMBER(hp9845_base_state::prt_flg_w)
{
- flg_w(PRINTER_PA , state);
+ set_flg(PRINTER_PA , state);
}
WRITE_LINE_MEMBER(hp9845_base_state::prt_sts_w)
{
- sts_w(PRINTER_PA , state);
+ set_sts(PRINTER_PA , state);
}
WRITE_LINE_MEMBER(hp9845_base_state::t14_irq_w)
{
- irq_w(T14_PA , state);
+ set_irq(T14_PA , state);
}
WRITE_LINE_MEMBER(hp9845_base_state::t14_flg_w)
{
- flg_w(T14_PA , state);
+ set_flg(T14_PA , state);
}
WRITE_LINE_MEMBER(hp9845_base_state::t14_sts_w)
{
- sts_w(T14_PA , state);
+ set_sts(T14_PA , state);
}
WRITE_LINE_MEMBER(hp9845_base_state::t15_irq_w)
{
- irq_w(T15_PA , state);
+ set_irq(T15_PA , state);
}
WRITE_LINE_MEMBER(hp9845_base_state::t15_flg_w)
{
- flg_w(T15_PA , state);
+ set_flg(T15_PA , state);
}
WRITE_LINE_MEMBER(hp9845_base_state::t15_sts_w)
{
- sts_w(T15_PA , state);
+ set_sts(T15_PA , state);
}
INPUT_CHANGED_MEMBER(hp9845_base_state::togglekey_changed)
@@ -1348,11 +1348,11 @@ void hp9845b_state::update_graphic_bits()
m_gv_fsm_state == GV_STAT_WAIT_DS_1 ||
m_gv_fsm_state == GV_STAT_WAIT_DS_2;
- flg_w(GVIDEO_PA , gv_ready);
+ set_flg(GVIDEO_PA , gv_ready);
bool irq = m_gv_int_en && !m_gv_dma_en && gv_ready;
- irq_w(GVIDEO_PA , irq);
+ set_irq(GVIDEO_PA , irq);
bool dmar = gv_ready && m_gv_dma_en;
@@ -2775,11 +2775,11 @@ void hp9845c_state::update_graphic_bits()
m_gv_fsm_state == GV_STAT_WAIT_TRIG_1;
}
- flg_w(GVIDEO_PA , gv_ready);
+ set_flg(GVIDEO_PA , gv_ready);
bool irq = m_gv_int_en && !m_gv_dma_en && gv_ready;
- irq_w(GVIDEO_PA , irq);
+ set_irq(GVIDEO_PA , irq);
bool dmar = gv_ready && m_gv_dma_en;
@@ -3621,11 +3621,11 @@ void hp9845t_state::update_graphic_bits()
// Fix for this problem is in commit 27004d00
// My apologies to Tony Duell for doubting at one point the correctness
// of his 98780A schematics.. :)
- flg_w(GVIDEO_PA , gv_ready);
+ set_flg(GVIDEO_PA , gv_ready);
bool irq = m_gv_int_en && !m_gv_dma_en && gv_ready;
- irq_w(GVIDEO_PA , irq);
+ set_irq(GVIDEO_PA , irq);
bool dmar = gv_ready && m_gv_dma_en;
diff --git a/src/mame/drivers/pimps.cpp b/src/mame/drivers/pimps.cpp
index dd76cdb111a..31335ecb2ed 100644
--- a/src/mame/drivers/pimps.cpp
+++ b/src/mame/drivers/pimps.cpp
@@ -83,10 +83,12 @@ public:
{ }
void pimps(machine_config &config);
+
+private:
void io_map(address_map &map);
void mem_map(address_map &map);
-private:
virtual void machine_reset() override;
+
required_device<cpu_device> m_maincpu;
};
diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp
index 46f299dace0..29fd95593bb 100644
--- a/src/mame/drivers/qx10.cpp
+++ b/src/mame/drivers/qx10.cpp
@@ -63,8 +63,8 @@
class qx10_state : public driver_device
{
public:
- qx10_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ qx10_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_pit_1(*this, "pit8253_1"),
m_pit_2(*this, "pit8253_2"),
m_pic_m(*this, "pic8259_master"),
diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp
index f4a84b73408..1c5eba84b91 100644
--- a/src/mame/drivers/royalmah.cpp
+++ b/src/mame/drivers/royalmah.cpp
@@ -112,14 +112,15 @@ Stephh's notes (based on the games Z80 code and some tests) :
class royalmah_state : public driver_device
{
public:
- royalmah_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ royalmah_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_maincpu(*this,"maincpu"),
m_ay(*this, "aysnd"),
m_videoram(*this, "videoram"),
m_audiocpu(*this, "audiocpu"),
m_rtc(*this, "rtc"),
- m_soundlatch(*this, "soundlatch") { }
+ m_soundlatch(*this, "soundlatch")
+ { }
DECLARE_READ8_MEMBER(player_1_port_r);
diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp
index 711dae82191..1745b74e1b1 100644
--- a/src/mame/drivers/videopkr.cpp
+++ b/src/mame/drivers/videopkr.cpp
@@ -1359,8 +1359,8 @@ MACHINE_CONFIG_START(videopkr_state::bpoker)
MCFG_DEVICE_REPLACE("maincpu", I8751, XTAL(6'000'000))
MCFG_DEVICE_PROGRAM_MAP(i8751_map)
MCFG_DEVICE_IO_MAP(i8751_io_port)
- MCFG_MCS51_PORT_P0_IN_CB(NOOP) // ???
- MCFG_MCS51_PORT_P1_IN_CB(NOOP) // ???
+ MCFG_MCS51_PORT_P0_IN_CB(CONSTANT(0)) // ???
+ MCFG_MCS51_PORT_P1_IN_CB(CONSTANT(0)) // ???
MCFG_MCS51_PORT_P1_OUT_CB(NOOP) // ???
MCFG_DEVICE_ADD("ppi", I8255A, 0)
diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h
index 6c8898bdf95..98e3c539a12 100644
--- a/src/mame/includes/capbowl.h
+++ b/src/mame/includes/capbowl.h
@@ -24,15 +24,16 @@ public:
TIMER_UPDATE
};
- capbowl_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ capbowl_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_watchdog(*this, "watchdog"),
m_audiocpu(*this, "audiocpu"),
m_tms34061(*this, "tms34061"),
m_screen(*this, "screen"),
m_soundlatch(*this, "soundlatch"),
- m_rowaddress(*this, "rowaddress") { }
+ m_rowaddress(*this, "rowaddress")
+ { }
/* devices */
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/includes/cgc7900.h b/src/mame/includes/cgc7900.h
index c7e26283913..a1237bf9c5f 100644
--- a/src/mame/includes/cgc7900.h
+++ b/src/mame/includes/cgc7900.h
@@ -1,10 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
-#pragma once
-
#ifndef MAME_INCLUDES_CGC7900_H
#define MAME_INCLUDES_CGC7900_H
+#pragma once
+
#include "bus/rs232/rs232.h"
#include "cpu/m68000/m68000.h"
@@ -34,27 +34,27 @@ class cgc7900_state : public driver_device
{
public:
cgc7900_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, M68000_TAG),
- m_palette(*this, "palette"),
- m_screen(*this, "screen"),
- m_char_rom(*this, "gfx1"),
- m_chrom_ram(*this, "chrom_ram"),
- m_plane_ram(*this, "plane_ram"),
- m_clut_ram(*this, "clut_ram"),
- m_overlay_ram(*this, "overlay_ram"),
- m_roll_bitmap(*this, "roll_bitmap"),
- m_pan_x(*this, "pan_x"),
- m_pan_y(*this, "pan_y"),
- m_zoom(*this, "zoom"),
- m_blink_select(*this, "blink_select"),
- m_plane_select(*this, "plane_select"),
- m_plane_switch(*this, "plane_switch"),
- m_color_status_fg(*this, "color_status_fg"),
- m_color_status_bg(*this, "color_status_bg"),
- m_roll_overlay(*this, "roll_overlay"),
- m_i8251_0(*this, INS8251_0_TAG),
- m_i8251_1(*this, INS8251_1_TAG)
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, M68000_TAG)
+ , m_palette(*this, "palette")
+ , m_screen(*this, "screen")
+ , m_char_rom(*this, "gfx1")
+ , m_chrom_ram(*this, "chrom_ram")
+ , m_plane_ram(*this, "plane_ram")
+ , m_clut_ram(*this, "clut_ram")
+ , m_overlay_ram(*this, "overlay_ram")
+ , m_roll_bitmap(*this, "roll_bitmap")
+ , m_pan_x(*this, "pan_x")
+ , m_pan_y(*this, "pan_y")
+ , m_zoom(*this, "zoom")
+ , m_blink_select(*this, "blink_select")
+ , m_plane_select(*this, "plane_select")
+ , m_plane_switch(*this, "plane_switch")
+ , m_color_status_fg(*this, "color_status_fg")
+ , m_color_status_bg(*this, "color_status_bg")
+ , m_roll_overlay(*this, "roll_overlay")
+ , m_i8251_0(*this, INS8251_0_TAG)
+ , m_i8251_1(*this, INS8251_1_TAG)
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/includes/divebomb.h b/src/mame/includes/divebomb.h
index 3fb38b4b3d9..0bfc21f00c8 100644
--- a/src/mame/includes/divebomb.h
+++ b/src/mame/includes/divebomb.h
@@ -5,6 +5,11 @@
Kyuukoukabakugekitai - Dive Bomber Squad
*************************************************************************/
+#ifndef MAME_INCLUDES_DIVEBOMB_H
+#define MAME_INCLUDES_DIVEBOMB_H
+
+#pragma once
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
@@ -22,7 +27,7 @@ public:
: driver_device(mconfig, type, tag)
, m_spritecpu(*this, "spritecpu")
, m_fgcpu(*this, "fgcpu")
- , m_rozcpucpu(*this, "rozcpu")
+ , m_rozcpu(*this, "rozcpu")
, m_rozbank(*this, "rozbank")
, m_fgram(*this, "fgram")
, m_spriteram(*this, "spriteram")
@@ -40,7 +45,7 @@ public:
private:
required_device<cpu_device> m_spritecpu;
required_device<cpu_device> m_fgcpu;
- required_device<cpu_device> m_rozcpucpu;
+ required_device<cpu_device> m_rozcpu;
required_memory_bank m_rozbank;
required_shared_ptr<uint8_t> m_fgram;
required_shared_ptr<uint8_t> m_spriteram;
@@ -86,3 +91,5 @@ private:
void divebomb_spritecpu_iomap(address_map &map);
void divebomb_spritecpu_map(address_map &map);
};
+
+#endif // MAME_INCLUDES_DIVEBOMB_H
diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h
index e7e0ce6259c..d6940b7c3ad 100644
--- a/src/mame/includes/dynax.h
+++ b/src/mame/includes/dynax.h
@@ -5,6 +5,10 @@
Dynax hardware
***************************************************************************/
+#ifndef MAME_INCLUDES_DYNAX_H
+#define MAME_INCLUDES_DYNAX_H
+
+#pragma once
#include "machine/bankdev.h"
#include "machine/gen_latch.h"
@@ -28,11 +32,11 @@ public:
, m_palette(*this, "palette")
, m_mainlatch(*this, "mainlatch")
, m_bankdev(*this, "bankdev")
+ , m_blitter(*this, "blitter")
, m_msm(*this, "msm")
, m_mainirq(*this, "mainirq")
, m_soundirq(*this, "soundirq")
, m_soundlatch(*this, "soundlatch")
- , m_blitter(*this, "blitter")
, m_blitter2(*this, "blitter2")
, m_blitter_gfx(*this, "blitter")
, m_led(*this, "led0")
@@ -87,6 +91,7 @@ protected:
required_device<palette_device> m_palette;
optional_device<ls259_device> m_mainlatch;
optional_device<address_map_bank_device> m_bankdev;
+ optional_device<dynax_blitter_rev2_device> m_blitter;
/* input / output */
uint8_t m_input_sel;
@@ -290,7 +295,6 @@ private:
optional_device<rst_pos_buffer_device> m_mainirq;
optional_device<rst_pos_buffer_device> m_soundirq;
optional_device<generic_latch_8_device> m_soundlatch;
- optional_device<dynax_blitter_rev2_device> m_blitter;
optional_device<dynax_blitter_rev2_device> m_blitter2;
optional_region_ptr<uint8_t> m_blitter_gfx;
output_finder<> m_led;
@@ -342,3 +346,5 @@ private:
uint8_t m_gekisha_val[2];
};
+
+#endif // MAME_INCLUDES_DYNAX_H
diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h
index 7e3d34dcc27..30192fdd840 100644
--- a/src/mame/includes/hnayayoi.h
+++ b/src/mame/includes/hnayayoi.h
@@ -5,6 +5,11 @@
Hana Yayoi & other Dynax games (using 1st version of their blitter)
*************************************************************************/
+#ifndef MAME_INCLUDES_HNAYAYOI_H
+#define MAME_INCLUDES_HNAYAYOI_H
+
+#pragma once
+
#include "sound/msm5205.h"
#include "video/mc6845.h"
#include "emupal.h"
@@ -12,11 +17,12 @@
class hnayayoi_state : public driver_device
{
public:
- hnayayoi_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag) ,
+ hnayayoi_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_msm(*this, "msm"),
- m_palette(*this, "palette") { }
+ m_palette(*this, "palette")
+ { }
void untoucha(machine_config &config);
void hnayayoi(machine_config &config);
@@ -66,3 +72,5 @@ private:
void untoucha_io_map(address_map &map);
void untoucha_map(address_map &map);
};
+
+#endif // MAME_INCLUDES_HNAYAYOI_H
diff --git a/src/mame/includes/hp9845.h b/src/mame/includes/hp9845.h
index 9054a4592bf..18940182cd3 100644
--- a/src/mame/includes/hp9845.h
+++ b/src/mame/includes/hp9845.h
@@ -38,12 +38,12 @@ protected:
IRQ_CALLBACK_MEMBER(irq_callback);
void update_irq();
DECLARE_WRITE8_MEMBER(irq_w);
- void irq_w(uint8_t sc , int state);
+ void set_irq(uint8_t sc , int state);
void update_flg_sts();
DECLARE_WRITE8_MEMBER(sts_w);
- void sts_w(uint8_t sc , int state);
+ void set_sts(uint8_t sc , int state);
DECLARE_WRITE8_MEMBER(flg_w);
- void flg_w(uint8_t sc , int state);
+ void set_flg(uint8_t sc , int state);
TIMER_DEVICE_CALLBACK_MEMBER(kb_scan);
DECLARE_READ16_MEMBER(kb_scancode_r);
diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h
index df19e81a5dd..a6b010b3af2 100644
--- a/src/mame/includes/nemesis.h
+++ b/src/mame/includes/nemesis.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail
+#ifndef MAME_INCLUDES_NEMESIS_H
+#define MAME_INCLUDES_NEMESIS_H
+
+#pragma once
#include "machine/timer.h"
#include "sound/flt_rc.h"
@@ -14,8 +18,8 @@
class nemesis_state : public driver_device
{
public:
- nemesis_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ nemesis_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_charram(*this, "charram"),
m_xscroll1(*this, "xscroll1"),
m_xscroll2(*this, "xscroll2"),
@@ -39,7 +43,8 @@ public:
m_vlm(*this, "vlm"),
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
- m_palette(*this, "palette") { }
+ m_palette(*this, "palette")
+ { }
/* memory pointers */
required_shared_ptr<uint16_t> m_charram;
@@ -156,3 +161,5 @@ public:
void salamand_vlm_map(address_map &map);
void sound_map(address_map &map);
};
+
+#endif // MAME_INCLUDES_NEMESIS_H
diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h
index 4b7da9cadde..6b19c1d1ff7 100644
--- a/src/mame/includes/pandoras.h
+++ b/src/mame/includes/pandoras.h
@@ -5,14 +5,18 @@
Pandora's Palace
*************************************************************************/
+#ifndef MAME_INCLUDES_PANDORAS_H
+#define MAME_INCLUDES_PANDORAS_H
+
+#pragma once
#include "emupal.h"
class pandoras_state : public driver_device
{
public:
- pandoras_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ pandoras_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_spriteram(*this, "spriteram"),
m_colorram(*this, "colorram"),
m_videoram(*this, "videoram"),
@@ -21,7 +25,8 @@ public:
m_audiocpu(*this, "audiocpu"),
m_mcu(*this, "mcu"),
m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette") { }
+ m_palette(*this, "palette")
+ { }
/* memory pointers */
required_shared_ptr<uint8_t> m_spriteram;
@@ -76,3 +81,5 @@ public:
void pandoras_slave_map(address_map &map);
void pandoras_sound_map(address_map &map);
};
+
+#endif // MAME_INCLUDES_PANDORAS_H
diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h
index 08bf033c368..e053cf74e5c 100644
--- a/src/mame/includes/runaway.h
+++ b/src/mame/includes/runaway.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Mike Balfour
+#ifndef MAME_INCLUDES_RUNAWAY_H
+#define MAME_INCLUDES_RUNAWAY_H
+
+#pragma once
#include "machine/er2055.h"
#include "emupal.h"
@@ -56,3 +60,5 @@ protected:
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
};
+
+#endif // MAME_INCLUDES_RUNAWAY_H
diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h
index 11cc8c8b35d..d348da7ecc9 100644
--- a/src/mame/includes/splash.h
+++ b/src/mame/includes/splash.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Manuel Abadia, David Haywood
+#ifndef MAME_INCLUDES_SPLASH_H
+#define MAME_INCLUDES_SPLASH_H
+
+#pragma once
#include "machine/eepromser.h"
#include "machine/gen_latch.h"
@@ -10,8 +14,8 @@
class splash_state : public driver_device
{
public:
- splash_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ splash_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_msm(*this, "msm"),
@@ -25,7 +29,7 @@ public:
m_spriteram(*this, "spriteram"),
m_protdata(*this, "protdata"),
m_bitmap_mode(*this, "bitmap_mode")
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@@ -108,16 +112,24 @@ public:
class funystrp_state : public splash_state
{
public:
- funystrp_state(const machine_config &mconfig, device_type type, const char *tag)
- : splash_state(mconfig, type, tag),
+ funystrp_state(const machine_config &mconfig, device_type type, const char *tag) :
+ splash_state(mconfig, type, tag),
m_msm1(*this, "msm1"),
m_msm2(*this, "msm2"),
m_eeprom(*this, "eeprom"),
m_funystrp_val(0),
m_funystrp_ff3cc7_val(0),
m_funystrp_ff3cc8_val(0)
- { }
+ { }
+
+ void init_funystrp();
+
+ void funystrp(machine_config &config);
+
+protected:
+ virtual void machine_start() override;
+private:
DECLARE_READ16_MEMBER(spr_read);
DECLARE_WRITE16_MEMBER(spr_write);
DECLARE_READ8_MEMBER(int_source_r);
@@ -131,16 +143,11 @@ public:
DECLARE_READ16_MEMBER(protection_r);
DECLARE_WRITE8_MEMBER(eeprom_w);
- void init_funystrp();
-
uint32_t screen_update_funystrp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void funystrp_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
- void funystrp(machine_config &config);
void funystrp_map(address_map &map);
void funystrp_sound_io_map(address_map &map);
-private:
- virtual void machine_start() override;
required_device<msm5205_device> m_msm1;
required_device<msm5205_device> m_msm2;
@@ -157,3 +164,5 @@ private:
int m_snd_interrupt_enable1;
int m_snd_interrupt_enable2;
};
+
+#endif // MAME_INCLUDES_SPLASH_H
diff --git a/src/mame/machine/ms7004.cpp b/src/mame/machine/ms7004.cpp
index bc84c17bb40..bbfb59fbfd7 100644
--- a/src/mame/machine/ms7004.cpp
+++ b/src/mame/machine/ms7004.cpp
@@ -65,7 +65,7 @@ MACHINE_CONFIG_START(ms7004_device::device_add_mconfig)
MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, ms7004_device, t1_r))
MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE("i8243", i8243_device, prog_w))
- MCFG_I8243_ADD("i8243", NOOP, WRITE8(*this, ms7004_device, i8243_port_w))
+ MCFG_I8243_ADD("i8243", CONSTANT(0), WRITE8(*this, ms7004_device, i8243_port_w))
SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD(MS7004_SPK_TAG, BEEP, 3250)
diff --git a/src/mame/video/dynax_blitter_rev2.h b/src/mame/video/dynax_blitter_rev2.h
index ea6db297fb6..29704351251 100644
--- a/src/mame/video/dynax_blitter_rev2.h
+++ b/src/mame/video/dynax_blitter_rev2.h
@@ -5,11 +5,11 @@
Dynax blitter, "revision 2" (TC17G032AP-0246 custom DIP64)
**********************************************************************/
+#ifndef MAME_VIDEO_DYNAX_BLITTER_REV2_H
+#define MAME_VIDEO_DYNAX_BLITTER_REV2_H
#pragma once
-#ifndef MAME_VIDEO_DYNAX_BLITTER_REV2_H
-#define MAME_VIDEO_DYNAX_BLITTER_REV2_H
//**************************************************************************
// CONFIGURATION MACROS