From 34be7d416603f0601877f208e6250dae416a92b2 Mon Sep 17 00:00:00 2001 From: AJR Date: Thu, 14 Apr 2016 21:20:49 -0400 Subject: Eliminate device_t::static_config, a type-unsafe legacy feature. Rewrite or remove every last instance of MCFG_DEVICE_CONFIG and its two aliases, including within comments and dead code. Make the Z80/Z180 daisy chain an interface that interfaces with the existing interface. Z8000 has been hooked up to this as well (p8000_16 already configures it), but currently does nothing with it. --- src/mame/audio/cinemat.cpp | 2 +- src/mame/drivers/4dpi.cpp | 1 - src/mame/drivers/a5105.cpp | 2 +- src/mame/drivers/abc80.cpp | 2 +- src/mame/drivers/abc80x.cpp | 8 ++++---- src/mame/drivers/altos5.cpp | 2 +- src/mame/drivers/ampro.cpp | 2 +- src/mame/drivers/apexc.cpp | 1 - src/mame/drivers/astrocde.cpp | 2 +- src/mame/drivers/attache.cpp | 2 +- src/mame/drivers/aussiebyte.cpp | 2 +- src/mame/drivers/babbage.cpp | 2 +- src/mame/drivers/bbcbc.cpp | 2 +- src/mame/drivers/bcs3.cpp | 4 ++-- src/mame/drivers/bigbord2.cpp | 2 +- src/mame/drivers/binbug.cpp | 2 +- src/mame/drivers/br8641.cpp | 2 +- src/mame/drivers/bullet.cpp | 4 ++-- src/mame/drivers/c80.cpp | 2 +- src/mame/drivers/cchasm.cpp | 2 +- src/mame/drivers/comquest.cpp | 3 --- src/mame/drivers/csplayh5.cpp | 2 +- src/mame/drivers/czk80.cpp | 2 +- src/mame/drivers/dlair.cpp | 2 +- src/mame/drivers/einstein.cpp | 2 +- src/mame/drivers/ghosteo.cpp | 2 +- src/mame/drivers/gp_1.cpp | 2 +- src/mame/drivers/gp_2.cpp | 2 +- src/mame/drivers/hikaru.cpp | 14 ++++++++++---- src/mame/drivers/huebler.cpp | 2 +- src/mame/drivers/igs011.cpp | 2 -- src/mame/drivers/indy_indigo2.cpp | 17 ++++++----------- src/mame/drivers/jankenmn.cpp | 2 +- src/mame/drivers/kaypro.cpp | 4 ++-- src/mame/drivers/kc.cpp | 4 ++-- src/mame/drivers/kenseim.cpp | 2 +- src/mame/drivers/llc.cpp | 4 ++-- src/mame/drivers/m5.cpp | 4 ++-- src/mame/drivers/magictg.cpp | 18 ++---------------- src/mame/drivers/mbee.cpp | 4 ++-- src/mame/drivers/mc80.cpp | 2 +- src/mame/drivers/mcr.cpp | 4 ++-- src/mame/drivers/mcr3.cpp | 2 +- src/mame/drivers/meritm.cpp | 2 +- src/mame/drivers/mpf1.cpp | 6 +++--- src/mame/drivers/mtx.cpp | 4 ++-- src/mame/drivers/n64.cpp | 14 +++----------- src/mame/drivers/nanos.cpp | 2 +- src/mame/drivers/nbmj9195.cpp | 4 ++-- src/mame/drivers/niyanpai.cpp | 2 +- src/mame/drivers/onyx.cpp | 4 ++-- src/mame/drivers/osbexec.cpp | 2 +- src/mame/drivers/p8k.cpp | 4 ++-- src/mame/drivers/pachifev.cpp | 9 ++------- src/mame/drivers/pasopia.cpp | 2 +- src/mame/drivers/pasopia7.cpp | 2 +- src/mame/drivers/pcm.cpp | 2 +- src/mame/drivers/pdp1.cpp | 2 +- src/mame/drivers/pipeline.cpp | 2 +- src/mame/drivers/proconn.cpp | 2 +- src/mame/drivers/pulsar.cpp | 2 +- src/mame/drivers/pve500.cpp | 2 +- src/mame/drivers/rt1715.cpp | 2 +- src/mame/drivers/senjyo.cpp | 2 +- src/mame/drivers/super6.cpp | 2 +- src/mame/drivers/super80.cpp | 4 ++-- src/mame/drivers/superslave.cpp | 2 +- src/mame/drivers/thomson.cpp | 8 ++++---- src/mame/drivers/tiki100.cpp | 2 +- src/mame/drivers/trs80m2.cpp | 4 ++-- src/mame/drivers/ts802.cpp | 2 +- src/mame/drivers/ts803.cpp | 2 +- src/mame/drivers/univac.cpp | 2 +- src/mame/drivers/vcs80.cpp | 2 +- src/mame/drivers/x1.cpp | 4 ++-- src/mame/drivers/x1twin.cpp | 2 +- src/mame/drivers/xerox820.cpp | 4 ++-- src/mame/drivers/z9001.cpp | 2 +- src/mame/machine/appldriv.h | 12 ++++++------ src/mame/machine/applefdc.cpp | 9 ++++----- src/mame/machine/applefdc.h | 15 +++++++++++---- src/mame/machine/inder_sb.cpp | 2 +- src/mame/machine/sonydriv.h | 12 ++++++------ src/mame/machine/swim.h | 4 ++-- 84 files changed, 146 insertions(+), 173 deletions(-) (limited to 'src/mame') diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp index 3a59752f1e9..99260c00a61 100644 --- a/src/mame/audio/cinemat.cpp +++ b/src/mame/audio/cinemat.cpp @@ -1311,7 +1311,7 @@ MACHINE_CONFIG_FRAGMENT( demon_sound ) /* basic machine hardware */ MCFG_CPU_ADD("audiocpu", Z80, 3579545) - MCFG_CPU_CONFIG(daisy_chain) + MCFG_Z80_DAISY_CHAIN(daisy_chain) MCFG_CPU_PROGRAM_MAP(demon_sound_map) MCFG_CPU_IO_MAP(demon_sound_ports) diff --git a/src/mame/drivers/4dpi.cpp b/src/mame/drivers/4dpi.cpp index 7feead80bea..3fbe6ed8244 100644 --- a/src/mame/drivers/4dpi.cpp +++ b/src/mame/drivers/4dpi.cpp @@ -229,7 +229,6 @@ ADDRESS_MAP_END static MACHINE_CONFIG_START( sgi_ip6, sgi_ip6_state ) MCFG_CPU_ADD( "maincpu", R3041, 20000000 ) // FIXME: Should be R2000 MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG) - MCFG_CPU_CONFIG( config ) MCFG_CPU_PROGRAM_MAP( sgi_ip6_map ) MCFG_CPU_VBLANK_INT_DRIVER("screen", sgi_ip6_state, sgi_ip6_vbl) diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp index de95d2a33a6..f0ac55e9b03 100644 --- a/src/mame/drivers/a5105.cpp +++ b/src/mame/drivers/a5105.cpp @@ -557,7 +557,7 @@ static MACHINE_CONFIG_START( a5105, a5105_state ) MCFG_CPU_ADD("maincpu",Z80, XTAL_15MHz / 4) MCFG_CPU_PROGRAM_MAP(a5105_mem) MCFG_CPU_IO_MAP(a5105_io) - MCFG_CPU_CONFIG(a5105_daisy_chain) + MCFG_Z80_DAISY_CHAIN(a5105_daisy_chain) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp index 35a0bc0d9ca..e4d5100e777 100644 --- a/src/mame/drivers/abc80.cpp +++ b/src/mame/drivers/abc80.cpp @@ -524,7 +524,7 @@ static MACHINE_CONFIG_START( abc80, abc80_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_11_9808MHz/2/2) // 2.9952 MHz MCFG_CPU_PROGRAM_MAP(abc80_mem) MCFG_CPU_IO_MAP(abc80_io) - MCFG_CPU_CONFIG(abc80_daisy_chain) + MCFG_Z80_DAISY_CHAIN(abc80_daisy_chain) // video hardware MCFG_FRAGMENT_ADD(abc80_video) diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp index eb171c990fd..4e941c927a8 100644 --- a/src/mame/drivers/abc80x.cpp +++ b/src/mame/drivers/abc80x.cpp @@ -1015,7 +1015,7 @@ void abc806_state::machine_reset() static MACHINE_CONFIG_START( abc800c, abc800c_state ) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2) - MCFG_CPU_CONFIG(abc800_daisy_chain) + MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain) MCFG_CPU_PROGRAM_MAP(abc800c_mem) MCFG_CPU_IO_MAP(abc800c_io) @@ -1090,7 +1090,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( abc800m, abc800m_state ) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2) - MCFG_CPU_CONFIG(abc800_daisy_chain) + MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain) MCFG_CPU_PROGRAM_MAP(abc800m_mem) MCFG_CPU_IO_MAP(abc800m_io) @@ -1165,7 +1165,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( abc802, abc802_state ) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2) - MCFG_CPU_CONFIG(abc800_daisy_chain) + MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain) MCFG_CPU_PROGRAM_MAP(abc802_mem) MCFG_CPU_IO_MAP(abc802_io) @@ -1241,7 +1241,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( abc806, abc806_state ) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2) - MCFG_CPU_CONFIG(abc800_daisy_chain) + MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain) MCFG_CPU_PROGRAM_MAP(abc806_mem) MCFG_CPU_IO_MAP(abc806_io) diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp index 96fd75ae2e4..51542eaa43e 100644 --- a/src/mame/drivers/altos5.cpp +++ b/src/mame/drivers/altos5.cpp @@ -381,7 +381,7 @@ static MACHINE_CONFIG_START( altos5, altos5_state ) MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(altos5_mem) MCFG_CPU_IO_MAP(altos5_io) - MCFG_CPU_CONFIG(daisy_chain_intf) + MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) /* devices */ MCFG_DEVICE_ADD("z80dma", Z80DMA, XTAL_8MHz / 2) diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp index 6aef2a6f984..f111312c3f1 100644 --- a/src/mame/drivers/ampro.cpp +++ b/src/mame/drivers/ampro.cpp @@ -160,7 +160,7 @@ static MACHINE_CONFIG_START( ampro, ampro_state ) MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(ampro_mem) MCFG_CPU_IO_MAP(ampro_io) - MCFG_CPU_CONFIG(daisy_chain_intf) + MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) MCFG_MACHINE_RESET_OVERRIDE(ampro_state, ampro) /* Devices */ diff --git a/src/mame/drivers/apexc.cpp b/src/mame/drivers/apexc.cpp index dd992f1a209..d56f89e5e24 100644 --- a/src/mame/drivers/apexc.cpp +++ b/src/mame/drivers/apexc.cpp @@ -871,7 +871,6 @@ static MACHINE_CONFIG_START( apexc, apexc_state ) /* basic machine hardware */ /* APEXC CPU @ 2.0 kHz (memory word clock frequency) */ MCFG_CPU_ADD("maincpu", APEXC, 2000) - /*MCFG_CPU_CONFIG(NULL)*/ MCFG_CPU_PROGRAM_MAP(apexc_mem_map) MCFG_CPU_IO_MAP(apexc_io_map) /* dummy interrupt: handles the control panel */ diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp index 43101fc49ed..5883edcdaa1 100644 --- a/src/mame/drivers/astrocde.cpp +++ b/src/mame/drivers/astrocde.cpp @@ -1441,7 +1441,7 @@ static MACHINE_CONFIG_DERIVED( tenpindx, astrocade_16color_base ) MCFG_CPU_IO_MAP(port_map_16col_pattern_nosound) MCFG_CPU_ADD("sub", Z80, ASTROCADE_CLOCK/4) /* real clock unknown */ - MCFG_CPU_CONFIG(tenpin_daisy_chain) + MCFG_Z80_DAISY_CHAIN(tenpin_daisy_chain) MCFG_CPU_PROGRAM_MAP(tenpin_sub_map) MCFG_CPU_IO_MAP(tenpin_sub_io_map) diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index 69bcb219ee6..64649910a4f 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -927,7 +927,7 @@ static MACHINE_CONFIG_START( attache, attache_state ) MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(attache_map) MCFG_CPU_IO_MAP(attache_io) - MCFG_CPU_CONFIG(attache_daisy_chain) + MCFG_Z80_DAISY_CHAIN(attache_daisy_chain) MCFG_QUANTUM_TIME(attotime::from_hz(60)) diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp index eb790c0ae00..1fdf1cd1fcb 100644 --- a/src/mame/drivers/aussiebyte.cpp +++ b/src/mame/drivers/aussiebyte.cpp @@ -447,7 +447,7 @@ static MACHINE_CONFIG_START( aussiebyte, aussiebyte_state ) MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(aussiebyte_map) MCFG_CPU_IO_MAP(aussiebyte_io) - MCFG_CPU_CONFIG(daisy_chain_intf) + MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) MCFG_MACHINE_RESET_OVERRIDE(aussiebyte_state, aussiebyte ) diff --git a/src/mame/drivers/babbage.cpp b/src/mame/drivers/babbage.cpp index f3d9c187fc8..f98ade87c91 100644 --- a/src/mame/drivers/babbage.cpp +++ b/src/mame/drivers/babbage.cpp @@ -237,7 +237,7 @@ static MACHINE_CONFIG_START( babbage, babbage_state ) MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK) //2.5MHz MCFG_CPU_PROGRAM_MAP(babbage_map) MCFG_CPU_IO_MAP(babbage_io) - MCFG_CPU_CONFIG(babbage_daisy_chain) + MCFG_Z80_DAISY_CHAIN(babbage_daisy_chain) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_babbage) diff --git a/src/mame/drivers/bbcbc.cpp b/src/mame/drivers/bbcbc.cpp index c2d6d661d9f..96e346aed67 100644 --- a/src/mame/drivers/bbcbc.cpp +++ b/src/mame/drivers/bbcbc.cpp @@ -131,7 +131,7 @@ static MACHINE_CONFIG_START( bbcbc, bbcbc_state ) MCFG_CPU_ADD( "maincpu", Z80, MAIN_CLOCK / 8 ) MCFG_CPU_PROGRAM_MAP( bbcbc_prg) MCFG_CPU_IO_MAP( bbcbc_io) - MCFG_CPU_CONFIG(bbcbc_daisy_chain) + MCFG_Z80_DAISY_CHAIN(bbcbc_daisy_chain) MCFG_DEVICE_ADD("z80pio", Z80PIO, MAIN_CLOCK/8) diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp index eab460c0cc3..bc38ce59c9a 100644 --- a/src/mame/drivers/bcs3.cpp +++ b/src/mame/drivers/bcs3.cpp @@ -378,7 +378,7 @@ static MACHINE_CONFIG_START( bcs3, bcs3_state ) MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz /2) MCFG_CPU_PROGRAM_MAP(bcs3_mem) MCFG_CPU_IO_MAP(bcs3_io) - MCFG_CPU_CONFIG(daisy_chain_intf) + MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -405,7 +405,7 @@ static MACHINE_CONFIG_START( bcs3a, bcs3_state ) MCFG_CPU_ADD("maincpu", Z80, XTAL_7MHz /2) MCFG_CPU_PROGRAM_MAP(bcs3a_mem) MCFG_CPU_IO_MAP(bcs3_io) - MCFG_CPU_CONFIG(daisy_chain_intf) + MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp index 7b00129e939..88af1c08601 100644 --- a/src/mame/drivers/bigbord2.cpp +++ b/src/mame/drivers/bigbord2.cpp @@ -545,7 +545,7 @@ static MACHINE_CONFIG_START( bigbord2, bigbord2_state ) MCFG_CPU_ADD(Z80_TAG, Z80, MAIN_CLOCK) MCFG_CPU_PROGRAM_MAP(bigbord2_mem) MCFG_CPU_IO_MAP(bigbord2_io) - MCFG_CPU_CONFIG(bigbord2_daisy_chain) + MCFG_Z80_DAISY_CHAIN(bigbord2_daisy_chain) /* video hardware */ MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp index fa05ab12f59..8abd74a23cd 100644 --- a/src/mame/drivers/binbug.cpp +++ b/src/mame/drivers/binbug.cpp @@ -531,7 +531,7 @@ static MACHINE_CONFIG_START( dg680, dg680_state ) MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz / 4) MCFG_CPU_PROGRAM_MAP(dg680_mem) MCFG_CPU_IO_MAP(dg680_io) - MCFG_CPU_CONFIG(dg680_daisy_chain) + MCFG_Z80_DAISY_CHAIN(dg680_daisy_chain) /* video hardware */ MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber) diff --git a/src/mame/drivers/br8641.cpp b/src/mame/drivers/br8641.cpp index ce8e204e4ee..1e0197a86f1 100644 --- a/src/mame/drivers/br8641.cpp +++ b/src/mame/drivers/br8641.cpp @@ -157,7 +157,7 @@ static MACHINE_CONFIG_START( brandt8641, brandt8641_state ) MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) // U4 ,4MHz crystal on board MCFG_CPU_PROGRAM_MAP(brandt8641_mem) MCFG_CPU_IO_MAP(brandt8641_io) - MCFG_CPU_CONFIG(daisy_chain_intf) + MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp index 97a7d5ef81f..186f19043b5 100644 --- a/src/mame/drivers/bullet.cpp +++ b/src/mame/drivers/bullet.cpp @@ -1102,7 +1102,7 @@ static MACHINE_CONFIG_START( bullet, bullet_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) MCFG_CPU_PROGRAM_MAP(bullet_mem) MCFG_CPU_IO_MAP(bullet_io) - MCFG_CPU_CONFIG(daisy_chain) + MCFG_Z80_DAISY_CHAIN(daisy_chain) // devices MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_16MHz/4) @@ -1182,7 +1182,7 @@ static MACHINE_CONFIG_START( bulletf, bulletf_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) MCFG_CPU_PROGRAM_MAP(bulletf_mem) MCFG_CPU_IO_MAP(bulletf_io) - MCFG_CPU_CONFIG(daisy_chain) + MCFG_Z80_DAISY_CHAIN(daisy_chain) // devices MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_16MHz/4) diff --git a/src/mame/drivers/c80.cpp b/src/mame/drivers/c80.cpp index b1dfb1263aa..fa0f3244ce0 100644 --- a/src/mame/drivers/c80.cpp +++ b/src/mame/drivers/c80.cpp @@ -251,7 +251,7 @@ static MACHINE_CONFIG_START( c80, c80_state ) MCFG_CPU_ADD(Z80_TAG, Z80, 2500000) /* U880D */ MCFG_CPU_PROGRAM_MAP(c80_mem) MCFG_CPU_IO_MAP(c80_io) - MCFG_CPU_CONFIG(c80_daisy_chain) + MCFG_Z80_DAISY_CHAIN(c80_daisy_chain) /* video hardware */ MCFG_DEFAULT_LAYOUT( layout_c80 ) diff --git a/src/mame/drivers/cchasm.cpp b/src/mame/drivers/cchasm.cpp index 78a34741514..237f34e87f3 100644 --- a/src/mame/drivers/cchasm.cpp +++ b/src/mame/drivers/cchasm.cpp @@ -148,7 +148,7 @@ static MACHINE_CONFIG_START( cchasm, cchasm_state ) MCFG_CPU_PROGRAM_MAP(memmap) MCFG_CPU_ADD("audiocpu", Z80, 3584229) /* 3.58 MHz (from schematics) */ - MCFG_CPU_CONFIG(daisy_chain) + MCFG_Z80_DAISY_CHAIN(daisy_chain) MCFG_CPU_PROGRAM_MAP(sound_memmap) MCFG_CPU_IO_MAP(sound_portmap) diff --git a/src/mame/drivers/comquest.cpp b/src/mame/drivers/comquest.cpp index a4000192f2e..6a35917800a 100644 --- a/src/mame/drivers/comquest.cpp +++ b/src/mame/drivers/comquest.cpp @@ -210,8 +210,6 @@ void comquest_state::machine_reset() // membank(1)->set_base(mem+0x00000); } -static const UINT32 amask= 0xffff; - static MACHINE_CONFIG_START( comquest, comquest_state ) /* basic machine hardware */ @@ -244,7 +242,6 @@ static MACHINE_CONFIG_START( comquest, comquest_state ) */ MCFG_CPU_PROGRAM_MAP(comquest_mem) - MCFG_CPU_CONFIG( amask ) /* video hardware */ diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp index fa87c2f7a02..aadf7ecbdb6 100644 --- a/src/mame/drivers/csplayh5.cpp +++ b/src/mame/drivers/csplayh5.cpp @@ -466,7 +466,7 @@ static MACHINE_CONFIG_START( csplayh5, csplayh5_state ) #endif MCFG_CPU_ADD("audiocpu", TMPZ84C011, 8000000) /* TMPZ84C011, unknown clock */ - MCFG_CPU_CONFIG(daisy_chain_sound) + MCFG_Z80_DAISY_CHAIN(daisy_chain_sound) MCFG_CPU_PROGRAM_MAP(csplayh5_sound_map) MCFG_CPU_IO_MAP(csplayh5_sound_io_map) MCFG_TMPZ84C011_PORTA_WRITE_CB(WRITE8(csplayh5_state, soundcpu_porta_w)) diff --git a/src/mame/drivers/czk80.cpp b/src/mame/drivers/czk80.cpp index 1b0415d9b4f..ba528e1b833 100644 --- a/src/mame/drivers/czk80.cpp +++ b/src/mame/drivers/czk80.cpp @@ -193,7 +193,7 @@ static MACHINE_CONFIG_START( czk80, czk80_state ) MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(czk80_mem) MCFG_CPU_IO_MAP(czk80_io) - MCFG_CPU_CONFIG(daisy_chain) + MCFG_Z80_DAISY_CHAIN(daisy_chain) MCFG_MACHINE_RESET_OVERRIDE(czk80_state, czk80) MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0) diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp index 016e71a5358..fb1b3c21e8b 100644 --- a/src/mame/drivers/dlair.cpp +++ b/src/mame/drivers/dlair.cpp @@ -697,7 +697,7 @@ static MACHINE_CONFIG_START( dleuro, dlair_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_EURO/4) - MCFG_CPU_CONFIG(dleuro_daisy_chain) + MCFG_Z80_DAISY_CHAIN(dleuro_daisy_chain) MCFG_CPU_PROGRAM_MAP(dleuro_map) MCFG_CPU_IO_MAP(dleuro_io_map) diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp index c2fd45e06b8..d0f5bb73a05 100644 --- a/src/mame/drivers/einstein.cpp +++ b/src/mame/drivers/einstein.cpp @@ -686,7 +686,7 @@ static MACHINE_CONFIG_START( einstein, einstein_state ) MCFG_CPU_ADD(IC_I001, Z80, XTAL_X002 / 2) MCFG_CPU_PROGRAM_MAP(einstein_mem) MCFG_CPU_IO_MAP(einstein_io) - MCFG_CPU_CONFIG(einstein_daisy_chain) + MCFG_Z80_DAISY_CHAIN(einstein_daisy_chain) /* this is actually clocked at the system clock 4 MHz, but this would be too fast for our driver. So we update at 50Hz and hope this is good enough. */ diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp index 6a57e0ccba5..2e1c408ccf6 100644 --- a/src/mame/drivers/ghosteo.cpp +++ b/src/mame/drivers/ghosteo.cpp @@ -638,7 +638,7 @@ static MACHINE_CONFIG_START( ghosteo, ghosteo_state ) // MCFG_DEVICE_ADD("nand", NAND, 0) // MCFG_NAND_TYPE(NAND_CHIP_K9F5608U0D) // or another variant with ID 0xEC 0x75 ? -// MCFG_DEVICE_CONFIG(bballoon_nand_intf) +// MCFG_NAND_RNB_CALLBACK(DEVWRITELINE("s3c2410", s3c2410_device, s3c24xx_pin_frnb_w)) // MCFG_I2CMEM_ADD("i2cmem", 0xA0, 0, 0x100, NULL) diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp index 96d4e94cb78..330f49b36ff 100644 --- a/src/mame/drivers/gp_1.cpp +++ b/src/mame/drivers/gp_1.cpp @@ -421,7 +421,7 @@ static MACHINE_CONFIG_START( gp_1, gp_1_state ) MCFG_CPU_ADD("maincpu", Z80, 2457600) MCFG_CPU_PROGRAM_MAP(gp_1_map) MCFG_CPU_IO_MAP(gp_1_io) - MCFG_CPU_CONFIG(daisy_chain) + MCFG_Z80_DAISY_CHAIN(daisy_chain) MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mame/drivers/gp_2.cpp b/src/mame/drivers/gp_2.cpp index b829912b939..6046ede4f13 100644 --- a/src/mame/drivers/gp_2.cpp +++ b/src/mame/drivers/gp_2.cpp @@ -574,7 +574,7 @@ static MACHINE_CONFIG_START( gp_2, gp_2_state ) MCFG_CPU_ADD("maincpu", Z80, 2457600) MCFG_CPU_PROGRAM_MAP(gp_2_map) MCFG_CPU_IO_MAP(gp_2_io) - MCFG_CPU_CONFIG(daisy_chain) + MCFG_Z80_DAISY_CHAIN(daisy_chain) MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mame/drivers/hikaru.cpp b/src/mame/drivers/hikaru.cpp index b5939d4e09e..e2239e73c6d 100644 --- a/src/mame/drivers/hikaru.cpp +++ b/src/mame/drivers/hikaru.cpp @@ -385,8 +385,6 @@ Notes: #include "cpu/sh4/sh4.h" #define CPU_CLOCK (200000000) - /* MD2 MD1 MD0 MD6 MD4 MD3 MD5 MD7 MD8 */ -//static const struct sh4_config sh4cpu_config = { 1, 0, 1, 0, 0, 0, 1, 1, 0, CPU_CLOCK }; class hikaru_state : public driver_device { @@ -484,7 +482,16 @@ ADDRESS_MAP_END static MACHINE_CONFIG_START( hikaru, hikaru_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH4LE, CPU_CLOCK) -// MCFG_CPU_CONFIG(sh4cpu_config) +// MCFG_SH4_MD0(1) +// MCFG_SH4_MD1(0) +// MCFG_SH4_MD2(1) +// MCFG_SH4_MD3(0) +// MCFG_SH4_MD4(0) +// MCFG_SH4_MD5(1) +// MCFG_SH4_MD6(0) +// MCFG_SH4_MD7(1) +// MCFG_SH4_MD8(0) +// MCFG_SH4_CLOCK(CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(hikaru_map) // MCFG_CPU_IO_MAP(hikaru_port) // MCFG_CPU_VBLANK_INT("screen", hikaru,vblank) @@ -509,7 +516,6 @@ static MACHINE_CONFIG_START( hikaru, hikaru_state ) // MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") // MCFG_SOUND_ADD("aica", AICA, 0) -// MCFG_SOUND_CONFIG(aica_config) // MCFG_SOUND_ROUTE(0, "lspeaker", 2.0) // MCFG_SOUND_ROUTE(0, "rspeaker", 2.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/huebler.cpp b/src/mame/drivers/huebler.cpp index 1d5dda7ff73..26148bcbff6 100644 --- a/src/mame/drivers/huebler.cpp +++ b/src/mame/drivers/huebler.cpp @@ -330,7 +330,7 @@ static MACHINE_CONFIG_START( amu880, amu880_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10MHz/4) // U880D MCFG_CPU_PROGRAM_MAP(amu880_mem) MCFG_CPU_IO_MAP(amu880_io) - MCFG_CPU_CONFIG(amu880_daisy_chain) + MCFG_Z80_DAISY_CHAIN(amu880_daisy_chain) MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", amu880_state, keyboard_tick, attotime::from_hz(1500)) diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp index 0edcd3e7cb9..fb26115a720 100644 --- a/src/mame/drivers/igs011.cpp +++ b/src/mame/drivers/igs011.cpp @@ -4142,8 +4142,6 @@ static MACHINE_CONFIG_DERIVED( vbowl, igs011_base ) MCFG_DEVICE_REMOVE("oki") MCFG_ICS2115_ADD("ics", 0) MCFG_ICS2115_IRQ_CB(WRITELINE(igs011_state, sound_irq)) -// MCFG_SOUND_ADD("ics", ICS2115, 0) -// MCFG_SOUND_CONFIG(vbowl_ics2115_interface) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp index 20eee2b6f27..2631d9f66fb 100644 --- a/src/mame/drivers/indy_indigo2.cpp +++ b/src/mame/drivers/indy_indigo2.cpp @@ -1572,14 +1572,6 @@ INTERRUPT_GEN_MEMBER(ip22_state::ip22_vbl) } } -#if 0 -static const mips3_config config = -{ - 32768, /* code cache size */ - 32768 /* data cache size */ -}; -#endif - static MACHINE_CONFIG_FRAGMENT( cdrom_config ) MCFG_DEVICE_MODIFY( "cdda" ) MCFG_SOUND_ROUTE( 0, "^^^^lspeaker", 1.0 ) @@ -1588,7 +1580,8 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( ip225015, ip22_state ) MCFG_CPU_ADD( "maincpu", R5000BE, 50000000*3 ) - MCFG_CPU_CONFIG( config ) + //MCFG_MIPS3_ICACHE_SIZE(32768) + //MCFG_MIPS3_DCACHE_SIZE(32768) MCFG_CPU_PROGRAM_MAP( ip225015_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", ip22_state, ip22_vbl) @@ -1639,14 +1632,16 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( ip224613, ip225015 ) MCFG_CPU_REPLACE( "maincpu", R4600BE, 133333333 ) - MCFG_CPU_CONFIG( config ) + //MCFG_MIPS3_ICACHE_SIZE(32768) + //MCFG_MIPS3_DCACHE_SIZE(32768) MCFG_CPU_PROGRAM_MAP( ip225015_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", ip22_state, ip22_vbl) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( ip244415, ip225015 ) MCFG_CPU_REPLACE( "maincpu", R4600BE, 150000000 ) - MCFG_CPU_CONFIG( config ) + //MCFG_MIPS3_ICACHE_SIZE(32768) + //MCFG_MIPS3_DCACHE_SIZE(32768) MCFG_CPU_PROGRAM_MAP( ip225015_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", ip22_state, ip22_vbl) MACHINE_CONFIG_END diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp index 10195a3d4f1..3d8c2ffcf83 100644 --- a/src/mame/drivers/jankenmn.cpp +++ b/src/mame/drivers/jankenmn.cpp @@ -363,7 +363,7 @@ static const z80_daisy_config daisy_chain[] = static MACHINE_CONFIG_START( jankenmn, jankenmn_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 2.5 MHz */ - MCFG_CPU_CONFIG(daisy_chain) + MCFG_Z80_DAISY_CHAIN(daisy_chain) MCFG_CPU_PROGRAM_MAP(jankenmn_map) MCFG_CPU_IO_MAP(jankenmn_port_map) diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp index f8d78018e85..62e3b1eae87 100644 --- a/src/mame/drivers/kaypro.cpp +++ b/src/mame/drivers/kaypro.cpp @@ -196,7 +196,7 @@ static MACHINE_CONFIG_START( kayproii, kaypro_state ) MCFG_CPU_PROGRAM_MAP(kaypro_map) MCFG_CPU_IO_MAP(kayproii_io) MCFG_CPU_VBLANK_INT_DRIVER("screen", kaypro_state, kay_kbd_interrupt) /* this doesn't actually exist, it is to run the keyboard */ - MCFG_CPU_CONFIG(kayproii_daisy_chain) + MCFG_Z80_DAISY_CHAIN(kayproii_daisy_chain) MCFG_MACHINE_START_OVERRIDE(kaypro_state, kayproii ) MCFG_MACHINE_RESET_OVERRIDE(kaypro_state, kaypro ) @@ -266,7 +266,7 @@ static MACHINE_CONFIG_START( kaypro2x, kaypro_state ) MCFG_CPU_PROGRAM_MAP(kaypro_map) MCFG_CPU_IO_MAP(kaypro2x_io) MCFG_CPU_VBLANK_INT_DRIVER("screen", kaypro_state, kay_kbd_interrupt) - MCFG_CPU_CONFIG(kaypro2x_daisy_chain) + MCFG_Z80_DAISY_CHAIN(kaypro2x_daisy_chain) MCFG_MACHINE_RESET_OVERRIDE(kaypro_state, kaypro ) diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp index 09afbd06209..ba3fec228c2 100644 --- a/src/mame/drivers/kc.cpp +++ b/src/mame/drivers/kc.cpp @@ -92,7 +92,7 @@ static MACHINE_CONFIG_START( kc85_3, kc_state ) MCFG_CPU_ADD("maincpu", Z80, KC85_3_CLOCK) MCFG_CPU_PROGRAM_MAP(kc85_3_mem) MCFG_CPU_IO_MAP(kc85_3_io) - MCFG_CPU_CONFIG(kc85_daisy_chain) + MCFG_Z80_DAISY_CHAIN(kc85_daisy_chain) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_DEVICE_ADD("z80pio", Z80PIO, KC85_3_CLOCK) @@ -176,7 +176,7 @@ static MACHINE_CONFIG_START( kc85_4, kc85_4_state ) MCFG_CPU_ADD("maincpu", Z80, KC85_4_CLOCK) MCFG_CPU_PROGRAM_MAP(kc85_4_mem) MCFG_CPU_IO_MAP(kc85_4_io) - MCFG_CPU_CONFIG(kc85_daisy_chain) + MCFG_Z80_DAISY_CHAIN(kc85_daisy_chain) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_DEVICE_ADD("z80pio", Z80PIO, KC85_4_CLOCK) diff --git a/src/mame/drivers/kenseim.cpp b/src/mame/drivers/kenseim.cpp index e5ec6e2cd78..320ca23d44f 100644 --- a/src/mame/drivers/kenseim.cpp +++ b/src/mame/drivers/kenseim.cpp @@ -475,7 +475,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( kenseim, cps1_12MHz, kenseim_state ) /* basic machine hardware */ MCFG_CPU_ADD("gamecpu", TMPZ84C011, XTAL_16MHz/2) // tmpz84c011-8 - MCFG_CPU_CONFIG(daisy_chain_gamecpu) + MCFG_Z80_DAISY_CHAIN(daisy_chain_gamecpu) MCFG_CPU_PROGRAM_MAP(kenseim_map) MCFG_CPU_IO_MAP(kenseim_io_map) MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8(kenseim_state, cpu_portc_w)) diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp index 183496a535c..a5f300c6fd1 100644 --- a/src/mame/drivers/llc.cpp +++ b/src/mame/drivers/llc.cpp @@ -197,7 +197,7 @@ GFXDECODE_END static MACHINE_CONFIG_START( llc1, llc_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3MHz) - MCFG_CPU_CONFIG(llc1_daisy_chain) + MCFG_Z80_DAISY_CHAIN(llc1_daisy_chain) MCFG_CPU_PROGRAM_MAP(llc1_mem) MCFG_CPU_IO_MAP(llc1_io) @@ -241,7 +241,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( llc2, llc_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3MHz) - MCFG_CPU_CONFIG(llc2_daisy_chain) + MCFG_Z80_DAISY_CHAIN(llc2_daisy_chain) MCFG_CPU_PROGRAM_MAP(llc2_mem) MCFG_CPU_IO_MAP(llc2_io) diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp index 8344b68e9e3..5f2baad000a 100644 --- a/src/mame/drivers/m5.cpp +++ b/src/mame/drivers/m5.cpp @@ -1400,7 +1400,7 @@ static MACHINE_CONFIG_START( m5, m5_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_14_31818MHz/4) MCFG_CPU_PROGRAM_MAP(m5_mem) MCFG_CPU_IO_MAP(m5_io) - MCFG_CPU_CONFIG(m5_daisy_chain) + MCFG_Z80_DAISY_CHAIN(m5_daisy_chain) MCFG_CPU_ADD(Z80_FD5_TAG, Z80, XTAL_14_31818MHz/4) MCFG_CPU_PROGRAM_MAP(fd5_mem) @@ -1492,7 +1492,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( brno, m5, brno_state ) MCFG_CPU_MODIFY(Z80_TAG) MCFG_CPU_PROGRAM_MAP(m5_mem_brno) MCFG_CPU_IO_MAP(brno_io) -// MCFG_CPU_CONFIG(m5_daisy_chain) +// MCFG_Z80_DAISY_CHAIN(m5_daisy_chain) //remove devices used for fd5 floppy diff --git a/src/mame/drivers/magictg.cpp b/src/mame/drivers/magictg.cpp index 901c8070390..7a7a20bb33b 100644 --- a/src/mame/drivers/magictg.cpp +++ b/src/mame/drivers/magictg.cpp @@ -889,21 +889,6 @@ static INPUT_PORTS_START( magictg ) INPUT_PORTS_END -/************************************* - * - * CPU configuration - * - *************************************/ - -#if 0 -/* TODO: Unknown */ -static const mips3_config config = -{ - 16384, /* code cache size */ - 16384 /* data cache size */ -}; -#endif - /************************************* * * Machine driver @@ -912,7 +897,8 @@ static const mips3_config config = static MACHINE_CONFIG_START( magictg, magictg_state ) MCFG_CPU_ADD("mips", R5000BE, 150000000) /* TODO: CPU type and clock are unknown */ - MCFG_CPU_CONFIG(config) + //MCFG_MIPS3_ICACHE_SIZE(16384) /* TODO: Unknown */ + //MCFG_MIPS3_DCACHE_SIZE(16384) /* TODO: Unknown */ MCFG_CPU_PROGRAM_MAP(magictg_map) MCFG_CPU_ADD("adsp", ADSP2181, 16000000) diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp index 420aa8340f6..e28d4e63036 100644 --- a/src/mame/drivers/mbee.cpp +++ b/src/mame/drivers/mbee.cpp @@ -627,7 +627,7 @@ static MACHINE_CONFIG_START( mbee, mbee_state ) MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 6) /* 2 MHz */ MCFG_CPU_PROGRAM_MAP(mbee_mem) MCFG_CPU_IO_MAP(mbee_io) - MCFG_CPU_CONFIG(mbee_daisy_chain) + MCFG_Z80_DAISY_CHAIN(mbee_daisy_chain) MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee) @@ -686,7 +686,7 @@ static MACHINE_CONFIG_START( mbeeic, mbee_state ) MCFG_CPU_ADD("maincpu", Z80, XTAL_13_5MHz / 4) /* 3.37500 MHz */ MCFG_CPU_PROGRAM_MAP(mbeeic_mem) MCFG_CPU_IO_MAP(mbeeic_io) - MCFG_CPU_CONFIG(mbee_daisy_chain) + MCFG_Z80_DAISY_CHAIN(mbee_daisy_chain) MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee) diff --git a/src/mame/drivers/mc80.cpp b/src/mame/drivers/mc80.cpp index 48a237a56b3..d9eff85385d 100644 --- a/src/mame/drivers/mc80.cpp +++ b/src/mame/drivers/mc80.cpp @@ -201,7 +201,7 @@ static MACHINE_CONFIG_START( mc8030, mc80_state ) MCFG_CPU_ADD("maincpu",Z80, XTAL_2_4576MHz) MCFG_CPU_PROGRAM_MAP(mc8030_mem) MCFG_CPU_IO_MAP(mc8030_io) - MCFG_CPU_CONFIG(mc8030_daisy_chain) + MCFG_Z80_DAISY_CHAIN(mc8030_daisy_chain) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(mc80_state,mc8030_irq_callback) MCFG_MACHINE_RESET_OVERRIDE(mc80_state,mc8030) diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp index e0b42f836d1..056116804f5 100644 --- a/src/mame/drivers/mcr.cpp +++ b/src/mame/drivers/mcr.cpp @@ -1757,7 +1757,7 @@ static MACHINE_CONFIG_START( mcr_90009, mcr_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_OSC_MCR_I/8) - MCFG_CPU_CONFIG(mcr_daisy_chain) + MCFG_Z80_DAISY_CHAIN(mcr_daisy_chain) MCFG_CPU_PROGRAM_MAP(cpu_90009_map) MCFG_CPU_IO_MAP(cpu_90009_portmap) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mcr_state, mcr_interrupt, "screen", 0, 1) @@ -1879,7 +1879,7 @@ static MACHINE_CONFIG_DERIVED( mcr_91490_ipu, mcr_91490_snt ) MCFG_MACHINE_START_OVERRIDE(mcr_state,nflfoot) MCFG_CPU_ADD("ipu", Z80, 7372800/2) - MCFG_CPU_CONFIG(mcr_ipu_daisy_chain) + MCFG_Z80_DAISY_CHAIN(mcr_ipu_daisy_chain) MCFG_CPU_PROGRAM_MAP(ipu_91695_map) MCFG_CPU_IO_MAP(ipu_91695_portmap) MCFG_TIMER_MODIFY("scantimer") diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp index 9b3b15dabb3..5a7d07c6909 100644 --- a/src/mame/drivers/mcr3.cpp +++ b/src/mame/drivers/mcr3.cpp @@ -1085,7 +1085,7 @@ static MACHINE_CONFIG_START( mcrmono, mcr3_state ) MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4) MCFG_CPU_PROGRAM_MAP(mcrmono_map) MCFG_CPU_IO_MAP(mcrmono_portmap) - MCFG_CPU_CONFIG(mcr_daisy_chain) + MCFG_Z80_DAISY_CHAIN(mcr_daisy_chain) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mcr3_state, mcr_interrupt, "screen", 0, 1) MCFG_DEVICE_ADD("ctc", Z80CTC, MASTER_CLOCK/4 /* same as "maincpu" */) diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp index 07c93d7b8f5..d1d4ce7c222 100644 --- a/src/mame/drivers/meritm.cpp +++ b/src/mame/drivers/meritm.cpp @@ -1087,7 +1087,7 @@ static MACHINE_CONFIG_START( meritm_crt250, meritm_state ) MCFG_CPU_ADD("maincpu", Z80, SYSTEM_CLK/6) MCFG_CPU_PROGRAM_MAP(meritm_crt250_map) MCFG_CPU_IO_MAP(meritm_crt250_io_map) - MCFG_CPU_CONFIG(meritm_daisy_chain) + MCFG_Z80_DAISY_CHAIN(meritm_daisy_chain) MCFG_DEVICE_ADD("ppi8255", I8255, 0) MCFG_I8255_OUT_PORTB_CB(WRITE8(meritm_state, meritm_crt250_port_b_w)) // used LMP x DRIVE diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp index 36eecbdc9a6..5f0b9eeb78b 100644 --- a/src/mame/drivers/mpf1.cpp +++ b/src/mame/drivers/mpf1.cpp @@ -338,7 +338,7 @@ static MACHINE_CONFIG_START( mpf1, mpf1_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_3_579545MHz/2) MCFG_CPU_PROGRAM_MAP(mpf1_map) MCFG_CPU_IO_MAP(mpf1_io_map) - MCFG_CPU_CONFIG(mpf1_daisy_chain) + MCFG_Z80_DAISY_CHAIN(mpf1_daisy_chain) /* devices */ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_3_579545MHz/2) @@ -371,7 +371,7 @@ static MACHINE_CONFIG_START( mpf1b, mpf1_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_3_579545MHz/2) MCFG_CPU_PROGRAM_MAP(mpf1b_map) MCFG_CPU_IO_MAP(mpf1b_io_map) - MCFG_CPU_CONFIG(mpf1_daisy_chain) + MCFG_Z80_DAISY_CHAIN(mpf1_daisy_chain) /* devices */ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_3_579545MHz/2) @@ -407,7 +407,7 @@ static MACHINE_CONFIG_START( mpf1p, mpf1_state ) MCFG_CPU_ADD(Z80_TAG, Z80, 2500000) MCFG_CPU_PROGRAM_MAP(mpf1p_map) MCFG_CPU_IO_MAP(mpf1p_io_map) - MCFG_CPU_CONFIG(mpf1_daisy_chain) + MCFG_Z80_DAISY_CHAIN(mpf1_daisy_chain) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_mpf1p) diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp index 64ffb944e70..a2d69798559 100644 --- a/src/mame/drivers/mtx.cpp +++ b/src/mame/drivers/mtx.cpp @@ -287,7 +287,7 @@ static MACHINE_CONFIG_START( mtx512, mtx_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(mtx_mem) MCFG_CPU_IO_MAP(mtx_io) - MCFG_CPU_CONFIG(mtx_daisy_chain) + MCFG_Z80_DAISY_CHAIN(mtx_daisy_chain) MCFG_MACHINE_START_OVERRIDE(mtx_state,mtx512) MCFG_MACHINE_RESET_OVERRIDE(mtx_state,mtx512) @@ -356,7 +356,7 @@ static MACHINE_CONFIG_DERIVED( rs128, mtx512 ) /* basic machine hardware */ MCFG_CPU_MODIFY(Z80_TAG) MCFG_CPU_IO_MAP(rs128_io) - MCFG_CPU_CONFIG(rs128_daisy_chain) + MCFG_Z80_DAISY_CHAIN(rs128_daisy_chain) /* devices */ MCFG_Z80DART_ADD(Z80DART_TAG, XTAL_4MHz, 0, 0, 0, 0 ) diff --git a/src/mame/drivers/n64.cpp b/src/mame/drivers/n64.cpp index e3cefcdf6d6..f397d7a35b2 100644 --- a/src/mame/drivers/n64.cpp +++ b/src/mame/drivers/n64.cpp @@ -242,16 +242,6 @@ static INPUT_PORTS_START( n64 ) INPUT_PORTS_END -#if 0 -/* ?? */ -static const mips3_config config = -{ - 16384, /* code cache size */ - 8192, /* data cache size */ - 62500000 /* system clock */ -}; -#endif - void n64_mess_state::mempak_format(UINT8* pak) { unsigned char pak_header[] = @@ -419,7 +409,9 @@ static MACHINE_CONFIG_START( n64, n64_mess_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", VR4300BE, 93750000) MCFG_CPU_FORCE_NO_DRC() - MCFG_CPU_CONFIG(config) + //MCFG_MIPS3_ICACHE_SIZE(16384) /* ?? */ + //MCFG_MIPS3_DCACHE_SIZE(8192) /* ?? */ + //MCFG_MIPS3_SYSTEM_CLOCK(62500000) /* ?? */ MCFG_CPU_PROGRAM_MAP(n64_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", n64_mess_state, n64_reset_poll) diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp index e83f3074979..02d5471a472 100644 --- a/src/mame/drivers/nanos.cpp +++ b/src/mame/drivers/nanos.cpp @@ -473,7 +473,7 @@ static MACHINE_CONFIG_START( nanos, nanos_state ) MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(nanos_mem) MCFG_CPU_IO_MAP(nanos_io) - MCFG_CPU_CONFIG(nanos_daisy_chain) + MCFG_Z80_DAISY_CHAIN(nanos_daisy_chain) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/nbmj9195.cpp b/src/mame/drivers/nbmj9195.cpp index c670df4dbf0..a9f97f5ec8e 100644 --- a/src/mame/drivers/nbmj9195.cpp +++ b/src/mame/drivers/nbmj9195.cpp @@ -2710,13 +2710,13 @@ static MACHINE_CONFIG_START( NBMJDRV1_base, nbmj9195_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMPZ84C011, 12000000/2) /* TMPZ84C011, 6.00 MHz */ - MCFG_CPU_CONFIG(daisy_chain_main) + MCFG_Z80_DAISY_CHAIN(daisy_chain_main) MCFG_CPU_PROGRAM_MAP(sailorws_map) MCFG_CPU_IO_MAP(sailorws_io_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", nbmj9195_state, ctc0_trg1) /* vblank is connect to ctc trigger */ MCFG_CPU_ADD("audiocpu", TMPZ84C011, 8000000) /* TMPZ84C011, 8.00 MHz */ - MCFG_CPU_CONFIG(daisy_chain_sound) + MCFG_Z80_DAISY_CHAIN(daisy_chain_sound) MCFG_CPU_PROGRAM_MAP(sailorws_sound_map) MCFG_CPU_IO_MAP(sailorws_sound_io_map) MCFG_TMPZ84C011_ZC0_CB(DEVWRITELINE("audiocpu", tmpz84c011_device, trg3)) diff --git a/src/mame/drivers/niyanpai.cpp b/src/mame/drivers/niyanpai.cpp index 87dfcc07f85..d96baa66ced 100644 --- a/src/mame/drivers/niyanpai.cpp +++ b/src/mame/drivers/niyanpai.cpp @@ -740,7 +740,7 @@ static MACHINE_CONFIG_START( niyanpai, niyanpai_state ) MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(niyanpai_state, tmp68301_parallel_port_w)) MCFG_CPU_ADD("audiocpu", TMPZ84C011, 8000000) /* TMPZ84C011, 8.00 MHz */ - MCFG_CPU_CONFIG(daisy_chain_sound) + MCFG_Z80_DAISY_CHAIN(daisy_chain_sound) MCFG_CPU_PROGRAM_MAP(niyanpai_sound_map) MCFG_CPU_IO_MAP(niyanpai_sound_io_map) MCFG_TMPZ84C011_PORTD_READ_CB(READ8(niyanpai_state, soundlatch_byte_r)) diff --git a/src/mame/drivers/onyx.cpp b/src/mame/drivers/onyx.cpp index 85d02013975..b9b66872201 100644 --- a/src/mame/drivers/onyx.cpp +++ b/src/mame/drivers/onyx.cpp @@ -114,13 +114,13 @@ ADDRESS_MAP_END static MACHINE_CONFIG_START( c8002, onyx_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z8002, XTAL_4MHz ) - //MCFG_CPU_CONFIG(main_daisy_chain) + //MCFG_Z80_DAISY_CHAIN(main_daisy_chain) MCFG_CPU_PROGRAM_MAP(c8002_mem) //MCFG_CPU_DATA_MAP(c8002_data) MCFG_CPU_IO_MAP(c8002_io) MCFG_CPU_ADD("subcpu", Z80, XTAL_4MHz ) - //MCFG_CPU_CONFIG(sub_daisy_chain) + //MCFG_Z80_DAISY_CHAIN(sub_daisy_chain) MCFG_CPU_PROGRAM_MAP(submem) MCFG_CPU_IO_MAP(subio) MCFG_MACHINE_RESET_OVERRIDE(onyx_state, c8002) diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp index 226b4519128..e9542df1ff9 100644 --- a/src/mame/drivers/osbexec.cpp +++ b/src/mame/drivers/osbexec.cpp @@ -528,7 +528,7 @@ static MACHINE_CONFIG_START( osbexec, osbexec_state ) MCFG_CPU_ADD( "maincpu", Z80, MAIN_CLOCK/6 ) MCFG_CPU_PROGRAM_MAP( osbexec_mem) MCFG_CPU_IO_MAP( osbexec_io) - MCFG_CPU_CONFIG( osbexec_daisy_config ) + MCFG_Z80_DAISY_CHAIN( osbexec_daisy_config ) MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DRIVER(osbexec_state, screen_update) diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp index 8a6ed441127..5ceaa9c698f 100644 --- a/src/mame/drivers/p8k.cpp +++ b/src/mame/drivers/p8k.cpp @@ -466,7 +466,7 @@ GFXDECODE_END static MACHINE_CONFIG_START( p8k, p8k_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz ) - MCFG_CPU_CONFIG(p8k_daisy_chain) + MCFG_Z80_DAISY_CHAIN(p8k_daisy_chain) MCFG_CPU_PROGRAM_MAP(p8k_memmap) MCFG_CPU_IO_MAP(p8k_iomap) MCFG_MACHINE_RESET_OVERRIDE(p8k_state,p8k) @@ -526,7 +526,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( p8k_16, p8k_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z8001, XTAL_4MHz ) - MCFG_CPU_CONFIG(p8k_16_daisy_chain) + MCFG_Z80_DAISY_CHAIN(p8k_16_daisy_chain) MCFG_CPU_PROGRAM_MAP(p8k_16_memmap) MCFG_CPU_DATA_MAP(p8k_16_datamap) MCFG_CPU_IO_MAP(p8k_16_iomap) diff --git a/src/mame/drivers/pachifev.cpp b/src/mame/drivers/pachifev.cpp index 03d945b1943..e675c180eac 100644 --- a/src/mame/drivers/pachifev.cpp +++ b/src/mame/drivers/pachifev.cpp @@ -278,12 +278,6 @@ WRITE_LINE_MEMBER(pachifev_state::pf_adpcm_int) } } -static const msm5205_interface msm5205_config = -{ - DEVCB_DRIVER_LINE_MEMBER(pachifev_state,pf_adpcm_int), /* interrupt function */ - MSM5205_S48_4B /* 8kHz */ -}; - #endif void pachifev_state::machine_reset() @@ -360,7 +354,8 @@ static MACHINE_CONFIG_START( pachifev, pachifev_state ) MCFG_SPEAKER_STANDARD_MONO("mono") #if USE_MSM MCFG_SOUND_ADD("adpcm", MSM5205, XTAL_384kHz) /* guess */ - MCFG_SOUND_CONFIG(msm5205_config) + MCFG_MSM5205_VCLK_CB(WRITELINE(pachifev_state,pf_adpcm_int)) /* interrupt function */ + MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8kHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) #endif MCFG_SOUND_ADD("y2404_1", Y2404, XTAL_10_738635MHz/3) /* guess */ diff --git a/src/mame/drivers/pasopia.cpp b/src/mame/drivers/pasopia.cpp index aa65d9979b9..f76d73402ad 100644 --- a/src/mame/drivers/pasopia.cpp +++ b/src/mame/drivers/pasopia.cpp @@ -291,7 +291,7 @@ static MACHINE_CONFIG_START( pasopia, pasopia_state ) MCFG_CPU_ADD("maincpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(pasopia_map) MCFG_CPU_IO_MAP(pasopia_io) - MCFG_CPU_CONFIG(pasopia_daisy) + MCFG_Z80_DAISY_CHAIN(pasopia_daisy) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp index 2a9ec18114d..68e16212e61 100644 --- a/src/mame/drivers/pasopia7.cpp +++ b/src/mame/drivers/pasopia7.cpp @@ -913,7 +913,7 @@ static MACHINE_CONFIG_START( p7_base, pasopia7_state ) MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(pasopia7_mem) MCFG_CPU_IO_MAP(pasopia7_io) - MCFG_CPU_CONFIG(p7_daisy) + MCFG_Z80_DAISY_CHAIN(p7_daisy) /* Audio */ diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp index e11ff7b8da4..6a0a817c0c5 100644 --- a/src/mame/drivers/pcm.cpp +++ b/src/mame/drivers/pcm.cpp @@ -255,7 +255,7 @@ static MACHINE_CONFIG_START( pcm, pcm_state ) MCFG_CPU_ADD("maincpu",Z80, XTAL_10MHz /4) MCFG_CPU_PROGRAM_MAP(pcm_mem) MCFG_CPU_IO_MAP(pcm_io) - MCFG_CPU_CONFIG(pcm_daisy_chain) + MCFG_Z80_DAISY_CHAIN(pcm_daisy_chain) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/pdp1.cpp b/src/mame/drivers/pdp1.cpp index 0c74eae9f55..0425841abc1 100644 --- a/src/mame/drivers/pdp1.cpp +++ b/src/mame/drivers/pdp1.cpp @@ -1931,7 +1931,7 @@ static MACHINE_CONFIG_START( pdp1, pdp1_state ) /* basic machine hardware */ /* PDP1 CPU @ 200 kHz (no master clock, but the instruction and memory rate is 200 kHz) */ MCFG_CPU_ADD("maincpu", PDP1, 1000000/*the CPU core uses microsecond counts*/) - MCFG_CPU_CONFIG(pdp1_reset_param) + MCFG_PDP1_RESET_PARAM(pdp1_reset_param) MCFG_CPU_PROGRAM_MAP(pdp1_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", pdp1_state, pdp1_interrupt) /* dummy interrupt: handles input */ diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp index 0757fd1ae32..a322f66dbfb 100644 --- a/src/mame/drivers/pipeline.cpp +++ b/src/mame/drivers/pipeline.cpp @@ -369,7 +369,7 @@ static MACHINE_CONFIG_START( pipeline, pipeline_state ) MCFG_CPU_VBLANK_INT_DRIVER("screen", pipeline_state, nmi_line_pulse) MCFG_CPU_ADD("audiocpu", Z80, 7372800/2) - MCFG_CPU_CONFIG(daisy_chain_sound) + MCFG_Z80_DAISY_CHAIN(daisy_chain_sound) MCFG_CPU_PROGRAM_MAP(cpu1_mem) MCFG_CPU_IO_MAP(sound_port) diff --git a/src/mame/drivers/proconn.cpp b/src/mame/drivers/proconn.cpp index 9c7a5cd75ef..dbff3d2d993 100644 --- a/src/mame/drivers/proconn.cpp +++ b/src/mame/drivers/proconn.cpp @@ -316,7 +316,7 @@ void proconn_state::machine_reset() static MACHINE_CONFIG_START( proconn, proconn_state ) MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ?? Mhz */ - MCFG_CPU_CONFIG(z80_daisy_chain) + MCFG_Z80_DAISY_CHAIN(z80_daisy_chain) MCFG_CPU_PROGRAM_MAP(proconn_map) MCFG_CPU_IO_MAP(proconn_portmap) MCFG_S16LF01_ADD("vfd",0) diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp index eda3535ee2d..9cad86a4f56 100644 --- a/src/mame/drivers/pulsar.cpp +++ b/src/mame/drivers/pulsar.cpp @@ -220,7 +220,7 @@ static MACHINE_CONFIG_START( pulsar, pulsar_state ) MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(pulsar_mem) MCFG_CPU_IO_MAP(pulsar_io) - MCFG_CPU_CONFIG(daisy_chain_intf) + MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) MCFG_MACHINE_RESET_OVERRIDE(pulsar_state, pulsar) /* Devices */ diff --git a/src/mame/drivers/pve500.cpp b/src/mame/drivers/pve500.cpp index e94e548d92f..7c87ca636d0 100644 --- a/src/mame/drivers/pve500.cpp +++ b/src/mame/drivers/pve500.cpp @@ -351,7 +351,7 @@ static MACHINE_CONFIG_START( pve500, pve500_state ) MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL_12MHz / 2) /* TMPZ84C015BF-6 */ MCFG_CPU_PROGRAM_MAP(maincpu_prg) MCFG_CPU_IO_MAP(maincpu_io) - MCFG_CPU_CONFIG(maincpu_daisy_chain) + MCFG_Z80_DAISY_CHAIN(maincpu_daisy_chain) MCFG_TMPZ84C015_OUT_DTRA_CB(WRITELINE(pve500_state, GPI_w)) MCFG_TMPZ84C015_OUT_DTRB_CB(DEVWRITELINE("buzzer", beep_device, set_state)) MCFG_TMPZ84C015_OUT_TXDA_CB(DEVWRITELINE("recorder", rs232_port_device, write_txd)) diff --git a/src/mame/drivers/rt1715.cpp b/src/mame/drivers/rt1715.cpp index 4e8e259192a..680487f7344 100644 --- a/src/mame/drivers/rt1715.cpp +++ b/src/mame/drivers/rt1715.cpp @@ -270,7 +270,7 @@ static MACHINE_CONFIG_START( rt1715, rt1715_state ) MCFG_CPU_ADD("maincpu", Z80, XTAL_2_4576MHz) MCFG_CPU_PROGRAM_MAP(rt1715_mem) MCFG_CPU_IO_MAP(rt1715_io) - MCFG_CPU_CONFIG(rt1715_daisy_chain) + MCFG_Z80_DAISY_CHAIN(rt1715_daisy_chain) /* keyboard */ diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp index 4ccb8036ab1..3ee41df62bb 100644 --- a/src/mame/drivers/senjyo.cpp +++ b/src/mame/drivers/senjyo.cpp @@ -553,7 +553,7 @@ static MACHINE_CONFIG_START( senjyo, senjyo_state ) MCFG_CPU_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert) MCFG_CPU_ADD("sub", Z80, 2000000) /* 2 MHz? */ - MCFG_CPU_CONFIG(senjyo_daisy_chain) + MCFG_Z80_DAISY_CHAIN(senjyo_daisy_chain) MCFG_CPU_PROGRAM_MAP(senjyo_sound_map) MCFG_CPU_IO_MAP(senjyo_sound_io_map) diff --git a/src/mame/drivers/super6.cpp b/src/mame/drivers/super6.cpp index 838db3e3b20..34958f31edb 100644 --- a/src/mame/drivers/super6.cpp +++ b/src/mame/drivers/super6.cpp @@ -490,7 +490,7 @@ static MACHINE_CONFIG_START( super6, super6_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_24MHz/4) MCFG_CPU_PROGRAM_MAP(super6_mem) MCFG_CPU_IO_MAP(super6_io) - MCFG_CPU_CONFIG(super6_daisy_chain) + MCFG_Z80_DAISY_CHAIN(super6_daisy_chain) // devices MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_24MHz/4) diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp index b3823f3ef28..1d8e9bbcbfb 100644 --- a/src/mame/drivers/super80.cpp +++ b/src/mame/drivers/super80.cpp @@ -693,7 +693,7 @@ static MACHINE_CONFIG_START( super80, super80_state ) MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */ MCFG_CPU_PROGRAM_MAP(super80_map) MCFG_CPU_IO_MAP(super80_io) - MCFG_CPU_CONFIG(super80_daisy_chain) + MCFG_Z80_DAISY_CHAIN(super80_daisy_chain) MCFG_DEVICE_ADD("z80pio", Z80PIO, MASTER_CLOCK/6) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) @@ -773,7 +773,7 @@ static MACHINE_CONFIG_START( super80v, super80_state ) MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */ MCFG_CPU_PROGRAM_MAP(super80v_map) MCFG_CPU_IO_MAP(super80v_io) - MCFG_CPU_CONFIG(super80_daisy_chain) + MCFG_Z80_DAISY_CHAIN(super80_daisy_chain) MCFG_DEVICE_ADD("z80pio", Z80PIO, MASTER_CLOCK/6) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) diff --git a/src/mame/drivers/superslave.cpp b/src/mame/drivers/superslave.cpp index 11e4de4b815..e5b224bdefa 100644 --- a/src/mame/drivers/superslave.cpp +++ b/src/mame/drivers/superslave.cpp @@ -329,7 +329,7 @@ static MACHINE_CONFIG_START( superslave, superslave_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(superslave_mem) MCFG_CPU_IO_MAP(superslave_io) - MCFG_CPU_CONFIG(superslave_daisy_chain) + MCFG_Z80_DAISY_CHAIN(superslave_daisy_chain) // devices MCFG_PIC8259_ADD(AM9519_TAG, INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0), VCC, NULL) diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp index 24938323908..4bb631ff92a 100644 --- a/src/mame/drivers/thomson.cpp +++ b/src/mame/drivers/thomson.cpp @@ -663,16 +663,16 @@ static MACHINE_CONFIG_START( to7, thomson_state ) MCFG_FLOPPY_DRIVE_ADD("wd2793:1", cd90_640_floppies, "dd", thomson_state::cd90_640_formats) MCFG_DEVICE_ADD(FLOPPY_0, LEGACY_FLOPPY, 0) - MCFG_DEVICE_CONFIG(thomson_floppy_interface) + MCFG_LEGACY_FLOPPY_CONFIG(thomson_floppy_interface) MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(thomson_state, fdc_index_0_w)) MCFG_DEVICE_ADD(FLOPPY_1, LEGACY_FLOPPY, 0) - MCFG_DEVICE_CONFIG(thomson_floppy_interface) + MCFG_LEGACY_FLOPPY_CONFIG(thomson_floppy_interface) MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(thomson_state, fdc_index_1_w)) MCFG_DEVICE_ADD(FLOPPY_2, LEGACY_FLOPPY, 0) - MCFG_DEVICE_CONFIG(thomson_floppy_interface) + MCFG_LEGACY_FLOPPY_CONFIG(thomson_floppy_interface) MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(thomson_state, fdc_index_2_w)) MCFG_DEVICE_ADD(FLOPPY_3, LEGACY_FLOPPY, 0) - MCFG_DEVICE_CONFIG(thomson_floppy_interface) + MCFG_LEGACY_FLOPPY_CONFIG(thomson_floppy_interface) MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(thomson_state, fdc_index_3_w)) /* network */ diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp index a7487cce617..a25dc17ccbd 100644 --- a/src/mame/drivers/tiki100.cpp +++ b/src/mame/drivers/tiki100.cpp @@ -706,7 +706,7 @@ static MACHINE_CONFIG_START( tiki100, tiki100_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(tiki100_mem) MCFG_CPU_IO_MAP(tiki100_io) - MCFG_CPU_CONFIG(tiki100_daisy_chain) + MCFG_Z80_DAISY_CHAIN(tiki100_daisy_chain) /* video hardware */ MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp index e642a894edd..f20409e0a2e 100644 --- a/src/mame/drivers/trs80m2.cpp +++ b/src/mame/drivers/trs80m2.cpp @@ -701,7 +701,7 @@ void trs80m2_state::machine_reset() static MACHINE_CONFIG_START( trs80m2, trs80m2_state ) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) - MCFG_CPU_CONFIG(trs80m2_daisy_chain) + MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain) MCFG_CPU_PROGRAM_MAP(z80_mem) MCFG_CPU_IO_MAP(z80_io) @@ -786,7 +786,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( trs80m16, trs80m16_state ) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) - MCFG_CPU_CONFIG(trs80m2_daisy_chain) + MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain) MCFG_CPU_PROGRAM_MAP(z80_mem) MCFG_CPU_IO_MAP(m16_z80_io) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(AM9519A_TAG, pic8259_device, inta_cb) diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp index 19680c956cb..d60c5005576 100644 --- a/src/mame/drivers/ts802.cpp +++ b/src/mame/drivers/ts802.cpp @@ -187,7 +187,7 @@ static MACHINE_CONFIG_START( ts802, ts802_state ) MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(ts802_mem) MCFG_CPU_IO_MAP(ts802_io) - //MCFG_CPU_CONFIG(daisy_chain_intf) // causes problems + //MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) // causes problems MCFG_MACHINE_RESET_OVERRIDE(ts802_state, ts802) /* Devices */ diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp index c18f41cfda2..8885ecce299 100644 --- a/src/mame/drivers/ts803.cpp +++ b/src/mame/drivers/ts803.cpp @@ -493,7 +493,7 @@ static MACHINE_CONFIG_START( ts803, ts803_state ) MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/4) MCFG_CPU_PROGRAM_MAP(ts803_mem) MCFG_CPU_IO_MAP(ts803_io) - MCFG_CPU_CONFIG(daisy_chain) + MCFG_Z80_DAISY_CHAIN(daisy_chain) /* video hardware */ MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp index b8131c8c5cb..0a798a8af57 100644 --- a/src/mame/drivers/univac.cpp +++ b/src/mame/drivers/univac.cpp @@ -170,7 +170,7 @@ static MACHINE_CONFIG_START( uts20, univac_state ) MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) // unknown clock MCFG_CPU_PROGRAM_MAP(uts20_mem) MCFG_CPU_IO_MAP(uts20_io) - MCFG_CPU_CONFIG(daisy_chain) + MCFG_Z80_DAISY_CHAIN(daisy_chain) /* video hardware */ MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) diff --git a/src/mame/drivers/vcs80.cpp b/src/mame/drivers/vcs80.cpp index 1e4540d4643..9ab71cf8c49 100644 --- a/src/mame/drivers/vcs80.cpp +++ b/src/mame/drivers/vcs80.cpp @@ -209,7 +209,7 @@ static MACHINE_CONFIG_START( vcs80, vcs80_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_5MHz/2) /* U880D */ MCFG_CPU_PROGRAM_MAP(vcs80_mem) MCFG_CPU_IO_MAP(vcs80_io) - MCFG_CPU_CONFIG(vcs80_daisy_chain) + MCFG_Z80_DAISY_CHAIN(vcs80_daisy_chain) /* keyboard timer */ MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", vcs80_state, vcs80_keyboard_tick, attotime::from_hz(1000)) diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index 21bd91f6253..53c11e9319c 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -2461,7 +2461,7 @@ static MACHINE_CONFIG_START( x1, x1_state ) MCFG_CPU_ADD("x1_cpu", Z80, MAIN_CLOCK/4) MCFG_CPU_PROGRAM_MAP(x1_mem) MCFG_CPU_IO_MAP(x1_io) - MCFG_CPU_CONFIG(x1_daisy) + MCFG_Z80_DAISY_CHAIN(x1_daisy) MCFG_DEVICE_ADD("ctc", Z80CTC, MAIN_CLOCK/4) MCFG_Z80CTC_INTR_CB(INPUTLINE("x1_cpu", INPUT_LINE_IRQ0)) @@ -2543,7 +2543,7 @@ static MACHINE_CONFIG_DERIVED( x1turbo, x1 ) MCFG_CPU_MODIFY("x1_cpu") MCFG_CPU_PROGRAM_MAP(x1turbo_mem) MCFG_CPU_IO_MAP(x1turbo_io) - MCFG_CPU_CONFIG(x1turbo_daisy) + MCFG_Z80_DAISY_CHAIN(x1turbo_daisy) MCFG_MACHINE_RESET_OVERRIDE(x1_state,x1turbo) MCFG_Z80SIO0_ADD("sio", MAIN_CLOCK/4 , 0, 0, 0, 0) diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp index 41783de4e28..c5d431da65a 100644 --- a/src/mame/drivers/x1twin.cpp +++ b/src/mame/drivers/x1twin.cpp @@ -403,7 +403,7 @@ static MACHINE_CONFIG_START( x1twin, x1twin_state ) MCFG_CPU_ADD("x1_cpu", Z80, X1_MAIN_CLOCK/4) MCFG_CPU_PROGRAM_MAP(x1_mem) MCFG_CPU_IO_MAP(x1_io) - MCFG_CPU_CONFIG(x1_daisy) + MCFG_Z80_DAISY_CHAIN(x1_daisy) MCFG_DEVICE_ADD("ctc", Z80CTC, MAIN_CLOCK/4) MCFG_Z80CTC_INTR_CB(INPUTLINE("x1_cpu", INPUT_LINE_IRQ0)) diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp index 0e49169dd2d..744d57a57b4 100644 --- a/src/mame/drivers/xerox820.cpp +++ b/src/mame/drivers/xerox820.cpp @@ -544,7 +544,7 @@ static MACHINE_CONFIG_START( xerox820, xerox820_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_20MHz/8) MCFG_CPU_PROGRAM_MAP(xerox820_mem) MCFG_CPU_IO_MAP(xerox820_io) - MCFG_CPU_CONFIG(xerox820_daisy_chain) + MCFG_Z80_DAISY_CHAIN(xerox820_daisy_chain) /* video hardware */ MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) @@ -618,7 +618,7 @@ static MACHINE_CONFIG_START( xerox820ii, xerox820ii_state ) MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) MCFG_CPU_PROGRAM_MAP(xerox820ii_mem) MCFG_CPU_IO_MAP(xerox820ii_io) - MCFG_CPU_CONFIG(xerox820_daisy_chain) + MCFG_Z80_DAISY_CHAIN(xerox820_daisy_chain) /* video hardware */ MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp index 9cfb24ceb73..939d2bc8cf7 100644 --- a/src/mame/drivers/z9001.cpp +++ b/src/mame/drivers/z9001.cpp @@ -205,7 +205,7 @@ static MACHINE_CONFIG_START( z9001, z9001_state ) MCFG_CPU_ADD("maincpu",Z80, XTAL_9_8304MHz / 4) MCFG_CPU_PROGRAM_MAP(z9001_mem) MCFG_CPU_IO_MAP(z9001_io) - MCFG_CPU_CONFIG(z9001_daisy_chain) + MCFG_Z80_DAISY_CHAIN(z9001_daisy_chain) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/machine/appldriv.h b/src/mame/machine/appldriv.h index 4ab7ea18479..f01c7b68217 100644 --- a/src/mame/machine/appldriv.h +++ b/src/mame/machine/appldriv.h @@ -61,24 +61,24 @@ extern const device_type FLOPPY_APPLE; #define MCFG_LEGACY_FLOPPY_APPLE_2_DRIVES_ADD(_config,_dividend,_divisor) \ MCFG_DEVICE_ADD(FLOPPY_0, FLOPPY_APPLE, 0) \ - MCFG_DEVICE_CONFIG(_config) \ + MCFG_LEGACY_FLOPPY_CONFIG(_config) \ MCFG_LEGACY_FLOPPY_APPLE_PARAMS(_dividend,_divisor) \ MCFG_DEVICE_ADD(FLOPPY_1, FLOPPY_APPLE, 0) \ - MCFG_DEVICE_CONFIG(_config) \ + MCFG_LEGACY_FLOPPY_CONFIG(_config) \ MCFG_LEGACY_FLOPPY_APPLE_PARAMS(_dividend,_divisor) #define MCFG_LEGACY_FLOPPY_APPLE_4_DRIVES_ADD(_config,_dividend,_divisor) \ MCFG_DEVICE_ADD(FLOPPY_0, FLOPPY_APPLE, 0) \ - MCFG_DEVICE_CONFIG(_config) \ + MCFG_LEGACY_FLOPPY_CONFIG(_config) \ MCFG_LEGACY_FLOPPY_APPLE_PARAMS(_dividend,_divisor) \ MCFG_DEVICE_ADD(FLOPPY_1, FLOPPY_APPLE, 0) \ - MCFG_DEVICE_CONFIG(_config) \ + MCFG_LEGACY_FLOPPY_CONFIG(_config) \ MCFG_LEGACY_FLOPPY_APPLE_PARAMS(_dividend,_divisor) \ MCFG_DEVICE_ADD(FLOPPY_2, FLOPPY_APPLE, 0) \ - MCFG_DEVICE_CONFIG(_config) \ + MCFG_LEGACY_FLOPPY_CONFIG(_config) \ MCFG_LEGACY_FLOPPY_APPLE_PARAMS(_dividend,_divisor) \ MCFG_DEVICE_ADD(FLOPPY_3, FLOPPY_APPLE, 0) \ - MCFG_DEVICE_CONFIG(_config) \ + MCFG_LEGACY_FLOPPY_CONFIG(_config) \ MCFG_LEGACY_FLOPPY_APPLE_PARAMS(_dividend,_divisor) #define MCFG_LEGACY_FLOPPY_APPLE_2_DRIVES_REMOVE() \ diff --git a/src/mame/machine/applefdc.cpp b/src/mame/machine/applefdc.cpp index 014546b0f85..06bf5cba948 100644 --- a/src/mame/machine/applefdc.cpp +++ b/src/mame/machine/applefdc.cpp @@ -106,9 +106,10 @@ enum //------------------------------------------------- applefdc_base_device::applefdc_base_device(applefdc_base_device::applefdc_t fdc_type, const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) - : device_t(mconfig, type, name, tag, owner, clock, shortname, source) + : device_t(mconfig, type, name, tag, owner, clock, shortname, source), + m_type(fdc_type), + m_interface(nullptr) { - m_type = fdc_type; } @@ -176,9 +177,7 @@ const applefdc_interface *applefdc_base_device::get_interface() { static const applefdc_interface dummy_interface = {nullptr, }; - return (static_config() != nullptr) - ? (const applefdc_interface *) static_config() - : &dummy_interface; + return (m_interface != nullptr) ? m_interface : &dummy_interface; } diff --git a/src/mame/machine/applefdc.h b/src/mame/machine/applefdc.h index 6e02ddc87b2..7a105b777a1 100644 --- a/src/mame/machine/applefdc.h +++ b/src/mame/machine/applefdc.h @@ -59,6 +59,9 @@ struct applefdc_interface class applefdc_base_device : public device_t { public: + // configuration helpers + static void static_set_config(device_t &device, const applefdc_interface *intrf) { downcast(device).m_interface = intrf; } + // read/write handlers virtual UINT8 read(UINT8 offset); virtual void write(UINT8 offset, UINT8 data); @@ -95,6 +98,7 @@ private: // data that is constant for the lifetime of the emulation emu_timer * m_motor_timer; applefdc_t m_type; + const applefdc_interface *m_interface; // data that changes at emulation time UINT8 m_write_byte; @@ -143,21 +147,24 @@ public: DEVICE CONFIGURATION MACROS ***************************************************************************/ +#define MCFG_APPLEFDC_CONFIG(_intrf) \ + applefdc_base_device::static_set_config(*device, &(_intrf)); + #define MCFG_APPLEFDC_ADD(_tag, _intrf) \ MCFG_DEVICE_ADD(_tag, APPLEFDC, 0) \ - MCFG_DEVICE_CONFIG(_intrf) + MCFG_APPLEFDC_CONFIG(_intrf) #define MCFG_APPLEFDC_MODIFY(_tag, _intrf) \ MCFG_DEVICE_MODIFY(_tag) \ - MCFG_DEVICE_CONFIG(_intrf) + MCFG_APPLEFDC_CONFIG(_intrf) #define MCFG_IWM_ADD(_tag, _intrf) \ MCFG_DEVICE_ADD(_tag, IWM, 0) \ - MCFG_DEVICE_CONFIG(_intrf) + MCFG_APPLEFDC_CONFIG(_intrf) #define MCFG_IWM_MODIFY(_tag, _intrf) \ MCFG_DEVICE_MODIFY(_tag) \ - MCFG_DEVICE_CONFIG(_intrf) + MCFG_APPLEFDC_CONFIG(_intrf) #endif /* __APPLEFDC_H__ */ diff --git a/src/mame/machine/inder_sb.cpp b/src/mame/machine/inder_sb.cpp index bad2b30d279..bd5cbd170a1 100644 --- a/src/mame/machine/inder_sb.cpp +++ b/src/mame/machine/inder_sb.cpp @@ -259,7 +259,7 @@ ADDRESS_MAP_END static MACHINE_CONFIG_FRAGMENT( inder_sb ) MCFG_CPU_ADD("audiocpu", Z80, 8000000) // unk freq - MCFG_CPU_CONFIG(daisy_chain) + MCFG_Z80_DAISY_CHAIN(daisy_chain) MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_CPU_IO_MAP(sound_io) diff --git a/src/mame/machine/sonydriv.h b/src/mame/machine/sonydriv.h index 5e5d20c2f3d..4a48ceb9f9d 100644 --- a/src/mame/machine/sonydriv.h +++ b/src/mame/machine/sonydriv.h @@ -50,21 +50,21 @@ extern const device_type FLOPPY_SONY; #define MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(_config) \ MCFG_DEVICE_ADD(FLOPPY_0, FLOPPY_SONY, 0) \ - MCFG_DEVICE_CONFIG(_config) \ + MCFG_LEGACY_FLOPPY_CONFIG(_config) \ MCFG_DEVICE_ADD(FLOPPY_1, FLOPPY_SONY, 0) \ - MCFG_DEVICE_CONFIG(_config) + MCFG_LEGACY_FLOPPY_CONFIG(_config) #define MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADDITIONAL_ADD(_config) \ MCFG_DEVICE_ADD(FLOPPY_2, FLOPPY_SONY, 0) \ - MCFG_DEVICE_CONFIG(_config) \ + MCFG_LEGACY_FLOPPY_CONFIG(_config) \ MCFG_DEVICE_ADD(FLOPPY_3, FLOPPY_SONY, 0) \ - MCFG_DEVICE_CONFIG(_config) + MCFG_LEGACY_FLOPPY_CONFIG(_config) #define MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_MODIFY(_config) \ MCFG_DEVICE_MODIFY(FLOPPY_0) \ - MCFG_DEVICE_CONFIG(_config) \ + MCFG_LEGACY_FLOPPY_CONFIG(_config) \ MCFG_DEVICE_MODIFY(FLOPPY_1) \ - MCFG_DEVICE_CONFIG(_config) + MCFG_LEGACY_FLOPPY_CONFIG(_config) diff --git a/src/mame/machine/swim.h b/src/mame/machine/swim.h index 438ee9e4933..f628f13dc2f 100644 --- a/src/mame/machine/swim.h +++ b/src/mame/machine/swim.h @@ -54,10 +54,10 @@ private: #define MCFG_SWIM_ADD(_tag, _intrf) \ MCFG_DEVICE_ADD(_tag, SWIM, 0) \ - MCFG_DEVICE_CONFIG(_intrf) + MCFG_APPLEFDC_CONFIG(_intrf) #define MCFG_SWIM_MODIFY(_tag, _intrf) \ MCFG_DEVICE_MODIFY(_tag) \ - MCFG_DEVICE_CONFIG(_intrf) + MCFG_APPLEFDC_CONFIG(_intrf) #endif // __SWIM_H__ -- cgit v1.2.3