diff options
Diffstat (limited to 'src/mame/drivers/esqasr.cpp')
-rw-r--r-- | src/mame/drivers/esqasr.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/esqasr.cpp b/src/mame/drivers/esqasr.cpp index 80f2a5098e1..ed7c24bd44a 100644 --- a/src/mame/drivers/esqasr.cpp +++ b/src/mame/drivers/esqasr.cpp @@ -114,28 +114,28 @@ READ16_MEMBER(esqasr_state::esq5506_read_adc) } MACHINE_CONFIG_START(esqasr_state::asr) - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) // actually MC68302 - MCFG_CPU_PROGRAM_MAP(asr_map) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) // actually MC68302 + MCFG_DEVICE_PROGRAM_MAP(asr_map) - MCFG_CPU_ADD("esp", ES5510, XTAL(10'000'000)) + MCFG_DEVICE_ADD("esp", ES5510, XTAL(10'000'000)) MCFG_DEVICE_DISABLE() MCFG_ESQ2X40_SQ1_ADD("sq1vfd") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("pump", ESQ_5505_5510_PUMP, XTAL(16'000'000) / (16 * 32)) + MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, XTAL(16'000'000) / (16 * 32)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) - MCFG_SOUND_ADD("ensoniq", ES5506, XTAL(16'000'000)) + MCFG_DEVICE_ADD("ensoniq", ES5506, XTAL(16'000'000)) MCFG_ES5506_REGION0("waverom") /* Bank 0 */ MCFG_ES5506_REGION1("waverom2") /* Bank 1 */ MCFG_ES5506_REGION2("waverom3") /* Bank 0 */ MCFG_ES5506_REGION3("waverom4") /* Bank 1 */ MCFG_ES5506_CHANNELS(4) /* channels, Not verified from real hardware */ - MCFG_ES5506_IRQ_CB(WRITELINE(esqasr_state, esq5506_otto_irq)) /* irq */ - MCFG_ES5506_READ_PORT_CB(READ16(esqasr_state, esq5506_read_adc)) + MCFG_ES5506_IRQ_CB(WRITELINE(*this, esqasr_state, esq5506_otto_irq)) /* irq */ + MCFG_ES5506_READ_PORT_CB(READ16(*this, esqasr_state, esq5506_read_adc)) MCFG_SOUND_ROUTE(0, "pump", 1.0, 0) MCFG_SOUND_ROUTE(1, "pump", 1.0, 1) MCFG_SOUND_ROUTE(2, "pump", 1.0, 2) @@ -147,28 +147,28 @@ MACHINE_CONFIG_START(esqasr_state::asr) MACHINE_CONFIG_END MACHINE_CONFIG_START(esqasr_state::asrx) - MCFG_CPU_ADD("maincpu", M68340, XTAL(16'000'000)) // 68340 - MCFG_CPU_PROGRAM_MAP(asrx_map) + MCFG_DEVICE_ADD("maincpu", M68340, XTAL(16'000'000)) // 68340 + MCFG_DEVICE_PROGRAM_MAP(asrx_map) - MCFG_CPU_ADD("esp", ES5510, XTAL(10'000'000)) // Actually ES5511 + MCFG_DEVICE_ADD("esp", ES5510, XTAL(10'000'000)) // Actually ES5511 MCFG_DEVICE_DISABLE() MCFG_ESQ2X40_SQ1_ADD("sq1vfd") MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("pump", ESQ_5505_5510_PUMP, XTAL(16'000'000) / (16 * 32)) // Actually ES5511 + MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, XTAL(16'000'000) / (16 * 32)) // Actually ES5511 MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) - MCFG_SOUND_ADD("ensoniq", ES5506, XTAL(16'000'000)) + MCFG_DEVICE_ADD("ensoniq", ES5506, XTAL(16'000'000)) MCFG_ES5506_REGION0("waverom") /* Bank 0 */ MCFG_ES5506_REGION1("waverom2") /* Bank 1 */ MCFG_ES5506_REGION2("waverom3") /* Bank 0 */ MCFG_ES5506_REGION3("waverom4") /* Bank 1 */ MCFG_ES5506_CHANNELS(1) /* channels */ - MCFG_ES5506_IRQ_CB(WRITELINE(esqasr_state, esq5506_otto_irq)) /* irq */ - MCFG_ES5506_READ_PORT_CB(READ16(esqasr_state, esq5506_read_adc)) + MCFG_ES5506_IRQ_CB(WRITELINE(*this, esqasr_state, esq5506_otto_irq)) /* irq */ + MCFG_ES5506_READ_PORT_CB(READ16(*this, esqasr_state, esq5506_read_adc)) MCFG_SOUND_ROUTE(0, "pump", 1.0, 0) MCFG_SOUND_ROUTE(1, "pump", 1.0, 1) MCFG_SOUND_ROUTE(2, "pump", 1.0, 2) |