summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author cam900 <dbtlrchl@naver.com>2019-02-17 21:09:06 +0900
committer Vas Crabb <cuavas@users.noreply.github.com>2019-02-17 23:14:03 +1100
commit7967b9e3d5d3e6e59858bfc0c2864082a21816fa (patch)
tree3404eb1d27cef39267f62904637e4d193ed39e48
parentd72df29988fdf0a3076ca85d2f506f87ef1ffb0d (diff)
Remove MCFG_DEVICE_DISASSEMBLE_OVERRIDE usage
coco12.cpp, coco3.cpp Minor MCFG removals dgn_beta.cpp, palm.cpp : Remove MCFGs
-rw-r--r--src/emu/didisasm.h3
-rw-r--r--src/mame/drivers/coco12.cpp44
-rw-r--r--src/mame/drivers/coco3.cpp41
-rw-r--r--src/mame/drivers/dgn_beta.cpp29
-rw-r--r--src/mame/drivers/palm.cpp29
5 files changed, 75 insertions, 71 deletions
diff --git a/src/emu/didisasm.h b/src/emu/didisasm.h
index 751ba86b2b6..c63fe0cc421 100644
--- a/src/emu/didisasm.h
+++ b/src/emu/didisasm.h
@@ -18,9 +18,6 @@
#include <utility>
-#define MCFG_DEVICE_DISASSEMBLE_OVERRIDE(_class, _func) \
- dynamic_cast<device_disasm_interface *>(device)->set_dasm_override(dasm_override_delegate(&_class::_func, #_class "::" #_func, nullptr, (_class *)nullptr));
-
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp
index 19a4ac28818..22b0b43731f 100644
--- a/src/mame/drivers/coco12.cpp
+++ b/src/mame/drivers/coco12.cpp
@@ -436,9 +436,9 @@ MACHINE_CONFIG_START(coco12_state::coco)
MCFG_DEVICE_CLOCK(XTAL(14'318'181) / 16)
// basic machine hardware
- MCFG_DEVICE_ADD(MAINCPU_TAG, MC6809E, DERIVED_CLOCK(1, 1))
- MCFG_DEVICE_PROGRAM_MAP(coco_mem)
- MCFG_DEVICE_DISASSEMBLE_OVERRIDE(coco_state, dasm_override)
+ MC6809E(config, m_maincpu, DERIVED_CLOCK(1, 1));
+ m_maincpu->set_addrmap(AS_PROGRAM, &coco12_state::coco_mem);
+ m_maincpu->set_dasm_override(FUNC(coco_state::dasm_override));
// devices
pia6821_device &pia0(PIA6821(config, PIA0_TAG, 0));
@@ -463,7 +463,7 @@ MACHINE_CONFIG_START(coco12_state::coco)
m_sam->res_rd_callback().set(FUNC(coco12_state::sam_read));
// Becker Port device
- MCFG_DEVICE_ADD(DWSOCK_TAG, COCO_DWSOCK, 0)
+ COCO_DWSOCK(config, DWSOCK_TAG, 0);
CASSETTE(config, m_cassette);
m_cassette->set_formats(coco_cassette_formats);
@@ -502,12 +502,13 @@ MACHINE_CONFIG_START(coco12_state::coco)
SOFTWARE_LIST(config, "dragon_cart_list").set_compatible("dragon_cart");
MACHINE_CONFIG_END
-MACHINE_CONFIG_START(coco12_state::cocoh)
+void coco12_state::cocoh(machine_config &config)
+{
coco(config);
- MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
- MCFG_DEVICE_PROGRAM_MAP(coco_mem)
+ HD6309E(config.replace(), m_maincpu, DERIVED_CLOCK(1, 1));
+ m_maincpu->set_addrmap(AS_PROGRAM, &coco12_state::coco_mem);
m_ram->set_default_size("64K");
-MACHINE_CONFIG_END
+}
void coco12_state::cocoe(machine_config &config)
{
@@ -520,12 +521,13 @@ void coco12_state::cocoe(machine_config &config)
COCO_VHD(config, m_vhd_1, 0, m_maincpu);
}
-MACHINE_CONFIG_START(coco12_state::cocoeh)
+void coco12_state::cocoeh(machine_config &config)
+{
cocoe(config);
- MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
- MCFG_DEVICE_PROGRAM_MAP(coco_mem)
+ HD6309E(config.replace(), m_maincpu, DERIVED_CLOCK(1, 1));
+ m_maincpu->set_addrmap(AS_PROGRAM, &coco12_state::coco_mem);
m_ram->set_default_size("64K");
-MACHINE_CONFIG_END
+}
void coco12_state::coco2(machine_config &config)
{
@@ -538,12 +540,13 @@ void coco12_state::coco2(machine_config &config)
COCO_VHD(config, m_vhd_1, 0, m_maincpu);
}
-MACHINE_CONFIG_START(coco12_state::coco2h)
+void coco12_state::coco2h(machine_config &config)
+{
coco2(config);
- MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
- MCFG_DEVICE_PROGRAM_MAP(coco_mem)
+ HD6309E(config.replace(), m_maincpu, DERIVED_CLOCK(1, 1));
+ m_maincpu->set_addrmap(AS_PROGRAM, &coco12_state::coco_mem);
m_ram->set_default_size("64K");
-MACHINE_CONFIG_END
+}
void coco12_state::coco2b(machine_config &config)
{
@@ -555,12 +558,13 @@ void coco12_state::coco2b(machine_config &config)
m_vdg->input_callback().set(m_sam, FUNC(sam6883_device::display_read));
}
-MACHINE_CONFIG_START(coco12_state::coco2bh)
+void coco12_state::coco2bh(machine_config &config)
+{
coco2b(config);
- MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
- MCFG_DEVICE_PROGRAM_MAP(coco_mem)
+ HD6309E(config.replace(), m_maincpu, DERIVED_CLOCK(1, 1));
+ m_maincpu->set_addrmap(AS_PROGRAM, &coco12_state::coco_mem);
m_ram->set_default_size("64K");
-MACHINE_CONFIG_END
+}
void coco12_state::cp400(machine_config &config)
{
diff --git a/src/mame/drivers/coco3.cpp b/src/mame/drivers/coco3.cpp
index be945c8ba89..c341b6f3215 100644
--- a/src/mame/drivers/coco3.cpp
+++ b/src/mame/drivers/coco3.cpp
@@ -247,9 +247,9 @@ MACHINE_CONFIG_START(coco3_state::coco3)
MCFG_DEVICE_CLOCK(XTAL(28'636'363) / 32)
// basic machine hardware
- MCFG_DEVICE_ADD(MAINCPU_TAG, MC6809E, DERIVED_CLOCK(1, 1))
- MCFG_DEVICE_PROGRAM_MAP(coco3_mem)
- MCFG_DEVICE_DISASSEMBLE_OVERRIDE(coco_state, dasm_override)
+ MC6809E(config, m_maincpu, DERIVED_CLOCK(1, 1));
+ m_maincpu->set_addrmap(AS_PROGRAM, &coco3_state::coco3_mem);
+ m_maincpu->set_dasm_override(FUNC(coco_state::dasm_override));
// devices
pia6821_device &pia0(PIA6821(config, PIA0_TAG, 0));
@@ -271,7 +271,7 @@ MACHINE_CONFIG_START(coco3_state::coco3)
pia1.irqb_handler().set(FUNC(coco_state::pia1_firq_b));
// Becker Port device
- MCFG_DEVICE_ADD(DWSOCK_TAG, COCO_DWSOCK, 0)
+ COCO_DWSOCK(config, DWSOCK_TAG, 0);
CASSETTE(config, m_cassette);
m_cassette->set_formats(coco_cassette_formats);
@@ -301,20 +301,20 @@ MACHINE_CONFIG_START(coco3_state::coco3)
m_gime->floating_bus_rd_callback().set(FUNC(coco3_state::floating_bus_r));
// composite monitor
- MCFG_SCREEN_ADD(COMPOSITE_SCREEN_TAG, RASTER)
- MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_SCREEN_UPDATE_DRIVER(coco3_state, screen_update)
- MCFG_SCREEN_SIZE(640, 243)
- MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 1, 241-1)
- MCFG_SCREEN_VBLANK_TIME(0)
+ screen_device &composite_screen(SCREEN(config, COMPOSITE_SCREEN_TAG, SCREEN_TYPE_RASTER));
+ composite_screen.set_refresh_hz(60);
+ composite_screen.set_screen_update(FUNC(coco3_state::screen_update));
+ composite_screen.set_size(640, 243);
+ composite_screen.set_visarea(0, 640-1, 1, 241-1);
+ composite_screen.set_vblank_time(0);
// RGB monitor
- MCFG_SCREEN_ADD(RGB_SCREEN_TAG, RASTER)
- MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_SCREEN_UPDATE_DRIVER(coco3_state, screen_update)
- MCFG_SCREEN_SIZE(640, 243)
- MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 1, 241-1)
- MCFG_SCREEN_VBLANK_TIME(0)
+ screen_device &rgb_screen(SCREEN(config, RGB_SCREEN_TAG, SCREEN_TYPE_RASTER));
+ rgb_screen.set_refresh_hz(60);
+ rgb_screen.set_screen_update(FUNC(coco3_state::screen_update));
+ rgb_screen.set_size(640, 243);
+ rgb_screen.set_visarea(0, 640-1, 1, 241-1);
+ rgb_screen.set_vblank_time(0);
// sound hardware
coco_sound(config);
@@ -346,11 +346,12 @@ MACHINE_CONFIG_START(coco3_state::coco3p)
m_gime->floating_bus_rd_callback().set(FUNC(coco3_state::floating_bus_r));
MACHINE_CONFIG_END
-MACHINE_CONFIG_START(coco3_state::coco3h)
+void coco3_state::coco3h(machine_config &config)
+{
coco3(config);
- MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
- MCFG_DEVICE_PROGRAM_MAP(coco3_mem)
-MACHINE_CONFIG_END
+ HD6309E(config.replace(), m_maincpu, DERIVED_CLOCK(1, 1));
+ m_maincpu->set_addrmap(AS_PROGRAM, &coco3_state::coco3_mem);
+}
void coco3_state::coco3dw1(machine_config &config)
{
diff --git a/src/mame/drivers/dgn_beta.cpp b/src/mame/drivers/dgn_beta.cpp
index fcbdff7c10b..3e635eab3d6 100644
--- a/src/mame/drivers/dgn_beta.cpp
+++ b/src/mame/drivers/dgn_beta.cpp
@@ -317,24 +317,25 @@ static void dgnbeta_floppies(device_slot_interface &device)
device.option_add("dd", FLOPPY_35_DD);
}
-MACHINE_CONFIG_START(dgn_beta_state::dgnbeta)
+void dgn_beta_state::dgnbeta(machine_config &config)
+{
/* basic machine hardware */
- MCFG_DEVICE_ADD(MAINCPU_TAG, MC6809E, DGNBETA_CPU_SPEED_HZ) /* 2 MHz */
- MCFG_DEVICE_PROGRAM_MAP(dgnbeta_map)
- MCFG_DEVICE_DISASSEMBLE_OVERRIDE(dgn_beta_state, dgnbeta_dasm_override)
+ MC6809E(config, m_maincpu, DGNBETA_CPU_SPEED_HZ); /* 2 MHz */
+ m_maincpu->set_addrmap(AS_PROGRAM, &dgn_beta_state::dgnbeta_map);
+ m_maincpu->set_dasm_override(FUNC(dgn_beta_state::dgnbeta_dasm_override));
/* both cpus in the beta share the same address/data buses */
- MCFG_DEVICE_ADD(DMACPU_TAG, MC6809E, DGNBETA_CPU_SPEED_HZ) /* 2 MHz */
- MCFG_DEVICE_PROGRAM_MAP(dgnbeta_map)
+ MC6809E(config, m_dmacpu, DGNBETA_CPU_SPEED_HZ); /* 2 MHz */
+ m_dmacpu->set_addrmap(AS_PROGRAM, &dgn_beta_state::dgnbeta_map);
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE(DGNBETA_FRAMES_PER_SECOND)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(100))
- MCFG_SCREEN_SIZE(700,550)
- MCFG_SCREEN_VISIBLE_AREA(0, 699, 0, 549)
- MCFG_SCREEN_UPDATE_DEVICE( "crtc", hd6845_device, screen_update )
- MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
+ screen.set_refresh_hz(DGNBETA_FRAMES_PER_SECOND);
+ screen.set_vblank_time(ATTOSECONDS_IN_USEC(100));
+ screen.set_size(700,550);
+ screen.set_visarea(0, 699, 0, 549);
+ screen.set_screen_update("crtc", FUNC(hd6845_device::screen_update));
+ screen.set_video_attributes(VIDEO_UPDATE_AFTER_VBLANK);
GFXDECODE(config, "gfxdecode", m_palette, gfx_dgnbeta);
PALETTE(config, m_palette, FUNC(dgn_beta_state::dgn_beta_palette), ARRAY_LENGTH(dgnbeta_pens));
@@ -395,7 +396,7 @@ MACHINE_CONFIG_START(dgn_beta_state::dgnbeta)
/* software lists */
SOFTWARE_LIST(config, "flop_list").set_original("dgnbeta_flop");
-MACHINE_CONFIG_END
+}
ROM_START(dgnbeta)
ROM_REGION(0x4000,MAINCPU_TAG,0)
diff --git a/src/mame/drivers/palm.cpp b/src/mame/drivers/palm.cpp
index d040e84ce6f..45b20b9a82a 100644
--- a/src/mame/drivers/palm.cpp
+++ b/src/mame/drivers/palm.cpp
@@ -182,23 +182,24 @@ void palm_state::palm_map(address_map &map)
MACHINE DRIVERS
***************************************************************************/
-MACHINE_CONFIG_START(palm_state::palm)
+void palm_state::palm(machine_config &config)
+{
/* basic machine hardware */
- MCFG_DEVICE_ADD( "maincpu", M68000, 32768*506 ) /* 16.580608 MHz */
- MCFG_DEVICE_PROGRAM_MAP( palm_map)
- MCFG_DEVICE_DISASSEMBLE_OVERRIDE(palm_state, palm_dasm_override)
+ M68000(config, m_maincpu, 32768*506); /* 16.580608 MHz */
+ m_maincpu->set_addrmap(AS_PROGRAM, &palm_state::palm_map);
+ m_maincpu->set_dasm_override(FUNC(palm_state::palm_dasm_override));
- config.m_minimum_quantum = attotime::from_hz(60);
+ config.m_minimum_quantum = attotime::from_hz(60);
- MCFG_SCREEN_ADD( "screen", LCD )
- MCFG_SCREEN_REFRESH_RATE( 60 )
- MCFG_SCREEN_VBLANK_TIME( ATTOSECONDS_IN_USEC(1260) )
/* video hardware */
- MCFG_SCREEN_VIDEO_ATTRIBUTES( VIDEO_UPDATE_BEFORE_VBLANK )
- MCFG_SCREEN_SIZE( 160, 220 )
- MCFG_SCREEN_VISIBLE_AREA( 0, 159, 0, 219 )
- MCFG_SCREEN_UPDATE_DEVICE(MC68328_TAG, mc68328_device, screen_update)
- MCFG_SCREEN_PALETTE("palette")
+ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_LCD));
+ screen.set_refresh_hz(60);
+ screen.set_vblank_time(ATTOSECONDS_IN_USEC(1260));
+ screen.set_video_attributes(VIDEO_UPDATE_BEFORE_VBLANK);
+ screen.set_size(160, 220);
+ screen.set_visarea(0, 159, 0, 219);
+ screen.set_screen_update(MC68328_TAG, FUNC(mc68328_device::screen_update));
+ screen.set_palette("palette");
PALETTE(config, "palette", FUNC(palm_state::palm_palette), 2);
@@ -217,7 +218,7 @@ MACHINE_CONFIG_START(palm_state::palm)
m_lsi->out_spim().set(FUNC(palm_state::palm_spim_out));
m_lsi->in_spim().set(FUNC(palm_state::palm_spim_in));
m_lsi->spim_xch_trigger().set(FUNC(palm_state::palm_spim_exchange));
-MACHINE_CONFIG_END
+}
static INPUT_PORTS_START( palm )
PORT_START( "PENX" )