diff options
Diffstat (limited to 'src/mame/drivers/zn.cpp')
-rw-r--r-- | src/mame/drivers/zn.cpp | 168 |
1 files changed, 84 insertions, 84 deletions
diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp index f308c42747d..5c9947a4f9e 100644 --- a/src/mame/drivers/zn.cpp +++ b/src/mame/drivers/zn.cpp @@ -378,25 +378,25 @@ void zn_state::zn_map(address_map &map) MACHINE_CONFIG_START(zn_state::zn1_1mb_vram) /* basic machine hardware */ - MCFG_CPU_ADD( m_maincpu, CXD8530CQ, XTAL(67'737'600) ) - MCFG_CPU_PROGRAM_MAP( zn_map) + MCFG_DEVICE_ADD( m_maincpu, CXD8530CQ, XTAL(67'737'600) ) + MCFG_DEVICE_PROGRAM_MAP( zn_map) MCFG_RAM_MODIFY("maincpu:ram") MCFG_RAM_DEFAULT_SIZE("4M") MCFG_DEVICE_MODIFY("maincpu:sio0") - MCFG_PSX_SIO_SCK_HANDLER(WRITELINE(zn_state, sio0_sck)) - MCFG_PSX_SIO_TXD_HANDLER(WRITELINE(zn_state, sio0_txd)) + MCFG_PSX_SIO_SCK_HANDLER(WRITELINE(*this, zn_state, sio0_sck)) + MCFG_PSX_SIO_TXD_HANDLER(WRITELINE(*this, zn_state, sio0_txd)) MCFG_DEVICE_ADD("cat702_1", CAT702, 0) - MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_dataout<0>)) + MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(*this, zn_state, cat702_dataout<0>)) MCFG_DEVICE_ADD("cat702_2", CAT702, 0) - MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_dataout<1>)) + MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(*this, zn_state, cat702_dataout<1>)) MCFG_DEVICE_ADD("znmcu", ZNMCU, 0) - MCFG_ZNMCU_DATAOUT_HANDLER(WRITELINE(zn_state, znmcu_dataout)) - MCFG_ZNMCU_DSR_HANDLER(WRITELINE(zn_state, znmcu_dsrout)) + MCFG_ZNMCU_DATAOUT_HANDLER(WRITELINE(*this, zn_state, znmcu_dataout)) + MCFG_ZNMCU_DSR_HANDLER(WRITELINE(*this, zn_state, znmcu_dsrout)) MCFG_ZNMCU_DSW_HANDLER(IOPORT("DSW")) MCFG_ZNMCU_ANALOG1_HANDLER(IOPORT("ANALOG1")) MCFG_ZNMCU_ANALOG2_HANDLER(IOPORT("ANALOG2")) @@ -424,25 +424,25 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(zn_state::zn2) /* basic machine hardware */ - MCFG_CPU_ADD( m_maincpu, CXD8661R, XTAL(100'000'000) ) - MCFG_CPU_PROGRAM_MAP( zn_map) + MCFG_DEVICE_ADD( m_maincpu, CXD8661R, XTAL(100'000'000) ) + MCFG_DEVICE_PROGRAM_MAP( zn_map) MCFG_RAM_MODIFY("maincpu:ram") MCFG_RAM_DEFAULT_SIZE("4M") MCFG_DEVICE_MODIFY("maincpu:sio0") - MCFG_PSX_SIO_SCK_HANDLER(WRITELINE(zn_state, sio0_sck)) - MCFG_PSX_SIO_TXD_HANDLER(WRITELINE(zn_state, sio0_txd)) + MCFG_PSX_SIO_SCK_HANDLER(WRITELINE(*this, zn_state, sio0_sck)) + MCFG_PSX_SIO_TXD_HANDLER(WRITELINE(*this, zn_state, sio0_txd)) MCFG_DEVICE_ADD("cat702_1", CAT702, 0) - MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_dataout<0>)) + MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(*this, zn_state, cat702_dataout<0>)) MCFG_DEVICE_ADD("cat702_2", CAT702, 0) - MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_dataout<1>)) + MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(*this, zn_state, cat702_dataout<1>)) MCFG_DEVICE_ADD("znmcu", ZNMCU, 0) - MCFG_ZNMCU_DATAOUT_HANDLER(WRITELINE(zn_state, znmcu_dataout)) - MCFG_ZNMCU_DSR_HANDLER(WRITELINE(zn_state, znmcu_dsrout)) + MCFG_ZNMCU_DATAOUT_HANDLER(WRITELINE(*this, zn_state, znmcu_dataout)) + MCFG_ZNMCU_DSR_HANDLER(WRITELINE(*this, zn_state, znmcu_dsrout)) MCFG_ZNMCU_DSW_HANDLER(IOPORT("DSW")) MCFG_ZNMCU_ANALOG1_HANDLER(IOPORT("ANALOG1")) MCFG_ZNMCU_ANALOG2_HANDLER(IOPORT("ANALOG2")) @@ -647,13 +647,13 @@ void zn_state::qsound_portmap(address_map &map) MACHINE_CONFIG_START(zn_state::coh1000c) zn1_1mb_vram(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1000c_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1000c_map) - MCFG_CPU_ADD(m_audiocpu, Z80, XTAL(8'000'000)) - MCFG_CPU_PROGRAM_MAP(qsound_map) - MCFG_CPU_IO_MAP(qsound_portmap) - MCFG_CPU_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp) + MCFG_DEVICE_ADD(m_audiocpu, Z80, XTAL(8'000'000)) + MCFG_DEVICE_PROGRAM_MAP(qsound_map) + MCFG_DEVICE_IO_MAP(qsound_portmap) + MCFG_DEVICE_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c) @@ -673,13 +673,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(zn_state::coh1002c) zn1_2mb_vram(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1000c_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1000c_map) - MCFG_CPU_ADD(m_audiocpu, Z80, XTAL(8'000'000)) - MCFG_CPU_PROGRAM_MAP(qsound_map) - MCFG_CPU_IO_MAP(qsound_portmap) - MCFG_CPU_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp) + MCFG_DEVICE_ADD(m_audiocpu, Z80, XTAL(8'000'000)) + MCFG_DEVICE_PROGRAM_MAP(qsound_map) + MCFG_DEVICE_IO_MAP(qsound_portmap) + MCFG_DEVICE_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c) @@ -835,13 +835,13 @@ Notes: MACHINE_CONFIG_START(zn_state::coh3002c) zn2(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1000c_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1000c_map) - MCFG_CPU_ADD(m_audiocpu, Z80, XTAL(8'000'000)) - MCFG_CPU_PROGRAM_MAP(qsound_map) - MCFG_CPU_IO_MAP(qsound_portmap) - MCFG_CPU_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp) + MCFG_DEVICE_ADD(m_audiocpu, Z80, XTAL(8'000'000)) + MCFG_DEVICE_PROGRAM_MAP(qsound_map) + MCFG_DEVICE_IO_MAP(qsound_portmap) + MCFG_DEVICE_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c) @@ -1132,16 +1132,16 @@ void zn_state::fx1a_sound_map(address_map &map) MACHINE_CONFIG_START(zn_state::coh1000ta) zn1_1mb_vram(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1000ta_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1000ta_map) - MCFG_CPU_ADD(m_audiocpu, Z80, XTAL(16'000'000) / 4) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(fx1a_sound_map) + MCFG_DEVICE_ADD(m_audiocpu, Z80, XTAL(16'000'000) / 4) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(fx1a_sound_map) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000ta) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta) - MCFG_SOUND_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2) + MCFG_DEVICE_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2) MCFG_YM2610_IRQ_HANDLER(INPUTLINE(m_audiocpu, 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -1190,8 +1190,8 @@ MACHINE_CONFIG_START(zn_state::coh1000tb) zn1_1mb_vram(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1000tb_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1000tb_map) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000ta) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta) @@ -1200,7 +1200,7 @@ MACHINE_CONFIG_START(zn_state::coh1000tb) MCFG_MB3773_ADD("mb3773") /* sound hardware */ - MCFG_SOUND_MODIFY("spu") + MCFG_DEVICE_MODIFY("spu") MCFG_SOUND_ROUTES_RESET() MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) @@ -1212,8 +1212,8 @@ MACHINE_CONFIG_START(zn_state::coh1002tb) zn1_2mb_vram(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1000tb_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1000tb_map) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000ta) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta) @@ -1222,7 +1222,7 @@ MACHINE_CONFIG_START(zn_state::coh1002tb) MCFG_MB3773_ADD("mb3773") /* sound hardware */ - MCFG_SOUND_MODIFY("spu") + MCFG_DEVICE_MODIFY("spu") MCFG_SOUND_ROUTES_RESET() MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) @@ -1458,14 +1458,14 @@ void zn_state::coh1000w_map(address_map &map) MACHINE_CONFIG_START(zn_state::coh1000w) zn1_2mb_vram(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1000w_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1000w_map) MCFG_RAM_MODIFY("maincpu:ram") MCFG_RAM_DEFAULT_SIZE("8M") MCFG_VT83C461_ADD("ide", ata_devices, "hdd", nullptr, true) - MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10)) + MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("maincpu:irq", psxirq_device, intin10)) MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&zn_state::atpsx_dma_read, this ) ) MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&zn_state::atpsx_dma_write, this ) ) MACHINE_CONFIG_END @@ -1677,27 +1677,27 @@ void zn_state::oki_map(address_map &map) MACHINE_CONFIG_START(zn_state::coh1002e) zn1_2mb_vram(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1002e_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1002e_map) - MCFG_CPU_ADD(m_audiocpu, M68000, XTAL(12'000'000)) - MCFG_CPU_PROGRAM_MAP(psarc_snd_map) + MCFG_DEVICE_ADD(m_audiocpu, M68000, XTAL(12'000'000)) + MCFG_DEVICE_PROGRAM_MAP(psarc_snd_map) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002e) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002e) - MCFG_SOUND_ADD("ymf", YMF271, XTAL(16'934'400)) + MCFG_DEVICE_ADD("ymf", YMF271, XTAL(16'934'400)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END MACHINE_CONFIG_START(zn_state::beastrzrb) zn1_2mb_vram(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1002e_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1002e_map) - MCFG_CPU_ADD(m_audiocpu, AT89C4051, XTAL(12'000'000)) // clock unverified - MCFG_CPU_PROGRAM_MAP(beastrzrb_snd_map) + MCFG_DEVICE_ADD(m_audiocpu, AT89C4051, XTAL(12'000'000)) // clock unverified + MCFG_DEVICE_PROGRAM_MAP(beastrzrb_snd_map) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002e) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002e) @@ -1833,8 +1833,8 @@ MACHINE_RESET_MEMBER(zn_state,bam2) MACHINE_CONFIG_START(zn_state::bam2) zn1_2mb_vram(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(bam2_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(bam2_map) MCFG_MACHINE_START_OVERRIDE(zn_state, bam2) MCFG_MACHINE_RESET_OVERRIDE(zn_state, bam2) @@ -2183,14 +2183,14 @@ void zn_state::jdredd_map(address_map &map) MACHINE_CONFIG_START(zn_state::coh1000a) zn1_2mb_vram(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1000a_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1000a_map) MACHINE_CONFIG_END MACHINE_CONFIG_START(zn_state::nbajamex) coh1000a(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(nbajamex_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(nbajamex_map) MCFG_NVRAM_ADD_1FILL("71256") @@ -2209,14 +2209,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(zn_state::jdredd) coh1000a(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(jdredd_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(jdredd_map) MCFG_DEVICE_MODIFY("gpu") MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate(&zn_state::jdredd_vblank, this)) MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true) - MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10)) + MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("maincpu:irq", psxirq_device, intin10)) MACHINE_CONFIG_END /* @@ -2377,11 +2377,11 @@ void zn_state::atlus_snd_map(address_map &map) MACHINE_CONFIG_START(zn_state::coh1001l) zn1_2mb_vram(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1001l_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1001l_map) - MCFG_CPU_ADD(m_audiocpu, M68000, XTAL(10'000'000)) - MCFG_CPU_PROGRAM_MAP(atlus_snd_map) + MCFG_DEVICE_ADD(m_audiocpu, M68000, XTAL(10'000'000)) + MCFG_DEVICE_PROGRAM_MAP(atlus_snd_map) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1001l) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1001l) @@ -2389,7 +2389,7 @@ MACHINE_CONFIG_START(zn_state::coh1001l) MCFG_GENERIC_LATCH_16_ADD("soundlatch16") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE(m_audiocpu, 3)) - MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400)) + MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400)) MCFG_YMZ280B_IRQ_HANDLER(INPUTLINE(m_audiocpu, 2)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.35) MCFG_SOUND_ROUTE(1, "rspeaker", 0.35) @@ -2433,8 +2433,8 @@ MACHINE_RESET_MEMBER(zn_state,coh1002v) MACHINE_CONFIG_START(zn_state::coh1002v) zn1_2mb_vram(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1002v_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1002v_map) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002v) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002v) @@ -2623,8 +2623,8 @@ MACHINE_RESET_MEMBER(zn_state,coh1002m) MACHINE_CONFIG_START(zn_state::coh1002m) zn1_2mb_vram(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1002m_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1002m_map) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002m) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002m) @@ -2680,12 +2680,12 @@ MACHINE_CONFIG_START(zn_state::coh1002msnd) coh1002m(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(coh1002msnd_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(coh1002msnd_map) - MCFG_CPU_ADD(m_audiocpu, Z80, XTAL(32'000'000)/8) - MCFG_CPU_PROGRAM_MAP(cbaj_z80_map) - MCFG_CPU_IO_MAP(cbaj_z80_port_map) + MCFG_DEVICE_ADD(m_audiocpu, Z80, XTAL(32'000'000)/8) + MCFG_DEVICE_PROGRAM_MAP(cbaj_z80_map) + MCFG_DEVICE_IO_MAP(cbaj_z80_port_map) MCFG_FIFO7200_ADD("cbaj_fifo1", 0x400) // LH540202 MCFG_FIFO7200_ADD("cbaj_fifo2", 0x400) // " @@ -2693,16 +2693,16 @@ MACHINE_CONFIG_START(zn_state::coh1002msnd) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* sound hardware */ - MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400)) + MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.35) MCFG_SOUND_ROUTE(1, "rspeaker", 0.35) MACHINE_CONFIG_END MACHINE_CONFIG_START(zn_state::coh1002ml) coh1002m(config); - MCFG_CPU_ADD("link", Z80, 4000000) // ? - MCFG_CPU_PROGRAM_MAP(coh1002ml_link_map) - MCFG_CPU_IO_MAP(coh1002ml_link_port_map) + MCFG_DEVICE_ADD("link", Z80, 4000000) // ? + MCFG_DEVICE_PROGRAM_MAP(coh1002ml_link_map) + MCFG_DEVICE_IO_MAP(coh1002ml_link_port_map) MACHINE_CONFIG_END |