diff options
Diffstat (limited to 'src/mame/drivers/bking.cpp')
-rw-r--r-- | src/mame/drivers/bking.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp index 3bc2c610757..4d873a81178 100644 --- a/src/mame/drivers/bking.cpp +++ b/src/mame/drivers/bking.cpp @@ -392,18 +392,18 @@ MACHINE_RESET_MEMBER(bking_state,bking3) MACHINE_CONFIG_START(bking_state::bking) /* basic machine hardware */ - MCFG_CPU_ADD("main_cpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */ - MCFG_CPU_PROGRAM_MAP(bking_map) - MCFG_CPU_IO_MAP(bking_io_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", bking_state, irq0_line_hold) + MCFG_DEVICE_ADD("main_cpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */ + MCFG_DEVICE_PROGRAM_MAP(bking_map) + MCFG_DEVICE_IO_MAP(bking_io_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bking_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(6'000'000)/2) /* 3 MHz */ - MCFG_CPU_PROGRAM_MAP(bking_audio_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(6'000'000)/2) /* 3 MHz */ + MCFG_DEVICE_PROGRAM_MAP(bking_audio_map) /* interrupts (from Jungle King hardware, might be wrong): */ /* - no interrupts synced with vblank */ /* - NMI triggered by the main CPU */ /* - periodic IRQ, with frequency 6000000/(4*16*16*10*16) = 36.621 Hz, */ - MCFG_CPU_PERIODIC_INT_DRIVER(bking_state, irq0_line_hold, (double)6000000/(4*16*16*10*16)) + MCFG_DEVICE_PERIODIC_INT_DRIVER(bking_state, irq0_line_hold, (double)6000000/(4*16*16*10*16)) MCFG_WATCHDOG_ADD("watchdog") @@ -414,7 +414,7 @@ MACHINE_CONFIG_START(bking_state::bking) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(bking_state, screen_update_bking) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(bking_state, screen_vblank_bking)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bking_state, screen_vblank_bking)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", bking) @@ -425,20 +425,20 @@ MACHINE_CONFIG_START(bking_state::bking) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>)) + MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>)) MCFG_INPUT_MERGER_ALL_HIGH("soundnmi") MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_SOUND_ADD("ay1", AY8910, XTAL(6'000'000)/4) + MCFG_DEVICE_ADD("ay1", AY8910, XTAL(6'000'000)/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) - MCFG_SOUND_ADD("ay2", AY8910, XTAL(6'000'000)/4) - MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("dac", dac_byte_interface, write)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(bking_state, port_b_w)) + MCFG_DEVICE_ADD("ay2", AY8910, XTAL(6'000'000)/4) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, bking_state, port_b_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // 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 @@ -447,8 +447,8 @@ MACHINE_CONFIG_START(bking_state::bking3) bking(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("main_cpu") - MCFG_CPU_IO_MAP(bking3_io_map) + MCFG_DEVICE_MODIFY("main_cpu") + MCFG_DEVICE_IO_MAP(bking3_io_map) MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(3'000'000)) /* xtal is 3MHz, divided by 4 internally */ |