summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/joctronic.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/joctronic.cpp')
-rw-r--r--src/mame/drivers/joctronic.cpp70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/mame/drivers/joctronic.cpp b/src/mame/drivers/joctronic.cpp
index d2695472611..745bcb36c06 100644
--- a/src/mame/drivers/joctronic.cpp
+++ b/src/mame/drivers/joctronic.cpp
@@ -333,21 +333,21 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(joctronic_state::joctronic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) // 3 MHz - uses WAIT
- MCFG_CPU_PROGRAM_MAP(maincpu_map) // 139
- MCFG_CPU_IO_MAP(maincpu_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/4) // 3 MHz - uses WAIT
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map) // 139
+ MCFG_DEVICE_IO_MAP(maincpu_io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
- MCFG_CPU_PROGRAM_MAP(joctronic_sound_map)
- MCFG_CPU_IO_MAP(joctronic_sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
+ MCFG_DEVICE_PROGRAM_MAP(joctronic_sound_map)
+ MCFG_DEVICE_IO_MAP(joctronic_sound_io_map)
MCFG_NVRAM_ADD_0FILL("nvram") // 5516
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // IC4 - exact type unknown
- //MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(joctronic_state, display_select_w)) MCFG_DEVCB_MASK(0x07)
- //MCFG_DEVCB_CHAIN_OUTPUT(WRITE8(joctronic_state, ls145_w)) MCFG_DEVCB_RSHIFT(4)
- //MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(joctronic_state, display_reset_w))
+ //MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, joctronic_state, display_select_w)) MCFG_DEVCB_MASK(0x07)
+ //MCFG_DEVCB_CHAIN_OUTPUT(WRITE8(*this, joctronic_state, ls145_w)) MCFG_DEVCB_RSHIFT(4)
+ //MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, joctronic_state, display_reset_w))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(12'000'000)/4) // 3 MHz
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -362,38 +362,38 @@ MACHINE_CONFIG_START(joctronic_state::joctronic)
MCFG_SPEAKER_STANDARD_MONO("mono")
// Datasheet suggests YM2203 as a possible replacement for this AY8910
- MCFG_SOUND_ADD("aysnd1", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("r2r1", dac_8bit_r2r_device, write))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("r2r2", dac_8bit_r2r_device, write))
+ MCFG_DEVICE_ADD("aysnd1", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("r2r1", dac_8bit_r2r_device, write))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("r2r2", dac_8bit_r2r_device, write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("aysnd2", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
+ MCFG_DEVICE_ADD("aysnd2", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("r2r1", DAC_8BIT_R2R, 0)
+ MCFG_DEVICE_ADD("r2r1", DAC_8BIT_R2R, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("r2r2", DAC_8BIT_R2R, 0)
+ MCFG_DEVICE_ADD("r2r2", DAC_8BIT_R2R, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(joctronic_state::slalom03)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
- MCFG_CPU_PROGRAM_MAP(slalom03_maincpu_map) // 138, 368, 32
- MCFG_CPU_IO_MAP(maincpu_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
+ MCFG_DEVICE_PROGRAM_MAP(slalom03_maincpu_map) // 138, 368, 32
+ MCFG_DEVICE_IO_MAP(maincpu_io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
- MCFG_CPU_PROGRAM_MAP(slalom03_sound_map)
- MCFG_CPU_IO_MAP(slalom03_sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
+ MCFG_DEVICE_PROGRAM_MAP(slalom03_sound_map)
+ MCFG_DEVICE_IO_MAP(slalom03_sound_io_map)
MCFG_NVRAM_ADD_0FILL("nvram") // 5516
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // IC6 - exact type unknown
- //MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(joctronic_state, cont_w))
- //MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(joctronic_state, ls145_w)) MCFG_DEVCB_RSHIFT(3) MCFG_DEVCB_MASK(0x38)
- //MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(joctronic_state, slalom03_reset_w))
+ //MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, joctronic_state, cont_w))
+ //MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, joctronic_state, ls145_w)) MCFG_DEVCB_RSHIFT(3) MCFG_DEVCB_MASK(0x38)
+ //MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, joctronic_state, slalom03_reset_w))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(12'000'000)/2) // 6 MHz
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -409,31 +409,31 @@ MACHINE_CONFIG_START(joctronic_state::slalom03)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd1", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(joctronic_state, slalom03_oki_bank_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("adpcm_select", ls157_device, ba_w))
+ MCFG_DEVICE_ADD("aysnd1", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, joctronic_state, slalom03_oki_bank_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("adpcm_select", ls157_device, ba_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("aysnd2", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("r2r", dac_8bit_r2r_device, write))
+ MCFG_DEVICE_ADD("aysnd2", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("r2r", dac_8bit_r2r_device, write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("r2r", DAC_8BIT_R2R, 0)
+ MCFG_DEVICE_ADD("r2r", DAC_8BIT_R2R, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("oki", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("oki", msm5205_device, data_w))
- MCFG_SOUND_ADD("oki", MSM5205, XTAL(12'000'000)/2/16) // 375 kHz
+ MCFG_DEVICE_ADD("oki", MSM5205, XTAL(12'000'000)/2/16) // 375 kHz
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) // frequency modifiable during operation
- MCFG_MSM5205_VCK_CALLBACK(WRITELINE(joctronic_state, vck_w))
+ MCFG_MSM5205_VCK_CALLBACK(WRITELINE(*this, joctronic_state, vck_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(joctronic_state::bldyrolr)
slalom03(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bldyrolr_maincpu_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bldyrolr_maincpu_map)
MACHINE_CONFIG_END