diff options
author | 2018-05-06 00:40:40 +1000 | |
---|---|---|
committer | 2018-05-06 00:51:27 +1000 | |
commit | 4ea3cd0bc1f54e47a0d38a47afac38101549e9ee (patch) | |
tree | bbadc20010b6bad48cf321b1c864655587e4b8ad /src/mame/drivers/alpha68k.cpp | |
parent | bba5127d7a73ca44fdc0dcab7286846c81206771 (diff) |
Streamline machine configuration macros - everyone's a device edition.
Start replacing special device macros with additional constructors,
starting with ISA, INTELLEC 4 and RS-232 buses.
Allow an object finder to take on the target of another object finder.
(For a combination of the previous two things in action, see either the
INTELLEC 4 driver, or the Apple 2 PC Exporter card. Also check out
looping over a device finder array to instantiate devices in some
places. Lots of things no longer need to pass tags around.)
Start supplying default clocks for things that have a standard clock or
have all clocks internal.
Eliminate the separate DEV versions of the DEVCB_ macros. Previously,
the plain versions were a shortcut for DEVICE_SELF as the target. You
can now supply a string tag (relative to current device being
configured), an object finder (takes on the base and relative tag), or
a reference to a device/interface (only do this if you know the device
won't be replaced out from under it, but that's a safe assumption for
your subdevices). In almost all cases, you can get the effect you want
by supplying *this as the target.
Eliminate sound and CPU versions of macros. They serve no useful
purpose, provide no extra checks, make error messages longer, add
indirection, and mislead newbies into thinking there's a difference.
Remove a lot of now-unnecessary ":" prefixes binding things relative to
machine root.
Clean up some miscellaneous rot.
Examples of new functionality in use in (some more subtle than others):
* src/mame/drivers/intellec4.cpp
* src/mame/drivers/tranz330.cpp
* src/mame/drivers/osboren1.cpp
* src/mame/drivers/zorba.cpp
* src/mame/devices/smioc.cpp
* src/devices/bus/a2bus/pc_xporter.cpp
* src/devices/bus/isa/isa.h
* src/devices/bus/isa/isa.h
* src/devices/bus/intellec4/intellec4.h
Diffstat (limited to 'src/mame/drivers/alpha68k.cpp')
-rw-r--r-- | src/mame/drivers/alpha68k.cpp | 218 |
1 files changed, 109 insertions, 109 deletions
diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp index 89eee69e27c..1277d24586a 100644 --- a/src/mame/drivers/alpha68k.cpp +++ b/src/mame/drivers/alpha68k.cpp @@ -1929,24 +1929,24 @@ MACHINE_START_MEMBER(alpha68k_state,alpha68k_II) MACHINE_CONFIG_START(alpha68k_state::sstingry) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */ - MCFG_CPU_PROGRAM_MAP(kyros_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold) - MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60) // MCU irq - - MCFG_CPU_ADD("audiocpu", Z80, 3579545) - MCFG_CPU_PROGRAM_MAP(sstingry_sound_map) - MCFG_CPU_IO_MAP(kyros_sound_portmap) - MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq0_line_hold) - MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, nmi_line_pulse, 4000) - - MCFG_CPU_ADD("mcu", I8748, 9263750) /* 9.263750 MHz oscillator, divided by 3*5 internally */ -// MCFG_CPU_PROGRAM_MAP(i8748_map) -// MCFG_MCS48_PORT_BUS_IN_CB(READ8(alpha68k_state, saiyugoub1_mcu_command_r)) + MCFG_DEVICE_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */ + MCFG_DEVICE_PROGRAM_MAP(kyros_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold) + MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60) // MCU irq + + MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) + MCFG_DEVICE_PROGRAM_MAP(sstingry_sound_map) + MCFG_DEVICE_IO_MAP(kyros_sound_portmap) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq0_line_hold) + MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, nmi_line_pulse, 4000) + + MCFG_DEVICE_ADD("mcu", I8748, 9263750) /* 9.263750 MHz oscillator, divided by 3*5 internally */ +// MCFG_DEVICE_PROGRAM_MAP(i8748_map) +// MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, alpha68k_state, saiyugoub1_mcu_command_r)) // MCFG_MCS48_PORT_T0_CLK_CUSTOM(alpha68k_state, saiyugoub1_m5205_clk_w) /* Drives the clock on the m5205 at 1/8 of this frequency */ -// MCFG_MCS48_PORT_T1_IN_CB(READLINE(alpha68k_state, saiyugoub1_m5205_irq_r)) -// MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(alpha68k_state, saiyugoub1_adpcm_rom_addr_w)) -// MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(alpha68k_state, saiyugoub1_adpcm_control_w)) +// MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, alpha68k_state, saiyugoub1_m5205_irq_r)) +// MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, alpha68k_state, saiyugoub1_adpcm_rom_addr_w)) +// MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, alpha68k_state, saiyugoub1_adpcm_control_w)) MCFG_DEVICE_DISABLE() MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common) @@ -1973,16 +1973,16 @@ MACHINE_CONFIG_START(alpha68k_state::sstingry) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ym1", YM2203, 3000000) + MCFG_DEVICE_ADD("ym1", YM2203, 3000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35) - MCFG_SOUND_ADD("ym2", YM2203, 3000000) + MCFG_DEVICE_ADD("ym2", YM2203, 3000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35) - MCFG_SOUND_ADD("ym3", YM2203, 3000000) + MCFG_DEVICE_ADD("ym3", YM2203, 3000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END @@ -1990,16 +1990,16 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(alpha68k_state::kyros) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* Verified on bootleg PCB */ - MCFG_CPU_PROGRAM_MAP(kyros_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold) - MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60) // MCU irq + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* Verified on bootleg PCB */ + MCFG_DEVICE_PROGRAM_MAP(kyros_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold) + MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60) // MCU irq - MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) /* Verified on bootleg PCB */ - MCFG_CPU_PROGRAM_MAP(kyros_sound_map) - MCFG_CPU_IO_MAP(kyros_sound_portmap) - MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq0_line_hold) - MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, nmi_line_pulse, 4000) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/6) /* Verified on bootleg PCB */ + MCFG_DEVICE_PROGRAM_MAP(kyros_sound_map) + MCFG_DEVICE_IO_MAP(kyros_sound_portmap) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq0_line_hold) + MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, nmi_line_pulse, 4000) MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common) MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common) @@ -2025,16 +2025,16 @@ MACHINE_CONFIG_START(alpha68k_state::kyros) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ym1", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */ + MCFG_DEVICE_ADD("ym1", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35) - MCFG_SOUND_ADD("ym2", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */ + MCFG_DEVICE_ADD("ym2", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35) - MCFG_SOUND_ADD("ym3", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */ + MCFG_DEVICE_ADD("ym3", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.9) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END @@ -2042,15 +2042,15 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(alpha68k_state::jongbou) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 8000000) - MCFG_CPU_PROGRAM_MAP(kyros_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold) - MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*16) // MCU irq + MCFG_DEVICE_ADD("maincpu", M68000, 8000000) + MCFG_DEVICE_PROGRAM_MAP(kyros_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold) + MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*16) // MCU irq - MCFG_CPU_ADD("audiocpu", Z80, 4000000) - MCFG_CPU_PROGRAM_MAP(jongbou_sound_map) - MCFG_CPU_IO_MAP(jongbou_sound_portmap) - MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq0_line_hold, 160*60) + MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) + MCFG_DEVICE_PROGRAM_MAP(jongbou_sound_map) + MCFG_DEVICE_IO_MAP(jongbou_sound_portmap) + MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq0_line_hold, 160*60) MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common) MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common) @@ -2076,20 +2076,20 @@ MACHINE_CONFIG_START(alpha68k_state::jongbou) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("aysnd", AY8910, 2000000) - MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) + MCFG_DEVICE_ADD("aysnd", AY8910, 2000000) + MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.65) MACHINE_CONFIG_END MACHINE_CONFIG_START(alpha68k_state::alpha68k_I) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */ - MCFG_CPU_PROGRAM_MAP(alpha68k_I_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)/* VBL */ + MCFG_DEVICE_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */ + MCFG_DEVICE_PROGRAM_MAP(alpha68k_I_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)/* VBL */ - MCFG_CPU_ADD("audiocpu", Z80, 4000000) // 4Mhz seems to yield the correct tone - MCFG_CPU_PROGRAM_MAP(alpha68k_I_s_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) // 4Mhz seems to yield the correct tone + MCFG_DEVICE_PROGRAM_MAP(alpha68k_I_s_map) MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common) MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common) @@ -2115,7 +2115,7 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_I) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ymsnd", YM3812, 4000000) + MCFG_DEVICE_ADD("ymsnd", YM3812, 4000000) MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END @@ -2129,14 +2129,14 @@ INTERRUPT_GEN_MEMBER(alpha68k_state::alpha68k_sound_nmi) MACHINE_CONFIG_START(alpha68k_state::alpha68k_II) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 8000000) /* Correct */ - MCFG_CPU_PROGRAM_MAP(alpha68k_II_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq3_line_hold)/* VBL */ + MCFG_DEVICE_ADD("maincpu", M68000, 8000000) /* Correct */ + MCFG_DEVICE_PROGRAM_MAP(alpha68k_II_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq3_line_hold)/* VBL */ - MCFG_CPU_ADD("audiocpu", Z80, 3579545*2) /* Unlikely but needed to stop nested NMI's */ - MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_IO_MAP(sound_portmap) - MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 7500) + MCFG_DEVICE_ADD("audiocpu", Z80, 3579545*2) /* Unlikely but needed to stop nested NMI's */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) + MCFG_DEVICE_IO_MAP(sound_portmap) + MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 7500) MCFG_MACHINE_START_OVERRIDE(alpha68k_state,alpha68k_II) MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,alpha68k_II) @@ -2162,38 +2162,38 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_II) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ym1", YM2203, 3000000) - MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(alpha68k_state, porta_w)) + MCFG_DEVICE_ADD("ym1", YM2203, 3000000) + MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, alpha68k_state, porta_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.65) - MCFG_SOUND_ADD("ym2", YM2413, 3579545) + MCFG_DEVICE_ADD("ym2", YM2413, 3579545) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END MACHINE_CONFIG_START(alpha68k_state::btlfieldb) alpha68k_II(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold) - MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*4) // MCU irq + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold) + MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*4) // MCU irq MACHINE_CONFIG_END MACHINE_CONFIG_START(alpha68k_state::alpha68k_II_gm) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 8000000) - MCFG_CPU_PROGRAM_MAP(alpha68k_II_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold) - MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*3) // MCU irq + MCFG_DEVICE_ADD("maincpu", M68000, 8000000) + MCFG_DEVICE_PROGRAM_MAP(alpha68k_II_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold) + MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*3) // MCU irq - MCFG_CPU_ADD("audiocpu", Z80, 4000000*2) // TODO: fix this - MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_IO_MAP(sound_portmap) - MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 7500) + MCFG_DEVICE_ADD("audiocpu", Z80, 4000000*2) // TODO: fix this + MCFG_DEVICE_PROGRAM_MAP(sound_map) + MCFG_DEVICE_IO_MAP(sound_portmap) + MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 7500) MCFG_MACHINE_START_OVERRIDE(alpha68k_state,alpha68k_II) MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,alpha68k_II) @@ -2219,15 +2219,15 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_II_gm) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ym1", YM2203, 3000000) - MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(alpha68k_state, porta_w)) + MCFG_DEVICE_ADD("ym1", YM2203, 3000000) + MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, alpha68k_state, porta_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.65) - MCFG_SOUND_ADD("ym2", YM2413, 3579545) + MCFG_DEVICE_ADD("ym2", YM2413, 3579545) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END @@ -2235,14 +2235,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(alpha68k_state::alpha68k_V) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */ - MCFG_CPU_PROGRAM_MAP(alpha68k_V_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq3_line_hold)/* VBL */ + MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* ? */ + MCFG_DEVICE_PROGRAM_MAP(alpha68k_V_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq3_line_hold)/* VBL */ - MCFG_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */ - MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_IO_MAP(sound_portmap) - MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 8500) + MCFG_DEVICE_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) + MCFG_DEVICE_IO_MAP(sound_portmap) + MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 8500) MCFG_MACHINE_START_OVERRIDE(alpha68k_state,alpha68k_V) MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,alpha68k_V) @@ -2268,15 +2268,15 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_V) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ym1", YM2203, 3000000) - MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(alpha68k_state, porta_w)) + MCFG_DEVICE_ADD("ym1", YM2203, 3000000) + MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, alpha68k_state, porta_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.65) - MCFG_SOUND_ADD("ym2", YM2413, 3579545) + MCFG_DEVICE_ADD("ym2", YM2413, 3579545) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END @@ -2284,14 +2284,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(alpha68k_state::alpha68k_V_sb) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */ - MCFG_CPU_PROGRAM_MAP(alpha68k_V_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq3_line_hold)/* VBL */ + MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* ? */ + MCFG_DEVICE_PROGRAM_MAP(alpha68k_V_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq3_line_hold)/* VBL */ - MCFG_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */ - MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_IO_MAP(sound_portmap) - MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 8500) + MCFG_DEVICE_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) + MCFG_DEVICE_IO_MAP(sound_portmap) + MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 8500) MCFG_MACHINE_START_OVERRIDE(alpha68k_state,alpha68k_V) MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,alpha68k_V) @@ -2317,15 +2317,15 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_V_sb) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ym1", YM2203, 3000000) - MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(alpha68k_state, porta_w)) + MCFG_DEVICE_ADD("ym1", YM2203, 3000000) + MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, alpha68k_state, porta_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.65) - MCFG_SOUND_ADD("ym2", YM2413, 3579545) + MCFG_DEVICE_ADD("ym2", YM2413, 3579545) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END @@ -2333,13 +2333,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(alpha68k_state::tnextspc) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 9000000) /* Confirmed 18 MHz/2 */ - MCFG_CPU_PROGRAM_MAP(tnextspc_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)/* VBL */ + MCFG_DEVICE_ADD("maincpu", M68000, 9000000) /* Confirmed 18 MHz/2 */ + MCFG_DEVICE_PROGRAM_MAP(tnextspc_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)/* VBL */ - MCFG_CPU_ADD("audiocpu", Z80, 4000000) - MCFG_CPU_PROGRAM_MAP(tnextspc_sound_map) - MCFG_CPU_IO_MAP(tnextspc_sound_portmap) + MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) + MCFG_DEVICE_PROGRAM_MAP(tnextspc_sound_map) + MCFG_DEVICE_IO_MAP(tnextspc_sound_portmap) MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common) MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common) @@ -2365,7 +2365,7 @@ MACHINE_CONFIG_START(alpha68k_state::tnextspc) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ymsnd", YM3812, 4000000) + MCFG_DEVICE_ADD("ymsnd", YM3812, 4000000) MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END |