summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/cclimber.cpp
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2019-03-21 18:05:29 +0100
committer Ivan Vangelista <mesgnet@yahoo.it>2019-03-21 18:05:29 +0100
commitf079fb82cd64ab898e1deb9c66c97c4c99a13d74 (patch)
treea157ffd09c1c6044cae1e76efe9a701248f43eb3 /src/mame/drivers/cclimber.cpp
parentf17ad47091ed5516d4b0734f92adbcec0d888812 (diff)
mame\drivers: removed most MCFG and MACHINE_CONFIG macros from drivers starting with c (nw)
Diffstat (limited to 'src/mame/drivers/cclimber.cpp')
-rw-r--r--src/mame/drivers/cclimber.cpp86
1 files changed, 44 insertions, 42 deletions
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp
index 688276e222d..1025f696fa0 100644
--- a/src/mame/drivers/cclimber.cpp
+++ b/src/mame/drivers/cclimber.cpp
@@ -1105,33 +1105,33 @@ WRITE_LINE_MEMBER(cclimber_state::bagmanf_vblank_irq)
m_maincpu->set_input_line(0, HOLD_LINE);
}
-MACHINE_CONFIG_START(cclimber_state::root)
-
+void cclimber_state::root(machine_config &config)
+{
/* basic machine hardware */
- MCFG_DEVICE_ADD(m_maincpu, Z80, XTAL(18'432'000)/3/2) /* 3.072 MHz */
- MCFG_DEVICE_PROGRAM_MAP(cclimber_map)
- MCFG_DEVICE_IO_MAP(cclimber_portmap)
+ Z80(config, m_maincpu, XTAL(18'432'000)/3/2); /* 3.072 MHz */
+ m_maincpu->set_addrmap(AS_PROGRAM, &cclimber_state::cclimber_map);
+ m_maincpu->set_addrmap(AS_IO, &cclimber_state::cclimber_portmap);
- MCFG_DEVICE_ADD(m_mainlatch, LS259, 0)
+ LS259(config, m_mainlatch, 0);
m_mainlatch->q_out_cb<0>().set(FUNC(cclimber_state::nmi_mask_w));
m_mainlatch->q_out_cb<1>().set(FUNC(cclimber_state::flip_screen_x_w));
m_mainlatch->q_out_cb<2>().set(FUNC(cclimber_state::flip_screen_y_w));
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MCFG_SCREEN_SIZE(32*8, 32*8)
- MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MCFG_SCREEN_UPDATE_DRIVER(cclimber_state, screen_update_cclimber)
- MCFG_SCREEN_PALETTE(m_palette)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cclimber_state, vblank_irq))
+ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
+ screen.set_refresh_hz(60);
+ screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
+ screen.set_size(32*8, 32*8);
+ screen.set_visarea(0*8, 32*8-1, 2*8, 30*8-1);
+ screen.set_screen_update(FUNC(cclimber_state::screen_update_cclimber));
+ screen.set_palette(m_palette);
+ screen.screen_vblank().set(FUNC(cclimber_state::vblank_irq));
GFXDECODE(config, m_gfxdecode, m_palette, gfx_cclimber);
PALETTE(config, m_palette, FUNC(cclimber_state::cclimber_palette), 16*4+8*4);
MCFG_VIDEO_START_OVERRIDE(cclimber_state,cclimber)
-MACHINE_CONFIG_END
+}
void cclimber_state::cclimber(machine_config &config)
@@ -1186,7 +1186,8 @@ void cclimber_state::bagmanf(machine_config &config)
}
-MACHINE_CONFIG_START(cclimber_state::yamato)
+void cclimber_state::yamato(machine_config &config)
+{
root(config);
/* basic machine hardware */
@@ -1196,15 +1197,15 @@ MACHINE_CONFIG_START(cclimber_state::yamato)
maincpu.set_addrmap(AS_OPCODES, &cclimber_state::yamato_decrypted_opcodes_map);
maincpu.set_decrypted_tag(":decrypted_opcodes");
- MCFG_DEVICE_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz ? */
- MCFG_DEVICE_PROGRAM_MAP(yamato_audio_map)
- MCFG_DEVICE_IO_MAP(yamato_audio_portmap)
+ Z80(config, m_audiocpu, 3072000); /* 3.072 MHz ? */
+ m_audiocpu->set_addrmap(AS_PROGRAM, &cclimber_state::yamato_audio_map);
+ m_audiocpu->set_addrmap(AS_IO, &cclimber_state::yamato_audio_portmap);
/* video hardware */
m_palette->set_entries(16*4+8*4+256);
m_palette->set_init(FUNC(cclimber_state::yamato_palette));
- MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_UPDATE_DRIVER(cclimber_state, screen_update_yamato)
+
+ subdevice<screen_device>("screen")->set_screen_update(FUNC(cclimber_state::screen_update_yamato));
/* audio hardware */
SPEAKER(config, "speaker").front_center();
@@ -1212,10 +1213,11 @@ MACHINE_CONFIG_START(cclimber_state::yamato)
AY8910(config, "ay1", XTAL(18'432'000)/12).add_route(ALL_OUTPUTS, "speaker", 0.25); /* 1.536 MHz */
AY8910(config, "ay2", XTAL(18'432'000)/12).add_route(ALL_OUTPUTS, "speaker", 0.25); /* 1.536 MHz */
-MACHINE_CONFIG_END
+}
-MACHINE_CONFIG_START(cclimber_state::toprollr)
+void cclimber_state::toprollr(machine_config &config)
+{
cclimber(config);
sega_315_5018_device &maincpu(SEGA_315_5018(config.replace(), m_maincpu, XTAL(18'432'000)/3/2)); /* 3.072 MHz */
@@ -1236,36 +1238,36 @@ MACHINE_CONFIG_START(cclimber_state::toprollr)
MCFG_VIDEO_START_OVERRIDE(cclimber_state,toprollr)
subdevice<screen_device>("screen")->set_screen_update(FUNC(cclimber_state::screen_update_toprollr));
-MACHINE_CONFIG_END
-
+}
-MACHINE_CONFIG_START(cclimber_state::swimmer)
+void cclimber_state::swimmer(machine_config &config)
+{
/* basic machine hardware */
- MCFG_DEVICE_ADD(m_maincpu, Z80, XTAL(18'432'000)/6) /* verified on pcb */
- MCFG_DEVICE_PROGRAM_MAP(swimmer_map)
+ Z80(config, m_maincpu, XTAL(18'432'000)/6); /* verified on pcb */
+ m_maincpu->set_addrmap(AS_PROGRAM, &cclimber_state::swimmer_map);
- MCFG_DEVICE_ADD(m_mainlatch, LS259, 0)
+ LS259(config, m_mainlatch, 0);
m_mainlatch->q_out_cb<0>().set(FUNC(cclimber_state::nmi_mask_w));
m_mainlatch->q_out_cb<1>().set(FUNC(cclimber_state::flip_screen_x_w));
m_mainlatch->q_out_cb<2>().set(FUNC(cclimber_state::flip_screen_y_w));
m_mainlatch->q_out_cb<3>().set(FUNC(cclimber_state::sidebg_enable_w));
m_mainlatch->q_out_cb<4>().set(FUNC(cclimber_state::palette_bank_w));
- MCFG_DEVICE_ADD("audiocpu", Z80,XTAL(4'000'000)/2) /* verified on pcb */
- MCFG_DEVICE_PROGRAM_MAP(swimmer_audio_map)
- MCFG_DEVICE_IO_MAP(swimmer_audio_portmap)
- MCFG_DEVICE_PERIODIC_INT_DRIVER(cclimber_state, nmi_line_pulse, (double)4000000/16384) /* IRQs are triggered by the main CPU */
+ Z80(config, m_audiocpu, XTAL(4'000'000)/2); /* verified on pcb */
+ m_audiocpu->set_addrmap(AS_PROGRAM, &cclimber_state::swimmer_audio_map);
+ m_audiocpu->set_addrmap(AS_IO, &cclimber_state::swimmer_audio_portmap);
+ m_audiocpu->set_periodic_int(FUNC(cclimber_state::nmi_line_pulse), attotime::from_hz((double)4000000/16384)); /* IRQs are triggered by the main CPU */
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE(60.57) /* verified on pcb */
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MCFG_SCREEN_SIZE(32*8, 32*8)
- MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MCFG_SCREEN_UPDATE_DRIVER(cclimber_state, screen_update_swimmer)
- MCFG_SCREEN_PALETTE(m_palette)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cclimber_state, vblank_irq))
+ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
+ screen.set_refresh_hz(60.57); /* verified on pcb */
+ screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
+ screen.set_size(32*8, 32*8);
+ screen.set_visarea(0*8, 32*8-1, 2*8, 30*8-1);
+ screen.set_screen_update(FUNC(cclimber_state::screen_update_swimmer));
+ screen.set_palette(m_palette);
+ screen.screen_vblank().set(FUNC(cclimber_state::vblank_irq));
GFXDECODE(config, m_gfxdecode, m_palette, gfx_swimmer);
PALETTE(config, m_palette, FUNC(cclimber_state::swimmer_palette), 32*8+4*8+1);
@@ -1280,7 +1282,7 @@ MACHINE_CONFIG_START(cclimber_state::swimmer)
AY8910(config, "ay1", XTAL(4'000'000)/2).add_route(ALL_OUTPUTS, "speaker", 0.25); /* verified on pcb */
AY8910(config, "ay2", XTAL(4'000'000)/2).add_route(ALL_OUTPUTS, "speaker", 0.25); /* verified on pcb */
-MACHINE_CONFIG_END
+}
void cclimber_state::guzzler(machine_config &config)
{