summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/jaguar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/jaguar.cpp')
-rw-r--r--src/mame/drivers/jaguar.cpp64
1 files changed, 32 insertions, 32 deletions
diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp
index cf266c2a000..119c0219481 100644
--- a/src/mame/drivers/jaguar.cpp
+++ b/src/mame/drivers/jaguar.cpp
@@ -1815,24 +1815,24 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(jaguar_state::cojagr3k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R3041, R3000_CLOCK)
+ MCFG_DEVICE_ADD("maincpu", R3041, R3000_CLOCK)
MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG)
- MCFG_CPU_PROGRAM_MAP(r3000_map)
+ MCFG_DEVICE_PROGRAM_MAP(r3000_map)
- MCFG_CPU_ADD("gpu", JAGUARGPU, COJAG_CLOCK/2)
- MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(jaguar_state, gpu_cpu_int))
- MCFG_CPU_PROGRAM_MAP(gpu_map)
+ MCFG_DEVICE_ADD("gpu", JAGUARGPU, COJAG_CLOCK/2)
+ MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(*this, jaguar_state, gpu_cpu_int))
+ MCFG_DEVICE_PROGRAM_MAP(gpu_map)
- MCFG_CPU_ADD("dsp", JAGUARDSP, COJAG_CLOCK/2)
- MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(jaguar_state, dsp_cpu_int))
- MCFG_CPU_PROGRAM_MAP(dsp_map)
+ MCFG_DEVICE_ADD("dsp", JAGUARDSP, COJAG_CLOCK/2)
+ MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(*this, jaguar_state, dsp_cpu_int))
+ MCFG_DEVICE_PROGRAM_MAP(dsp_map)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_WATCHDOG_ADD("watchdog")
MCFG_VT83C461_ADD("ide", cojag_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(jaguar_state, external_int))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, jaguar_state, external_int))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1842,8 +1842,8 @@ MACHINE_CONFIG_START(jaguar_state::cojagr3k)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -1859,25 +1859,25 @@ MACHINE_CONFIG_START(jaguar_state::cojag68k)
cojagr3k(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68EC020, M68K_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(m68020_map)
+ MCFG_DEVICE_REPLACE("maincpu", M68EC020, M68K_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(m68020_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(jaguar_state::jaguar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, JAGUAR_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(jaguar_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(jaguar_state,jaguar_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, JAGUAR_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(jaguar_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(jaguar_state,jaguar_irq_callback)
- MCFG_CPU_ADD("gpu", JAGUARGPU, JAGUAR_CLOCK)
- MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(jaguar_state, gpu_cpu_int))
- MCFG_CPU_PROGRAM_MAP(jag_gpu_map)
+ MCFG_DEVICE_ADD("gpu", JAGUARGPU, JAGUAR_CLOCK)
+ MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(*this, jaguar_state, gpu_cpu_int))
+ MCFG_DEVICE_PROGRAM_MAP(jag_gpu_map)
- MCFG_CPU_ADD("dsp", JAGUARDSP, JAGUAR_CLOCK)
- MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(jaguar_state, dsp_cpu_int))
- MCFG_CPU_PROGRAM_MAP(jag_dsp_map)
+ MCFG_DEVICE_ADD("dsp", JAGUARDSP, JAGUAR_CLOCK)
+ MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(*this, jaguar_state, dsp_cpu_int))
+ MCFG_DEVICE_PROGRAM_MAP(jag_dsp_map)
// MCFG_NVRAM_HANDLER(jaguar)
@@ -1889,8 +1889,8 @@ MACHINE_CONFIG_START(jaguar_state::jaguar)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -1911,16 +1911,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(jaguar_state::jaguarcd)
jaguar(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(jaguarcd_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(jaguarcd_map)
- MCFG_CPU_MODIFY("gpu")
- MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(jaguar_state, gpu_cpu_int))
- MCFG_CPU_PROGRAM_MAP(jagcd_gpu_map)
+ MCFG_DEVICE_MODIFY("gpu")
+ MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(*this, jaguar_state, gpu_cpu_int))
+ MCFG_DEVICE_PROGRAM_MAP(jagcd_gpu_map)
- MCFG_CPU_MODIFY("dsp")
- MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(jaguar_state, dsp_cpu_int))
- MCFG_CPU_PROGRAM_MAP(jagcd_dsp_map)
+ MCFG_DEVICE_MODIFY("dsp")
+ MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(*this, jaguar_state, dsp_cpu_int))
+ MCFG_DEVICE_PROGRAM_MAP(jagcd_dsp_map)
MCFG_CDROM_ADD("cdrom")
MCFG_CDROM_INTERFACE("jag_cdrom")