summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/beezer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/beezer.cpp')
-rw-r--r--src/mame/drivers/beezer.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp
index ad78b0f5588..27b5cad9b5f 100644
--- a/src/mame/drivers/beezer.cpp
+++ b/src/mame/drivers/beezer.cpp
@@ -468,8 +468,8 @@ void beezer_state::machine_reset()
MACHINE_CONFIG_START(beezer_state::beezer)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(12'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(12'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("sysbank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(banked_map)
@@ -481,12 +481,12 @@ MACHINE_CONFIG_START(beezer_state::beezer)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", beezer_state, scanline_cb, "screen", 0, 1)
MCFG_DEVICE_ADD("via_u6", VIA6522, XTAL(12'000'000) / 12)
- MCFG_VIA6522_READPA_HANDLER(READ8(beezer_state, via_system_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(beezer_state, via_system_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(beezer_state, via_system_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(beezer_state, via_system_pb_w))
- MCFG_VIA6522_CB1_HANDLER(DEVWRITELINE("via_u18", via6522_device, write_ca2))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE("via_u18", via6522_device, write_ca1))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, beezer_state, via_system_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, beezer_state, via_system_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, beezer_state, via_system_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, beezer_state, via_system_pb_w))
+ MCFG_VIA6522_CB1_HANDLER(WRITELINE("via_u18", via6522_device, write_ca2))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE("via_u18", via6522_device, write_ca1))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_WATCHDOG_ADD("watchdog")
@@ -504,34 +504,34 @@ MACHINE_CONFIG_START(beezer_state::beezer)
MCFG_PALETTE_INIT_OWNER(beezer_state, beezer)
// sound hardware
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_INPUT_MERGER_ANY_HIGH("audio_irqs")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("via_u18", VIA6522, XTAL(4'000'000) / 4)
- MCFG_VIA6522_READPA_HANDLER(READ8(beezer_state, via_audio_pa_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(beezer_state, via_audio_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(beezer_state, via_audio_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("via_u6", via6522_device, write_cb1))
- MCFG_VIA6522_CB1_HANDLER(WRITELINE(beezer_state, dmod_clr_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(beezer_state, dmod_data_w))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("audio_irqs", input_merger_device, in_w<0>))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, beezer_state, via_audio_pa_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, beezer_state, via_audio_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, beezer_state, via_audio_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE("via_u6", via6522_device, write_cb1))
+ MCFG_VIA6522_CB1_HANDLER(WRITELINE(*this, beezer_state, dmod_clr_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, beezer_state, dmod_data_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE("audio_irqs", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD("ptm", PTM6840, XTAL(4'000'000) / 4)
- MCFG_PTM6840_O1_CB(WRITELINE(beezer_state, ptm_o1_w))
- MCFG_PTM6840_O2_CB(WRITELINE(beezer_state, ptm_o2_w))
- MCFG_PTM6840_O3_CB(WRITELINE(beezer_state, ptm_o3_w))
- MCFG_PTM6840_IRQ_CB(DEVWRITELINE("audio_irqs", input_merger_device, in_w<1>))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, beezer_state, ptm_o1_w))
+ MCFG_PTM6840_O2_CB(WRITELINE(*this, beezer_state, ptm_o2_w))
+ MCFG_PTM6840_O3_CB(WRITELINE(*this, beezer_state, ptm_o3_w))
+ MCFG_PTM6840_IRQ_CB(WRITELINE("audio_irqs", input_merger_device, in_w<1>))
// schematics show an input labeled VCO to channel 2, but the source is unknown
MCFG_MM5837_ADD("noise")
MCFG_MM5837_VDD(12)
- MCFG_MM5837_OUTPUT_CB(WRITELINE(beezer_state, noise_w))
+ MCFG_MM5837_OUTPUT_CB(WRITELINE(*this, beezer_state, noise_w))
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC76, 0)
+ MCFG_DEVICE_ADD("dac", DAC76, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END