summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/dynax.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/dynax.cpp')
-rw-r--r--src/mame/drivers/dynax.cpp96
1 files changed, 48 insertions, 48 deletions
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))