summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/slapfght.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/slapfght.cpp')
-rw-r--r--src/mame/drivers/slapfght.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp
index 7857866d11e..d5d0e0973ab 100644
--- a/src/mame/drivers/slapfght.cpp
+++ b/src/mame/drivers/slapfght.cpp
@@ -876,7 +876,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(slapfght_state::perfrman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/4) // 4MHz? XTAL is known, divider is guessed
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/4) // 4MHz? XTAL is known, divider is guessed
MCFG_CPU_PROGRAM_MAP(perfrman_map)
MCFG_CPU_IO_MAP(io_map_nomcu)
MCFG_CPU_VBLANK_INT_DRIVER("screen", slapfght_state, vblank_irq)
@@ -887,7 +887,7 @@ MACHINE_CONFIG_START(slapfght_state::perfrman)
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(slapfght_state, irq_enable_w))
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(slapfght_state, palette_bank_w))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/8) // 2MHz? XTAL is known, divider is guessed
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/8) // 2MHz? XTAL is known, divider is guessed
MCFG_CPU_PROGRAM_MAP(perfrman_sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(slapfght_state, sound_nmi, 240) // music speed, verified
@@ -912,12 +912,12 @@ MACHINE_CONFIG_START(slapfght_state::perfrman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_16MHz/8)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(16'000'000)/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_16MHz/8)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(16'000'000)/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -927,7 +927,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(slapfght_state::tigerh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_36MHz/6) // 6MHz
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(36'000'000)/6) // 6MHz
MCFG_CPU_PROGRAM_MAP(tigerh_map_mcu)
MCFG_CPU_IO_MAP(io_map_mcu)
MCFG_CPU_VBLANK_INT_DRIVER("screen", slapfght_state, vblank_irq)
@@ -937,11 +937,11 @@ MACHINE_CONFIG_START(slapfght_state::tigerh)
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(slapfght_state, flipscreen_w))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(slapfght_state, irq_enable_w))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_36MHz/12) // 3MHz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(36'000'000)/12) // 3MHz
MCFG_CPU_PROGRAM_MAP(tigerh_sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(slapfght_state, sound_nmi, 360) // music speed, verified with pcb recording
- MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU_TIGER, XTAL_36MHz/12) // 3MHz
+ MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU_TIGER, XTAL(36'000'000)/12) // 3MHz
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -964,12 +964,12 @@ MACHINE_CONFIG_START(slapfght_state::tigerh)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_36MHz/24) // 1.5MHz
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(36'000'000)/24) // 1.5MHz
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_36MHz/24) // 1.5MHz
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(36'000'000)/24) // 1.5MHz
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -996,7 +996,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(slapfght_state::slapfigh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_36MHz/6) // 6MHz
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(36'000'000)/6) // 6MHz
MCFG_CPU_PROGRAM_MAP(slapfigh_map_mcu)
MCFG_CPU_IO_MAP(io_map_mcu)
MCFG_CPU_VBLANK_INT_DRIVER("screen", slapfght_state, vblank_irq)
@@ -1007,11 +1007,11 @@ MACHINE_CONFIG_START(slapfght_state::slapfigh)
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(slapfght_state, irq_enable_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(MEMBANK("bank1"))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_36MHz/12) // 3MHz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(36'000'000)/12) // 3MHz
MCFG_CPU_PROGRAM_MAP(tigerh_sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(slapfght_state, sound_nmi, 180)
- MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL_36MHz/12) // 3MHz
+ MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(36'000'000)/12) // 3MHz
MCFG_TAITO_M68705_AUX_STROBE_CB(WRITE8(slapfght_state, scroll_from_mcu_w))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -1035,12 +1035,12 @@ MACHINE_CONFIG_START(slapfght_state::slapfigh)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_36MHz/24) // 1.5MHz
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(36'000'000)/24) // 1.5MHz
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_36MHz/24) // 1.5MHz
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(36'000'000)/24) // 1.5MHz
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)