summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/toaplan2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/toaplan2.cpp')
-rw-r--r--src/mame/drivers/toaplan2.cpp230
1 files changed, 115 insertions, 115 deletions
diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp
index ef35ede6e3b..9b5aaa1ae24 100644
--- a/src/mame/drivers/toaplan2.cpp
+++ b/src/mame/drivers/toaplan2.cpp
@@ -3178,10 +3178,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(toaplan2_state::tekipaki)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* 10MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(tekipaki_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z180, XTAL_10MHz) /* HD647180 CPU actually */
+ MCFG_CPU_ADD("audiocpu", Z180, XTAL(10'000'000)) /* HD647180 CPU actually */
MCFG_CPU_PROGRAM_MAP(hd647180_mem_map)
MCFG_CPU_IO_MAP(hd647180_io_map)
@@ -3192,7 +3192,7 @@ MACHINE_CONFIG_START(toaplan2_state::tekipaki)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -3203,7 +3203,7 @@ MACHINE_CONFIG_START(toaplan2_state::tekipaki)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -3214,7 +3214,7 @@ MACHINE_CONFIG_START(toaplan2_state::tekipaki)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(27'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3222,10 +3222,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::ghox)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(ghox_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z180, XTAL_10MHz) /* HD647180 CPU actually */
+ MCFG_CPU_ADD("audiocpu", Z180, XTAL(10'000'000)) /* HD647180 CPU actually */
MCFG_CPU_PROGRAM_MAP(ghox_hd647180_mem_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -3235,7 +3235,7 @@ MACHINE_CONFIG_START(toaplan2_state::ghox)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -3246,7 +3246,7 @@ MACHINE_CONFIG_START(toaplan2_state::ghox)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -3255,7 +3255,7 @@ MACHINE_CONFIG_START(toaplan2_state::ghox)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3312,10 +3312,10 @@ a4849 cd
MACHINE_CONFIG_START(toaplan2_state::dogyuun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_25MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(25'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(dogyuun_68k_mem)
- MCFG_CPU_ADD("audiocpu", V25, XTAL_25MHz/2) /* NEC V25 type Toaplan marked CPU ??? */
+ MCFG_CPU_ADD("audiocpu", V25, XTAL(25'000'000)/2) /* NEC V25 type Toaplan marked CPU ??? */
MCFG_CPU_PROGRAM_MAP(v25_mem)
MCFG_V25_CONFIG(nitro_decryption_table)
MCFG_V25_PORT_PT_READ_CB(IOPORT("DSWB")) MCFG_DEVCB_XOR(0xff)
@@ -3326,7 +3326,7 @@ MACHINE_CONFIG_START(toaplan2_state::dogyuun)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_dogyuun)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
@@ -3334,11 +3334,11 @@ MACHINE_CONFIG_START(toaplan2_state::dogyuun)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
- MCFG_DEVICE_ADD("gp9001_1", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001_1", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2)
@@ -3346,10 +3346,10 @@ MACHINE_CONFIG_START(toaplan2_state::dogyuun)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(25'000'000)/24, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3357,11 +3357,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::kbash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16MHz Oscillator */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(kbash_68k_mem)
/* ROM based v25 */
- MCFG_CPU_ADD("audiocpu", V25, XTAL_16MHz) /* NEC V25 type Toaplan marked CPU ??? */
+ MCFG_CPU_ADD("audiocpu", V25, XTAL(16'000'000)) /* NEC V25 type Toaplan marked CPU ??? */
MCFG_CPU_PROGRAM_MAP(kbash_v25_mem)
MCFG_V25_CONFIG(nitro_decryption_table)
MCFG_V25_PORT_PT_READ_CB(IOPORT("DSWA")) MCFG_DEVCB_XOR(0xff)
@@ -3372,7 +3372,7 @@ MACHINE_CONFIG_START(toaplan2_state::kbash)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -3383,7 +3383,7 @@ MACHINE_CONFIG_START(toaplan2_state::kbash)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -3392,10 +3392,10 @@ MACHINE_CONFIG_START(toaplan2_state::kbash)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8)
+ MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3403,13 +3403,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::kbash2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16MHz Oscillator */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(kbash2_68k_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -3420,7 +3420,7 @@ MACHINE_CONFIG_START(toaplan2_state::kbash2)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -3429,10 +3429,10 @@ MACHINE_CONFIG_START(toaplan2_state::kbash2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL(16'000'000)/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL(16'000'000)/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3440,13 +3440,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::truxton2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(truxton2_68k_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
@@ -3455,7 +3455,7 @@ MACHINE_CONFIG_START(toaplan2_state::truxton2)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_2))
@@ -3465,20 +3465,20 @@ MACHINE_CONFIG_START(toaplan2_state::truxton2)
#ifdef TRUXTON2_STEREO // music data is stereo...
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8)
+ MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4, PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/4, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
#else // ...but the hardware is mono
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/4, PIN7_LOW) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
#endif
MACHINE_CONFIG_END
@@ -3487,10 +3487,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::pipibibs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(pipibibs_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_27MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(27'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(pipibibs_sound_z80_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -3500,7 +3500,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibs)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -3511,7 +3511,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibs)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -3520,7 +3520,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibs)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(27'000'000)/8) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3529,11 +3529,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::pipibibsbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* 10MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(pipibibi_bootleg_68k_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(toaplan2_state, pipibibsbl_irq_ack)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_27MHz/8) /* ??? 3.37MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(27'000'000)/8) /* ??? 3.37MHz */
MCFG_CPU_PROGRAM_MAP(pipibibs_sound_z80_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -3543,7 +3543,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibsbl)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -3554,7 +3554,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibsbl)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(ASSERTLINE("maincpu", M68K_IRQ_4))
@@ -3563,7 +3563,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibsbl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(27'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3610,10 +3610,10 @@ static const uint8_t ts001turbo_decryption_table[256] = {
MACHINE_CONFIG_START(toaplan2_state::fixeight)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(fixeight_68k_mem)
- MCFG_CPU_ADD("audiocpu", V25, XTAL_16MHz) /* NEC V25 type Toaplan marked CPU ??? */
+ MCFG_CPU_ADD("audiocpu", V25, XTAL(16'000'000)) /* NEC V25 type Toaplan marked CPU ??? */
MCFG_CPU_PROGRAM_MAP(fixeight_v25_mem)
MCFG_V25_CONFIG(ts001turbo_decryption_table)
MCFG_V25_PORT_P0_READ_CB(IOPORT("EEPROM"))
@@ -3624,7 +3624,7 @@ MACHINE_CONFIG_START(toaplan2_state::fixeight)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) /* verified on pcb */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240) /* verified on pcb */
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
@@ -3633,7 +3633,7 @@ MACHINE_CONFIG_START(toaplan2_state::fixeight)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -3642,10 +3642,10 @@ MACHINE_CONFIG_START(toaplan2_state::fixeight)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3653,14 +3653,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::fixeightbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* 10MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(fixeightbl_68k_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(toaplan2_state, fixeightbl_irq_ack)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -3672,7 +3672,7 @@ MACHINE_CONFIG_START(toaplan2_state::fixeightbl)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(ASSERTLINE("maincpu", M68K_IRQ_2))
@@ -3681,7 +3681,7 @@ MACHINE_CONFIG_START(toaplan2_state::fixeightbl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_14MHz/16, PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", XTAL(14'000'000)/16, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, fixeightbl_oki)
MACHINE_CONFIG_END
@@ -3690,10 +3690,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::vfive)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(vfive_68k_mem)
- MCFG_CPU_ADD("audiocpu", V25, XTAL_20MHz/2) /* Verified on pcb, NEC V25 type Toaplan mark scratched out */
+ MCFG_CPU_ADD("audiocpu", V25, XTAL(20'000'000)/2) /* Verified on pcb, NEC V25 type Toaplan mark scratched out */
MCFG_CPU_PROGRAM_MAP(vfive_v25_mem)
MCFG_V25_CONFIG(nitro_decryption_table)
MCFG_V25_PORT_PT_READ_CB(IOPORT("DSWA")) MCFG_DEVCB_XOR(0xff)
@@ -3704,7 +3704,7 @@ MACHINE_CONFIG_START(toaplan2_state::vfive)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240) /* verified on pcb */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240) /* verified on pcb */
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
@@ -3712,7 +3712,7 @@ MACHINE_CONFIG_START(toaplan2_state::vfive)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -3721,7 +3721,7 @@ MACHINE_CONFIG_START(toaplan2_state::vfive)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3729,10 +3729,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::batsugun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(batsugun_68k_mem)
- MCFG_CPU_ADD("audiocpu", V25, XTAL_32MHz/2) /* NEC V25 type Toaplan marked CPU ??? */
+ MCFG_CPU_ADD("audiocpu", V25, XTAL(32'000'000)/2) /* NEC V25 type Toaplan marked CPU ??? */
MCFG_CPU_PROGRAM_MAP(v25_mem)
MCFG_V25_PORT_PT_READ_CB(IOPORT("DSWA")) MCFG_DEVCB_XOR(0xff)
MCFG_V25_PORT_P0_READ_CB(IOPORT("DSWB")) MCFG_DEVCB_XOR(0xff)
@@ -3742,7 +3742,7 @@ MACHINE_CONFIG_START(toaplan2_state::batsugun)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -3753,11 +3753,11 @@ MACHINE_CONFIG_START(toaplan2_state::batsugun)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
- MCFG_DEVICE_ADD("gp9001_1", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001_1", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_VIDEO_START_OVERRIDE(toaplan2_state,toaplan2)
@@ -3765,17 +3765,17 @@ MACHINE_CONFIG_START(toaplan2_state::batsugun)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8)
+ MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/8, PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/8, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::pwrkick)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(pwrkick_68k_mem)
MCFG_UPD4992_ADD("rtc")
@@ -3787,7 +3787,7 @@ MACHINE_CONFIG_START(toaplan2_state::pwrkick)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
@@ -3795,7 +3795,7 @@ MACHINE_CONFIG_START(toaplan2_state::pwrkick)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -3804,13 +3804,13 @@ MACHINE_CONFIG_START(toaplan2_state::pwrkick)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
/* empty YM2151 socket*/
- MCFG_OKIM6295_ADD("oki", XTAL_27MHz/8, PIN7_HIGH) // not confirmed
+ MCFG_OKIM6295_ADD("oki", XTAL(27'000'000)/8, PIN7_HIGH) // not confirmed
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::othldrby)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(othldrby_68k_mem)
MCFG_UPD4992_ADD("rtc")
@@ -3820,7 +3820,7 @@ MACHINE_CONFIG_START(toaplan2_state::othldrby)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
@@ -3828,7 +3828,7 @@ MACHINE_CONFIG_START(toaplan2_state::othldrby)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -3837,20 +3837,20 @@ MACHINE_CONFIG_START(toaplan2_state::othldrby)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_27MHz/8, PIN7_HIGH) // not confirmed
+ MCFG_OKIM6295_ADD("oki", XTAL(27'000'000)/8, PIN7_HIGH) // not confirmed
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::enmadaio)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2)
MCFG_CPU_PROGRAM_MAP(enmadaio_68k_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
@@ -3858,7 +3858,7 @@ MACHINE_CONFIG_START(toaplan2_state::enmadaio)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -3867,10 +3867,10 @@ MACHINE_CONFIG_START(toaplan2_state::enmadaio)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8)
+ MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4, PIN7_LOW) // pin7 not confirmed
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/4, PIN7_LOW) // pin7 not confirmed
MCFG_DEVICE_ADDRESS_MAP(0, enmadaio_oki)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3878,13 +3878,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::snowbro2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(snowbro2_68k_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -3895,7 +3895,7 @@ MACHINE_CONFIG_START(toaplan2_state::snowbro2)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -3904,10 +3904,10 @@ MACHINE_CONFIG_START(toaplan2_state::snowbro2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8)
+ MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_27MHz/10, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(27'000'000)/10, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3915,10 +3915,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::mahoudai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(mahoudai_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8) /* 4MHz , 32MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(raizing_sound_z80_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -3928,7 +3928,7 @@ MACHINE_CONFIG_START(toaplan2_state::mahoudai)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -3940,7 +3940,7 @@ MACHINE_CONFIG_START(toaplan2_state::mahoudai)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -3949,10 +3949,10 @@ MACHINE_CONFIG_START(toaplan2_state::mahoudai)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8)
+ MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3960,10 +3960,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::shippumd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(shippumd_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8) /* 4MHz , 32MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(raizing_sound_z80_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -3973,7 +3973,7 @@ MACHINE_CONFIG_START(toaplan2_state::shippumd)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -3985,7 +3985,7 @@ MACHINE_CONFIG_START(toaplan2_state::shippumd)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -3994,20 +3994,20 @@ MACHINE_CONFIG_START(toaplan2_state::shippumd)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8)
+ MCFG_YM2151_ADD("ymsnd", XTAL(27'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::bgaregga)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(bgaregga_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8) /* 4MHz , 32MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(bgaregga_sound_z80_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -4017,7 +4017,7 @@ MACHINE_CONFIG_START(toaplan2_state::bgaregga)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -4029,7 +4029,7 @@ MACHINE_CONFIG_START(toaplan2_state::bgaregga)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
@@ -4042,10 +4042,10 @@ MACHINE_CONFIG_START(toaplan2_state::bgaregga)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_YM2151_ADD("ymsnd", XTAL_32MHz/8)
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
@@ -4063,10 +4063,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::batrider)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator (verified) */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator (verified) */
MCFG_CPU_PROGRAM_MAP(batrider_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/6) /* 5.333MHz , 32MHz Oscillator (verified) */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/6) /* 5.333MHz , 32MHz Oscillator (verified) */
MCFG_CPU_PROGRAM_MAP(batrider_sound_z80_mem)
MCFG_CPU_IO_MAP(batrider_sound_z80_port)
@@ -4077,7 +4077,7 @@ MACHINE_CONFIG_START(toaplan2_state::batrider)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -4089,7 +4089,7 @@ MACHINE_CONFIG_START(toaplan2_state::batrider)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_2))
@@ -4103,13 +4103,13 @@ MACHINE_CONFIG_START(toaplan2_state::batrider)
MCFG_GENERIC_LATCH_8_ADD("soundlatch3")
MCFG_GENERIC_LATCH_8_ADD("soundlatch4")
- MCFG_YM2151_ADD("ymsnd", XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator (verified) */
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'000'000)/8) /* 4MHz , 32MHz Oscillator (verified) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki1", XTAL_32MHz/10, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'000'000)/10, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_32MHz/10, PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", XTAL(32'000'000)/10, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
@@ -4121,10 +4121,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::bbakraid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(bbakraid_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/6) /* 5.3333MHz , 32MHz Oscillator */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/6) /* 5.3333MHz , 32MHz Oscillator */
MCFG_CPU_PROGRAM_MAP(bbakraid_sound_z80_mem)
MCFG_CPU_IO_MAP(bbakraid_sound_z80_port)
MCFG_CPU_PERIODIC_INT_DRIVER(toaplan2_state, bbakraid_snd_interrupt, 448)
@@ -4138,7 +4138,7 @@ MACHINE_CONFIG_START(toaplan2_state::bbakraid)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_27MHz/4,432,0,320,262,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
//MCFG_SCREEN_REFRESH_RATE(60)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
@@ -4150,7 +4150,7 @@ MACHINE_CONFIG_START(toaplan2_state::bbakraid)
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL_27MHz)
+ MCFG_DEVICE_ADD("gp9001", GP9001_VDP, XTAL(27'000'000))
MCFG_GFX_PALETTE("palette")
MCFG_GP9001_VINT_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_1))
@@ -4164,7 +4164,7 @@ MACHINE_CONFIG_START(toaplan2_state::bbakraid)
MCFG_GENERIC_LATCH_8_ADD("soundlatch3")
MCFG_GENERIC_LATCH_8_ADD("soundlatch4")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
// IRQ not used ??? Connected to a test pin (TP082)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END