summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/tempest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/tempest.cpp')
-rw-r--r--src/mame/drivers/tempest.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp
index 8ef79ce5bef..4aeb0387791 100644
--- a/src/mame/drivers/tempest.cpp
+++ b/src/mame/drivers/tempest.cpp
@@ -599,9 +599,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tempest_state::tempest)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(tempest_state, irq0_line_assert, CLOCK_3KHZ / 12)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tempest_state, irq0_line_assert, CLOCK_3KHZ / 12)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(CLOCK_3KHZ / 256))
@@ -625,28 +625,28 @@ MACHINE_CONFIG_START(tempest_state::tempest)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK / 8)
- MCFG_POKEY_POT0_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT1_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT2_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT3_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT4_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT5_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT6_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT7_R_CB(READ8(tempest_state, input_port_1_bit_r))
+ MCFG_DEVICE_ADD("pokey1", POKEY, MASTER_CLOCK / 8)
+ MCFG_POKEY_POT0_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT1_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT2_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT3_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT4_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT5_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT6_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT7_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
MCFG_POKEY_OUTPUT_RC(RES_K(10), CAP_U(0.015), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK / 8)
- MCFG_POKEY_POT0_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT1_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT2_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT3_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT4_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT5_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT6_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT7_R_CB(READ8(tempest_state, input_port_2_bit_r))
+ MCFG_DEVICE_ADD("pokey2", POKEY, MASTER_CLOCK / 8)
+ MCFG_POKEY_POT0_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT1_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT2_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT3_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT4_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT5_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT6_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT7_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
MCFG_POKEY_OUTPUT_RC(RES_K(10), CAP_U(0.015), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)