summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/apollo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/apollo.cpp')
-rw-r--r--src/mame/drivers/apollo.cpp68
1 files changed, 34 insertions, 34 deletions
diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp
index 36acbe3e8f3..8ee9cf4c829 100644
--- a/src/mame/drivers/apollo.cpp
+++ b/src/mame/drivers/apollo.cpp
@@ -1055,9 +1055,9 @@ READ_LINE_MEMBER( apollo_state::apollo_kbd_is_german )
MACHINE_CONFIG_START(apollo_state::dn3500)
/* basic machine hardware */
- MCFG_CPU_ADD(MAINCPU, M68030, 25000000) /* 25 MHz 68030 */
- MCFG_CPU_PROGRAM_MAP(dn3500_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
+ MCFG_DEVICE_ADD(MAINCPU, M68030, 25000000) /* 25 MHz 68030 */
+ MCFG_DEVICE_PROGRAM_MAP(dn3500_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1065,7 +1065,7 @@ MACHINE_CONFIG_START(apollo_state::dn3500)
/* keyboard beeper */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beep", BEEP, 1000)
+ MCFG_DEVICE_ADD("beep", BEEP, 1000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* internal ram */
@@ -1075,21 +1075,21 @@ MACHINE_CONFIG_START(apollo_state::dn3500)
#ifdef APOLLO_XXL
MCFG_DEVICE_ADD(APOLLO_STDIO_TAG, APOLLO_STDIO, 0)
- MCFG_APOLLO_STDIO_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_b_w))
+ MCFG_APOLLO_STDIO_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_b_w))
#endif
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dsp3500)
- MCFG_CPU_ADD(MAINCPU, M68030, 25000000) /* 25 MHz 68030 */
- MCFG_CPU_PROGRAM_MAP(dsp3500_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
+ MCFG_DEVICE_ADD(MAINCPU, M68030, 25000000) /* 25 MHz 68030 */
+ MCFG_DEVICE_PROGRAM_MAP(dsp3500_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
apollo_terminal(config);
/* keyboard beeper */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beep", BEEP, 1000)
+ MCFG_DEVICE_ADD("beep", BEEP, 1000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* internal ram */
@@ -1106,8 +1106,8 @@ MACHINE_CONFIG_START(apollo_state::dn3500_19i)
/* video hardware 19" monochrome */
MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
- MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
- MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
+ MCFG_APOLLO_KBD_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
+ MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(*this, apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dn3500_15i)
@@ -1115,15 +1115,15 @@ MACHINE_CONFIG_START(apollo_state::dn3500_15i)
/* video hardware is 15" monochrome or color */
MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
- MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
- MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
+ MCFG_APOLLO_KBD_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
+ MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(*this, apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dn3000)
dn3500(config);
- MCFG_CPU_REPLACE(MAINCPU, M68020PMMU, 12000000) /* 12 MHz */
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
- MCFG_CPU_PROGRAM_MAP(dn3000_map)
+ MCFG_DEVICE_REPLACE(MAINCPU, M68020PMMU, 12000000) /* 12 MHz */
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
+ MCFG_DEVICE_PROGRAM_MAP(dn3000_map)
MCFG_DEVICE_REMOVE( APOLLO_SIO2_TAG )
MCFG_RAM_MODIFY("messram")
MCFG_RAM_DEFAULT_SIZE("8M")
@@ -1131,16 +1131,16 @@ MACHINE_CONFIG_START(apollo_state::dn3000)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dsp3000)
- MCFG_CPU_ADD(MAINCPU, M68020PMMU, 12000000) /* 12 MHz */
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
- MCFG_CPU_PROGRAM_MAP(dsp3000_map)
+ MCFG_DEVICE_ADD(MAINCPU, M68020PMMU, 12000000) /* 12 MHz */
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
+ MCFG_DEVICE_PROGRAM_MAP(dsp3000_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
apollo_terminal(config);
/* keyboard beeper */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beep", BEEP, 1000)
+ MCFG_DEVICE_ADD("beep", BEEP, 1000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* internal ram */
@@ -1160,8 +1160,8 @@ MACHINE_CONFIG_START(apollo_state::dn3000_19i)
/* video hardware 19" monochrome */
MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
- MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
- MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
+ MCFG_APOLLO_KBD_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
+ MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(*this, apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dn3000_15i)
@@ -1169,27 +1169,27 @@ MACHINE_CONFIG_START(apollo_state::dn3000_15i)
/* video hardware 15" monochrome */
MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
- MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
- MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
+ MCFG_APOLLO_KBD_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
+ MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(*this, apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dn5500)
dn3500(config);
- MCFG_CPU_REPLACE(MAINCPU, M68040, 25000000) /* 25 MHz */
- MCFG_CPU_PROGRAM_MAP(dn5500_map)
+ MCFG_DEVICE_REPLACE(MAINCPU, M68040, 25000000) /* 25 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(dn5500_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dsp5500)
- MCFG_CPU_ADD(MAINCPU, M68040, 25000000) /* 25 MHz */
- MCFG_CPU_PROGRAM_MAP(dsp5500_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
+ MCFG_DEVICE_ADD(MAINCPU, M68040, 25000000) /* 25 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(dsp5500_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
apollo_terminal(config);
/* keyboard beeper */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beep", BEEP, 1000)
+ MCFG_DEVICE_ADD("beep", BEEP, 1000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* terminal hardware */
@@ -1201,8 +1201,8 @@ MACHINE_CONFIG_START(apollo_state::dn5500_19i)
/* video hardware 19" monochrome */
MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
- MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
- MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
+ MCFG_APOLLO_KBD_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
+ MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(*this, apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dn5500_15i)
@@ -1210,8 +1210,8 @@ MACHINE_CONFIG_START(apollo_state::dn5500_15i)
/* video hardware 15" monochrome */
MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
- MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
- MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
+ MCFG_APOLLO_KBD_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
+ MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(*this, apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
/***************************************************************************