summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2018-01-21 23:42:41 +0100
committer Olivier Galibert <galibert@pobox.com>2018-01-23 10:25:25 +0100
commit03ba80e0ef3e021f6ff89ef91ae5cdce4e24b994 (patch)
treef127b7f533d36df2484f82fcb05cef5f4c04f232 /src
parentf61a64ea29bf46bf2deb2e1fbace5b24f3d7b0aa (diff)
xtal.h is dead, long live to xtal.cpp [O. Galibert]
Diffstat (limited to 'src')
-rw-r--r--src/devices/bus/a2bus/a2arcadebd.cpp2
-rw-r--r--src/devices/bus/a2bus/a2bus.h2
-rw-r--r--src/devices/bus/a2bus/a2ssc.cpp2
-rw-r--r--src/devices/bus/a2bus/corvfdc01.cpp2
-rw-r--r--src/devices/bus/a2bus/ezcgi.cpp6
-rw-r--r--src/devices/bus/a2bus/ssprite.cpp2
-rw-r--r--src/devices/bus/a7800/cpuwiz.cpp2
-rw-r--r--src/devices/bus/a7800/rom.cpp14
-rw-r--r--src/devices/bus/a7800/xboard.cpp6
-rw-r--r--src/devices/bus/abcbus/fd2.cpp6
-rw-r--r--src/devices/bus/abcbus/lux10828.cpp6
-rw-r--r--src/devices/bus/abcbus/lux21046.cpp10
-rw-r--r--src/devices/bus/abcbus/lux21056.cpp4
-rw-r--r--src/devices/bus/abcbus/sio.cpp2
-rw-r--r--src/devices/bus/abckb/abc77.cpp4
-rw-r--r--src/devices/bus/abckb/abc800kb.cpp4
-rw-r--r--src/devices/bus/abckb/abc99.cpp6
-rw-r--r--src/devices/bus/adamnet/ddp.cpp2
-rw-r--r--src/devices/bus/adamnet/fdc.cpp4
-rw-r--r--src/devices/bus/adamnet/kb.cpp2
-rw-r--r--src/devices/bus/adamnet/printer.cpp2
-rw-r--r--src/devices/bus/adamnet/spi.cpp4
-rw-r--r--src/devices/bus/amiga/keyboard/a1200.cpp2
-rw-r--r--src/devices/bus/amiga/keyboard/a500.cpp4
-rw-r--r--src/devices/bus/amiga/zorro/a2232.cpp32
-rw-r--r--src/devices/bus/apricot/keyboard/hle.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/beebsid.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/opus3.cpp2
-rw-r--r--src/devices/bus/bbc/fdc/acorn.cpp2
-rw-r--r--src/devices/bus/bbc/fdc/cumana.cpp4
-rw-r--r--src/devices/bus/bbc/fdc/cv1797.cpp2
-rw-r--r--src/devices/bus/bbc/fdc/opus.cpp6
-rw-r--r--src/devices/bus/bbc/fdc/watford.cpp4
-rw-r--r--src/devices/bus/bbc/tube/tube_6502.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_65c102.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_80186.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_80286.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_arm.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_casper.cpp6
-rw-r--r--src/devices/bus/bbc/tube/tube_z80.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_zep100.cpp4
-rw-r--r--src/devices/bus/bml3/bml3mp1802.cpp2
-rw-r--r--src/devices/bus/c64/fcc.cpp2
-rw-r--r--src/devices/bus/c64/ide64.cpp2
-rw-r--r--src/devices/bus/c64/magic_voice.cpp2
-rw-r--r--src/devices/bus/c64/multiscreen.cpp2
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.cpp2
-rw-r--r--src/devices/bus/c64/swiftlink.cpp2
-rw-r--r--src/devices/bus/c64/tdos.cpp2
-rw-r--r--src/devices/bus/c64/turbo232.cpp8
-rw-r--r--src/devices/bus/c64/xl80.cpp2
-rw-r--r--src/devices/bus/cbmiec/c1526.cpp4
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp8
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp52
-rw-r--r--src/devices/bus/cbmiec/c1581.cpp6
-rw-r--r--src/devices/bus/cbmiec/cmdhd.cpp2
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp8
-rw-r--r--src/devices/bus/cbmiec/serialbox.cpp2
-rw-r--r--src/devices/bus/cbmiec/vic1515.cpp2
-rw-r--r--src/devices/bus/cbmiec/vic1520.cpp2
-rw-r--r--src/devices/bus/cbus/pc9801_118.cpp2
-rw-r--r--src/devices/bus/cbus/pc9801_26.cpp2
-rw-r--r--src/devices/bus/cbus/pc9801_86.cpp2
-rw-r--r--src/devices/bus/cbus/pc9801_amd98.cpp2
-rw-r--r--src/devices/bus/centronics/epson_lx800.cpp2
-rw-r--r--src/devices/bus/centronics/epson_lx810l.cpp2
-rw-r--r--src/devices/bus/centronics/nec_p72.cpp2
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.cpp2
-rw-r--r--src/devices/bus/coco/coco_dcmodem.cpp2
-rw-r--r--src/devices/bus/coco/coco_fdc.cpp4
-rw-r--r--src/devices/bus/coco/coco_gmc.cpp2
-rw-r--r--src/devices/bus/coco/coco_rs232.cpp2
-rw-r--r--src/devices/bus/coco/coco_ssc.cpp2
-rw-r--r--src/devices/bus/coco/coco_t4426.cpp2
-rw-r--r--src/devices/bus/coco/dragon_fdc.cpp4
-rw-r--r--src/devices/bus/comx35/clm.cpp2
-rw-r--r--src/devices/bus/comx35/fdc.cpp2
-rw-r--r--src/devices/bus/cpc/cpc_pds.cpp2
-rw-r--r--src/devices/bus/cpc/cpc_rs232.cpp2
-rw-r--r--src/devices/bus/cpc/cpc_ssa1.cpp4
-rw-r--r--src/devices/bus/cpc/magicsound.cpp14
-rw-r--r--src/devices/bus/cpc/playcity.cpp8
-rw-r--r--src/devices/bus/dmv/k210.cpp2
-rw-r--r--src/devices/bus/dmv/k220.cpp2
-rw-r--r--src/devices/bus/dmv/k230.cpp6
-rw-r--r--src/devices/bus/dmv/k801.cpp2
-rw-r--r--src/devices/bus/dmv/k803.cpp2
-rw-r--r--src/devices/bus/dmv/k806.cpp2
-rw-r--r--src/devices/bus/ecbbus/grip.cpp8
-rw-r--r--src/devices/bus/econet/e01.cpp8
-rw-r--r--src/devices/bus/einstein/pipe/tk02.cpp4
-rw-r--r--src/devices/bus/electron/m2105.cpp2
-rw-r--r--src/devices/bus/electron/plus3.cpp2
-rw-r--r--src/devices/bus/ep64/exdos.cpp2
-rw-r--r--src/devices/bus/epson_sio/pf10.cpp2
-rw-r--r--src/devices/bus/epson_sio/tf20.cpp4
-rw-r--r--src/devices/bus/epson_sio/tf20.h4
-rw-r--r--src/devices/bus/hp80_io/82937.cpp2
-rw-r--r--src/devices/bus/hp9845_io/98035.cpp6
-rw-r--r--src/devices/bus/ieee488/c2031.cpp8
-rw-r--r--src/devices/bus/ieee488/c2040.cpp42
-rw-r--r--src/devices/bus/ieee488/c8050.cpp56
-rw-r--r--src/devices/bus/ieee488/c8280.cpp10
-rw-r--r--src/devices/bus/ieee488/d9060.cpp10
-rw-r--r--src/devices/bus/ieee488/hardbox.cpp2
-rw-r--r--src/devices/bus/ieee488/softbox.cpp4
-rw-r--r--src/devices/bus/imi7000/imi5000h.cpp10
-rw-r--r--src/devices/bus/intv/ecs.cpp2
-rw-r--r--src/devices/bus/isa/aga.cpp10
-rw-r--r--src/devices/bus/isa/aha1542.cpp2
-rw-r--r--src/devices/bus/isa/cga.cpp10
-rw-r--r--src/devices/bus/isa/com.cpp16
-rw-r--r--src/devices/bus/isa/dectalk.cpp4
-rw-r--r--src/devices/bus/isa/ega.cpp2
-rw-r--r--src/devices/bus/isa/ibm_mfc.cpp10
-rw-r--r--src/devices/bus/isa/mc1502_fdc.cpp2
-rw-r--r--src/devices/bus/isa/myb3k_com.cpp6
-rw-r--r--src/devices/bus/isa/myb3k_fdc.cpp6
-rw-r--r--src/devices/bus/isa/num9rev.cpp2
-rw-r--r--src/devices/bus/isa/p1_fdc.cpp2
-rw-r--r--src/devices/bus/isa/p1_sound.cpp18
-rw-r--r--src/devices/bus/isa/pgc.cpp6
-rw-r--r--src/devices/bus/isa/s3virge.cpp10
-rw-r--r--src/devices/bus/isa/sb16.cpp4
-rw-r--r--src/devices/bus/isa/sblaster.cpp4
-rw-r--r--src/devices/bus/isa/ssi2001.cpp2
-rw-r--r--src/devices/bus/isa/stereo_fx.cpp4
-rw-r--r--src/devices/bus/isa/svga_cirrus.cpp4
-rw-r--r--src/devices/bus/isa/svga_s3.cpp8
-rw-r--r--src/devices/bus/isa/svga_trident.cpp2
-rw-r--r--src/devices/bus/isa/svga_tseng.cpp2
-rw-r--r--src/devices/bus/isa/trident.cpp8
-rw-r--r--src/devices/bus/isa/vga.cpp2
-rw-r--r--src/devices/bus/isa/vga_ati.cpp6
-rw-r--r--src/devices/bus/kc/d004.cpp4
-rw-r--r--src/devices/bus/lpci/southbridge.cpp6
-rw-r--r--src/devices/bus/msx_cart/bm_012.cpp4
-rw-r--r--src/devices/bus/msx_cart/disk.cpp6
-rw-r--r--src/devices/bus/msx_cart/fmpac.cpp2
-rw-r--r--src/devices/bus/msx_cart/konami.cpp6
-rw-r--r--src/devices/bus/msx_cart/msx_audio.cpp6
-rw-r--r--src/devices/bus/msx_cart/yamaha.cpp4
-rw-r--r--src/devices/bus/nasbus/avc.cpp2
-rw-r--r--src/devices/bus/nasbus/floppy.cpp2
-rw-r--r--src/devices/bus/nes/konami.cpp4
-rw-r--r--src/devices/bus/nes/sunsoft.cpp2
-rw-r--r--src/devices/bus/newbrain/eim.cpp6
-rw-r--r--src/devices/bus/newbrain/fdc.cpp4
-rw-r--r--src/devices/bus/nubus/bootbug.cpp2
-rw-r--r--src/devices/bus/nubus/quadralink.cpp4
-rw-r--r--src/devices/bus/odyssey2/chess.cpp2
-rw-r--r--src/devices/bus/oricext/jasmin.cpp2
-rw-r--r--src/devices/bus/oricext/microdisc.cpp2
-rw-r--r--src/devices/bus/pc_kbd/ec1841.cpp2
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.cpp2
-rw-r--r--src/devices/bus/pc_kbd/msnat.cpp2
-rw-r--r--src/devices/bus/pet/superpet.cpp6
-rw-r--r--src/devices/bus/plus4/c1551.cpp4
-rw-r--r--src/devices/bus/plus4/sid.cpp2
-rw-r--r--src/devices/bus/pofo/hpc102.cpp2
-rw-r--r--src/devices/bus/pofo/hpc104.cpp2
-rw-r--r--src/devices/bus/psi_kbd/ergoline.cpp2
-rw-r--r--src/devices/bus/ql/sandy_superqboard.cpp4
-rw-r--r--src/devices/bus/s100/dj2db.cpp4
-rw-r--r--src/devices/bus/s100/djdma.cpp2
-rw-r--r--src/devices/bus/s100/wunderbus.cpp8
-rw-r--r--src/devices/bus/scsi/s1410.cpp2
-rw-r--r--src/devices/bus/sg1000_exp/fm_unit.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/paddle.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/sports.cpp2
-rw-r--r--src/devices/bus/snes/sgb.cpp4
-rw-r--r--src/devices/bus/spc1000/fdd.cpp2
-rw-r--r--src/devices/bus/spc1000/vdp.cpp2
-rw-r--r--src/devices/bus/spectrum/fuller.cpp2
-rw-r--r--src/devices/bus/spectrum/melodik.cpp2
-rw-r--r--src/devices/bus/spectrum/uspeech.cpp2
-rw-r--r--src/devices/bus/svi3x8/expander/sv603.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv801.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv805.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv806.cpp4
-rw-r--r--src/devices/bus/ti99/peb/bwg.cpp2
-rw-r--r--src/devices/bus/ti99/peb/evpc.cpp4
-rw-r--r--src/devices/bus/ti99/peb/ti_fdc.cpp2
-rw-r--r--src/devices/bus/ti99/ti99defs.h2
-rw-r--r--src/devices/bus/tvc/hbf.cpp2
-rw-r--r--src/devices/bus/vic20/videopak.cpp2
-rw-r--r--src/devices/bus/vip/vp575.cpp10
-rw-r--r--src/devices/bus/vme/vme_fccpu20.cpp6
-rw-r--r--src/devices/bus/vme/vme_fcisio.cpp8
-rw-r--r--src/devices/bus/vme/vme_fcscsi.cpp4
-rw-r--r--src/devices/bus/vme/vme_hcpu30.cpp2
-rw-r--r--src/devices/bus/vme/vme_mvme350.cpp4
-rw-r--r--src/devices/bus/vme/vme_mzr8105.cpp2
-rw-r--r--src/devices/bus/vme/vme_mzr8300.cpp6
-rw-r--r--src/devices/bus/wangpc/lvc.cpp6
-rw-r--r--src/devices/bus/wangpc/mvc.cpp2
-rw-r--r--src/devices/bus/wangpc/tig.cpp4
-rw-r--r--src/devices/bus/wangpc/wdc.cpp2
-rw-r--r--src/devices/bus/x68k/x68k_midi.cpp2
-rw-r--r--src/devices/cpu/lc8670/lc8670.h1
-rw-r--r--src/devices/cpu/m6502/n2a03.h4
-rw-r--r--src/devices/cpu/powerpc/ppc.h1
-rw-r--r--src/devices/cpu/sh/sh4.h1
-rw-r--r--src/devices/cpu/tms34010/tms34010.h1
-rw-r--r--src/devices/machine/68340.h2
-rw-r--r--src/devices/machine/6840ptm.h1
-rw-r--r--src/devices/machine/ay31015.h2
-rw-r--r--src/devices/machine/cs4031.cpp6
-rw-r--r--src/devices/machine/ds128x.h2
-rw-r--r--src/devices/machine/ds2404.h2
-rw-r--r--src/devices/machine/fdc37c665gt.cpp4
-rw-r--r--src/devices/machine/genpc.cpp8
-rw-r--r--src/devices/machine/i82371sb.cpp8
-rw-r--r--src/devices/machine/ie15.cpp4
-rw-r--r--src/devices/machine/laserdsc.h4
-rw-r--r--src/devices/machine/ldpr8210.cpp18
-rw-r--r--src/devices/machine/ldv1000.cpp4
-rw-r--r--src/devices/machine/ldvp931.cpp2
-rw-r--r--src/devices/machine/m6m80011ap.h2
-rw-r--r--src/devices/machine/mc68681.h3
-rw-r--r--src/devices/machine/mc68901.h3
-rw-r--r--src/devices/machine/mos6551.h2
-rw-r--r--src/devices/machine/nsc810.h2
-rw-r--r--src/devices/machine/pdc.cpp4
-rw-r--r--src/devices/machine/pit8253.h3
-rw-r--r--src/devices/machine/rtc9701.cpp2
-rw-r--r--src/devices/machine/rtc9701.h2
-rw-r--r--src/devices/machine/s3520cf.cpp2
-rw-r--r--src/devices/machine/s3520cf.h2
-rw-r--r--src/devices/machine/sega_scu.cpp2
-rw-r--r--src/devices/machine/sis85c496.cpp6
-rw-r--r--src/devices/machine/smioc.cpp12
-rw-r--r--src/devices/machine/upd1990a.cpp2
-rw-r--r--src/devices/machine/upd4992.h2
-rw-r--r--src/devices/machine/v3021.cpp2
-rw-r--r--src/devices/machine/v3021.h2
-rw-r--r--src/devices/machine/wd7600.cpp6
-rw-r--r--src/devices/machine/ym3802.cpp4
-rw-r--r--src/devices/sound/ad1848.cpp2
-rw-r--r--src/devices/sound/cdp1863.h1
-rw-r--r--src/devices/sound/cdp1864.h2
-rw-r--r--src/devices/sound/cdp1869.cpp6
-rw-r--r--src/devices/sound/cdp1869.h13
-rw-r--r--src/devices/sound/s14001a.h1
-rw-r--r--src/devices/sound/upd7759.h2
-rw-r--r--src/devices/video/cdp1862.h2
-rw-r--r--src/devices/video/clgd542x.cpp6
-rw-r--r--src/devices/video/gba_lcd.cpp2
-rw-r--r--src/devices/video/mc6845.h1
-rw-r--r--src/devices/video/mos6566.h16
-rw-r--r--src/devices/video/pc_vga.cpp24
-rw-r--r--src/devices/video/stvvdp2.cpp2
-rw-r--r--src/devices/video/tms9928a.h6
-rw-r--r--src/devices/video/voodoo.cpp2
-rw-r--r--src/devices/video/zeus2.cpp2
-rw-r--r--src/devices/video/zeus2.h2
-rw-r--r--src/emu/attotime.h7
-rw-r--r--src/emu/device.h2
-rw-r--r--src/emu/drivers/xtal.h716
-rw-r--r--src/emu/emu.h6
-rw-r--r--src/emu/mconfig.cpp15
-rw-r--r--src/emu/mconfig.h2
-rw-r--r--src/emu/profiler.h3
-rw-r--r--src/emu/screen.h1
-rw-r--r--src/emu/xtal.cpp785
-rw-r--r--src/emu/xtal.h63
-rw-r--r--src/mame/audio/atarijsa.cpp8
-rw-r--r--src/mame/audio/carnival.cpp4
-rw-r--r--src/mame/audio/crbaloon.cpp2
-rw-r--r--src/mame/audio/csd.cpp2
-rw-r--r--src/mame/audio/dcs.cpp10
-rw-r--r--src/mame/audio/decobsmt.cpp4
-rw-r--r--src/mame/audio/dkong.cpp6
-rw-r--r--src/mame/audio/exidy.cpp14
-rw-r--r--src/mame/audio/exidy440.cpp2
-rw-r--r--src/mame/audio/galaxian.cpp4
-rw-r--r--src/mame/audio/gottlieb.cpp6
-rw-r--r--src/mame/audio/harddriv.cpp4
-rw-r--r--src/mame/audio/irem.cpp28
-rw-r--r--src/mame/audio/midway.cpp8
-rw-r--r--src/mame/audio/rax.cpp2
-rw-r--r--src/mame/audio/redalert.cpp8
-rw-r--r--src/mame/audio/s11c_bg.cpp4
-rw-r--r--src/mame/audio/scramble.cpp2
-rw-r--r--src/mame/audio/t5182.cpp2
-rw-r--r--src/mame/audio/taito_en.cpp8
-rw-r--r--src/mame/audio/taito_zm.cpp4
-rw-r--r--src/mame/audio/timeplt.cpp2
-rw-r--r--src/mame/audio/tx1.cpp12
-rw-r--r--src/mame/audio/williams.cpp12
-rw-r--r--src/mame/audio/wpcsnd.cpp2
-rw-r--r--src/mame/audio/zaccaria.cpp10
-rw-r--r--src/mame/drivers/1942.cpp4
-rw-r--r--src/mame/drivers/1943.cpp8
-rw-r--r--src/mame/drivers/1945kiii.cpp2
-rw-r--r--src/mame/drivers/20pacgal.cpp2
-rw-r--r--src/mame/drivers/30test.cpp2
-rw-r--r--src/mame/drivers/3do.cpp6
-rw-r--r--src/mame/drivers/3x3puzzl.cpp4
-rw-r--r--src/mame/drivers/4004clk.cpp2
-rw-r--r--src/mame/drivers/4enlinea.cpp6
-rw-r--r--src/mame/drivers/4enraya.cpp2
-rw-r--r--src/mame/drivers/4roses.cpp2
-rw-r--r--src/mame/drivers/5clown.cpp2
-rw-r--r--src/mame/drivers/8080bw.cpp10
-rw-r--r--src/mame/drivers/a5105.cpp8
-rw-r--r--src/mame/drivers/a51xx.cpp2
-rw-r--r--src/mame/drivers/a6809.cpp6
-rw-r--r--src/mame/drivers/a7150.cpp14
-rw-r--r--src/mame/drivers/a7800.cpp2
-rw-r--r--src/mame/drivers/aa310.cpp12
-rw-r--r--src/mame/drivers/abc1600.cpp18
-rw-r--r--src/mame/drivers/abc80.cpp4
-rw-r--r--src/mame/drivers/ac1.cpp4
-rw-r--r--src/mame/drivers/accomm.cpp6
-rw-r--r--src/mame/drivers/ace.cpp2
-rw-r--r--src/mame/drivers/actfancr.cpp10
-rw-r--r--src/mame/drivers/acvirus.cpp2
-rw-r--r--src/mame/drivers/adam.cpp14
-rw-r--r--src/mame/drivers/adp.cpp4
-rw-r--r--src/mame/drivers/advision.cpp2
-rw-r--r--src/mame/drivers/aeroboto.cpp8
-rw-r--r--src/mame/drivers/aerofgt.cpp44
-rw-r--r--src/mame/drivers/agat.cpp2
-rw-r--r--src/mame/drivers/aim65_40.cpp2
-rw-r--r--src/mame/drivers/airbustr.cpp10
-rw-r--r--src/mame/drivers/airraid.cpp6
-rw-r--r--src/mame/drivers/ajax.cpp6
-rw-r--r--src/mame/drivers/akaiax80.cpp2
-rw-r--r--src/mame/drivers/albazg.cpp2
-rw-r--r--src/mame/drivers/alesis.cpp4
-rw-r--r--src/mame/drivers/alesis_qs.cpp2
-rw-r--r--src/mame/drivers/alien.cpp2
-rw-r--r--src/mame/drivers/aliens.cpp12
-rw-r--r--src/mame/drivers/alpha68k.cpp12
-rw-r--r--src/mame/drivers/alphasma.cpp2
-rw-r--r--src/mame/drivers/alphatpx.cpp24
-rw-r--r--src/mame/drivers/alphatro.cpp4
-rw-r--r--src/mame/drivers/altair.cpp2
-rw-r--r--src/mame/drivers/alto2.cpp4
-rw-r--r--src/mame/drivers/altos2.cpp10
-rw-r--r--src/mame/drivers/altos486.cpp18
-rw-r--r--src/mame/drivers/altos5.cpp18
-rw-r--r--src/mame/drivers/altos8600.cpp6
-rw-r--r--src/mame/drivers/amaticmg.cpp2
-rw-r--r--src/mame/drivers/ambush.cpp12
-rw-r--r--src/mame/drivers/amerihok.cpp2
-rw-r--r--src/mame/drivers/amiga.cpp22
-rw-r--r--src/mame/drivers/ampex.cpp6
-rw-r--r--src/mame/drivers/ampoker2.cpp2
-rw-r--r--src/mame/drivers/ampro.cpp10
-rw-r--r--src/mame/drivers/amstr_pc.cpp2
-rw-r--r--src/mame/drivers/amstrad.cpp28
-rw-r--r--src/mame/drivers/amusco.cpp6
-rw-r--r--src/mame/drivers/amust.cpp4
-rw-r--r--src/mame/drivers/anes.cpp4
-rw-r--r--src/mame/drivers/angelkds.cpp10
-rw-r--r--src/mame/drivers/apc.cpp4
-rw-r--r--src/mame/drivers/apf.cpp4
-rw-r--r--src/mame/drivers/apogee.cpp12
-rw-r--r--src/mame/drivers/apple1.cpp2
-rw-r--r--src/mame/drivers/apple2.cpp2
-rw-r--r--src/mame/drivers/apple2e.cpp8
-rw-r--r--src/mame/drivers/apple2gs.cpp8
-rw-r--r--src/mame/drivers/apple3.cpp4
-rw-r--r--src/mame/drivers/applix.cpp10
-rw-r--r--src/mame/drivers/apricot.cpp22
-rw-r--r--src/mame/drivers/apricotf.cpp4
-rw-r--r--src/mame/drivers/apricotp.cpp2
-rw-r--r--src/mame/drivers/aquarium.cpp8
-rw-r--r--src/mame/drivers/aquarius.cpp8
-rw-r--r--src/mame/drivers/arabian.cpp2
-rw-r--r--src/mame/drivers/arachnid.cpp6
-rw-r--r--src/mame/drivers/arcadecl.cpp2
-rw-r--r--src/mame/drivers/argox.cpp2
-rw-r--r--src/mame/drivers/aristmk4.cpp4
-rw-r--r--src/mame/drivers/aristmk5.cpp10
-rw-r--r--src/mame/drivers/aristmk6.cpp6
-rw-r--r--src/mame/drivers/arkanoid.cpp26
-rw-r--r--src/mame/drivers/armedf.cpp58
-rw-r--r--src/mame/drivers/artmagic.cpp4
-rw-r--r--src/mame/drivers/asterix.cpp8
-rw-r--r--src/mame/drivers/asteroid.cpp6
-rw-r--r--src/mame/drivers/astinvad.cpp4
-rw-r--r--src/mame/drivers/astrcorp.cpp10
-rw-r--r--src/mame/drivers/astrof.cpp2
-rw-r--r--src/mame/drivers/asuka.cpp16
-rw-r--r--src/mame/drivers/at.cpp18
-rw-r--r--src/mame/drivers/atari_s1.cpp2
-rw-r--r--src/mame/drivers/atari_s2.cpp4
-rw-r--r--src/mame/drivers/atarist.cpp4
-rw-r--r--src/mame/drivers/atarisy2.cpp8
-rw-r--r--src/mame/drivers/atetris.cpp4
-rw-r--r--src/mame/drivers/atlantis.cpp4
-rw-r--r--src/mame/drivers/atom.cpp4
-rw-r--r--src/mame/drivers/att4425.cpp4
-rw-r--r--src/mame/drivers/att630.cpp8
-rw-r--r--src/mame/drivers/attache.cpp38
-rw-r--r--src/mame/drivers/attckufo.cpp4
-rw-r--r--src/mame/drivers/atvtrack.cpp2
-rw-r--r--src/mame/drivers/aussiebyte.cpp22
-rw-r--r--src/mame/drivers/avalnche.cpp2
-rw-r--r--src/mame/drivers/avigo.cpp4
-rw-r--r--src/mame/drivers/avt.cpp2
-rw-r--r--src/mame/drivers/ax20.cpp2
-rw-r--r--src/mame/drivers/b16.cpp6
-rw-r--r--src/mame/drivers/b2m.cpp2
-rw-r--r--src/mame/drivers/badlands.cpp6
-rw-r--r--src/mame/drivers/balsente.cpp4
-rw-r--r--src/mame/drivers/banctec.cpp4
-rw-r--r--src/mame/drivers/bankp.cpp2
-rw-r--r--src/mame/drivers/baraduke.cpp8
-rw-r--r--src/mame/drivers/barata.cpp2
-rw-r--r--src/mame/drivers/barni.cpp4
-rw-r--r--src/mame/drivers/basic52.cpp4
-rw-r--r--src/mame/drivers/battlex.cpp6
-rw-r--r--src/mame/drivers/battlnts.cpp8
-rw-r--r--src/mame/drivers/bbc.cpp38
-rw-r--r--src/mame/drivers/bbcbc.cpp4
-rw-r--r--src/mame/drivers/bcs3.cpp8
-rw-r--r--src/mame/drivers/bebox.cpp8
-rw-r--r--src/mame/drivers/beehive.cpp2
-rw-r--r--src/mame/drivers/beezer.cpp12
-rw-r--r--src/mame/drivers/berzerk.cpp2
-rw-r--r--src/mame/drivers/beta.cpp4
-rw-r--r--src/mame/drivers/bfm_sc1.cpp2
-rw-r--r--src/mame/drivers/bfm_sc2.cpp8
-rw-r--r--src/mame/drivers/bfm_sc4.cpp2
-rw-r--r--src/mame/drivers/bfmsys85.cpp2
-rw-r--r--src/mame/drivers/big10.cpp2
-rw-r--r--src/mame/drivers/bigbord2.cpp8
-rw-r--r--src/mame/drivers/binbug.cpp8
-rw-r--r--src/mame/drivers/bingoman.cpp2
-rw-r--r--src/mame/drivers/bingor.cpp8
-rw-r--r--src/mame/drivers/bingowav.cpp2
-rw-r--r--src/mame/drivers/bionicc.cpp8
-rw-r--r--src/mame/drivers/bitgraph.cpp12
-rw-r--r--src/mame/drivers/bking.cpp10
-rw-r--r--src/mame/drivers/bladestl.cpp8
-rw-r--r--src/mame/drivers/blitz68k.cpp30
-rw-r--r--src/mame/drivers/blktiger.cpp10
-rw-r--r--src/mame/drivers/blmbycar.cpp4
-rw-r--r--src/mame/drivers/blockade.cpp4
-rw-r--r--src/mame/drivers/blockhl.cpp10
-rw-r--r--src/mame/drivers/blockout.cpp6
-rw-r--r--src/mame/drivers/bloodbro.cpp14
-rw-r--r--src/mame/drivers/bmcbowl.cpp6
-rw-r--r--src/mame/drivers/bmcpokr.cpp6
-rw-r--r--src/mame/drivers/bmjr.cpp2
-rw-r--r--src/mame/drivers/bob85.cpp2
-rw-r--r--src/mame/drivers/bogeyman.cpp2
-rw-r--r--src/mame/drivers/bombjack.cpp10
-rw-r--r--src/mame/drivers/bottom9.cpp8
-rw-r--r--src/mame/drivers/boxer.cpp2
-rw-r--r--src/mame/drivers/bpmmicro.cpp2
-rw-r--r--src/mame/drivers/br8641.cpp10
-rw-r--r--src/mame/drivers/brkthru.cpp2
-rw-r--r--src/mame/drivers/btime.cpp2
-rw-r--r--src/mame/drivers/btoads.cpp6
-rw-r--r--src/mame/drivers/bublbobl.cpp6
-rw-r--r--src/mame/drivers/buggychl.cpp14
-rw-r--r--src/mame/drivers/bullet.cpp34
-rw-r--r--src/mame/drivers/buster.cpp4
-rw-r--r--src/mame/drivers/bw12.cpp12
-rw-r--r--src/mame/drivers/bw2.cpp10
-rw-r--r--src/mame/drivers/bwing.cpp4
-rw-r--r--src/mame/drivers/by6803.cpp2
-rw-r--r--src/mame/drivers/byvid.cpp14
-rw-r--r--src/mame/drivers/c10.cpp2
-rw-r--r--src/mame/drivers/c128.cpp36
-rw-r--r--src/mame/drivers/c64.cpp40
-rw-r--r--src/mame/drivers/c65.cpp2
-rw-r--r--src/mame/drivers/c900.cpp2
-rw-r--r--src/mame/drivers/cabal.cpp20
-rw-r--r--src/mame/drivers/cabaret.cpp4
-rw-r--r--src/mame/drivers/calcune.cpp2
-rw-r--r--src/mame/drivers/calomega.cpp2
-rw-r--r--src/mame/drivers/camplynx.cpp10
-rw-r--r--src/mame/drivers/candela.cpp10
-rw-r--r--src/mame/drivers/canyon.cpp2
-rw-r--r--src/mame/drivers/capbowl.cpp2
-rw-r--r--src/mame/drivers/cardline.cpp2
-rw-r--r--src/mame/drivers/carjmbre.cpp8
-rw-r--r--src/mame/drivers/carpolo.cpp2
-rw-r--r--src/mame/drivers/carrera.cpp2
-rw-r--r--src/mame/drivers/cat.cpp6
-rw-r--r--src/mame/drivers/cave.cpp94
-rw-r--r--src/mame/drivers/cball.cpp2
-rw-r--r--src/mame/drivers/cbm2.cpp44
-rw-r--r--src/mame/drivers/cbuster.cpp12
-rw-r--r--src/mame/drivers/cc40.cpp2
-rw-r--r--src/mame/drivers/cchasm.cpp4
-rw-r--r--src/mame/drivers/cclimber.cpp10
-rw-r--r--src/mame/drivers/ccs2810.cpp10
-rw-r--r--src/mame/drivers/ccs300.cpp8
-rw-r--r--src/mame/drivers/cd2650.cpp4
-rw-r--r--src/mame/drivers/cdi.cpp4
-rw-r--r--src/mame/drivers/cgc7900.cpp10
-rw-r--r--src/mame/drivers/cgenie.cpp8
-rw-r--r--src/mame/drivers/chaknpop.cpp8
-rw-r--r--src/mame/drivers/champbas.cpp36
-rw-r--r--src/mame/drivers/champbwl.cpp4
-rw-r--r--src/mame/drivers/chanbara.cpp4
-rw-r--r--src/mame/drivers/chance32.cpp2
-rw-r--r--src/mame/drivers/chaos.cpp2
-rw-r--r--src/mame/drivers/chessmst.cpp18
-rw-r--r--src/mame/drivers/chexx.cpp2
-rw-r--r--src/mame/drivers/chinagat.cpp8
-rw-r--r--src/mame/drivers/chinsan.cpp8
-rw-r--r--src/mame/drivers/chqflag.cpp14
-rw-r--r--src/mame/drivers/chsuper.cpp2
-rw-r--r--src/mame/drivers/cinemat.cpp2
-rw-r--r--src/mame/drivers/circus.cpp8
-rw-r--r--src/mame/drivers/circusc.cpp6
-rw-r--r--src/mame/drivers/cischeat.cpp2
-rw-r--r--src/mame/drivers/citycon.cpp8
-rw-r--r--src/mame/drivers/ckz80.cpp2
-rw-r--r--src/mame/drivers/clcd.cpp4
-rw-r--r--src/mame/drivers/cliffhgr.cpp2
-rw-r--r--src/mame/drivers/cloak.cpp4
-rw-r--r--src/mame/drivers/clpoker.cpp4
-rw-r--r--src/mame/drivers/clshroad.cpp2
-rw-r--r--src/mame/drivers/cm1800.cpp2
-rw-r--r--src/mame/drivers/cmi.cpp46
-rw-r--r--src/mame/drivers/cmmb.cpp2
-rw-r--r--src/mame/drivers/cninja.cpp68
-rw-r--r--src/mame/drivers/cobra.cpp6
-rw-r--r--src/mame/drivers/coco12.cpp8
-rw-r--r--src/mame/drivers/coco3.cpp8
-rw-r--r--src/mame/drivers/cocoloco.cpp2
-rw-r--r--src/mame/drivers/codata.cpp6
-rw-r--r--src/mame/drivers/coinmstr.cpp2
-rw-r--r--src/mame/drivers/coinmvga.cpp8
-rw-r--r--src/mame/drivers/coleco.cpp10
-rw-r--r--src/mame/drivers/combatsc.cpp2
-rw-r--r--src/mame/drivers/compc.cpp6
-rw-r--r--src/mame/drivers/compis.cpp16
-rw-r--r--src/mame/drivers/compucolor.cpp8
-rw-r--r--src/mame/drivers/concept.cpp6
-rw-r--r--src/mame/drivers/contra.cpp6
-rw-r--r--src/mame/drivers/controlid.cpp2
-rw-r--r--src/mame/drivers/coolpool.cpp16
-rw-r--r--src/mame/drivers/coolridr.cpp2
-rw-r--r--src/mame/drivers/cop01.cpp6
-rw-r--r--src/mame/drivers/cops.cpp12
-rw-r--r--src/mame/drivers/corona.cpp8
-rw-r--r--src/mame/drivers/cortex.cpp8
-rw-r--r--src/mame/drivers/cosmicos.cpp6
-rw-r--r--src/mame/drivers/cp1.cpp2
-rw-r--r--src/mame/drivers/cps1.cpp14
-rw-r--r--src/mame/drivers/cps2.cpp6
-rw-r--r--src/mame/drivers/cps3.cpp2
-rw-r--r--src/mame/drivers/crimfght.cpp12
-rw-r--r--src/mame/drivers/crvision.cpp14
-rw-r--r--src/mame/drivers/crystal.cpp2
-rw-r--r--src/mame/drivers/csplayh5.cpp6
-rw-r--r--src/mame/drivers/cswat.cpp2
-rw-r--r--src/mame/drivers/ct486.cpp6
-rw-r--r--src/mame/drivers/cubeqst.cpp8
-rw-r--r--src/mame/drivers/cv1k.cpp10
-rw-r--r--src/mame/drivers/cvicny.cpp2
-rw-r--r--src/mame/drivers/cvs.cpp8
-rw-r--r--src/mame/drivers/cxgz80.cpp2
-rw-r--r--src/mame/drivers/cxhumax.cpp4
-rw-r--r--src/mame/drivers/cyberbal.cpp2
-rw-r--r--src/mame/drivers/cybertnk.cpp10
-rw-r--r--src/mame/drivers/cybiko.cpp6
-rw-r--r--src/mame/drivers/cyclemb.cpp6
-rw-r--r--src/mame/drivers/czk80.cpp8
-rw-r--r--src/mame/drivers/d400.cpp6
-rw-r--r--src/mame/drivers/d6800.cpp2
-rw-r--r--src/mame/drivers/d6809.cpp6
-rw-r--r--src/mame/drivers/d9final.cpp4
-rw-r--r--src/mame/drivers/dacholer.cpp12
-rw-r--r--src/mame/drivers/dai3wksi.cpp2
-rw-r--r--src/mame/drivers/darius.cpp14
-rw-r--r--src/mame/drivers/darkseal.cpp12
-rw-r--r--src/mame/drivers/dassault.cpp14
-rw-r--r--src/mame/drivers/datum.cpp2
-rw-r--r--src/mame/drivers/dblcrown.cpp2
-rw-r--r--src/mame/drivers/dblewing.cpp8
-rw-r--r--src/mame/drivers/dbox.cpp2
-rw-r--r--src/mame/drivers/dccons.cpp4
-rw-r--r--src/mame/drivers/dcon.cpp8
-rw-r--r--src/mame/drivers/ddealer.cpp4
-rw-r--r--src/mame/drivers/ddenlovr.cpp104
-rw-r--r--src/mame/drivers/ddragon.cpp6
-rw-r--r--src/mame/drivers/ddragon3.cpp18
-rw-r--r--src/mame/drivers/ddribble.cpp10
-rw-r--r--src/mame/drivers/de_2.cpp16
-rw-r--r--src/mame/drivers/de_3.cpp4
-rw-r--r--src/mame/drivers/de_3b.cpp4
-rw-r--r--src/mame/drivers/deadang.cpp10
-rw-r--r--src/mame/drivers/dec0.cpp40
-rw-r--r--src/mame/drivers/dec8.cpp30
-rw-r--r--src/mame/drivers/deco32.cpp34
-rw-r--r--src/mame/drivers/decocass.cpp2
-rw-r--r--src/mame/drivers/dectalk.cpp6
-rw-r--r--src/mame/drivers/decwritr.cpp4
-rw-r--r--src/mame/drivers/deniam.cpp14
-rw-r--r--src/mame/drivers/deshoros.cpp2
-rw-r--r--src/mame/drivers/destroyr.cpp2
-rw-r--r--src/mame/drivers/dfruit.cpp2
-rw-r--r--src/mame/drivers/dgn_beta.cpp4
-rw-r--r--src/mame/drivers/didact.cpp2
-rw-r--r--src/mame/drivers/dietgo.cpp8
-rw-r--r--src/mame/drivers/digel804.cpp4
-rw-r--r--src/mame/drivers/digijet.cpp2
-rw-r--r--src/mame/drivers/dim68k.cpp10
-rw-r--r--src/mame/drivers/discoboy.cpp8
-rw-r--r--src/mame/drivers/djmain.cpp4
-rw-r--r--src/mame/drivers/dkong.cpp2
-rw-r--r--src/mame/drivers/dlair2.cpp2
-rw-r--r--src/mame/drivers/dmax8000.cpp16
-rw-r--r--src/mame/drivers/dms5000.cpp2
-rw-r--r--src/mame/drivers/dms86.cpp10
-rw-r--r--src/mame/drivers/dmv.cpp10
-rw-r--r--src/mame/drivers/docastle.cpp20
-rw-r--r--src/mame/drivers/dolphunk.cpp2
-rw-r--r--src/mame/drivers/dominob.cpp4
-rw-r--r--src/mame/drivers/dooyong.cpp36
-rw-r--r--src/mame/drivers/dotrikun.cpp2
-rw-r--r--src/mame/drivers/dps1.cpp2
-rw-r--r--src/mame/drivers/dragon.cpp16
-rw-r--r--src/mame/drivers/dragrace.cpp2
-rw-r--r--src/mame/drivers/dreamwld.cpp6
-rw-r--r--src/mame/drivers/drw80pkr.cpp2
-rw-r--r--src/mame/drivers/dsb46.cpp8
-rw-r--r--src/mame/drivers/dual68.cpp4
-rw-r--r--src/mame/drivers/dvk_kcgd.cpp6
-rw-r--r--src/mame/drivers/dvk_ksm.cpp4
-rw-r--r--src/mame/drivers/dynax.cpp34
-rw-r--r--src/mame/drivers/e100.cpp4
-rw-r--r--src/mame/drivers/eacc.cpp2
-rw-r--r--src/mame/drivers/ec65.cpp14
-rw-r--r--src/mame/drivers/einstein.cpp6
-rw-r--r--src/mame/drivers/electron.cpp2
-rw-r--r--src/mame/drivers/elekscmp.cpp2
-rw-r--r--src/mame/drivers/elektronmono.cpp2
-rw-r--r--src/mame/drivers/elf.cpp6
-rw-r--r--src/mame/drivers/eolith.cpp4
-rw-r--r--src/mame/drivers/ep64.cpp6
-rw-r--r--src/mame/drivers/epos.cpp8
-rw-r--r--src/mame/drivers/equites.cpp8
-rw-r--r--src/mame/drivers/ertictac.cpp6
-rw-r--r--src/mame/drivers/esd16.cpp14
-rw-r--r--src/mame/drivers/esq1.cpp8
-rw-r--r--src/mame/drivers/esq5505.cpp16
-rw-r--r--src/mame/drivers/esqasr.cpp12
-rw-r--r--src/mame/drivers/esqkt.cpp8
-rw-r--r--src/mame/drivers/esqmr.cpp6
-rw-r--r--src/mame/drivers/esripsys.cpp10
-rw-r--r--src/mame/drivers/et3400.cpp2
-rw-r--r--src/mame/drivers/eti660.cpp6
-rw-r--r--src/mame/drivers/eurocom2.cpp6
-rw-r--r--src/mame/drivers/eva.cpp12
-rw-r--r--src/mame/drivers/evmbug.cpp4
-rw-r--r--src/mame/drivers/excali64.cpp14
-rw-r--r--src/mame/drivers/exelv.cpp8
-rw-r--r--src/mame/drivers/exp85.cpp6
-rw-r--r--src/mame/drivers/exprraid.cpp10
-rw-r--r--src/mame/drivers/f-32.cpp12
-rw-r--r--src/mame/drivers/f1gp.cpp10
-rw-r--r--src/mame/drivers/fantland.cpp6
-rw-r--r--src/mame/drivers/fanucs15.cpp8
-rw-r--r--src/mame/drivers/fanucspmg.cpp26
-rw-r--r--src/mame/drivers/fastfred.cpp8
-rw-r--r--src/mame/drivers/fastlane.cpp6
-rw-r--r--src/mame/drivers/fb01.cpp8
-rw-r--r--src/mame/drivers/fc100.cpp8
-rw-r--r--src/mame/drivers/fccpu30.cpp20
-rw-r--r--src/mame/drivers/fcrash.cpp20
-rw-r--r--src/mame/drivers/feversoc.cpp4
-rw-r--r--src/mame/drivers/fidel6502.cpp38
-rw-r--r--src/mame/drivers/fidel68k.cpp24
-rw-r--r--src/mame/drivers/fidelmcs48.cpp2
-rw-r--r--src/mame/drivers/fidelz80.cpp18
-rw-r--r--src/mame/drivers/finalizr.cpp6
-rw-r--r--src/mame/drivers/fireball.cpp4
-rw-r--r--src/mame/drivers/firebeat.cpp22
-rw-r--r--src/mame/drivers/firefox.cpp4
-rw-r--r--src/mame/drivers/firetrap.cpp4
-rw-r--r--src/mame/drivers/firetrk.cpp2
-rw-r--r--src/mame/drivers/fk1.cpp2
-rw-r--r--src/mame/drivers/flicker.cpp2
-rw-r--r--src/mame/drivers/flipjack.cpp4
-rw-r--r--src/mame/drivers/flower.cpp2
-rw-r--r--src/mame/drivers/flstory.cpp48
-rw-r--r--src/mame/drivers/flyball.cpp2
-rw-r--r--src/mame/drivers/fm7.cpp32
-rw-r--r--src/mame/drivers/fmtowns.cpp2
-rw-r--r--src/mame/drivers/fontwriter.cpp2
-rw-r--r--src/mame/drivers/force68k.cpp18
-rw-r--r--src/mame/drivers/forte2.cpp6
-rw-r--r--src/mame/drivers/fortecar.cpp2
-rw-r--r--src/mame/drivers/fp200.cpp2
-rw-r--r--src/mame/drivers/freekick.cpp28
-rw-r--r--src/mame/drivers/fromanc2.cpp4
-rw-r--r--src/mame/drivers/fromance.cpp14
-rw-r--r--src/mame/drivers/ft68m.cpp4
-rw-r--r--src/mame/drivers/funkyjet.cpp8
-rw-r--r--src/mame/drivers/funworld.cpp2
-rw-r--r--src/mame/drivers/fuukifg2.cpp10
-rw-r--r--src/mame/drivers/gaelco.cpp12
-rw-r--r--src/mame/drivers/gaelco2.cpp24
-rw-r--r--src/mame/drivers/galaga.cpp2
-rw-r--r--src/mame/drivers/galaxi.cpp4
-rw-r--r--src/mame/drivers/galaxia.cpp4
-rw-r--r--src/mame/drivers/galaxian.cpp8
-rw-r--r--src/mame/drivers/galaxold.cpp2
-rw-r--r--src/mame/drivers/galgames.cpp10
-rw-r--r--src/mame/drivers/galivan.cpp16
-rw-r--r--src/mame/drivers/galpani2.cpp8
-rw-r--r--src/mame/drivers/galpani3.cpp4
-rw-r--r--src/mame/drivers/galpanic.cpp4
-rw-r--r--src/mame/drivers/galspnbl.cpp8
-rw-r--r--src/mame/drivers/gambl186.cpp4
-rw-r--r--src/mame/drivers/gamecom.cpp2
-rw-r--r--src/mame/drivers/gamepock.cpp2
-rw-r--r--src/mame/drivers/gamtor.cpp2
-rw-r--r--src/mame/drivers/gaplus.cpp8
-rw-r--r--src/mame/drivers/gatron.cpp2
-rw-r--r--src/mame/drivers/gb.cpp12
-rw-r--r--src/mame/drivers/gba.cpp10
-rw-r--r--src/mame/drivers/gberet.cpp10
-rw-r--r--src/mame/drivers/gcpinbal.cpp6
-rw-r--r--src/mame/drivers/geneve.cpp4
-rw-r--r--src/mame/drivers/geniusiq.cpp4
-rw-r--r--src/mame/drivers/ggconnie.cpp2
-rw-r--r--src/mame/drivers/ghosteo.cpp2
-rw-r--r--src/mame/drivers/giclassic.cpp8
-rw-r--r--src/mame/drivers/gijoe.cpp6
-rw-r--r--src/mame/drivers/gimix.cpp28
-rw-r--r--src/mame/drivers/ginganin.cpp4
-rw-r--r--src/mame/drivers/gkigt.cpp6
-rw-r--r--src/mame/drivers/gladiatr.cpp32
-rw-r--r--src/mame/drivers/glass.cpp6
-rw-r--r--src/mame/drivers/gluck2.cpp4
-rw-r--r--src/mame/drivers/gmaster.cpp2
-rw-r--r--src/mame/drivers/gng.cpp8
-rw-r--r--src/mame/drivers/goindol.cpp6
-rw-r--r--src/mame/drivers/gokidetor.cpp2
-rw-r--r--src/mame/drivers/goldngam.cpp4
-rw-r--r--src/mame/drivers/goldnpkr.cpp2
-rw-r--r--src/mame/drivers/goldstar.cpp6
-rw-r--r--src/mame/drivers/gomoku.cpp2
-rw-r--r--src/mame/drivers/gottlieb.cpp6
-rw-r--r--src/mame/drivers/goupil.cpp8
-rw-r--r--src/mame/drivers/gradius3.cpp4
-rw-r--r--src/mame/drivers/gridcomp.cpp14
-rw-r--r--src/mame/drivers/groundfx.cpp2
-rw-r--r--src/mame/drivers/gstriker.cpp2
-rw-r--r--src/mame/drivers/gsword.cpp10
-rw-r--r--src/mame/drivers/gticlub.cpp22
-rw-r--r--src/mame/drivers/gts1.cpp4
-rw-r--r--src/mame/drivers/gts3.cpp6
-rw-r--r--src/mame/drivers/gts3a.cpp10
-rw-r--r--src/mame/drivers/gts80.cpp8
-rw-r--r--src/mame/drivers/gts80a.cpp8
-rw-r--r--src/mame/drivers/gts80b.cpp8
-rw-r--r--src/mame/drivers/gumbo.cpp4
-rw-r--r--src/mame/drivers/gunbustr.cpp2
-rw-r--r--src/mame/drivers/gundealr.cpp4
-rw-r--r--src/mame/drivers/gunpey.cpp4
-rw-r--r--src/mame/drivers/gyruss.cpp6
-rw-r--r--src/mame/drivers/h19.cpp6
-rw-r--r--src/mame/drivers/h8.cpp2
-rw-r--r--src/mame/drivers/h89.cpp4
-rw-r--r--src/mame/drivers/halleys.cpp14
-rw-r--r--src/mame/drivers/harddriv.cpp20
-rw-r--r--src/mame/drivers/harriet.cpp2
-rw-r--r--src/mame/drivers/hazeltin.cpp14
-rw-r--r--src/mame/drivers/headonb.cpp2
-rw-r--r--src/mame/drivers/hec2hrp.cpp20
-rw-r--r--src/mame/drivers/hexion.cpp6
-rw-r--r--src/mame/drivers/hh_melps4.cpp4
-rw-r--r--src/mame/drivers/hh_sm510.cpp94
-rw-r--r--src/mame/drivers/hh_tms1k.cpp2
-rw-r--r--src/mame/drivers/hh_ucom4.cpp22
-rw-r--r--src/mame/drivers/higemaru.cpp6
-rw-r--r--src/mame/drivers/highvdeo.cpp10
-rw-r--r--src/mame/drivers/himesiki.cpp4
-rw-r--r--src/mame/drivers/hitme.cpp2
-rw-r--r--src/mame/drivers/hitpoker.cpp2
-rw-r--r--src/mame/drivers/hk68v10.cpp4
-rw-r--r--src/mame/drivers/hng64.cpp2
-rw-r--r--src/mame/drivers/homelab.cpp6
-rw-r--r--src/mame/drivers/homerun.cpp6
-rw-r--r--src/mame/drivers/homez80.cpp2
-rw-r--r--src/mame/drivers/horizon.cpp8
-rw-r--r--src/mame/drivers/hornet.cpp14
-rw-r--r--src/mame/drivers/hotstuff.cpp2
-rw-r--r--src/mame/drivers/hp16500.cpp2
-rw-r--r--src/mame/drivers/hp2620.cpp8
-rw-r--r--src/mame/drivers/hp2640.cpp6
-rw-r--r--src/mame/drivers/hp64k.cpp4
-rw-r--r--src/mame/drivers/hp700.cpp4
-rw-r--r--src/mame/drivers/hp9845.cpp8
-rw-r--r--src/mame/drivers/hp9k.cpp4
-rw-r--r--src/mame/drivers/hp9k_3xx.cpp6
-rw-r--r--src/mame/drivers/hp_ipc.cpp12
-rw-r--r--src/mame/drivers/hprot1.cpp2
-rw-r--r--src/mame/drivers/hpz80unk.cpp2
-rw-r--r--src/mame/drivers/ht68k.cpp6
-rw-r--r--src/mame/drivers/huebler.cpp10
-rw-r--r--src/mame/drivers/hunter2.cpp6
-rw-r--r--src/mame/drivers/hx20.cpp6
-rw-r--r--src/mame/drivers/hyperscan.cpp6
-rw-r--r--src/mame/drivers/hyperspt.cpp10
-rw-r--r--src/mame/drivers/i7000.cpp10
-rw-r--r--src/mame/drivers/ibm3153.cpp2
-rw-r--r--src/mame/drivers/ibm6580.cpp6
-rw-r--r--src/mame/drivers/ibmpc.cpp4
-rw-r--r--src/mame/drivers/ibmpcjr.cpp10
-rw-r--r--src/mame/drivers/icatel.cpp2
-rw-r--r--src/mame/drivers/icecold.cpp8
-rw-r--r--src/mame/drivers/ichiban.cpp2
-rw-r--r--src/mame/drivers/idsa.cpp4
-rw-r--r--src/mame/drivers/igs009.cpp6
-rw-r--r--src/mame/drivers/igs011.cpp10
-rw-r--r--src/mame/drivers/igs017.cpp42
-rw-r--r--src/mame/drivers/igspoker.cpp2
-rw-r--r--src/mame/drivers/imds.cpp2
-rw-r--r--src/mame/drivers/imds2.cpp10
-rw-r--r--src/mame/drivers/imsai.cpp8
-rw-r--r--src/mame/drivers/inder.cpp22
-rw-r--r--src/mame/drivers/indiana.cpp6
-rw-r--r--src/mame/drivers/indy_indigo2.cpp8
-rw-r--r--src/mame/drivers/instantm.cpp6
-rw-r--r--src/mame/drivers/instruct.cpp2
-rw-r--r--src/mame/drivers/interact.cpp4
-rw-r--r--src/mame/drivers/interpro.cpp20
-rw-r--r--src/mame/drivers/intv.cpp10
-rw-r--r--src/mame/drivers/invqix.cpp4
-rw-r--r--src/mame/drivers/ipc.cpp8
-rw-r--r--src/mame/drivers/ipds.cpp4
-rw-r--r--src/mame/drivers/iq151.cpp2
-rw-r--r--src/mame/drivers/iris3130.cpp6
-rw-r--r--src/mame/drivers/irisha.cpp8
-rw-r--r--src/mame/drivers/irobot.cpp4
-rw-r--r--src/mame/drivers/isbc.cpp28
-rw-r--r--src/mame/drivers/isbc8010.cpp8
-rw-r--r--src/mame/drivers/isbc8030.cpp8
-rw-r--r--src/mame/drivers/istrebiteli.cpp6
-rw-r--r--src/mame/drivers/itgambl2.cpp4
-rw-r--r--src/mame/drivers/itgambl3.cpp2
-rw-r--r--src/mame/drivers/itgamble.cpp10
-rw-r--r--src/mame/drivers/itt3030.cpp8
-rw-r--r--src/mame/drivers/jack.cpp6
-rw-r--r--src/mame/drivers/jackie.cpp2
-rw-r--r--src/mame/drivers/jade.cpp10
-rw-r--r--src/mame/drivers/jaguar.cpp6
-rw-r--r--src/mame/drivers/jangou.cpp4
-rw-r--r--src/mame/drivers/jankenmn.cpp2
-rw-r--r--src/mame/drivers/jantotsu.cpp4
-rw-r--r--src/mame/drivers/joctronic.cpp22
-rw-r--r--src/mame/drivers/jokrwild.cpp2
-rw-r--r--src/mame/drivers/jollyjgr.cpp4
-rw-r--r--src/mame/drivers/jonos.cpp2
-rw-r--r--src/mame/drivers/joystand.cpp8
-rw-r--r--src/mame/drivers/jp.cpp10
-rw-r--r--src/mame/drivers/jpmmps.cpp4
-rw-r--r--src/mame/drivers/jpmsys5.cpp8
-rw-r--r--src/mame/drivers/jr100.cpp6
-rw-r--r--src/mame/drivers/jr200.cpp4
-rw-r--r--src/mame/drivers/jtc.cpp2
-rw-r--r--src/mame/drivers/jubilee.cpp2
-rw-r--r--src/mame/drivers/jungleyo.cpp4
-rw-r--r--src/mame/drivers/junior.cpp4
-rw-r--r--src/mame/drivers/jupace.cpp10
-rw-r--r--src/mame/drivers/jupiter.cpp4
-rw-r--r--src/mame/drivers/jvh.cpp8
-rw-r--r--src/mame/drivers/k28.cpp4
-rw-r--r--src/mame/drivers/k8915.cpp8
-rw-r--r--src/mame/drivers/kaneko16.cpp36
-rw-r--r--src/mame/drivers/kangaroo.cpp2
-rw-r--r--src/mame/drivers/kas89.cpp2
-rw-r--r--src/mame/drivers/kaypro.cpp22
-rw-r--r--src/mame/drivers/kc.cpp8
-rw-r--r--src/mame/drivers/kchamp.cpp16
-rw-r--r--src/mame/drivers/kdt6.cpp22
-rw-r--r--src/mame/drivers/kenseim.cpp2
-rw-r--r--src/mame/drivers/kickgoal.cpp6
-rw-r--r--src/mame/drivers/kingdrby.cpp4
-rw-r--r--src/mame/drivers/kingpin.cpp8
-rw-r--r--src/mame/drivers/kinst.cpp2
-rw-r--r--src/mame/drivers/kncljoe.cpp10
-rw-r--r--src/mame/drivers/koftball.cpp4
-rw-r--r--src/mame/drivers/konamigq.cpp14
-rw-r--r--src/mame/drivers/konamigv.cpp6
-rw-r--r--src/mame/drivers/konamigx.cpp12
-rw-r--r--src/mame/drivers/konin.cpp4
-rw-r--r--src/mame/drivers/konmedal.cpp14
-rw-r--r--src/mame/drivers/kontest.cpp2
-rw-r--r--src/mame/drivers/kron.cpp2
-rw-r--r--src/mame/drivers/krz2000.cpp2
-rw-r--r--src/mame/drivers/ksayakyu.cpp2
-rw-r--r--src/mame/drivers/ksys573.cpp8
-rw-r--r--src/mame/drivers/kungfur.cpp4
-rw-r--r--src/mame/drivers/kurukuru.cpp4
-rw-r--r--src/mame/drivers/kyocera.cpp34
-rw-r--r--src/mame/drivers/kyugo.cpp8
-rw-r--r--src/mame/drivers/ladyfrog.cpp10
-rw-r--r--src/mame/drivers/laserbat.cpp14
-rw-r--r--src/mame/drivers/lasso.cpp8
-rw-r--r--src/mame/drivers/lastbank.cpp2
-rw-r--r--src/mame/drivers/lastduel.cpp16
-rw-r--r--src/mame/drivers/lazercmd.cpp2
-rw-r--r--src/mame/drivers/lb186.cpp6
-rw-r--r--src/mame/drivers/lbeach.cpp2
-rw-r--r--src/mame/drivers/lcmate2.cpp4
-rw-r--r--src/mame/drivers/leland.cpp8
-rw-r--r--src/mame/drivers/lethal.cpp6
-rw-r--r--src/mame/drivers/lethalj.cpp8
-rw-r--r--src/mame/drivers/lg-dvd.cpp2
-rw-r--r--src/mame/drivers/limenko.cpp2
-rw-r--r--src/mame/drivers/littlerb.cpp6
-rw-r--r--src/mame/drivers/lkage.cpp8
-rw-r--r--src/mame/drivers/llc.cpp16
-rw-r--r--src/mame/drivers/lockon.cpp10
-rw-r--r--src/mame/drivers/lola8a.cpp6
-rw-r--r--src/mame/drivers/lordgun.cpp16
-rw-r--r--src/mame/drivers/lsasquad.cpp2
-rw-r--r--src/mame/drivers/ltd.cpp8
-rw-r--r--src/mame/drivers/lucky74.cpp2
-rw-r--r--src/mame/drivers/luckybal.cpp6
-rw-r--r--src/mame/drivers/lwings.cpp22
-rw-r--r--src/mame/drivers/lwriter.cpp4
-rw-r--r--src/mame/drivers/m107.cpp8
-rw-r--r--src/mame/drivers/m20.cpp2
-rw-r--r--src/mame/drivers/m24.cpp4
-rw-r--r--src/mame/drivers/m5.cpp16
-rw-r--r--src/mame/drivers/m52.cpp2
-rw-r--r--src/mame/drivers/m57.cpp4
-rw-r--r--src/mame/drivers/m58.cpp2
-rw-r--r--src/mame/drivers/m63.cpp14
-rw-r--r--src/mame/drivers/m6805evs.cpp2
-rw-r--r--src/mame/drivers/m68705prg.cpp8
-rw-r--r--src/mame/drivers/m72.cpp6
-rw-r--r--src/mame/drivers/m79152pc.cpp6
-rw-r--r--src/mame/drivers/m79amb.cpp2
-rw-r--r--src/mame/drivers/m90.cpp6
-rw-r--r--src/mame/drivers/m92.cpp8
-rw-r--r--src/mame/drivers/mac.cpp12
-rw-r--r--src/mame/drivers/mac128.cpp2
-rw-r--r--src/mame/drivers/madalien.cpp2
-rw-r--r--src/mame/drivers/magic10.cpp4
-rw-r--r--src/mame/drivers/magicard.cpp6
-rw-r--r--src/mame/drivers/magicfly.cpp2
-rw-r--r--src/mame/drivers/magmax.cpp10
-rw-r--r--src/mame/drivers/magnum.cpp4
-rw-r--r--src/mame/drivers/magreel.cpp2
-rw-r--r--src/mame/drivers/magtouch.cpp2
-rw-r--r--src/mame/drivers/majorpkr.cpp2
-rw-r--r--src/mame/drivers/manohman.cpp10
-rw-r--r--src/mame/drivers/mappy.cpp2
-rw-r--r--src/mame/drivers/marineb.cpp2
-rw-r--r--src/mame/drivers/marinedt.cpp2
-rw-r--r--src/mame/drivers/marywu.cpp8
-rw-r--r--src/mame/drivers/maygayv1.cpp6
-rw-r--r--src/mame/drivers/mazerbla.cpp4
-rw-r--r--src/mame/drivers/mbc200.cpp8
-rw-r--r--src/mame/drivers/mbc55x.cpp6
-rw-r--r--src/mame/drivers/mbee.cpp14
-rw-r--r--src/mame/drivers/mc10.cpp6
-rw-r--r--src/mame/drivers/mc1000.cpp2
-rw-r--r--src/mame/drivers/mc1502.cpp8
-rw-r--r--src/mame/drivers/mc8020.cpp8
-rw-r--r--src/mame/drivers/mc8030.cpp10
-rw-r--r--src/mame/drivers/mcatadv.cpp8
-rw-r--r--src/mame/drivers/mccpm.cpp6
-rw-r--r--src/mame/drivers/mcr3.cpp2
-rw-r--r--src/mame/drivers/meadows.cpp2
-rw-r--r--src/mame/drivers/megaplay.cpp2
-rw-r--r--src/mame/drivers/megasys1.cpp12
-rw-r--r--src/mame/drivers/megatech.cpp4
-rw-r--r--src/mame/drivers/megazone.cpp8
-rw-r--r--src/mame/drivers/mephisto_montec.cpp18
-rw-r--r--src/mame/drivers/mephistp.cpp14
-rw-r--r--src/mame/drivers/merit.cpp2
-rw-r--r--src/mame/drivers/meritm.cpp4
-rw-r--r--src/mame/drivers/mes.cpp2
-rw-r--r--src/mame/drivers/metalmx.cpp4
-rw-r--r--src/mame/drivers/metlfrzr.cpp4
-rw-r--r--src/mame/drivers/metro.cpp112
-rw-r--r--src/mame/drivers/meyc8080.cpp2
-rw-r--r--src/mame/drivers/meyc8088.cpp8
-rw-r--r--src/mame/drivers/mfabfz.cpp4
-rw-r--r--src/mame/drivers/mgames.cpp2
-rw-r--r--src/mame/drivers/mgavegas.cpp2
-rw-r--r--src/mame/drivers/mice.cpp6
-rw-r--r--src/mame/drivers/micral.cpp4
-rw-r--r--src/mame/drivers/micro20.cpp12
-rw-r--r--src/mame/drivers/micro3d.cpp22
-rw-r--r--src/mame/drivers/microdec.cpp2
-rw-r--r--src/mame/drivers/micronic.cpp6
-rw-r--r--src/mame/drivers/micropin.cpp2
-rw-r--r--src/mame/drivers/microtan.cpp8
-rw-r--r--src/mame/drivers/microterm.cpp18
-rw-r--r--src/mame/drivers/midas.cpp8
-rw-r--r--src/mame/drivers/midyunit.cpp14
-rw-r--r--src/mame/drivers/midzeus.cpp2
-rw-r--r--src/mame/drivers/mightyframe.cpp2
-rw-r--r--src/mame/drivers/mikromik.cpp16
-rw-r--r--src/mame/drivers/mikrosha.cpp6
-rw-r--r--src/mame/drivers/mil4000.cpp4
-rw-r--r--src/mame/drivers/milwaukee.cpp8
-rw-r--r--src/mame/drivers/miniboy7.cpp2
-rw-r--r--src/mame/drivers/minicom.cpp2
-rw-r--r--src/mame/drivers/miniframe.cpp2
-rw-r--r--src/mame/drivers/minitel_2_rpic.cpp2
-rw-r--r--src/mame/drivers/minivadr.cpp2
-rw-r--r--src/mame/drivers/missile.cpp2
-rw-r--r--src/mame/drivers/mitchell.cpp22
-rw-r--r--src/mame/drivers/mits680b.cpp2
-rw-r--r--src/mame/drivers/mk14.cpp2
-rw-r--r--src/mame/drivers/mk85.cpp2
-rw-r--r--src/mame/drivers/mk90.cpp2
-rw-r--r--src/mame/drivers/mkit09.cpp4
-rw-r--r--src/mame/drivers/mmagic.cpp4
-rw-r--r--src/mame/drivers/mmodular.cpp8
-rw-r--r--src/mame/drivers/model1.cpp4
-rw-r--r--src/mame/drivers/model2.cpp4
-rw-r--r--src/mame/drivers/model3.cpp8
-rw-r--r--src/mame/drivers/modellot.cpp2
-rw-r--r--src/mame/drivers/molecular.cpp4
-rw-r--r--src/mame/drivers/momoko.cpp8
-rw-r--r--src/mame/drivers/moo.cpp10
-rw-r--r--src/mame/drivers/mosaic.cpp4
-rw-r--r--src/mame/drivers/mpf1.cpp12
-rw-r--r--src/mame/drivers/mpu12wbk.cpp2
-rw-r--r--src/mame/drivers/mpu3.cpp2
-rw-r--r--src/mame/drivers/mpz80.cpp4
-rw-r--r--src/mame/drivers/mrdo.cpp4
-rw-r--r--src/mame/drivers/mrgame.cpp8
-rw-r--r--src/mame/drivers/ms0515.cpp10
-rw-r--r--src/mame/drivers/ms6102.cpp12
-rw-r--r--src/mame/drivers/msbc1.cpp2
-rw-r--r--src/mame/drivers/mstation.cpp4
-rw-r--r--src/mame/drivers/msx.cpp58
-rw-r--r--src/mame/drivers/mt735.cpp2
-rw-r--r--src/mame/drivers/mtouchxl.cpp2
-rw-r--r--src/mame/drivers/mtx.cpp12
-rw-r--r--src/mame/drivers/multfish.cpp2
-rw-r--r--src/mame/drivers/multi8.cpp4
-rw-r--r--src/mame/drivers/munchmo.cpp8
-rw-r--r--src/mame/drivers/mvme147.cpp4
-rw-r--r--src/mame/drivers/mw18w.cpp2
-rw-r--r--src/mame/drivers/mwarr.cpp4
-rw-r--r--src/mame/drivers/mwsub.cpp2
-rw-r--r--src/mame/drivers/mx2178.cpp6
-rw-r--r--src/mame/drivers/myb3k.cpp14
-rw-r--r--src/mame/drivers/mycom.cpp8
-rw-r--r--src/mame/drivers/mystwarr.cpp4
-rw-r--r--src/mame/drivers/myvision.cpp6
-rw-r--r--src/mame/drivers/mz2000.cpp4
-rw-r--r--src/mame/drivers/mz2500.cpp6
-rw-r--r--src/mame/drivers/mz3500.cpp2
-rw-r--r--src/mame/drivers/mz700.cpp12
-rw-r--r--src/mame/drivers/mz80.cpp6
-rw-r--r--src/mame/drivers/mzr8105.cpp2
-rw-r--r--src/mame/drivers/n8080.cpp4
-rw-r--r--src/mame/drivers/nakajies.cpp2
-rw-r--r--src/mame/drivers/namcona1.cpp2
-rw-r--r--src/mame/drivers/namconb1.cpp2
-rw-r--r--src/mame/drivers/namcond1.cpp10
-rw-r--r--src/mame/drivers/namcos1.cpp12
-rw-r--r--src/mame/drivers/namcos10.cpp8
-rw-r--r--src/mame/drivers/namcos11.cpp8
-rw-r--r--src/mame/drivers/namcos12.cpp8
-rw-r--r--src/mame/drivers/namcos2.cpp4
-rw-r--r--src/mame/drivers/namcos22.cpp4
-rw-r--r--src/mame/drivers/namcos23.cpp10
-rw-r--r--src/mame/drivers/namcos86.cpp10
-rw-r--r--src/mame/drivers/nanos.cpp16
-rw-r--r--src/mame/drivers/naomi.cpp4
-rw-r--r--src/mame/drivers/nascom1.cpp10
-rw-r--r--src/mame/drivers/nc.cpp4
-rw-r--r--src/mame/drivers/neogeo.cpp2
-rw-r--r--src/mame/drivers/neoprint.cpp4
-rw-r--r--src/mame/drivers/nes.cpp6
-rw-r--r--src/mame/drivers/nes_vt.cpp4
-rw-r--r--src/mame/drivers/newbrain.cpp6
-rw-r--r--src/mame/drivers/next.cpp20
-rw-r--r--src/mame/drivers/ngen.cpp36
-rw-r--r--src/mame/drivers/ngp.cpp12
-rw-r--r--src/mame/drivers/nibble.cpp2
-rw-r--r--src/mame/drivers/nightgal.cpp2
-rw-r--r--src/mame/drivers/ninjakd2.cpp4
-rw-r--r--src/mame/drivers/nitedrvr.cpp2
-rw-r--r--src/mame/drivers/nmk16.cpp42
-rw-r--r--src/mame/drivers/norautp.cpp4
-rw-r--r--src/mame/drivers/notechan.cpp2
-rw-r--r--src/mame/drivers/notetaker.cpp24
-rw-r--r--src/mame/drivers/nova2001.cpp2
-rw-r--r--src/mame/drivers/novag6502.cpp28
-rw-r--r--src/mame/drivers/novag68k.cpp4
-rw-r--r--src/mame/drivers/nsg6809.cpp6
-rw-r--r--src/mame/drivers/nsmpoker.cpp2
-rw-r--r--src/mame/drivers/nss.cpp2
-rw-r--r--src/mame/drivers/nwk-tr.cpp12
-rw-r--r--src/mame/drivers/nyny.cpp6
-rw-r--r--src/mame/drivers/ob68k1a.cpp6
-rw-r--r--src/mame/drivers/octopus.cpp16
-rw-r--r--src/mame/drivers/odyssey2.cpp16
-rw-r--r--src/mame/drivers/ojankohs.cpp4
-rw-r--r--src/mame/drivers/okean240.cpp2
-rw-r--r--src/mame/drivers/omegrace.cpp8
-rw-r--r--src/mame/drivers/onetwo.cpp2
-rw-r--r--src/mame/drivers/onyx.cpp44
-rw-r--r--src/mame/drivers/opwolf.cpp6
-rw-r--r--src/mame/drivers/orbit.cpp2
-rw-r--r--src/mame/drivers/oric.cpp14
-rw-r--r--src/mame/drivers/orion.cpp8
-rw-r--r--src/mame/drivers/osbexec.cpp2
-rw-r--r--src/mame/drivers/osborne1.cpp4
-rw-r--r--src/mame/drivers/osi.cpp2
-rw-r--r--src/mame/drivers/othello.cpp6
-rw-r--r--src/mame/drivers/overdriv.cpp16
-rw-r--r--src/mame/drivers/p112.cpp2
-rw-r--r--src/mame/drivers/p8k.cpp24
-rw-r--r--src/mame/drivers/pachifev.cpp10
-rw-r--r--src/mame/drivers/pacland.cpp8
-rw-r--r--src/mame/drivers/pacman.cpp2
-rw-r--r--src/mame/drivers/pandoras.cpp4
-rw-r--r--src/mame/drivers/panicr.cpp6
-rw-r--r--src/mame/drivers/paradise.cpp6
-rw-r--r--src/mame/drivers/partner.cpp8
-rw-r--r--src/mame/drivers/pasogo.cpp2
-rw-r--r--src/mame/drivers/pasopia.cpp6
-rw-r--r--src/mame/drivers/pasopia7.cpp8
-rw-r--r--src/mame/drivers/patapata.cpp6
-rw-r--r--src/mame/drivers/pc.cpp10
-rw-r--r--src/mame/drivers/pc100.cpp2
-rw-r--r--src/mame/drivers/pc1500.cpp2
-rw-r--r--src/mame/drivers/pc1512.cpp28
-rw-r--r--src/mame/drivers/pc2000.cpp2
-rw-r--r--src/mame/drivers/pc4.cpp4
-rw-r--r--src/mame/drivers/pc6001.cpp2
-rw-r--r--src/mame/drivers/pc8001.cpp16
-rw-r--r--src/mame/drivers/pc8401a.cpp4
-rw-r--r--src/mame/drivers/pc8801.cpp12
-rw-r--r--src/mame/drivers/pc9801.cpp8
-rw-r--r--src/mame/drivers/pcat_dyn.cpp2
-rw-r--r--src/mame/drivers/pcat_nit.cpp4
-rw-r--r--src/mame/drivers/pcd.cpp14
-rw-r--r--src/mame/drivers/pce220.cpp4
-rw-r--r--src/mame/drivers/pcfx.cpp10
-rw-r--r--src/mame/drivers/pcm.cpp12
-rw-r--r--src/mame/drivers/pcw16.cpp4
-rw-r--r--src/mame/drivers/pcxt.cpp4
-rw-r--r--src/mame/drivers/pda600.cpp4
-rw-r--r--src/mame/drivers/pdp11.cpp2
-rw-r--r--src/mame/drivers/pegasus.cpp2
-rw-r--r--src/mame/drivers/pencil2.cpp6
-rw-r--r--src/mame/drivers/pengadvb.cpp6
-rw-r--r--src/mame/drivers/pentagon.cpp12
-rw-r--r--src/mame/drivers/peoplepc.cpp14
-rw-r--r--src/mame/drivers/peplus.cpp6
-rw-r--r--src/mame/drivers/pes.cpp2
-rw-r--r--src/mame/drivers/pet.cpp24
-rw-r--r--src/mame/drivers/pg685.cpp26
-rw-r--r--src/mame/drivers/phc25.cpp6
-rw-r--r--src/mame/drivers/phunsy.cpp4
-rw-r--r--src/mame/drivers/picno.cpp2
-rw-r--r--src/mame/drivers/piggypas.cpp4
-rw-r--r--src/mame/drivers/pimps.cpp2
-rw-r--r--src/mame/drivers/pinkiri8.cpp2
-rw-r--r--src/mame/drivers/pipbug.cpp2
-rw-r--r--src/mame/drivers/pipedrm.cpp4
-rw-r--r--src/mame/drivers/piratesh.cpp6
-rw-r--r--src/mame/drivers/pitagjr.cpp2
-rw-r--r--src/mame/drivers/pitnrun.cpp10
-rw-r--r--src/mame/drivers/pk8020.cpp10
-rw-r--r--src/mame/drivers/play_2.cpp10
-rw-r--r--src/mame/drivers/play_3.cpp14
-rw-r--r--src/mame/drivers/playmark.cpp30
-rw-r--r--src/mame/drivers/plus4.cpp16
-rw-r--r--src/mame/drivers/plygonet.cpp6
-rw-r--r--src/mame/drivers/pmi80.cpp2
-rw-r--r--src/mame/drivers/pntnpuzl.cpp8
-rw-r--r--src/mame/drivers/pofo.cpp12
-rw-r--r--src/mame/drivers/poisk1.cpp8
-rw-r--r--src/mame/drivers/pokechmp.cpp10
-rw-r--r--src/mame/drivers/polepos.cpp2
-rw-r--r--src/mame/drivers/polgar.cpp20
-rw-r--r--src/mame/drivers/poly.cpp6
-rw-r--r--src/mame/drivers/poly88.cpp4
-rw-r--r--src/mame/drivers/poly880.cpp8
-rw-r--r--src/mame/drivers/pooyan.cpp2
-rw-r--r--src/mame/drivers/popeye.cpp4
-rw-r--r--src/mame/drivers/popobear.cpp6
-rw-r--r--src/mame/drivers/popper.cpp10
-rw-r--r--src/mame/drivers/potgoldu.cpp4
-rw-r--r--src/mame/drivers/prehisle.cpp8
-rw-r--r--src/mame/drivers/prestige.cpp2
-rw-r--r--src/mame/drivers/pro80.cpp4
-rw-r--r--src/mame/drivers/prodigy.cpp6
-rw-r--r--src/mame/drivers/prof180x.cpp2
-rw-r--r--src/mame/drivers/prof80.cpp4
-rw-r--r--src/mame/drivers/prophet600.cpp12
-rw-r--r--src/mame/drivers/proteus3.cpp4
-rw-r--r--src/mame/drivers/psikyo.cpp8
-rw-r--r--src/mame/drivers/psx.cpp12
-rw-r--r--src/mame/drivers/psychic5.cpp20
-rw-r--r--src/mame/drivers/pt68k4.cpp14
-rw-r--r--src/mame/drivers/ptcsol.cpp2
-rw-r--r--src/mame/drivers/puckpkmn.cpp2
-rw-r--r--src/mame/drivers/pulsar.cpp10
-rw-r--r--src/mame/drivers/punchout.cpp2
-rw-r--r--src/mame/drivers/pv2000.cpp6
-rw-r--r--src/mame/drivers/pve500.cpp12
-rw-r--r--src/mame/drivers/pwrview.cpp12
-rw-r--r--src/mame/drivers/px4.cpp4
-rw-r--r--src/mame/drivers/px8.cpp4
-rw-r--r--src/mame/drivers/pyl601.cpp8
-rw-r--r--src/mame/drivers/qdrmfgp.cpp14
-rw-r--r--src/mame/drivers/ql.cpp6
-rw-r--r--src/mame/drivers/qtsbc.cpp4
-rw-r--r--src/mame/drivers/quantum.cpp4
-rw-r--r--src/mame/drivers/quickpick5.cpp8
-rw-r--r--src/mame/drivers/quizpun2.cpp10
-rw-r--r--src/mame/drivers/quizshow.cpp2
-rw-r--r--src/mame/drivers/qvt103.cpp12
-rw-r--r--src/mame/drivers/qvt201.cpp8
-rw-r--r--src/mame/drivers/qvt6800.cpp20
-rw-r--r--src/mame/drivers/qx10.cpp2
-rw-r--r--src/mame/drivers/r2dx_v33.cpp4
-rw-r--r--src/mame/drivers/rabbit.cpp4
-rw-r--r--src/mame/drivers/radicasi.cpp2
-rw-r--r--src/mame/drivers/radio86.cpp6
-rw-r--r--src/mame/drivers/raiden.cpp10
-rw-r--r--src/mame/drivers/raiden2.cpp20
-rw-r--r--src/mame/drivers/rainbow.cpp16
-rw-r--r--src/mame/drivers/rallyx.cpp2
-rw-r--r--src/mame/drivers/rampart.cpp2
-rw-r--r--src/mame/drivers/rastan.cpp8
-rw-r--r--src/mame/drivers/rastersp.cpp6
-rw-r--r--src/mame/drivers/ravens.cpp4
-rw-r--r--src/mame/drivers/rbisland.cpp18
-rw-r--r--src/mame/drivers/rc702.cpp10
-rw-r--r--src/mame/drivers/rc759.cpp4
-rw-r--r--src/mame/drivers/rd100.cpp2
-rw-r--r--src/mame/drivers/rd110.cpp2
-rw-r--r--src/mame/drivers/re900.cpp6
-rw-r--r--src/mame/drivers/realbrk.cpp6
-rw-r--r--src/mame/drivers/redalert.cpp2
-rw-r--r--src/mame/drivers/retofinv.cpp12
-rw-r--r--src/mame/drivers/rex6000.cpp12
-rw-r--r--src/mame/drivers/risc2500.cpp2
-rw-r--r--src/mame/drivers/riscpc.cpp8
-rw-r--r--src/mame/drivers/rltennis.cpp2
-rw-r--r--src/mame/drivers/rm380z.cpp6
-rw-r--r--src/mame/drivers/rmnimbus.cpp2
-rw-r--r--src/mame/drivers/rmt32.cpp2
-rw-r--r--src/mame/drivers/rockrage.cpp4
-rw-r--r--src/mame/drivers/rocnrope.cpp2
-rw-r--r--src/mame/drivers/rollrace.cpp10
-rw-r--r--src/mame/drivers/ron.cpp6
-rw-r--r--src/mame/drivers/royalmah.cpp16
-rw-r--r--src/mame/drivers/rpunch.cpp4
-rw-r--r--src/mame/drivers/rsc55.cpp2
-rw-r--r--src/mame/drivers/rt1715.cpp12
-rw-r--r--src/mame/drivers/rungun.cpp4
-rw-r--r--src/mame/drivers/rvoice.cpp6
-rw-r--r--src/mame/drivers/rx78.cpp4
-rw-r--r--src/mame/drivers/rzone.cpp4
-rw-r--r--src/mame/drivers/s11.cpp4
-rw-r--r--src/mame/drivers/s11a.cpp8
-rw-r--r--src/mame/drivers/s11b.cpp6
-rw-r--r--src/mame/drivers/s11c.cpp2
-rw-r--r--src/mame/drivers/s8.cpp4
-rw-r--r--src/mame/drivers/s8a.cpp4
-rw-r--r--src/mame/drivers/s9.cpp4
-rw-r--r--src/mame/drivers/safarir.cpp2
-rw-r--r--src/mame/drivers/sage2.cpp10
-rw-r--r--src/mame/drivers/sam.cpp2
-rw-r--r--src/mame/drivers/samcoupe.cpp6
-rw-r--r--src/mame/drivers/sangho.cpp16
-rw-r--r--src/mame/drivers/sanremo.cpp2
-rw-r--r--src/mame/drivers/sapi1.cpp8
-rw-r--r--src/mame/drivers/saturn.cpp2
-rw-r--r--src/mame/drivers/sauro.cpp4
-rw-r--r--src/mame/drivers/savia84.cpp2
-rw-r--r--src/mame/drivers/sbasketb.cpp6
-rw-r--r--src/mame/drivers/sbc6510.cpp8
-rw-r--r--src/mame/drivers/sbowling.cpp4
-rw-r--r--src/mame/drivers/sbrain.cpp8
-rw-r--r--src/mame/drivers/sbrkout.cpp2
-rw-r--r--src/mame/drivers/sc1.cpp4
-rw-r--r--src/mame/drivers/sc2.cpp4
-rw-r--r--src/mame/drivers/scopus.cpp4
-rw-r--r--src/mame/drivers/scregg.cpp16
-rw-r--r--src/mame/drivers/scv.cpp10
-rw-r--r--src/mame/drivers/sderby.cpp4
-rw-r--r--src/mame/drivers/sderby2.cpp4
-rw-r--r--src/mame/drivers/sdk80.cpp4
-rw-r--r--src/mame/drivers/sdk85.cpp12
-rw-r--r--src/mame/drivers/sdk86.cpp4
-rw-r--r--src/mame/drivers/seattlecmp.cpp6
-rw-r--r--src/mame/drivers/segac2.cpp4
-rw-r--r--src/mame/drivers/segae.cpp14
-rw-r--r--src/mame/drivers/segam1.cpp2
-rw-r--r--src/mame/drivers/segaorun.cpp6
-rw-r--r--src/mame/drivers/segas16b.cpp16
-rw-r--r--src/mame/drivers/segas24.cpp14
-rw-r--r--src/mame/drivers/segas32.cpp4
-rw-r--r--src/mame/drivers/segaufo.cpp16
-rw-r--r--src/mame/drivers/segaxbd.cpp12
-rw-r--r--src/mame/drivers/segaybd.cpp4
-rw-r--r--src/mame/drivers/seibucats.cpp8
-rw-r--r--src/mame/drivers/seibuspi.cpp26
-rw-r--r--src/mame/drivers/seicross.cpp6
-rw-r--r--src/mame/drivers/seicupbl.cpp2
-rw-r--r--src/mame/drivers/selz80.cpp2
-rw-r--r--src/mame/drivers/seta.cpp28
-rw-r--r--src/mame/drivers/seta2.cpp18
-rw-r--r--src/mame/drivers/sf.cpp8
-rw-r--r--src/mame/drivers/sfcbox.cpp6
-rw-r--r--src/mame/drivers/sfkick.cpp2
-rw-r--r--src/mame/drivers/sg1000.cpp18
-rw-r--r--src/mame/drivers/sg1000a.cpp10
-rw-r--r--src/mame/drivers/shadfrce.cpp10
-rw-r--r--src/mame/drivers/shangha3.cpp28
-rw-r--r--src/mame/drivers/shanghai.cpp14
-rw-r--r--src/mame/drivers/shangkid.cpp8
-rw-r--r--src/mame/drivers/shaolins.cpp2
-rw-r--r--src/mame/drivers/shootaway2.cpp6
-rw-r--r--src/mame/drivers/shootout.cpp16
-rw-r--r--src/mame/drivers/shougi.cpp8
-rw-r--r--src/mame/drivers/sigmab52.cpp12
-rw-r--r--src/mame/drivers/sigmab98.cpp4
-rw-r--r--src/mame/drivers/silkroad.cpp8
-rw-r--r--src/mame/drivers/silvmil.cpp14
-rw-r--r--src/mame/drivers/simpsons.cpp12
-rw-r--r--src/mame/drivers/sitcom.cpp2
-rw-r--r--src/mame/drivers/skimaxx.cpp14
-rw-r--r--src/mame/drivers/skydiver.cpp2
-rw-r--r--src/mame/drivers/skyfox.cpp8
-rw-r--r--src/mame/drivers/skykid.cpp4
-rw-r--r--src/mame/drivers/skylncr.cpp2
-rw-r--r--src/mame/drivers/slapfght.cpp28
-rw-r--r--src/mame/drivers/slicer.cpp6
-rw-r--r--src/mame/drivers/slotcarn.cpp2
-rw-r--r--src/mame/drivers/sm1800.cpp2
-rw-r--r--src/mame/drivers/sm7238.cpp16
-rw-r--r--src/mame/drivers/smc777.cpp4
-rw-r--r--src/mame/drivers/sms.cpp30
-rw-r--r--src/mame/drivers/sms_bootleg.cpp8
-rw-r--r--src/mame/drivers/smsmcorp.cpp6
-rw-r--r--src/mame/drivers/snes.cpp2
-rw-r--r--src/mame/drivers/snesb.cpp4
-rw-r--r--src/mame/drivers/snk.cpp34
-rw-r--r--src/mame/drivers/snk6502.cpp2
-rw-r--r--src/mame/drivers/snk68.cpp8
-rw-r--r--src/mame/drivers/snookr10.cpp2
-rw-r--r--src/mame/drivers/snowbros.cpp46
-rw-r--r--src/mame/drivers/socrates.cpp16
-rw-r--r--src/mame/drivers/softbox.cpp4
-rw-r--r--src/mame/drivers/sonson.cpp8
-rw-r--r--src/mame/drivers/sothello.cpp14
-rw-r--r--src/mame/drivers/spbactn.cpp20
-rw-r--r--src/mame/drivers/spc1000.cpp8
-rw-r--r--src/mame/drivers/spc1500.cpp6
-rw-r--r--src/mame/drivers/spdodgeb.cpp8
-rw-r--r--src/mame/drivers/special.cpp4
-rw-r--r--src/mame/drivers/spectra.cpp4
-rw-r--r--src/mame/drivers/speedatk.cpp2
-rw-r--r--src/mame/drivers/speedbal.cpp6
-rw-r--r--src/mame/drivers/spinb.cpp16
-rw-r--r--src/mame/drivers/splash.cpp22
-rw-r--r--src/mame/drivers/splus.cpp2
-rw-r--r--src/mame/drivers/spoker.cpp8
-rw-r--r--src/mame/drivers/sprcros2.cpp2
-rw-r--r--src/mame/drivers/sprint2.cpp2
-rw-r--r--src/mame/drivers/spy.cpp4
-rw-r--r--src/mame/drivers/squale.cpp4
-rw-r--r--src/mame/drivers/sshot.cpp2
-rw-r--r--src/mame/drivers/ssozumo.cpp2
-rw-r--r--src/mame/drivers/sspeedr.cpp2
-rw-r--r--src/mame/drivers/ssv.cpp4
-rw-r--r--src/mame/drivers/stadhero.cpp10
-rw-r--r--src/mame/drivers/starwars.cpp4
-rw-r--r--src/mame/drivers/stfight.cpp12
-rw-r--r--src/mame/drivers/stlforce.cpp6
-rw-r--r--src/mame/drivers/studio2.cpp6
-rw-r--r--src/mame/drivers/stuntair.cpp8
-rw-r--r--src/mame/drivers/stv.cpp2
-rw-r--r--src/mame/drivers/su2000.cpp8
-rw-r--r--src/mame/drivers/sub.cpp2
-rw-r--r--src/mame/drivers/subsino.cpp24
-rw-r--r--src/mame/drivers/subsino2.cpp18
-rw-r--r--src/mame/drivers/sun1.cpp6
-rw-r--r--src/mame/drivers/sun2.cpp16
-rw-r--r--src/mame/drivers/sun3.cpp8
-rw-r--r--src/mame/drivers/sun3x.cpp8
-rw-r--r--src/mame/drivers/sun4.cpp10
-rw-r--r--src/mame/drivers/suna16.cpp36
-rw-r--r--src/mame/drivers/suna8.cpp2
-rw-r--r--src/mame/drivers/supbtime.cpp10
-rw-r--r--src/mame/drivers/supdrapo.cpp2
-rw-r--r--src/mame/drivers/supduck.cpp6
-rw-r--r--src/mame/drivers/super6.cpp14
-rw-r--r--src/mame/drivers/super80.cpp4
-rw-r--r--src/mame/drivers/superchs.cpp4
-rw-r--r--src/mame/drivers/supercrd.cpp2
-rw-r--r--src/mame/drivers/superqix.cpp16
-rw-r--r--src/mame/drivers/superslave.cpp10
-rw-r--r--src/mame/drivers/superwng.cpp2
-rw-r--r--src/mame/drivers/supracan.cpp6
-rw-r--r--src/mame/drivers/suprgolf.cpp4
-rw-r--r--src/mame/drivers/suprnova.cpp2
-rw-r--r--src/mame/drivers/suprridr.cpp6
-rw-r--r--src/mame/drivers/supstarf.cpp8
-rw-r--r--src/mame/drivers/surpratk.cpp4
-rw-r--r--src/mame/drivers/sv8000.cpp6
-rw-r--r--src/mame/drivers/svi318.cpp8
-rw-r--r--src/mame/drivers/svmu.cpp4
-rw-r--r--src/mame/drivers/swtpc.cpp8
-rw-r--r--src/mame/drivers/swtpc09.cpp10
-rw-r--r--src/mame/drivers/swyft.cpp8
-rw-r--r--src/mame/drivers/sym1.cpp2
-rw-r--r--src/mame/drivers/symbolics.cpp2
-rw-r--r--src/mame/drivers/sys2900.cpp2
-rw-r--r--src/mame/drivers/sys9002.cpp4
-rw-r--r--src/mame/drivers/systec.cpp4
-rw-r--r--src/mame/drivers/system1.cpp4
-rw-r--r--src/mame/drivers/system16.cpp6
-rw-r--r--src/mame/drivers/tagteam.cpp8
-rw-r--r--src/mame/drivers/tail2nos.cpp8
-rw-r--r--src/mame/drivers/taito.cpp4
-rw-r--r--src/mame/drivers/taito_b.cpp86
-rw-r--r--src/mame/drivers/taito_f2.cpp6
-rw-r--r--src/mame/drivers/taito_f3.cpp4
-rw-r--r--src/mame/drivers/taito_h.cpp18
-rw-r--r--src/mame/drivers/taito_l.cpp30
-rw-r--r--src/mame/drivers/taito_x.cpp14
-rw-r--r--src/mame/drivers/taito_z.cpp18
-rw-r--r--src/mame/drivers/taitoair.cpp8
-rw-r--r--src/mame/drivers/taitogn.cpp6
-rw-r--r--src/mame/drivers/taitojc.cpp6
-rw-r--r--src/mame/drivers/taitopjc.cpp2
-rw-r--r--src/mame/drivers/taitosj.cpp16
-rw-r--r--src/mame/drivers/taitotz.cpp2
-rw-r--r--src/mame/drivers/tamag1.cpp4
-rw-r--r--src/mame/drivers/tandy1t.cpp8
-rw-r--r--src/mame/drivers/tandy2k.cpp16
-rw-r--r--src/mame/drivers/tankbust.cpp10
-rw-r--r--src/mame/drivers/tapatune.cpp12
-rw-r--r--src/mame/drivers/targeth.cpp6
-rw-r--r--src/mame/drivers/tatsumi.cpp4
-rw-r--r--src/mame/drivers/tavernie.cpp6
-rw-r--r--src/mame/drivers/tceptor.cpp14
-rw-r--r--src/mame/drivers/tdv2324.cpp2
-rw-r--r--src/mame/drivers/tec1.cpp2
-rw-r--r--src/mame/drivers/techno.cpp8
-rw-r--r--src/mame/drivers/tecmo.cpp14
-rw-r--r--src/mame/drivers/tecmo16.cpp4
-rw-r--r--src/mame/drivers/tecmosys.cpp10
-rw-r--r--src/mame/drivers/tecnbras.cpp2
-rw-r--r--src/mame/drivers/tek405x.cpp4
-rw-r--r--src/mame/drivers/tek440x.cpp8
-rw-r--r--src/mame/drivers/tekxp33x.cpp4
-rw-r--r--src/mame/drivers/tempest.cpp4
-rw-r--r--src/mame/drivers/terak.cpp2
-rw-r--r--src/mame/drivers/terco.cpp2
-rw-r--r--src/mame/drivers/terracre.cpp10
-rw-r--r--src/mame/drivers/testconsole.cpp4
-rw-r--r--src/mame/drivers/tetrisp2.cpp4
-rw-r--r--src/mame/drivers/tg100.cpp2
-rw-r--r--src/mame/drivers/tgtpanic.cpp2
-rw-r--r--src/mame/drivers/thayers.cpp6
-rw-r--r--src/mame/drivers/thedealr.cpp6
-rw-r--r--src/mame/drivers/thedeep.cpp8
-rw-r--r--src/mame/drivers/thief.cpp10
-rw-r--r--src/mame/drivers/thomson.cpp4
-rw-r--r--src/mame/drivers/thoop2.cpp6
-rw-r--r--src/mame/drivers/thunderx.cpp8
-rw-r--r--src/mame/drivers/ti630.cpp2
-rw-r--r--src/mame/drivers/ti74.cpp4
-rw-r--r--src/mame/drivers/ti89.cpp8
-rw-r--r--src/mame/drivers/ti99_4x.cpp12
-rw-r--r--src/mame/drivers/ti99_8.cpp8
-rw-r--r--src/mame/drivers/tickee.cpp12
-rw-r--r--src/mame/drivers/tigeroad.cpp8
-rw-r--r--src/mame/drivers/tiki100.cpp16
-rw-r--r--src/mame/drivers/tim011.cpp6
-rw-r--r--src/mame/drivers/tim100.cpp4
-rw-r--r--src/mame/drivers/timeplt.cpp4
-rw-r--r--src/mame/drivers/timex.cpp4
-rw-r--r--src/mame/drivers/tispeak.cpp2
-rw-r--r--src/mame/drivers/tk2000.cpp2
-rw-r--r--src/mame/drivers/tk80.cpp6
-rw-r--r--src/mame/drivers/tk80bs.cpp2
-rw-r--r--src/mame/drivers/tm990189.cpp2
-rw-r--r--src/mame/drivers/tmaster.cpp8
-rw-r--r--src/mame/drivers/tmc1800.cpp8
-rw-r--r--src/mame/drivers/tmc2000e.cpp6
-rw-r--r--src/mame/drivers/tmc600.cpp6
-rw-r--r--src/mame/drivers/tmmjprd.cpp2
-rw-r--r--src/mame/drivers/tmnt.cpp72
-rw-r--r--src/mame/drivers/tmspoker.cpp2
-rw-r--r--src/mame/drivers/tnzs.cpp16
-rw-r--r--src/mame/drivers/toaplan1.cpp58
-rw-r--r--src/mame/drivers/toaplan2.cpp230
-rw-r--r--src/mame/drivers/toki.cpp8
-rw-r--r--src/mame/drivers/tomcat.cpp18
-rw-r--r--src/mame/drivers/tonton.cpp2
-rw-r--r--src/mame/drivers/toobin.cpp2
-rw-r--r--src/mame/drivers/topspeed.cpp14
-rw-r--r--src/mame/drivers/tosh1000.cpp4
-rw-r--r--src/mame/drivers/tourtabl.cpp2
-rw-r--r--src/mame/drivers/toypop.cpp2
-rw-r--r--src/mame/drivers/tp84.cpp12
-rw-r--r--src/mame/drivers/tr175.cpp2
-rw-r--r--src/mame/drivers/trackfld.cpp8
-rw-r--r--src/mame/drivers/tranz330.cpp12
-rw-r--r--src/mame/drivers/tricep.cpp2
-rw-r--r--src/mame/drivers/trs80.cpp2
-rw-r--r--src/mame/drivers/trs80m2.cpp36
-rw-r--r--src/mame/drivers/truco.cpp2
-rw-r--r--src/mame/drivers/trvmadns.cpp4
-rw-r--r--src/mame/drivers/trvquest.cpp12
-rw-r--r--src/mame/drivers/ts3000.cpp2
-rw-r--r--src/mame/drivers/ts802.cpp12
-rw-r--r--src/mame/drivers/ts803.cpp12
-rw-r--r--src/mame/drivers/ts816.cpp30
-rw-r--r--src/mame/drivers/tsamurai.cpp24
-rw-r--r--src/mame/drivers/tti.cpp4
-rw-r--r--src/mame/drivers/tugboat.cpp2
-rw-r--r--src/mame/drivers/tunhunt.cpp6
-rw-r--r--src/mame/drivers/turbo.cpp2
-rw-r--r--src/mame/drivers/turrett.cpp2
-rw-r--r--src/mame/drivers/tutankhm.cpp2
-rw-r--r--src/mame/drivers/tutor.cpp4
-rw-r--r--src/mame/drivers/tv910.cpp4
-rw-r--r--src/mame/drivers/tv912.cpp10
-rw-r--r--src/mame/drivers/tv950.cpp4
-rw-r--r--src/mame/drivers/tv990.cpp4
-rw-r--r--src/mame/drivers/tvgame.cpp2
-rw-r--r--src/mame/drivers/twin16.cpp26
-rw-r--r--src/mame/drivers/twincobr.cpp14
-rw-r--r--src/mame/drivers/twinkle.cpp10
-rw-r--r--src/mame/drivers/twins.cpp4
-rw-r--r--src/mame/drivers/ultratnk.cpp2
-rw-r--r--src/mame/drivers/ultrsprt.cpp4
-rw-r--r--src/mame/drivers/undrfire.cpp6
-rw-r--r--src/mame/drivers/unichamp.cpp8
-rw-r--r--src/mame/drivers/unico.cpp20
-rw-r--r--src/mame/drivers/unior.cpp12
-rw-r--r--src/mame/drivers/unistar.cpp4
-rw-r--r--src/mame/drivers/univac.cpp6
-rw-r--r--src/mame/drivers/unixpc.cpp4
-rw-r--r--src/mame/drivers/unkhorse.cpp4
-rw-r--r--src/mame/drivers/usgames.cpp2
-rw-r--r--src/mame/drivers/v100.cpp14
-rw-r--r--src/mame/drivers/v102.cpp10
-rw-r--r--src/mame/drivers/v1050.cpp18
-rw-r--r--src/mame/drivers/v6809.cpp8
-rw-r--r--src/mame/drivers/vamphalf.cpp30
-rw-r--r--src/mame/drivers/vaportra.cpp12
-rw-r--r--src/mame/drivers/vastar.cpp6
-rw-r--r--src/mame/drivers/vax11.cpp2
-rw-r--r--src/mame/drivers/vball.cpp2
-rw-r--r--src/mame/drivers/vboy.cpp6
-rw-r--r--src/mame/drivers/vcombat.cpp22
-rw-r--r--src/mame/drivers/vcs80.cpp4
-rw-r--r--src/mame/drivers/vector06.cpp2
-rw-r--r--src/mame/drivers/vector4.cpp2
-rw-r--r--src/mame/drivers/vectrex.cpp6
-rw-r--r--src/mame/drivers/vectrix.cpp2
-rw-r--r--src/mame/drivers/vegaeo.cpp4
-rw-r--r--src/mame/drivers/vendetta.cpp8
-rw-r--r--src/mame/drivers/vertigo.cpp12
-rw-r--r--src/mame/drivers/vg5k.cpp2
-rw-r--r--src/mame/drivers/vgmplay.cpp2
-rw-r--r--src/mame/drivers/vic10.cpp10
-rw-r--r--src/mame/drivers/vicdual.cpp2
-rw-r--r--src/mame/drivers/victor9k.cpp16
-rw-r--r--src/mame/drivers/vidbrain.cpp4
-rw-r--r--src/mame/drivers/videopkr.cpp8
-rw-r--r--src/mame/drivers/vii.cpp8
-rw-r--r--src/mame/drivers/vip.cpp8
-rw-r--r--src/mame/drivers/vis.cpp11
-rw-r--r--src/mame/drivers/vixen.cpp12
-rw-r--r--src/mame/drivers/vk100.cpp10
-rw-r--r--src/mame/drivers/vlc.cpp12
-rw-r--r--src/mame/drivers/volfied.cpp6
-rw-r--r--src/mame/drivers/votrpss.cpp10
-rw-r--r--src/mame/drivers/votrtnt.cpp2
-rw-r--r--src/mame/drivers/vp122.cpp6
-rw-r--r--src/mame/drivers/vp60.cpp6
-rw-r--r--src/mame/drivers/vpoker.cpp4
-rw-r--r--src/mame/drivers/vsnes.cpp10
-rw-r--r--src/mame/drivers/vt100.cpp14
-rw-r--r--src/mame/drivers/vt220.cpp4
-rw-r--r--src/mame/drivers/vt240.cpp10
-rw-r--r--src/mame/drivers/vt320.cpp2
-rw-r--r--src/mame/drivers/vt520.cpp4
-rw-r--r--src/mame/drivers/vta2000.cpp2
-rw-r--r--src/mame/drivers/vtech1.cpp8
-rw-r--r--src/mame/drivers/vulgus.cpp8
-rw-r--r--src/mame/drivers/wacky_gator.cpp18
-rw-r--r--src/mame/drivers/wardner.cpp12
-rw-r--r--src/mame/drivers/warpsped.cpp2
-rw-r--r--src/mame/drivers/warpwarp.cpp2
-rw-r--r--src/mame/drivers/wc90.cpp8
-rw-r--r--src/mame/drivers/wc90b.cpp8
-rw-r--r--src/mame/drivers/welltris.cpp2
-rw-r--r--src/mame/drivers/wicat.cpp32
-rw-r--r--src/mame/drivers/wico.cpp6
-rw-r--r--src/mame/drivers/wildpkr.cpp10
-rw-r--r--src/mame/drivers/williams.cpp4
-rw-r--r--src/mame/drivers/witch.cpp2
-rw-r--r--src/mame/drivers/wmg.cpp4
-rw-r--r--src/mame/drivers/wms.cpp6
-rw-r--r--src/mame/drivers/wpc_95.cpp4
-rw-r--r--src/mame/drivers/wpc_an.cpp2
-rw-r--r--src/mame/drivers/wpc_dcs.cpp4
-rw-r--r--src/mame/drivers/wpc_s.cpp4
-rw-r--r--src/mame/drivers/wrally.cpp6
-rw-r--r--src/mame/drivers/wswan.cpp4
-rw-r--r--src/mame/drivers/wwfsstar.cpp8
-rw-r--r--src/mame/drivers/x07.cpp2
-rw-r--r--src/mame/drivers/x1.cpp6
-rw-r--r--src/mame/drivers/x1twin.cpp6
-rw-r--r--src/mame/drivers/x68k.cpp2
-rw-r--r--src/mame/drivers/xain.cpp2
-rw-r--r--src/mame/drivers/xavix.cpp2
-rw-r--r--src/mame/drivers/xerox820.cpp40
-rw-r--r--src/mame/drivers/xexex.cpp14
-rw-r--r--src/mame/drivers/xmen.cpp16
-rw-r--r--src/mame/drivers/xor100.cpp14
-rw-r--r--src/mame/drivers/yiear.cpp6
-rw-r--r--src/mame/drivers/ymmu100.cpp2
-rw-r--r--src/mame/drivers/yunsun16.cpp16
-rw-r--r--src/mame/drivers/yunsung8.cpp10
-rw-r--r--src/mame/drivers/yuvomz80.cpp10
-rw-r--r--src/mame/drivers/z100.cpp6
-rw-r--r--src/mame/drivers/z1013.cpp6
-rw-r--r--src/mame/drivers/z80dev.cpp2
-rw-r--r--src/mame/drivers/z80ne.cpp8
-rw-r--r--src/mame/drivers/z88.cpp4
-rw-r--r--src/mame/drivers/z9001.cpp8
-rw-r--r--src/mame/drivers/zac_proto.cpp2
-rw-r--r--src/mame/drivers/zaccaria.cpp2
-rw-r--r--src/mame/drivers/zapcomputer.cpp2
-rw-r--r--src/mame/drivers/zaurus.cpp4
-rw-r--r--src/mame/drivers/zaxxon.cpp6
-rw-r--r--src/mame/drivers/zexall.cpp2
-rw-r--r--src/mame/drivers/zms8085.cpp4
-rw-r--r--src/mame/drivers/zn.cpp36
-rw-r--r--src/mame/drivers/zodiack.cpp8
-rw-r--r--src/mame/drivers/zorba.cpp14
-rw-r--r--src/mame/drivers/zr107.cpp24
-rw-r--r--src/mame/drivers/zrt80.cpp4
-rw-r--r--src/mame/drivers/zsbc3.cpp10
-rw-r--r--src/mame/drivers/zwackery.cpp2
-rw-r--r--src/mame/drivers/zx.cpp4
-rw-r--r--src/mame/etc/korgm1.cpp2
-rw-r--r--src/mame/etc/template_driver.cpp4
-rw-r--r--src/mame/includes/abc80x.h4
-rw-r--r--src/mame/includes/aim65.h2
-rw-r--r--src/mame/includes/amiga.h18
-rw-r--r--src/mame/includes/apple2gs.h2
-rw-r--r--src/mame/includes/astrocde.h2
-rw-r--r--src/mame/includes/atarist.h8
-rw-r--r--src/mame/includes/atom.h4
-rw-r--r--src/mame/includes/bagman.h2
-rw-r--r--src/mame/includes/bishi.h4
-rw-r--r--src/mame/includes/bwidow.h4
-rw-r--r--src/mame/includes/bzone.h4
-rw-r--r--src/mame/includes/cdi.h4
-rw-r--r--src/mame/includes/cidelsa.h6
-rw-r--r--src/mame/includes/cosmic.h4
-rw-r--r--src/mame/includes/cps1.h2
-rw-r--r--src/mame/includes/crbaloon.h2
-rw-r--r--src/mame/includes/crgolf.h2
-rw-r--r--src/mame/includes/divebomb.h2
-rw-r--r--src/mame/includes/dkong.h4
-rw-r--r--src/mame/includes/esripsys.h2
-rw-r--r--src/mame/includes/exerion.h2
-rw-r--r--src/mame/includes/exidy.h2
-rw-r--r--src/mame/includes/exidy440.h2
-rw-r--r--src/mame/includes/fuukifg3.h6
-rw-r--r--src/mame/includes/galaxian.h2
-rw-r--r--src/mame/includes/gameplan.h8
-rw-r--r--src/mame/includes/harddriv.h4
-rw-r--r--src/mame/includes/itech32.h10
-rw-r--r--src/mame/includes/jackal.h4
-rw-r--r--src/mame/includes/jaguar.h6
-rw-r--r--src/mame/includes/jailbrek.h4
-rw-r--r--src/mame/includes/jedi.h4
-rw-r--r--src/mame/includes/lockon.h4
-rw-r--r--src/mame/includes/madalien.h2
-rw-r--r--src/mame/includes/mario.h6
-rw-r--r--src/mame/includes/maygay1b.h4
-rw-r--r--src/mame/includes/mcr.h2
-rw-r--r--src/mame/includes/midzeus.h2
-rw-r--r--src/mame/includes/mpu4.h4
-rw-r--r--src/mame/includes/mystston.h2
-rw-r--r--src/mame/includes/osi.h2
-rw-r--r--src/mame/includes/phoenix.h2
-rw-r--r--src/mame/includes/polyplay.h2
-rw-r--r--src/mame/includes/s11.h2
-rw-r--r--src/mame/includes/saturn.h5
-rw-r--r--src/mame/includes/spectrum.h4
-rw-r--r--src/mame/includes/starfire.h2
-rw-r--r--src/mame/includes/tx1.h6
-rw-r--r--src/mame/includes/victory.h4
-rw-r--r--src/mame/machine/abc1600mac.cpp2
-rw-r--r--src/mame/machine/acs8600_ics.cpp14
-rw-r--r--src/mame/machine/amiga.cpp6
-rw-r--r--src/mame/machine/amstrad.cpp8
-rw-r--r--src/mame/machine/apollo.cpp12
-rw-r--r--src/mame/machine/apricotkb.cpp2
-rw-r--r--src/mame/machine/at.cpp8
-rw-r--r--src/mame/machine/atarigen.h8
-rw-r--r--src/mame/machine/beta.cpp2
-rw-r--r--src/mame/machine/compiskb.cpp2
-rw-r--r--src/mame/machine/cuda.cpp2
-rw-r--r--src/mame/machine/dec_lk201.cpp2
-rw-r--r--src/mame/machine/decopincpu.cpp2
-rw-r--r--src/mame/machine/decopincpu.h2
-rw-r--r--src/mame/machine/dmv_keyb.cpp2
-rw-r--r--src/mame/machine/egret.cpp2
-rw-r--r--src/mame/machine/gamecom.cpp2
-rw-r--r--src/mame/machine/hec2hrp.cpp8
-rw-r--r--src/mame/machine/ibm6580_fdc.cpp2
-rw-r--r--src/mame/machine/ibm6580_kbd.cpp2
-rw-r--r--src/mame/machine/inder_vid.cpp6
-rw-r--r--src/mame/machine/interpro_ioga.cpp2
-rw-r--r--src/mame/machine/isbc_208.cpp2
-rw-r--r--src/mame/machine/isbc_215g.cpp2
-rw-r--r--src/mame/machine/iteagle_fpga.cpp2
-rw-r--r--src/mame/machine/kay_kbd.cpp2
-rw-r--r--src/mame/machine/km035.cpp2
-rw-r--r--src/mame/machine/m20_8086.cpp2
-rw-r--r--src/mame/machine/m24_kbd.cpp2
-rw-r--r--src/mame/machine/m24_z8000.cpp2
-rw-r--r--src/mame/machine/micro3d.cpp2
-rw-r--r--src/mame/machine/ms7004.cpp2
-rw-r--r--src/mame/machine/pc1512kb.cpp2
-rw-r--r--src/mame/machine/pcshare.cpp16
-rw-r--r--src/mame/machine/pgmprot_igs027a_type3.cpp2
-rw-r--r--src/mame/machine/saturn.cpp4
-rw-r--r--src/mame/machine/v1050kb.cpp2
-rw-r--r--src/mame/machine/victor9k_fdc.cpp10
-rw-r--r--src/mame/machine/victor9k_kb.cpp2
-rw-r--r--src/mame/machine/wangpckb.cpp2
-rw-r--r--src/mame/machine/x820kb.cpp2
-rw-r--r--src/mame/machine/zorbakbd.cpp2
-rw-r--r--src/mame/machine/zx8302.h1
-rw-r--r--src/mame/video/abc1600.cpp4
-rw-r--r--src/mame/video/abc80.cpp4
-rw-r--r--src/mame/video/abc800.cpp4
-rw-r--r--src/mame/video/abc802.cpp2
-rw-r--r--src/mame/video/abc806.cpp2
-rw-r--r--src/mame/video/agat7.cpp2
-rw-r--r--src/mame/video/bbc.cpp6
-rw-r--r--src/mame/video/bfm_adr2.cpp2
-rw-r--r--src/mame/video/cgc7900.cpp2
-rw-r--r--src/mame/video/decodmd1.cpp2
-rw-r--r--src/mame/video/decodmd2.cpp4
-rw-r--r--src/mame/video/decodmd3.cpp4
-rw-r--r--src/mame/video/dkong.cpp2
-rw-r--r--src/mame/video/jaguar.cpp2
-rw-r--r--src/mame/video/kyocera.cpp2
-rw-r--r--src/mame/video/lethalj.cpp2
-rw-r--r--src/mame/video/lockon.cpp2
-rw-r--r--src/mame/video/m92.cpp2
-rw-r--r--src/mame/video/midzeus.cpp2
-rw-r--r--src/mame/video/mikromik.cpp6
-rw-r--r--src/mame/video/mystston.cpp4
-rw-r--r--src/mame/video/pc1512.cpp8
-rw-r--r--src/mame/video/pc_t1t.cpp12
-rw-r--r--src/mame/video/pcd.cpp4
-rw-r--r--src/mame/video/tmc1800.cpp12
-rw-r--r--src/mame/video/v1050.cpp2
-rw-r--r--src/mame/video/victory.cpp2
-rw-r--r--src/zexall/zexall.cpp2
1781 files changed, 7448 insertions, 7253 deletions
diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp
index 30ddb40f5ac..ffb0b14f0f1 100644
--- a/src/devices/bus/a2bus/a2arcadebd.cpp
+++ b/src/devices/bus/a2bus/a2arcadebd.cpp
@@ -37,7 +37,7 @@ DEFINE_DEVICE_TYPE(A2BUS_ARCADEBOARD, a2bus_arcboard_device, "a2arcbd", "Third M
//-------------------------------------------------
MACHINE_CONFIG_START(a2bus_arcboard_device::device_add_mconfig)
- MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_arcboard_device, tms_irq_w))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h
index 1c8fb15b06f..9a2010b8a80 100644
--- a/src/devices/bus/a2bus/a2bus.h
+++ b/src/devices/bus/a2bus/a2bus.h
@@ -51,7 +51,7 @@
MCFG_DEVICE_INPUT_DEFAULTS(_def_inp) \
device_a2bus_card_interface::static_set_a2bus_tag(*device, _nbtag, _tag);
-// 7M = XTAL_14_31818MHz / 2 or XTAL_28_63636MHz / 4 (for IIgs)
+// 7M = XTAL(14'318'181) / 2 or XTAL(28'636'363) / 4 (for IIgs)
static constexpr uint32_t A2BUS_7M_CLOCK = 7159090;
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp
index a6454d41500..10ca6bf211f 100644
--- a/src/devices/bus/a2bus/a2ssc.cpp
+++ b/src/devices/bus/a2bus/a2ssc.cpp
@@ -98,7 +98,7 @@ ioport_constructor a2bus_ssc_device::device_input_ports() const
MACHINE_CONFIG_START(a2bus_ssc_device::device_add_mconfig)
MCFG_DEVICE_ADD(SSC_ACIA_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2bus_ssc_device, acia_irq_w))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(SSC_RS232_TAG, rs232_port_device, write_txd))
diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp
index 6776260e208..0b8b7c9d153 100644
--- a/src/devices/bus/a2bus/corvfdc01.cpp
+++ b/src/devices/bus/a2bus/corvfdc01.cpp
@@ -83,7 +83,7 @@ enum
//-------------------------------------------------
MACHINE_CONFIG_START(a2bus_corvfdc01_device::device_add_mconfig)
- MCFG_FD1793_ADD(FDC01_FDC_TAG, XTAL_16MHz / 8)
+ MCFG_FD1793_ADD(FDC01_FDC_TAG, XTAL(16'000'000) / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD(FDC01_FDC_TAG":0", corv_floppies, "8sssd", a2bus_corvfdc01_device::corv_floppy_formats)
diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp
index 812494bafc6..7114b6f4156 100644
--- a/src/devices/bus/a2bus/ezcgi.cpp
+++ b/src/devices/bus/a2bus/ezcgi.cpp
@@ -41,7 +41,7 @@ DEFINE_DEVICE_TYPE(A2BUS_EZCGI_9958, a2bus_ezcgi_9958_device, "a2ezcgi5", "E-Z C
//-------------------------------------------------
MACHINE_CONFIG_START(a2bus_ezcgi_device::device_add_mconfig)
- MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_ezcgi_device, tms_irq_w))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
@@ -49,7 +49,7 @@ MACHINE_CONFIG_START(a2bus_ezcgi_device::device_add_mconfig)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(a2bus_ezcgi_9938_device::device_add_mconfig)
- MCFG_V9938_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL_21_4772MHz) // 192K of VRAM / typical 9938 clock, not verified
+ MCFG_V9938_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL(21'477'272)) // 192K of VRAM / typical 9938 clock, not verified
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9938_device, tms_irq_w))
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
@@ -62,7 +62,7 @@ MACHINE_CONFIG_START(a2bus_ezcgi_9938_device::device_add_mconfig)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(a2bus_ezcgi_9958_device::device_add_mconfig)
- MCFG_V9958_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL_21_4772MHz) // 192K of VRAM / typcial 9938/9958 clock, not verified
+ MCFG_V9958_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL(21'477'272)) // 192K of VRAM / typcial 9938/9958 clock, not verified
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9958_device, tms_irq_w))
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
diff --git a/src/devices/bus/a2bus/ssprite.cpp b/src/devices/bus/a2bus/ssprite.cpp
index d3540134ad0..16d22760b04 100644
--- a/src/devices/bus/a2bus/ssprite.cpp
+++ b/src/devices/bus/a2bus/ssprite.cpp
@@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(A2BUS_SSPRITE, a2bus_ssprite_device, "a2ssprite", "Synetix Su
//-------------------------------------------------
MACHINE_CONFIG_START(a2bus_ssprite_device::device_add_mconfig)
- MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_ssprite_device, tms_irq_w))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp
index 5b53463e211..24d771dd596 100644
--- a/src/devices/bus/a7800/cpuwiz.cpp
+++ b/src/devices/bus/a7800/cpuwiz.cpp
@@ -123,6 +123,6 @@ WRITE8_MEMBER(a78_megacart_device::write_40xx)
MACHINE_CONFIG_START(a78_rom_p450_vb_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp
index a87ce5993ee..f6228971794 100644
--- a/src/devices/bus/a7800/rom.cpp
+++ b/src/devices/bus/a7800/rom.cpp
@@ -247,7 +247,7 @@ WRITE8_MEMBER(a78_rom_pokey_device::write_40xx)
MACHINE_CONFIG_START(a78_rom_pokey_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("pokey", POKEY, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("pokey", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00)
MACHINE_CONFIG_END
@@ -345,7 +345,7 @@ WRITE8_MEMBER(a78_rom_sg_pokey_device::write_40xx)
MACHINE_CONFIG_START(a78_rom_sg_pokey_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("pokey", POKEY, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("pokey", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00)
MACHINE_CONFIG_END
@@ -500,17 +500,17 @@ WRITE8_MEMBER(a78_rom_act_device::write_40xx)
MACHINE_CONFIG_START(a78_rom_p450_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("pokey_450")
- MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(a78_rom_p450_pokey_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("pokey", POKEY, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("pokey", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00)
- MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00)
MACHINE_CONFIG_END
@@ -518,13 +518,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a78_rom_p450_sg_ram_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("pokey_450")
- MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(a78_rom_p450_sg9_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("pokey_450")
- MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp
index c849d45085f..f7f7436b634 100644
--- a/src/devices/bus/a7800/xboard.cpp
+++ b/src/devices/bus/a7800/xboard.cpp
@@ -111,7 +111,7 @@ MACHINE_CONFIG_START(a78_xboard_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("xb_speaker")
- MCFG_SOUND_ADD("xb_pokey", POKEY, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("xb_pokey", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "xb_speaker", 1.00)
MACHINE_CONFIG_END
@@ -120,10 +120,10 @@ MACHINE_CONFIG_START(a78_xm_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("xb_speaker")
- MCFG_SOUND_ADD("xb_pokey", POKEY, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("xb_pokey", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "xb_speaker", 1.00)
- MCFG_SOUND_ADD("xm_ym2151", YM2151, XTAL_14_31818MHz/4)
+ MCFG_SOUND_ADD("xm_ym2151", YM2151, XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "xb_speaker", 1.00)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp
index 3f1a16b0be5..6d0d93f94b5 100644
--- a/src/devices/bus/abcbus/fd2.cpp
+++ b/src/devices/bus/abcbus/fd2.cpp
@@ -235,19 +235,19 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(abc_fd2_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000)/2)
MCFG_CPU_PROGRAM_MAP(abc_fd2_mem)
MCFG_CPU_IO_MAP(abc_fd2_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_4MHz/2)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(4'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(abc_fd2_device, pio_pa_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(abc_fd2_device, pio_pa_w))
MCFG_Z80PIO_IN_PB_CB(READ8(abc_fd2_device, pio_pb_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(abc_fd2_device, pio_pb_w))
- MCFG_FD1771_ADD(FD1771_TAG, XTAL_4MHz/4)
+ MCFG_FD1771_ADD(FD1771_TAG, XTAL(4'000'000)/4)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb7_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb5_w))
MCFG_WD_FDC_HLD_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb6_w))
diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp
index 3a57ab09179..bcf151e6ac9 100644
--- a/src/devices/bus/abcbus/lux10828.cpp
+++ b/src/devices/bus/abcbus/lux10828.cpp
@@ -318,19 +318,19 @@ WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_drq_w )
//-------------------------------------------------
MACHINE_CONFIG_START(luxor_55_10828_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000)/2)
MCFG_CPU_PROGRAM_MAP(luxor_55_10828_mem)
MCFG_CPU_IO_MAP(luxor_55_10828_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_4MHz/2)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(4'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(luxor_55_10828_device, pio_pa_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(luxor_55_10828_device, pio_pa_w))
MCFG_Z80PIO_IN_PB_CB(READ8(luxor_55_10828_device, pio_pb_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(luxor_55_10828_device, pio_pb_w))
- MCFG_MB8876_ADD(MB8876_TAG, XTAL_4MHz/4)
+ MCFG_MB8876_ADD(MB8876_TAG, XTAL(4'000'000)/4)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(luxor_55_10828_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(luxor_55_10828_device, fdc_drq_w))
diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp
index 50e33b7b884..cfda28d875b 100644
--- a/src/devices/bus/abcbus/lux21046.cpp
+++ b/src/devices/bus/abcbus/lux21046.cpp
@@ -288,12 +288,12 @@ static const z80_daisy_config z80_daisy_chain[] =
//-------------------------------------------------
MACHINE_CONFIG_START(luxor_55_21046_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
MCFG_Z80_DAISY_CHAIN(z80_daisy_chain)
MCFG_CPU_PROGRAM_MAP(luxor_55_21046_mem)
MCFG_CPU_IO_MAP(luxor_55_21046_io)
- MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(16'000'000)/4)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(WRITELINE(luxor_55_21046_device, dma_int_w))
MCFG_Z80DMA_IN_MREQ_CB(READ8(luxor_55_21046_device, memory_read_byte))
@@ -301,7 +301,7 @@ MACHINE_CONFIG_START(luxor_55_21046_device::device_add_mconfig)
MCFG_Z80DMA_IN_IORQ_CB(READ8(luxor_55_21046_device, io_read_byte))
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(luxor_55_21046_device, io_write_byte))
- MCFG_FD1793_ADD(SAB1793_TAG, XTAL_16MHz/16)
+ MCFG_FD1793_ADD(SAB1793_TAG, XTAL(16'000'000)/16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(luxor_55_21046_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
MACHINE_CONFIG_END
@@ -1051,11 +1051,11 @@ WRITE8_MEMBER( luxor_55_21046_device::_8a_w )
if (BIT(data, 2))
{
- m_fdc->set_unscaled_clock(XTAL_16MHz/16);
+ m_fdc->set_unscaled_clock(XTAL(16'000'000)/16);
}
else
{
- m_fdc->set_unscaled_clock(XTAL_16MHz/8);
+ m_fdc->set_unscaled_clock(XTAL(16'000'000)/8);
}
}
diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp
index 02b5b6ec38f..4b1b7f0e998 100644
--- a/src/devices/bus/abcbus/lux21056.cpp
+++ b/src/devices/bus/abcbus/lux21056.cpp
@@ -246,12 +246,12 @@ WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_msg )
//-------------------------------------------------
MACHINE_CONFIG_START(luxor_55_21056_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(luxor_55_21056_mem)
MCFG_CPU_IO_MAP(luxor_55_21056_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(8'000'000)/2)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80DMA_IN_MREQ_CB(READ8(luxor_55_21056_device, memory_read_byte))
diff --git a/src/devices/bus/abcbus/sio.cpp b/src/devices/bus/abcbus/sio.cpp
index 9cfb67300ac..1521e5b7459 100644
--- a/src/devices/bus/abcbus/sio.cpp
+++ b/src/devices/bus/abcbus/sio.cpp
@@ -77,7 +77,7 @@ const tiny_rom_entry *abc_sio_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(abc_sio_device::device_add_mconfig)
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_4_9152MHz)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(4'915'200))
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80DART, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp
index 02f4b9f6e16..6081d256406 100644
--- a/src/devices/bus/abckb/abc77.cpp
+++ b/src/devices/bus/abckb/abc77.cpp
@@ -129,7 +129,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(abc77_device::device_add_mconfig)
// keyboard cpu
- MCFG_CPU_ADD(I8035_TAG, I8035, XTAL_4_608MHz)
+ MCFG_CPU_ADD(I8035_TAG, I8035, XTAL(4'608'000))
MCFG_CPU_PROGRAM_MAP(abc77_map)
MCFG_CPU_IO_MAP(abc77_io)
MCFG_MCS48_PORT_P1_IN_CB(READ8(abc77_device, p1_r))
@@ -139,7 +139,7 @@ MACHINE_CONFIG_START(abc77_device::device_add_mconfig)
// watchdog
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(XTAL_4_608MHz/3/5/4096))
+ MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(XTAL(4'608'000)/3/5/4096))
// discrete sound
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp
index f5597eb625f..50c26c98942 100644
--- a/src/devices/bus/abckb/abc800kb.cpp
+++ b/src/devices/bus/abckb/abc800kb.cpp
@@ -113,7 +113,7 @@ const tiny_rom_entry *abc800_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(abc800_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5_9904MHz)
+ MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(5'990'400))
MCFG_MCS48_PORT_P1_IN_CB(READ8(abc800_keyboard_device, kb_p1_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(abc800_keyboard_device, kb_p1_w))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(abc800_keyboard_device, kb_p2_w))
@@ -337,7 +337,7 @@ void abc800_keyboard_device::device_start()
{
// allocate timers
m_serial_timer = timer_alloc();
- m_serial_timer->adjust(attotime::from_hz(XTAL_5_9904MHz/(3*5)/20), 0, attotime::from_hz(XTAL_5_9904MHz/(3*5)/20)); // ???
+ m_serial_timer->adjust(attotime::from_hz(XTAL(5'990'400)/(3*5)/20), 0, attotime::from_hz(XTAL(5'990'400)/(3*5)/20)); // ???
// state saving
save_item(NAME(m_row));
diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp
index 6e918ab3909..9730c9f0a58 100644
--- a/src/devices/bus/abckb/abc99.cpp
+++ b/src/devices/bus/abckb/abc99.cpp
@@ -151,7 +151,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(abc99_device::device_add_mconfig)
// keyboard CPU
- MCFG_CPU_ADD(I8035_Z2_TAG, I8035, XTAL_6MHz/3) // from Z5 T0 output
+ MCFG_CPU_ADD(I8035_Z2_TAG, I8035, XTAL(6'000'000)/3) // from Z5 T0 output
MCFG_CPU_PROGRAM_MAP(abc99_z2_mem)
MCFG_CPU_IO_MAP(abc99_z2_io)
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(abc99_device, z2_p1_w))
@@ -160,7 +160,7 @@ MACHINE_CONFIG_START(abc99_device::device_add_mconfig)
MCFG_MCS48_PORT_T1_IN_CB(READLINE(abc99_device, z2_t1_r))
// mouse CPU
- MCFG_CPU_ADD(I8035_Z5_TAG, I8035, XTAL_6MHz)
+ MCFG_CPU_ADD(I8035_Z5_TAG, I8035, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(abc99_z5_mem)
//MCFG_MCS48_PORT_P1_IN_CB(READ8(abc99_device, z5_p1_r))
//MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(abc99_device, z5_p2_w))
@@ -497,7 +497,7 @@ void abc99_device::device_start()
{
// allocate timers
m_serial_timer = timer_alloc(TIMER_SERIAL);
- m_serial_timer->adjust(MCS48_ALE_CLOCK(XTAL_6MHz/3), 0, MCS48_ALE_CLOCK(XTAL_6MHz/3));
+ m_serial_timer->adjust(MCS48_ALE_CLOCK(XTAL(6'000'000)/3), 0, MCS48_ALE_CLOCK(XTAL(6'000'000)/3));
m_mouse_timer = timer_alloc(TIMER_MOUSE);
diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp
index 10235caa0df..469b0c72707 100644
--- a/src/devices/bus/adamnet/ddp.cpp
+++ b/src/devices/bus/adamnet/ddp.cpp
@@ -82,7 +82,7 @@ static const struct CassetteOptions adam_cassette_options =
//-------------------------------------------------
MACHINE_CONFIG_START(adam_digital_data_pack_device::device_add_mconfig)
- MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz)
+ MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(adam_ddp_mem)
MCFG_CPU_IO_MAP(adam_ddp_io)
diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp
index 7e04986df16..7074309db84 100644
--- a/src/devices/bus/adamnet/fdc.cpp
+++ b/src/devices/bus/adamnet/fdc.cpp
@@ -125,11 +125,11 @@ SLOT_INTERFACE_END
//-------------------------------------------------
MACHINE_CONFIG_START(adam_fdc_device::device_add_mconfig)
- MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz)
+ MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(adam_fdc_mem)
MCFG_CPU_IO_MAP(adam_fdc_io)
- MCFG_WD2793_ADD(WD2793_TAG, XTAL_4MHz/4)
+ MCFG_WD2793_ADD(WD2793_TAG, XTAL(4'000'000)/4)
MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(M6801_TAG, INPUT_LINE_NMI))
MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", adam_fdc_floppies, "525ssdd", adam_fdc_device::floppy_formats)
diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp
index 731f75fe571..f32bd5acfdf 100644
--- a/src/devices/bus/adamnet/kb.cpp
+++ b/src/devices/bus/adamnet/kb.cpp
@@ -74,7 +74,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(adam_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz)
+ MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(adam_kb_mem)
MCFG_CPU_IO_MAP(adam_kb_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/adamnet/printer.cpp b/src/devices/bus/adamnet/printer.cpp
index 6edd3e6da82..1a4ee40aacc 100644
--- a/src/devices/bus/adamnet/printer.cpp
+++ b/src/devices/bus/adamnet/printer.cpp
@@ -74,7 +74,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(adam_printer_device::device_add_mconfig)
- MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz)
+ MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(adam_prn_mem)
MCFG_CPU_IO_MAP(adam_prn_io)
MCFG_DEVICE_DISABLE() // TODO
diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp
index 99889b79a99..f789b0e00af 100644
--- a/src/devices/bus/adamnet/spi.cpp
+++ b/src/devices/bus/adamnet/spi.cpp
@@ -74,12 +74,12 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(adam_spi_device::device_add_mconfig)
- MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz)
+ MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(adam_spi_mem)
MCFG_CPU_IO_MAP(adam_spi_io)
MCFG_DEVICE_DISABLE()
- MCFG_DEVICE_ADD(MC2661_TAG, MC2661, XTAL_4_9152MHz)
+ MCFG_DEVICE_ADD(MC2661_TAG, MC2661, XTAL(4'915'200))
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
diff --git a/src/devices/bus/amiga/keyboard/a1200.cpp b/src/devices/bus/amiga/keyboard/a1200.cpp
index a0ba5339de8..b3490a34075 100644
--- a/src/devices/bus/amiga/keyboard/a1200.cpp
+++ b/src/devices/bus/amiga/keyboard/a1200.cpp
@@ -127,7 +127,7 @@ WRITE_LINE_MEMBER(a1200_kbd_device::mpu_tcmp)
}
MACHINE_CONFIG_START(a1200_kbd_device::device_add_mconfig)
- MCFG_CPU_ADD("mpu", M68HC705C8A, XTAL_3MHz)
+ MCFG_CPU_ADD("mpu", M68HC705C8A, XTAL(3'000'000))
MCFG_M68HC05_PORTB_R_CB(READ8(a1200_kbd_device, mpu_portb_r));
MCFG_M68HC05_PORTD_R_CB(IOPORT("MOD"));
MCFG_M68HC05_PORTA_W_CB(WRITE8(a1200_kbd_device, mpu_porta_w));
diff --git a/src/devices/bus/amiga/keyboard/a500.cpp b/src/devices/bus/amiga/keyboard/a500.cpp
index b8817124343..8080d9c3a0c 100644
--- a/src/devices/bus/amiga/keyboard/a500.cpp
+++ b/src/devices/bus/amiga/keyboard/a500.cpp
@@ -137,7 +137,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(a500_kbd_device::device_add_mconfig)
- MCFG_CPU_ADD("ic1", M6502, XTAL_3MHz / 2)
+ MCFG_CPU_ADD("ic1", M6502, XTAL(3'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(mpu6500_map)
MACHINE_CONFIG_END
@@ -279,7 +279,7 @@ void a500_kbd_device::device_reset()
m_counter = 0xffff; // not initialized by hardware
m_control = 0x00;
- m_timer->adjust(attotime::zero, 0, attotime::from_hz(XTAL_3MHz / 2));
+ m_timer->adjust(attotime::zero, 0, attotime::from_hz(XTAL(3'000'000) / 2));
m_watchdog->adjust(attotime::from_msec(54));
}
diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp
index 8e5e260b3ad..536ecb7b8ef 100644
--- a/src/devices/bus/amiga/zorro/a2232.cpp
+++ b/src/devices/bus/amiga/zorro/a2232.cpp
@@ -47,47 +47,47 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(a2232_device::device_add_mconfig)
// main cpu
- MCFG_CPU_ADD("iocpu", M65CE02, XTAL_28_37516MHz / 8) // should run at Amiga clock 7M / 2
+ MCFG_CPU_ADD("iocpu", M65CE02, XTAL(28'375'160) / 8) // should run at Amiga clock 7M / 2
MCFG_CPU_PROGRAM_MAP(iocpu_map)
// acia
- MCFG_DEVICE_ADD("acia_0", MOS6551, XTAL_28_37516MHz / 8)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("acia_0", MOS6551, XTAL(28'375'160) / 8)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_1", rs232_port_device, write_txd))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_0_irq_w))
- MCFG_DEVICE_ADD("acia_1", MOS6551, XTAL_28_37516MHz / 8)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("acia_1", MOS6551, XTAL(28'375'160) / 8)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_2", rs232_port_device, write_txd))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_1_irq_w))
- MCFG_DEVICE_ADD("acia_2", MOS6551, XTAL_28_37516MHz / 8)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("acia_2", MOS6551, XTAL(28'375'160) / 8)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_3", rs232_port_device, write_txd))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_2_irq_w))
- MCFG_DEVICE_ADD("acia_3", MOS6551, XTAL_28_37516MHz / 8)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("acia_3", MOS6551, XTAL(28'375'160) / 8)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_4", rs232_port_device, write_txd))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_3_irq_w))
- MCFG_DEVICE_ADD("acia_4", MOS6551, XTAL_28_37516MHz / 8)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("acia_4", MOS6551, XTAL(28'375'160) / 8)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_5", rs232_port_device, write_txd))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_4_irq_w))
- MCFG_DEVICE_ADD("acia_5", MOS6551, XTAL_28_37516MHz / 8)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("acia_5", MOS6551, XTAL(28'375'160) / 8)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_6", rs232_port_device, write_txd))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_5_irq_w))
- MCFG_DEVICE_ADD("acia_6", MOS6551, XTAL_28_37516MHz / 8)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("acia_6", MOS6551, XTAL(28'375'160) / 8)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_7", rs232_port_device, write_txd))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_6_irq_w))
// cia
- MCFG_DEVICE_ADD("cia", MOS8520, XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("cia", MOS8520, XTAL(1'843'200))
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(a2232_device, cia_irq_w))
MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(a2232_device, cia_port_a_r))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(a2232_device, cia_port_b_r))
diff --git a/src/devices/bus/apricot/keyboard/hle.cpp b/src/devices/bus/apricot/keyboard/hle.cpp
index 9663e2505e3..1388047a062 100644
--- a/src/devices/bus/apricot/keyboard/hle.cpp
+++ b/src/devices/bus/apricot/keyboard/hle.cpp
@@ -196,7 +196,7 @@ ioport_constructor apricot_keyboard_hle_device::device_input_ports() const
}
MACHINE_CONFIG_START(apricot_keyboard_hle_device::device_add_mconfig)
- MCFG_MSM5832_ADD("rtc", XTAL_32_768kHz)
+ MCFG_MSM5832_ADD("rtc", XTAL(32'768))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/bbc/1mhzbus/beebsid.cpp b/src/devices/bus/bbc/1mhzbus/beebsid.cpp
index d10db3133a6..21dc23da7d4 100644
--- a/src/devices/bus/bbc/1mhzbus/beebsid.cpp
+++ b/src/devices/bus/bbc/1mhzbus/beebsid.cpp
@@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(BBC_BEEBSID, bbc_beebsid_device, "beebsid", "BeebSID")
MACHINE_CONFIG_START(bbc_beebsid_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL_16MHz / 16)
+ MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL(16'000'000) / 16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_BBC_PASSTHRU_1MHZBUS_SLOT_ADD()
diff --git a/src/devices/bus/bbc/1mhzbus/opus3.cpp b/src/devices/bus/bbc/1mhzbus/opus3.cpp
index d505b59db49..6aedae49556 100644
--- a/src/devices/bus/bbc/1mhzbus/opus3.cpp
+++ b/src/devices/bus/bbc/1mhzbus/opus3.cpp
@@ -82,7 +82,7 @@ ROM_END
MACHINE_CONFIG_START(bbc_opus3_device::device_add_mconfig)
/* fdc */
- MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2)
+ MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opus3_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("wd1770:0", bbc_floppies, "525qd", floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
diff --git a/src/devices/bus/bbc/fdc/acorn.cpp b/src/devices/bus/bbc/fdc/acorn.cpp
index 4398d8db7dc..1d0be677968 100644
--- a/src/devices/bus/bbc/fdc/acorn.cpp
+++ b/src/devices/bus/bbc/fdc/acorn.cpp
@@ -132,7 +132,7 @@ MACHINE_CONFIG_START(bbc_acorn8271_device::device_add_mconfig)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_acorn1770_device::device_add_mconfig)
- MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2)
+ MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_acorn1770_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_acorn1770_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("wd1770:0", bbc_floppies_525, "525qd", bbc_acorn8271_device::floppy_formats)
diff --git a/src/devices/bus/bbc/fdc/cumana.cpp b/src/devices/bus/bbc/fdc/cumana.cpp
index c15d196d7be..bfe97abd240 100644
--- a/src/devices/bus/bbc/fdc/cumana.cpp
+++ b/src/devices/bus/bbc/fdc/cumana.cpp
@@ -59,7 +59,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_cumana1_device::device_add_mconfig)
- MCFG_MB8877_ADD("mb8877a", XTAL_16MHz / 16)
+ MCFG_MB8877_ADD("mb8877a", XTAL(16'000'000) / 16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_drq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_cumanafdc_device, motor_w))
@@ -70,7 +70,7 @@ MACHINE_CONFIG_START(bbc_cumana1_device::device_add_mconfig)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_cumana2_device::device_add_mconfig)
- MCFG_MB8877_ADD("mb8877a", XTAL_16MHz / 16)
+ MCFG_MB8877_ADD("mb8877a", XTAL(16'000'000) / 16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_drq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_cumanafdc_device, motor_w))
diff --git a/src/devices/bus/bbc/fdc/cv1797.cpp b/src/devices/bus/bbc/fdc/cv1797.cpp
index a623cff1cef..a8c3f683cb1 100644
--- a/src/devices/bus/bbc/fdc/cv1797.cpp
+++ b/src/devices/bus/bbc/fdc/cv1797.cpp
@@ -52,7 +52,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_cv1797_device::device_add_mconfig)
- MCFG_FD1797_ADD("fd1797", XTAL_8MHz / 8)
+ MCFG_FD1797_ADD("fd1797", XTAL(8'000'000) / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_cv1797_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_cv1797_device, fdc_drq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_cv1797_device, motor_w))
diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp
index b8288fe87c4..246b3ad203f 100644
--- a/src/devices/bus/bbc/fdc/opus.cpp
+++ b/src/devices/bus/bbc/fdc/opus.cpp
@@ -98,7 +98,7 @@ MACHINE_CONFIG_START(bbc_opus8272_device::device_add_mconfig)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_opus2791_device::device_add_mconfig)
- MCFG_WD2791_ADD("fdc", XTAL_16MHz / 16)
+ MCFG_WD2791_ADD("fdc", XTAL(16'000'000) / 16)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_opusfdc_device, motor_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats)
@@ -108,7 +108,7 @@ MACHINE_CONFIG_START(bbc_opus2791_device::device_add_mconfig)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_opus2793_device::device_add_mconfig)
- MCFG_WD2793_ADD("fdc", XTAL_16MHz / 16)
+ MCFG_WD2793_ADD("fdc", XTAL(16'000'000) / 16)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_opusfdc_device, motor_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats)
@@ -118,7 +118,7 @@ MACHINE_CONFIG_START(bbc_opus2793_device::device_add_mconfig)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_opus1770_device::device_add_mconfig)
- MCFG_WD1770_ADD("fdc", XTAL_16MHz / 2)
+ MCFG_WD1770_ADD("fdc", XTAL(16'000'000) / 2)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
diff --git a/src/devices/bus/bbc/fdc/watford.cpp b/src/devices/bus/bbc/fdc/watford.cpp
index 031a9a03255..fcc465c84f6 100644
--- a/src/devices/bus/bbc/fdc/watford.cpp
+++ b/src/devices/bus/bbc/fdc/watford.cpp
@@ -65,7 +65,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_weddb2_device::device_add_mconfig)
- MCFG_WD1772_ADD("wd1772", XTAL_16MHz / 2)
+ MCFG_WD1772_ADD("wd1772", XTAL(16'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_weddb2_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_weddb2_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("wd1772:0", bbc_floppies_525, "525qd", floppy_formats)
@@ -75,7 +75,7 @@ MACHINE_CONFIG_START(bbc_weddb2_device::device_add_mconfig)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_weddb3_device::device_add_mconfig)
- MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2)
+ MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_weddb3_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_weddb3_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("wd1770:0", bbc_floppies_525, "525qd", floppy_formats)
diff --git a/src/devices/bus/bbc/tube/tube_6502.cpp b/src/devices/bus/bbc/tube/tube_6502.cpp
index f70a5093200..10da176316f 100644
--- a/src/devices/bus/bbc/tube/tube_6502.cpp
+++ b/src/devices/bus/bbc/tube/tube_6502.cpp
@@ -43,7 +43,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_6502_device::device_add_mconfig)
- MCFG_CPU_ADD("m6502", M65C02, XTAL_12MHz / 4)
+ MCFG_CPU_ADD("m6502", M65C02, XTAL(12'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(tube_6502_mem)
MCFG_TUBE_ADD("ula")
diff --git a/src/devices/bus/bbc/tube/tube_65c102.cpp b/src/devices/bus/bbc/tube/tube_65c102.cpp
index 35f979cf361..6f15b5866cf 100644
--- a/src/devices/bus/bbc/tube/tube_65c102.cpp
+++ b/src/devices/bus/bbc/tube/tube_65c102.cpp
@@ -43,7 +43,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_65c102_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", M65C02, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", M65C02, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(tube_6502_mem)
MCFG_TUBE_ADD("ula")
diff --git a/src/devices/bus/bbc/tube/tube_80186.cpp b/src/devices/bus/bbc/tube/tube_80186.cpp
index d64eaa47213..9e04a20cf6a 100644
--- a/src/devices/bus/bbc/tube/tube_80186.cpp
+++ b/src/devices/bus/bbc/tube/tube_80186.cpp
@@ -52,7 +52,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_80186_device::device_add_mconfig)
- MCFG_CPU_ADD("i80186", I80186, XTAL_20MHz / 2)
+ MCFG_CPU_ADD("i80186", I80186, XTAL(20'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(tube_80186_mem)
MCFG_CPU_IO_MAP(tube_80186_io)
//MCFG_80186_CHIP_SELECT_CB(WRITE16(bbc_tube_80186_device, chip_select_cb))
diff --git a/src/devices/bus/bbc/tube/tube_80286.cpp b/src/devices/bus/bbc/tube/tube_80286.cpp
index 7701b2e0ce2..d8f9e027dc9 100644
--- a/src/devices/bus/bbc/tube/tube_80286.cpp
+++ b/src/devices/bus/bbc/tube/tube_80286.cpp
@@ -56,7 +56,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_80286_device::device_add_mconfig)
- MCFG_CPU_ADD("i80286", I80286, XTAL_12MHz / 2)
+ MCFG_CPU_ADD("i80286", I80286, XTAL(12'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(tube_80286_mem)
MCFG_CPU_IO_MAP(tube_80286_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, bbc_tube_80286_device, irq_callback)
diff --git a/src/devices/bus/bbc/tube/tube_arm.cpp b/src/devices/bus/bbc/tube/tube_arm.cpp
index d23131674cb..e6c91cc8675 100644
--- a/src/devices/bus/bbc/tube/tube_arm.cpp
+++ b/src/devices/bus/bbc/tube/tube_arm.cpp
@@ -50,7 +50,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_arm_device::device_add_mconfig)
- MCFG_CPU_ADD("arm", ARM, XTAL_20MHz / 3)
+ MCFG_CPU_ADD("arm", ARM, XTAL(20'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(tube_arm_mem)
MCFG_TUBE_ADD("ula")
diff --git a/src/devices/bus/bbc/tube/tube_casper.cpp b/src/devices/bus/bbc/tube/tube_casper.cpp
index af49f67c5f9..7dc88d50339 100644
--- a/src/devices/bus/bbc/tube/tube_casper.cpp
+++ b/src/devices/bus/bbc/tube/tube_casper.cpp
@@ -48,16 +48,16 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_casper_device::device_add_mconfig)
- MCFG_CPU_ADD("m68000", M68000, XTAL_4MHz)
+ MCFG_CPU_ADD("m68000", M68000, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(tube_casper_mem)
- MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL_4MHz / 2)
+ MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL(4'000'000) / 2)
MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8("via6522_1", via6522_device, write_pa))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_cb1))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_ca1))
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, bbc_tube_slot_device, irq_w))
- MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL_4MHz / 2)
+ MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL(4'000'000) / 2)
MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8("via6522_0", via6522_device, write_pa))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE("via6522_0", via6522_device, write_ca1))
diff --git a/src/devices/bus/bbc/tube/tube_z80.cpp b/src/devices/bus/bbc/tube/tube_z80.cpp
index 668220320e4..3c79a8002aa 100644
--- a/src/devices/bus/bbc/tube/tube_z80.cpp
+++ b/src/devices/bus/bbc/tube/tube_z80.cpp
@@ -59,7 +59,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_z80_device::device_add_mconfig)
- MCFG_CPU_ADD("z80", Z80, XTAL_12MHz / 2)
+ MCFG_CPU_ADD("z80", Z80, XTAL(12'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(tube_z80_mem)
MCFG_CPU_DECRYPTED_OPCODES_MAP(tube_z80_fetch)
MCFG_CPU_IO_MAP(tube_z80_io)
diff --git a/src/devices/bus/bbc/tube/tube_zep100.cpp b/src/devices/bus/bbc/tube/tube_zep100.cpp
index 2f9525aa4a0..76d0f5677f0 100644
--- a/src/devices/bus/bbc/tube/tube_zep100.cpp
+++ b/src/devices/bus/bbc/tube/tube_zep100.cpp
@@ -56,11 +56,11 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_zep100_device::device_add_mconfig)
- MCFG_CPU_ADD("z80", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("z80", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(tube_zep100_mem)
MCFG_CPU_IO_MAP(tube_zep100_io)
- MCFG_DEVICE_ADD("via", VIA6522, XTAL_4MHz / 2)
+ MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 2)
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(bbc_tube_zep100_device, via_pb_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE("ppi", i8255_device, pc2_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("ppi", i8255_device, pc6_w))
diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp
index 698fa6dd6a1..dd27a9c53ec 100644
--- a/src/devices/bus/bml3/bml3mp1802.cpp
+++ b/src/devices/bus/bml3/bml3mp1802.cpp
@@ -52,7 +52,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bml3bus_mp1802_device::device_add_mconfig)
- MCFG_MB8866_ADD("fdc", XTAL_1MHz)
+ MCFG_MB8866_ADD("fdc", XTAL(1'000'000))
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bml3bus_mp1802_device, bml3_wd17xx_intrq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", mp1802_floppies, "dd", floppy_image_device::default_floppy_formats)
diff --git a/src/devices/bus/c64/fcc.cpp b/src/devices/bus/c64/fcc.cpp
index 3dfda72f137..48f7595eed3 100644
--- a/src/devices/bus/c64/fcc.cpp
+++ b/src/devices/bus/c64/fcc.cpp
@@ -75,7 +75,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(c64_final_chesscard_device::device_add_mconfig)
- MCFG_CPU_ADD(G65SC02P4_TAG, M65SC02, XTAL_5MHz)
+ MCFG_CPU_ADD(G65SC02P4_TAG, M65SC02, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(c64_fcc_map)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp
index 22291412210..16d50a12870 100644
--- a/src/devices/bus/c64/ide64.cpp
+++ b/src/devices/bus/c64/ide64.cpp
@@ -48,7 +48,7 @@ DEFINE_DEVICE_TYPE(C64_IDE64, c64_ide64_cartridge_device, "c64_ide64", "C64 IDE6
MACHINE_CONFIG_START(c64_ide64_cartridge_device::device_add_mconfig)
MCFG_ATMEL_29C010_ADD(AT29C010A_TAG)
- MCFG_DS1302_ADD(DS1302_TAG, XTAL_32_768kHz)
+ MCFG_DS1302_ADD(DS1302_TAG, XTAL(32'768))
MCFG_ATA_INTERFACE_ADD(ATA_TAG, ata_devices, "hdd", nullptr, false)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp
index cd507231fc1..8f7b866b303 100644
--- a/src/devices/bus/c64/magic_voice.cpp
+++ b/src/devices/bus/c64/magic_voice.cpp
@@ -233,7 +233,7 @@ MACHINE_CONFIG_START(c64_magic_voice_cartridge_device::device_add_mconfig)
MCFG_40105_DATA_IN_READY_CB(DEVWRITELINE(MOS6525_TAG, tpi6525_device, i3_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(T6721A_TAG, T6721A, XTAL_640kHz)
+ MCFG_SOUND_ADD(T6721A_TAG, T6721A, XTAL(640'000))
MCFG_T6721A_EOS_HANDLER(DEVWRITELINE(MOS6525_TAG, tpi6525_device, i2_w))
MCFG_T6721A_PHI2_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_magic_voice_cartridge_device, phi2_w))
MCFG_T6721A_DTRD_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_magic_voice_cartridge_device, dtrd_w))
diff --git a/src/devices/bus/c64/multiscreen.cpp b/src/devices/bus/c64/multiscreen.cpp
index 0e2687b4f9d..17dcded3409 100644
--- a/src/devices/bus/c64/multiscreen.cpp
+++ b/src/devices/bus/c64/multiscreen.cpp
@@ -112,7 +112,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(c64_multiscreen_cartridge_device::device_add_mconfig)
- MCFG_CPU_ADD(MC6802P_TAG, M6802, XTAL_4MHz)
+ MCFG_CPU_ADD(MC6802P_TAG, M6802, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(multiscreen_mem)
MCFG_DEVICE_ADD(MC6821P_0_TAG, PIA6821, 0)
diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp
index a284abfd0fc..2df60f4ef17 100644
--- a/src/devices/bus/c64/sfx_sound_expander.cpp
+++ b/src/devices/bus/c64/sfx_sound_expander.cpp
@@ -43,7 +43,7 @@ WRITE_LINE_MEMBER( c64_sfx_sound_expander_cartridge_device::opl_irq_w )
MACHINE_CONFIG_START(c64_sfx_sound_expander_cartridge_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(YM3526_TAG, YM3526, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD(YM3526_TAG, YM3526, XTAL(3'579'545))
MCFG_YM3526_IRQ_HANDLER(WRITELINE(c64_sfx_sound_expander_cartridge_device, opl_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
diff --git a/src/devices/bus/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp
index 2dd8d26147f..7fffd60dac2 100644
--- a/src/devices/bus/c64/swiftlink.cpp
+++ b/src/devices/bus/c64/swiftlink.cpp
@@ -40,7 +40,7 @@ DEFINE_DEVICE_TYPE(C64_SWIFTLINK, c64_swiftlink_cartridge_device, "c64_swiftlink
MACHINE_CONFIG_START(c64_swiftlink_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_3_6864MHz)
+ MCFG_MOS6551_XTAL(XTAL(3'686'400))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_swiftlink_cartridge_device, acia_irq_w))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
diff --git a/src/devices/bus/c64/tdos.cpp b/src/devices/bus/c64/tdos.cpp
index d42666401f8..679905cf25d 100644
--- a/src/devices/bus/c64/tdos.cpp
+++ b/src/devices/bus/c64/tdos.cpp
@@ -154,7 +154,7 @@ DEFINE_DEVICE_TYPE(C64_TDOS, c64_tdos_cartridge_device, "c64_tdos", "C64 TDOS ca
//-------------------------------------------------
MACHINE_CONFIG_START(c64_tdos_cartridge_device::device_add_mconfig)
- MCFG_DEVICE_ADD(MC68A52P_TAG, MC6852, XTAL_6_5MHz)
+ MCFG_DEVICE_ADD(MC68A52P_TAG, MC6852, XTAL(6'500'000))
MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD()
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp
index e268511349d..653a79a7627 100644
--- a/src/devices/bus/c64/turbo232.cpp
+++ b/src/devices/bus/c64/turbo232.cpp
@@ -39,7 +39,7 @@ DEFINE_DEVICE_TYPE(C64_TURBO232, c64_turbo232_cartridge_device, "c64_turbo232",
MACHINE_CONFIG_START(c64_turbo232_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_3_6864MHz)
+ MCFG_MOS6551_XTAL(XTAL(3'686'400))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_turbo232_cartridge_device, acia_irq_w))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
@@ -183,9 +183,9 @@ void c64_turbo232_cartridge_device::c64_cd_w(address_space &space, offs_t offset
switch (m_es & ES_S_MASK)
{
- case ES_S_230400: m_acia->set_xtal(XTAL_3_6864MHz); break;
- case ES_S_115200: m_acia->set_xtal(XTAL_3_6864MHz/2); break;
- case ES_S_57600: m_acia->set_xtal(XTAL_3_6864MHz/4); break;
+ case ES_S_230400: m_acia->set_xtal(XTAL(3'686'400)); break;
+ case ES_S_115200: m_acia->set_xtal(XTAL(3'686'400)/2); break;
+ case ES_S_57600: m_acia->set_xtal(XTAL(3'686'400)/4); break;
case ES_S_UNDEFINED: m_acia->set_xtal(0); break;
}
}
diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp
index 8474fee85a5..3c6d3d099dd 100644
--- a/src/devices/bus/c64/xl80.cpp
+++ b/src/devices/bus/c64/xl80.cpp
@@ -133,7 +133,7 @@ MACHINE_CONFIG_START(c64_xl80_device::device_add_mconfig)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", c64_xl80)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD(HD46505SP_TAG, H46505, MC6845_SCREEN_TAG, XTAL_14_31818MHz / 8)
+ MCFG_MC6845_ADD(HD46505SP_TAG, H46505, MC6845_SCREEN_TAG, XTAL(14'318'181) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(c64_xl80_device, crtc_update_row)
diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp
index 53d14803fe9..49c4279d508 100644
--- a/src/devices/bus/cbmiec/c1526.cpp
+++ b/src/devices/bus/cbmiec/c1526.cpp
@@ -88,7 +88,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(c1526_device::device_add_mconfig)
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_4MHz/4)
+ MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(4'000'000)/4)
MCFG_CPU_PROGRAM_MAP(c1526_mem)
MACHINE_CONFIG_END
@@ -98,7 +98,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
MACHINE_CONFIG_START(c4023_device::device_add_mconfig)
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_4MHz/4)
+ MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(4'000'000)/4)
MCFG_CPU_PROGRAM_MAP(c1526_mem)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp
index 2c11785c946..84d4c6e2e38 100644
--- a/src/devices/bus/cbmiec/c1541.cpp
+++ b/src/devices/bus/cbmiec/c1541.cpp
@@ -812,11 +812,11 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pb_w )
//-------------------------------------------------
MACHINE_CONFIG_START(c1541_device_base::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(c1541_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
- MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c1541_device_base, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1541_device_base, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1541_device_base, via0_pa_w))
@@ -824,7 +824,7 @@ MACHINE_CONFIG_START(c1541_device_base::device_add_mconfig)
MCFG_VIA6522_CB2_HANDLER(WRITELINE(c1541_device_base, via0_ca2_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1541_device_base, via0_irq_w))
- MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1541_device_base, via1_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
@@ -833,7 +833,7 @@ MACHINE_CONFIG_START(c1541_device_base::device_add_mconfig)
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1541_device_base, via1_irq_w))
- MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
+ MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
MCFG_64H156_ATN_CALLBACK(WRITELINE(c1541_device_base, atn_w))
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1541_device_base, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1540_floppies, "525ssqd", c1541_device_base::floppy_formats)
diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp
index 8d85be61809..58f5b2e6d46 100644
--- a/src/devices/bus/cbmiec/c1571.cpp
+++ b/src/devices/bus/cbmiec/c1571.cpp
@@ -233,7 +233,7 @@ WRITE8_MEMBER( c1571_device::via0_pa_w )
if (m_1_2mhz != clock_1_2)
{
- uint32_t clock = clock_1_2 ? XTAL_16MHz/8 : XTAL_16MHz/16;
+ const XTAL clock = clock_1_2 ? XTAL(16'000'000)/8 : XTAL(16'000'000)/16;
m_maincpu->set_unscaled_clock(clock);
m_cia->set_unscaled_clock(clock);
@@ -275,7 +275,7 @@ WRITE8_MEMBER( c1571cr_device::via0_pa_w )
if (m_1_2mhz != clock_1_2)
{
- uint32_t clock = clock_1_2 ? XTAL_16MHz/8 : XTAL_16MHz/16;
+ const XTAL clock = clock_1_2 ? XTAL(16'000'000)/8 : XTAL(16'000'000)/16;
m_maincpu->set_unscaled_clock(clock);
m_cia->set_unscaled_clock(clock);
@@ -601,18 +601,18 @@ SLOT_INTERFACE_END
//-------------------------------------------------
MACHINE_CONFIG_START(c1570_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(c1571_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
- MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
- MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
@@ -621,7 +621,7 @@ MACHINE_CONFIG_START(c1570_device::device_add_mconfig)
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w))
- MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w))
MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w))
@@ -629,26 +629,26 @@ MACHINE_CONFIG_START(c1570_device::device_add_mconfig)
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w))
MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w))
- MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2)
- MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
+ MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2)
+ MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(c1571_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(c1571_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
- MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
- MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
@@ -657,7 +657,7 @@ MACHINE_CONFIG_START(c1571_device::device_add_mconfig)
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w))
- MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w))
MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w))
@@ -665,26 +665,26 @@ MACHINE_CONFIG_START(c1571_device::device_add_mconfig)
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w))
MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w))
- MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2)
- MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
+ MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2)
+ MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(c1571cr_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(c1571_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
- MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571cr_device, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571cr_device, via0_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
- MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
@@ -693,28 +693,28 @@ MACHINE_CONFIG_START(c1571cr_device::device_add_mconfig)
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w))
- //MCFG_MOS5710_ADD(M5710_TAG, XTAL_16MHz/16, 0)
+ //MCFG_MOS5710_ADD(M5710_TAG, XTAL(16'000'000)/16, 0)
- MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2)
- MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
+ MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2)
+ MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mini_chief_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(mini_chief_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
- MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
- MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
@@ -723,7 +723,7 @@ MACHINE_CONFIG_START(mini_chief_device::device_add_mconfig)
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w))
- MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w))
MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w))
@@ -731,8 +731,8 @@ MACHINE_CONFIG_START(mini_chief_device::device_add_mconfig)
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w))
MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w))
- MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2)
- MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
+ MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2)
+ MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp
index 52e22cfe725..ed1d0ebfe26 100644
--- a/src/devices/bus/cbmiec/c1581.cpp
+++ b/src/devices/bus/cbmiec/c1581.cpp
@@ -266,10 +266,10 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(c1581_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/8)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/8)
MCFG_CPU_PROGRAM_MAP(c1581_mem)
- MCFG_DEVICE_ADD(M8520_TAG, MOS8520, XTAL_16MHz/8)
+ MCFG_DEVICE_ADD(M8520_TAG, MOS8520, XTAL(16'000'000)/8)
MCFG_MOS6526_IRQ_CALLBACK(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1581_device, cnt_w))
MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1581_device, sp_w))
@@ -278,7 +278,7 @@ MACHINE_CONFIG_START(c1581_device::device_add_mconfig)
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1581_device, cia_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1581_device, cia_pb_w))
- MCFG_WD1772_ADD(WD1772_TAG, XTAL_16MHz/2)
+ MCFG_WD1772_ADD(WD1772_TAG, XTAL(16'000'000)/2)
MCFG_FLOPPY_DRIVE_ADD_FIXED(WD1772_TAG":0", c1581_floppies, "35dd", c1581_device::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp
index 18fffca8d8d..55b40e386cc 100644
--- a/src/devices/bus/cbmiec/cmdhd.cpp
+++ b/src/devices/bus/cbmiec/cmdhd.cpp
@@ -83,7 +83,7 @@ MACHINE_CONFIG_START(cmd_hd_device::device_add_mconfig)
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 2000000)
MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, 2000000)
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_DEVICE_ADD(RTC72421A_TAG, RTC72421, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(RTC72421A_TAG, RTC72421, XTAL(32'768))
MCFG_DEVICE_ADD(SCSIBUS_TAG, SCSI_PORT, 0)
MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_0)
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp
index 2f637199896..bac81b01567 100644
--- a/src/devices/bus/cbmiec/fd2000.cpp
+++ b/src/devices/bus/cbmiec/fd2000.cpp
@@ -212,10 +212,10 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(fd2000_device::device_add_mconfig)
- MCFG_CPU_ADD(G65SC02PI2_TAG, M65C02, XTAL_24MHz/12)
+ MCFG_CPU_ADD(G65SC02PI2_TAG, M65C02, XTAL(24'000'000)/12)
MCFG_CPU_PROGRAM_MAP(fd2000_mem)
- MCFG_DEVICE_ADD(G65SC22P2_TAG, VIA6522, XTAL_24MHz/12)
+ MCFG_DEVICE_ADD(G65SC22P2_TAG, VIA6522, XTAL(24'000'000)/12)
MCFG_VIA6522_READPA_HANDLER(READ8(fd2000_device, via_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(fd2000_device, via_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(fd2000_device, via_pa_w))
@@ -228,10 +228,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fd4000_device::device_add_mconfig)
- MCFG_CPU_ADD(R65C02P4_TAG, M65C02, XTAL_24MHz/6)
+ MCFG_CPU_ADD(R65C02P4_TAG, M65C02, XTAL(24'000'000)/6)
MCFG_CPU_PROGRAM_MAP(fd4000_mem)
- MCFG_DEVICE_ADD(G65SC22P2_TAG, VIA6522, XTAL_24MHz/12)
+ MCFG_DEVICE_ADD(G65SC22P2_TAG, VIA6522, XTAL(24'000'000)/12)
MCFG_VIA6522_READPA_HANDLER(READ8(fd2000_device, via_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(fd2000_device, via_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(fd2000_device, via_pa_w))
diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp
index 92f4f6e2226..6f68ccae9c4 100644
--- a/src/devices/bus/cbmiec/serialbox.cpp
+++ b/src/devices/bus/cbmiec/serialbox.cpp
@@ -69,7 +69,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(serial_box_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M65C02, XTAL_4MHz/4)
+ MCFG_CPU_ADD(M6502_TAG, M65C02, XTAL(4'000'000)/4)
MCFG_CPU_PROGRAM_MAP(serial_box_mem)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbmiec/vic1515.cpp b/src/devices/bus/cbmiec/vic1515.cpp
index 93d76fcfced..229f3ed76ec 100644
--- a/src/devices/bus/cbmiec/vic1515.cpp
+++ b/src/devices/bus/cbmiec/vic1515.cpp
@@ -60,7 +60,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(vic1515_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", I8039, XTAL_6MHz)
+ MCFG_CPU_ADD("maincpu", I8039, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(vic1515_mem)
MCFG_CPU_IO_MAP(vic1515_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp
index 3e5c48cae00..30291266d9f 100644
--- a/src/devices/bus/cbmiec/vic1520.cpp
+++ b/src/devices/bus/cbmiec/vic1520.cpp
@@ -94,7 +94,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(vic1520_device::device_add_mconfig)
- MCFG_CPU_ADD(M6500_1_TAG, M6502, XTAL_2MHz) // M6500/1
+ MCFG_CPU_ADD(M6500_1_TAG, M6502, XTAL(2'000'000)) // M6500/1
MCFG_CPU_PROGRAM_MAP(vic1520_mem)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbus/pc9801_118.cpp b/src/devices/bus/cbus/pc9801_118.cpp
index d5cb715035a..ecd86eb39c2 100644
--- a/src/devices/bus/cbus/pc9801_118.cpp
+++ b/src/devices/bus/cbus/pc9801_118.cpp
@@ -20,7 +20,7 @@
#include "speaker.h"
-#define MAIN_CLOCK_X2 XTAL_2_4576MHz
+#define MAIN_CLOCK_X2 XTAL(2'457'600)
//**************************************************************************
// GLOBAL VARIABLES
diff --git a/src/devices/bus/cbus/pc9801_26.cpp b/src/devices/bus/cbus/pc9801_26.cpp
index 57fa3e8b888..57fc88f09e5 100644
--- a/src/devices/bus/cbus/pc9801_26.cpp
+++ b/src/devices/bus/cbus/pc9801_26.cpp
@@ -19,7 +19,7 @@
#include "speaker.h"
-#define MAIN_CLOCK_X1 XTAL_1_9968MHz
+#define MAIN_CLOCK_X1 XTAL(1'996'800)
//**************************************************************************
// GLOBAL VARIABLES
diff --git a/src/devices/bus/cbus/pc9801_86.cpp b/src/devices/bus/cbus/pc9801_86.cpp
index 8469e8f16c4..2e984e61436 100644
--- a/src/devices/bus/cbus/pc9801_86.cpp
+++ b/src/devices/bus/cbus/pc9801_86.cpp
@@ -20,7 +20,7 @@
#include "sound/volt_reg.h"
#include "speaker.h"
-#define MAIN_CLOCK_X1 XTAL_1_9968MHz
+#define MAIN_CLOCK_X1 XTAL(1'996'800)
#define QUEUE_SIZE 32768
//**************************************************************************
diff --git a/src/devices/bus/cbus/pc9801_amd98.cpp b/src/devices/bus/cbus/pc9801_amd98.cpp
index 6442f13c3ab..3fb6e13d9a8 100644
--- a/src/devices/bus/cbus/pc9801_amd98.cpp
+++ b/src/devices/bus/cbus/pc9801_amd98.cpp
@@ -32,7 +32,7 @@
#include "speaker.h"
-#define MAIN_CLOCK_X1 XTAL_1_9968MHz
+#define MAIN_CLOCK_X1 XTAL(1'996'800)
//**************************************************************************
// GLOBAL VARIABLES
diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp
index b81ba2c88fb..03b36b63df1 100644
--- a/src/devices/bus/centronics/epson_lx800.cpp
+++ b/src/devices/bus/centronics/epson_lx800.cpp
@@ -67,7 +67,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(epson_lx800_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", UPD7810, XTAL_14_7456MHz)
+ MCFG_CPU_ADD("maincpu", UPD7810, XTAL(14'745'600))
MCFG_CPU_PROGRAM_MAP(lx800_mem)
MCFG_UPD7810_PORTA_READ_CB(READ8(epson_lx800_device, porta_r))
MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(epson_lx800_device, porta_w))
diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp
index c2782e451e2..24b06396ff2 100644
--- a/src/devices/bus/centronics/epson_lx810l.cpp
+++ b/src/devices/bus/centronics/epson_lx810l.cpp
@@ -110,7 +110,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(epson_lx810l_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", UPD7810, XTAL_14_7456MHz)
+ MCFG_CPU_ADD("maincpu", UPD7810, XTAL(14'745'600))
MCFG_CPU_PROGRAM_MAP(lx810l_mem)
MCFG_UPD7810_PORTA_READ_CB(READ8(epson_lx810l_device, porta_r))
MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(epson_lx810l_device, porta_w))
diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp
index b906a7a8c0a..58639e698d5 100644
--- a/src/devices/bus/centronics/nec_p72.cpp
+++ b/src/devices/bus/centronics/nec_p72.cpp
@@ -50,7 +50,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(nec_p72_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V33, XTAL_16MHz/2) /* TODO it's actually a V40 */
+ MCFG_CPU_ADD("maincpu", V33, XTAL(16'000'000)/2) /* TODO it's actually a V40 */
MCFG_CPU_PROGRAM_MAP(p72_mem)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp
index bca9110bff5..e53ad30fbe6 100644
--- a/src/devices/bus/cgenie/expansion/floppy.cpp
+++ b/src/devices/bus/cgenie/expansion/floppy.cpp
@@ -72,7 +72,7 @@ const tiny_rom_entry *cgenie_fdc_device::device_rom_region() const
MACHINE_CONFIG_START(cgenie_fdc_device::device_add_mconfig)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer", cgenie_fdc_device, timer_callback, attotime::from_msec(25))
- MCFG_FD1793_ADD("fd1793", XTAL_1MHz)
+ MCFG_FD1793_ADD("fd1793", XTAL(1'000'000))
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(cgenie_fdc_device, intrq_w))
MCFG_FLOPPY_DRIVE_ADD("fd1793:0", cgenie_floppies, "ssdd", cgenie_fdc_device::floppy_formats)
diff --git a/src/devices/bus/coco/coco_dcmodem.cpp b/src/devices/bus/coco/coco_dcmodem.cpp
index 4e7a12081ff..f0dd20b86da 100644
--- a/src/devices/bus/coco/coco_dcmodem.cpp
+++ b/src/devices/bus/coco/coco_dcmodem.cpp
@@ -85,7 +85,7 @@ namespace
MACHINE_CONFIG_START(coco_dc_modem_device::device_add_mconfig)
MCFG_DEVICE_ADD(UART_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(coco_dc_modem_device, uart_irq_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp
index be84d919982..037c155fb63 100644
--- a/src/devices/bus/coco/coco_fdc.cpp
+++ b/src/devices/bus/coco/coco_fdc.cpp
@@ -122,7 +122,7 @@ static SLOT_INTERFACE_START( coco_fdc_floppies )
SLOT_INTERFACE_END
MACHINE_CONFIG_START(coco_fdc_device_base::device_add_mconfig)
- MCFG_WD1773_ADD(WD_TAG, XTAL_8MHz)
+ MCFG_WD1773_ADD(WD_TAG, XTAL(8'000'000))
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(coco_fdc_device_base, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(coco_fdc_device_base, fdc_drq_w))
@@ -135,7 +135,7 @@ MACHINE_CONFIG_START(coco_fdc_device_base::device_add_mconfig)
MCFG_FLOPPY_DRIVE_ADD(WD_TAG ":3", coco_fdc_floppies, nullptr, coco_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
- MCFG_DEVICE_ADD(DISTO_TAG, MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(DISTO_TAG, MSM6242, XTAL(32'768))
MCFG_DS1315_ADD(CLOUD9_TAG)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/coco/coco_gmc.cpp b/src/devices/bus/coco/coco_gmc.cpp
index 75d6c28669e..1cd11645fc9 100644
--- a/src/devices/bus/coco/coco_gmc.cpp
+++ b/src/devices/bus/coco/coco_gmc.cpp
@@ -53,7 +53,7 @@ namespace
MACHINE_CONFIG_START(coco_pak_gmc_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("gmc_speaker")
- MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL_4MHz)
+ MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL(4'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "gmc_speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/coco/coco_rs232.cpp b/src/devices/bus/coco/coco_rs232.cpp
index c6bf6bd0c23..2ec1f7a4d2a 100644
--- a/src/devices/bus/coco/coco_rs232.cpp
+++ b/src/devices/bus/coco/coco_rs232.cpp
@@ -69,7 +69,7 @@ IMPLEMENTATION
MACHINE_CONFIG_START(coco_rs232_device::device_add_mconfig)
MCFG_DEVICE_ADD(UART_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp
index 2397af5aa14..96df8ea8d3c 100644
--- a/src/devices/bus/coco/coco_ssc.cpp
+++ b/src/devices/bus/coco/coco_ssc.cpp
@@ -167,7 +167,7 @@ MACHINE_CONFIG_START(coco_ssc_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("ssc_audio")
- MCFG_SOUND_ADD(SP0256_TAG, SP0256, XTAL_3_12MHz)
+ MCFG_SOUND_ADD(SP0256_TAG, SP0256, XTAL(3'120'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ssc_audio", SP0256_GAIN)
MCFG_SP0256_DATA_REQUEST_CB(INPUTLINE(PIC_TAG, TMS7000_INT1_LINE))
diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp
index 7a79343b5b5..1800ba64874 100644
--- a/src/devices/bus/coco/coco_t4426.cpp
+++ b/src/devices/bus/coco/coco_t4426.cpp
@@ -163,7 +163,7 @@ MACHINE_CONFIG_START(coco_t4426_device::device_add_mconfig)
MCFG_RS232_CTS_HANDLER (DEVWRITELINE (UART_TAG, acia6850_device, write_cts))
/* Bit Rate Generator */
- MCFG_MC14411_ADD (BRG_TAG, XTAL_1_8432MHz)
+ MCFG_MC14411_ADD (BRG_TAG, XTAL(1'843'200))
MCFG_MC14411_F1_CB(WRITELINE (coco_t4426_device, write_f1_clock))
MCFG_MC14411_F3_CB(WRITELINE (coco_t4426_device, write_f3_clock))
MCFG_MC14411_F5_CB(WRITELINE (coco_t4426_device, write_f5_clock))
diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp
index 675485d9f54..d13488df8a7 100644
--- a/src/devices/bus/coco/dragon_fdc.cpp
+++ b/src/devices/bus/coco/dragon_fdc.cpp
@@ -146,7 +146,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(dragon_fdc_device_base::device_add_mconfig)
- MCFG_WD2797_ADD(WD2797_TAG, XTAL_4MHz / 4)
+ MCFG_WD2797_ADD(WD2797_TAG, XTAL(4'000'000) / 4)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(dragon_fdc_device_base, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(dragon_fdc_device_base, fdc_drq_w))
MCFG_WD_FDC_FORCE_READY
@@ -163,7 +163,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(premier_fdc_device_base::device_add_mconfig)
- MCFG_WD2791_ADD(WD2791_TAG, XTAL_2MHz / 2)
+ MCFG_WD2791_ADD(WD2791_TAG, XTAL(2'000'000) / 2)
MCFG_WD_FDC_FORCE_READY
MCFG_FLOPPY_DRIVE_ADD(WD2791_TAG ":0", dragon_fdc_device_base, "qd", dragon_fdc_device_base::floppy_formats)
diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp
index 7e692069baa..07b6a737133 100644
--- a/src/devices/bus/comx35/clm.cpp
+++ b/src/devices/bus/comx35/clm.cpp
@@ -147,7 +147,7 @@ MACHINE_CONFIG_START(comx_clm_device::device_add_mconfig)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", comx_clm)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD(MC6845_TAG, MC6845, MC6845_SCREEN_TAG, XTAL_14_31818MHz/7)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845, MC6845_SCREEN_TAG, XTAL(14'318'181)/7)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(comx_clm_device, crtc_update_row)
diff --git a/src/devices/bus/comx35/fdc.cpp b/src/devices/bus/comx35/fdc.cpp
index de9267969d9..49ea672b1ee 100644
--- a/src/devices/bus/comx35/fdc.cpp
+++ b/src/devices/bus/comx35/fdc.cpp
@@ -96,7 +96,7 @@ SLOT_INTERFACE_END
//-------------------------------------------------
MACHINE_CONFIG_START(comx_fd_device::device_add_mconfig)
- MCFG_WD1770_ADD(WD1770_TAG, XTAL_8MHz)
+ MCFG_WD1770_ADD(WD1770_TAG, XTAL(8'000'000))
MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", comx_fd_floppies, "525sd35t", comx_fd_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":1", comx_fd_floppies, nullptr, comx_fd_device::floppy_formats)
diff --git a/src/devices/bus/cpc/cpc_pds.cpp b/src/devices/bus/cpc/cpc_pds.cpp
index 4687e2366a3..bc170675a51 100644
--- a/src/devices/bus/cpc/cpc_pds.cpp
+++ b/src/devices/bus/cpc/cpc_pds.cpp
@@ -18,7 +18,7 @@ DEFINE_DEVICE_TYPE(CPC_PDS, cpc_pds_device, "cpc_pds", "Programmers Development
MACHINE_CONFIG_START(cpc_pds_device::device_add_mconfig)
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_4MHz) // no clock on the PCB, so will presume that it uses the CPC's clock
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(4'000'000)) // no clock on the PCB, so will presume that it uses the CPC's clock
// no pass-through seen on remake PCBs, unknown if actual hardware had a pass-through port or not
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp
index b187e514e6a..c0914b93b68 100644
--- a/src/devices/bus/cpc/cpc_rs232.cpp
+++ b/src/devices/bus/cpc/cpc_rs232.cpp
@@ -42,7 +42,7 @@ MACHINE_CONFIG_START(cpc_rs232_device::device_add_mconfig)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(cpc_rs232_device, pit_out1_w))
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(cpc_rs232_device, pit_out2_w))
- MCFG_DEVICE_ADD("dart", Z80DART, XTAL_4MHz)
+ MCFG_DEVICE_ADD("dart", Z80DART, XTAL(4'000'000))
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp
index aa9ade4b124..59369e577df 100644
--- a/src/devices/bus/cpc/cpc_ssa1.cpp
+++ b/src/devices/bus/cpc/cpc_ssa1.cpp
@@ -117,7 +117,7 @@ const tiny_rom_entry *cpc_dkspeech_device::device_rom_region() const
// device machine config
MACHINE_CONFIG_START(cpc_ssa1_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sp0256",SP0256,XTAL_3_12MHz)
+ MCFG_SOUND_ADD("sp0256",SP0256,XTAL(3'120'000))
MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(cpc_ssa1_device, lrq_cb))
MCFG_SP0256_STANDBY_CB(WRITELINE(cpc_ssa1_device, sby_cb))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -133,7 +133,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cpc_dkspeech_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sp0256",SP0256,XTAL_4MHz) // uses the CPC's clock from pin 50 of the expansion port
+ MCFG_SOUND_ADD("sp0256",SP0256,XTAL(4'000'000)) // uses the CPC's clock from pin 50 of the expansion port
MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(cpc_dkspeech_device, lrq_cb))
MCFG_SP0256_STANDBY_CB(WRITELINE(cpc_dkspeech_device, sby_cb))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp
index c62aa4313dd..ef3b9cb52e0 100644
--- a/src/devices/bus/cpc/magicsound.cpp
+++ b/src/devices/bus/cpc/magicsound.cpp
@@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(AL_MAGICSOUND, al_magicsound_device, "al_magicsound", "Aleste
MACHINE_CONFIG_START(al_magicsound_device::device_add_mconfig)
- MCFG_DEVICE_ADD( "dmac", AM9517A, XTAL_4MHz ) // CLK from expansion port
+ MCFG_DEVICE_ADD( "dmac", AM9517A, XTAL(4'000'000) ) // CLK from expansion port
// According to the schematics, the TC pin (EOP on western chips) is connected to NMI on the expansion port.
// NMIs seem to occur too quickly when this is active, so either EOP is not triggered at the correct time, or
// the K1810WT37 is different to the i8237/AM9517A
@@ -42,19 +42,19 @@ MACHINE_CONFIG_START(al_magicsound_device::device_add_mconfig)
// passes through an inverter to each CLK pin on both timers. This seems to be too fast.
// Timer outputs to SAM0/1/2/3 are sample clocks for each sound channel, D/A0 is the low bit of the channel select.
MCFG_DEVICE_ADD("timer1", PIT8254, 0)
- MCFG_PIT8253_CLK0(XTAL_4MHz)
+ MCFG_PIT8253_CLK0(XTAL(4'000'000))
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(al_magicsound_device, sam0_w))
- MCFG_PIT8253_CLK1(XTAL_4MHz)
+ MCFG_PIT8253_CLK1(XTAL(4'000'000))
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(al_magicsound_device, sam1_w))
- MCFG_PIT8253_CLK2(XTAL_4MHz)
+ MCFG_PIT8253_CLK2(XTAL(4'000'000))
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(al_magicsound_device, sam2_w))
MCFG_DEVICE_ADD("timer2", PIT8254, 0)
- MCFG_PIT8253_CLK0(XTAL_4MHz)
+ MCFG_PIT8253_CLK0(XTAL(4'000'000))
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(al_magicsound_device, sam3_w))
- MCFG_PIT8253_CLK1(XTAL_4MHz)
+ MCFG_PIT8253_CLK1(XTAL(4'000'000))
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(al_magicsound_device, da0_w))
- MCFG_PIT8253_CLK2(XTAL_4MHz)
+ MCFG_PIT8253_CLK2(XTAL(4'000'000))
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
diff --git a/src/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp
index ca165673e26..9ec331ffd54 100644
--- a/src/devices/bus/cpc/playcity.cpp
+++ b/src/devices/bus/cpc/playcity.cpp
@@ -25,15 +25,15 @@ DEFINE_DEVICE_TYPE(CPC_PLAYCITY, cpc_playcity_device, "cpc_playcity", "PlayCity"
// device machine config
MACHINE_CONFIG_START(cpc_playcity_device::device_add_mconfig)
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_ZC1_CB(WRITELINE(cpc_playcity_device, ctc_zc1_cb))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc",z80ctc_device, trg3))
MCFG_Z80CTC_INTR_CB(WRITELINE(cpc_playcity_device, ctc_intr_cb))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MCFG_SOUND_ADD("ymz_1",YMZ294,XTAL_4MHz) // when timer is not set, operates at 4MHz (interally divided by 2, so equivalent to the ST)
+ MCFG_SOUND_ADD("ymz_1",YMZ294,XTAL(4'000'000)) // when timer is not set, operates at 4MHz (interally divided by 2, so equivalent to the ST)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_SOUND_ADD("ymz_2",YMZ294,XTAL_4MHz)
+ MCFG_SOUND_ADD("ymz_2",YMZ294,XTAL(4'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
// pass-through
@@ -132,7 +132,7 @@ void cpc_playcity_device::update_ymz_clock()
{
// Bit of a hack job here, since there is no way currently to connect the CTC channel output directly to the YMZ clocks.
uint8_t rate = m_ctc->get_channel_constant(0);
- uint32_t clk = XTAL_4MHz;
+ uint32_t clk = 4000000;
switch(rate)
{
diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp
index 776a3970fdd..cf9a1cfffc2 100644
--- a/src/devices/bus/dmv/k210.cpp
+++ b/src/devices/bus/dmv/k210.cpp
@@ -142,7 +142,7 @@ WRITE8_MEMBER( dmv_k210_device::portc_w )
if (!(data & 0x80))
{
m_centronics->write_strobe(ASSERT_LINE);
- m_clk1_timer->adjust(attotime::from_hz(XTAL_1MHz));
+ m_clk1_timer->adjust(attotime::from_hz(XTAL(1'000'000)));
}
m_centronics->write_init(!BIT(data, 1));
diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp
index b449d4d8dc3..196943863a7 100644
--- a/src/devices/bus/dmv/k220.cpp
+++ b/src/devices/bus/dmv/k220.cpp
@@ -162,7 +162,7 @@ MACHINE_CONFIG_START(dmv_k220_device::device_add_mconfig)
MCFG_I8255_OUT_PORTC_CB(WRITE8(dmv_k220_device, portc_w))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_1MHz) // CLK1
+ MCFG_PIT8253_CLK0(XTAL(1'000'000)) // CLK1
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(dmv_k220_device, write_out0))
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(dmv_k220_device, write_out1))
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(dmv_k220_device, write_out2))
diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp
index a21e4e12aae..217fa423022 100644
--- a/src/devices/bus/dmv/k230.cpp
+++ b/src/devices/bus/dmv/k230.cpp
@@ -163,18 +163,18 @@ void dmv_k234_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(dmv_k230_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", I8088, XTAL_15MHz / 3)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(15'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(k230_mem)
MCFG_CPU_IO_MAP(k230_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dmv_k234_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", M68008, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68008, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(k234_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dmv_k235_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", V20, XTAL_15MHz / 3)
+ MCFG_CPU_ADD("maincpu", V20, XTAL(15'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(k230_mem)
MCFG_CPU_IO_MAP(k235_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp
index fdb33c2e427..cb6352ba058 100644
--- a/src/devices/bus/dmv/k801.cpp
+++ b/src/devices/bus/dmv/k801.cpp
@@ -143,7 +143,7 @@ void dmv_k801_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(dmv_k801_device::device_add_mconfig)
- MCFG_DEVICE_ADD("epci", MC2661, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD("epci", MC2661, XTAL(5'068'800))
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp
index 2e46256e9e9..99deb19fdde 100644
--- a/src/devices/bus/dmv/k803.cpp
+++ b/src/devices/bus/dmv/k803.cpp
@@ -76,7 +76,7 @@ void dmv_k803_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(dmv_k803_device::device_add_mconfig)
- MCFG_DEVICE_ADD("rtc", MM58167, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768))
MCFG_MM58167_IRQ_CALLBACK(WRITELINE(dmv_k803_device, rtc_irq_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp
index 48758217e3c..742f97c2a33 100644
--- a/src/devices/bus/dmv/k806.cpp
+++ b/src/devices/bus/dmv/k806.cpp
@@ -101,7 +101,7 @@ void dmv_k806_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(dmv_k806_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8741, XTAL_6MHz)
+ MCFG_CPU_ADD("mcu", I8741, XTAL(6'000'000))
MCFG_MCS48_PORT_P1_IN_CB(READ8(dmv_k806_device, port1_r))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(dmv_k806_device, port2_w))
MCFG_MCS48_PORT_T1_IN_CB(READLINE(dmv_k806_device, portt1_r))
diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp
index 2b6556b54a7..30174aa4e83 100644
--- a/src/devices/bus/ecbbus/grip.cpp
+++ b/src/devices/bus/ecbbus/grip.cpp
@@ -459,7 +459,7 @@ void ecb_grip21_device::kb_w(uint8_t data)
MACHINE_CONFIG_START(ecb_grip21_device::device_add_mconfig)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
MCFG_Z80_DAISY_CHAIN(grip_daisy_chain)
MCFG_CPU_PROGRAM_MAP(grip_mem)
MCFG_CPU_IO_MAP(grip_io)
@@ -481,14 +481,14 @@ MACHINE_CONFIG_START(ecb_grip21_device::device_add_mconfig)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
- MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/4)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(16'000'000)/4)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(ecb_grip21_device, crtc_update_row)
MCFG_MC6845_OUT_DE_CB(DEVWRITELINE(Z80STI_TAG, z80sti_device, i1_w))
MCFG_MC6845_OUT_CUR_CB(DEVWRITELINE(Z80STI_TAG, z80sti_device, i1_w))
-// MCFG_MC6845_ADD(HD6345_TAG, HD6345, SCREEN_TAG, XTAL_16MHz/4)
+// MCFG_MC6845_ADD(HD6345_TAG, HD6345, SCREEN_TAG, XTAL(16'000'000)/4)
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
MCFG_I8255_IN_PORTA_CB(READ8(ecb_grip21_device, ppi_pa_r))
@@ -496,7 +496,7 @@ MACHINE_CONFIG_START(ecb_grip21_device::device_add_mconfig)
MCFG_I8255_IN_PORTB_CB(READ8(ecb_grip21_device, ppi_pb_r))
MCFG_I8255_OUT_PORTC_CB(WRITE8(ecb_grip21_device, ppi_pc_w))
- MCFG_DEVICE_ADD(Z80STI_TAG, Z80STI, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80STI_TAG, Z80STI, XTAL(16'000'000)/4)
MCFG_Z80STI_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80STI_IN_GPIO_CB(READ8(ecb_grip21_device, sti_gpio_r))
MCFG_Z80STI_OUT_TBO_CB(WRITELINE(ecb_grip21_device, speaker_w))
diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp
index 5cb5c6704c9..94c7cfe26b1 100644
--- a/src/devices/bus/econet/e01.cpp
+++ b/src/devices/bus/econet/e01.cpp
@@ -243,21 +243,21 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(econet_e01_device::device_add_mconfig)
// basic machine hardware
- MCFG_CPU_ADD(R65C102_TAG, M65C02, XTAL_8MHz/4) // Rockwell R65C102P3
+ MCFG_CPU_ADD(R65C102_TAG, M65C02, XTAL(8'000'000)/4) // Rockwell R65C102P3
MCFG_CPU_PROGRAM_MAP(e01_mem)
- MCFG_MC146818_ADD(HD146818_TAG, XTAL_32_768kHz)
+ MCFG_MC146818_ADD(HD146818_TAG, XTAL(32'768))
MCFG_MC146818_IRQ_HANDLER(WRITELINE(econet_e01_device, rtc_irq_w))
// devices
- MCFG_DEVICE_ADD(R6522_TAG, VIA6522, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD(R6522_TAG, VIA6522, XTAL(8'000'000) / 4)
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(econet_e01_device, via_irq_w))
MCFG_DEVICE_ADD(MC6854_TAG, MC6854, 0)
MCFG_MC6854_OUT_IRQ_CB(WRITELINE(econet_e01_device, adlc_irq_w))
MCFG_MC6854_OUT_TXD_CB(WRITELINE(econet_e01_device, econet_data_w))
- MCFG_WD2793_ADD(WD2793_TAG, XTAL_8MHz/4)
+ MCFG_WD2793_ADD(WD2793_TAG, XTAL(8'000'000)/4)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(econet_e01_device, fdc_irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(econet_e01_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", e01_floppies, "35dd", floppy_formats_afs)
diff --git a/src/devices/bus/einstein/pipe/tk02.cpp b/src/devices/bus/einstein/pipe/tk02.cpp
index 763181c2ed8..14aa1b661c7 100644
--- a/src/devices/bus/einstein/pipe/tk02.cpp
+++ b/src/devices/bus/einstein/pipe/tk02.cpp
@@ -97,14 +97,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(tk02_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME("mono", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS(XTAL_8MHz * 2, 1024, 0, 640, 312, 0, 250)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(8'000'000) * 2, 1024, 0, 640, 312, 0, 250)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", tk02)
- MCFG_MC6845_ADD("crtc", MC6845, "mono", XTAL_8MHz / 4)
+ MCFG_MC6845_ADD("crtc", MC6845, "mono", XTAL(8'000'000) / 4)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(tk02_device, crtc_update_row)
diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp
index 918d73e3670..81c68a80e4d 100644
--- a/src/devices/bus/electron/m2105.cpp
+++ b/src/devices/bus/electron/m2105.cpp
@@ -78,7 +78,7 @@ MACHINE_CONFIG_START(electron_m2105_device::device_add_mconfig)
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<1>))
/* duart */
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400))
MCFG_MC68681_IRQ_CALLBACK(DEVWRITELINE("irqs", input_merger_device, in_w<2>))
MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
//MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(electron_m2105_device, sio_out_w))
diff --git a/src/devices/bus/electron/plus3.cpp b/src/devices/bus/electron/plus3.cpp
index 0f00958fd75..413bbc8ec6c 100644
--- a/src/devices/bus/electron/plus3.cpp
+++ b/src/devices/bus/electron/plus3.cpp
@@ -66,7 +66,7 @@ ROM_END
MACHINE_CONFIG_START(electron_plus3_device::device_add_mconfig)
/* fdc */
- MCFG_WD1770_ADD("fdc", XTAL_16MHz / 2)
+ MCFG_WD1770_ADD("fdc", XTAL(16'000'000) / 2)
MCFG_FLOPPY_DRIVE_ADD_FIXED("fdc:0", electron_floppies, "35dd", floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", electron_floppies, nullptr, floppy_formats)
diff --git a/src/devices/bus/ep64/exdos.cpp b/src/devices/bus/ep64/exdos.cpp
index 931ae243aa1..eb5b61229c9 100644
--- a/src/devices/bus/ep64/exdos.cpp
+++ b/src/devices/bus/ep64/exdos.cpp
@@ -103,7 +103,7 @@ SLOT_INTERFACE_END
//-------------------------------------------------
MACHINE_CONFIG_START(ep64_exdos_device::device_add_mconfig)
- MCFG_WD1770_ADD(WD1770_TAG, XTAL_8MHz)
+ MCFG_WD1770_ADD(WD1770_TAG, XTAL(8'000'000))
MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", ep64_exdos_floppies, "35dd", ep64_exdos_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":1", ep64_exdos_floppies, nullptr, ep64_exdos_device::floppy_formats)
diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp
index ac0e8e1884e..728e096b50e 100644
--- a/src/devices/bus/epson_sio/pf10.cpp
+++ b/src/devices/bus/epson_sio/pf10.cpp
@@ -64,7 +64,7 @@ static SLOT_INTERFACE_START( pf10_floppies )
SLOT_INTERFACE_END
MACHINE_CONFIG_START(epson_pf10_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", HD6303Y, XTAL_4_9152MHz) // HD63A03XF
+ MCFG_CPU_ADD("maincpu", HD6303Y, XTAL(4'915'200)) // HD63A03XF
MCFG_CPU_PROGRAM_MAP(cpu_mem)
MCFG_CPU_IO_MAP(cpu_io)
MCFG_M6801_SER_TX(DEVWRITELINE(DEVICE_SELF, epson_pf10_device, hd6303_tx_w))
diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp
index f50c5c7af89..35a86b25009 100644
--- a/src/devices/bus/epson_sio/tf20.cpp
+++ b/src/devices/bus/epson_sio/tf20.cpp
@@ -15,8 +15,8 @@
#include "emu.h"
#include "tf20.h"
-#define XTAL_CR1 XTAL_8MHz
-#define XTAL_CR2 XTAL_4_9152MHz
+#define XTAL_CR1 XTAL(8'000'000)
+#define XTAL_CR2 XTAL(4'915'200)
//**************************************************************************
diff --git a/src/devices/bus/epson_sio/tf20.h b/src/devices/bus/epson_sio/tf20.h
index e509e6ffcaa..cde9509f685 100644
--- a/src/devices/bus/epson_sio/tf20.h
+++ b/src/devices/bus/epson_sio/tf20.h
@@ -79,8 +79,8 @@ private:
epson_sio_device *m_sio_input;
- static const int XTAL_CR1 = XTAL_8MHz;
- static const int XTAL_CR2 = XTAL_4_9152MHz;
+ static constexpr XTAL XTAL_CR1 = XTAL(8'000'000);
+ static constexpr XTAL XTAL_CR2 = XTAL(4'915'200);
};
diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp
index 8da82eaff2e..48713edcc13 100644
--- a/src/devices/bus/hp80_io/82937.cpp
+++ b/src/devices/bus/hp80_io/82937.cpp
@@ -328,7 +328,7 @@ const tiny_rom_entry *hp82937_io_card_device::device_rom_region() const
}
MACHINE_CONFIG_START(hp82937_io_card_device::device_add_mconfig)
- MCFG_CPU_ADD("cpu" , I8049 , XTAL_11MHz)
+ MCFG_CPU_ADD("cpu" , I8049 , XTAL(11'000'000))
MCFG_CPU_IO_MAP(cpu_io_map)
MCFG_MCS48_PORT_T0_IN_CB(READLINE(hp82937_io_card_device , t0_r))
MCFG_MCS48_PORT_T1_IN_CB(DEVREADLINE("xlator" , hp_1mb5_device , int_r))
diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp
index cc08e339a79..886faf6957f 100644
--- a/src/devices/bus/hp9845_io/98035.cpp
+++ b/src/devices/bus/hp9845_io/98035.cpp
@@ -94,7 +94,7 @@
#define BIT_SET(w , n) ((w) |= BIT_MASK(n))
// Frequency of digit multiplexing in clock chip
-#define DIGIT_MUX_FREQ (XTAL_32_768kHz / 64)
+#define DIGIT_MUX_FREQ (XTAL(32'768) / 64)
// Duration of key presses
#define KEY_PRESS_SHORT 1 // 1.95 ms
@@ -247,7 +247,7 @@ void hp98035_io_card_device::device_timer(emu_timer &timer, device_timer_id id,
m_prev_clock_keys = m_clock_keys;
// Count seconds
m_clock_1s_div++;
- if (m_clock_1s_div >= DIGIT_MUX_FREQ) {
+ if (m_clock_1s_div >= DIGIT_MUX_FREQ.value()) {
m_clock_1s_div = 0;
advance_seconds();
regen_clock_image();
@@ -755,7 +755,7 @@ const tiny_rom_entry *hp98035_io_card_device::device_rom_region() const
}
MACHINE_CONFIG_START(hp98035_io_card_device::device_add_mconfig)
- MCFG_CPU_ADD("np" , HP_NANOPROCESSOR , XTAL_1MHz)
+ MCFG_CPU_ADD("np" , HP_NANOPROCESSOR , XTAL(1'000'000))
MCFG_CPU_PROGRAM_MAP(np_program_map)
MCFG_CPU_IO_MAP(np_io_map)
MCFG_HP_NANO_DC_CHANGED(WRITE8(hp98035_io_card_device , dc_w))
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp
index 0a74402a923..6ea6f846c82 100644
--- a/src/devices/bus/ieee488/c2031.cpp
+++ b/src/devices/bus/ieee488/c2031.cpp
@@ -303,18 +303,18 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(c2031_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(c2031_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
- MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c2031_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c2031_device, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c2031_device, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2031_device, via0_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c2031_device, via0_irq_w))
- MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c2031_device, via1_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
@@ -323,7 +323,7 @@ MACHINE_CONFIG_START(c2031_device::device_add_mconfig)
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c2031_device, via1_irq_w))
- MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
+ MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
MCFG_64H156_BYTE_CALLBACK(WRITELINE(c2031_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c2031_floppies, "525ssqd", c2031_device::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp
index 379152202d2..1031e7129c2 100644
--- a/src/devices/bus/ieee488/c2040.cpp
+++ b/src/devices/bus/ieee488/c2040.cpp
@@ -449,14 +449,14 @@ FLOPPY_FORMATS_END
MACHINE_CONFIG_START(c2040_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(c2040_main_mem)
- MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(16'000'000)/16)
MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w))
- MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(16'000'000)/16)
MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r))
@@ -464,16 +464,16 @@ MACHINE_CONFIG_START(c2040_device::device_add_mconfig)
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(c2040_fdc_mem)
- MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_device, read))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w))
- MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(16'000'000)/16)
MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c2040_fdc_device, write))
MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w))
MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds0_w))
@@ -481,7 +481,7 @@ MACHINE_CONFIG_START(c2040_device::device_add_mconfig)
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c2040_fdc_device, wps_r))
- MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL_16MHz)
+ MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL(16'000'000))
MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_new_device, pb6_w))
MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
@@ -492,14 +492,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c3040_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(c2040_main_mem)
- MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(16'000'000)/16)
MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w))
- MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(16'000'000)/16)
MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r))
@@ -507,16 +507,16 @@ MACHINE_CONFIG_START(c3040_device::device_add_mconfig)
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(c2040_fdc_mem)
- MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_device, read))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w))
- MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(16'000'000)/16)
MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c2040_fdc_device, write))
MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w))
MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds0_w))
@@ -524,7 +524,7 @@ MACHINE_CONFIG_START(c3040_device::device_add_mconfig)
MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c2040_fdc_device, wps_r))
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
- MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL_16MHz)
+ MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL(16'000'000))
MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_new_device, pb6_w))
MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
@@ -535,14 +535,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c4040_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(c2040_main_mem)
- MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(16'000'000)/16)
MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w))
- MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(16'000'000)/16)
MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r))
@@ -550,16 +550,16 @@ MACHINE_CONFIG_START(c4040_device::device_add_mconfig)
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(c2040_fdc_mem)
- MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_device, read))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w))
- MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(16'000'000)/16)
MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c2040_fdc_device, write))
MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w))
MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds0_w))
@@ -567,7 +567,7 @@ MACHINE_CONFIG_START(c4040_device::device_add_mconfig)
MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c2040_fdc_device, wps_r))
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
- MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL_16MHz)
+ MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL(16'000'000))
MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_new_device, pb6_w))
MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp
index 88c214a1b06..799abbd599e 100644
--- a/src/devices/bus/ieee488/c8050.cpp
+++ b/src/devices/bus/ieee488/c8050.cpp
@@ -526,14 +526,14 @@ FLOPPY_FORMATS_END
MACHINE_CONFIG_START(c8050_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12)
MCFG_CPU_PROGRAM_MAP(c8050_main_mem)
- MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w))
- MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r))
@@ -541,16 +541,16 @@ MACHINE_CONFIG_START(c8050_device::device_add_mconfig)
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_12MHz/12)
+ MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12)
MCFG_CPU_PROGRAM_MAP(c8050_fdc_mem)
- MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w))
- MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12)
MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write))
MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w))
MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w))
@@ -559,7 +559,7 @@ MACHINE_CONFIG_START(c8050_device::device_add_mconfig)
MCFG_MOS6530n_IN_PB6_CB(VCC) // SINGLE SIDED
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
- MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL_12MHz/2)
+ MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2)
MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7))
MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1)
@@ -571,14 +571,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c8250_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12)
MCFG_CPU_PROGRAM_MAP(c8050_main_mem)
- MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w))
- MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r))
@@ -586,16 +586,16 @@ MACHINE_CONFIG_START(c8250_device::device_add_mconfig)
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_12MHz/12)
+ MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12)
MCFG_CPU_PROGRAM_MAP(c8050_fdc_mem)
- MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w))
- MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12)
MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write))
MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w))
MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w))
@@ -605,7 +605,7 @@ MACHINE_CONFIG_START(c8250_device::device_add_mconfig)
MCFG_MOS6530n_IN_PB6_CB(GND) // DOUBLE SIDED
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
- MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL_12MHz/2)
+ MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2)
MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7))
MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1)
@@ -617,14 +617,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c8250lp_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12)
MCFG_CPU_PROGRAM_MAP(c8050_main_mem)
- MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w))
- MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r))
@@ -632,16 +632,16 @@ MACHINE_CONFIG_START(c8250lp_device::device_add_mconfig)
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_12MHz/12)
+ MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12)
MCFG_CPU_PROGRAM_MAP(c8250lp_fdc_mem)
- MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w))
- MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12)
MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write))
MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w))
MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w))
@@ -651,7 +651,7 @@ MACHINE_CONFIG_START(c8250lp_device::device_add_mconfig)
MCFG_MOS6530n_IN_PB6_CB(GND) // DOUBLE SIDED
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
- MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL_12MHz/2)
+ MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2)
MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7))
MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1)
@@ -663,14 +663,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sfd1001_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12)
MCFG_CPU_PROGRAM_MAP(c8050_main_mem)
- MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w))
- MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r))
@@ -678,16 +678,16 @@ MACHINE_CONFIG_START(sfd1001_device::device_add_mconfig)
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_12MHz/12)
+ MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12)
MCFG_CPU_PROGRAM_MAP(sfd1001_fdc_mem)
- MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w))
- MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_12MHz/12)
+ MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12)
MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write))
MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w))
MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds1_w))
@@ -696,7 +696,7 @@ MACHINE_CONFIG_START(sfd1001_device::device_add_mconfig)
MCFG_MOS6530n_IN_PB6_CB(GND) // DOUBLE SIDED
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
- MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL_12MHz/2)
+ MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2)
MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7))
MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1)
diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp
index d4fed8cec5f..5bb49da2c71 100644
--- a/src/devices/bus/ieee488/c8280.cpp
+++ b/src/devices/bus/ieee488/c8280.cpp
@@ -290,24 +290,24 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(c8280_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL_12MHz/8)
+ MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL(12'000'000)/8)
MCFG_CPU_PROGRAM_MAP(c8280_main_mem)
- MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_12MHz/8)
+ MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/8)
MCFG_MOS6530n_IN_PA_CB(READ8(c8280_device, dio_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8280_device, dio_w))
- MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_12MHz/8)
+ MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/8)
MCFG_MOS6530n_IN_PA_CB(READ8(c8280_device, riot1_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8280_device, riot1_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(c8280_device, riot1_pb_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8280_device, riot1_pb_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_DOS_TAG, INPUT_LINE_IRQ0))
- MCFG_CPU_ADD(M6502_FDC_TAG, M6502, XTAL_12MHz/8)
+ MCFG_CPU_ADD(M6502_FDC_TAG, M6502, XTAL(12'000'000)/8)
MCFG_CPU_PROGRAM_MAP(c8280_fdc_mem)
- MCFG_FD1797_ADD(WD1797_TAG, XTAL_12MHz/6)
+ MCFG_FD1797_ADD(WD1797_TAG, XTAL(12'000'000)/6)
MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(M6502_FDC_TAG, M6502_IRQ_LINE))
MCFG_WD_FDC_DRQ_CALLBACK(INPUTLINE(M6502_FDC_TAG, M6502_SET_OVERFLOW))
MCFG_FLOPPY_DRIVE_ADD(WD1797_TAG ":0", c8280_floppies, "8dsdd", c8280_device::floppy_formats)
diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp
index 2f003f5b282..5104527ad70 100644
--- a/src/devices/bus/ieee488/d9060.cpp
+++ b/src/devices/bus/ieee488/d9060.cpp
@@ -370,14 +370,14 @@ WRITE8_MEMBER( d9060_device_base::scsi_data_w )
MACHINE_CONFIG_START(d9060_device_base::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL_4MHz/4)
+ MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL(4'000'000)/4)
MCFG_CPU_PROGRAM_MAP(d9060_main_mem)
- MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_4MHz/4)
+ MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(4'000'000)/4)
MCFG_MOS6530n_IN_PA_CB(READ8(d9060_device_base, dio_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(d9060_device_base, dio_w))
- MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_4MHz/4)
+ MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(4'000'000)/4)
MCFG_MOS6530n_IN_PA_CB(READ8(d9060_device_base, riot1_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(d9060_device_base, riot1_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(d9060_device_base, riot1_pb_r))
@@ -385,10 +385,10 @@ MACHINE_CONFIG_START(d9060_device_base::device_add_mconfig)
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_DOS_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6502_HDC_TAG, M6502, XTAL_4MHz/4)
+ MCFG_CPU_ADD(M6502_HDC_TAG, M6502, XTAL(4'000'000)/4)
MCFG_CPU_PROGRAM_MAP(d9060_hdc_mem)
- MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_4MHz/4)
+ MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(4'000'000)/4)
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(d9060_device_base, scsi_data_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(d9060_device_base, via_pb_w))
MCFG_VIA6522_CA2_HANDLER(WRITELINE(d9060_device_base, ack_w))
diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp
index a2256e32fe5..5cf5c5e74eb 100644
--- a/src/devices/bus/ieee488/hardbox.cpp
+++ b/src/devices/bus/ieee488/hardbox.cpp
@@ -267,7 +267,7 @@ WRITE8_MEMBER( hardbox_device::ppi1_pc_w )
MACHINE_CONFIG_START(hardbox_device::device_add_mconfig)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(hardbox_mem)
MCFG_CPU_IO_MAP(hardbox_io)
diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp
index 2e82ea4d1d1..e54e0d9dc83 100644
--- a/src/devices/bus/ieee488/softbox.cpp
+++ b/src/devices/bus/ieee488/softbox.cpp
@@ -234,7 +234,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(softbox_device::device_add_mconfig)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(softbox_mem)
MCFG_CPU_IO_MAP(softbox_io)
@@ -260,7 +260,7 @@ MACHINE_CONFIG_START(softbox_device::device_add_mconfig)
MCFG_I8255_IN_PORTC_CB(READ8(softbox_device, ppi1_pc_r))
MCFG_I8255_OUT_PORTC_CB(WRITE8(softbox_device, ppi1_pc_w))
- MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxc))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_txc))
diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp
index 36a5cd9d51f..395181ff77e 100644
--- a/src/devices/bus/imi7000/imi5000h.cpp
+++ b/src/devices/bus/imi7000/imi5000h.cpp
@@ -341,18 +341,18 @@ WRITE8_MEMBER( imi5000h_device::pio3_pb_w )
//-------------------------------------------------
MACHINE_CONFIG_START(imi5000h_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_Z80_DAISY_CHAIN(z80_daisy_chain)
MCFG_CPU_PROGRAM_MAP(imi5000h_mem)
MCFG_CPU_IO_MAP(imi5000h_io)
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000) / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(imi5000h_device, ctc_z0_w))
MCFG_Z80CTC_ZC1_CB(WRITELINE(imi5000h_device, ctc_z1_w))
MCFG_Z80CTC_ZC2_CB(WRITELINE(imi5000h_device, ctc_z2_w))
- MCFG_DEVICE_ADD(Z80PIO_0_TAG, Z80PIO, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80PIO_0_TAG, Z80PIO, XTAL(8'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(imi5000h_device, pio0_pa_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(imi5000h_device, pio0_pa_w))
@@ -361,7 +361,7 @@ MACHINE_CONFIG_START(imi5000h_device::device_add_mconfig)
MCFG_Z80PIO_OUT_PB_CB(WRITE8(imi5000h_device, pio0_pb_w))
MCFG_Z80PIO_OUT_BRDY_CB(DEVWRITELINE(Z80PIO_0_TAG, z80pio_device, strobe_b))
- MCFG_DEVICE_ADD(Z80PIO_2_TAG, Z80PIO, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80PIO_2_TAG, Z80PIO, XTAL(8'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(imi5000h_device, pio2_pa_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(imi5000h_device, pio2_pa_w))
@@ -369,7 +369,7 @@ MACHINE_CONFIG_START(imi5000h_device::device_add_mconfig)
MCFG_Z80PIO_IN_PB_CB(READ8(imi5000h_device, pio2_pb_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(imi5000h_device, pio2_pb_w))
- MCFG_DEVICE_ADD(Z80PIO_3_TAG, Z80PIO, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80PIO_3_TAG, Z80PIO, XTAL(8'000'000)/2)
MCFG_Z80PIO_IN_PA_CB(READ8(imi5000h_device, pio3_pa_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(imi5000h_device, pio3_pa_w))
MCFG_Z80PIO_OUT_ARDY_CB(DEVWRITELINE(Z80PIO_3_TAG, z80pio_device, strobe_a))
diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp
index d85b680de18..90f0e4abd54 100644
--- a/src/devices/bus/intv/ecs.cpp
+++ b/src/devices/bus/intv/ecs.cpp
@@ -97,7 +97,7 @@ void intv_ecs_device::late_subslot_setup()
MACHINE_CONFIG_START(intv_ecs_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono_ecs")
- MCFG_SOUND_ADD("ay8914", AY8914, XTAL_3_579545MHz/2)
+ MCFG_SOUND_ADD("ay8914", AY8914, XTAL(3'579'545)/2)
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("ctrl_port", intvecs_control_port_device, portA_r))
MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("ctrl_port", intvecs_control_port_device, portB_r))
MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("ctrl_port", intvecs_control_port_device, portA_w))
diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp
index 6a536b69f1f..51c9e1679c9 100644
--- a/src/devices/bus/isa/aga.cpp
+++ b/src/devices/bus/isa/aga.cpp
@@ -9,8 +9,8 @@
#include "aga.h"
#include "video/cgapal.h"
-#define CGA_HCLK (XTAL_14_31818MHz/8)
-#define CGA_LCLK (XTAL_14_31818MHz/16)
+#define CGA_HCLK (XTAL(14'318'181)/8)
+#define CGA_LCLK (XTAL(14'318'181)/16)
#define AGA_SCREEN_NAME "screen"
#define AGA_MC6845_NAME "mc6845_aga"
@@ -275,12 +275,12 @@ MC6845_UPDATE_ROW( isa8_aga_device::aga_update_row )
MACHINE_CONFIG_START(isa8_aga_device::device_add_mconfig)
MCFG_SCREEN_ADD( AGA_SCREEN_NAME, RASTER )
- MCFG_SCREEN_RAW_PARAMS( XTAL_14_31818MHz,912,0,640,262,0,200 )
+ MCFG_SCREEN_RAW_PARAMS( XTAL(14'318'181),912,0,640,262,0,200 )
MCFG_SCREEN_UPDATE_DEVICE( AGA_MC6845_NAME, mc6845_device, screen_update )
MCFG_PALETTE_ADD( "palette", /* CGA_PALETTE_SETS * 16*/ 65536 )
- MCFG_MC6845_ADD(AGA_MC6845_NAME, MC6845, AGA_SCREEN_NAME, XTAL_14_31818MHz/8)
+ MCFG_MC6845_ADD(AGA_MC6845_NAME, MC6845, AGA_SCREEN_NAME, XTAL(14'318'181)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(isa8_aga_device, aga_update_row)
@@ -863,7 +863,7 @@ void isa8_aga_device::pc_aga_set_mode( AGA_MODE mode)
switch (m_mode) {
case AGA_COLOR:
- m_mc6845->set_clock( XTAL_14_31818MHz/8 );
+ m_mc6845->set_clock( XTAL(14'318'181)/8 );
break;
case AGA_MONO:
m_mc6845->set_clock( 16257000/9 );
diff --git a/src/devices/bus/isa/aha1542.cpp b/src/devices/bus/isa/aha1542.cpp
index 9b633c5717a..5be4b1de3cb 100644
--- a/src/devices/bus/isa/aha1542.cpp
+++ b/src/devices/bus/isa/aha1542.cpp
@@ -175,7 +175,7 @@ const tiny_rom_entry *aha1542_device::device_rom_region() const
}
MACHINE_CONFIG_START(aha1542_device::device_add_mconfig)
- MCFG_CPU_ADD(Z84C0010_TAG, Z80, XTAL_12MHz)
+ MCFG_CPU_ADD(Z84C0010_TAG, Z80, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP( z84c0010_mem )
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp
index 0609d9ce7a3..7d87ae853bf 100644
--- a/src/devices/bus/isa/cga.cpp
+++ b/src/devices/bus/isa/cga.cpp
@@ -240,8 +240,8 @@ MC6845_UPDATE_ROW( isa8_cga_pc1512_device::crtc_update_row )
}
-#define CGA_HCLK (XTAL_14_31818MHz/8)
-#define CGA_LCLK (XTAL_14_31818MHz/16)
+#define CGA_HCLK (XTAL(14'318'181)/8)
+#define CGA_LCLK (XTAL(14'318'181)/16)
ROM_START( cga )
@@ -263,12 +263,12 @@ DEFINE_DEVICE_TYPE(ISA8_CGA, isa8_cga_device, "cga", "IBM Color/Graphics Monitor
MACHINE_CONFIG_START(isa8_cga_device::device_add_mconfig)
MCFG_SCREEN_ADD(CGA_SCREEN_NAME, RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,262,0,200)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181),912,0,640,262,0,200)
MCFG_SCREEN_UPDATE_DEVICE( DEVICE_SELF, isa8_cga_device, screen_update )
MCFG_PALETTE_ADD("palette", /* CGA_PALETTE_SETS * 16*/ 65536 )
- MCFG_MC6845_ADD(CGA_MC6845_NAME, MC6845, CGA_SCREEN_NAME, XTAL_14_31818MHz/8)
+ MCFG_MC6845_ADD(CGA_MC6845_NAME, MC6845, CGA_SCREEN_NAME, XTAL(14'318'181)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(isa8_cga_device, crtc_update_row)
@@ -1705,7 +1705,7 @@ MACHINE_CONFIG_START(isa8_cga_m24_device::device_add_mconfig)
isa8_cga_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY(CGA_SCREEN_NAME)
- MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,462,0,400)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181),912,0,640,462,0,400)
MCFG_DEVICE_MODIFY(CGA_MC6845_NAME)
MCFG_MC6845_RECONFIGURE_CB(isa8_cga_m24_device, reconfigure)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp
index 86d0ff8e6ab..3fa3a9b3ffb 100644
--- a/src/devices/bus/isa/com.cpp
+++ b/src/devices/bus/isa/com.cpp
@@ -33,22 +33,22 @@ DEFINE_DEVICE_TYPE(ISA8_COM, isa8_com_device, "isa_com", "Communications Adapter
//-------------------------------------------------
MACHINE_CONFIG_START(isa8_com_device::device_add_mconfig)
- MCFG_DEVICE_ADD( "uart_0", INS8250, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "uart_0", INS8250, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport0", rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1))
- MCFG_DEVICE_ADD( "uart_1", INS8250, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "uart_1", INS8250, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport1", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport1", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport1", rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_2))
- /*MCFG_DEVICE_ADD( "uart_2", INS8250, XTAL_1_8432MHz )
+ /*MCFG_DEVICE_ADD( "uart_2", INS8250, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport2", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport2", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport2", rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1))
- MCFG_DEVICE_ADD( "uart_3", INS8250, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "uart_3", INS8250, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport3", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport3", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport3", rs232_port_device, write_rts))
@@ -135,22 +135,22 @@ DEFINE_DEVICE_TYPE(ISA8_COM_AT, isa8_com_at_device, "isa_com_at", "Communication
//-------------------------------------------------
MACHINE_CONFIG_START(isa8_com_at_device::device_add_mconfig)
- MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL_1_8432MHz ) /* Verified: IBM P/N 6320947 Serial/Parallel card uses an NS16450N */
+ MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL(1'843'200) ) /* Verified: IBM P/N 6320947 Serial/Parallel card uses an NS16450N */
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport0", rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1))
- MCFG_DEVICE_ADD( "uart_1", NS16450, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "uart_1", NS16450, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport1", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport1", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport1", rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_2))
- /*MCFG_DEVICE_ADD( "uart_2", NS16450, XTAL_1_8432MHz )
+ /*MCFG_DEVICE_ADD( "uart_2", NS16450, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport2", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport2", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport2", rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1))
- MCFG_DEVICE_ADD( "uart_3", NS16450, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "uart_3", NS16450, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport3", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport3", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport3", rs232_port_device, write_rts))
diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp
index 38477e648ab..7cb022c0a19 100644
--- a/src/devices/bus/isa/dectalk.cpp
+++ b/src/devices/bus/isa/dectalk.cpp
@@ -154,12 +154,12 @@ const tiny_rom_entry* dectalk_isa_device::device_rom_region() const
}
MACHINE_CONFIG_START(dectalk_isa_device::device_add_mconfig)
- MCFG_CPU_ADD("dectalk_cpu", I80186, XTAL_20MHz)
+ MCFG_CPU_ADD("dectalk_cpu", I80186, XTAL(20'000'000))
MCFG_CPU_IO_MAP(dectalk_cpu_io)
MCFG_CPU_PROGRAM_MAP(dectalk_cpu_map)
MCFG_80186_TMROUT0_HANDLER(WRITELINE(dectalk_isa_device, clock_w));
- MCFG_CPU_ADD("dectalk_dsp", TMS32015, XTAL_20MHz)
+ MCFG_CPU_ADD("dectalk_dsp", TMS32015, XTAL(20'000'000))
MCFG_CPU_IO_MAP(dectalk_dsp_io)
MCFG_TMS32010_BIO_IN_CB(READLINE(dectalk_isa_device, bio_line_r))
MCFG_CPU_PROGRAM_MAP(dectalk_dsp_map)
diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp
index ceb8b9ddc5d..12ca0086531 100644
--- a/src/devices/bus/isa/ega.cpp
+++ b/src/devices/bus/isa/ega.cpp
@@ -940,7 +940,7 @@ void isa8_ega_device::change_mode()
}
/* Check for changes to the crtc input clock and number of pixels per clock */
- clock = ( ( m_misc_output & 0x0c ) ? 16257000 : XTAL_14_31818MHz );
+ clock = ( ( m_misc_output & 0x0c ) ? 16257000 : 14318181 );
pixels = ( ( m_sequencer.data[0x01] & 0x01 ) ? 8 : 9 );
if ( m_sequencer.data[0x01] & 0x08 )
diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp
index a0ac2dd5177..d98d404451c 100644
--- a/src/devices/bus/isa/ibm_mfc.cpp
+++ b/src/devices/bus/isa/ibm_mfc.cpp
@@ -373,7 +373,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(isa8_ibm_mfc_device::device_add_mconfig)
- MCFG_CPU_ADD("ibm_mfc", Z80, XTAL_11_8MHz / 2)
+ MCFG_CPU_ADD("ibm_mfc", Z80, XTAL(11'800'000) / 2)
MCFG_CPU_PROGRAM_MAP(prg_map)
MCFG_CPU_IO_MAP(io_map)
@@ -390,19 +390,19 @@ MACHINE_CONFIG_START(isa8_ibm_mfc_device::device_add_mconfig)
MCFG_DEVICE_ADD("d71051", I8251, 0)
- MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL_4MHz / 8) // 500KHz
+ MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL(4'000'000) / 8) // 500KHz
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(isa8_ibm_mfc_device, write_usart_clock))
MCFG_DEVICE_ADD("d8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_4MHz / 8)
+ MCFG_PIT8253_CLK0(XTAL(4'000'000) / 8)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(isa8_ibm_mfc_device, d8253_out0))
MCFG_PIT8253_CLK1(0)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(isa8_ibm_mfc_device, d8253_out1))
- MCFG_PIT8253_CLK2(XTAL_4MHz / 2)
+ MCFG_PIT8253_CLK2(XTAL(4'000'000) / 2)
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("d8253", pit8253_device, write_clk1))
MCFG_SPEAKER_STANDARD_STEREO("ymleft", "ymright")
- MCFG_YM2151_ADD("ym2151", XTAL_4MHz)
+ MCFG_YM2151_ADD("ym2151", XTAL(4'000'000))
MCFG_YM2151_IRQ_HANDLER(WRITELINE(isa8_ibm_mfc_device, ibm_mfc_ym_irq))
MCFG_SOUND_ROUTE(0, "ymleft", 1.00)
MCFG_SOUND_ROUTE(1, "ymright", 1.00)
diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp
index 6209473b467..d97985550f7 100644
--- a/src/devices/bus/isa/mc1502_fdc.cpp
+++ b/src/devices/bus/isa/mc1502_fdc.cpp
@@ -52,7 +52,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(mc1502_fdc_device::device_add_mconfig)
- MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16)
+ MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", mc1502_floppies, "525qd", mc1502_fdc_device::floppy_formats)
diff --git a/src/devices/bus/isa/myb3k_com.cpp b/src/devices/bus/isa/myb3k_com.cpp
index fbbaa39d8c1..61a79abe6f2 100644
--- a/src/devices/bus/isa/myb3k_com.cpp
+++ b/src/devices/bus/isa/myb3k_com.cpp
@@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(ISA8_MYB3K_COM, isa8_myb3k_com_device, "isa8_myb3k_com", "ADP
// device_add_mconfig - add device configuration
//-------------------------------------------------
MACHINE_CONFIG_START(isa8_myb3k_com_device::device_add_mconfig)
- MCFG_DEVICE_ADD( "usart", I8251, XTAL_15_9744MHz / 8 )
+ MCFG_DEVICE_ADD( "usart", I8251, XTAL(15'974'400) / 8 )
MCFG_I8251_TXD_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_txd))
MCFG_I8251_DTR_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_dtr))
MCFG_I8251_RTS_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_rts))
@@ -48,9 +48,9 @@ MACHINE_CONFIG_START(isa8_myb3k_com_device::device_add_mconfig)
/* Timer chip */
MCFG_DEVICE_ADD("pit", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_15_9744MHz / 8 ) /* TxC */
+ MCFG_PIT8253_CLK0(XTAL(15'974'400) / 8 ) /* TxC */
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(isa8_myb3k_com_device, pit_txc))
- MCFG_PIT8253_CLK1(XTAL_15_9744MHz / 8 ) /* RxC */
+ MCFG_PIT8253_CLK1(XTAL(15'974'400) / 8 ) /* RxC */
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(isa8_myb3k_com_device, pit_rxc))
// Timer 2 is not used/connected to anything on the schematics
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/myb3k_fdc.cpp b/src/devices/bus/isa/myb3k_fdc.cpp
index b23fe5258bc..2f4db748450 100644
--- a/src/devices/bus/isa/myb3k_fdc.cpp
+++ b/src/devices/bus/isa/myb3k_fdc.cpp
@@ -93,7 +93,7 @@ SLOT_INTERFACE_END
//-------------------------------------------------
/* */
MACHINE_CONFIG_START(isa8_myb3k_fdc4710_device::device_add_mconfig)
- MCFG_DEVICE_ADD("fdc", MB8876, XTAL_15_9744MHz / 8) /* From StepOne schematics */
+ MCFG_DEVICE_ADD("fdc", MB8876, XTAL(15'974'400) / 8) /* From StepOne schematics */
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4710_device, irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4710_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_sd_floppies, "525sd", isa8_myb3k_fdc4710_device::myb3k_floppy_formats)
@@ -102,7 +102,7 @@ MACHINE_CONFIG_END
/* Main difference from fdc4710 is that a Hitachi HA16632AP has replaced the descrete VFO enabling 720Kb disks */
MACHINE_CONFIG_START(isa8_myb3k_fdc4711_device::device_add_mconfig)
- MCFG_DEVICE_ADD("fdc", FD1791, XTAL_15_9744MHz / 16)
+ MCFG_DEVICE_ADD("fdc", FD1791, XTAL(15'974'400) / 16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4711_device, irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4711_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_qd_floppies, "525qd", isa8_myb3k_fdc4711_device::myb3k_floppy_formats)
@@ -113,7 +113,7 @@ MACHINE_CONFIG_END
#if 0
MACHINE_CONFIG_START(isa8_myb3k_fdc4712_device::device_add_mconfig)
- MCFG_DEVICE_ADD("fdc", FD1791, XTAL_15_9744MHz / 8)
+ MCFG_DEVICE_ADD("fdc", FD1791, XTAL(15'974'400) / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4712_device, irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4712_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_8inch_floppies, "8dsdd", isa8_myb3k_fdc4712_device::myb3k_floppy_formats)
diff --git a/src/devices/bus/isa/num9rev.cpp b/src/devices/bus/isa/num9rev.cpp
index ebdd5b7e4cb..5ec78ab8399 100644
--- a/src/devices/bus/isa/num9rev.cpp
+++ b/src/devices/bus/isa/num9rev.cpp
@@ -60,7 +60,7 @@ MACHINE_CONFIG_START(isa8_number_9_rev_device::device_add_mconfig)
MCFG_SCREEN_UPDATE_DRIVER(isa8_number_9_rev_device, screen_update)
MCFG_PALETTE_ADD("palette", 4096)
- MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL_4_433619MHz/2) // unknown clock
+ MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL(4'433'619)/2) // unknown clock
MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(isa8_number_9_rev_device, hgdc_display_pixels)
MCFG_VIDEO_SET_SCREEN("screen")
diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp
index d9a0e3d86a0..5d47a021d94 100644
--- a/src/devices/bus/isa/p1_fdc.cpp
+++ b/src/devices/bus/isa/p1_fdc.cpp
@@ -62,7 +62,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(p1_fdc_device::device_add_mconfig)
- MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16)
+ MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", poisk1_floppies, "525qd", p1_fdc_device::floppy_formats)
diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp
index e9a12df010b..9fa6ea3852e 100644
--- a/src/devices/bus/isa/p1_sound.cpp
+++ b/src/devices/bus/isa/p1_sound.cpp
@@ -40,28 +40,28 @@ MACHINE_CONFIG_START(p1_sound_device::device_add_mconfig)
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("d14", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_12_5MHz/10)
+ MCFG_PIT8253_CLK0(XTAL(12'500'000)/10)
// sampler at 10 KHz
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(p1_sound_device, sampler_sync))
- MCFG_PIT8253_CLK1(XTAL_12_5MHz/10)
+ MCFG_PIT8253_CLK1(XTAL(12'500'000)/10)
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("midi", i8251_device, write_txc))
- MCFG_PIT8253_CLK2(XTAL_12_5MHz/10)
+ MCFG_PIT8253_CLK2(XTAL(12'500'000)/10)
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("midi", i8251_device, write_rxc))
MCFG_DEVICE_ADD("d16", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_12_5MHz/10)
+ MCFG_PIT8253_CLK0(XTAL(12'500'000)/10)
// MCFG_PIT8253_OUT0_HANDLER(XXX)
- MCFG_PIT8253_CLK1(XTAL_12_5MHz/10)
+ MCFG_PIT8253_CLK1(XTAL(12'500'000)/10)
// MCFG_PIT8253_OUT1_HANDLER(XXX)
- MCFG_PIT8253_CLK2(XTAL_12_5MHz/10)
+ MCFG_PIT8253_CLK2(XTAL(12'500'000)/10)
// MCFG_PIT8253_OUT2_HANDLER(XXX)
MCFG_DEVICE_ADD("d17", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_12_5MHz/10)
+ MCFG_PIT8253_CLK0(XTAL(12'500'000)/10)
// MCFG_PIT8253_OUT0_HANDLER(XXX)
- MCFG_PIT8253_CLK1(XTAL_12_5MHz/10)
+ MCFG_PIT8253_CLK1(XTAL(12'500'000)/10)
// MCFG_PIT8253_OUT1_HANDLER(XXX)
- MCFG_PIT8253_CLK2(XTAL_12_5MHz/10)
+ MCFG_PIT8253_CLK2(XTAL(12'500'000)/10)
// MCFG_PIT8253_OUT2_HANDLER(XXX)
MCFG_SPEAKER_STANDARD_MONO("speaker")
diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp
index 5caced97de5..6c49434e456 100644
--- a/src/devices/bus/isa/pgc.cpp
+++ b/src/devices/bus/isa/pgc.cpp
@@ -151,7 +151,7 @@ DEFINE_DEVICE_TYPE(ISA8_PGC, isa8_pgc_device, "isa_ibm_pgc", "IBM Professional G
//-------------------------------------------------
MACHINE_CONFIG_START(isa8_pgc_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", I8088, XTAL_24MHz/3)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(24'000'000)/3)
MCFG_CPU_PROGRAM_MAP(pgc_map)
MCFG_CPU_IO_MAP(pgc_io)
#if 0
@@ -161,10 +161,10 @@ MACHINE_CONFIG_START(isa8_pgc_device::device_add_mconfig)
MCFG_TIMER_DRIVER_ADD_PERIODIC("scantimer", isa8_pgc_device, scanline_callback,
attotime::from_hz(60*PGC_TOTAL_VERT))
- MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL_50MHz/(2*PGC_HORZ_START)))
+ MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL(50'000'000)/(2*PGC_HORZ_START)))
MCFG_SCREEN_ADD(PGC_SCREEN_NAME, RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_50MHz/2,
+ MCFG_SCREEN_RAW_PARAMS(XTAL(50'000'000)/2,
PGC_TOTAL_HORZ, PGC_HORZ_START, PGC_HORZ_START+PGC_DISP_HORZ,
PGC_TOTAL_VERT, PGC_VERT_START, PGC_VERT_START+PGC_DISP_VERT)
MCFG_SCREEN_UPDATE_DRIVER(isa8_pgc_device, screen_update)
diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp
index 27c142036bf..7fbc8be6aff 100644
--- a/src/devices/bus/isa/s3virge.cpp
+++ b/src/devices/bus/isa/s3virge.cpp
@@ -260,15 +260,15 @@ uint8_t s3virge_vga_device::s3_crtc_reg_read(uint8_t index)
void s3virge_vga_device::s3_define_video_mode()
{
int divisor = 1;
- int xtal = (vga.miscellaneous_output & 0xc) ? XTAL_28_63636MHz : XTAL_25_1748MHz;
- double freq;
+ const XTAL base_xtal = XTAL(14'318'181);
+ XTAL xtal = (vga.miscellaneous_output & 0xc) ? base_xtal*2 : base_xtal*1.75;
if((vga.miscellaneous_output & 0xc) == 0x0c)
{
// Dot clock is set via SR12 and SR13
// DCLK calculation
- freq = ((double)(s3.clk_pll_m+2) / (double)((s3.clk_pll_n+2)*(pow(2.0,s3.clk_pll_r)))) * 14.318; // clock between XIN and XOUT
- xtal = freq * 1000000;
+ double ratio = (double)(s3.clk_pll_m+2) / (double)((s3.clk_pll_n+2)*(pow(2.0,s3.clk_pll_r))); // clock between XIN and XOUT
+ xtal = base_xtal * ratio;
//printf("DCLK set to %dHz M=%i N=%i R=%i\n",xtal,s3.clk_pll_m,s3.clk_pll_n,s3.clk_pll_r);
}
@@ -296,7 +296,7 @@ void s3virge_vga_device::s3_define_video_mode()
}
if(s3.cr43 & 0x80) // Horizontal clock doubling (techincally, doubles horizontal CRT parameters)
divisor *= 2;
- recompute_params_clock(divisor, xtal);
+ recompute_params_clock(divisor, xtal.value());
}
void s3virge_vga_device::s3_crtc_reg_write(uint8_t index, uint8_t data)
diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp
index 7f0f2d52b12..4d2fb059c2e 100644
--- a/src/devices/bus/isa/sb16.cpp
+++ b/src/devices/bus/isa/sb16.cpp
@@ -411,11 +411,11 @@ const tiny_rom_entry *sb16_lle_device::device_rom_region() const
}
MACHINE_CONFIG_START(sb16_lle_device::device_add_mconfig)
- MCFG_CPU_ADD("sb16_cpu", I80C52, XTAL_24MHz)
+ MCFG_CPU_ADD("sb16_cpu", I80C52, XTAL(24'000'000))
MCFG_CPU_IO_MAP(sb16_io)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymf262", YMF262, XTAL_14_31818MHz)
+ MCFG_SOUND_ADD("ymf262", YMF262, XTAL(14'318'181))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MCFG_SOUND_ROUTE(2, "lspeaker", 1.00)
diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp
index c693e4648c9..9e1260fa25b 100644
--- a/src/devices/bus/isa/sblaster.cpp
+++ b/src/devices/bus/isa/sblaster.cpp
@@ -52,8 +52,8 @@
jumperable? normally 0x220
*/
-#define ym3812_StdClock XTAL_3_579545MHz
-#define ymf262_StdClock XTAL_14_31818MHz
+#define ym3812_StdClock XTAL(3'579'545)
+#define ymf262_StdClock XTAL(14'318'181)
static const int m_cmd_fifo_length[256] =
{
diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp
index 4f8568032e4..45adc68b34b 100644
--- a/src/devices/bus/isa/ssi2001.cpp
+++ b/src/devices/bus/isa/ssi2001.cpp
@@ -12,7 +12,7 @@ DEFINE_DEVICE_TYPE(ISA8_SSI2001, ssi2001_device, "ssi2001", "Innovation SSI-2001
MACHINE_CONFIG_START(ssi2001_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sid6581", MOS6581, XTAL_14_31818MHz/16)
+ MCFG_SOUND_ADD("sid6581", MOS6581, XTAL(14'318'181)/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_PC_JOY_ADD("pc_joy")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp
index 5b9b05033b1..93b397fb703 100644
--- a/src/devices/bus/isa/stereo_fx.cpp
+++ b/src/devices/bus/isa/stereo_fx.cpp
@@ -115,12 +115,12 @@ const tiny_rom_entry *stereo_fx_device::device_rom_region() const
}
MACHINE_CONFIG_START(stereo_fx_device::device_add_mconfig)
- MCFG_CPU_ADD("stereo_fx_cpu", I80C31, XTAL_30MHz)
+ MCFG_CPU_ADD("stereo_fx_cpu", I80C31, XTAL(30'000'000))
MCFG_CPU_IO_MAP(stereo_fx_io)
MCFG_CPU_PROGRAM_MAP(stereo_fx_rom)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ym3812", YM3812, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ym3812", YM3812, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
/* no CM/S support (empty sockets) */
diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp
index a28ef5876e2..a7204ce8457 100644
--- a/src/devices/bus/isa/svga_cirrus.cpp
+++ b/src/devices/bus/isa/svga_cirrus.cpp
@@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_CIRRUS_GD542X, isa16_svga_cirrus_gd542x_device, "c
MACHINE_CONFIG_START(isa16_svga_cirrus_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5430_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -113,7 +113,7 @@ ROM_END
MACHINE_CONFIG_START(isa16_svga_cirrus_gd542x_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp
index ee5df928b97..353316e1891 100644
--- a/src/devices/bus/isa/svga_s3.cpp
+++ b/src/devices/bus/isa/svga_s3.cpp
@@ -42,7 +42,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_S3, isa16_svga_s3_device, "s3_764", "Number Nine 9
MACHINE_CONFIG_START(isa16_svga_s3_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", s3_vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -149,7 +149,7 @@ DEFINE_DEVICE_TYPE(ISA16_S3VIRGE, isa16_s3virge_device, "s3virge", "S3 ViRGE Gra
MACHINE_CONFIG_START(isa16_s3virge_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", s3virge_vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -231,7 +231,7 @@ DEFINE_DEVICE_TYPE(ISA16_S3VIRGEDX, isa16_s3virgedx_device, "s3virgedx", "S3 ViR
MACHINE_CONFIG_START(isa16_s3virgedx_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", s3virgedx_vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -314,7 +314,7 @@ DEFINE_DEVICE_TYPE(ISA16_DMS3D2KPRO, isa16_stealth3d2kpro_device, "dms3d2kp", "D
MACHINE_CONFIG_START(isa16_stealth3d2kpro_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", s3virgedx_rev1_vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp
index 22b307cd6ad..55c01884f63 100644
--- a/src/devices/bus/isa/svga_trident.cpp
+++ b/src/devices/bus/isa/svga_trident.cpp
@@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_TGUI9680, isa16_svga_tgui9680_device, "tgui9680",
MACHINE_CONFIG_START(isa16_svga_tgui9680_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", trident_vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp
index 8d60d1a2400..16c76e169b7 100644
--- a/src/devices/bus/isa/svga_tseng.cpp
+++ b/src/devices/bus/isa/svga_tseng.cpp
@@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(ISA8_SVGA_ET4K, isa8_svga_et4k_device, "et4000", "SVGA Tseng
MACHINE_CONFIG_START(isa8_svga_et4k_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", tseng_vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
diff --git a/src/devices/bus/isa/trident.cpp b/src/devices/bus/isa/trident.cpp
index 287ef49b40a..2357f0cdfbc 100644
--- a/src/devices/bus/isa/trident.cpp
+++ b/src/devices/bus/isa/trident.cpp
@@ -346,8 +346,8 @@ void trident_vga_device::trident_define_video_mode()
switch(tri.clock)
{
case 0:
- default: xtal = XTAL_25_1748MHz; break;
- case 1: xtal = XTAL_28_63636MHz; break;
+ default: xtal = 25174800; break;
+ case 1: xtal = 28636363; break;
case 2: xtal = 44900000; break;
case 3: xtal = 36000000; break;
case 4: xtal = 57272000; break;
@@ -378,8 +378,8 @@ void trident_vga_device::trident_define_video_mode()
switch((vga.miscellaneous_output & 0x0c) >> 2)
{
case 0:
- default: xtal = XTAL_25_1748MHz; break;
- case 1: xtal = XTAL_28_63636MHz; break;
+ default: xtal = 25174800; break;
+ case 1: xtal = 28636363; break;
case 2: xtal = calculate_clock(); break;
}
diff --git a/src/devices/bus/isa/vga.cpp b/src/devices/bus/isa/vga.cpp
index 88c38cd1543..280108cb5b3 100644
--- a/src/devices/bus/isa/vga.cpp
+++ b/src/devices/bus/isa/vga.cpp
@@ -29,7 +29,7 @@ DEFINE_DEVICE_TYPE(ISA8_VGA, isa8_vga_device, "ibm_vga", "IBM VGA Graphics Card"
MACHINE_CONFIG_START(isa8_vga_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp
index 25f4202cd89..ff1bd656b9b 100644
--- a/src/devices/bus/isa/vga_ati.cpp
+++ b/src/devices/bus/isa/vga_ati.cpp
@@ -78,7 +78,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_MACH64, isa16_vga_mach64_device, "mach64
MACHINE_CONFIG_START(isa16_vga_gfxultra_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", ati_vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -88,7 +88,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(isa16_vga_gfxultrapro_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", mach32_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -98,7 +98,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(isa16_vga_mach64_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", mach64_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp
index f2103e0f860..c58713bde33 100644
--- a/src/devices/bus/kc/d004.cpp
+++ b/src/devices/bus/kc/d004.cpp
@@ -147,12 +147,12 @@ void kc_d004_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(kc_d004_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(kc_d004_mem)
MCFG_CPU_IO_MAP(kc_d004_io)
MCFG_Z80_DAISY_CHAIN(kc_d004_daisy_chain)
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, 0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg1))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg2))
diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp
index 861bde164c8..882ceb26efa 100644
--- a/src/devices/bus/lpci/southbridge.cpp
+++ b/src/devices/bus/lpci/southbridge.cpp
@@ -34,7 +34,7 @@ MACHINE_CONFIG_START(southbridge_device::device_add_mconfig)
MCFG_PIT8253_CLK2(4772720/4) // pio port c pin 4, and speaker polling enough
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(southbridge_device, at_pit8254_out2_changed))
- MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 )
MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq0_w))
MCFG_I8237_OUT_EOP_CB(WRITELINE(southbridge_device, at_dma8237_out_eop))
MCFG_I8237_IN_MEMR_CB(READ8(southbridge_device, pc_dma_read_byte))
@@ -52,7 +52,7 @@ MACHINE_CONFIG_START(southbridge_device::device_add_mconfig)
MCFG_I8237_OUT_DACK_2_CB(WRITELINE(southbridge_device, pc_dack2_w))
MCFG_I8237_OUT_DACK_3_CB(WRITELINE(southbridge_device, pc_dack3_w))
- MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 )
MCFG_I8237_OUT_HREQ_CB(WRITELINE(southbridge_device, pc_dma_hrq_changed))
MCFG_I8237_IN_MEMR_CB(READ8(southbridge_device, pc_dma_read_word))
MCFG_I8237_OUT_MEMW_CB(WRITE8(southbridge_device, pc_dma_write_word))
@@ -456,7 +456,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(southbridge_extended_device::device_add_mconfig)
southbridge_device::device_add_mconfig(config);
- MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL_12MHz)
+ MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000))
MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(INPUTLINE(":maincpu", INPUT_LINE_RESET))
MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(INPUTLINE(":maincpu", INPUT_LINE_A20))
MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir1_w))
diff --git a/src/devices/bus/msx_cart/bm_012.cpp b/src/devices/bus/msx_cart/bm_012.cpp
index bf1f8cbc977..949c2b64d46 100644
--- a/src/devices/bus/msx_cart/bm_012.cpp
+++ b/src/devices/bus/msx_cart/bm_012.cpp
@@ -47,7 +47,7 @@ MACHINE_CONFIG_START(msx_cart_bm_012_device::device_add_mconfig)
// - PIO
// - CGC
// - WDT
- MCFG_CPU_ADD("tmpz84c015af", TMPZ84C015, XTAL_12MHz/2) /* 6 MHz */
+ MCFG_CPU_ADD("tmpz84c015af", TMPZ84C015, XTAL(12'000'000)/2) /* 6 MHz */
MCFG_CPU_PROGRAM_MAP(bm_012_memory_map)
// PIO callbacks
MCFG_TMPZ84C015_IN_PA_CB(DEVREAD8("bm012_pio", z80pio_device, pa_r))
@@ -60,7 +60,7 @@ MACHINE_CONFIG_START(msx_cart_bm_012_device::device_add_mconfig)
// Sony CXK5864BSP-10L (8KB ram)
// Sharp LH0081A Z80A-PIO-0 - For communicating between the MSX and the TMP
- MCFG_DEVICE_ADD("bm012_pio", Z80PIO, XTAL_3_579545MHz) // ?????
+ MCFG_DEVICE_ADD("bm012_pio", Z80PIO, XTAL(3'579'545)) // ?????
MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("tmpz84c015af", tmpz84c015_device, pa_w))
MCFG_Z80PIO_IN_PA_CB(DEVREAD8("tmpz84c015af", tmpz84c015_device, pa_r))
MCFG_Z80PIO_OUT_PB_CB(DEVWRITE8("tmpz84c015af", tmpz84c015_device, pb_w))
diff --git a/src/devices/bus/msx_cart/disk.cpp b/src/devices/bus/msx_cart/disk.cpp
index eddd5d9cfa0..30ff4361e7c 100644
--- a/src/devices/bus/msx_cart/disk.cpp
+++ b/src/devices/bus/msx_cart/disk.cpp
@@ -199,7 +199,7 @@ MACHINE_CONFIG_START(msx_cart_vy0010_device::device_add_mconfig)
// HLT pulled high
// SSO/-ENMF + -DDEN + ENP + -5/8 - pulled low
// READY inverted in VY-0010 cartridge and pulled low on VY-0010/VY-0011 floppy drive
- MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4)
+ MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 4)
MCFG_WD_FDC_FORCE_READY
// Single sided 3.5" floppy drive
@@ -214,7 +214,7 @@ MACHINE_CONFIG_START(msx_cart_vy0010_device::device_add_mconfig)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(msx_cart_fsfd1_device::device_add_mconfig)
- MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4)
+ MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 4)
// Double sided 3.5" floppy drive
MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35dd", msx_cart_disk_device::floppy_formats)
@@ -244,7 +244,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(msx_cart_fscf351_device::device_add_mconfig)
- MCFG_MB8877_ADD("fdc", XTAL_4MHz / 4)
+ MCFG_MB8877_ADD("fdc", XTAL(4'000'000) / 4)
MCFG_WD_FDC_FORCE_READY
// Double sided 3.5" floppy drive
diff --git a/src/devices/bus/msx_cart/fmpac.cpp b/src/devices/bus/msx_cart/fmpac.cpp
index 788fbb6827e..97edffd3b11 100644
--- a/src/devices/bus/msx_cart/fmpac.cpp
+++ b/src/devices/bus/msx_cart/fmpac.cpp
@@ -32,7 +32,7 @@ msx_cart_fmpac_device::msx_cart_fmpac_device(const machine_config &mconfig, cons
MACHINE_CONFIG_START(msx_cart_fmpac_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_10_738635MHz/3)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/msx_cart/konami.cpp b/src/devices/bus/msx_cart/konami.cpp
index 57d08bc2c7d..0663422b69c 100644
--- a/src/devices/bus/msx_cart/konami.cpp
+++ b/src/devices/bus/msx_cart/konami.cpp
@@ -144,7 +144,7 @@ msx_cart_konami_scc_device::msx_cart_konami_scc_device(const machine_config &mco
MACHINE_CONFIG_START(msx_cart_konami_scc_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("k051649", K051649, XTAL_10_738635MHz/3/2)
+ MCFG_SOUND_ADD("k051649", K051649, XTAL(10'738'635)/3/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
@@ -548,7 +548,7 @@ msx_cart_konami_sound_device::msx_cart_konami_sound_device(const machine_config
MACHINE_CONFIG_START(msx_cart_konami_sound_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("k052539", K051649, XTAL_10_738635MHz/3/2)
+ MCFG_SOUND_ADD("k052539", K051649, XTAL(10'738'635)/3/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
@@ -874,7 +874,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(msx_cart_keyboard_master_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("vlm5030", VLM5030, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("vlm5030", VLM5030, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/msx_cart/msx_audio.cpp b/src/devices/bus/msx_cart/msx_audio.cpp
index 9dcfb09d869..5184a15c2a1 100644
--- a/src/devices/bus/msx_cart/msx_audio.cpp
+++ b/src/devices/bus/msx_cart/msx_audio.cpp
@@ -83,7 +83,7 @@ msx_cart_msx_audio_hxmu900_device::msx_cart_msx_audio_hxmu900_device(const machi
MACHINE_CONFIG_START(msx_cart_msx_audio_hxmu900_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("y8950", Y8950, XTAL_3_579545MHz) // Not verified
+ MCFG_SOUND_ADD("y8950", Y8950, XTAL(3'579'545)) // Not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_Y8950_KEYBOARD_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write))
MCFG_Y8950_KEYBOARD_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read))
@@ -149,7 +149,7 @@ MACHINE_CONFIG_START(msx_cart_msx_audio_nms1205_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
// At the same time the sound is also output on two output on the nms1205 cartridge itself
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("y8950", Y8950, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("y8950", Y8950, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_Y8950_KEYBOARD_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write))
MCFG_Y8950_KEYBOARD_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read))
@@ -249,7 +249,7 @@ msx_cart_msx_audio_fsca1_device::msx_cart_msx_audio_fsca1_device(const machine_c
MACHINE_CONFIG_START(msx_cart_msx_audio_fsca1_device::device_add_mconfig)
// This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'.
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("y8950", Y8950, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("y8950", Y8950, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_Y8950_KEYBOARD_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write))
MCFG_Y8950_KEYBOARD_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read))
diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp
index f0ef8ecc1aa..3bb4f7c63dc 100644
--- a/src/devices/bus/msx_cart/yamaha.cpp
+++ b/src/devices/bus/msx_cart/yamaha.cpp
@@ -52,12 +52,12 @@ MACHINE_CONFIG_START(msx_cart_sfg_device::device_add_mconfig)
// YM2148 (MKS)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ym2151", XTAL_3_579545MHz) // The SFG01 uses a YM2151, the SFG05 uses a YM2164, input clock comes from the main cpu frequency
+ MCFG_YM2151_ADD("ym2151", XTAL(3'579'545)) // The SFG01 uses a YM2151, the SFG05 uses a YM2164, input clock comes from the main cpu frequency
MCFG_YM2151_IRQ_HANDLER(WRITELINE(msx_cart_sfg_device, ym2151_irq_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MCFG_DEVICE_ADD("ym2148", YM2148, XTAL_4MHz)
+ MCFG_DEVICE_ADD("ym2148", YM2148, XTAL(4'000'000))
MCFG_YM2148_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
MCFG_YM2148_PORT_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write))
MCFG_YM2148_PORT_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read))
diff --git a/src/devices/bus/nasbus/avc.cpp b/src/devices/bus/nasbus/avc.cpp
index 327ab6a5146..0fb9ecdcd1b 100644
--- a/src/devices/bus/nasbus/avc.cpp
+++ b/src/devices/bus/nasbus/avc.cpp
@@ -29,7 +29,7 @@ MACHINE_CONFIG_START(nascom_avc_device::device_add_mconfig)
MCFG_PALETTE_ADD_3BIT_RGB("palette")
- MCFG_MC6845_ADD("mc6845", MC6845, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD("mc6845", MC6845, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(6)
MCFG_MC6845_UPDATE_ROW_CB(nascom_avc_device, crtc_update_row)
diff --git a/src/devices/bus/nasbus/floppy.cpp b/src/devices/bus/nasbus/floppy.cpp
index a59e51ce422..ffa1be5fce8 100644
--- a/src/devices/bus/nasbus/floppy.cpp
+++ b/src/devices/bus/nasbus/floppy.cpp
@@ -38,7 +38,7 @@ SLOT_INTERFACE_END
//-------------------------------------------------
MACHINE_CONFIG_START(nascom_fdc_device::device_add_mconfig)
- MCFG_FD1793_ADD("fd1793", XTAL_16MHz / 4 / 4)
+ MCFG_FD1793_ADD("fd1793", XTAL(16'000'000) / 4 / 4)
MCFG_FLOPPY_DRIVE_ADD("fd1793:0", nascom_floppies, "55f", nascom_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1793:1", nascom_floppies, "55f", nascom_fdc_device::floppy_formats)
diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp
index 91f7f192f87..4f3d8644bff 100644
--- a/src/devices/bus/nes/konami.cpp
+++ b/src/devices/bus/nes/konami.cpp
@@ -645,7 +645,7 @@ MACHINE_CONFIG_START(nes_konami_vrc6_device::device_add_mconfig)
// TODO: this is not how VRC6 clock signaling works!
// The board uses the CLK pin in reality, not hardcoded NTSC values!
- MCFG_SOUND_ADD("vrc6snd", VRC6, XTAL_21_4772MHz/12)
+ MCFG_SOUND_ADD("vrc6snd", VRC6, XTAL(21'477'272)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.5)
MACHINE_CONFIG_END
@@ -769,6 +769,6 @@ MACHINE_CONFIG_START(nes_konami_vrc7_device::device_add_mconfig)
// TODO: this is not how VRC7 clock signaling works!
// The board uses the CLK pin in reality, not hardcoded NTSC values!
- MCFG_SOUND_ADD("ym", YM2413, XTAL_21_4772MHz/12)
+ MCFG_SOUND_ADD("ym", YM2413, XTAL(21'477'272)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.5)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp
index 8b527d1ec43..bffd3b2b608 100644
--- a/src/devices/bus/nes/sunsoft.cpp
+++ b/src/devices/bus/nes/sunsoft.cpp
@@ -617,6 +617,6 @@ MACHINE_CONFIG_START(nes_sunsoft_5_device::device_add_mconfig)
// TODO: this is not how Sunsoft 5B clock signaling works!
// The board uses the CLK pin in reality, not hardcoded NTSC values!
- MCFG_SOUND_ADD("ay", YM2149, (XTAL_21_4772MHz/12)/2) // divide by 2 for the internal divider
+ MCFG_SOUND_ADD("ay", YM2149, (XTAL(21'477'272)/12)/2) // divide by 2 for the internal divider
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp
index f07e29b245e..503c9086835 100644
--- a/src/devices/bus/newbrain/eim.cpp
+++ b/src/devices/bus/newbrain/eim.cpp
@@ -69,12 +69,12 @@ const tiny_rom_entry *newbrain_eim_device::device_rom_region() const
MACHINE_CONFIG_START(newbrain_eim_device::device_add_mconfig)
// devices
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_16MHz/8)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/8)
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(MC6850_TAG, acia6850_device, write_rxc))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(MC6850_TAG, acia6850_device, write_txc))
MCFG_Z80CTC_ZC2_CB(WRITELINE(newbrain_eim_device, ctc_z2_w))
- MCFG_TIMER_DRIVER_ADD_PERIODIC("z80ctc_c2", newbrain_eim_device, ctc_c2_tick, attotime::from_hz(XTAL_16MHz/4/13))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("z80ctc_c2", newbrain_eim_device, ctc_c2_tick, attotime::from_hz(XTAL(16'000'000)/4/13))
MCFG_DEVICE_ADD(ADC0809_TAG, ADC0808, 500000)
MCFG_ADC0808_OUT_EOC_CB(WRITELINE(newbrain_eim_device, adc_eoc_w))
MCFG_ADC0808_IN_VREF_POS_CB(newbrain_eim_device, adc_vref_pos_r)
@@ -92,7 +92,7 @@ MACHINE_CONFIG_START(newbrain_eim_device::device_add_mconfig)
MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(newbrain_eim_device, acia_interrupt))
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_NEWBRAIN_EXPANSION_SLOT_ADD(NEWBRAIN_EXPANSION_SLOT_TAG, XTAL_16MHz/8, newbrain_expansion_cards, "fdc")
+ MCFG_NEWBRAIN_EXPANSION_SLOT_ADD(NEWBRAIN_EXPANSION_SLOT_TAG, XTAL(16'000'000)/8, newbrain_expansion_cards, "fdc")
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp
index 52ee62e262a..33e81c93ac3 100644
--- a/src/devices/bus/newbrain/fdc.cpp
+++ b/src/devices/bus/newbrain/fdc.cpp
@@ -102,7 +102,7 @@ SLOT_INTERFACE_END
//-------------------------------------------------
MACHINE_CONFIG_START(newbrain_fdc_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(newbrain_fdc_mem)
MCFG_CPU_IO_MAP(newbrain_fdc_io)
@@ -114,7 +114,7 @@ MACHINE_CONFIG_START(newbrain_fdc_device::device_add_mconfig)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":2", newbrain_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":3", newbrain_floppies, nullptr, floppy_image_device::default_floppy_formats)
- MCFG_NEWBRAIN_EXPANSION_SLOT_ADD(NEWBRAIN_EXPANSION_SLOT_TAG, XTAL_16MHz/8, newbrain_expansion_cards, nullptr)
+ MCFG_NEWBRAIN_EXPANSION_SLOT_ADD(NEWBRAIN_EXPANSION_SLOT_TAG, XTAL(16'000'000)/8, newbrain_expansion_cards, nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nubus/bootbug.cpp b/src/devices/bus/nubus/bootbug.cpp
index 5a8db4cec39..447887dd032 100644
--- a/src/devices/bus/nubus/bootbug.cpp
+++ b/src/devices/bus/nubus/bootbug.cpp
@@ -46,7 +46,7 @@ DEFINE_DEVICE_TYPE(NUBUS_BOOTBUG, nubus_bootbug_device, "nb_btbug", "Brigent Boo
//-------------------------------------------------
MACHINE_CONFIG_START(nubus_bootbug_device::device_add_mconfig)
- MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport0", rs232_port_device, write_rts))
diff --git a/src/devices/bus/nubus/quadralink.cpp b/src/devices/bus/nubus/quadralink.cpp
index 3fca63470bc..199cd08d13f 100644
--- a/src/devices/bus/nubus/quadralink.cpp
+++ b/src/devices/bus/nubus/quadralink.cpp
@@ -37,11 +37,11 @@ DEFINE_DEVICE_TYPE(NUBUS_QUADRALINK, nubus_quadralink_device, "nb_qdlink", "Appl
//-------------------------------------------------
MACHINE_CONFIG_START(nubus_quadralink_device::device_add_mconfig)
- MCFG_SCC8530_ADD("scc1", XTAL_3_6864MHz, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD("scc1", XTAL(3'686'400), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE("serport1", rs232_port_device, write_txd))
- MCFG_SCC8530_ADD("scc2", XTAL_3_6864MHz, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD("scc2", XTAL(3'686'400), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE("serport2", rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE("serport3", rs232_port_device, write_txd))
diff --git a/src/devices/bus/odyssey2/chess.cpp b/src/devices/bus/odyssey2/chess.cpp
index fd44863bae3..a3f5609fbe7 100644
--- a/src/devices/bus/odyssey2/chess.cpp
+++ b/src/devices/bus/odyssey2/chess.cpp
@@ -44,7 +44,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(o2_chess_device::device_add_mconfig)
- MCFG_CPU_ADD("subcpu", NSC800, XTAL_4MHz)
+ MCFG_CPU_ADD("subcpu", NSC800, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(chess_mem)
MCFG_CPU_IO_MAP(chess_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp
index 400311da867..b573f11657e 100644
--- a/src/devices/bus/oricext/jasmin.cpp
+++ b/src/devices/bus/oricext/jasmin.cpp
@@ -71,7 +71,7 @@ const tiny_rom_entry *jasmin_device::device_rom_region() const
}
MACHINE_CONFIG_START(jasmin_device::device_add_mconfig)
- MCFG_WD1770_ADD("fdc", XTAL_8MHz)
+ MCFG_WD1770_ADD("fdc", XTAL(8'000'000))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(oricext_device, irq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", jasmin_floppies, "3dsdd", jasmin_device::floppy_formats)
diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp
index 7d151fa1b54..f53e3cb0e73 100644
--- a/src/devices/bus/oricext/microdisc.cpp
+++ b/src/devices/bus/oricext/microdisc.cpp
@@ -67,7 +67,7 @@ const tiny_rom_entry *microdisc_device::device_rom_region() const
}
MACHINE_CONFIG_START(microdisc_device::device_add_mconfig)
- MCFG_FD1793_ADD("fdc", XTAL_8MHz/8)
+ MCFG_FD1793_ADD("fdc", XTAL(8'000'000)/8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(microdisc_device, fdc_irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(microdisc_device, fdc_drq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(microdisc_device, fdc_hld_w))
diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp
index dfbc2aaed62..26af0640856 100644
--- a/src/devices/bus/pc_kbd/ec1841.cpp
+++ b/src/devices/bus/pc_kbd/ec1841.cpp
@@ -67,7 +67,7 @@ const tiny_rom_entry *ec_1841_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(ec_1841_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5_46MHz)
+ MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(5'460'000))
MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ec_1841_keyboard_device, bus_w))
MCFG_MCS48_PORT_P1_IN_CB(READ8(ec_1841_keyboard_device, p1_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(ec_1841_keyboard_device, p1_w))
diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp
index 4908db4baef..8ff77fb9727 100644
--- a/src/devices/bus/pc_kbd/iskr1030.cpp
+++ b/src/devices/bus/pc_kbd/iskr1030.cpp
@@ -71,7 +71,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(iskr_1030_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5MHz)
+ MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(5'000'000))
MCFG_CPU_IO_MAP(iskr_1030_keyboard_io)
MCFG_MCS48_PORT_P1_IN_CB(READ8(iskr_1030_keyboard_device, p1_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(iskr_1030_keyboard_device, p1_w))
diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp
index 5cf275fbe33..304a3b6f4ac 100644
--- a/src/devices/bus/pc_kbd/msnat.cpp
+++ b/src/devices/bus/pc_kbd/msnat.cpp
@@ -258,7 +258,7 @@ void pc_kbd_microsoft_natural_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(pc_kbd_microsoft_natural_device::device_add_mconfig)
- MCFG_CPU_ADD("ms_natrl_cpu", I8051, XTAL_6MHz)
+ MCFG_CPU_ADD("ms_natrl_cpu", I8051, XTAL(6'000'000))
MCFG_CPU_IO_MAP(microsoft_natural_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp
index 6857de7add9..7fbad750ebe 100644
--- a/src/devices/bus/pet/superpet.cpp
+++ b/src/devices/bus/pet/superpet.cpp
@@ -70,13 +70,13 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(superpet_device::device_add_mconfig)
- MCFG_CPU_ADD(M6809_TAG, M6809, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6809_TAG, M6809, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(superpet_mem)
- MCFG_MOS6702_ADD(MOS6702_TAG, XTAL_16MHz/16)
+ MCFG_MOS6702_ADD(MOS6702_TAG, XTAL(16'000'000)/16)
MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(superpet_device, acia_irq_w))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp
index 424902d9cef..f1e711ac7f7 100644
--- a/src/devices/bus/plus4/c1551.cpp
+++ b/src/devices/bus/plus4/c1551.cpp
@@ -344,7 +344,7 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(c1551_device::device_add_mconfig)
- MCFG_CPU_ADD(M6510T_TAG, M6510T, XTAL_16MHz/8)
+ MCFG_CPU_ADD(M6510T_TAG, M6510T, XTAL(16'000'000)/8)
MCFG_CPU_PROGRAM_MAP(c1551_mem)
MCFG_M6510T_PORT_CALLBACKS(READ8(c1551_device, port_r), WRITE8(c1551_device, port_w))
MCFG_QUANTUM_PERFECT_CPU(M6510T_TAG)
@@ -364,7 +364,7 @@ MACHINE_CONFIG_START(c1551_device::device_add_mconfig)
MCFG_TPI6525_IN_PC_CB(READ8(c1551_device, tpi1_pc_r))
MCFG_TPI6525_OUT_PC_CB(WRITE8(c1551_device, tpi1_pc_w))
- MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz)
+ MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
MCFG_64H156_BYTE_CALLBACK(DEVWRITELINE(C64H156_TAG, c64h156_device, atni_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1551_floppies, "525ssqd", c1551_device::floppy_formats)
diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp
index d0977f62951..ffecc19bdb5 100644
--- a/src/devices/bus/plus4/sid.cpp
+++ b/src/devices/bus/plus4/sid.cpp
@@ -66,7 +66,7 @@ const tiny_rom_entry *plus4_sid_cartridge_device::device_rom_region() const
MACHINE_CONFIG_START(plus4_sid_cartridge_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL_17_73447MHz/20)
+ MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL(17'734'470)/20)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
diff --git a/src/devices/bus/pofo/hpc102.cpp b/src/devices/bus/pofo/hpc102.cpp
index a81c38bd837..3955eafd5c2 100644
--- a/src/devices/bus/pofo/hpc102.cpp
+++ b/src/devices/bus/pofo/hpc102.cpp
@@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(POFO_HPC102, pofo_hpc102_device, "pofo_hpc102", "Atari Portfo
//-------------------------------------------------
MACHINE_CONFIG_START(pofo_hpc102_device::device_add_mconfig)
- MCFG_DEVICE_ADD(M82C50A_TAG, INS8250, XTAL_1_8432MHz) // should be INS8250A
+ MCFG_DEVICE_ADD(M82C50A_TAG, INS8250, XTAL(1'843'200)) // should be INS8250A
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
diff --git a/src/devices/bus/pofo/hpc104.cpp b/src/devices/bus/pofo/hpc104.cpp
index 0a675077059..580f1e602b8 100644
--- a/src/devices/bus/pofo/hpc104.cpp
+++ b/src/devices/bus/pofo/hpc104.cpp
@@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(POFO_HPC104_2, pofo_hpc104_2_device, "pofo_hpc104_2", "Atari
MACHINE_CONFIG_START(pofo_hpc104_device::device_add_mconfig)
MCFG_PORTFOLIO_MEMORY_CARD_SLOT_ADD(PORTFOLIO_MEMORY_CARD_SLOT_B_TAG, portfolio_memory_cards, nullptr)
- MCFG_PORTFOLIO_EXPANSION_SLOT_ADD(PORTFOLIO_EXPANSION_SLOT_TAG, XTAL_4_9152MHz, portfolio_expansion_cards, nullptr)
+ MCFG_PORTFOLIO_EXPANSION_SLOT_ADD(PORTFOLIO_EXPANSION_SLOT_TAG, XTAL(4'915'200), portfolio_expansion_cards, nullptr)
MCFG_PORTFOLIO_EXPANSION_SLOT_EINT_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, portfolio_expansion_slot_device, eint_w))
MCFG_PORTFOLIO_EXPANSION_SLOT_NMIO_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, portfolio_expansion_slot_device, nmio_w))
MCFG_PORTFOLIO_EXPANSION_SLOT_WAKE_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, portfolio_expansion_slot_device, wake_w))
diff --git a/src/devices/bus/psi_kbd/ergoline.cpp b/src/devices/bus/psi_kbd/ergoline.cpp
index 35bd6d74230..ee97b6c5f9f 100644
--- a/src/devices/bus/psi_kbd/ergoline.cpp
+++ b/src/devices/bus/psi_kbd/ergoline.cpp
@@ -57,7 +57,7 @@ const tiny_rom_entry *ergoline_keyboard_device::device_rom_region() const
}
MACHINE_CONFIG_START(ergoline_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", I8031, XTAL_5_5296MHz)
+ MCFG_CPU_ADD("maincpu", I8031, XTAL(5'529'600))
MCFG_CPU_PROGRAM_MAP(kbd_mem)
MCFG_CPU_IO_MAP(kbd_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp
index c15c1d656ba..3965736bd01 100644
--- a/src/devices/bus/ql/sandy_superqboard.cpp
+++ b/src/devices/bus/ql/sandy_superqboard.cpp
@@ -103,7 +103,7 @@ WRITE_LINE_MEMBER( sandy_superqboard_device::busy_w )
//-------------------------------------------------
MACHINE_CONFIG_START(sandy_superqboard_device::device_add_mconfig)
- MCFG_DEVICE_ADD(WD1772_TAG, WD1772, XTAL_16MHz/2)
+ MCFG_DEVICE_ADD(WD1772_TAG, WD1772, XTAL(16'000'000)/2)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_superqboard_floppies, "35hd", sandy_superqboard_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_superqboard_floppies, nullptr, sandy_superqboard_device::floppy_formats)
@@ -411,7 +411,7 @@ void sandy_superqboard_device::write(address_space &space, offs_t offset, uint8_
break;
case 5:
- m_fdc->set_unscaled_clock(XTAL_16MHz / (BIT(data, 0) ? 1 : 2));
+ m_fdc->set_unscaled_clock(XTAL(16'000'000) / (BIT(data, 0) ? 1 : 2));
break;
}
}
diff --git a/src/devices/bus/s100/dj2db.cpp b/src/devices/bus/s100/dj2db.cpp
index e34be7e4163..78ac2ae6ad8 100644
--- a/src/devices/bus/s100/dj2db.cpp
+++ b/src/devices/bus/s100/dj2db.cpp
@@ -102,10 +102,10 @@ WRITE_LINE_MEMBER( s100_dj2db_device::fdc_drq_w )
//-------------------------------------------------
MACHINE_CONFIG_START(s100_dj2db_device::device_add_mconfig)
- MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(WRITELINE(s100_dj2db_device, fr_w))
- MCFG_MB8866_ADD(MB8866_TAG, XTAL_10MHz/5)
+ MCFG_MB8866_ADD(MB8866_TAG, XTAL(10'000'000)/5)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(s100_dj2db_device, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(s100_dj2db_device, fdc_drq_w))
diff --git a/src/devices/bus/s100/djdma.cpp b/src/devices/bus/s100/djdma.cpp
index 68949a5b7aa..c34602e3248 100644
--- a/src/devices/bus/s100/djdma.cpp
+++ b/src/devices/bus/s100/djdma.cpp
@@ -77,7 +77,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(s100_djdma_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(djdma_mem)
MCFG_CPU_IO_MAP(djdma_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp
index a550be2adef..4e0a68c4c6d 100644
--- a/src/devices/bus/s100/wunderbus.cpp
+++ b/src/devices/bus/s100/wunderbus.cpp
@@ -92,19 +92,19 @@ MACHINE_CONFIG_START(s100_wunderbus_device::device_add_mconfig)
MCFG_PIC8259_OUT_INT_CB(WRITELINE(s100_wunderbus_device, pic_int_w))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_DEVICE_ADD(INS8250_1_TAG, INS8250, XTAL_18_432MHz/10)
+ MCFG_DEVICE_ADD(INS8250_1_TAG, INS8250, XTAL(18'432'000)/10)
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir3_w))
- MCFG_DEVICE_ADD(INS8250_2_TAG, INS8250, XTAL_18_432MHz/10)
+ MCFG_DEVICE_ADD(INS8250_2_TAG, INS8250, XTAL(18'432'000)/10)
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir4_w))
- MCFG_DEVICE_ADD(INS8250_3_TAG, INS8250, XTAL_18_432MHz/10)
+ MCFG_DEVICE_ADD(INS8250_3_TAG, INS8250, XTAL(18'432'000)/10)
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_rts))
@@ -132,7 +132,7 @@ MACHINE_CONFIG_START(s100_wunderbus_device::device_add_mconfig)
MCFG_RS232_RI_HANDLER(DEVWRITELINE(INS8250_3_TAG, ins8250_uart_device, ri_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE(INS8250_3_TAG, ins8250_uart_device, cts_w))
- MCFG_UPD1990A_ADD(UPD1990C_TAG, XTAL_32_768kHz, NOOP, DEVWRITELINE(DEVICE_SELF, s100_wunderbus_device, rtc_tp_w))
+ MCFG_UPD1990A_ADD(UPD1990C_TAG, XTAL(32'768), NOOP, DEVWRITELINE(DEVICE_SELF, s100_wunderbus_device, rtc_tp_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp
index c61046950f7..6a07f495842 100644
--- a/src/devices/bus/scsi/s1410.cpp
+++ b/src/devices/bus/scsi/s1410.cpp
@@ -164,7 +164,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(s1410_device::device_add_mconfig)
- MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL(16'000'000)/4)
MCFG_CPU_PROGRAM_MAP(s1410_mem)
MCFG_CPU_IO_MAP(s1410_io)
MCFG_DEVICE_DISABLE()
diff --git a/src/devices/bus/sg1000_exp/fm_unit.cpp b/src/devices/bus/sg1000_exp/fm_unit.cpp
index ba46f795885..c43b143248c 100644
--- a/src/devices/bus/sg1000_exp/fm_unit.cpp
+++ b/src/devices/bus/sg1000_exp/fm_unit.cpp
@@ -51,7 +51,7 @@ DEFINE_DEVICE_TYPE(SEGA_FM_UNIT, sega_fm_unit_device, "sega_fm_unit", "SG-1000 F
MACHINE_CONFIG_START(sega_fm_unit_device::device_add_mconfig)
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_10_738635MHz/3)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(10'738'635)/3)
// if this output gain is changed, the gain set when unmute the output need
// to be changed too, probably along the gain set for SMSJ/SMSKRFM drivers.
MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":mono", 1.00)
diff --git a/src/devices/bus/sms_ctrl/paddle.cpp b/src/devices/bus/sms_ctrl/paddle.cpp
index f19da195186..4d3ade12477 100644
--- a/src/devices/bus/sms_ctrl/paddle.cpp
+++ b/src/devices/bus/sms_ctrl/paddle.cpp
@@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(SMS_PADDLE, sms_paddle_device, "sms_paddle", "Sega SMS Paddle
// time interval not verified
// Player 2 of Galactic Protector is the most sensible to this timming.
-#define PADDLE_INTERVAL attotime::from_hz(XTAL_10_738635MHz/3/100)
+#define PADDLE_INTERVAL attotime::from_hz(XTAL(10'738'635)/3/100)
CUSTOM_INPUT_MEMBER( sms_paddle_device::rldu_pins_r )
diff --git a/src/devices/bus/sms_ctrl/sports.cpp b/src/devices/bus/sms_ctrl/sports.cpp
index cd814ff14cc..646126c232f 100644
--- a/src/devices/bus/sms_ctrl/sports.cpp
+++ b/src/devices/bus/sms_ctrl/sports.cpp
@@ -50,7 +50,7 @@ Notes:
DEFINE_DEVICE_TYPE(SMS_SPORTS_PAD, sms_sports_pad_device, "sms_sports_pad", "Sega SMS Sports Pad (US)")
// time interval not verified
-#define SPORTS_PAD_INTERVAL attotime::from_hz(XTAL_10_738635MHz/3/512)
+#define SPORTS_PAD_INTERVAL attotime::from_hz(XTAL(10'738'635)/3/512)
void sms_sports_pad_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
diff --git a/src/devices/bus/snes/sgb.cpp b/src/devices/bus/snes/sgb.cpp
index 88f2f10048d..cb07ecc9fc1 100644
--- a/src/devices/bus/snes/sgb.cpp
+++ b/src/devices/bus/snes/sgb.cpp
@@ -187,14 +187,14 @@ const tiny_rom_entry *sns_rom_sgb1_device::device_rom_region() const
MACHINE_CONFIG_START(sns_rom_sgb2_device::device_add_mconfig)
- MCFG_CPU_ADD("sgb_cpu", LR35902, XTAL_4_194304Mhz) /* 4.194MHz derived from clock on sgb2 pcb */
+ MCFG_CPU_ADD("sgb_cpu", LR35902, XTAL(4'194'304)) /* 4.194MHz derived from clock on sgb2 pcb */
MCFG_CPU_PROGRAM_MAP(supergb_map)
MCFG_LR35902_TIMER_CB(WRITE8(sns_rom_sgb_device, gb_timer_callback))
MCFG_LR35902_HALT_BUG
MCFG_SGB_PPU_ADD("sgb_ppu", "sgb_cpu")
- MCFG_SOUND_ADD("sgb_apu", DMG_APU, XTAL_4_194304Mhz)
+ MCFG_SOUND_ADD("sgb_apu", DMG_APU, XTAL(4'194'304))
MCFG_GB_CARTRIDGE_ADD("gb_slot", supergb_cart, nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp
index 691d93e2758..a79ccb92bf7 100644
--- a/src/devices/bus/spc1000/fdd.cpp
+++ b/src/devices/bus/spc1000/fdd.cpp
@@ -80,7 +80,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(spc1000_fdd_exp_device::device_add_mconfig)
// sub CPU (5 inch floppy drive)
- MCFG_CPU_ADD("fdccpu", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("fdccpu", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(sd725_mem)
MCFG_CPU_IO_MAP(sd725_io)
diff --git a/src/devices/bus/spc1000/vdp.cpp b/src/devices/bus/spc1000/vdp.cpp
index 9eedd2feb80..a65594e5e68 100644
--- a/src/devices/bus/spc1000/vdp.cpp
+++ b/src/devices/bus/spc1000/vdp.cpp
@@ -25,7 +25,7 @@ WRITE_LINE_MEMBER(spc1000_vdp_exp_device::vdp_interrupt)
MACHINE_CONFIG_START(spc1000_vdp_exp_device::device_add_mconfig)
- MCFG_DEVICE_ADD("tms", TMS9928A, XTAL_10_738635MHz / 2) // TODO: which clock?
+ MCFG_DEVICE_ADD("tms", TMS9928A, XTAL(10'738'635) / 2) // TODO: which clock?
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(spc1000_vdp_exp_device, vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_NTSC("tms_screen")
diff --git a/src/devices/bus/spectrum/fuller.cpp b/src/devices/bus/spectrum/fuller.cpp
index bebb169b7f3..46419753217 100644
--- a/src/devices/bus/spectrum/fuller.cpp
+++ b/src/devices/bus/spectrum/fuller.cpp
@@ -47,7 +47,7 @@ ioport_constructor spectrum_fuller_device::device_input_ports() const
MACHINE_CONFIG_START(spectrum_fuller_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8912", AY8912, XTAL_3_579545MHz / 2) // unverified clock
+ MCFG_SOUND_ADD("ay8912", AY8912, XTAL(3'579'545) / 2) // unverified clock
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* passthru */
diff --git a/src/devices/bus/spectrum/melodik.cpp b/src/devices/bus/spectrum/melodik.cpp
index 63b5d3f3cbe..6395427501e 100644
--- a/src/devices/bus/spectrum/melodik.cpp
+++ b/src/devices/bus/spectrum/melodik.cpp
@@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(SPECTRUM_MELODIK, spectrum_melodik_device, "spectrum_melodik"
MACHINE_CONFIG_START(spectrum_melodik_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8912", AY8912, XTAL_3_579545MHz / 2)
+ MCFG_SOUND_ADD("ay8912", AY8912, XTAL(3'579'545) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* passthru */
diff --git a/src/devices/bus/spectrum/uspeech.cpp b/src/devices/bus/spectrum/uspeech.cpp
index bfbbf9d3516..ae3f49250af 100644
--- a/src/devices/bus/spectrum/uspeech.cpp
+++ b/src/devices/bus/spectrum/uspeech.cpp
@@ -55,7 +55,7 @@ const tiny_rom_entry *spectrum_uspeech_device::device_rom_region() const
MACHINE_CONFIG_START(spectrum_uspeech_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SP0256_TAG, SP0256, XTAL_14MHz / 4)
+ MCFG_SOUND_ADD(SP0256_TAG, SP0256, XTAL(14'000'000) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/svi3x8/expander/sv603.cpp b/src/devices/bus/svi3x8/expander/sv603.cpp
index c4191bdb7f7..f2adbdd584a 100644
--- a/src/devices/bus/svi3x8/expander/sv603.cpp
+++ b/src/devices/bus/svi3x8/expander/sv603.cpp
@@ -39,7 +39,7 @@ const tiny_rom_entry *sv603_device::device_rom_region() const
MACHINE_CONFIG_START(sv603_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snd", SN76489A, XTAL_10_738635MHz / 3)
+ MCFG_SOUND_ADD("snd", SN76489A, XTAL(10'738'635) / 3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// cartridge slot
diff --git a/src/devices/bus/svi3x8/slot/sv801.cpp b/src/devices/bus/svi3x8/slot/sv801.cpp
index c0f17f0bc60..c7137d3d8d6 100644
--- a/src/devices/bus/svi3x8/slot/sv801.cpp
+++ b/src/devices/bus/svi3x8/slot/sv801.cpp
@@ -31,7 +31,7 @@ SLOT_INTERFACE_END
//-------------------------------------------------
MACHINE_CONFIG_START(sv801_device::device_add_mconfig)
- MCFG_FD1793_ADD("fdc", XTAL_8MHz / 8)
+ MCFG_FD1793_ADD("fdc", XTAL(8'000'000) / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(sv801_device, intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(sv801_device, drq_w))
diff --git a/src/devices/bus/svi3x8/slot/sv805.cpp b/src/devices/bus/svi3x8/slot/sv805.cpp
index 65ea09ed1d0..a3d994e549f 100644
--- a/src/devices/bus/svi3x8/slot/sv805.cpp
+++ b/src/devices/bus/svi3x8/slot/sv805.cpp
@@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(SV805, sv805_device, "sv805", "SV-805 RS-232 Interface")
//-------------------------------------------------
MACHINE_CONFIG_START(sv805_device::device_add_mconfig)
- MCFG_DEVICE_ADD("uart", INS8250, XTAL_3_072MHz)
+ MCFG_DEVICE_ADD("uart", INS8250, XTAL(3'072'000))
MCFG_INS8250_OUT_INT_CB(WRITELINE(sv805_device, uart_intr_w))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
diff --git a/src/devices/bus/svi3x8/slot/sv806.cpp b/src/devices/bus/svi3x8/slot/sv806.cpp
index 44f6fb7de57..539f9435586 100644
--- a/src/devices/bus/svi3x8/slot/sv806.cpp
+++ b/src/devices/bus/svi3x8/slot/sv806.cpp
@@ -41,12 +41,12 @@ const tiny_rom_entry *sv806_device::device_rom_region() const
MACHINE_CONFIG_START(sv806_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME("80col", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS((XTAL_12MHz / 6) * 8, 864, 0, 640, 317, 0, 192)
+ MCFG_SCREEN_RAW_PARAMS((XTAL(12'000'000) / 6) * 8, 864, 0, 640, 317, 0, 192)
MCFG_SCREEN_UPDATE_DEVICE("crtc", hd6845_device, screen_update)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD("crtc", HD6845, "80col", XTAL_12MHz / 6)
+ MCFG_MC6845_ADD("crtc", HD6845, "80col", XTAL(12'000'000) / 6)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(sv806_device, crtc_update_row)
diff --git a/src/devices/bus/ti99/peb/bwg.cpp b/src/devices/bus/ti99/peb/bwg.cpp
index 7a911c6d7fc..a1d2f41a31b 100644
--- a/src/devices/bus/ti99/peb/bwg.cpp
+++ b/src/devices/bus/ti99/peb/bwg.cpp
@@ -694,7 +694,7 @@ ROM_START( bwg_fdc )
ROM_END
MACHINE_CONFIG_START(snug_bwg_device::device_add_mconfig)
- MCFG_WD1773_ADD(FDC_TAG, XTAL_8MHz)
+ MCFG_WD1773_ADD(FDC_TAG, XTAL(8'000'000))
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_drq_w))
diff --git a/src/devices/bus/ti99/peb/evpc.cpp b/src/devices/bus/ti99/peb/evpc.cpp
index 30726024e2c..df93f54ff2b 100644
--- a/src/devices/bus/ti99/peb/evpc.cpp
+++ b/src/devices/bus/ti99/peb/evpc.cpp
@@ -480,9 +480,9 @@ ioport_constructor snug_enhanced_video_device::device_input_ports() const
MACHINE_CONFIG_START(snug_enhanced_video_device::device_add_mconfig)
// video hardware
- MCFG_V9938_ADD(TI_VDP_TAG, TI_SCREEN_TAG, 0x20000, XTAL_21_4772MHz) /* typical 9938 clock, not verified */
+ MCFG_V9938_ADD(TI_VDP_TAG, TI_SCREEN_TAG, 0x20000, XTAL(21'477'272)) /* typical 9938 clock, not verified */
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(snug_enhanced_video_device, video_interrupt_in))
- MCFG_V99X8_SCREEN_ADD_NTSC(TI_SCREEN_TAG, TI_VDP_TAG, XTAL_21_4772MHz)
+ MCFG_V99X8_SCREEN_ADD_NTSC(TI_SCREEN_TAG, TI_VDP_TAG, XTAL(21'477'272))
// Sound hardware
MCFG_SPEAKER_STANDARD_MONO("sound_out")
diff --git a/src/devices/bus/ti99/peb/ti_fdc.cpp b/src/devices/bus/ti99/peb/ti_fdc.cpp
index 82ee10722b2..28f80a48787 100644
--- a/src/devices/bus/ti99/peb/ti_fdc.cpp
+++ b/src/devices/bus/ti99/peb/ti_fdc.cpp
@@ -450,7 +450,7 @@ ROM_START( ti_fdc )
ROM_END
MACHINE_CONFIG_START(ti_fdc_device::device_add_mconfig)
- MCFG_FD1771_ADD(FDC_TAG, XTAL_1MHz)
+ MCFG_FD1771_ADD(FDC_TAG, XTAL(1'000'000))
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("0", tifdc_floppies, "525dd", ti_fdc_device::floppy_formats)
diff --git a/src/devices/bus/ti99/ti99defs.h b/src/devices/bus/ti99/ti99defs.h
index f1cdd5b43cd..6c7f8308d07 100644
--- a/src/devices/bus/ti99/ti99defs.h
+++ b/src/devices/bus/ti99/ti99defs.h
@@ -36,7 +36,7 @@
#define TI_VDP_TAG "vdp"
#define TI_SCREEN_TAG "screen"
#define TI_HEXBUS_TAG "hexbus"
-#define TI_VDPFREQ XTAL_10_738635MHz
+#define TI_VDPFREQ XTAL(10'738'635)
// v9938
#define COLORBUS_TAG "colorbus"
diff --git a/src/devices/bus/tvc/hbf.cpp b/src/devices/bus/tvc/hbf.cpp
index 6d0a4673cf9..90dc378056b 100644
--- a/src/devices/bus/tvc/hbf.cpp
+++ b/src/devices/bus/tvc/hbf.cpp
@@ -84,7 +84,7 @@ void tvc_hbf_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(tvc_hbf_device::device_add_mconfig)
- MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16)
+ MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 16)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vic20/videopak.cpp b/src/devices/bus/vic20/videopak.cpp
index 65fdc84ddba..ed071d13554 100644
--- a/src/devices/bus/vic20/videopak.cpp
+++ b/src/devices/bus/vic20/videopak.cpp
@@ -107,7 +107,7 @@ MACHINE_CONFIG_START(vic20_video_pak_device::device_add_mconfig)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", vic20_video_pak)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD(MC6845_TAG, H46505, MC6845_SCREEN_TAG, XTAL_14_31818MHz / 8)
+ MCFG_MC6845_ADD(MC6845_TAG, H46505, MC6845_SCREEN_TAG, XTAL(14'318'181) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(vic20_video_pak_device, crtc_update_row)
diff --git a/src/devices/bus/vip/vp575.cpp b/src/devices/bus/vip/vp575.cpp
index 158dbd49c8f..544481760af 100644
--- a/src/devices/bus/vip/vp575.cpp
+++ b/src/devices/bus/vip/vp575.cpp
@@ -46,27 +46,27 @@ void vp575_device::update_interrupts()
//-------------------------------------------------
MACHINE_CONFIG_START(vp575_device::device_add_mconfig)
- MCFG_VIP_EXPANSION_SLOT_ADD("exp1", XTAL_3_52128MHz/2, vip_expansion_cards, nullptr)
+ MCFG_VIP_EXPANSION_SLOT_ADD("exp1", XTAL(3'521'280)/2, vip_expansion_cards, nullptr)
MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp1_int_w))
MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp1_dma_out_w))
MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp1_dma_in_w))
- MCFG_VIP_EXPANSION_SLOT_ADD("exp2", XTAL_3_52128MHz/2, vip_expansion_cards, nullptr)
+ MCFG_VIP_EXPANSION_SLOT_ADD("exp2", XTAL(3'521'280)/2, vip_expansion_cards, nullptr)
MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp2_int_w))
MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp2_dma_out_w))
MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp2_dma_in_w))
- MCFG_VIP_EXPANSION_SLOT_ADD("exp3", XTAL_3_52128MHz/2, vip_expansion_cards, nullptr)
+ MCFG_VIP_EXPANSION_SLOT_ADD("exp3", XTAL(3'521'280)/2, vip_expansion_cards, nullptr)
MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp3_int_w))
MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp3_dma_out_w))
MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp3_dma_in_w))
- MCFG_VIP_EXPANSION_SLOT_ADD("exp4", XTAL_3_52128MHz/2, vip_expansion_cards, nullptr)
+ MCFG_VIP_EXPANSION_SLOT_ADD("exp4", XTAL(3'521'280)/2, vip_expansion_cards, nullptr)
MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp4_int_w))
MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp4_dma_out_w))
MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp4_dma_in_w))
- MCFG_VIP_EXPANSION_SLOT_ADD("exp5", XTAL_3_52128MHz/2, vip_expansion_cards, nullptr)
+ MCFG_VIP_EXPANSION_SLOT_ADD("exp5", XTAL(3'521'280)/2, vip_expansion_cards, nullptr)
MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp5_int_w))
MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp5_dma_out_w))
MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp5_dma_in_w))
diff --git a/src/devices/bus/vme/vme_fccpu20.cpp b/src/devices/bus/vme/vme_fccpu20.cpp
index 36c4523d2e0..fb317a1f24a 100644
--- a/src/devices/bus/vme/vme_fccpu20.cpp
+++ b/src/devices/bus/vme/vme_fccpu20.cpp
@@ -222,9 +222,9 @@ DEFINE_DEVICE_TYPE(VME_FCCPU21YA, vme_fccpu21ya_card_device, "fccpu21ya", "Force
DEFINE_DEVICE_TYPE(VME_FCCPU21B, vme_fccpu21b_card_device, "fccpu21b", "Force Computer SYS68K/CPU-21B CPU Board")
DEFINE_DEVICE_TYPE(VME_FCCPU21YB, vme_fccpu21yb_card_device, "fccpu21yb", "Force Computer SYS68K/CPU-21YB CPU Board")
-#define CLOCK50 XTAL_50MHz /* HCJ */
-#define CLOCK40 XTAL_40MHz /* HCJ */
-#define CLOCK32 XTAL_32MHz /* HCJ */
+#define CLOCK50 XTAL(50'000'000) /* HCJ */
+#define CLOCK40 XTAL(40'000'000) /* HCJ */
+#define CLOCK32 XTAL(32'000'000) /* HCJ */
static ADDRESS_MAP_START (cpu20_mem, AS_PROGRAM, 32, vme_fccpu20_device)
ADDRESS_MAP_UNMAP_HIGH
diff --git a/src/devices/bus/vme/vme_fcisio.cpp b/src/devices/bus/vme/vme_fcisio.cpp
index 001c7bef1ab..8673b375858 100644
--- a/src/devices/bus/vme/vme_fcisio.cpp
+++ b/src/devices/bus/vme/vme_fcisio.cpp
@@ -158,8 +158,8 @@
DEFINE_DEVICE_TYPE(VME_FCISIO1, vme_fcisio1_card_device, "fcisio1", "Force Computer SYS68K/ISIO-1/2 Intelligent Serial I/O Board")
-#define CPU_CLOCK XTAL_20MHz /* HCJ */
-#define DUSCC_CLOCK XTAL_14_7456MHz /* HCJ */
+#define CPU_CLOCK XTAL(20'000'000) /* HCJ */
+#define DUSCC_CLOCK XTAL(14'745'600) /* HCJ */
static ADDRESS_MAP_START (fcisio1_mem, AS_PROGRAM, 16, vme_fcisio1_card_device)
ADDRESS_MAP_UNMAP_HIGH
@@ -361,10 +361,10 @@ MACHINE_CONFIG_START(vme_fcisio1_card_device::device_add_mconfig)
MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc3", duscc68562_device, rxb_w))
MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc3", duscc68562_device, ctsb_w))
- MCFG_DEVICE_ADD ("pit", PIT68230, XTAL_20MHz / 2)
+ MCFG_DEVICE_ADD ("pit", PIT68230, XTAL(20'000'000) / 2)
MCFG_PIT68230_PB_INPUT_CB(READ8(vme_fcisio1_card_device, config_rd))
- MCFG_MC68153_ADD("bim", XTAL_20MHz / 2)
+ MCFG_MC68153_ADD("bim", XTAL(20'000'000) / 2)
MACHINE_CONFIG_END
const tiny_rom_entry *vme_fcisio1_card_device::device_rom_region() const
diff --git a/src/devices/bus/vme/vme_fcscsi.cpp b/src/devices/bus/vme/vme_fcscsi.cpp
index 26cc9dfd60b..083e08a0f19 100644
--- a/src/devices/bus/vme/vme_fcscsi.cpp
+++ b/src/devices/bus/vme/vme_fcscsi.cpp
@@ -182,8 +182,8 @@
DEFINE_DEVICE_TYPE(VME_FCSCSI1, vme_fcscsi1_card_device, "fcscsi1", "Force Computer SYS68K/ISCSI-1 Intelligent Mass Storage Controller Board")
-#define CPU_CRYSTAL XTAL_20MHz /* Jauch */
-#define PIT_CRYSTAL XTAL_16MHz /* Jauch */
+#define CPU_CRYSTAL XTAL(20'000'000) /* Jauch */
+#define PIT_CRYSTAL XTAL(16'000'000) /* Jauch */
static ADDRESS_MAP_START (fcscsi1_mem, AS_PROGRAM, 16, vme_fcscsi1_card_device)
ADDRESS_MAP_UNMAP_HIGH
diff --git a/src/devices/bus/vme/vme_hcpu30.cpp b/src/devices/bus/vme/vme_hcpu30.cpp
index 30ed0c405f7..9c98292c178 100644
--- a/src/devices/bus/vme/vme_hcpu30.cpp
+++ b/src/devices/bus/vme/vme_hcpu30.cpp
@@ -42,7 +42,7 @@
#endif
-#define DUSCC_CLOCK XTAL_14_7456MHz /* XXX Unverified */
+#define DUSCC_CLOCK XTAL(14'745'600) /* XXX Unverified */
#define RS232P1_TAG "rs232p1"
#define RS232P2_TAG "rs232p2"
diff --git a/src/devices/bus/vme/vme_mvme350.cpp b/src/devices/bus/vme/vme_mvme350.cpp
index 40d2f3bd30e..1fe35f8dfbb 100644
--- a/src/devices/bus/vme/vme_mvme350.cpp
+++ b/src/devices/bus/vme/vme_mvme350.cpp
@@ -190,10 +190,10 @@ ROM_END
MACHINE_CONFIG_START(vme_mvme350_card_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD (MVME350_CPU_TAG, M68010, XTAL_10MHz)
+ MCFG_CPU_ADD (MVME350_CPU_TAG, M68010, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP (mvme350_mem)
/* PIT Parallel Interface and Timer device, assuming strapped for on board clock */
- MCFG_DEVICE_ADD("pit", PIT68230, XTAL_16MHz / 2)
+ MCFG_DEVICE_ADD("pit", PIT68230, XTAL(16'000'000) / 2)
MACHINE_CONFIG_END
const tiny_rom_entry *vme_mvme350_card_device::device_rom_region() const
diff --git a/src/devices/bus/vme/vme_mzr8105.cpp b/src/devices/bus/vme/vme_mzr8105.cpp
index 9ec70e3f851..c0d863635ac 100644
--- a/src/devices/bus/vme/vme_mzr8105.cpp
+++ b/src/devices/bus/vme/vme_mzr8105.cpp
@@ -38,7 +38,7 @@ DEFINE_DEVICE_TYPE(VME_MZR8105, vme_mzr8105_card_device, "mzr8105", "Mizar 8105
MACHINE_CONFIG_START(vme_mzr8105_card_device::device_add_mconfig)
{
- MCFG_CPU_ADD ("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD ("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP (mzr8105_mem)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_BUS_OWNER_SPACES()
diff --git a/src/devices/bus/vme/vme_mzr8300.cpp b/src/devices/bus/vme/vme_mzr8300.cpp
index 6505a681663..7f643075b15 100644
--- a/src/devices/bus/vme/vme_mzr8300.cpp
+++ b/src/devices/bus/vme/vme_mzr8300.cpp
@@ -125,18 +125,18 @@ DEFINE_DEVICE_TYPE(VME_MZR8300, vme_mzr8300_card_device, "mzr8300", "Mizar 8300
//-------------------------------------------------
MACHINE_CONFIG_START(vme_mzr8300_card_device::device_add_mconfig)
- MCFG_DEVICE_ADD("sio0", UPD7201_NEW, XTAL_4MHz)
+ MCFG_DEVICE_ADD("sio0", UPD7201_NEW, XTAL(4'000'000))
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232p1", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232p1", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232p1", rs232_port_device, write_rts))
- MCFG_DEVICE_ADD("sio1", UPD7201_NEW, XTAL_4MHz)
+ MCFG_DEVICE_ADD("sio1", UPD7201_NEW, XTAL(4'000'000))
MCFG_RS232_PORT_ADD("rs232p1", default_rs232_devices, "terminal")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio0", upd7201_new_device, rxb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio0", upd7201_new_device, ctsb_w))
- MCFG_DEVICE_ADD("stc", AM9513, XTAL_4MHz)
+ MCFG_DEVICE_ADD("stc", AM9513, XTAL(4'000'000))
MCFG_AM9513_OUT1_CALLBACK(DEVWRITELINE("sio0", upd7201_new_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio0", upd7201_new_device, txca_w))
MCFG_AM9513_OUT2_CALLBACK(DEVWRITELINE("sio0", upd7201_new_device, rxcb_w))
diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp
index bc11ac14b8c..c7709ee97a9 100644
--- a/src/devices/bus/wangpc/lvc.cpp
+++ b/src/devices/bus/wangpc/lvc.cpp
@@ -124,7 +124,7 @@ MACHINE_CONFIG_START(wangpc_lvc_device::device_add_mconfig)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_MC6845_ADD(MC6845_TAG, MC6845_1, SCREEN_TAG, XTAL_14_31818MHz/16)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845_1, SCREEN_TAG, XTAL(14'318'181)/16)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(wangpc_lvc_device, crtc_update_row)
@@ -296,11 +296,11 @@ void wangpc_lvc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, u
if (OPTION_80_COL)
{
- m_crtc->set_clock(XTAL_14_31818MHz / 8);
+ m_crtc->set_clock(XTAL(14'318'181) / 8);
}
else
{
- m_crtc->set_clock(XTAL_14_31818MHz / 16);
+ m_crtc->set_clock(XTAL(14'318'181) / 16);
}
}
break;
diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp
index c4ef69379fe..c2a5b1af0dc 100644
--- a/src/devices/bus/wangpc/mvc.cpp
+++ b/src/devices/bus/wangpc/mvc.cpp
@@ -144,7 +144,7 @@ MACHINE_CONFIG_START(wangpc_mvc_device::device_add_mconfig)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_MC6845_ADD(MC6845_TAG, MC6845_1, SCREEN_TAG, XTAL_14_31818MHz/16)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845_1, SCREEN_TAG, XTAL(14'318'181)/16)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(10)
MCFG_MC6845_UPDATE_ROW_CB(wangpc_mvc_device, crtc_update_row)
diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp
index a73131b53a7..936340a4267 100644
--- a/src/devices/bus/wangpc/tig.cpp
+++ b/src/devices/bus/wangpc/tig.cpp
@@ -122,12 +122,12 @@ MACHINE_CONFIG_START(wangpc_tig_device::device_add_mconfig)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
- MCFG_DEVICE_ADD(UPD7720_0_TAG, UPD7220, XTAL_52_832MHz/28)
+ MCFG_DEVICE_ADD(UPD7720_0_TAG, UPD7220, XTAL(52'832'000)/28)
MCFG_DEVICE_ADDRESS_MAP(0, upd7220_0_map)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(wangpc_tig_device, hgdc_draw_text)
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
- MCFG_DEVICE_ADD(UPD7720_1_TAG, UPD7220, XTAL_52_832MHz/28)
+ MCFG_DEVICE_ADD(UPD7720_1_TAG, UPD7220, XTAL(52'832'000)/28)
MCFG_DEVICE_ADDRESS_MAP(0, upd7220_1_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(wangpc_tig_device, hgdc_display_pixels)
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp
index a5424a8863d..095bb28bdaf 100644
--- a/src/devices/bus/wangpc/wdc.cpp
+++ b/src/devices/bus/wangpc/wdc.cpp
@@ -91,7 +91,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(wangpc_wdc_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, 2000000) // XTAL_10MHz / ?
+ MCFG_CPU_ADD(Z80_TAG, Z80, 2000000) // XTAL(10'000'000) / ?
//MCFG_Z80_DAISY_CHAIN(wangpc_wdc_daisy_chain)
MCFG_CPU_PROGRAM_MAP(wangpc_wdc_mem)
MCFG_CPU_IO_MAP(wangpc_wdc_io)
diff --git a/src/devices/bus/x68k/x68k_midi.cpp b/src/devices/bus/x68k/x68k_midi.cpp
index 7289959627b..91bb5713715 100644
--- a/src/devices/bus/x68k/x68k_midi.cpp
+++ b/src/devices/bus/x68k/x68k_midi.cpp
@@ -18,7 +18,7 @@
DEFINE_DEVICE_TYPE(X68K_MIDI, x68k_midi_device, "x68k_midi", "X68000 MIDI Interface")
MACHINE_CONFIG_START(x68k_midi_device::device_add_mconfig)
- MCFG_DEVICE_ADD("midi", YM3802, XTAL_1MHz) // clock is unknown
+ MCFG_DEVICE_ADD("midi", YM3802, XTAL(1'000'000)) // clock is unknown
MCFG_YM3802_TXD_HANDLER(DEVWRITELINE("mdout",midi_port_device,write_txd))
MCFG_YM3802_IRQ_HANDLER(WRITELINE(x68k_midi_device,irq_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
diff --git a/src/devices/cpu/lc8670/lc8670.h b/src/devices/cpu/lc8670/lc8670.h
index c0fddecb60b..8659ca58e06 100644
--- a/src/devices/cpu/lc8670/lc8670.h
+++ b/src/devices/cpu/lc8670/lc8670.h
@@ -85,6 +85,7 @@ public:
// static configuration helpers
static void static_set_cpu_clock(device_t &device, clock_source source, uint32_t clock) { downcast<lc8670_cpu_device &>(device).m_clocks[unsigned(source)] = clock; }
+ static void static_set_cpu_clock(device_t &device, clock_source source, const XTAL &clock) { static_set_cpu_clock(device, source, clock.value()); }
static void static_set_lcd_update_cb(device_t &device, lcd_update cb) { downcast<lc8670_cpu_device &>(device).m_lcd_update_func = cb; }
template <class Object> static devcb_base & static_set_bankswitch_cb(device_t &device, Object &&cb) { return downcast<lc8670_cpu_device &>(device).m_bankswitch_func.set_callback(std::forward<Object>(cb)); }
diff --git a/src/devices/cpu/m6502/n2a03.h b/src/devices/cpu/m6502/n2a03.h
index 42e5eac8257..8cf4d9ec4bb 100644
--- a/src/devices/cpu/m6502/n2a03.h
+++ b/src/devices/cpu/m6502/n2a03.h
@@ -58,8 +58,8 @@ private:
manufacturing throughout the production of the 2A03. PALC_APU_CLOCK is
the clock rate devised by UMC(?) for PAL Famicom clone hardware. */
-#define N2A03_NTSC_XTAL XTAL_21_4772MHz
-#define N2A03_PAL_XTAL XTAL_26_601712MHz
+#define N2A03_NTSC_XTAL XTAL(21'477'272)
+#define N2A03_PAL_XTAL XTAL(26'601'712)
#define NTSC_APU_CLOCK (N2A03_NTSC_XTAL/12) /* 1.7897726666... MHz */
#define PAL_APU_CLOCK (N2A03_PAL_XTAL/16) /* 1.662607 MHz */
#define PALC_APU_CLOCK (N2A03_PAL_XTAL/15) /* 1.77344746666... MHz */
diff --git a/src/devices/cpu/powerpc/ppc.h b/src/devices/cpu/powerpc/ppc.h
index ba81a6055bb..a4b7f672471 100644
--- a/src/devices/cpu/powerpc/ppc.h
+++ b/src/devices/cpu/powerpc/ppc.h
@@ -214,6 +214,7 @@ protected:
public:
static void set_bus_frequency(device_t &device, uint32_t bus_frequency) { downcast<ppc_device &>(device).c_bus_frequency = bus_frequency; }
+ static void set_bus_frequency(device_t &device, const XTAL &xtal) { set_bus_frequency(device, xtal.value()); }
void ppc_set_dcstore_callback(write32_delegate callback);
diff --git a/src/devices/cpu/sh/sh4.h b/src/devices/cpu/sh/sh4.h
index 6f3c37e862a..c9dc55f88a3 100644
--- a/src/devices/cpu/sh/sh4.h
+++ b/src/devices/cpu/sh/sh4.h
@@ -207,6 +207,7 @@ public:
static void set_md7(device_t &device, int md0) { downcast<sh34_base_device &>(device).c_md7 = md0; }
static void set_md8(device_t &device, int md0) { downcast<sh34_base_device &>(device).c_md8 = md0; }
static void set_sh4_clock(device_t &device, int clock) { downcast<sh34_base_device &>(device).c_clock = clock; }
+ static void set_sh4_clock(device_t &device, const XTAL &xtal) { set_sh4_clock(device, xtal.value()); }
static void set_mmu_hacktype(device_t &device, int hacktype) { downcast<sh34_base_device &>(device).m_mmuhack = hacktype; }
diff --git a/src/devices/cpu/tms34010/tms34010.h b/src/devices/cpu/tms34010/tms34010.h
index b9c6aaf0795..d1d1c35ca63 100644
--- a/src/devices/cpu/tms34010/tms34010.h
+++ b/src/devices/cpu/tms34010/tms34010.h
@@ -162,6 +162,7 @@ public:
static void set_halt_on_reset(device_t &device, bool halt_on_reset) { downcast<tms340x0_device &>(device).m_halt_on_reset = halt_on_reset; }
static void set_pixel_clock(device_t &device, uint32_t pixclock) { downcast<tms340x0_device &>(device).m_pixclock = pixclock; }
+ static void set_pixel_clock(device_t &device, const XTAL &xtal) { set_pixel_clock(device, xtal.value()); }
static void set_pixels_per_clock(device_t &device, int pixperclock) { downcast<tms340x0_device &>(device).m_pixperclock = pixperclock; }
static void set_scanline_ind16_callback(device_t &device, scanline_ind16_cb_delegate callback) { downcast<tms340x0_device &>(device).m_scanline_ind16_cb = callback; }
static void set_scanline_rgb32_callback(device_t &device, scanline_rgb32_cb_delegate callback) { downcast<tms340x0_device &>(device).m_scanline_rgb32_cb = callback; }
diff --git a/src/devices/machine/68340.h b/src/devices/machine/68340.h
index 76255b412a7..9ced90bb241 100644
--- a/src/devices/machine/68340.h
+++ b/src/devices/machine/68340.h
@@ -79,6 +79,8 @@ public:
dev.m_clock_mode |= (m68340_sim::CLOCK_MODCK | m68340_sim::CLOCK_PLL);
}
+ static void set_crystal(device_t &device, const XTAL &crystal) { set_crystal(device, crystal.value()); }
+
READ32_MEMBER( m68340_internal_base_r );
WRITE32_MEMBER( m68340_internal_base_w );
READ32_MEMBER( m68340_internal_dma_r );
diff --git a/src/devices/machine/6840ptm.h b/src/devices/machine/6840ptm.h
index 832f511179b..df91f393d7d 100644
--- a/src/devices/machine/6840ptm.h
+++ b/src/devices/machine/6840ptm.h
@@ -47,6 +47,7 @@ public:
ptm6840_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
static void set_external_clocks(device_t &device, double clock0, double clock1, double clock2) { downcast<ptm6840_device &>(device).m_external_clock[0] = clock0; downcast<ptm6840_device &>(device).m_external_clock[1] = clock1; downcast<ptm6840_device &>(device).m_external_clock[2] = clock2; }
+ static void set_external_clocks(device_t &device, const XTAL &clock0, const XTAL &clock1, const XTAL &clock2) { set_external_clocks(device, clock0.dvalue(), clock1.dvalue(), clock2.dvalue()); }
template <class Object> static devcb_base &set_out_callback(device_t &device, int index, Object &&cb) { return downcast<ptm6840_device &>(device).m_out_cb[index].set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_irq_callback(device_t &device, Object &&cb) { return downcast<ptm6840_device &>(device).m_irq_cb.set_callback(std::forward<Object>(cb)); }
diff --git a/src/devices/machine/ay31015.h b/src/devices/machine/ay31015.h
index f319f5aea96..33de1cf66c9 100644
--- a/src/devices/machine/ay31015.h
+++ b/src/devices/machine/ay31015.h
@@ -55,7 +55,9 @@ public:
ay31015_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
static void set_tx_clock(device_t &device, double tx_clock) { downcast<ay31015_device &>(device).m_tx_clock = tx_clock; }
+ static void set_tx_clock(device_t &device, const XTAL &xtal) { set_tx_clock(device, xtal.dvalue()); }
static void set_rx_clock(device_t &device, double rx_clock) { downcast<ay31015_device &>(device).m_rx_clock = rx_clock; }
+ static void set_rx_clock(device_t &device, const XTAL &xtal) { set_rx_clock(device, xtal.dvalue()); }
template <class Object> static devcb_base &set_read_si_callback(device_t &device, Object &&cb) { return downcast<ay31015_device &>(device).m_read_si_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_write_so_callback(device_t &device, Object &&cb) { return downcast<ay31015_device &>(device).m_write_so_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_status_changed_callback(device_t &device, Object &&cb) { return downcast<ay31015_device &>(device).m_status_changed_cb.set_callback(std::forward<Object>(cb)); }
diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp
index 66eb283359d..b7c31322e0d 100644
--- a/src/devices/machine/cs4031.cpp
+++ b/src/devices/machine/cs4031.cpp
@@ -139,11 +139,11 @@ MACHINE_CONFIG_START(cs4031_device::device_add_mconfig)
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("ctc", PIT8254, 0)
- MCFG_PIT8253_CLK0(XTAL_14_31818MHz / 12.0)
+ MCFG_PIT8253_CLK0(XTAL(14'318'181) / 12.0)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("intc1", pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_14_31818MHz / 12.0)
+ MCFG_PIT8253_CLK1(XTAL(14'318'181) / 12.0)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(cs4031_device, ctc_out1_w))
- MCFG_PIT8253_CLK2(XTAL_14_31818MHz / 12.0)
+ MCFG_PIT8253_CLK2(XTAL(14'318'181) / 12.0)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(cs4031_device, ctc_out2_w))
MCFG_DS12885_ADD("rtc")
diff --git a/src/devices/machine/ds128x.h b/src/devices/machine/ds128x.h
index e525d7a79d3..f3fb9998d15 100644
--- a/src/devices/machine/ds128x.h
+++ b/src/devices/machine/ds128x.h
@@ -6,7 +6,7 @@
#include "mc146818.h"
#define MCFG_DS12885_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, DS12885, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(_tag, DS12885, XTAL(32'768))
// ======================> mc146818_device
diff --git a/src/devices/machine/ds2404.h b/src/devices/machine/ds2404.h
index 5ebc665d171..55d9f63776c 100644
--- a/src/devices/machine/ds2404.h
+++ b/src/devices/machine/ds2404.h
@@ -21,7 +21,7 @@
***************************************************************************/
#define MCFG_DS2404_ADD(_tag, _ref_year, _ref_month, _ref_day) \
- MCFG_DEVICE_ADD(_tag, DS2404, XTAL_32_768kHz) \
+ MCFG_DEVICE_ADD(_tag, DS2404, XTAL(32'768)) \
MCFG_DS2404_REF_YEAR(_ref_year) \
MCFG_DS2404_REF_MONTH(_ref_month) \
MCFG_DS2404_REF_DAY(_ref_day)
diff --git a/src/devices/machine/fdc37c665gt.cpp b/src/devices/machine/fdc37c665gt.cpp
index 97790044994..4c6f23651db 100644
--- a/src/devices/machine/fdc37c665gt.cpp
+++ b/src/devices/machine/fdc37c665gt.cpp
@@ -50,8 +50,8 @@ void fdc37c665gt_device::device_start()
}
MACHINE_CONFIG_START(fdc37c665gt_device::device_add_mconfig)
- MCFG_DEVICE_ADD("uart1", NS16550, XTAL_24MHz/13)
- MCFG_DEVICE_ADD("uart2", NS16550, XTAL_24MHz/13)
+ MCFG_DEVICE_ADD("uart1", NS16550, XTAL(24'000'000)/13)
+ MCFG_DEVICE_ADD("uart2", NS16550, XTAL(24'000'000)/13)
MACHINE_CONFIG_END
DEFINE_DEVICE_TYPE(FDC37C665GT, fdc37c665gt_device, "fdc37c665gt", "FDC37C665GT")
diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp
index 7cc13629778..58ff8a7ef21 100644
--- a/src/devices/machine/genpc.cpp
+++ b/src/devices/machine/genpc.cpp
@@ -407,14 +407,14 @@ DEFINE_DEVICE_TYPE(IBM5160_MOTHERBOARD, ibm5160_mb_device, "ibm5160_mb", "IBM 51
MACHINE_CONFIG_START(ibm5160_mb_device::device_add_mconfig)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_14_31818MHz/12.0) /* heartbeat IRQ */
+ MCFG_PIT8253_CLK0(XTAL(14'318'181)/12.0) /* heartbeat IRQ */
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_14_31818MHz/12.0) /* dram refresh */
+ MCFG_PIT8253_CLK1(XTAL(14'318'181)/12.0) /* dram refresh */
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(ibm5160_mb_device, pc_pit8253_out1_changed))
- MCFG_PIT8253_CLK2(XTAL_14_31818MHz/12.0) /* pio port c pin 4, and speaker polling enough */
+ MCFG_PIT8253_CLK2(XTAL(14'318'181)/12.0) /* pio port c pin 4, and speaker polling enough */
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(ibm5160_mb_device, pc_pit8253_out2_changed))
- MCFG_DEVICE_ADD( "dma8237", AM9517A, XTAL_14_31818MHz/3.0 )
+ MCFG_DEVICE_ADD( "dma8237", AM9517A, XTAL(14'318'181)/3.0 )
MCFG_I8237_OUT_HREQ_CB(WRITELINE(ibm5160_mb_device, pc_dma_hrq_changed))
MCFG_I8237_OUT_EOP_CB(WRITELINE(ibm5160_mb_device, pc_dma8237_out_eop))
MCFG_I8237_IN_MEMR_CB(READ8(ibm5160_mb_device, pc_dma_read_byte))
diff --git a/src/devices/machine/i82371sb.cpp b/src/devices/machine/i82371sb.cpp
index 1acf3c472e3..c076e6ebd65 100644
--- a/src/devices/machine/i82371sb.cpp
+++ b/src/devices/machine/i82371sb.cpp
@@ -66,7 +66,7 @@ MACHINE_CONFIG_START(i82371sb_isa_device::device_add_mconfig)
MCFG_PIT8253_CLK2(4772720/4) /* pio port c pin 4, and speaker polling enough */
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(i82371sb_isa_device, at_pit8254_out2_changed))
- MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 )
MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq0_w))
MCFG_I8237_OUT_EOP_CB(WRITELINE(i82371sb_isa_device, at_dma8237_out_eop))
MCFG_I8237_IN_MEMR_CB(READ8(i82371sb_isa_device, pc_dma_read_byte))
@@ -84,7 +84,7 @@ MACHINE_CONFIG_START(i82371sb_isa_device::device_add_mconfig)
MCFG_I8237_OUT_DACK_2_CB(WRITELINE(i82371sb_isa_device, pc_dack2_w))
MCFG_I8237_OUT_DACK_3_CB(WRITELINE(i82371sb_isa_device, pc_dack3_w))
- MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 )
MCFG_I8237_OUT_HREQ_CB(WRITELINE(i82371sb_isa_device, pc_dma_hrq_changed))
MCFG_I8237_IN_MEMR_CB(READ8(i82371sb_isa_device, pc_dma_read_word))
MCFG_I8237_OUT_MEMW_CB(WRITE8(i82371sb_isa_device, pc_dma_write_word))
@@ -108,7 +108,7 @@ MACHINE_CONFIG_START(i82371sb_isa_device::device_add_mconfig)
MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir2_w))
MCFG_PIC8259_IN_SP_CB(GND)
- MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL_12MHz)
+ MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000))
MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(INPUTLINE(":maincpu", INPUT_LINE_RESET))
MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(INPUTLINE(":maincpu", INPUT_LINE_A20))
MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir1_w))
@@ -162,7 +162,7 @@ MACHINE_CONFIG_START(i82371sb_isa_device::device_add_mconfig)
// MCFG_ISA16_SLOT_ADD("isabus","board3", pc_isa_onboard, "lpt", true)
// VGA-HACK
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
diff --git a/src/devices/machine/ie15.cpp b/src/devices/machine/ie15.cpp
index 2e57425f59e..74459c34dac 100644
--- a/src/devices/machine/ie15.cpp
+++ b/src/devices/machine/ie15.cpp
@@ -566,7 +566,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(ie15_device::ie15core)
/* Basic machine hardware */
- MCFG_CPU_ADD("maincpu", IE15_CPU, XTAL_30_8MHz/10)
+ MCFG_CPU_ADD("maincpu", IE15_CPU, XTAL(30'800'000)/10)
MCFG_CPU_PROGRAM_MAP(ie15_mem)
MCFG_CPU_IO_MAP(ie15_io)
@@ -604,7 +604,7 @@ MACHINE_CONFIG_START(ie15_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DRIVER(ie15_device, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_30_8MHz/2, IE15_TOTAL_HORZ, IE15_HORZ_START,
+ MCFG_SCREEN_RAW_PARAMS(XTAL(30'800'000)/2, IE15_TOTAL_HORZ, IE15_HORZ_START,
IE15_HORZ_START+IE15_DISP_HORZ, IE15_TOTAL_VERT, IE15_VERT_START,
IE15_VERT_START+IE15_DISP_VERT);
diff --git a/src/devices/machine/laserdsc.h b/src/devices/machine/laserdsc.h
index 85b5a197a08..e2f8f9ebd41 100644
--- a/src/devices/machine/laserdsc.h
+++ b/src/devices/machine/laserdsc.h
@@ -87,7 +87,7 @@ enum laserdisc_field_code
laserdisc_device::static_set_screen(*device, _tag); \
MCFG_SCREEN_ADD(_tag, RASTER) \
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \
- MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz*2, 910, 0, 704, 525, 44, 524) \
+ MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181)*2, 910, 0, 704, 525, 44, 524) \
MCFG_SCREEN_UPDATE_DEVICE(_ldtag, laserdisc_device, screen_update)
#define MCFG_LASERDISC_SCREEN_ADD_PAL(_tag, _ldtag) \
@@ -95,7 +95,7 @@ enum laserdisc_field_code
laserdisc_device::static_set_screen(*device, _tag); \
MCFG_SCREEN_ADD(_tag, RASTER) \
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \
- MCFG_SCREEN_RAW_PARAMS(XTAL_17_73447MHz*2, 1135, 0, 768, 625, 48, 624) \
+ MCFG_SCREEN_RAW_PARAMS(XTAL(17'734'470)*2, 1135, 0, 768, 625, 48, 624) \
MCFG_SCREEN_UPDATE_DEVICE(_ldtag, laserdisc_device, screen_update)
diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp
index 827d81dff80..f0e4fe732e9 100644
--- a/src/devices/machine/ldpr8210.cpp
+++ b/src/devices/machine/ldpr8210.cpp
@@ -53,13 +53,13 @@
#define SEEK_FAST_SPEED (4000 / 30) // 4000 frames/second
// serial timing, mostly from the service manual, derived from the XTAL
-#define SERIAL_CLOCK XTAL_455kHz
-#define SERIAL_0_BIT_TIME attotime::from_hz((double)SERIAL_CLOCK / 512)
-#define SERIAL_1_BIT_TIME attotime::from_hz((double)SERIAL_CLOCK / 1024)
-#define SERIAL_MIDPOINT_TIME attotime::from_hz((double)SERIAL_CLOCK / 600)
-#define SERIAL_MAX_BIT_TIME attotime::from_hz((double)SERIAL_CLOCK / 4096)
-#define SERIAL_MAX_WORD_TIME attotime::from_hz((double)SERIAL_CLOCK / 11520)
-#define SERIAL_REJECT_DUPLICATE_TIME attotime::from_hz((double)SERIAL_CLOCK / 11520 / 4)
+#define SERIAL_CLOCK XTAL(455'000)
+#define SERIAL_0_BIT_TIME attotime::from_hz(SERIAL_CLOCK / 512)
+#define SERIAL_1_BIT_TIME attotime::from_hz(SERIAL_CLOCK / 1024)
+#define SERIAL_MIDPOINT_TIME attotime::from_hz(SERIAL_CLOCK / 600)
+#define SERIAL_MAX_BIT_TIME attotime::from_hz(SERIAL_CLOCK / 4096)
+#define SERIAL_MAX_WORD_TIME attotime::from_hz(SERIAL_CLOCK / 11520)
+#define SERIAL_REJECT_DUPLICATE_TIME attotime::from_hz(SERIAL_CLOCK / 11520 / 4)
@@ -373,7 +373,7 @@ const tiny_rom_entry *pioneer_pr8210_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(pioneer_pr8210_device::device_add_mconfig)
- MCFG_CPU_ADD("pr8210", I8049, XTAL_4_41MHz)
+ MCFG_CPU_ADD("pr8210", I8049, XTAL(4'410'000))
MCFG_CPU_IO_MAP(pr8210_portmap)
MCFG_MCS48_PORT_BUS_IN_CB(READ8(pioneer_pr8210_device, i8049_bus_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(pioneer_pr8210_device, i8049_port1_w))
@@ -1000,7 +1000,7 @@ const tiny_rom_entry *simutrek_special_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(simutrek_special_device::device_add_mconfig)
- MCFG_CPU_ADD("simutrek", I8748, XTAL_6MHz)
+ MCFG_CPU_ADD("simutrek", I8748, XTAL(6'000'000))
MCFG_CPU_IO_MAP(simutrek_portmap)
MCFG_MCS48_PORT_P2_IN_CB(READ8(simutrek_special_device, i8748_port2_r))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(simutrek_special_device, i8748_port2_w))
diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp
index 7eb0683dda6..07116eb98ea 100644
--- a/src/devices/machine/ldv1000.cpp
+++ b/src/devices/machine/ldv1000.cpp
@@ -271,12 +271,12 @@ const tiny_rom_entry *pioneer_ldv1000_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(pioneer_ldv1000_device::device_add_mconfig)
- MCFG_CPU_ADD("ldv1000", Z80, XTAL_5MHz/2)
+ MCFG_CPU_ADD("ldv1000", Z80, XTAL(5'000'000)/2)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_CPU_PROGRAM_MAP(ldv1000_map)
MCFG_CPU_IO_MAP(ldv1000_portmap)
- MCFG_DEVICE_ADD("ldvctc", Z80CTC, XTAL_5MHz/2)
+ MCFG_DEVICE_ADD("ldvctc", Z80CTC, XTAL(5'000'000)/2)
MCFG_Z80CTC_INTR_CB(WRITELINE(pioneer_ldv1000_device, ctc_interrupt))
MCFG_DEVICE_ADD("ldvppi0", I8255, 0)
diff --git a/src/devices/machine/ldvp931.cpp b/src/devices/machine/ldvp931.cpp
index c15d7842791..19dd7d41701 100644
--- a/src/devices/machine/ldvp931.cpp
+++ b/src/devices/machine/ldvp931.cpp
@@ -286,7 +286,7 @@ const tiny_rom_entry *phillips_22vp931_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(phillips_22vp931_device::device_add_mconfig)
- MCFG_CPU_ADD("vp931", I8049, XTAL_11MHz)
+ MCFG_CPU_ADD("vp931", I8049, XTAL(11'000'000))
MCFG_CPU_IO_MAP(vp931_portmap)
MCFG_MCS48_PORT_P1_IN_CB(READ8(phillips_22vp931_device, i8049_port1_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(phillips_22vp931_device, i8049_port1_w))
diff --git a/src/devices/machine/m6m80011ap.h b/src/devices/machine/m6m80011ap.h
index 0f30ccb3505..2f1d0e9102a 100644
--- a/src/devices/machine/m6m80011ap.h
+++ b/src/devices/machine/m6m80011ap.h
@@ -13,7 +13,7 @@
/* TODO: frequency */
#define MCFG_M6M80011AP_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, M6M80011AP, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(_tag, M6M80011AP, XTAL(32'768))
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/machine/mc68681.h b/src/devices/machine/mc68681.h
index 452b67cb64f..e6e588ddb25 100644
--- a/src/devices/machine/mc68681.h
+++ b/src/devices/machine/mc68681.h
@@ -121,6 +121,9 @@ public:
// inline configuration helpers
static void static_set_clocks(device_t &device, int clk3, int clk4, int clk5, int clk6);
+ static void static_set_clocks(device_t &device, const XTAL &clk3, const XTAL &clk4, const XTAL &clk5, const XTAL &clk6) {
+ static_set_clocks(device, clk3.value(), clk4.value(), clk5.value(), clk6.value());
+ }
// API
virtual DECLARE_READ8_MEMBER(read);
diff --git a/src/devices/machine/mc68901.h b/src/devices/machine/mc68901.h
index cccd257b2ee..c4270b230e3 100644
--- a/src/devices/machine/mc68901.h
+++ b/src/devices/machine/mc68901.h
@@ -98,6 +98,9 @@ public:
static void set_timer_clock(device_t &device, int timer_clock) { downcast<mc68901_device &>(device).m_timer_clock = timer_clock; }
static void set_rx_clock(device_t &device, int rx_clock) { downcast<mc68901_device &>(device).m_rx_clock = rx_clock; }
static void set_tx_clock(device_t &device, int tx_clock) { downcast<mc68901_device &>(device).m_tx_clock = tx_clock; }
+ static void set_timer_clock(device_t &device, const XTAL &xtal) { set_timer_clock(device, xtal.value()); }
+ static void set_rx_clock(device_t &device, const XTAL &xtal) { set_rx_clock(device, xtal.value()); }
+ static void set_tx_clock(device_t &device, const XTAL &xtal) { set_tx_clock(device, xtal.value()); }
template <class Object> static devcb_base &set_out_irq_callback(device_t &device, Object &&cb) { return downcast<mc68901_device &>(device).m_out_irq_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_out_gpio_callback(device_t &device, Object &&cb) { return downcast<mc68901_device &>(device).m_out_gpio_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_out_tao_callback(device_t &device, Object &&cb) { return downcast<mc68901_device &>(device).m_out_tao_cb.set_callback(std::forward<Object>(cb)); }
diff --git a/src/devices/machine/mos6551.h b/src/devices/machine/mos6551.h
index 4e3ae657e59..e08ddeb716a 100644
--- a/src/devices/machine/mos6551.h
+++ b/src/devices/machine/mos6551.h
@@ -54,6 +54,7 @@ public:
mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
static void set_xtal(device_t &device, uint32_t xtal) { downcast<mos6551_device &>(device).set_xtal(xtal); }
+ static void set_xtal(device_t &device, const XTAL &xtal) { set_xtal(device, xtal.value()); }
template <class Object> static devcb_base &set_irq_handler(device_t &device, Object &&cb) { return downcast<mos6551_device &>(device).m_irq_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_txd_handler(device_t &device, Object &&cb) { return downcast<mos6551_device &>(device).m_txd_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_rxc_handler(device_t &device, Object &&cb) { return downcast<mos6551_device &>(device).m_rxc_handler.set_callback(std::forward<Object>(cb)); }
@@ -71,6 +72,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(write_dcd);
void set_xtal(uint32_t clock);
+ void set_xtal(const XTAL &clock) { set_xtal(clock.value()); }
protected:
virtual void device_start() override;
diff --git a/src/devices/machine/nsc810.h b/src/devices/machine/nsc810.h
index d029e56bced..f2fd3b9b699 100644
--- a/src/devices/machine/nsc810.h
+++ b/src/devices/machine/nsc810.h
@@ -28,7 +28,9 @@ public:
template <class Object> static devcb_base &set_timer1_callback(device_t &device, Object &&cb) { return downcast<nsc810_device &>(device).m_timer1_out.set_callback(std::forward<Object>(cb)); }
void set_timer0_clock(uint32_t clk) { m_timer0_clock = clk; }
+ void set_timer0_clock(const XTAL &clk) { set_timer0_clock(clk.value()); }
void set_timer1_clock(uint32_t clk) { m_timer1_clock = clk; }
+ void set_timer1_clock(const XTAL &clk) { set_timer1_clock(clk.value()); }
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
diff --git a/src/devices/machine/pdc.cpp b/src/devices/machine/pdc.cpp
index 5c2576f3f91..69207aefbfd 100644
--- a/src/devices/machine/pdc.cpp
+++ b/src/devices/machine/pdc.cpp
@@ -253,7 +253,7 @@ FLOPPY_FORMATS_END
MACHINE_CONFIG_START(pdc_device::device_add_mconfig)
/* CPU - Zilog Z0840006PSC */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10MHz / 2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(10'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(pdc_mem)
MCFG_CPU_IO_MAP(pdc_io)
//MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
@@ -269,7 +269,7 @@ MACHINE_CONFIG_START(pdc_device::device_add_mconfig)
/* DMA Controller - Intel P8237A-5 */
/* Channel 0: uPD765a Floppy Disk Controller */
/* Channel 1: M68K main system memory */
- MCFG_DEVICE_ADD(FDCDMA_TAG, AM9517A, XTAL_10MHz / 2)
+ MCFG_DEVICE_ADD(FDCDMA_TAG, AM9517A, XTAL(10'000'000) / 2)
MCFG_I8237_OUT_HREQ_CB(WRITELINE(pdc_device, i8237_hreq_w))
MCFG_I8237_OUT_EOP_CB(WRITELINE(pdc_device, i8237_eop_w))
MCFG_I8237_IN_MEMR_CB(READ8(pdc_device, i8237_dma_mem_r))
diff --git a/src/devices/machine/pit8253.h b/src/devices/machine/pit8253.h
index c8198d30edc..998de676bb3 100644
--- a/src/devices/machine/pit8253.h
+++ b/src/devices/machine/pit8253.h
@@ -62,6 +62,9 @@ public:
static void set_clk0(device_t &device, double clk0) { downcast<pit8253_device &>(device).m_clk0 = clk0; }
static void set_clk1(device_t &device, double clk1) { downcast<pit8253_device &>(device).m_clk1 = clk1; }
static void set_clk2(device_t &device, double clk2) { downcast<pit8253_device &>(device).m_clk2 = clk2; }
+ static void set_clk0(device_t &device, const XTAL &xtal) { set_clk0(device, xtal.dvalue()); }
+ static void set_clk1(device_t &device, const XTAL &xtal) { set_clk1(device, xtal.dvalue()); }
+ static void set_clk2(device_t &device, const XTAL &xtal) { set_clk2(device, xtal.dvalue()); }
template <class Object> static devcb_base &set_out0_handler(device_t &device, Object &&cb) { return downcast<pit8253_device &>(device).m_out0_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_out1_handler(device_t &device, Object &&cb) { return downcast<pit8253_device &>(device).m_out1_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_out2_handler(device_t &device, Object &&cb) { return downcast<pit8253_device &>(device).m_out2_handler.set_callback(std::forward<Object>(cb)); }
diff --git a/src/devices/machine/rtc9701.cpp b/src/devices/machine/rtc9701.cpp
index 75a48cd7a40..f224f9c8f87 100644
--- a/src/devices/machine/rtc9701.cpp
+++ b/src/devices/machine/rtc9701.cpp
@@ -93,7 +93,7 @@ void rtc9701_device::device_start()
{
/* let's call the timer callback every second */
m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(rtc9701_device::timer_callback), this));
- m_timer->adjust(attotime::from_hz(clock() / XTAL_32_768kHz), 0, attotime::from_hz(clock() / XTAL_32_768kHz));
+ m_timer->adjust(attotime::from_hz(clock() / XTAL(32'768)), 0, attotime::from_hz(clock() / XTAL(32'768)));
system_time systime;
machine().base_datetime(systime);
diff --git a/src/devices/machine/rtc9701.h b/src/devices/machine/rtc9701.h
index 20defb5be43..628b3bb6e5e 100644
--- a/src/devices/machine/rtc9701.h
+++ b/src/devices/machine/rtc9701.h
@@ -20,7 +20,7 @@
//**************************************************************************
#define MCFG_RTC9701_ADD(tag) \
- MCFG_DEVICE_ADD((tag), RTC9701, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD((tag), RTC9701, XTAL(32'768))
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/machine/s3520cf.cpp b/src/devices/machine/s3520cf.cpp
index 902e03becf3..a272a85740c 100644
--- a/src/devices/machine/s3520cf.cpp
+++ b/src/devices/machine/s3520cf.cpp
@@ -91,7 +91,7 @@ void s3520cf_device::device_start()
{
/* let's call the timer callback every second for now */
m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(s3520cf_device::timer_callback), this));
- m_timer->adjust(attotime::from_hz(clock() / XTAL_32_768kHz), 0, attotime::from_hz(clock() / XTAL_32_768kHz));
+ m_timer->adjust(attotime::from_hz(clock() / XTAL(32'768)), 0, attotime::from_hz(clock() / XTAL(32'768)));
system_time systime;
machine().base_datetime(systime);
diff --git a/src/devices/machine/s3520cf.h b/src/devices/machine/s3520cf.h
index 72b75fc4238..675349985ff 100644
--- a/src/devices/machine/s3520cf.h
+++ b/src/devices/machine/s3520cf.h
@@ -18,7 +18,7 @@ Seiko/Epson S-3520CF
//**************************************************************************
#define MCFG_S3520CF_ADD(tag) \
- MCFG_DEVICE_ADD((tag), S3520CF, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD((tag), S3520CF, XTAL(32'768))
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/machine/sega_scu.cpp b/src/devices/machine/sega_scu.cpp
index 6581ed6510d..7bdadcc5dbe 100644
--- a/src/devices/machine/sega_scu.cpp
+++ b/src/devices/machine/sega_scu.cpp
@@ -184,7 +184,7 @@ WRITE16_MEMBER(sega_scu_device::scudsp_dma_w)
}
MACHINE_CONFIG_START(sega_scu_device::device_add_mconfig)
- MCFG_CPU_ADD("scudsp", SCUDSP, XTAL_57_2727MHz/4) // 14 MHz
+ MCFG_CPU_ADD("scudsp", SCUDSP, XTAL(57'272'727)/4) // 14 MHz
MCFG_SCUDSP_OUT_IRQ_CB(DEVWRITELINE(DEVICE_SELF, sega_scu_device, scudsp_end_w))
MCFG_SCUDSP_IN_DMA_CB(READ16(sega_scu_device, scudsp_dma_r))
MCFG_SCUDSP_OUT_DMA_CB(WRITE16(sega_scu_device, scudsp_dma_w))
diff --git a/src/devices/machine/sis85c496.cpp b/src/devices/machine/sis85c496.cpp
index cd02c3bbda2..2a1032a9161 100644
--- a/src/devices/machine/sis85c496.cpp
+++ b/src/devices/machine/sis85c496.cpp
@@ -54,7 +54,7 @@ MACHINE_CONFIG_START(sis85c496_host_device::device_add_mconfig)
MCFG_PIT8253_CLK2(4772720/4) /* pio port c pin 4, and speaker polling enough */
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(sis85c496_host_device, at_pit8254_out2_changed))
- MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 )
MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq0_w))
MCFG_I8237_OUT_EOP_CB(WRITELINE(sis85c496_host_device, at_dma8237_out_eop))
MCFG_I8237_IN_MEMR_CB(READ8(sis85c496_host_device, pc_dma_read_byte))
@@ -72,7 +72,7 @@ MACHINE_CONFIG_START(sis85c496_host_device::device_add_mconfig)
MCFG_I8237_OUT_DACK_2_CB(WRITELINE(sis85c496_host_device, pc_dack2_w))
MCFG_I8237_OUT_DACK_3_CB(WRITELINE(sis85c496_host_device, pc_dack3_w))
- MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 )
MCFG_I8237_OUT_HREQ_CB(WRITELINE(sis85c496_host_device, pc_dma_hrq_changed))
MCFG_I8237_IN_MEMR_CB(READ8(sis85c496_host_device, pc_dma_read_word))
MCFG_I8237_OUT_MEMW_CB(WRITE8(sis85c496_host_device, pc_dma_write_word))
@@ -96,7 +96,7 @@ MACHINE_CONFIG_START(sis85c496_host_device::device_add_mconfig)
MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir2_w))
MCFG_PIC8259_IN_SP_CB(GND)
- MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL_12MHz)
+ MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000))
MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(INPUTLINE(":maincpu", INPUT_LINE_RESET))
MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(INPUTLINE(":maincpu", INPUT_LINE_A20))
MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir1_w))
diff --git a/src/devices/machine/smioc.cpp b/src/devices/machine/smioc.cpp
index c86de2a2e2e..a9321952a8f 100644
--- a/src/devices/machine/smioc.cpp
+++ b/src/devices/machine/smioc.cpp
@@ -111,15 +111,15 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(smioc_device::device_add_mconfig)
/* CPU - Intel 80C188 */
- MCFG_CPU_ADD(I188_TAG, I80188, XTAL_20MHz / 2) // Clock division unknown
+ MCFG_CPU_ADD(I188_TAG, I80188, XTAL(20'000'000) / 2) // Clock division unknown
MCFG_CPU_PROGRAM_MAP(smioc_mem)
/* DMA */
- MCFG_DEVICE_ADD("dma8237_1", AM9517A, XTAL_20MHz / 4) // Clock division unknown
- MCFG_DEVICE_ADD("dma8237_2", AM9517A, XTAL_20MHz / 4)
- MCFG_DEVICE_ADD("dma8237_3", AM9517A, XTAL_20MHz / 4)
- MCFG_DEVICE_ADD("dma8237_4", AM9517A, XTAL_20MHz / 4)
- MCFG_DEVICE_ADD("dma8237_5", AM9517A, XTAL_20MHz / 4)
+ MCFG_DEVICE_ADD("dma8237_1", AM9517A, XTAL(20'000'000) / 4) // Clock division unknown
+ MCFG_DEVICE_ADD("dma8237_2", AM9517A, XTAL(20'000'000) / 4)
+ MCFG_DEVICE_ADD("dma8237_3", AM9517A, XTAL(20'000'000) / 4)
+ MCFG_DEVICE_ADD("dma8237_4", AM9517A, XTAL(20'000'000) / 4)
+ MCFG_DEVICE_ADD("dma8237_5", AM9517A, XTAL(20'000'000) / 4)
/* RS232 */
/* Port 1: Console */
diff --git a/src/devices/machine/upd1990a.cpp b/src/devices/machine/upd1990a.cpp
index a37840c405f..6b14f95c123 100644
--- a/src/devices/machine/upd1990a.cpp
+++ b/src/devices/machine/upd1990a.cpp
@@ -93,7 +93,7 @@ void upd1990a_device::device_start()
// allocate timers
m_timer_clock = timer_alloc(TIMER_CLOCK);
- m_timer_clock->adjust(attotime::from_hz(clock() / 32768.0), 0, attotime::from_hz(clock() / 32768.0)); // 1 second on XTAL_32_768kHz
+ m_timer_clock->adjust(attotime::from_hz(clock() / 32768.0), 0, attotime::from_hz(clock() / 32768.0)); // 1 second on XTAL(32'768)
m_timer_tp = timer_alloc(TIMER_TP);
m_timer_data_out = timer_alloc(TIMER_DATA_OUT);
m_timer_test_mode = timer_alloc(TIMER_TEST_MODE);
diff --git a/src/devices/machine/upd4992.h b/src/devices/machine/upd4992.h
index 433506a5bcf..1a054951621 100644
--- a/src/devices/machine/upd4992.h
+++ b/src/devices/machine/upd4992.h
@@ -19,7 +19,7 @@
//**************************************************************************
#define MCFG_UPD4992_ADD(tag) \
- MCFG_DEVICE_ADD((tag), UPD4992, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD((tag), UPD4992, XTAL(32'768))
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/machine/v3021.cpp b/src/devices/machine/v3021.cpp
index 7909f56ee80..3e48d4e8ebb 100644
--- a/src/devices/machine/v3021.cpp
+++ b/src/devices/machine/v3021.cpp
@@ -86,7 +86,7 @@ void v3021_device::device_start()
{
/* let's call the timer callback every second */
m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(v3021_device::timer_callback), this));
- m_timer->adjust(attotime::from_hz(clock() / XTAL_32_768kHz), 0, attotime::from_hz(clock() / XTAL_32_768kHz));
+ m_timer->adjust(attotime::from_hz(clock() / XTAL(32'768)), 0, attotime::from_hz(clock() / XTAL(32'768)));
system_time systime;
machine().base_datetime(systime);
diff --git a/src/devices/machine/v3021.h b/src/devices/machine/v3021.h
index 45024917d89..b412163cb22 100644
--- a/src/devices/machine/v3021.h
+++ b/src/devices/machine/v3021.h
@@ -22,7 +22,7 @@
//**************************************************************************
#define MCFG_V3021_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, V3021, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(_tag, V3021, XTAL(32'768))
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp
index 05df6925045..f73086d700d 100644
--- a/src/devices/machine/wd7600.cpp
+++ b/src/devices/machine/wd7600.cpp
@@ -64,11 +64,11 @@ MACHINE_CONFIG_START(wd7600_device::device_add_mconfig)
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("ctc", PIT8254, 0)
- MCFG_PIT8253_CLK0(XTAL_14_31818MHz / 12.0)
+ MCFG_PIT8253_CLK0(XTAL(14'318'181) / 12.0)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("intc1", pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_14_31818MHz / 12.0)
+ MCFG_PIT8253_CLK1(XTAL(14'318'181) / 12.0)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(wd7600_device, ctc_out1_w))
- MCFG_PIT8253_CLK2(XTAL_14_31818MHz / 12.0)
+ MCFG_PIT8253_CLK2(XTAL(14'318'181) / 12.0)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(wd7600_device, ctc_out2_w))
MCFG_DS12885_ADD("rtc")
diff --git a/src/devices/machine/ym3802.cpp b/src/devices/machine/ym3802.cpp
index cfc172f28eb..af3d1819f2f 100644
--- a/src/devices/machine/ym3802.cpp
+++ b/src/devices/machine/ym3802.cpp
@@ -143,7 +143,7 @@ void ym3802_device::midi_clk()
void ym3802_device::reset_midi_timer()
{
- uint64_t rate;
+ uint32_t rate;
uint8_t divisor = m_reg[REG_TRR] & 0x1f;
if(!(divisor & 0x10))
@@ -260,7 +260,7 @@ WRITE8_MEMBER(ym3802_device::write)
{
if((data & 0x07) == 2)
{
- uint64_t rate = (m_reg[REG_CCR] & 0x02) ? m_clkm_rate / 4 : m_clkm_rate / 8;
+ const XTAL rate = (m_reg[REG_CCR] & 0x02) ? m_clkm_rate / 4 : m_clkm_rate / 8;
// start message to click counter
m_midi_counter_timer->adjust(attotime::from_hz(rate),0,attotime::from_hz(rate));
diff --git a/src/devices/sound/ad1848.cpp b/src/devices/sound/ad1848.cpp
index 533b576a825..30a0e59da2a 100644
--- a/src/devices/sound/ad1848.cpp
+++ b/src/devices/sound/ad1848.cpp
@@ -99,7 +99,7 @@ WRITE8_MEMBER(ad1848_device::write)
case 9:
{
m_play = (data & 1) ? true : false;
- attotime rate = m_play ? attotime::from_hz(((m_regs.dform & 1) ? XTAL_24_576MHz : XTAL_16_9344MHz)
+ attotime rate = m_play ? attotime::from_hz(((m_regs.dform & 1) ? XTAL(24'576'000) : XTAL(16'934'400))
/ div_factor[(m_regs.dform >> 1) & 7]) : attotime::never;
m_timer->adjust(rate, 0 , rate);
m_drq_cb(m_play ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/devices/sound/cdp1863.h b/src/devices/sound/cdp1863.h
index 189a04ae5c9..bb47f0ea5f2 100644
--- a/src/devices/sound/cdp1863.h
+++ b/src/devices/sound/cdp1863.h
@@ -50,6 +50,7 @@ public:
// inline configuration helpers
static void static_set_clock2(device_t &device, int clock2);
+ static void static_set_clock2(device_t &device, const XTAL &xtal) { xtal.check("selecting cdp1863 clock"); static_set_clock2(device, xtal.value()); }
DECLARE_WRITE8_MEMBER( str_w );
void str_w(uint8_t data);
diff --git a/src/devices/sound/cdp1864.h b/src/devices/sound/cdp1864.h
index 471475cfc74..c65a3aefac2 100644
--- a/src/devices/sound/cdp1864.h
+++ b/src/devices/sound/cdp1864.h
@@ -48,7 +48,7 @@
// MACROS / CONSTANTS
//**************************************************************************
-#define CDP1864_CLOCK XTAL_1_75MHz
+#define CDP1864_CLOCK XTAL(1'750'000)
diff --git a/src/devices/sound/cdp1869.cpp b/src/devices/sound/cdp1869.cpp
index 9fac6faeecb..529c948633c 100644
--- a/src/devices/sound/cdp1869.cpp
+++ b/src/devices/sound/cdp1869.cpp
@@ -49,6 +49,12 @@ enum
};
+constexpr XTAL cdp1869_device::DOT_CLK_NTSC;
+constexpr XTAL cdp1869_device::DOT_CLK_PAL;
+constexpr XTAL cdp1869_device::COLOR_CLK_NTSC;
+constexpr XTAL cdp1869_device::COLOR_CLK_PAL;
+constexpr XTAL cdp1869_device::CPU_CLK_NTSC;
+constexpr XTAL cdp1869_device::CPU_CLK_PAL;
//**************************************************************************
// DEVICE DEFINITIONS
diff --git a/src/devices/sound/cdp1869.h b/src/devices/sound/cdp1869.h
index c0e2197318b..234757a2b42 100644
--- a/src/devices/sound/cdp1869.h
+++ b/src/devices/sound/cdp1869.h
@@ -137,13 +137,13 @@ class cdp1869_device : public device_t,
public device_memory_interface
{
public:
- static constexpr float DOT_CLK_PAL = XTAL_5_626MHz;
- static constexpr float DOT_CLK_NTSC = XTAL_5_67MHz;
- static constexpr float COLOR_CLK_PAL = XTAL_8_867236MHz;
- static constexpr float COLOR_CLK_NTSC = XTAL_7_15909MHz;
+ static constexpr auto DOT_CLK_PAL = XTAL(5'626'000);
+ static constexpr auto DOT_CLK_NTSC = XTAL(5'670'000);
+ static constexpr auto COLOR_CLK_PAL = XTAL(8'867'236);
+ static constexpr auto COLOR_CLK_NTSC = XTAL(7'159'090);
- static constexpr float CPU_CLK_PAL = DOT_CLK_PAL / 2;
- static constexpr float CPU_CLK_NTSC = DOT_CLK_NTSC / 2;
+ static constexpr auto CPU_CLK_PAL = DOT_CLK_PAL / 2;
+ static constexpr auto CPU_CLK_NTSC = DOT_CLK_NTSC / 2;
static constexpr unsigned CHAR_WIDTH = 6;
@@ -194,6 +194,7 @@ public:
static void static_set_char_ram_write(device_t &device, char_ram_write_delegate &&cb) { downcast<cdp1869_device &>(device).m_out_char_ram_func = std::move(cb); }
static void static_set_pcb_read(device_t &device, pcb_read_delegate &&cb) { downcast<cdp1869_device &>(device).m_in_pcb_func = std::move(cb); }
static void static_set_color_clock(device_t &device, int color_clock) { downcast<cdp1869_device &>(device).m_color_clock = color_clock; }
+ static void static_set_color_clock(device_t &device, const XTAL &xtal) { xtal.check("selecting cdp1869 clock"); static_set_color_clock(device, xtal.value()); }
virtual DECLARE_ADDRESS_MAP(io_map, 8);
virtual DECLARE_ADDRESS_MAP(char_map, 8);
diff --git a/src/devices/sound/s14001a.h b/src/devices/sound/s14001a.h
index 3b0ee89f2f0..13aa4d032ae 100644
--- a/src/devices/sound/s14001a.h
+++ b/src/devices/sound/s14001a.h
@@ -30,6 +30,7 @@ public:
DECLARE_WRITE8_MEMBER(data_w); // 6-bit word
void set_clock(uint32_t clock); // set new CLK frequency
+ void set_clock(const XTAL &xtal) { set_clock(xtal.value()); }
void force_update(); // update stream, eg. before external ROM bankswitch
protected:
diff --git a/src/devices/sound/upd7759.h b/src/devices/sound/upd7759.h
index 62f8502ba05..c6615a6e2fd 100644
--- a/src/devices/sound/upd7759.h
+++ b/src/devices/sound/upd7759.h
@@ -13,7 +13,7 @@
software.
*/
-#define UPD7759_STANDARD_CLOCK XTAL_640kHz
+#define UPD7759_STANDARD_CLOCK XTAL(640'000)
class upd775x_device : public device_t, public device_sound_interface
{
diff --git a/src/devices/video/cdp1862.h b/src/devices/video/cdp1862.h
index d0699565f6b..8fa171bf61b 100644
--- a/src/devices/video/cdp1862.h
+++ b/src/devices/video/cdp1862.h
@@ -33,7 +33,7 @@
// MACROS / CONSTANTS
//**************************************************************************
-#define CPD1862_CLOCK XTAL_7_15909MHz
+#define CPD1862_CLOCK XTAL(7'159'090)
diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp
index 402e253b1ca..9897675ac09 100644
--- a/src/devices/video/clgd542x.cpp
+++ b/src/devices/video/clgd542x.cpp
@@ -198,6 +198,7 @@ void cirrus_gd5428_device::cirrus_define_video_mode()
{
uint8_t divisor = 1;
float clock;
+ const XTAL xtal = XTAL(14'318'181);
uint8_t clocksel = (vga.miscellaneous_output & 0xc) >> 2;
svga.rgb8_en = 0;
@@ -207,14 +208,13 @@ void cirrus_gd5428_device::cirrus_define_video_mode()
svga.rgb32_en = 0;
if(gc_locked || m_vclk_num[clocksel] == 0 || m_vclk_denom[clocksel] == 0)
- clock = (vga.miscellaneous_output & 0xc) ? XTAL_28_63636MHz : XTAL_25_1748MHz;
+ clock = ((vga.miscellaneous_output & 0xc) ? xtal*2: xtal*1.75).dvalue();
else
{
int numerator = m_vclk_num[clocksel] & 0x7f;
int denominator = (m_vclk_denom[clocksel] & 0x3e) >> 1;
int mul = m_vclk_denom[clocksel] & 0x01 ? 2 : 1;
- clock = 14.31818f * ((float)numerator / ((float)denominator * mul));
- clock *= 1000000;
+ clock = (xtal * numerator / denominator / mul).dvalue();
}
if (!gc_locked && (vga.sequencer.data[0x07] & 0x01))
diff --git a/src/devices/video/gba_lcd.cpp b/src/devices/video/gba_lcd.cpp
index 6176a51a54a..92ef5b360b5 100644
--- a/src/devices/video/gba_lcd.cpp
+++ b/src/devices/video/gba_lcd.cpp
@@ -1806,7 +1806,7 @@ void gba_lcd_device::device_reset()
MACHINE_CONFIG_START(gba_lcd_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", LCD)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16_777216MHz / 4, 308, 0, 240, 228, 0, 160)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'777'216) / 4, 308, 0, 240, 228, 0, 160)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, gba_lcd_device, screen_update)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h
index dd407da06eb..bf08104f247 100644
--- a/src/devices/video/mc6845.h
+++ b/src/devices/video/mc6845.h
@@ -152,6 +152,7 @@ public:
/* set the clock (pin 21) of the chip */
void set_clock(int clock);
+ void set_clock(const XTAL &xtal) { set_clock(int(xtal.value())); }
/* set number of pixels per video memory address */
void set_hpixels_per_column(int hpixels_per_column);
diff --git a/src/devices/video/mos6566.h b/src/devices/video/mos6566.h
index 0da94f20aeb..2f8e6b07771 100644
--- a/src/devices/video/mos6566.h
+++ b/src/devices/video/mos6566.h
@@ -110,10 +110,10 @@
// MACROS / CONSTANTS
//**************************************************************************
-#define VIC6566_CLOCK (XTAL_8MHz / 8) // 1000000
-#define VIC6567R56A_CLOCK (XTAL_8MHz / 8) // 1000000
-#define VIC6567_CLOCK (XTAL_14_31818MHz / 14) // 1022727
-#define VIC6569_CLOCK (XTAL_17_734472MHz / 18) // 985248
+#define VIC6566_CLOCK (XTAL(8'000'000) / 8) // 1000000
+#define VIC6567R56A_CLOCK (XTAL(8'000'000) / 8) // 1000000
+#define VIC6567_CLOCK (XTAL(14'318'181) / 14) // 1022727
+#define VIC6569_CLOCK (XTAL(17'734'472) / 18) // 985248
#define VIC6566_DOTCLOCK (VIC6566_CLOCK * 8) // 8000000
#define VIC6567R56A_DOTCLOCK (VIC6567R56A_CLOCK * 8) // 8000000
@@ -126,10 +126,10 @@
#define VIC6567_LINES 263
#define VIC6569_LINES 312
-#define VIC6566_VRETRACERATE ((float)VIC6566_CLOCK / 262 / 64)
-#define VIC6567R56A_VRETRACERATE ((float)VIC6567R56A_CLOCK / 262 / 64)
-#define VIC6567_VRETRACERATE ((float)VIC6567_CLOCK / 263 / 65)
-#define VIC6569_VRETRACERATE ((float)VIC6569_CLOCK / 312 / 63)
+#define VIC6566_VRETRACERATE (VIC6566_CLOCK / 262 / 64)
+#define VIC6567R56A_VRETRACERATE (VIC6567R56A_CLOCK / 262 / 64)
+#define VIC6567_VRETRACERATE (VIC6567_CLOCK / 263 / 65)
+#define VIC6569_VRETRACERATE (VIC6569_CLOCK / 312 / 63)
#define VIC6566_HRETRACERATE (VIC6566_CLOCK / VIC6566_CYCLESPERLINE)
#define VIC6567_HRETRACERATE (VIC6567_CLOCK / VIC6567_CYCLESPERLINE)
diff --git a/src/devices/video/pc_vga.cpp b/src/devices/video/pc_vga.cpp
index 9e8dd3c9964..c0831d8282a 100644
--- a/src/devices/video/pc_vga.cpp
+++ b/src/devices/video/pc_vga.cpp
@@ -1422,7 +1422,7 @@ void vga_device::recompute_params()
if(vga.miscellaneous_output & 8)
logerror("Warning: VGA external clock latch selected\n");
else
- recompute_params_clock(1, (vga.miscellaneous_output & 0xc) ? XTAL_28_63636MHz : XTAL_25_1748MHz);
+ recompute_params_clock(1, ((vga.miscellaneous_output & 0xc) ? XTAL(28'636'363) : XTAL(25'174'800)).value());
}
void vga_device::crtc_reg_write(uint8_t index, uint8_t data)
@@ -2250,22 +2250,22 @@ void tseng_vga_device::tseng_define_video_mode()
switch(((et4k.aux_ctrl << 1) & 4)|(vga.miscellaneous_output & 0xc)>>2)
{
case 0:
- xtal = XTAL_25_1748MHz;
+ xtal = XTAL(25'174'800).value();
break;
case 1:
- xtal = XTAL_28_63636MHz;
+ xtal = XTAL(28'636'363).value();
break;
case 2:
xtal = 16257000*2; //2xEGA clock
break;
case 3:
- xtal = XTAL_40MHz;
+ xtal = XTAL(40'000'000).value();
break;
case 4:
- xtal = XTAL_36MHz;
+ xtal = XTAL(36'000'000).value();
break;
case 5:
- xtal = XTAL_45MHz;
+ xtal = XTAL(45'000'000).value();
break;
case 6:
xtal = 31000000;
@@ -2763,7 +2763,7 @@ uint8_t s3_vga_device::s3_crtc_reg_read(uint8_t index)
void s3_vga_device::s3_define_video_mode()
{
int divisor = 1;
- int xtal = (vga.miscellaneous_output & 0xc) ? XTAL_28_63636MHz : XTAL_25_1748MHz;
+ int xtal = ((vga.miscellaneous_output & 0xc) ? XTAL(28'636'363) : XTAL(25'174'800)).value();
double freq;
if((vga.miscellaneous_output & 0xc) == 0x0c)
@@ -5155,7 +5155,7 @@ void ati_vga_device::ati_define_video_mode()
switch(clock_type)
{
case 0:
- clock = XTAL_42_9545MHz;
+ clock = XTAL(42'954'545).value();
break;
case 1:
clock = 48771000;
@@ -5164,7 +5164,7 @@ void ati_vga_device::ati_define_video_mode()
clock = 16657000;
break;
case 3:
- clock = XTAL_36MHz;
+ clock = XTAL(36'000'000).value();
break;
case 4:
clock = 50350000;
@@ -5182,7 +5182,7 @@ void ati_vga_device::ati_define_video_mode()
clock = 30240000;
break;
case 9:
- clock = XTAL_32MHz;
+ clock = XTAL(32'000'000).value();
break;
case 10:
clock = 37500000;
@@ -5191,7 +5191,7 @@ void ati_vga_device::ati_define_video_mode()
clock = 39000000;
break;
case 12:
- clock = XTAL_40MHz;
+ clock = XTAL(40'000'000).value();
break;
case 13:
clock = 56644000;
@@ -5203,7 +5203,7 @@ void ati_vga_device::ati_define_video_mode()
clock = 65000000;
break;
default:
- clock = XTAL_42_9545MHz;
+ clock = XTAL(42'954'545).value();
logerror("Invalid dot clock %i selected.\n",clock_type);
}
// logerror("ATI: Clock select type %i (%iHz / %i)\n",clock_type,clock,div);
diff --git a/src/devices/video/stvvdp2.cpp b/src/devices/video/stvvdp2.cpp
index fea188fffc5..13e07a5124b 100644
--- a/src/devices/video/stvvdp2.cpp
+++ b/src/devices/video/stvvdp2.cpp
@@ -6018,7 +6018,7 @@ int saturn_state::get_pixel_clock( void )
{
int res,divider;
- res = m_vdp2.dotsel ? MASTER_CLOCK_352 : MASTER_CLOCK_320;
+ res = (m_vdp2.dotsel ? MASTER_CLOCK_352 : MASTER_CLOCK_320).value();
/* TODO: divider is ALWAYS 8, this thing is just to over-compensate for MAME framework faults ... */
divider = 8;
diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h
index fc8edee0c9f..c9cafb3dc3e 100644
--- a/src/devices/video/tms9928a.h
+++ b/src/devices/video/tms9928a.h
@@ -31,7 +31,7 @@
#include "screen.h"
-// MCFG_DEVICE_ADD(_tag, _variant, XTAL_10_738635MHz / 2 )
+// MCFG_DEVICE_ADD(_tag, _variant, XTAL(10'738'635) / 2 )
#define MCFG_TMS9928A_VRAM_SIZE(_size) \
tms9928a_device::set_vram_size(*device, _size);
@@ -48,14 +48,14 @@
#define MCFG_TMS9928A_SCREEN_ADD_NTSC(_screen_tag) \
MCFG_VIDEO_SET_SCREEN(_screen_tag) \
MCFG_SCREEN_ADD( _screen_tag, RASTER ) \
- MCFG_SCREEN_RAW_PARAMS( XTAL_10_738635MHz / 2, tms9928a_device::TOTAL_HORZ, tms9928a_device::HORZ_DISPLAY_START-12, tms9928a_device::HORZ_DISPLAY_START + 256 + 12, \
+ MCFG_SCREEN_RAW_PARAMS( XTAL(10'738'635) / 2, tms9928a_device::TOTAL_HORZ, tms9928a_device::HORZ_DISPLAY_START-12, tms9928a_device::HORZ_DISPLAY_START + 256 + 12, \
tms9928a_device::TOTAL_VERT_NTSC, tms9928a_device::VERT_DISPLAY_START_NTSC - 12, tms9928a_device::VERT_DISPLAY_START_NTSC + 192 + 12 )
#define MCFG_TMS9928A_SCREEN_ADD_PAL(_screen_tag) \
MCFG_VIDEO_SET_SCREEN(_screen_tag) \
MCFG_SCREEN_ADD(_screen_tag, RASTER ) \
- MCFG_SCREEN_RAW_PARAMS( XTAL_10_738635MHz / 2, tms9928a_device::TOTAL_HORZ, tms9928a_device::HORZ_DISPLAY_START-12, tms9928a_device::HORZ_DISPLAY_START + 256 + 12, \
+ MCFG_SCREEN_RAW_PARAMS( XTAL(10'738'635) / 2, tms9928a_device::TOTAL_HORZ, tms9928a_device::HORZ_DISPLAY_START-12, tms9928a_device::HORZ_DISPLAY_START + 256 + 12, \
tms9928a_device::TOTAL_VERT_PAL, tms9928a_device::VERT_DISPLAY_START_PAL - 12, tms9928a_device::VERT_DISPLAY_START_PAL + 192 + 12 )
diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp
index 2db47a0847a..b9f77931c90 100644
--- a/src/devices/video/voodoo.cpp
+++ b/src/devices/video/voodoo.cpp
@@ -4958,7 +4958,7 @@ WRITE32_MEMBER( voodoo_banshee_device::banshee_io_w )
const uint32_t k = (banshee.io[io_pllCtrl0] >> 0) & 0x3;
const uint32_t m = (banshee.io[io_pllCtrl0] >> 2) & 0x3f;
const uint32_t n = (banshee.io[io_pllCtrl0] >> 8) & 0xff;
- const double video_clock = XTAL_14_31818MHz * (n + 2) / double((m + 2) << k);
+ const double video_clock = (XTAL(14'318'181) * (n + 2) / ((m + 2) << k)).dvalue();
const double frame_period = vtotal * htotal / video_clock;
//osd_printf_info("k: %d m: %d n: %d clock: %f period: %f rate: %.2f\n", k, m, n, video_clock, frame_period, 1.0 / frame_period);
diff --git a/src/devices/video/zeus2.cpp b/src/devices/video/zeus2.cpp
index 8b0e4ac07d2..86492d9160c 100644
--- a/src/devices/video/zeus2.cpp
+++ b/src/devices/video/zeus2.cpp
@@ -461,7 +461,7 @@ void zeus2_device::zeus2_register_update(offs_t offset, uint32_t oldval, int log
int htotal = (m_zeusbase[0x34] >> 16) << m_yScale;
//rectangle visarea((m_zeusbase[0x33] >> 16) << m_yScale, htotal - 1, 0, (m_zeusbase[0x35] & 0xffff) << m_yScale);
rectangle visarea(0, hor - 1, 0, ver - 1);
- screen().configure(htotal, vtotal, visarea, HZ_TO_ATTOSECONDS((double)ZEUS2_VIDEO_CLOCK / 4.0 / (htotal * vtotal)));
+ screen().configure(htotal, vtotal, visarea, HZ_TO_ATTOSECONDS(ZEUS2_VIDEO_CLOCK / 4.0 / (htotal * vtotal)));
zeus_cliprect = visarea;
zeus_cliprect.max_x -= zeus_cliprect.min_x;
zeus_cliprect.min_x = 0;
diff --git a/src/devices/video/zeus2.h b/src/devices/video/zeus2.h
index 2900fdce2e0..377e1ed93fc 100644
--- a/src/devices/video/zeus2.h
+++ b/src/devices/video/zeus2.h
@@ -17,7 +17,7 @@
/*************************************
* Constants
*************************************/
-#define ZEUS2_VIDEO_CLOCK XTAL_66_6667MHz
+#define ZEUS2_VIDEO_CLOCK XTAL(66'666'700)
#define DUMP_WAVE_RAM 0
#define TRACK_REG_USAGE 0
diff --git a/src/emu/attotime.h b/src/emu/attotime.h
index 6183497ae72..2b8f75450f9 100644
--- a/src/emu/attotime.h
+++ b/src/emu/attotime.h
@@ -69,6 +69,8 @@ inline constexpr attoseconds_t DOUBLE_TO_ATTOSECONDS(double x) { return attoseco
// convert between hertz (as a double) and attoseconds
inline constexpr double ATTOSECONDS_TO_HZ(attoseconds_t x) { return double(ATTOSECONDS_PER_SECOND) / double(x); }
template <typename T> inline constexpr attoseconds_t HZ_TO_ATTOSECONDS(T &&x) { return attoseconds_t(ATTOSECONDS_PER_SECOND / x); }
+inline constexpr attoseconds_t HZ_TO_ATTOSECONDS(const XTAL &x) { return attoseconds_t(ATTOSECONDS_PER_SECOND / x.dvalue()); }
+inline constexpr attoseconds_t HZ_TO_ATTOSECONDS(XTAL &&x) { return attoseconds_t(ATTOSECONDS_PER_SECOND / x.dvalue()); }
// macros for converting other seconds types to attoseconds
template <typename T> inline constexpr attoseconds_t ATTOSECONDS_IN_SEC(T &&x) { return attoseconds_t(x) * ATTOSECONDS_PER_SECOND; }
@@ -111,6 +113,7 @@ public:
constexpr double as_double() const { return double(m_seconds) + ATTOSECONDS_TO_DOUBLE(m_attoseconds); }
constexpr attoseconds_t as_attoseconds() const;
u64 as_ticks(u32 frequency) const;
+ u64 as_ticks(const XTAL &xtal) const { return as_ticks(xtal.value()); }
/** Convert to string using at @p precision */
const char *as_string(int precision = 9) const;
@@ -121,6 +124,7 @@ public:
static attotime from_double(double _time);
static attotime from_ticks(u64 ticks, u32 frequency);
+ static attotime from_ticks(u64 ticks, const XTAL &xtal) { return from_ticks(ticks, xtal.value()); }
/** Create an attotime from a integer count of seconds @seconds */
static constexpr attotime from_seconds(s32 seconds) { return attotime(seconds, 0); }
/** Create an attotime from a integer count of milliseconds @msec */
@@ -131,6 +135,9 @@ public:
static constexpr attotime from_nsec(s64 nsec) { return attotime(nsec / 1000000000, (nsec % 1000000000) * (ATTOSECONDS_PER_SECOND / 1000000000)); }
/** Create an attotime from at the given frequency @frequency */
static attotime from_hz(double frequency) { assert(frequency > 0); double d = 1 / frequency; return attotime(floor(d), modf(d, &d) * ATTOSECONDS_PER_SECOND); }
+ static attotime from_hz(u32 frequency) { return from_hz(double(frequency)); }
+ static attotime from_hz(int frequency) { return from_hz(double(frequency)); }
+ static attotime from_hz(const XTAL &xtal) { return from_hz(xtal.dvalue()); }
// math
attotime &operator+=(const attotime &right);
diff --git a/src/emu/device.h b/src/emu/device.h
index 38b20ba3111..d385534cd00 100644
--- a/src/emu/device.h
+++ b/src/emu/device.h
@@ -494,6 +494,7 @@ public:
// configuration helpers
void add_machine_configuration(machine_config &config) { device_add_mconfig(config); }
static void static_set_clock(device_t &device, u32 clock);
+ static void static_set_clock(device_t &device, const XTAL &xtal) { static_set_clock(device, xtal.value()); }
static void static_set_input_default(device_t &device, const input_device_default *config) { device.m_input_defaults = config; }
static void static_set_default_bios_tag(device_t &device, const char *tag) { device.m_default_bios_tag = tag; }
@@ -508,6 +509,7 @@ public:
u32 clock() const { return m_clock; }
u32 unscaled_clock() const { return m_unscaled_clock; }
void set_unscaled_clock(u32 clock);
+ void set_unscaled_clock(const XTAL &xtal) { set_unscaled_clock(xtal.value()); }
double clock_scale() const { return m_clock_scale; }
void set_clock_scale(double clockscale);
attotime clocks_to_attotime(u64 clocks) const;
diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h
deleted file mode 100644
index 467a104d2ab..00000000000
--- a/src/emu/drivers/xtal.h
+++ /dev/null
@@ -1,716 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Nicola Salmoria
-/*************************************************************************
-
- xtal.h
-
- Documentation and consistent naming for known existing crystals.
-
-***************************************************************************
-
- PCB Crystal Reference
- ----------------------
- _____ ________
- |16 | |o |
- |MHZ| |16.0MHZ |
- |___| |________|
- | |
-
- There is a finite list of _manufactured_ crystals. This file aims
- to document all of the known speeds that crystals were available in.
- Feel free to add to the list if you find another speed crystal on
- a PCB, but please DON'T GUESS!
-
- Remember that some very high frequencies (typically above 100MHz) are
- generated by a frequency multiplying IC from a lower frequency
- crystal.
-
- This is intended as a reference of existing parts to prevent incorrect
- clock speed measurements with digital frequency counters being used
- in drivers. When measuring clocks, remember that most parts have a
- tolerance so be sure to reference existing parts only and not just
- accept direct readings as 100% true.
-
- MAME doesn't yet support fractions in crystal frequencies. For example,
- XTAL_3_579545MHz should actually be 3579545.454545...Hz (39375000/11).
- This is no problem though: see above note about tolerance.
-
- In the "Examples" column, please don't add 1000 examples, this is just
- for interest, so two or three examples is enough.
- The actual reference where the xtals are used can be found in the
- driver files by searching for the frequency (e.g. "XTAL_4_9152MHz")
-
- (Thanks to Guru for starting this documentation.)
-
-**************************************************************************/
-
-#ifndef MAME_EMU_DRIVERS_XTAL_H
-#define MAME_EMU_DRIVERS_XTAL_H
-
-#pragma once
-
-enum
-{
-/*
- Name = Frequency Examples
- ------------------ ------------ ------------------------------------------------------------ */
- XTAL_32_768kHz = 32768, /* 32.768kHz, used to drive RTC chips */
- XTAL_1MHz = 1000000, /* Used to drive OKI M6295 chips */
- XTAL_1_2944MHz = 1294400, /* BBN BitGraph PSG */
- XTAL_1_75MHz = 1750000, /* RCA CDP1861 */
- XTAL_1_7971MHz = 1797100, /* SWTPC 6800 (with MIKBUG) */
- XTAL_1_8432MHz = 1843200, /* Bondwell 12/14 */
- XTAL_1_9968MHz = 1996800, /* NEC PC-98xx */
- XTAL_2MHz = 2000000,
- XTAL_2_01216MHz = 2012160, /* Cidelsa Draco sound board */
- XTAL_2_097152MHz = 2097152, /* Icatel 1995 - Brazilian public payphone */
- XTAL_2_4576MHz = 2457600, /* Atari ST MFP, NEC PC-98xx */
- XTAL_2_5MHz = 2500000, /* Janken Man units */
- XTAL_2_95MHz = 2950000, /* Playmatic MPU-C, MPU-III & Sound-3 */
- XTAL_3MHz = 3000000, /* Probably only used to drive 68705 or similar MCUs on 80's Taito PCBs */
- XTAL_3_072MHz = 3072000, /* INS 8520 input clock rate */
- XTAL_3_12MHz = 3120000, /* SP0250 clock on Gottlieb games */
- XTAL_3_52128MHz = 3521280, /* RCA COSMAC VIP */
- XTAL_3_57MHz = 3570000, /* Telmac TMC-600 */
- XTAL_3_57864MHz = 3578640, /* Atari Portfolio PCD3311T */
- XTAL_3_579545MHz = 3579545, /* NTSC color subcarrier, extremely common, used on 100's of PCBs (Keytronic custom part #48-300-010 is equivalent) */
- XTAL_3_6864MHz = 3686400, /* Baud rate clock for MC68681 and similar UARTs */
- XTAL_3_84MHz = 3840000, /* Fairlight CMI Alphanumeric Keyboard */
- XTAL_4MHz = 4000000,
- XTAL_4_028MHz = 4028000, /* Sony SMC-777 */
- XTAL_4_032MHz = 4032000, /* GRiD Compass modem board */
- XTAL_4_096MHz = 4096000, /* Used to drive OKI M9810 chips */
- XTAL_4_194304Mhz = 4194304, /* Used to drive MC146818 / Nintendo Game Boy */
- XTAL_4_224MHz = 4224000, /* Used to drive OKI M6295 chips, usually with /4 divider */
- XTAL_4_41MHz = 4410000, /* Pioneer PR-8210 ldplayer */
- XTAL_4_43361MHz = 4433610, /* Cidelsa Draco */
- XTAL_4_433619MHz = 4433619, /* PAL color subcarrier (technically 4.43361875mhz)*/
- XTAL_4_608MHz = 4608000, /* Luxor ABC-77 keyboard (Keytronic custom part #48-300-107 is equivalent) */
- XTAL_4_9152MHz = 4915200,
- XTAL_5MHz = 5000000, /* Mutant Night */
- XTAL_5_0688MHz = 5068800, /* Usually used as MC2661 or COM8116 baud rate clock */
- XTAL_5_46MHz = 5460000, /* ec1840 and ec1841 keyboard */
- XTAL_5_5296MHz = 5529600, /* Kontron PSI98 keyboard */
- XTAL_5_626MHz = 5626000, /* RCA CDP1869 PAL dot clock */
- XTAL_5_67MHz = 5670000, /* RCA CDP1869 NTSC dot clock */
- XTAL_5_7143MHz = 5714300, /* Cidelsa Destroyer, TeleVideo serial keyboards */
- XTAL_5_911MHz = 5911000, /* Philips Videopac Plus G7400 */
- XTAL_5_9904MHz = 5990400, /* Luxor ABC 800 keyboard (Keytronic custom part #48-300-008 is equivalent) */
- XTAL_6MHz = 6000000, /* American Poker II, Taito SJ System */
- XTAL_6_144MHz = 6144000, /* Used on Alpha Denshi early 80's games sound board, Casio FP-200 and Namco Universal System 16 */
- XTAL_6_5MHz = 6500000, /* Jupiter Ace */
- XTAL_6_88MHz = 6880000, /* Barcrest MPU4 */
- XTAL_6_9MHz = 6900000, /* BBN BitGraph CPU */
- XTAL_7MHz = 7000000, /* Jaleco Mega System PCBs */
- XTAL_7_15909MHz = 7159090, /* Blood Bros (2x NTSC subcarrier) */
- XTAL_7_3728MHz = 7372800,
- XTAL_7_8643MHz = 7864300, /* Used on InterFlip games as video clock */
- XTAL_8MHz = 8000000, /* Extremely common, used on 100's of PCBs */
- XTAL_8_2MHz = 8200000, /* Universal Mr. Do - Model 8021 PCB */
- XTAL_8_388MHz = 8388000, /* Nintendo Game Boy Color */
- XTAL_8_448MHz = 8448000, /* Banpresto's Note Chance - Used to drive OKI M6295 chips, usually with /8 divider */
- XTAL_8_4672MHz = 8467200, /* Subsino's Ying Hua Lian */
- XTAL_8_664MHz = 8664000, /* Touchmaster */
- XTAL_8_7MHz = 8700000, /* Tandberg TDV 2324 */
- XTAL_8_867236MHz = 8867236, /* RCA CDP1869 PAL color clock (~2x PAL subcarrier) */
- XTAL_8_867238MHz = 8867238, /* ETI-660 (~2x PAL subcarrier) */
- XTAL_8_945MHz = 8945000, /* Hit Me */
- XTAL_9_216MHz = 9216000, /* Conitec PROF-180X */
- XTAL_9_828MHz = 9828000, /* Universal PCBs */
- XTAL_9_832MHz = 9832000, /* Robotron A7150 */
- XTAL_9_8304MHz = 9830400, /* Epson PX-8 */
- XTAL_9_87768MHz = 9877680, /* Microterm 420 */
- XTAL_9_987MHz = 9987000, /* Crazy Balloon */
- XTAL_10MHz = 10000000,
- XTAL_10_245MHz = 10245000, /* PES Speech box */
- XTAL_10_38MHz = 10380000, /* Fairlight Q219 Lightpen/Graphics Card */
- XTAL_10_5MHz = 10500000, /* Agat-7 */
- XTAL_10_595MHz = 10595000, /* Mad Alien */
- XTAL_10_6875MHz = 10687500, /* BBC Bridge Companion */
- XTAL_10_69425MHz = 10694250, /* Xerox 820 */
- XTAL_10_7172MHz = 10717200, /* Eltec EurocomII */
- XTAL_10_730MHz = 10730000, /* Ruleta RE-900 VDP Clock */
- XTAL_10_733MHz = 10733000, /* The Fairyland Story */
- XTAL_10_738635MHz = 10738635, /* TMS9918 family (3x NTSC subcarrier) */
- XTAL_10_816MHz = 10816000, /* Universal 1979-1980 (Cosmic Alien, etc) */
- XTAL_10_920MHz = 10920000, /* ADDS Viewpoint 60, Viewpoint A2 */
- XTAL_11MHz = 11000000, /* Mario I8039 sound */
- XTAL_11_0592MHz = 11059200, /* Used with MCS-51 to generate common baud rates */
- XTAL_11_2MHz = 11200000, /* New York, New York */
- XTAL_11_289MHz = 11289000, /* Vanguard */
- XTAL_11_4MHz = 11400000, /* HP 9845 */
- XTAL_11_6688MHz = 11668800, /* Gameplan pixel clock */
- XTAL_11_8MHz = 11800000, /* IBM PC Music Feature Card */
- XTAL_11_9808MHz = 11980800, /* Luxor ABC 80 */
- XTAL_12MHz = 12000000, /* Extremely common, used on 100's of PCBs */
- XTAL_12_0576MHz = 12057600, /* Poly 1 (38400 * 314) */
- XTAL_12_096MHz = 12096000, /* Some early 80's Atari games */
- XTAL_12_288MHz = 12288000, /* Sega Model 3 digital audio board */
- XTAL_12_324MHz = 12324000, /* Otrona Attache */
- XTAL_12_432MHz = 12432000, /* Kaneko Fly Boy/Fast Freddie Hardware */
- XTAL_12_4725MHz = 12472500, /* Bonanza's Mini Boy 7 */
- XTAL_12_48MHz = 12480000, /* TRS-80 Model II */
- XTAL_12_5MHz = 12500000, /* Red Alert audio board */
- XTAL_12_8MHz = 12800000, /* Cave CV1000 */
- XTAL_12_8544MHz = 12854400, /* alphatronic P3 */
- XTAL_12_9792MHz = 12979200, /* Exidy 440 */
- XTAL_13_3MHz = 13300000, /* BMC bowling */
- XTAL_13_33056MHz = 13330560, /* Taito L */
- XTAL_13_333MHz = 13333000, /* Ojanko High School */
- XTAL_13_4MHz = 13400000, /* TNK3, Ikari Warriors h/w */
- XTAL_13_4784MHz = 13478400, /* TeleVideo 970 80-column display clock */
- XTAL_13_4952MHz = 13495200, /* Used on Shadow Force pcb and maybe other Technos pcbs? */
- XTAL_13_5168MHz = 13516800, /* Kontron KDT6 */
- XTAL_13_608MHz = 13608000, /* TeleVideo 910 & 925 */
- XTAL_14MHz = 14000000,
- XTAL_14_112MHz = 14112000, /* Timex/Sinclair TS2068 */
- XTAL_14_192640MHz = 14192640, /* Central Data 2650 */
- XTAL_14_218MHz = 14218000, /* Dragon */
- XTAL_14_3MHz = 14300000, /* Agat-7 */
- XTAL_14_314MHz = 14314000, /* Taito TTL Board */
- XTAL_14_31818MHz = 14318181, /* Extremely common, used on 100's of PCBs (4x NTSC subcarrier) */
- XTAL_14_705882MHz = 14705882, /* Aleck64 */
- XTAL_14_7456MHz = 14745600, /* Namco System 12 & System Super 22/23 for JVS */
- XTAL_14_916MHz = 14916000, /* ADDS Viewpoint 122 */
- XTAL_15MHz = 15000000, /* Sinclair QL, Amusco Poker */
- XTAL_15_1488MHz = 15148800, /* Zentec 9002/9003 */
- XTAL_15_288MHz = 15288000, /* DEC VT220 80-column display clock */
- XTAL_15_30072MHz = 15300720, /* Microterm 420 */
- XTAL_15_36MHz = 15360000, /* Visual 1050 */
- XTAL_15_4MHz = 15400000, /* DVK KSM */
- XTAL_15_468MHz = 15468480, /* Bank Panic h/w, Sega G80 */
- XTAL_15_582MHz = 15582000, /* Zentec Zephyr */
- XTAL_15_8976MHz = 15897600, /* IAI Swyft */
- XTAL_15_92MHz = 15920000, /* HP Integral PC */
- XTAL_15_9744MHz = 15974400, /* Osborne 1 (9600 * 52 * 32) */
- XTAL_16MHz = 16000000, /* Extremely common, used on 100's of PCBs */
- XTAL_16_09728MHz = 16097280, /* DEC VT240 (1024 * 262 * 60) */
- XTAL_16_128MHz = 16128000, /* Fujitsu FM-7 */
- XTAL_16_384MHz = 16384000,
- XTAL_16_4MHz = 16400000, /* MS 6102 */
- XTAL_16_5888MHz = 16588800, /* SM 7238 */
- XTAL_16_6698MHz = 16669800, /* Qume QVT-102 */
- XTAL_16_67MHz = 16670000,
- XTAL_16_777216MHz = 16777216, /* Nintendo Game Boy Advance */
- XTAL_16_9344MHz = 16934400, /* Usually used to drive 90's Yamaha OPL/FM chips (44100 * 384) */
- XTAL_17_064MHz = 17064000, /* Memorex 1377 */
- XTAL_17_36MHz = 17360000, /* OMTI Series 10 SCSI controller */
- XTAL_17_55MHz = 17550000, /* HP 264x display clock (50 Hz configuration) */
- XTAL_17_73447MHz = 17734470, /* (~4x PAL subcarrier) */
- XTAL_17_734472MHz = 17734472, /* actually ~4x PAL subcarrier */
- XTAL_17_9712MHz = 17971200,
- XTAL_18MHz = 18000000, /* S.A.R, Ikari Warriors 3 */
- XTAL_18_432MHz = 18432000, /* Extremely common, used on 100's of PCBs (48000 * 384) */
- XTAL_18_575MHz = 18575000, /* Visual 102, Visual 220 */
- XTAL_18_720MHz = 18720000, /* Nokia MikroMikko 1 */
- XTAL_18_8696MHz = 18869600, /* Memorex 2178 */
- XTAL_19_3396MHz = 19339600, /* TeleVideo TVI-955 80-column display clock */
- XTAL_19_6MHz = 19600000, /* Universal Mr. Do - Model 8021 PCB */
- XTAL_19_6608MHz = 19660800, /* Euro League (bootleg), labeled as "UKI 19.6608 20PF" */
- XTAL_19_6614MHz = 19661400, /* Wyse WY-30 */
- XTAL_19_923MHz = 19923000, /* Cinematronics vectors */
- XTAL_19_968MHz = 19968000, /* Used mostly by some Taito games */
- XTAL_20MHz = 20000000,
- XTAL_20_16MHz = 20160000, /* Nintendo 8080 */
- XTAL_20_079MHz = 20790000, /* Blockade-hardware Gremlin games */
- XTAL_20_625MHz = 20625000, /* SM 7238 */
- XTAL_21MHz = 21000000, /* Lock-On pixel clock */
- XTAL_21_0526MHz = 21052600, /* NEC PC-98xx pixel clock */
- XTAL_21_06MHz = 21060000, /* HP 264x display clock (60 Hz configuration) */
- XTAL_21_2544MHz = 21254400, /* TeleVideo 970 132-column display clock */
- XTAL_21_28137MHz = 21281370, /* Radica Tetris */
- XTAL_21_3MHz = 21300000,
- XTAL_21_4772MHz = 21477272, /* BMC bowling, some Data East 90's games, Vtech Socrates; (6x NTSC subcarrier) */
- XTAL_22MHz = 22000000,
- XTAL_22_096MHz = 22096000, /* ADDS Viewpoint 122 */
- XTAL_22_1184MHz = 22118400, /* Amusco Poker */
- XTAL_22_3210MHz = 22321000, /* Apple LaserWriter II NT */
- XTAL_22_656MHz = 22656000, /* Super Pinball Action (~1440x NTSC line rate) */
- XTAL_22_896MHz = 22896000, /* DEC VT220 132-column display clock */
- XTAL_23_814MHz = 23814000, /* TeleVideo TVI-912, 920 & 950 */
- XTAL_23_9616MHz = 23961600, /* Osborne 4 (Vixen) */
- XTAL_24MHz = 24000000, /* Mario, 80's Data East games, 80's Konami games */
- XTAL_24_0734MHz = 24073400, /* DEC Rainbow 100 */
- XTAL_24_576MHz = 24576000, /* Pole Position h/w, Model 3 CPU board */
- XTAL_24_8832MHz = 24883200, /* DEC VT100 */
- XTAL_25MHz = 25000000, /* Namco System 22, Taito GNET, Dogyuun h/w */
- XTAL_25_1748MHz = 25174800, /* Sega System 16A/16B (1600x NTSC line rate) */
- XTAL_25_2MHz = 25200000, /* Tektronix 4404 video clock */
- XTAL_25_39836MHz = 25398360, /* Tandberg TDV 2324 */
- XTAL_25_447MHz = 25447000, /* Namco EVA3A (Funcube2) */
- XTAL_25_590906MHz = 25590906, /* Atari Jaguar NTSC */
- XTAL_25_593900MHz = 25593900, /* Atari Jaguar PAL */
- XTAL_25_7715MHz = 25771500, /* HP-2622A */
- XTAL_25_92MHz = 25920000, /* ADDS Viewpoint 60 */
- XTAL_26MHz = 26000000, /* Gaelco PCBs */
- XTAL_26_366MHz = 26366000, /* DEC VT320 */
- XTAL_26_580MHz = 26580000, /* Wyse WY-60 80-column display clock */
- XTAL_26_601712MHz = 26601712, /* Astro Corp.'s Show Hand, PAL Vtech/Yeno Socrates (6x PAL subcarrier) */
- XTAL_26_666MHz = 26666000, /* Imagetek I4100/I4220/I4300 */
- XTAL_26_66666MHz = 26666666, /* Irem M92 but most use 27MHz */
- XTAL_26_686MHz = 26686000, /* Typically used on 90's Taito PCBs to drive the custom chips */
- XTAL_26_9892MHz = 26989200, /* TeleVideo 965 */
- XTAL_27MHz = 27000000, /* Some Banpresto games macrossp, Irem M92 and 90's Toaplan games */
- XTAL_27_164MHz = 27164000, /* Typically used on 90's Taito PCBs to drive the custom chips */
- XTAL_27_2109MHz = 27210900, /* LA Girl */
- XTAL_27_562MHz = 27562000, /* Visual 220 */
- XTAL_28MHz = 28000000,
- XTAL_28_322MHz = 28322000, /* Saitek RISC 2500, Mephisto Montreux */
- XTAL_28_37516MHz = 28375160, /* Amiga PAL systems */
- XTAL_28_475MHz = 28475000, /* CoCo 3 PAL */
- XTAL_28_48MHz = 28480000, /* Chromatics CGC-7900 */
- XTAL_28_63636MHz = 28636363, /* Later Leland games and Atari GT, Amiga NTSC, Raiden2 h/w (8x NTSC subcarrier)*/
- XTAL_28_64MHz = 28640000, /* Fukki FG-1c AI AM-2 PCB */
- XTAL_28_7MHz = 28700000,
- XTAL_29_376MHz = 29376000, /* Qume QVT-103 */
- XTAL_29_4912MHz = 29491200, /* Xerox Alto-II system clock (tagged 29.4MHz in the schematics) */
- XTAL_30MHz = 30000000, /* Impera Magic Card */
- XTAL_30_4761MHz = 30476100, /* Taito JC */
- XTAL_30_8MHz = 30800000, /* 15IE-00-013 */
- XTAL_31_2795MHz = 31279500, /* Wyse WY-30+ */
- XTAL_31_684MHz = 31684000, /* TeleVideo TVI-955 132-column display clock */
- XTAL_31_9488MHz = 31948800, /* NEC PC-88xx, PC-98xx */
- XTAL_32MHz = 32000000,
- XTAL_32_22MHz = 32220000, /* Typically used on 90's Data East PCBs (close to 9x NTSC subcarrier which is 32.215905Mhz*/
- XTAL_32_3174MHz = 32317400, /* DEC VT330, VT340 */
- XTAL_32_5304MHz = 32530400, /* Seta 2 */
- XTAL_33MHz = 33000000, /* Sega Model 3 video board */
- XTAL_33_264MHz = 33264000, /* Hazeltine 1500 terminal */
- XTAL_33_333MHz = 33333000, /* Sega Model 3 CPU board, Vegas */
- XTAL_33_833MHz = 33833000,
- XTAL_33_8688MHz = 33868800, /* Usually used to drive 90's Yamaha OPL/FM chips with /2 divider */
- XTAL_34MHz = 34000000, /* Gaelco PCBs */
- XTAL_34_291712MHz = 34291712, /* Fairlight CMI master card */
- XTAL_36MHz = 36000000, /* Sega Model 1 video board */
- XTAL_38_76922MHz = 38769220, /* Namco System 21 video board */
- XTAL_39_3216MHz = 39321600, /* Sun 2/120 */
- XTAL_39_710MHz = 39710000, /* Wyse WY-60 132-column display clock */
- XTAL_40MHz = 40000000,
- XTAL_40_210MHz = 40210000, /* Fairlight CMI IIx */
- XTAL_42MHz = 42000000, /* BMC A-00211 - Popo Bear */
- XTAL_42_1052MHz = 42105200, /* NEC PC-88xx */
- XTAL_42_9545MHz = 42954545, /* CPS3 (12x NTSC subcarrier)*/
- XTAL_43_320MHz = 43320000, /* DEC VT420 */
- XTAL_44_1MHz = 44100000, /* Subsino's Bishou Jan */
- XTAL_44_4528MHz = 44452800, /* TeleVideo 965 */
- XTAL_45MHz = 45000000, /* Eolith with Hyperstone CPUs */
- XTAL_45_158MHz = 45158000, /* Sega Model 2A video board, Model 3 CPU board */
- XTAL_45_6192MHz = 45619200, /* DEC VK100 */
- XTAL_45_8304MHz = 45830400, /* Microterm 5510 */
- XTAL_47_736MHz = 47736000, /* Visual 100 */
- XTAL_48MHz = 48000000, /* Williams/Midway Y/Z-unit system / SSV board */
- XTAL_48_384MHz = 48384000, /* Namco NB-1 */
- XTAL_48_5568MHz = 48556800, /* Wyse WY-85 */
- XTAL_48_654MHz = 48654000, /* Qume QVT-201 */
- XTAL_48_66MHz = 48660000, /* Zaxxon */
- XTAL_49_152MHz = 49152000, /* Used on some Namco PCBs, Baraduke h/w, System 21, Super System 22 */
- XTAL_49_4235MHz = 49423500, /* Wyse WY-185 */
- XTAL_50MHz = 50000000, /* Williams/Midway T/W/V-unit system */
- XTAL_50_113MHz = 50113000, /* Namco NA-1 (14x NTSC subcarrier)*/
- XTAL_50_349MHz = 50349000, /* Sega System 18 (~3200x NTSC line rate) */
- XTAL_52MHz = 52000000, /* Cojag */
- XTAL_52_832MHz = 52832000, /* Wang PC TIG video controller */
- XTAL_53_2034MHz = 53203400, /* Master System, Mega Drive PAL (~12x PAL subcarrier) */
- XTAL_53_693175MHz = 53693175, /* PSX-based h/w, Sony ZN1-2-based (15x NTSC subcarrier) */
- XTAL_54MHz = 54000000, /* Taito JC */
- XTAL_55MHz = 55000000, /* Eolith Vega */
- XTAL_57_2727MHz = 57272727, /* Psikyo SH2 with /2 divider (16x NTSC subcarrier)*/
- XTAL_58MHz = 58000000, /* Magic Reel (Play System) */
- XTAL_59_2920MHz = 59292000, /* Data General D461 */
- XTAL_60MHz = 60000000,
- XTAL_61_44MHz = 61440000, /* dkong */
- XTAL_64MHz = 64000000, /* BattleToads */
- XTAL_66_6667MHz = 66666700, /* Later Midway games */
- XTAL_67_7376MHz = 67737600, /* PSX-based h/w, Sony ZN1-2-based */
- XTAL_68_85MHz = 68850000, /* Wyse WY-50 */
- XTAL_72MHz = 72000000, /* Aristocrat MKV */
- XTAL_72_576MHz = 72576000, /* Centipede, Millipede, Missile Command, Let's Go Bowling "Multipede" */
- XTAL_73_728MHz = 73728000, /* Ms. Pac-Man/Galaga 20th Anniversary */
- XTAL_87_18336MHz = 87183360, /* AT&T 630 MTG */
- XTAL_100MHz = 100000000, /* PSX-based Namco System 12, Vegas, Sony ZN1-2-based */
- XTAL_101_4912MHz = 101491200, /* PSX-based Namco System 10 */
- XTAL_200MHz = 200000000, /* Base SH4 CPU (Naomi, Hikaru etc.) */
-
-/* Resonators (There are probably more) */
-
- XTAL_384kHz = 384000, /* Commonly used for driving OKI MSM5205 */
- XTAL_400kHz = 400000, /* OKI MSM5205 on Great Swordman h/w */
- XTAL_430kHz = 430000,
- XTAL_455kHz = 455000, /* OKI MSM5205 on Gladiator h/w */
- XTAL_512kHz = 512000, /* Toshiba TC8830F */
- XTAL_600kHz = 600000,
- XTAL_640kHz = 640000, /* NEC UPD7759, Texas Instruments Speech Chips @ 8khz */
- XTAL_960kHz = 960000, /* Xerox Notetaker Keyboard UART */
- XTAL_1_056MHz = 1056000, /* OKI M6295 on Trio The Punch h/w */
- XTAL_3_9MHz = 3900000 /* Used on some Fidelity boards */
-};
-
-
-/*
-
-For further reference:
-
-A search at http://search.digikey.com/scripts/DkSearch/dksus.dll?Cat=852333;keywords=cry
-reveals the following shipping frequencies as of 1/1/2008:
-
-20kHz
-25.600kHz
-26.667kHz
-28kHz
-
-30kHz
-30.720kHz
-30.76kHz
-31.2kHz
-31.25kHz
-31.5kHz
-32.000kHz
-32.56kHz
-32.768kHz
-32.919kHz
-34kHz
-36kHz
-38kHz
-38.4kHz
-39.500kHz
-
-40kHz
-44.100kHz
-46.604kHz
-46.6084kHz
-
-50kHz
-59.787kHz
-
-60.000kHz
-60.002kHz
-60.005kHz
-65.535kHz
-65.536kHz
-69kHz
-
-70kHz
-71kHz
-72kHz
-73kHz
-74kHz
-74.3kHz
-74.4kHz
-75kHz
-76kHz
-76.79kHz
-76.8kHz
-76.81kHz
-77kHz
-77.204kHz
-77.287kHz
-77.500kHz
-77.503kHz
-77.504kHz
-78kHz
-79kHz
-
-83kHz
-
-96kHz
-96.006kHz
-
-100kHz
-111kHz
-117.72kHz
-120kHz
-120.8475kHz
-125kHz
-131.072kHz
-149.475kHz
-153.600kHz
-
-200kHz
-
-307.2kHz
-
-1.000MHz
-1.8432MHz
-
-2.000MHz
-2.048MHz
-2.097152MHz
-2.4576MHz
-2.5MHz
-2.560MHz
-2.949120MHz
-
-3.000MHz
-3.276MHz
-3.2768MHz
-3.579MHz
-3.579545MHz
-3.640MHz
-3.6864MHz
-3.700MHz
-3.859MHz
-3.93216MHz
-
-4.000MHz
-4.032MHz
-4.096MHz
-4.09625MHz
-4.194MHz
-4.194304MHz
-4.332MHz
-4.433MHz
-4.433616MHz
-4.433618MHz
-4.433619MHz
-4.74687MHz
-4.800MHz
-4.8970MHz
-4.90625MHz
-4.915MHz
-4.9152MHz
-
-5.000MHz
-5.0688MHz
-5.120MHz
-5.185MHz
-5.223438MHz
-5.5MHz
-5.5296MHz
-5.9904MHz
-
-6.000MHz
-6.14MHz
-6.144MHz
-6.1760MHz
-6.400 MHz
-6.49830MHz
-6.5MHz
-6.5536MHz
-6.612813MHz
-6.7458MHz
-6.757MHz
-6.76438MHz
-
-7.1505MHz
-7.15909 MHz
-7.2MHz
-7.3728MHz
-7.68MHz
-7.94888MHz
-
-8.000MHz
-8.000156MHz
-8.192MHz
-8.388608MHz
-8.432MHz
-8.5MHz
-8.6432MHz
-
-9.000MHz
-9.216MHz
-9.509375MHz
-9.545MHz
-9.6MHz
-9.7941MHz
-9.830MHz
-9.8304MHz
-9.84375MHz
-9.8438MHz
-
-10.000MHz
-10.240MHz
-10.245MHz
-10.6244MHz
-10.738635MHz
-10.73865MHz
-
-11.000MHz
-11.046MHz
-11.0592MHz
-11.228MHz
-11.2896MHz
-11.520MHz
-11.981350MHz
-
-12.000MHz
-12.000393MHz
-12.096MHz
-12.1875MHz
-12.288MHz
-12.352MHz
-12.500MHz
-12.688MHz
-12.800MHz
-12.96MHz
-
-13.000MHz
-13.0625MHz
-13.225MHz
-13.2256MHz
-13.500MHz
-13.5168MHz
-13.56MHz
-13.605MHz
-13.824MHz
-13.94916MHz
-
-14.00MHz
-14.318MHz
-14.31818MHz
-14.3359MHz
-14.3594MHz
-14.4MHz
-14.5MHz
-14.69MHz
-14.7456MHz
-14.850MHz
-
-15MHz
-15.360MHz
-
-16.000MHz
-16.000312MHz
-16.128MHz
-16.257MHz
-16.3676MHz
-16.368MHz
-16.384MHz
-16.576MHz
-16.6660MHz
-16.667MHz
-16.670MHz
-16.800MHz
-16.934MHz
-16.9344MHz
-
-17.734475MHz
-
-18.000MHz
-18.432MHz
-18.869MHz
-
-19.200MHz
-19.440MHz
-19.660MHz
-19.6608MHz
-19.68MHz
-19.800MHz
-
-20.000MHz
-20.35625MHz
-20.3563MHz
-20.480MHz
-
-21.47727MHz
-
-22.000MHz
-22.118MHz
-22.1184MHz
-22.400MHz
-22.5MHz
-22.5792MHz
-22.6278MHz
-
-23MHz
-23.2643MHz
-23.5MHz
-23.5122MHz
-23.592MHz
-
-24.000MHz
-24.00014MHz
-24.5MHz
-24.545454 MHz
-24.5535MHz
-24.576MHz
-24.704MHz
-24.7456MHz
-
-25.000MHz
-25MHz
-25.175MHz
-25.2235MHz
-25.4563MHz
-25.5MHz
-
-26.000MHz
-26.45125MHz
-26.4513MHz
-26.5MHz
-26.5971MHz
-26.800MHz
-
-27.000MHz
-27.1344MHz
-27.3067MHz
-27.4688MHz
-
-28.000MHz
-28.224MHz
-28.259375MHz
-28.2594MHz
-28.322MHz
-28.375MHz
-28.5938MHz
-28.636MHz
-28.6363MHz
-28.63636MHz
-
-29.4912MHz
-29.498928MHz
-29.500MHz
-
-30.000MHz
-32.000MHz
-32.514MHz
-32.768MHz
-33.000MHz
-33.333MHz
-33.3333MHz
-33.8688MHz
-35.2512MHz
-35.3280MHz
-36.000MHz
-38.000MHz
-38.00053MHz
-38.400MHz
-38.880MHz
-39MHz
-
-40.000MHz
-40.320MHz
-40.960 MHz
-42.000MHz
-44.000MHz
-44.2368MHz
-44.545MHz
-44.736MHz
-44.800MHz
-44.900MHz
-45.000MHz
-46.000MHz
-48.000MHz
-49.152MHz
-49.86MHz
-
-50.000MHz
-53.125MHz
-55.000MHz
-
-60.000MHz
-64.000MHz
-66.000MHz
-66.666MHz
-66.6666MHz
-
-73.66979MHz
-75.957292MHz
-76.121875MHz
-
-80.000MHz
-
-100.00MHz
-
-*/
-
-#endif // MAME_EMU_DRIVERS_XTAL_H
diff --git a/src/emu/emu.h b/src/emu/emu.h
index cc837b04d4f..6d55125f07b 100644
--- a/src/emu/emu.h
+++ b/src/emu/emu.h
@@ -25,9 +25,11 @@
#include <unordered_map>
#include <unordered_set>
-// core emulator headers -- must be first
+// core emulator headers -- must be first (profiler needs attotime, attotime needs xtal)
#include "emucore.h"
#include "eminline.h"
+#include "xtal.h"
+#include "attotime.h"
#include "profiler.h"
// http interface helpers
@@ -40,7 +42,6 @@
#include "vecstream.h"
// emulator-specific utilities
-#include "attotime.h"
#include "hash.h"
#include "fileio.h"
#include "delegate.h"
@@ -108,7 +109,6 @@ typedef void (*machine_config_constructor)(machine_config &config, device_t *own
// generic helpers
#include "devcb.h"
-#include "drivers/xtal.h"
#include "bookkeeping.h"
#include "video/generic.h"
diff --git a/src/emu/mconfig.cpp b/src/emu/mconfig.cpp
index 78a89feefab..fe9040c3b75 100644
--- a/src/emu/mconfig.cpp
+++ b/src/emu/mconfig.cpp
@@ -159,6 +159,13 @@ device_t *machine_config::device_add(device_t *owner, const char *tag, device_ty
}
}
+device_t *machine_config::device_add(device_t *owner, const char *tag, device_type type, const XTAL &clock)
+{
+ std::string msg = std::string("Instantiating device ") + tag;
+ clock.check(msg);
+ return device_add(owner, tag, type, clock.value());
+}
+
//-------------------------------------------------
// device_replace - configuration helper to
@@ -192,6 +199,14 @@ device_t *machine_config::device_replace(device_t *owner, const char *tag, devic
}
+device_t *machine_config::device_replace(device_t *owner, const char *tag, device_type type, const XTAL &clock)
+{
+ std::string msg = std::string("Replacing device ") + tag;
+ clock.check(msg);
+ return device_replace(owner, tag, type, clock.value());
+}
+
+
//-------------------------------------------------
// device_remove - configuration helper to
// remove a device
diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h
index 1e0cb8c8e5a..fc3533feda1 100644
--- a/src/emu/mconfig.h
+++ b/src/emu/mconfig.h
@@ -69,7 +69,9 @@ public:
// helpers during configuration; not for general use
device_t *device_add(device_t *owner, const char *tag, device_type type, u32 clock);
+ device_t *device_add(device_t *owner, const char *tag, device_type type, const XTAL &xtal);
device_t *device_replace(device_t *owner, const char *tag, device_type type, u32 clock);
+ device_t *device_replace(device_t *owner, const char *tag, device_type type, const XTAL &xtal);
device_t *device_remove(device_t *owner, const char *tag);
device_t *device_find(device_t *owner, const char *tag);
diff --git a/src/emu/profiler.h b/src/emu/profiler.h
index f3abc6b5688..8000840af9a 100644
--- a/src/emu/profiler.h
+++ b/src/emu/profiler.h
@@ -26,9 +26,6 @@
#pragma once
-#include "attotime.h"
-
-
//**************************************************************************
// CONSTANTS
diff --git a/src/emu/screen.h b/src/emu/screen.h
index c022c573316..2297a8514e2 100644
--- a/src/emu/screen.h
+++ b/src/emu/screen.h
@@ -189,6 +189,7 @@ public:
// inline configuration helpers
static void static_set_type(device_t &device, screen_type_enum type);
static void static_set_raw(device_t &device, u32 pixclock, u16 htotal, u16 hbend, u16 hbstart, u16 vtotal, u16 vbend, u16 vbstart);
+ static void static_set_raw(device_t &device, const XTAL &xtal, u16 htotal, u16 hbend, u16 hbstart, u16 vtotal, u16 vbend, u16 vbstart) { static_set_raw(device, xtal.value(), htotal, hbend, hbstart, vtotal, vbend, vbstart); }
static void static_set_refresh(device_t &device, attoseconds_t rate);
static void static_set_vblank_time(device_t &device, attoseconds_t time);
static void static_set_size(device_t &device, u16 width, u16 height);
diff --git a/src/emu/xtal.cpp b/src/emu/xtal.cpp
new file mode 100644
index 00000000000..aa58705baf2
--- /dev/null
+++ b/src/emu/xtal.cpp
@@ -0,0 +1,785 @@
+// license:BSD-3-Clause
+// copyright-holders:Nicola Salmoria
+/*************************************************************************
+
+ xtal.h
+
+ Documentation and consistent naming for known existing crystals.
+
+***************************************************************************
+
+ PCB Crystal Reference
+ ----------------------
+ _____ ________
+ |16 | |o |
+ |MHZ| |16.0MHZ |
+ |___| |________|
+ | |
+
+ There is a finite list of _manufactured_ crystals. This file aims
+ to document all of the known speeds that crystals were available in.
+ Feel free to add to the list if you find another speed crystal on
+ a PCB, but please DON'T GUESS!
+
+ Remember that some very high frequencies (typically above 100MHz) are
+ generated by a frequency multiplying IC from a lower frequency
+ crystal.
+
+ This is intended as a reference of existing parts to prevent incorrect
+ clock speed measurements with digital frequency counters being used
+ in drivers. When measuring clocks, remember that most parts have a
+ tolerance so be sure to reference existing parts only and not just
+ accept direct readings as 100% true.
+
+ MAME doesn't yet support fractions in crystal frequencies. For example,
+ XTAL(3'579'545) should actually be 3579545.454545...Hz (39375000/11).
+ This is no problem though: see above note about tolerance.
+
+ In the "Examples" column, please don't add 1000 examples, this is just
+ for interest, so two or three examples is enough.
+ The actual reference where the xtals are used can be found in the
+ driver files by searching for the frequency (e.g. "XTAL(4'915'200)")
+
+ (Thanks to Guru for starting this documentation.)
+
+**************************************************************************/
+
+// This array *must* stay in order, it's binary-searched
+const double XTAL::known_xtals[] = {
+/*
+ Frequency Examples
+ ----------- ------------------------------------------------------------ */
+ 32'768, /* 32.768kHz, used to drive RTC chips */
+ 384'000, /* Resonator - Commonly used for driving OKI MSM5205 */
+ 400'000, /* Resonator - OKI MSM5205 on Great Swordman h/w */
+ 430'000, /* Resonator */
+ 455'000, /* Resonator - OKI MSM5205 on Gladiator h/w */
+ 512'000, /* Resonator - Toshiba TC8830F */
+ 600'000,
+ 640'000, /* Resonator - NEC UPD7759, Texas Instruments Speech Chips @ 8khz */
+ 960'000, /* Resonator - Xerox Notetaker Keyboard UART */
+ 1'000'000, /* Used to drive OKI M6295 chips */
+ 1'056'000, /* Resonator - OKI M6295 on Trio The Punch h/w */
+ 1'294'400, /* BBN BitGraph PSG */
+ 1'750'000, /* RCA CDP1861 */
+ 1'797'100, /* SWTPC 6800 (with MIKBUG) */
+ 1'843'200, /* Bondwell 12/14 */
+ 1'996'800, /* NEC PC-98xx */
+ 2'000'000,
+ 2'012'160, /* Cidelsa Draco sound board */
+ 2'097'152, /* Icatel 1995 - Brazilian public payphone */
+ 2'457'600, /* Atari ST MFP, NEC PC-98xx */
+ 2'500'000, /* Janken Man units */
+ 2'950'000, /* Playmatic MPU-C, MPU-III & Sound-3 */
+ 3'000'000, /* Probably only used to drive 68705 or similar MCUs on 80's Taito PCBs */
+ 3'072'000, /* INS 8520 input clock rate */
+ 3'120'000, /* SP0250 clock on Gottlieb games */
+ 3'521'280, /* RCA COSMAC VIP */
+ 3'570'000, /* Telmac TMC-600 */
+ 3'578'640, /* Atari Portfolio PCD3311T */
+ 3'579'545, /* NTSC color subcarrier, extremely common, used on 100's of PCBs (Keytronic custom part #48-300-010 is equivalent) */
+ 3'686'400, /* Baud rate clock for MC68681 and similar UARTs */
+ 3'840'000, /* Fairlight CMI Alphanumeric Keyboard */
+ 3'900'000, /* Resonator - Used on some Fidelity boards */
+ 4'000'000,
+ 4'028'000, /* Sony SMC-777 */
+ 4'032'000, /* GRiD Compass modem board */
+ 4'096'000, /* Used to drive OKI M9810 chips */
+ 4'194'304, /* Used to drive MC146818 / Nintendo Game Boy */
+ 4'224'000, /* Used to drive OKI M6295 chips, usually with /4 divider */
+ 4'410'000, /* Pioneer PR-8210 ldplayer */
+ 4'433'610, /* Cidelsa Draco */
+ 4'433'619, /* PAL color subcarrier (technically 4.43361875mhz)*/
+ 4'608'000, /* Luxor ABC-77 keyboard (Keytronic custom part #48-300-107 is equivalent) */
+ 4'915'200,
+ 5'000'000, /* Mutant Night */
+ 5'068'800, /* Usually used as MC2661 or COM8116 baud rate clock */
+ 5'460'000, /* ec1840 and ec1841 keyboard */
+ 5'529'600, /* Kontron PSI98 keyboard */
+ 5'626'000, /* RCA CDP1869 PAL dot clock */
+ 5'670'000, /* RCA CDP1869 NTSC dot clock */
+ 5'714'300, /* Cidelsa Destroyer, TeleVideo serial keyboards */
+ 5'911'000, /* Philips Videopac Plus G7400 */
+ 5'990'400, /* Luxor ABC 800 keyboard (Keytronic custom part #48-300-008 is equivalent) */
+ 6'000'000, /* American Poker II, Taito SJ System */
+ 6'144'000, /* Used on Alpha Denshi early 80's games sound board, Casio FP-200 and Namco Universal System 16 */
+ 6'500'000, /* Jupiter Ace */
+ 6'880'000, /* Barcrest MPU4 */
+ 6'900'000, /* BBN BitGraph CPU */
+ 7'000'000, /* Jaleco Mega System PCBs */
+ 7'159'090, /* Blood Bros (2x NTSC subcarrier) */
+ 7'372'800,
+ 7'864'300, /* Used on InterFlip games as video clock */
+ 8'000'000, /* Extremely common, used on 100's of PCBs */
+ 8'200'000, /* Universal Mr. Do - Model 8021 PCB */
+ 8'388'000, /* Nintendo Game Boy Color */
+ 8'448'000, /* Banpresto's Note Chance - Used to drive OKI M6295 chips, usually with /8 divider */
+ 8'467'200, /* Subsino's Ying Hua Lian */
+ 8'664'000, /* Touchmaster */
+ 8'700'000, /* Tandberg TDV 2324 */
+ 8'867'236, /* RCA CDP1869 PAL color clock (~2x PAL subcarrier) */
+ 8'867'238, /* ETI-660 (~2x PAL subcarrier) */
+ 8'945'000, /* Hit Me */
+ 9'216'000, /* Conitec PROF-180X */
+ 9'828'000, /* Universal PCBs */
+ 9'830'400, /* Epson PX-8 */
+ 9'832'000, /* Robotron A7150 */
+ 9'877'680, /* Microterm 420 */
+ 9'987'000, /* Crazy Balloon */
+ 10'000'000,
+ 10'245'000, /* PES Speech box */
+ 10'380'000, /* Fairlight Q219 Lightpen/Graphics Card */
+ 10'500'000, /* Agat-7 */
+ 10'595'000, /* Mad Alien */
+ 10'687'500, /* BBC Bridge Companion */
+ 10'694'250, /* Xerox 820 */
+ 10'717'200, /* Eltec EurocomII */
+ 10'730'000, /* Ruleta RE-900 VDP Clock */
+ 10'733'000, /* The Fairyland Story */
+ 10'738'635, /* TMS9918 family (3x NTSC subcarrier) */
+ 10'816'000, /* Universal 1979-1980 (Cosmic Alien, etc) */
+ 10'920'000, /* ADDS Viewpoint 60, Viewpoint A2 */
+ 11'000'000, /* Mario I8039 sound */
+ 11'059'200, /* Used with MCS-51 to generate common baud rates */
+ 11'200'000, /* New York, New York */
+ 11'289'000, /* Vanguard */
+ 11'400'000, /* HP 9845 */
+ 11'668'800, /* Gameplan pixel clock */
+ 11'800'000, /* IBM PC Music Feature Card */
+ 11'980'800, /* Luxor ABC 80 */
+ 12'000'000, /* Extremely common, used on 100's of PCBs */
+ 12'057'600, /* Poly 1 (38400 * 314) */
+ 12'096'000, /* Some early 80's Atari games */
+ 12'288'000, /* Sega Model 3 digital audio board */
+ 12'324'000, /* Otrona Attache */
+ 12'432'000, /* Kaneko Fly Boy/Fast Freddie Hardware */
+ 12'472'500, /* Bonanza's Mini Boy 7 */
+ 12'480'000, /* TRS-80 Model II */
+ 12'500'000, /* Red Alert audio board */
+ 12'800'000, /* Cave CV1000 */
+ 12'854'400, /* alphatronic P3 */
+ 12'979'200, /* Exidy 440 */
+ 13'300'000, /* BMC bowling */
+ 13'330'560, /* Taito L */
+ 13'333'000, /* Ojanko High School */
+ 13'400'000, /* TNK3, Ikari Warriors h/w */
+ 13'478'400, /* TeleVideo 970 80-column display clock */
+ 13'495'200, /* Used on Shadow Force pcb and maybe other Technos pcbs? */
+ 13'516'800, /* Kontron KDT6 */
+ 13'608'000, /* TeleVideo 910 & 925 */
+ 14'000'000,
+ 14'112'000, /* Timex/Sinclair TS2068 */
+ 14'192'640, /* Central Data 2650 */
+ 14'218'000, /* Dragon */
+ 14'300'000, /* Agat-7 */
+ 14'314'000, /* Taito TTL Board */
+ 14'318'181, /* Extremely common, used on 100's of PCBs (4x NTSC subcarrier) */
+ 14'705'882, /* Aleck64 */
+ 14'745'600, /* Namco System 12 & System Super 22/23 for JVS */
+ 14'916'000, /* ADDS Viewpoint 122 */
+ 15'000'000, /* Sinclair QL, Amusco Poker */
+ 15'148'800, /* Zentec 9002/9003 */
+ 15'288'000, /* DEC VT220 80-column display clock */
+ 15'300'720, /* Microterm 420 */
+ 15'360'000, /* Visual 1050 */
+ 15'400'000, /* DVK KSM */
+ 15'468'480, /* Bank Panic h/w, Sega G80 */
+ 15'582'000, /* Zentec Zephyr */
+ 15'897'600, /* IAI Swyft */
+ 15'920'000, /* HP Integral PC */
+ 15'974'400, /* Osborne 1 (9600 * 52 * 32) */
+ 16'000'000, /* Extremely common, used on 100's of PCBs */
+ 16'097'280, /* DEC VT240 (1024 * 262 * 60) */
+ 16'128'000, /* Fujitsu FM-7 */
+ 16'384'000,
+ 16'400'000, /* MS 6102 */
+ 16'588'800, /* SM 7238 */
+ 16'669'800, /* Qume QVT-102 */
+ 16'670'000,
+ 16'777'216, /* Nintendo Game Boy Advance */
+ 16'934'400, /* Usually used to drive 90's Yamaha OPL/FM chips (44100 * 384) */
+ 17'064'000, /* Memorex 1377 */
+ 17'360'000, /* OMTI Series 10 SCSI controller */
+ 17'550'000, /* HP 264x display clock (50 Hz configuration) */
+ 17'734'470, /* (~4x PAL subcarrier) */
+ 17'734'472, /* actually ~4x PAL subcarrier */
+ 17'971'200,
+ 18'000'000, /* S.A.R, Ikari Warriors 3 */
+ 18'432'000, /* Extremely common, used on 100's of PCBs (48000 * 384) */
+ 18'575'000, /* Visual 102, Visual 220 */
+ 18'720'000, /* Nokia MikroMikko 1 */
+ 18'869'600, /* Memorex 2178 */
+ 19'339'600, /* TeleVideo TVI-955 80-column display clock */
+ 19'600'000, /* Universal Mr. Do - Model 8021 PCB */
+ 19'660'800, /* Euro League (bootleg), labeled as "UKI 19.6608 20PF" */
+ 19'661'400, /* Wyse WY-30 */
+ 19'923'000, /* Cinematronics vectors */
+ 19'968'000, /* Used mostly by some Taito games */
+ 20'000'000,
+ 20'160'000, /* Nintendo 8080 */
+ 20'625'000, /* SM 7238 */
+ 20'790'000, /* Blockade-hardware Gremlin games */
+ 21'000'000, /* Lock-On pixel clock */
+ 21'052'600, /* NEC PC-98xx pixel clock */
+ 21'060'000, /* HP 264x display clock (60 Hz configuration) */
+ 21'254'400, /* TeleVideo 970 132-column display clock */
+ 21'281'370, /* Radica Tetris */
+ 21'300'000,
+ 21'477'272, /* BMC bowling, some Data East 90's games, Vtech Socrates; (6x NTSC subcarrier) */
+ 22'000'000,
+ 22'096'000, /* ADDS Viewpoint 122 */
+ 22'118'400, /* Amusco Poker */
+ 22'321'000, /* Apple LaserWriter II NT */
+ 22'656'000, /* Super Pinball Action (~1440x NTSC line rate) */
+ 22'896'000, /* DEC VT220 132-column display clock */
+ 23'814'000, /* TeleVideo TVI-912, 920 & 950 */
+ 23'961'600, /* Osborne 4 (Vixen) */
+ 24'000'000, /* Mario, 80's Data East games, 80's Konami games */
+ 24'073'400, /* DEC Rainbow 100 */
+ 24'576'000, /* Pole Position h/w, Model 3 CPU board */
+ 24'883'200, /* DEC VT100 */
+ 25'000'000, /* Namco System 22, Taito GNET, Dogyuun h/w */
+ 25'174'800, /* Sega System 16A/16B (1600x NTSC line rate) */
+ 25'200'000, /* Tektronix 4404 video clock */
+ 25'398'360, /* Tandberg TDV 2324 */
+ 25'447'000, /* Namco EVA3A (Funcube2) */
+ 25'590'906, /* Atari Jaguar NTSC */
+ 25'593'900, /* Atari Jaguar PAL */
+ 25'771'500, /* HP-2622A */
+ 25'920'000, /* ADDS Viewpoint 60 */
+ 26'000'000, /* Gaelco PCBs */
+ 26'366'000, /* DEC VT320 */
+ 26'580'000, /* Wyse WY-60 80-column display clock */
+ 26'601'712, /* Astro Corp.'s Show Hand, PAL Vtech/Yeno Socrates (6x PAL subcarrier) */
+ 26'666'000, /* Imagetek I4100/I4220/I4300 */
+ 26'666'666, /* Irem M92 but most use 27MHz */
+ 26'686'000, /* Typically used on 90's Taito PCBs to drive the custom chips */
+ 26'989'200, /* TeleVideo 965 */
+ 27'000'000, /* Some Banpresto games macrossp, Irem M92 and 90's Toaplan games */
+ 27'164'000, /* Typically used on 90's Taito PCBs to drive the custom chips */
+ 27'210'900, /* LA Girl */
+ 27'562'000, /* Visual 220 */
+ 28'000'000,
+ 28'322'000, /* Saitek RISC 2500, Mephisto Montreux */
+ 28'375'160, /* Amiga PAL systems */
+ 28'475'000, /* CoCo 3 PAL */
+ 28'480'000, /* Chromatics CGC-7900 */
+ 28'636'363, /* Later Leland games and Atari GT, Amiga NTSC, Raiden2 h/w (8x NTSC subcarrier)*/
+ 28'640'000, /* Fukki FG-1c AI AM-2 PCB */
+ 28'700'000,
+ 29'376'000, /* Qume QVT-103 */
+ 29'491'200, /* Xerox Alto-II system clock (tagged 29.4MHz in the schematics) */
+ 30'000'000, /* Impera Magic Card */
+ 30'476'100, /* Taito JC */
+ 30'800'000, /* 15IE-00-013 */
+ 31'279'500, /* Wyse WY-30+ */
+ 31'684'000, /* TeleVideo TVI-955 132-column display clock */
+ 31'948'800, /* NEC PC-88xx, PC-98xx */
+ 32'000'000,
+ 32'220'000, /* Typically used on 90's Data East PCBs (close to 9x NTSC subcarrier which is 32.215905Mhz*/
+ 32'317'400, /* DEC VT330, VT340 */
+ 32'530'400, /* Seta 2 */
+ 33'000'000, /* Sega Model 3 video board */
+ 33'264'000, /* Hazeltine 1500 terminal */
+ 33'333'000, /* Sega Model 3 CPU board, Vegas */
+ 33'833'000,
+ 33'868'800, /* Usually used to drive 90's Yamaha OPL/FM chips with /2 divider */
+ 34'000'000, /* Gaelco PCBs */
+ 34'291'712, /* Fairlight CMI master card */
+ 36'000'000, /* Sega Model 1 video board */
+ 38'769'220, /* Namco System 21 video board */
+ 39'321'600, /* Sun 2/120 */
+ 39'710'000, /* Wyse WY-60 132-column display clock */
+ 40'000'000,
+ 40'210'000, /* Fairlight CMI IIx */
+ 42'000'000, /* BMC A-00211 - Popo Bear */
+ 42'105'200, /* NEC PC-88xx */
+ 42'954'545, /* CPS3 (12x NTSC subcarrier)*/
+ 43'320'000, /* DEC VT420 */
+ 44'100'000, /* Subsino's Bishou Jan */
+ 44'452'800, /* TeleVideo 965 */
+ 45'000'000, /* Eolith with Hyperstone CPUs */
+ 45'158'000, /* Sega Model 2A video board, Model 3 CPU board */
+ 45'619'200, /* DEC VK100 */
+ 45'830'400, /* Microterm 5510 */
+ 47'736'000, /* Visual 100 */
+ 48'000'000, /* Williams/Midway Y/Z-unit system / SSV board */
+ 48'384'000, /* Namco NB-1 */
+ 48'556'800, /* Wyse WY-85 */
+ 48'654'000, /* Qume QVT-201 */
+ 48'660'000, /* Zaxxon */
+ 49'152'000, /* Used on some Namco PCBs, Baraduke h/w, System 21, Super System 22 */
+ 49'423'500, /* Wyse WY-185 */
+ 50'000'000, /* Williams/Midway T/W/V-unit system */
+ 50'113'000, /* Namco NA-1 (14x NTSC subcarrier)*/
+ 50'349'000, /* Sega System 18 (~3200x NTSC line rate) */
+ 52'000'000, /* Cojag */
+ 52'832'000, /* Wang PC TIG video controller */
+ 53'203'400, /* Master System, Mega Drive PAL (~12x PAL subcarrier) */
+ 53'693'175, /* PSX-based h/w, Sony ZN1-2-based (15x NTSC subcarrier) */
+ 54'000'000, /* Taito JC */
+ 55'000'000, /* Eolith Vega */
+ 57'272'727, /* Psikyo SH2 with /2 divider (16x NTSC subcarrier)*/
+ 58'000'000, /* Magic Reel (Play System) */
+ 59'292'000, /* Data General D461 */
+ 60'000'000,
+ 61'440'000, /* dkong */
+ 64'000'000, /* BattleToads */
+ 66'666'700, /* Later Midway games */
+ 67'737'600, /* PSX-based h/w, Sony ZN1-2-based */
+ 68'850'000, /* Wyse WY-50 */
+ 72'000'000, /* Aristocrat MKV */
+ 72'576'000, /* Centipede, Millipede, Missile Command, Let's Go Bowling "Multipede" */
+ 73'728'000, /* Ms. Pac-Man/Galaga 20th Anniversary */
+ 87'183'360, /* AT&T 630 MTG */
+ 100'000'000, /* PSX-based Namco System 12, Vegas, Sony ZN1-2-based */
+ 101'491'200, /* PSX-based Namco System 10 */
+ 200'000'000 /* Base SH4 CPU (Naomi, Hikaru etc.) */
+};
+
+double XTAL::last_correct_value = -1;
+double XTAL::xtal_error_low = 0;
+double XTAL::xtal_error_high = 0;
+
+bool XTAL::check(double base_clock)
+{
+ if(base_clock == last_correct_value)
+ return true;
+ const unsigned int xtal_count = sizeof(known_xtals) / sizeof(known_xtals[0]);
+ const unsigned int last_index = xtal_count - 1;
+ const unsigned int fill1 = last_index | (last_index >> 1);
+ const unsigned int fill2 = fill1 | (fill1 >> 2);
+ const unsigned int fill4 = fill2 | (fill2 >> 4);
+ const unsigned int fill8 = fill4 | (fill4 >> 8);
+ const unsigned int fill16 = fill8 | (fill8 >> 16);
+ const unsigned int ppow2 = fill16 - (fill16 >> 1);
+ unsigned int slot = ppow2;
+ unsigned int step = ppow2;
+ while(step) {
+ if(slot > last_index)
+ slot = slot ^ (step | (step >> 1));
+ else {
+ double sfreq = known_xtals[slot];
+ if(base_clock == sfreq) {
+ last_correct_value = base_clock;
+ return true;
+ }
+ if(base_clock > sfreq)
+ slot = slot | (step >> 1);
+ else
+ slot = slot ^ (step | (step >> 1));
+ }
+ step = step >> 1;
+ }
+
+ double sfreq = known_xtals[slot];
+ if(base_clock == sfreq) {
+ last_correct_value = base_clock;
+ return true;
+ }
+
+ if(base_clock < sfreq) {
+ if(slot)
+ xtal_error_low = known_xtals[slot-1];
+ else
+ xtal_error_low = 0;
+ xtal_error_high = sfreq;
+ } else {
+ if(slot < last_index)
+ xtal_error_high = known_xtals[slot+1];
+ else
+ xtal_error_high = 0;
+ xtal_error_low = sfreq;
+ }
+ return false;
+}
+
+void XTAL::check(const char *message) const
+{
+ if(!check(m_base_clock))
+ fail(m_base_clock, message);
+}
+
+void XTAL::check(const std::string &message) const
+{
+ if(!check(m_base_clock))
+ fail(m_base_clock, message);
+}
+
+void XTAL::fail(double base_clock, std::string message)
+{
+ std::string full_message = util::string_format("Unknown crystal value %.0f. ", base_clock);
+ if(xtal_error_low && xtal_error_high)
+ full_message += util::string_format(" Did you mean %.0f or %.0f?", xtal_error_low, xtal_error_high);
+ else
+ full_message += util::string_format(" Did you mean %.0f?", xtal_error_low ? xtal_error_low : xtal_error_high);
+ full_message += util::string_format(" Context: %s\n", message);
+ fatalerror("%s\n", full_message.c_str());
+}
+
+/*
+
+For further reference:
+
+A search at http://search.digikey.com/scripts/DkSearch/dksus.dll?Cat=852333;keywords=cry
+reveals the following shipping frequencies as of 1/1/2008:
+
+20kHz
+25.600kHz
+26.667kHz
+28kHz
+
+30kHz
+30.720kHz
+30.76kHz
+31.2kHz
+31.25kHz
+31.5kHz
+32.000kHz
+32.56kHz
+32.768kHz
+32.919kHz
+34kHz
+36kHz
+38kHz
+38.4kHz
+39.500kHz
+
+40kHz
+44.100kHz
+46.604kHz
+46.6084kHz
+
+50kHz
+59.787kHz
+
+60.000kHz
+60.002kHz
+60.005kHz
+65.535kHz
+65.536kHz
+69kHz
+
+70kHz
+71kHz
+72kHz
+73kHz
+74kHz
+74.3kHz
+74.4kHz
+75kHz
+76kHz
+76.79kHz
+76.8kHz
+76.81kHz
+77kHz
+77.204kHz
+77.287kHz
+77.500kHz
+77.503kHz
+77.504kHz
+78kHz
+79kHz
+
+83kHz
+
+96kHz
+96.006kHz
+
+100kHz
+111kHz
+117.72kHz
+120kHz
+120.8475kHz
+125kHz
+131.072kHz
+149.475kHz
+153.600kHz
+
+200kHz
+
+307.2kHz
+
+1.000MHz
+1.8432MHz
+
+2.000MHz
+2.048MHz
+2.097152MHz
+2.4576MHz
+2.5MHz
+2.560MHz
+2.949120MHz
+
+3.000MHz
+3.276MHz
+3.2768MHz
+3.579MHz
+3.579545MHz
+3.640MHz
+3.6864MHz
+3.700MHz
+3.859MHz
+3.93216MHz
+
+4.000MHz
+4.032MHz
+4.096MHz
+4.09625MHz
+4.194MHz
+4.194304MHz
+4.332MHz
+4.433MHz
+4.433616MHz
+4.433618MHz
+4.433619MHz
+4.74687MHz
+4.800MHz
+4.8970MHz
+4.90625MHz
+4.915MHz
+4.9152MHz
+
+5.000MHz
+5.0688MHz
+5.120MHz
+5.185MHz
+5.223438MHz
+5.5MHz
+5.5296MHz
+5.9904MHz
+
+6.000MHz
+6.14MHz
+6.144MHz
+6.1760MHz
+6.400 MHz
+6.49830MHz
+6.5MHz
+6.5536MHz
+6.612813MHz
+6.7458MHz
+6.757MHz
+6.76438MHz
+
+7.1505MHz
+7.15909 MHz
+7.2MHz
+7.3728MHz
+7.68MHz
+7.94888MHz
+
+8.000MHz
+8.000156MHz
+8.192MHz
+8.388608MHz
+8.432MHz
+8.5MHz
+8.6432MHz
+
+9.000MHz
+9.216MHz
+9.509375MHz
+9.545MHz
+9.6MHz
+9.7941MHz
+9.830MHz
+9.8304MHz
+9.84375MHz
+9.8438MHz
+
+10.000MHz
+10.240MHz
+10.245MHz
+10.6244MHz
+10.738635MHz
+10.73865MHz
+
+11.000MHz
+11.046MHz
+11.0592MHz
+11.228MHz
+11.2896MHz
+11.520MHz
+11.981350MHz
+
+12.000MHz
+12.000393MHz
+12.096MHz
+12.1875MHz
+12.288MHz
+12.352MHz
+12.500MHz
+12.688MHz
+12.800MHz
+12.96MHz
+
+13.000MHz
+13.0625MHz
+13.225MHz
+13.2256MHz
+13.500MHz
+13.5168MHz
+13.56MHz
+13.605MHz
+13.824MHz
+13.94916MHz
+
+14.00MHz
+14.318MHz
+14.31818MHz
+14.3359MHz
+14.3594MHz
+14.4MHz
+14.5MHz
+14.69MHz
+14.7456MHz
+14.850MHz
+
+15MHz
+15.360MHz
+
+16.000MHz
+16.000312MHz
+16.128MHz
+16.257MHz
+16.3676MHz
+16.368MHz
+16.384MHz
+16.576MHz
+16.6660MHz
+16.667MHz
+16.670MHz
+16.800MHz
+16.934MHz
+16.9344MHz
+
+17.734475MHz
+
+18.000MHz
+18.432MHz
+18.869MHz
+
+19.200MHz
+19.440MHz
+19.660MHz
+19.6608MHz
+19.68MHz
+19.800MHz
+
+20.000MHz
+20.35625MHz
+20.3563MHz
+20.480MHz
+
+21.47727MHz
+
+22.000MHz
+22.118MHz
+22.1184MHz
+22.400MHz
+22.5MHz
+22.5792MHz
+22.6278MHz
+
+23MHz
+23.2643MHz
+23.5MHz
+23.5122MHz
+23.592MHz
+
+24.000MHz
+24.00014MHz
+24.5MHz
+24.545454 MHz
+24.5535MHz
+24.576MHz
+24.704MHz
+24.7456MHz
+
+25.000MHz
+25MHz
+25.175MHz
+25.2235MHz
+25.4563MHz
+25.5MHz
+
+26.000MHz
+26.45125MHz
+26.4513MHz
+26.5MHz
+26.5971MHz
+26.800MHz
+
+27.000MHz
+27.1344MHz
+27.3067MHz
+27.4688MHz
+
+28.000MHz
+28.224MHz
+28.259375MHz
+28.2594MHz
+28.322MHz
+28.375MHz
+28.5938MHz
+28.636MHz
+28.6363MHz
+28.63636MHz
+
+29.4912MHz
+29.498928MHz
+29.500MHz
+
+30.000MHz
+32.000MHz
+32.514MHz
+32.768MHz
+33.000MHz
+33.333MHz
+33.3333MHz
+33.8688MHz
+35.2512MHz
+35.3280MHz
+36.000MHz
+38.000MHz
+38.00053MHz
+38.400MHz
+38.880MHz
+39MHz
+
+40.000MHz
+40.320MHz
+40.960 MHz
+42.000MHz
+44.000MHz
+44.2368MHz
+44.545MHz
+44.736MHz
+44.800MHz
+44.900MHz
+45.000MHz
+46.000MHz
+48.000MHz
+49.152MHz
+49.86MHz
+
+50.000MHz
+53.125MHz
+55.000MHz
+
+60.000MHz
+64.000MHz
+66.000MHz
+66.666MHz
+66.6666MHz
+
+73.66979MHz
+75.957292MHz
+76.121875MHz
+
+80.000MHz
+
+100.00MHz
+
+*/
diff --git a/src/emu/xtal.h b/src/emu/xtal.h
new file mode 100644
index 00000000000..97aecf87ba7
--- /dev/null
+++ b/src/emu/xtal.h
@@ -0,0 +1,63 @@
+// license:BSD-3-Clause
+// copyright-holders:Nicola Salmoria
+/*************************************************************************
+
+ xtal.h
+
+ Documentation and consistent naming for known existing crystals.
+ See the .cpp file for details
+
+***************************************************************************/
+
+
+#ifndef MAME_EMU_DRIVERS_XTAL_H
+#define MAME_EMU_DRIVERS_XTAL_H
+
+#pragma once
+
+class XTAL {
+public:
+
+ constexpr XTAL(double base_clock) : m_base_clock(base_clock), m_current_clock(base_clock) {}
+
+ constexpr double dvalue() const noexcept { return m_current_clock; }
+ constexpr u32 value() const noexcept { return u32(m_current_clock); }
+ constexpr double base() const noexcept { return m_base_clock; }
+
+ constexpr XTAL operator *(int mult) const noexcept { return XTAL(m_base_clock, m_current_clock * mult); }
+ constexpr XTAL operator *(unsigned int mult) const noexcept { return XTAL(m_base_clock, m_current_clock * mult); }
+ constexpr XTAL operator *(double mult) const noexcept { return XTAL(m_base_clock, m_current_clock * mult); }
+ constexpr XTAL operator /(int div) const noexcept { return XTAL(m_base_clock, m_current_clock / div); }
+ constexpr XTAL operator /(unsigned int div) const noexcept { return XTAL(m_base_clock, m_current_clock / div); }
+ constexpr XTAL operator /(double div) const noexcept { return XTAL(m_base_clock, m_current_clock / div); }
+
+ friend constexpr XTAL operator /(int div, const XTAL &xtal);
+ friend constexpr XTAL operator /(unsigned int div, const XTAL &xtal);
+ friend constexpr XTAL operator /(double div, const XTAL &xtal);
+ friend constexpr XTAL operator *(int mult, const XTAL &xtal);
+ friend constexpr XTAL operator *(unsigned int mult, const XTAL &xtal);
+ friend constexpr XTAL operator *(double mult, const XTAL &xtal);
+
+ void check(const char *message) const;
+ void check(const std::string &message) const;
+
+private:
+ double m_base_clock, m_current_clock;
+
+ constexpr XTAL(double base_clock, double current_clock) noexcept : m_base_clock(base_clock), m_current_clock(current_clock) {}
+
+ static const double known_xtals[];
+ static double last_correct_value, xtal_error_low, xtal_error_high;
+ static void fail(double base_clock, std::string message);
+ static bool check(double base_clock);
+ static void check_ordering();
+};
+
+inline constexpr XTAL operator /(int div, const XTAL &xtal) { return XTAL(xtal.base(), div / xtal.dvalue()); }
+inline constexpr XTAL operator /(unsigned int div, const XTAL &xtal) { return XTAL(xtal.base(), div / xtal.dvalue()); }
+inline constexpr XTAL operator /(double div, const XTAL &xtal) { return XTAL(xtal.base(), div / xtal.dvalue()); }
+inline constexpr XTAL operator *(int mult, const XTAL &xtal) { return XTAL(xtal.base(), mult * xtal.dvalue()); }
+inline constexpr XTAL operator *(unsigned int mult, const XTAL &xtal) { return XTAL(xtal.base(), mult * xtal.dvalue()); }
+inline constexpr XTAL operator *(double mult, const XTAL &xtal) { return XTAL(xtal.base(), mult * xtal.dvalue()); }
+
+#endif // MAME_EMU_DRIVERS_XTAL_H
diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp
index e3bf8c08acc..a83987fc8d8 100644
--- a/src/mame/audio/atarijsa.cpp
+++ b/src/mame/audio/atarijsa.cpp
@@ -77,7 +77,7 @@ ALL: the LPF (low pass filter) bit which selectively places a lowpass filter in
#include "audio/atarijsa.h"
-#define JSA_MASTER_CLOCK XTAL_3_579545MHz
+#define JSA_MASTER_CLOCK XTAL(3'579'545)
//**************************************************************************
@@ -696,7 +696,7 @@ MACHINE_CONFIG_START(atari_jsa_i_device::device_add_mconfig)
// basic machine hardware
MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2)
MCFG_CPU_PROGRAM_MAP(atarijsa1_map)
- MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, JSA_MASTER_CLOCK/4/16/16/14)
// sound hardware
MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(atari_jsa_base_device, main_int_write_line))
@@ -826,7 +826,7 @@ MACHINE_CONFIG_START(atari_jsa_ii_device::device_add_mconfig)
// basic machine hardware
MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2)
MCFG_CPU_PROGRAM_MAP(atarijsa2_map)
- MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, JSA_MASTER_CLOCK/4/16/16/14)
// sound hardware
MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(atari_jsa_base_device, main_int_write_line))
@@ -908,7 +908,7 @@ MACHINE_CONFIG_START(atari_jsa_iii_device::device_add_mconfig)
// basic machine hardware
MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2)
MCFG_CPU_PROGRAM_MAP(atarijsa3_map)
- MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, JSA_MASTER_CLOCK/4/16/16/14)
// sound hardware
MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(atari_jsa_base_device, main_int_write_line))
diff --git a/src/mame/audio/carnival.cpp b/src/mame/audio/carnival.cpp
index c7717802963..ecc2c5ec84c 100644
--- a/src/mame/audio/carnival.cpp
+++ b/src/mame/audio/carnival.cpp
@@ -199,13 +199,13 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(vicdual_state::carnival_audio)
/* music board */
- MCFG_CPU_ADD("audiocpu", I8039, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", I8039, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(mboard_map)
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(vicdual_state, carnival_music_port_1_w))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(vicdual_state, carnival_music_port_2_w))
MCFG_MCS48_PORT_T1_IN_CB(READLINE(vicdual_state, carnival_music_port_t1_r))
- MCFG_SOUND_ADD("psg", AY8912, XTAL_3_579545MHz/3)
+ MCFG_SOUND_ADD("psg", AY8912, XTAL(3'579'545)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* samples */
diff --git a/src/mame/audio/crbaloon.cpp b/src/mame/audio/crbaloon.cpp
index b0944b78657..3419edb3d3c 100644
--- a/src/mame/audio/crbaloon.cpp
+++ b/src/mame/audio/crbaloon.cpp
@@ -120,7 +120,7 @@ static DISCRETE_SOUND_START(crbaloon)
* linear ramp.
************************************************/
/* TO BE FIXED - needs proper modulation */
- DISCRETE_NOTE(NODE_20, 1, CRBALOON_16H / 2, CRBALOON_MUSIC_DATA, 255, 7, DISC_CLK_IS_FREQ)
+ DISCRETE_NOTE(NODE_20, 1, CRBALOON_16H.dvalue() / 2, CRBALOON_MUSIC_DATA, 255, 7, DISC_CLK_IS_FREQ)
DISCRETE_DAC_R1(NODE_21, NODE_20, DEFAULT_TTL_V_LOGIC_1, &desc_crbaloon_music_dac)
DISCRETE_ONOFF(NODE_22, CRBALOON_MUSIC_EN, NODE_21)
// DISCRETE_RAMP(NODE_21, 1, RAMP, GRAD, MIN, MAX, CLAMP)
diff --git a/src/mame/audio/csd.cpp b/src/mame/audio/csd.cpp
index 7b2b250bf3f..e90a1287f4c 100644
--- a/src/mame/audio/csd.cpp
+++ b/src/mame/audio/csd.cpp
@@ -36,7 +36,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(midway_cheap_squeak_deluxe_device::device_add_mconfig)
- MCFG_CPU_ADD("cpu", M68000, XTAL_16MHz/2)
+ MCFG_CPU_ADD("cpu", M68000, XTAL(16'000'000)/2)
MCFG_CPU_PROGRAM_MAP(csdeluxe_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp
index 32fa9cd95cb..5bb3ad93019 100644
--- a/src/mame/audio/dcs.cpp
+++ b/src/mame/audio/dcs.cpp
@@ -2452,7 +2452,7 @@ int dcs_audio_device::preprocess_write(uint16_t data)
/* Basic DCS system with ADSP-2105 and 2k of SRAM (T-unit, V-unit, Killer Instinct) */
MACHINE_CONFIG_START(dcs_audio_device::add_mconfig_dcs )
- MCFG_CPU_ADD("dcs", ADSP2105, XTAL_10MHz)
+ MCFG_CPU_ADD("dcs", ADSP2105, XTAL(10'000'000))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
MCFG_CPU_PROGRAM_MAP(dcs_2k_program_map)
@@ -2555,7 +2555,7 @@ dcs2_audio_device::dcs2_audio_device(const machine_config &mconfig, device_type
}
MACHINE_CONFIG_START(dcs2_audio_device::add_mconfig_dcs2 )
- MCFG_CPU_ADD("dcs2", ADSP2115, XTAL_16MHz)
+ MCFG_CPU_ADD("dcs2", ADSP2115, XTAL(16'000'000))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
MCFG_CPU_PROGRAM_MAP(dcs2_2115_program_map)
@@ -2608,7 +2608,7 @@ MACHINE_CONFIG_START(dcs2_audio_2104_device::device_add_mconfig)
dcs2_audio_device::add_mconfig_dcs2(config);
- MCFG_CPU_REPLACE("dcs2", ADSP2104, XTAL_16MHz)
+ MCFG_CPU_REPLACE("dcs2", ADSP2104, XTAL(16'000'000))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device,timer_enable_callback)) /* callback for timer fired */
MCFG_CPU_PROGRAM_MAP(dcs2_2104_program_map)
@@ -2627,7 +2627,7 @@ dcs2_audio_dsio_device::dcs2_audio_dsio_device(const machine_config &mconfig, co
}
MACHINE_CONFIG_START(dcs2_audio_dsio_device::device_add_mconfig)
- MCFG_CPU_ADD("dsio", ADSP2181, XTAL_32MHz)
+ MCFG_CPU_ADD("dsio", ADSP2181, XTAL(32'000'000))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(dcs_audio_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction
@@ -2668,7 +2668,7 @@ dcs2_audio_denver_device::dcs2_audio_denver_device(const machine_config &mconfig
}
MACHINE_CONFIG_START(dcs2_audio_denver_device::device_add_mconfig)
- MCFG_CPU_ADD("denver", ADSP2181, XTAL_33_333MHz)
+ MCFG_CPU_ADD("denver", ADSP2181, XTAL(33'333'000))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(dcs_audio_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction
diff --git a/src/mame/audio/decobsmt.cpp b/src/mame/audio/decobsmt.cpp
index 9ad72bab4e6..3b8bcb04149 100644
--- a/src/mame/audio/decobsmt.cpp
+++ b/src/mame/audio/decobsmt.cpp
@@ -47,12 +47,12 @@ DEFINE_DEVICE_TYPE(DECOBSMT, decobsmt_device, "decobsmt", "Data East/Sega/Stern
//-------------------------------------------------
MACHINE_CONFIG_START(decobsmt_device::device_add_mconfig)
- MCFG_CPU_ADD(M6809_TAG, MC6809E, XTAL_24MHz / 12) // 68B09E U6 (E & Q = 2 MHz according to manual)
+ MCFG_CPU_ADD(M6809_TAG, MC6809E, XTAL(24'000'000) / 12) // 68B09E U6 (E & Q = 2 MHz according to manual)
MCFG_CPU_PROGRAM_MAP(decobsmt_map)
MCFG_CPU_PERIODIC_INT_DRIVER(decobsmt_device, decobsmt_firq_interrupt, 489) /* Fixed FIRQ of 489Hz as measured on real (pinball) machine */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_BSMT2000_ADD(BSMT_TAG, XTAL_24MHz)
+ MCFG_BSMT2000_ADD(BSMT_TAG, XTAL(24'000'000))
MCFG_DEVICE_ADDRESS_MAP(0, bsmt_map)
MCFG_BSMT2000_READY_CALLBACK(decobsmt_device, bsmt_ready_callback)
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp
index 952977885a7..fd6a8f4a0c2 100644
--- a/src/mame/audio/dkong.cpp
+++ b/src/mame/audio/dkong.cpp
@@ -360,7 +360,7 @@ static DISCRETE_SOUND_START(dkong2b)
/************************************************/
/* Noise */
DISCRETE_TASK_START(1)
- DISCRETE_LFSR_NOISE(NODE_11, 1, 1, CLOCK_2VF, 1.0, 0, 0.5, &dkong_lfsr)
+ DISCRETE_LFSR_NOISE(NODE_11, 1, 1, CLOCK_2VF.dvalue(), 1.0, 0, 0.5, &dkong_lfsr)
DISCRETE_COUNTER(NODE_12, 1, 0, NODE_11, 0, 7, DISC_COUNT_UP, 0, DISC_CLK_ON_R_EDGE) /* LS161, IC 3J */
DISCRETE_TRANSFORM3(NODE_13,NODE_12,3,DK_SUP_V,"01>2*")
@@ -652,7 +652,7 @@ static DISCRETE_SOUND_START(radarscp)
/* Noise */
/************************************************/
- DISCRETE_LFSR_NOISE(NODE_11, 1, 1, CLOCK_2VF, 1.0, 0, 0.5, &dkong_lfsr)
+ DISCRETE_LFSR_NOISE(NODE_11, 1, 1, CLOCK_2VF.dvalue(), 1.0, 0, 0.5, &dkong_lfsr)
/* Clear (1) from SOUND6 */
DISCRETE_COUNTER(NODE_12, 1, DS_SOUND6_INV, NODE_11, 0, 15, DISC_COUNT_UP, 0, DISC_CLK_ON_R_EDGE) /* LS161, IC 3J */
DISCRETE_TRANSFORM3(NODE_13,NODE_12,0x04,DK_SUP_V,"01&1=2*") /*QC => SND02 */
@@ -1375,7 +1375,7 @@ MACHINE_CONFIG_DERIVED(dkong_state::radarscp1_audio, radarscp_audio)
/* tms memory controller */
MCFG_DEVICE_ADD("m58819", M58819, 0)
- MCFG_SOUND_ADD("tms", M58817, XTAL_640kHz)
+ MCFG_SOUND_ADD("tms", M58817, XTAL(640'000))
MCFG_TMS5110_M0_CB(DEVWRITELINE("m58819", tms6100_device, m0_w))
MCFG_TMS5110_M1_CB(DEVWRITELINE("m58819", tms6100_device, m1_w))
MCFG_TMS5110_ADDR_CB(DEVWRITE8("m58819", tms6100_device, add_w))
diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp
index cc6c5649fbb..a35b169ec45 100644
--- a/src/mame/audio/exidy.cpp
+++ b/src/mame/audio/exidy.cpp
@@ -24,7 +24,7 @@
*
*************************************/
-#define CRYSTAL_OSC (XTAL_3_579545MHz)
+#define CRYSTAL_OSC (XTAL(3'579'545))
#define SH8253_CLOCK (CRYSTAL_OSC / 2)
#define SH6840_CLOCK (CRYSTAL_OSC / 4)
#define SH6532_CLOCK (CRYSTAL_OSC / 4)
@@ -196,9 +196,9 @@ void exidy_sound_device::sh6840_register_state_globals()
void exidy_sound_device::common_sh_start()
{
- int sample_rate = SH8253_CLOCK;
+ int sample_rate = SH8253_CLOCK.value();
- m_sh6840_clocks_per_sample = (int)((double)SH6840_CLOCK / (double)sample_rate * (double)(1 << 24));
+ m_sh6840_clocks_per_sample = (int)(SH6840_CLOCK.dvalue() / (double)sample_rate * (double)(1 << 24));
/* allocate the stream */
m_stream = machine().sound().stream_alloc(*this, 0, 1, sample_rate);
@@ -505,7 +505,7 @@ WRITE8_MEMBER( exidy_sound_device::sh8253_w )
m_sh8253_timer[chan].clstate = 0;
m_sh8253_timer[chan].count = (m_sh8253_timer[chan].count & 0x00ff) | ((data << 8) & 0xff00);
if (m_sh8253_timer[chan].count)
- m_sh8253_timer[chan].step = m_freq_to_step * (double)SH8253_CLOCK / (double)m_sh8253_timer[chan].count;
+ m_sh8253_timer[chan].step = m_freq_to_step * SH8253_CLOCK.dvalue() / m_sh8253_timer[chan].count;
else
m_sh8253_timer[chan].step = 0;
}
@@ -687,7 +687,7 @@ void venture_sound_device::device_start()
m_cvsd = machine().device<hc55516_device>("cvsd");
/* 8253 */
- m_freq_to_step = (double)(1 << 24) / (double)SH8253_CLOCK;
+ m_freq_to_step = ((1 << 24) / SH8253_CLOCK).dvalue();
save_item(NAME(m_riot_irq_state));
sh8253_register_state_globals();
@@ -837,7 +837,7 @@ MACHINE_CONFIG_END
*
*************************************/
-#define VICTORY_AUDIO_CPU_CLOCK (XTAL_3_579545MHz / 4)
+#define VICTORY_AUDIO_CPU_CLOCK (XTAL(3'579'545) / 4)
#define VICTORY_LOG_SOUND 0
@@ -937,7 +937,7 @@ void victory_sound_device::device_start()
m_cvsd = machine().device<hc55516_device>("cvsd");
/* 8253 */
- m_freq_to_step = (double)(1 << 24) / (double)SH8253_CLOCK;
+ m_freq_to_step = ((1 << 24) / SH8253_CLOCK).dvalue();
save_item(NAME(m_riot_irq_state));
sh8253_register_state_globals();
diff --git a/src/mame/audio/exidy440.cpp b/src/mame/audio/exidy440.cpp
index b9ad9b13faf..dfa6393db45 100644
--- a/src/mame/audio/exidy440.cpp
+++ b/src/mame/audio/exidy440.cpp
@@ -21,7 +21,7 @@
#define FADE_TO_ZERO 1
-#define EXIDY440_AUDIO_CLOCK (XTAL_12_9792MHz / 4)
+#define EXIDY440_AUDIO_CLOCK (XTAL(12'979'200) / 4)
#define EXIDY440_MC3418_CLOCK (EXIDY440_AUDIO_CLOCK / 4 / 16)
#define EXIDY440_MC3417_CLOCK (EXIDY440_AUDIO_CLOCK / 4 / 32)
diff --git a/src/mame/audio/galaxian.cpp b/src/mame/audio/galaxian.cpp
index ebd0efadf7d..1a0e9ff7a43 100644
--- a/src/mame/audio/galaxian.cpp
+++ b/src/mame/audio/galaxian.cpp
@@ -278,7 +278,7 @@ static DISCRETE_SOUND_START(galaxian)
/* since only a sample of the LFSR is latched @V2 we let the lfsr
* run at a lower speed
*/
- DISCRETE_LFSR_NOISE(NODE_150, 1, 1, RNG_RATE/100, 1.0, 0, 0.5, &galaxian_lfsr)
+ DISCRETE_LFSR_NOISE(NODE_150, 1, 1, RNG_RATE.dvalue()/100, 1.0, 0, 0.5, &galaxian_lfsr)
DISCRETE_SQUAREWFIX(NODE_151,1,60*264/2,1.0,50,0.5,0) /* 2V signal */
DISCRETE_LOGIC_DFLIPFLOP(NODE_152,1,1,NODE_151,NODE_150)
DISCRETE_TASK_END()
@@ -315,7 +315,7 @@ static DISCRETE_SOUND_START(galaxian)
* DISCRETE_COUNTER(NODE_132, 1, 0, NODE_130, 0, 15, DISC_COUNT_UP, 0, DISC_CLK_IS_FREQ)
* but there is a native choice:
*/
- DISCRETE_NOTE(NODE_132, 1, SOUND_CLOCK, GAL_INP_PITCH, 255, 15, DISC_CLK_IS_FREQ)
+ DISCRETE_NOTE(NODE_132, 1, SOUND_CLOCK.dvalue(), GAL_INP_PITCH, 255, 15, DISC_CLK_IS_FREQ)
/* from the 74393 (counter 2 above) only QA, QC, QD are used.
* We decode three here and use SUB_NODE(133,x) below to access.
diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp
index d1d2e89242f..3e7234a847f 100644
--- a/src/mame/audio/gottlieb.cpp
+++ b/src/mame/audio/gottlieb.cpp
@@ -16,9 +16,9 @@
#include "sound/volt_reg.h"
-#define SOUND1_CLOCK XTAL_3_579545MHz
-#define SOUND2_CLOCK XTAL_4MHz
-#define SOUND2_SPEECH_CLOCK XTAL_3_12MHz
+#define SOUND1_CLOCK XTAL(3'579'545)
+#define SOUND2_CLOCK XTAL(4'000'000)
+#define SOUND2_SPEECH_CLOCK XTAL(3'120'000)
//**************************************************************************
diff --git a/src/mame/audio/harddriv.cpp b/src/mame/audio/harddriv.cpp
index 0c9fffc3aad..d5025bcce21 100644
--- a/src/mame/audio/harddriv.cpp
+++ b/src/mame/audio/harddriv.cpp
@@ -432,7 +432,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(harddriv_sound_board_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("soundcpu", M68000, XTAL_16MHz/2)
+ MCFG_CPU_ADD("soundcpu", M68000, XTAL(16'000'000)/2)
MCFG_CPU_PROGRAM_MAP(driversnd_68k_map)
MCFG_DEVICE_ADD("latch", LS259, 0) // 80R
@@ -443,7 +443,7 @@ MACHINE_CONFIG_START(harddriv_sound_board_device::device_add_mconfig)
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(INPUTLINE("sounddsp", INPUT_LINE_HALT)) MCFG_DEVCB_INVERT // RES320
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(harddriv_sound_board_device, led_w))
- MCFG_CPU_ADD("sounddsp", TMS32010, XTAL_20MHz)
+ MCFG_CPU_ADD("sounddsp", TMS32010, XTAL(20'000'000))
MCFG_CPU_PROGRAM_MAP(driversnd_dsp_program_map)
/* Data Map is internal to the CPU */
MCFG_CPU_IO_MAP(driversnd_dsp_io_map)
diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp
index 83647a7e851..5aa0dd025d2 100644
--- a/src/mame/audio/irem.cpp
+++ b/src/mame/audio/irem.cpp
@@ -403,14 +403,14 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(m62_audio_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("iremsound", M6803, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(m62_sound_map)
MCFG_CPU_IO_MAP(irem_sound_portmap)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay_45m", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
MCFG_AY8910_RES_LOADS(2000.0, 2000.0, 2000.0)
MCFG_AY8910_PORT_A_READ_CB(READ8(irem_audio_device, soundlatch_r))
@@ -419,7 +419,7 @@ MACHINE_CONFIG_START(m62_audio_device::device_add_mconfig)
MCFG_SOUND_ROUTE_EX(1, "snd_nl", 1.0, 1)
MCFG_SOUND_ROUTE_EX(2, "snd_nl", 1.0, 2)
- MCFG_SOUND_ADD("ay_45l", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay_45l", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
MCFG_AY8910_RES_LOADS(2000.0, 2000.0, 2000.0)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(irem_audio_device, ay8910_45L_porta_w))
@@ -427,13 +427,13 @@ MACHINE_CONFIG_START(m62_audio_device::device_add_mconfig)
MCFG_SOUND_ROUTE_EX(1, "snd_nl", 1.0, 4)
MCFG_SOUND_ROUTE_EX(2, "snd_nl", 1.0, 5)
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_VCK_CALLBACK(INPUTLINE("iremsound", INPUT_LINE_NMI)) // driven through NPN inverter
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("msm2", msm5205_device, vclk_w)) // the first MSM5205 clocks the second
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 6)
- MCFG_SOUND_ADD("msm2", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm2", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* default to 4KHz, but can be changed at run time, slave */
MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 7)
@@ -473,27 +473,27 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m52_soundc_audio_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("iremsound", M6803, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_IO_MAP(irem_sound_portmap)
MCFG_CPU_PROGRAM_MAP(m52_small_sound_map)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay_45m", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
MCFG_AY8910_PORT_A_READ_CB(READ8(irem_audio_device, soundlatch_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(irem_audio_device, ay8910_45M_portb_w))
MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 0)
- MCFG_SOUND_ADD("ay_45l", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay_45l", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(irem_audio_device, ay8910_45L_porta_w))
MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 1)
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_VCK_CALLBACK(INPUTLINE("iremsound", INPUT_LINE_NMI)) // driven through NPN inverter
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 2)
@@ -507,33 +507,33 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m52_large_audio_device::device_add_mconfig) /* 10 yard fight */
/* basic machine hardware */
- MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("iremsound", M6803, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(m52_large_sound_map)
MCFG_CPU_IO_MAP(irem_sound_portmap)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay_45m", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
MCFG_AY8910_PORT_A_READ_CB(READ8(irem_audio_device, soundlatch_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(irem_audio_device, ay8910_45M_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("ay_45l", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay_45l", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(irem_audio_device, ay8910_45L_porta_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_VCK_CALLBACK(INPUTLINE("iremsound", INPUT_LINE_NMI)) // driven through NPN inverter
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("msm2", msm5205_device, vclk_w)) // the first MSM5205 clocks the second
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("msm2", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm2", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* default to 4KHz, but can be changed at run time, slave */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp
index 8c79a4d4db6..3fb238f7903 100644
--- a/src/mame/audio/midway.cpp
+++ b/src/mame/audio/midway.cpp
@@ -20,10 +20,10 @@
// CONSTANTS
//**************************************************************************
-#define SSIO_CLOCK XTAL_16MHz
-#define SOUNDSGOOD_CLOCK XTAL_16MHz
-#define TURBOCS_CLOCK XTAL_8MHz
-#define SQUAWKTALK_CLOCK XTAL_3_579545MHz
+#define SSIO_CLOCK XTAL(16'000'000)
+#define SOUNDSGOOD_CLOCK XTAL(16'000'000)
+#define TURBOCS_CLOCK XTAL(8'000'000)
+#define SQUAWKTALK_CLOCK XTAL(3'579'545)
diff --git a/src/mame/audio/rax.cpp b/src/mame/audio/rax.cpp
index 47bc9a690d6..bc62cfa53dd 100644
--- a/src/mame/audio/rax.cpp
+++ b/src/mame/audio/rax.cpp
@@ -488,7 +488,7 @@ acclaim_rax_device::acclaim_rax_device(const machine_config &mconfig, const char
//-------------------------------------------------
MACHINE_CONFIG_START(acclaim_rax_device::device_add_mconfig)
- MCFG_CPU_ADD("adsp", ADSP2181, XTAL_16_67MHz)
+ MCFG_CPU_ADD("adsp", ADSP2181, XTAL(16'670'000))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(acclaim_rax_device, adsp_sound_tx_callback)) /* callback for serial transmit */
MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(acclaim_rax_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction
MCFG_CPU_PROGRAM_MAP(adsp_program_map)
diff --git a/src/mame/audio/redalert.cpp b/src/mame/audio/redalert.cpp
index 32111653d09..ac54ee242d7 100644
--- a/src/mame/audio/redalert.cpp
+++ b/src/mame/audio/redalert.cpp
@@ -22,16 +22,16 @@
-#define REDALERT_AUDIO_PCB_CLOCK (XTAL_12_5MHz)
+#define REDALERT_AUDIO_PCB_CLOCK (XTAL(12'500'000))
#define REDALERT_AUDIO_CPU_CLOCK (REDALERT_AUDIO_PCB_CLOCK / 12)
#define REDALERT_AY8910_CLOCK (REDALERT_AUDIO_PCB_CLOCK / 6)
-#define REDALERT_AUDIO_CPU_IRQ_FREQ (1000000000 / PERIOD_OF_555_ASTABLE_NSEC(RES_K(120), RES_K(2.7), CAP_U(0.01)))
+#define REDALERT_AUDIO_CPU_IRQ_FREQ (1000000000.0 / PERIOD_OF_555_ASTABLE_NSEC(RES_K(120), RES_K(2.7), CAP_U(0.01)))
-#define REDALERT_VOICE_PCB_CLOCK (XTAL_6MHz)
+#define REDALERT_VOICE_PCB_CLOCK (XTAL(6'000'000))
#define REDALERT_VOICE_CPU_CLOCK (REDALERT_VOICE_PCB_CLOCK)
#define REDALERT_HC55516_CLOCK (REDALERT_VOICE_PCB_CLOCK / 256)
-#define DEMONEYE_AUDIO_PCB_CLOCK (XTAL_3_579545MHz)
+#define DEMONEYE_AUDIO_PCB_CLOCK (XTAL(3'579'545))
#define DEMONEYE_AUDIO_CPU_CLOCK (DEMONEYE_AUDIO_PCB_CLOCK / 4) /* what's the real divisor? */
#define DEMONEYE_AY8910_CLOCK (DEMONEYE_AUDIO_PCB_CLOCK / 2) /* what's the real divisor? */
diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp
index 39d7ea21981..aef8dce6e48 100644
--- a/src/mame/audio/s11c_bg.cpp
+++ b/src/mame/audio/s11c_bg.cpp
@@ -57,11 +57,11 @@ void s11c_bg_device::data_w(uint8_t data)
}
MACHINE_CONFIG_START(s11c_bg_device::device_add_mconfig)
- MCFG_CPU_ADD("bgcpu", MC6809E, XTAL_8MHz / 4) // MC68B09E
+ MCFG_CPU_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
MCFG_CPU_PROGRAM_MAP(s11c_bg_map)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
- MCFG_YM2151_ADD("ym2151", XTAL_3_579545MHz) // "3.58 MHz" on schematics and parts list
+ MCFG_YM2151_ADD("ym2151", XTAL(3'579'545)) // "3.58 MHz" on schematics and parts list
MCFG_YM2151_IRQ_HANDLER(WRITELINE(s11c_bg_device, ym2151_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.25)
diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp
index a37f5fcac2f..e079f4051a1 100644
--- a/src/mame/audio/scramble.cpp
+++ b/src/mame/audio/scramble.cpp
@@ -22,7 +22,7 @@
#include "sound/ay8910.h"
#include "speaker.h"
-#define AD2083_TMS5110_CLOCK XTAL_640kHz
+#define AD2083_TMS5110_CLOCK XTAL(640'000)
/* The timer clock in Scramble which feeds the upper 4 bits of */
/* AY-3-8910 port A is based on the same clock */
diff --git a/src/mame/audio/t5182.cpp b/src/mame/audio/t5182.cpp
index 7044242425d..fc209d47f94 100644
--- a/src/mame/audio/t5182.cpp
+++ b/src/mame/audio/t5182.cpp
@@ -149,7 +149,7 @@ rom.
#include "emu.h"
#include "t5182.h"
-#define T5182_CLOCK XTAL_14_31818MHz/4
+#define T5182_CLOCK XTAL(14'318'181)/4
DEFINE_DEVICE_TYPE(T5182, t5182_device, "t5182", "T5182 MCU")
diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp
index 9e1d9ed18f5..af48cd7c95f 100644
--- a/src/mame/audio/taito_en.cpp
+++ b/src/mame/audio/taito_en.cpp
@@ -273,11 +273,11 @@ WRITE_LINE_MEMBER(taito_en_device::duart_irq_handler)
MACHINE_CONFIG_START(taito_en_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", M68000, XTAL_30_4761MHz / 2)
+ MCFG_CPU_ADD("audiocpu", M68000, XTAL(30'476'100) / 2)
MCFG_CPU_PROGRAM_MAP(en_sound_map)
- MCFG_DEVICE_ADD("duart68681", MC68681, XTAL_16MHz / 4)
- MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL_16MHz/2/8, XTAL_16MHz/2/16, XTAL_16MHz/2/16, XTAL_16MHz/2/8)
+ MCFG_DEVICE_ADD("duart68681", MC68681, XTAL(16'000'000) / 4)
+ MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL(16'000'000)/2/8, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/8)
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(taito_en_device, duart_irq_handler))
MCFG_DEVICE_ADD("mb87078", MB87078, 0)
@@ -287,7 +287,7 @@ MACHINE_CONFIG_START(taito_en_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ensoniq", ES5505, XTAL_30_4761MHz / 2)
+ MCFG_SOUND_ADD("ensoniq", ES5505, XTAL(30'476'100) / 2)
MCFG_ES5505_REGION0("ensoniq.0")
MCFG_ES5505_REGION1("ensoniq.0")
MCFG_ES5506_CHANNELS(1)
diff --git a/src/mame/audio/taito_zm.cpp b/src/mame/audio/taito_zm.cpp
index 61062d99a79..8e8f0b59b67 100644
--- a/src/mame/audio/taito_zm.cpp
+++ b/src/mame/audio/taito_zm.cpp
@@ -170,14 +170,14 @@ WRITE16_MEMBER(taito_zoom_device::reg_address_w)
MACHINE_CONFIG_START(taito_zoom_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("mn10200", MN1020012A, XTAL_25MHz/2)
+ MCFG_CPU_ADD("mn10200", MN1020012A, XTAL(25'000'000)/2)
MCFG_MN10200_READ_PORT_CB(1, DEVREAD8(DEVICE_SELF, taito_zoom_device, tms_ctrl_r))
MCFG_MN10200_WRITE_PORT_CB(1, DEVWRITE8(DEVICE_SELF, taito_zoom_device, tms_ctrl_w))
MCFG_CPU_PROGRAM_MAP(taitozoom_mn_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))
- MCFG_ZSG2_ADD("zsg2", XTAL_25MHz)
+ MCFG_ZSG2_ADD("zsg2", XTAL(25'000'000))
// we assume the parent machine has created lspeaker/rspeaker
MCFG_SOUND_ROUTE(0, "^^lspeaker", 1.0)
diff --git a/src/mame/audio/timeplt.cpp b/src/mame/audio/timeplt.cpp
index d240998c957..391925f4b44 100644
--- a/src/mame/audio/timeplt.cpp
+++ b/src/mame/audio/timeplt.cpp
@@ -20,7 +20,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_14_31818MHz
+#define MASTER_CLOCK XTAL(14'318'181)
DEFINE_DEVICE_TYPE(TIMEPLT_AUDIO, timeplt_audio_device, "timplt_audio", "Time Pilot Audio")
diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp
index 8c6da07ca78..9a2ce9ff73c 100644
--- a/src/mame/audio/tx1.cpp
+++ b/src/mame/audio/tx1.cpp
@@ -253,9 +253,9 @@ void tx1_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t
memset(outputs[1], 0, samples * sizeof(*outputs[1]));
/* 8253 outputs for the player/opponent engine sounds. */
- step_0 = m_pit8253.counts[0].val ? (TX1_PIT_CLOCK / m_pit8253.counts[0].val) * m_freq_to_step : 0;
- step_1 = m_pit8253.counts[1].val ? (TX1_PIT_CLOCK / m_pit8253.counts[1].val) * m_freq_to_step : 0;
- step_2 = m_pit8253.counts[2].val ? (TX1_PIT_CLOCK / m_pit8253.counts[2].val) * m_freq_to_step : 0;
+ step_0 = m_pit8253.counts[0].val ? (TX1_PIT_CLOCK / m_pit8253.counts[0].val * m_freq_to_step).value() : 0;
+ step_1 = m_pit8253.counts[1].val ? (TX1_PIT_CLOCK / m_pit8253.counts[1].val * m_freq_to_step).value() : 0;
+ step_2 = m_pit8253.counts[2].val ? (TX1_PIT_CLOCK / m_pit8253.counts[2].val * m_freq_to_step).value() : 0;
//gain_0 = tx1_engine_gains[m_ay_outputa & 0xf];
//gain_1 = tx1_engine_gains[m_ay_outputa >> 4];
@@ -492,8 +492,8 @@ void buggyboy_sound_device::sound_stream_update(sound_stream &stream, stream_sam
memset(outputs[1], 0, samples * sizeof(*outputs[1]));
/* 8253 outputs for the player/opponent buggy engine sounds. */
- step_0 = m_pit8253.counts[0].val ? (BUGGYBOY_PIT_CLOCK / m_pit8253.counts[0].val) * m_freq_to_step : 0;
- step_1 = m_pit8253.counts[1].val ? (BUGGYBOY_PIT_CLOCK / m_pit8253.counts[1].val) * m_freq_to_step : 0;
+ step_0 = m_pit8253.counts[0].val ? (BUGGYBOY_PIT_CLOCK / m_pit8253.counts[0].val * m_freq_to_step).value() : 0;
+ step_1 = m_pit8253.counts[1].val ? (BUGGYBOY_PIT_CLOCK / m_pit8253.counts[1].val * m_freq_to_step).value() : 0;
if (!strcmp(machine().system().name, "buggyboyjr"))
gain0 = BIT(m_ym2_outputb, 3) ? 1.0 : 2.0;
@@ -514,7 +514,7 @@ void buggyboy_sound_device::sound_stream_update(sound_stream &stream, stream_sam
pit1 = m_eng_voltages[(m_step1 >> 24) & 0xf];
/* Calculate the tyre screech noise source */
- for (i = 0; i < BUGGYBOY_NOISE_CLOCK / machine().sample_rate(); ++i)
+ for (i = 0; i < BUGGYBOY_NOISE_CLOCK.value() / machine().sample_rate(); ++i)
{
/* CD4006 is a 4-4-1-4-4-1 shift register */
int p13 = BIT(m_noise_lfsra, 3);
diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp
index b074045848a..eee3eb58b26 100644
--- a/src/mame/audio/williams.cpp
+++ b/src/mame/audio/williams.cpp
@@ -41,14 +41,14 @@
#include "sound/volt_reg.h"
-#define NARC_MASTER_CLOCK XTAL_8MHz
-#define NARC_FM_CLOCK XTAL_3_579545MHz
+#define NARC_MASTER_CLOCK XTAL(8'000'000)
+#define NARC_FM_CLOCK XTAL(3'579'545)
-#define CVSD_MASTER_CLOCK XTAL_8MHz
-#define CVSD_FM_CLOCK XTAL_3_579545MHz
+#define CVSD_MASTER_CLOCK XTAL(8'000'000)
+#define CVSD_FM_CLOCK XTAL(3'579'545)
-#define ADPCM_MASTER_CLOCK XTAL_8MHz
-#define ADPCM_FM_CLOCK XTAL_3_579545MHz
+#define ADPCM_MASTER_CLOCK XTAL(8'000'000)
+#define ADPCM_FM_CLOCK XTAL(3'579'545)
diff --git a/src/mame/audio/wpcsnd.cpp b/src/mame/audio/wpcsnd.cpp
index 75b34c75f9d..3564ef176e9 100644
--- a/src/mame/audio/wpcsnd.cpp
+++ b/src/mame/audio/wpcsnd.cpp
@@ -67,7 +67,7 @@ uint8_t wpcsnd_device::data_r()
}
MACHINE_CONFIG_START(wpcsnd_device::device_add_mconfig)
- MCFG_CPU_ADD("bgcpu", MC6809E, XTAL_8MHz / 4) // MC68B09E
+ MCFG_CPU_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
MCFG_CPU_PROGRAM_MAP(wpcsnd_map)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
diff --git a/src/mame/audio/zaccaria.cpp b/src/mame/audio/zaccaria.cpp
index 90ebf16c7b1..fa031b72f0d 100644
--- a/src/mame/audio/zaccaria.cpp
+++ b/src/mame/audio/zaccaria.cpp
@@ -219,10 +219,10 @@ READ8_MEMBER(zac1b111xx_melody_base::melodypsg1_portb_r)
}
MACHINE_CONFIG_START(zac1b111xx_melody_base::device_add_mconfig)
- MCFG_CPU_ADD("melodycpu", M6802, XTAL_3_579545MHz) // verified on pcb
+ MCFG_CPU_ADD("melodycpu", M6802, XTAL(3'579'545)) // verified on pcb
MCFG_CPU_PROGRAM_MAP(zac1b111xx_melody_base_map)
- MCFG_DEVICE_ADD("timebase", CLOCK, XTAL_3_579545MHz/4096/2) // CPU clock divided using 4040 and half of 74LS74
+ MCFG_DEVICE_ADD("timebase", CLOCK, XTAL(3'579'545)/4096/2) // CPU clock divided using 4040 and half of 74LS74
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("melodypia", pia6821_device, cb1_w))
MCFG_DEVICE_ADD("melodypia", PIA6821, 0)
@@ -232,10 +232,10 @@ MACHINE_CONFIG_START(zac1b111xx_melody_base::device_add_mconfig)
MCFG_PIA_IRQA_HANDLER(INPUTLINE("melodycpu", INPUT_LINE_NMI))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("melodycpu", M6802_IRQ_LINE))
- MCFG_SOUND_ADD("melodypsg1", AY8910, XTAL_3_579545MHz/2) // CPU clock divided using 4040
+ MCFG_SOUND_ADD("melodypsg1", AY8910, XTAL(3'579'545)/2) // CPU clock divided using 4040
MCFG_AY8910_PORT_B_READ_CB(READ8(zac1b111xx_melody_base, melodypsg1_portb_r))
- MCFG_SOUND_ADD("melodypsg2", AY8910, XTAL_3_579545MHz/2) // CPU clock divided using 4040
+ MCFG_SOUND_ADD("melodypsg2", AY8910, XTAL(3'579'545)/2) // CPU clock divided using 4040
MACHINE_CONFIG_END
void zac1b111xx_melody_base::device_start()
@@ -419,7 +419,7 @@ MACHINE_CONFIG_START(zac1b11142_audio_device::device_add_mconfig)
MCFG_SOUND_ROUTE_EX(1, "sound_nl", 1.0, 4)
MCFG_SOUND_ROUTE_EX(2, "sound_nl", 1.0, 5)
- MCFG_CPU_ADD("audiocpu", M6802, XTAL_3_579545MHz) // verified on pcb
+ MCFG_CPU_ADD("audiocpu", M6802, XTAL(3'579'545)) // verified on pcb
MCFG_CPU_PROGRAM_MAP(zac1b11142_audio_map)
MCFG_DEVICE_ADD("pia_1i", PIA6821, 0)
diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp
index 75c0f88315a..b2cdaf43952 100644
--- a/src/mame/drivers/1942.cpp
+++ b/src/mame/drivers/1942.cpp
@@ -62,12 +62,12 @@ correctly.
***************************************************************************/
/* 12mhz OSC */
-#define MASTER_CLOCK (XTAL_12MHz)
+#define MASTER_CLOCK (XTAL(12'000'000))
#define MAIN_CPU_CLOCK (MASTER_CLOCK/3)
#define SOUND_CPU_CLOCK (MASTER_CLOCK/4)
#define AUDIO_CLOCK (MASTER_CLOCK/8)
/* 20mhz OSC - both Z80s are 4 MHz */
-#define MASTER_CLOCK_1942P (XTAL_20MHz)
+#define MASTER_CLOCK_1942P (XTAL(20'000'000))
#define MAIN_CPU_CLOCK_1942P (MASTER_CLOCK_1942P/5)
#define SOUND_CPU_CLOCK_1942P (MASTER_CLOCK_1942P/5)
#define AUDIO_CLOCK_1942P (MASTER_CLOCK_1942P/16)
diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp
index 9a73b023372..4ff2f24c5de 100644
--- a/src/mame/drivers/1943.cpp
+++ b/src/mame/drivers/1943.cpp
@@ -312,11 +312,11 @@ void _1943_state::machine_reset()
MACHINE_CONFIG_START(_1943_state::_1943)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(c1943_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", _1943_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(_1943_state, irq0_line_hold, 4*60)
@@ -341,13 +341,13 @@ MACHINE_CONFIG_START(_1943_state::_1943)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_24MHz/16) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(24'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.10)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_24MHz/16) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(24'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp
index d144ef80137..c6efa99b79b 100644
--- a/src/mame/drivers/1945kiii.cpp
+++ b/src/mame/drivers/1945kiii.cpp
@@ -50,7 +50,7 @@ Notes:
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_16MHz
+#define MASTER_CLOCK XTAL(16'000'000)
class k3_state : public driver_device
diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp
index 4a7298ed0a7..a0093d6a41f 100644
--- a/src/mame/drivers/20pacgal.cpp
+++ b/src/mame/drivers/20pacgal.cpp
@@ -100,7 +100,7 @@ Graphics: CY37256P160-83AC x 2 (Ultra37000 CPLD family - 160 pin TQFP, 256 Macro
*
*************************************/
-#define MASTER_CLOCK (XTAL_73_728MHz)
+#define MASTER_CLOCK (XTAL(73'728'000))
#define MAIN_CPU_CLOCK (MASTER_CLOCK / 4) /* divider is either 3 or 4 */
#define NAMCO_AUDIO_CLOCK (MASTER_CLOCK / 4 / 6 / 32)
diff --git a/src/mame/drivers/30test.cpp b/src/mame/drivers/30test.cpp
index c7bfc309529..92244fbdd09 100644
--- a/src/mame/drivers/30test.cpp
+++ b/src/mame/drivers/30test.cpp
@@ -50,7 +50,7 @@ http://blogs.yahoo.co.jp/nadegatayosoyuki/59285865.html
#include "30test.lh"
-#define MAIN_CLOCK XTAL_16MHz
+#define MAIN_CLOCK XTAL(16'000'000)
class namco_30test_state : public driver_device
{
diff --git a/src/mame/drivers/3do.cpp b/src/mame/drivers/3do.cpp
index c3fd5175044..ea5a19ae4a3 100644
--- a/src/mame/drivers/3do.cpp
+++ b/src/mame/drivers/3do.cpp
@@ -104,7 +104,7 @@ Part list of Goldstar 3DO Interactive Multiplayer
#define X2_CLOCK_PAL 59000000
#define X2_CLOCK_NTSC 49090000
-#define X601_CLOCK XTAL_16_9344MHz
+#define X601_CLOCK XTAL(16'934'400)
static ADDRESS_MAP_START( 3do_mem, AS_PROGRAM, 32, _3do_state )
@@ -157,7 +157,7 @@ void _3do_state::machine_reset()
MACHINE_CONFIG_START(_3do_state::_3do)
/* Basic machine hardware */
- MCFG_CPU_ADD( "maincpu", ARM7_BE, XTAL_50MHz/4 )
+ MCFG_CPU_ADD( "maincpu", ARM7_BE, XTAL(50'000'000)/4 )
MCFG_CPU_PROGRAM_MAP( 3do_mem)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -177,7 +177,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(_3do_state::_3do_pal)
/* Basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM7_BE, XTAL_50MHz/4 )
+ MCFG_CPU_ADD("maincpu", ARM7_BE, XTAL(50'000'000)/4 )
MCFG_CPU_PROGRAM_MAP( 3do_mem)
MCFG_NVRAM_ADD_1FILL("nvram")
diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp
index 5e68d4e35c1..419b01b8762 100644
--- a/src/mame/drivers/3x3puzzl.cpp
+++ b/src/mame/drivers/3x3puzzl.cpp
@@ -46,7 +46,7 @@ Notes:
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_10MHz
+#define MAIN_CLOCK XTAL(10'000'000)
class _3x3puzzle_state : public driver_device
{
@@ -405,7 +405,7 @@ MACHINE_CONFIG_START(_3x3puzzle_state::_3x3puzzle)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(4'000'000)/4, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/4004clk.cpp b/src/mame/drivers/4004clk.cpp
index 90e6cb1202c..5b087e2b5a1 100644
--- a/src/mame/drivers/4004clk.cpp
+++ b/src/mame/drivers/4004clk.cpp
@@ -127,7 +127,7 @@ void nixieclock_state::machine_start()
MACHINE_CONFIG_START(nixieclock_state::_4004clk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I4004, XTAL_5MHz / 8)
+ MCFG_CPU_ADD("maincpu", I4004, XTAL(5'000'000) / 8)
MCFG_I4004_ROM_MAP(4004clk_rom)
MCFG_I4004_RAM_MEMORY_MAP(4004clk_mem)
MCFG_I4004_ROM_PORTS_MAP(4004clk_rp)
diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp
index 011e0d07682..95cb86b981d 100644
--- a/src/mame/drivers/4enlinea.cpp
+++ b/src/mame/drivers/4enlinea.cpp
@@ -196,9 +196,9 @@
#include "speaker.h"
-#define MAIN_CLOCK XTAL_16MHz
-#define SEC_CLOCK XTAL_8MHz
-#define HCGA_CLOCK XTAL_14_31818MHz
+#define MAIN_CLOCK XTAL(16'000'000)
+#define SEC_CLOCK XTAL(8'000'000)
+#define HCGA_CLOCK XTAL(14'318'181)
#define PRG_CPU_CLOCK MAIN_CLOCK /2 /* 8 MHz. (measured) */
#define SND_CPU_CLOCK SEC_CLOCK /2 /* 4 MHz. (measured) */
diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp
index 55751ff44e8..ad1586deb54 100644
--- a/src/mame/drivers/4enraya.cpp
+++ b/src/mame/drivers/4enraya.cpp
@@ -156,7 +156,7 @@
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_8MHz
+#define MAIN_CLOCK XTAL(8'000'000)
/***********************************
diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp
index 0faefbd4d2d..1b1c1b06736 100644
--- a/src/mame/drivers/4roses.cpp
+++ b/src/mame/drivers/4roses.cpp
@@ -184,7 +184,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_16MHz
+#define MASTER_CLOCK XTAL(16'000'000)
class _4roses_state : public funworld_state
{
diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp
index 0c9dbb8f000..8ec6f6f2be3 100644
--- a/src/mame/drivers/5clown.cpp
+++ b/src/mame/drivers/5clown.cpp
@@ -452,7 +452,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_10MHz
+#define MASTER_CLOCK XTAL(10'000'000)
class _5clown_state : public driver_device
diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp
index e678c0e1cbe..254de8d1d28 100644
--- a/src/mame/drivers/8080bw.cpp
+++ b/src/mame/drivers/8080bw.cpp
@@ -811,7 +811,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(_8080bw_state::spacecom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL_18MHz / 10) // divider guessed
+ MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'000'000) / 10) // divider guessed
// TODO: move irq handling away from mw8080.c, this game runs on custom hardware
MCFG_CPU_PROGRAM_MAP(spacecom_map)
MCFG_CPU_IO_MAP(spacecom_io_map)
@@ -928,7 +928,7 @@ MACHINE_CONFIG_DERIVED(_8080bw_state::invrvnge, mw8080bw_root)
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_CPU_ADD("audiocpu", M6808, XTAL_4MHz/2) // MC6808P
+ MCFG_CPU_ADD("audiocpu", M6808, XTAL(4'000'000)/2) // MC6808P
MCFG_CPU_PROGRAM_MAP(invrvnge_sound_map)
/* add shifter */
@@ -945,7 +945,7 @@ MACHINE_CONFIG_DERIVED(_8080bw_state::invrvnge, mw8080bw_root)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_4MHz/2)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(4'000'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -1129,7 +1129,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(_8080bw_state::escmars)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_18MHz / 10) // divider guessed
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(18'000'000) / 10) // divider guessed
MCFG_CPU_PROGRAM_MAP(escmars_map)
MCFG_CPU_IO_MAP(lrescue_io_map)
@@ -2645,7 +2645,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(_8080bw_state::shuttlei)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_18MHz / 10) // divider guessed
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(18'000'000) / 10) // divider guessed
// TODO: move irq handling away from mw8080.c, this game runs on custom hardware
MCFG_CPU_PROGRAM_MAP(shuttlei_map)
MCFG_CPU_IO_MAP(shuttlei_io_map)
diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp
index 7815573cd83..0fb48d07aef 100644
--- a/src/mame/drivers/a5105.cpp
+++ b/src/mame/drivers/a5105.cpp
@@ -559,7 +559,7 @@ static const z80_daisy_config a5105_daisy_chain[] =
MACHINE_CONFIG_START(a5105_state::a5105)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_15MHz / 4)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(15'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(a5105_mem)
MCFG_CPU_IO_MAP(a5105_io)
MCFG_Z80_DAISY_CHAIN(a5105_daisy_chain)
@@ -583,17 +583,17 @@ MACHINE_CONFIG_START(a5105_state::a5105)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
- MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL_15MHz / 16) // unk clock
+ MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL(15'000'000) / 16) // unk clock
MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(a5105_state, hgdc_display_pixels)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(a5105_state, hgdc_draw_text)
- MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_15MHz / 4)
+ MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(15'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", 0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg2))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3))
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_15MHz / 4)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(15'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_CASSETTE_ADD( "cassette" )
diff --git a/src/mame/drivers/a51xx.cpp b/src/mame/drivers/a51xx.cpp
index 4719976a8fd..aabb433950f 100644
--- a/src/mame/drivers/a51xx.cpp
+++ b/src/mame/drivers/a51xx.cpp
@@ -116,7 +116,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(a51xx_state::a5120)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(a5120_mem)
MCFG_CPU_IO_MAP(a5120_io)
diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp
index 3538f30f91e..ccb87364c00 100644
--- a/src/mame/drivers/a6809.cpp
+++ b/src/mame/drivers/a6809.cpp
@@ -223,7 +223,7 @@ void a6809_state::kbd_put(u8 data)
MACHINE_CONFIG_START(a6809_state::a6809)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(a6809_mem)
MCFG_CPU_IO_MAP(a6809_io)
MCFG_MACHINE_RESET_OVERRIDE(a6809_state, a6809)
@@ -243,11 +243,11 @@ MACHINE_CONFIG_START(a6809_state::a6809)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* Devices */
- MCFG_DEVICE_ADD("via", VIA6522, XTAL_4MHz / 4)
+ MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 4)
MCFG_VIA6522_CB2_HANDLER(WRITELINE(a6809_state, cass_w))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
- MCFG_MC6845_ADD("mc6845", HD6845, "screen", XTAL_4MHz / 2)
+ MCFG_MC6845_ADD("mc6845", HD6845, "screen", XTAL(4'000'000) / 2)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(12)
diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp
index 1b028b220f8..0c7b9afca88 100644
--- a/src/mame/drivers/a7150.cpp
+++ b/src/mame/drivers/a7150.cpp
@@ -425,7 +425,7 @@ static const z80_daisy_config k7070_daisy_chain[] =
* (framebuffer and terminal should be slot devices.)
*/
MACHINE_CONFIG_START(a7150_state::a7150)
- MCFG_CPU_ADD("maincpu", I8086, XTAL_9_832MHz/2)
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(9'832'000)/2)
MCFG_CPU_PROGRAM_MAP(a7150_mem)
MCFG_CPU_IO_MAP(a7150_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
@@ -440,10 +440,10 @@ MACHINE_CONFIG_START(a7150_state::a7150)
MCFG_I8255_OUT_PORTC_CB(WRITE8(a7150_state, ppi_c_w))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_14_7456MHz/4)
+ MCFG_PIT8253_CLK0(XTAL(14'745'600)/4)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_PIT8253_CLK1(XTAL_14_7456MHz/4)
- MCFG_PIT8253_CLK2(XTAL_14_7456MHz/4)
+ MCFG_PIT8253_CLK1(XTAL(14'745'600)/4)
+ MCFG_PIT8253_CLK2(XTAL(14'745'600)/4)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(a7150_state, a7150_tmr2_w))
MCFG_DEVICE_ADD("uart8251", I8251, 0)
@@ -464,7 +464,7 @@ MACHINE_CONFIG_START(a7150_state::a7150)
MCFG_ISBC_215_IRQ(DEVWRITELINE("pic8259", pic8259_device, ir5_w))
// KGS K7070 graphics terminal controlling ABG K7072 framebuffer
- MCFG_CPU_ADD("gfxcpu", Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD("gfxcpu", Z80, XTAL(16'000'000)/4)
MCFG_CPU_PROGRAM_MAP(k7070_cpu_mem)
MCFG_CPU_IO_MAP(k7070_cpu_io)
MCFG_Z80_DAISY_CHAIN(k7070_daisy_chain)
@@ -476,7 +476,7 @@ MACHINE_CONFIG_START(a7150_state::a7150)
MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(8)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x10000)
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_16MHz/3)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/3)
MCFG_Z80CTC_INTR_CB(INPUTLINE("gfxcpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80SIO_TAG, z80sio_device, txca_w))
@@ -502,7 +502,7 @@ MACHINE_CONFIG_START(a7150_state::a7150)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxb_w))
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS( XTAL_16MHz, 737,0,640, 431,0,400 )
+ MCFG_SCREEN_RAW_PARAMS( XTAL(16'000'000), 737,0,640, 431,0,400 )
MCFG_SCREEN_UPDATE_DRIVER(a7150_state, screen_update_k7072)
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD_MONOCHROME("palette")
diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp
index 893b3fbd35f..bf7b5203236 100644
--- a/src/mame/drivers/a7800.cpp
+++ b/src/mame/drivers/a7800.cpp
@@ -108,7 +108,7 @@
#include "softlist.h"
#include "speaker.h"
-#define A7800_NTSC_Y1 XTAL_14_31818MHz
+#define A7800_NTSC_Y1 XTAL(14'318'181)
#define CLK_PAL 1773447
diff --git a/src/mame/drivers/aa310.cpp b/src/mame/drivers/aa310.cpp
index 7ab0ef2f9c5..84b334394d8 100644
--- a/src/mame/drivers/aa310.cpp
+++ b/src/mame/drivers/aa310.cpp
@@ -399,7 +399,7 @@ WRITE_LINE_MEMBER( archimedes_state::a310_kart_rx_w )
MACHINE_CONFIG_START(aa310_state::aa310)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, XTAL_24MHz / 3) /* ARM2 8 MHz */
+ MCFG_CPU_ADD("maincpu", ARM, XTAL(24'000'000) / 3) /* ARM2 8 MHz */
MCFG_CPU_PROGRAM_MAP(aa310_mem)
MCFG_ARM_COPRO(VL86C020)
@@ -412,7 +412,7 @@ MACHINE_CONFIG_START(aa310_state::aa310)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz,1024,0,735,624/2,0,292) // RiscOS 3 default screen settings
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000),1024,0,735,624/2,0,292) // RiscOS 3 default screen settings
MCFG_SCREEN_UPDATE_DRIVER(archimedes_state, screen_update)
MCFG_PALETTE_ADD("palette", 32768)
@@ -504,7 +504,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(aa310_state::aa540, aa310)
MCFG_CPU_MODIFY("maincpu") // ARM3
- MCFG_CPU_CLOCK(XTAL_52MHz / 2)
+ MCFG_CPU_CLOCK(XTAL(52'000'000) / 2)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -517,7 +517,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(aa310_state::aa5000, aa310)
MCFG_CPU_MODIFY("maincpu") // ARM3
- MCFG_CPU_CLOCK(XTAL_50MHz / 2)
+ MCFG_CPU_CLOCK(XTAL(50'000'000) / 2)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("2M")
@@ -530,7 +530,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(aa310_state::aa4, aa5000)
MCFG_CPU_MODIFY("maincpu") // ARM3
- MCFG_CPU_CLOCK(XTAL_24MHz)
+ MCFG_CPU_CLOCK(XTAL(24'000'000))
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -548,7 +548,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(aa310_state::aa3010, aa310)
MCFG_CPU_MODIFY("maincpu") // ARM250
- MCFG_CPU_CLOCK(XTAL_72MHz / 6)
+ MCFG_CPU_CLOCK(XTAL(72'000'000) / 6)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("1M")
diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp
index a806e42f31b..0b0fee776be 100644
--- a/src/mame/drivers/abc1600.cpp
+++ b/src/mame/drivers/abc1600.cpp
@@ -875,7 +875,7 @@ void abc1600_state::machine_reset()
MACHINE_CONFIG_START(abc1600_state::abc1600)
// basic machine hardware
- MCFG_CPU_ADD(MC68008P8_TAG, M68008, XTAL_64MHz/8)
+ MCFG_CPU_ADD(MC68008P8_TAG, M68008, XTAL(64'000'000)/8)
MCFG_CPU_PROGRAM_MAP(abc1600_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(abc1600_state,abc1600_int_ack)
@@ -885,7 +885,7 @@ MACHINE_CONFIG_START(abc1600_state::abc1600)
// devices
MCFG_ABC1600_MAC_ADD(MC68008P8_TAG, mac_mem)
- MCFG_DEVICE_ADD(Z8410AB1_0_TAG, Z80DMA, XTAL_64MHz/16)
+ MCFG_DEVICE_ADD(Z8410AB1_0_TAG, Z80DMA, XTAL(64'000'000)/16)
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(abc1600_state, dbrq_w))
MCFG_Z80DMA_OUT_BAO_CB(DEVWRITELINE(Z8410AB1_1_TAG, z80dma_device, bai_w))
MCFG_Z80DMA_IN_MREQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_mreq_r))
@@ -893,7 +893,7 @@ MACHINE_CONFIG_START(abc1600_state::abc1600)
MCFG_Z80DMA_IN_IORQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_iorq_r))
MCFG_Z80DMA_OUT_IORQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_iorq_w))
- MCFG_DEVICE_ADD(Z8410AB1_1_TAG, Z80DMA, XTAL_64MHz/16)
+ MCFG_DEVICE_ADD(Z8410AB1_1_TAG, Z80DMA, XTAL(64'000'000)/16)
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(abc1600_state, dbrq_w))
MCFG_Z80DMA_OUT_BAO_CB(DEVWRITELINE(Z8410AB1_2_TAG, z80dma_device, bai_w))
MCFG_Z80DMA_IN_MREQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_mreq_r))
@@ -901,24 +901,24 @@ MACHINE_CONFIG_START(abc1600_state::abc1600)
MCFG_Z80DMA_IN_IORQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_iorq_r))
MCFG_Z80DMA_OUT_IORQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_iorq_w))
- MCFG_DEVICE_ADD(Z8410AB1_2_TAG, Z80DMA, XTAL_64MHz/16)
+ MCFG_DEVICE_ADD(Z8410AB1_2_TAG, Z80DMA, XTAL(64'000'000)/16)
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(abc1600_state, dbrq_w))
MCFG_Z80DMA_IN_MREQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_mreq_r))
MCFG_Z80DMA_OUT_MREQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_mreq_w))
MCFG_Z80DMA_IN_IORQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_iorq_r))
MCFG_Z80DMA_OUT_IORQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_iorq_w))
- MCFG_DEVICE_ADD(Z8470AB1_TAG, Z80DART, XTAL_64MHz/16)
+ MCFG_DEVICE_ADD(Z8470AB1_TAG, Z80DART, XTAL(64'000'000)/16)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(MC68008P8_TAG, M68K_IRQ_5)) // shared with SCC
- MCFG_DEVICE_ADD(Z8530B1_TAG, SCC8530, XTAL_64MHz/16)
+ MCFG_DEVICE_ADD(Z8530B1_TAG, SCC8530, XTAL(64'000'000)/16)
MCFG_Z8530_INTRQ_CALLBACK(INPUTLINE(MC68008P8_TAG, M68K_IRQ_5))
- MCFG_DEVICE_ADD(Z8536B1_TAG, Z8536, XTAL_64MHz/16)
+ MCFG_DEVICE_ADD(Z8536B1_TAG, Z8536, XTAL(64'000'000)/16)
MCFG_Z8536_IRQ_CALLBACK(INPUTLINE(MC68008P8_TAG, M68K_IRQ_2))
MCFG_Z8536_PA_IN_CALLBACK(READ8(abc1600_state, cio_pa_r))
MCFG_Z8536_PB_IN_CALLBACK(READ8(abc1600_state, cio_pb_r))
@@ -928,9 +928,9 @@ MACHINE_CONFIG_START(abc1600_state::abc1600)
MCFG_NMC9306_ADD(NMC9306_TAG)
- MCFG_E0516_ADD(E050_C16PC_TAG, XTAL_32_768kHz)
+ MCFG_E0516_ADD(E050_C16PC_TAG, XTAL(32'768))
- MCFG_FD1797_ADD(SAB1797_02P_TAG, XTAL_64MHz/64)
+ MCFG_FD1797_ADD(SAB1797_02P_TAG, XTAL(64'000'000)/64)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pb7_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(abc1600_state, fdc_drq_w))
diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp
index 767c537efea..333289cc441 100644
--- a/src/mame/drivers/abc80.cpp
+++ b/src/mame/drivers/abc80.cpp
@@ -485,7 +485,7 @@ QUICKLOAD_LOAD_MEMBER( abc80_state, bac )
MACHINE_CONFIG_START(abc80_state::abc80)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_11_9808MHz/2/2) // 2.9952 MHz
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(11'980'800)/2/2) // 2.9952 MHz
MCFG_CPU_PROGRAM_MAP(abc80_mem)
MCFG_CPU_IO_MAP(abc80_io)
MCFG_Z80_DAISY_CHAIN(abc80_daisy_chain)
@@ -511,7 +511,7 @@ MACHINE_CONFIG_START(abc80_state::abc80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_11_9808MHz/2/2)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(11'980'800)/2/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(abc80_state, pio_pa_r))
MCFG_Z80PIO_IN_PB_CB(READ8(abc80_state, pio_pb_r))
diff --git a/src/mame/drivers/ac1.cpp b/src/mame/drivers/ac1.cpp
index 4244f8ea07a..7dfec2d39b0 100644
--- a/src/mame/drivers/ac1.cpp
+++ b/src/mame/drivers/ac1.cpp
@@ -128,11 +128,11 @@ INPUT_PORTS_END
/* Machine driver */
MACHINE_CONFIG_START(ac1_state::ac1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(ac1_mem)
MCFG_CPU_IO_MAP(ac1_io)
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(8'000'000) / 4)
MCFG_Z80PIO_IN_PA_CB(READ8(ac1_state, ac1_port_a_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(ac1_state, ac1_port_a_w))
MCFG_Z80PIO_IN_PB_CB(READ8(ac1_state, ac1_port_b_r))
diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp
index 87127e02e9d..7e631ac19a5 100644
--- a/src/mame/drivers/accomm.cpp
+++ b/src/mame/drivers/accomm.cpp
@@ -829,7 +829,7 @@ static INPUT_PORTS_START( accomm )
INPUT_PORTS_END
MACHINE_CONFIG_START(accomm_state::accomm)
- MCFG_CPU_ADD("maincpu", G65816, XTAL_16MHz / 8)
+ MCFG_CPU_ADD("maincpu", G65816, XTAL(16'000'000) / 8)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", accomm_state, vbl_int)
@@ -861,7 +861,7 @@ MACHINE_CONFIG_START(accomm_state::accomm)
/* rtc pcf8573 */
/* via */
- MCFG_DEVICE_ADD("via6522", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("centronics", centronics_device, write_strobe))
@@ -876,7 +876,7 @@ MACHINE_CONFIG_START(accomm_state::accomm)
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_dcd))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts))
- MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL_16MHz / 13)
+ MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(16'000'000) / 13)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(accomm_state, write_acia_clock))
/* econet */
diff --git a/src/mame/drivers/ace.cpp b/src/mame/drivers/ace.cpp
index aadd15aa89a..61f40af6a23 100644
--- a/src/mame/drivers/ace.cpp
+++ b/src/mame/drivers/ace.cpp
@@ -45,7 +45,7 @@ A1 2101 2101
#include "ace.lh"
-#define MASTER_CLOCK XTAL_18MHz
+#define MASTER_CLOCK XTAL(18'000'000)
class aceal_state : public driver_device
diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp
index 61cde39cab0..8d35c97a4de 100644
--- a/src/mame/drivers/actfancr.cpp
+++ b/src/mame/drivers/actfancr.cpp
@@ -342,11 +342,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(actfancr_state::triothep)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */
+ MCFG_CPU_ADD("maincpu",H6280,XTAL(21'477'272)/3) /* XIN=21.4772Mhz, verified on pcb */
MCFG_CPU_PROGRAM_MAP(triothep_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", actfancr_state, irq0_line_hold) /* VBL */
- MCFG_CPU_ADD("audiocpu",M6502, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu",M6502, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(dec0_s_map)
MCFG_MACHINE_START_OVERRIDE(actfancr_state,triothep)
@@ -383,17 +383,17 @@ MACHINE_CONFIG_START(actfancr_state::triothep)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.90)
MCFG_SOUND_ROUTE(1, "mono", 0.90)
MCFG_SOUND_ROUTE(2, "mono", 0.90)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/acvirus.cpp b/src/mame/drivers/acvirus.cpp
index 6b508a24e74..139524404e6 100644
--- a/src/mame/drivers/acvirus.cpp
+++ b/src/mame/drivers/acvirus.cpp
@@ -102,7 +102,7 @@ static ADDRESS_MAP_START( virus_map, AS_PROGRAM, 8, acvirus_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(acvirus_state::virus)
- MCFG_CPU_ADD("maincpu", I8052, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", I8052, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(virus_map)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp
index 2865c4b9800..43087ee2c92 100644
--- a/src/mame/drivers/adam.cpp
+++ b/src/mame/drivers/adam.cpp
@@ -1049,18 +1049,18 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(adam_state::adam)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_7_15909MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(7'159'090)/2)
MCFG_CPU_PROGRAM_MAP(adam_mem)
MCFG_CPU_IO_MAP(adam_io)
- MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz)
+ MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(m6801_mem)
MCFG_CPU_IO_MAP(m6801_io)
MCFG_M6801_SC2(WRITELINE(adam_state, os3_w))
MCFG_QUANTUM_PERFECT_CPU(M6801_TAG)
// video hardware
- MCFG_DEVICE_ADD(TMS9928A_TAG, TMS9928A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD(TMS9928A_TAG, TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(adam_state, vdc_int_w))
MCFG_TMS9928A_SCREEN_ADD_NTSC(SCREEN_TAG)
@@ -1068,7 +1068,7 @@ MACHINE_CONFIG_START(adam_state::adam)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489A_TAG, SN76489A, XTAL_7_15909MHz/2)
+ MCFG_SOUND_ADD(SN76489A_TAG, SN76489A, XTAL(7'159'090)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SN76496_READY_HANDLER(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT))
@@ -1092,11 +1092,11 @@ MACHINE_CONFIG_START(adam_state::adam)
MCFG_ADAMNET_SLOT_ADD("net15", adamnet_devices, nullptr)
MCFG_COLECOVISION_CARTRIDGE_SLOT_ADD(COLECOVISION_CARTRIDGE_SLOT_TAG, colecovision_cartridges, nullptr)
- MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_LEFT_EXPANSION_SLOT_TAG, XTAL_7_15909MHz/2, adam_slot1_devices, "adamlink")
+ MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_LEFT_EXPANSION_SLOT_TAG, XTAL(7'159'090)/2, adam_slot1_devices, "adamlink")
MCFG_ADAM_EXPANSION_SLOT_IRQ_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_CENTER_EXPANSION_SLOT_TAG, XTAL_7_15909MHz/2, adam_slot2_devices, nullptr)
+ MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_CENTER_EXPANSION_SLOT_TAG, XTAL(7'159'090)/2, adam_slot2_devices, nullptr)
MCFG_ADAM_EXPANSION_SLOT_IRQ_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_RIGHT_EXPANSION_SLOT_TAG, XTAL_7_15909MHz/2, adam_slot3_devices, "ram")
+ MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_RIGHT_EXPANSION_SLOT_TAG, XTAL(7'159'090)/2, adam_slot3_devices, "ram")
MCFG_COLECOVISION_CONTROL_PORT_ADD(CONTROL1_TAG, colecovision_control_port_devices, "hand")
MCFG_COLECOVISION_CONTROL_PORT_IRQ_CALLBACK(WRITELINE(adam_state, joy1_irq_w))
diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp
index 5ab7d5f3ce8..2820e2be70d 100644
--- a/src/mame/drivers/adp.cpp
+++ b/src/mame/drivers/adp.cpp
@@ -540,7 +540,7 @@ MACHINE_CONFIG_START(adp_state::quickjac)
MCFG_MACHINE_START_OVERRIDE(adp_state,skattv)
MCFG_MACHINE_RESET_OVERRIDE(adp_state,skattv)
- MCFG_DEVICE_ADD( "duart", MC68681, XTAL_8_664MHz / 2 )
+ MCFG_DEVICE_ADD( "duart", MC68681, XTAL(8'664'000) / 2 )
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_device, rx))
MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW1"))
@@ -549,7 +549,7 @@ MACHINE_CONFIG_START(adp_state::quickjac)
MCFG_NVRAM_ADD_NO_FILL("nvram")
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
//MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(adp_state, rtc_irq))
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/advision.cpp b/src/mame/drivers/advision.cpp
index 4fd86302eeb..55665727133 100644
--- a/src/mame/drivers/advision.cpp
+++ b/src/mame/drivers/advision.cpp
@@ -63,7 +63,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(advision_state::advision)
/* basic machine hardware */
- MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_11MHz)
+ MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(11'000'000))
MCFG_CPU_PROGRAM_MAP(program_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_MCS48_PORT_P1_IN_CB(READ8(advision_state, controller_r))
diff --git a/src/mame/drivers/aeroboto.cpp b/src/mame/drivers/aeroboto.cpp
index 03e2abb8755..9ec02e5177a 100644
--- a/src/mame/drivers/aeroboto.cpp
+++ b/src/mame/drivers/aeroboto.cpp
@@ -240,11 +240,11 @@ void aeroboto_state::machine_reset()
MACHINE_CONFIG_START(aeroboto_state::formatz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_10MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(10'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aeroboto_state, aeroboto_interrupt)
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL_10MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", MC6809, XTAL(10'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aeroboto_state, irq0_line_hold)
@@ -268,12 +268,12 @@ MACHINE_CONFIG_START(aeroboto_state::formatz)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_10MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(10'000'000)/8) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("soundlatch2", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_10MHz/16) /* verified on pcb */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(10'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp
index a1936cfe3ec..321a9ea3a81 100644
--- a/src/mame/drivers/aerofgt.cpp
+++ b/src/mame/drivers/aerofgt.cpp
@@ -1403,11 +1403,11 @@ MACHINE_RESET_MEMBER(aerofgt_state,aerofgt)
MACHINE_CONFIG_START(aerofgt_state::pspikes)
/* 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(pspikes_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL(20'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
@@ -1433,7 +1433,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikes)
MCFG_VSYSTEM_SPR2_SET_GFXREGION(1)
MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode")
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes)
@@ -1534,11 +1534,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::kickball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,XTAL_10MHz) // 10Mhz XTAL near 10Mhz rated CPU
+ MCFG_CPU_ADD("maincpu",M68000,XTAL(10'000'000)) // 10Mhz XTAL near 10Mhz rated CPU
MCFG_CPU_PROGRAM_MAP(kickball_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold) /* only IRQ1 is valid */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(kickball_sound_map)
MCFG_CPU_IO_MAP(kickball_sound_portmap)
@@ -1574,11 +1574,11 @@ MACHINE_CONFIG_START(aerofgt_state::kickball)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) // K-666 (YM3812)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(4'000'000)) // K-666 (YM3812)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, PIN7_LOW) // AD-65 (M6295) clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(4'000'000)/4, PIN7_LOW) // AD-65 (M6295) clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1649,7 +1649,7 @@ MACHINE_CONFIG_START(aerofgt_state::karatblz)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0)
MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_old_tile_callback )
@@ -1670,7 +1670,7 @@ MACHINE_CONFIG_START(aerofgt_state::karatblz)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz ) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000) ) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -1726,7 +1726,7 @@ MACHINE_CONFIG_START(aerofgt_state::karatblzbl)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(8'000'000)/2)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1737,11 +1737,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::spinlbrk)
/* 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(spinlbrk_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold) /* there are vectors for 3 and 4 too, analog related? */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* 5mhz verified on pcb */
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL(20'000'000)/4) /* 5mhz verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(spinlbrk_sound_portmap)
/* IRQs are triggered by the YM2610 */
@@ -1762,7 +1762,7 @@ MACHINE_CONFIG_START(aerofgt_state::spinlbrk)
MCFG_PALETTE_ADD_INIT_BLACK("palette", 1024) // doesn't fully initialize palette at start-up ...
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0)
MCFG_VSYSTEM_SPR2_SET_PRITYPE(1)
@@ -1784,7 +1784,7 @@ MACHINE_CONFIG_START(aerofgt_state::spinlbrk)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -1795,11 +1795,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::turbofrc)
/* 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(turbofrc_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL_5MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL(5'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
@@ -1820,7 +1820,7 @@ MACHINE_CONFIG_START(aerofgt_state::turbofrc)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0)
MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_old_tile_callback )
@@ -1841,7 +1841,7 @@ MACHINE_CONFIG_START(aerofgt_state::turbofrc)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -1878,7 +1878,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgtb)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0)
MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_old_tile_callback )
@@ -1910,11 +1910,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::aerofgt)
/* 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(aerofgt_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* 5 MHz verified on pcb */
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL(20'000'000)/4) /* 5 MHz verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(aerofgt_sound_portmap)
/* IRQs are triggered by the YM2610 */
@@ -1962,7 +1962,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgt)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp
index 496b9af8dee..aa4732111ce 100644
--- a/src/mame/drivers/agat.cpp
+++ b/src/mame/drivers/agat.cpp
@@ -1071,7 +1071,7 @@ static SLOT_INTERFACE_START(agat7_cards)
SLOT_INTERFACE_END
MACHINE_CONFIG_START(agat7_state::agat7)
- MCFG_CPU_ADD("maincpu", M6502, XTAL_14_3MHz / 14)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(14'300'000) / 14)
MCFG_CPU_PROGRAM_MAP(agat7_map)
MCFG_CPU_VBLANK_INT_DRIVER(A7_VIDEO_TAG ":a7screen", agat7_state, agat_vblank)
diff --git a/src/mame/drivers/aim65_40.cpp b/src/mame/drivers/aim65_40.cpp
index f9af6e40a2e..d967c3acf64 100644
--- a/src/mame/drivers/aim65_40.cpp
+++ b/src/mame/drivers/aim65_40.cpp
@@ -127,7 +127,7 @@ MACHINE_CONFIG_START(aim65_40_state::aim65_40)
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 1000000)
MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, 1000000)
MCFG_DEVICE_ADD(M6551_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
MCFG_MOS6551_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp
index 5a4fe2daaaf..9a3d54c1120 100644
--- a/src/mame/drivers/airbustr.cpp
+++ b/src/mame/drivers/airbustr.cpp
@@ -546,17 +546,17 @@ void airbustr_state::machine_reset()
MACHINE_CONFIG_START(airbustr_state::airbustr)
/* basic machine hardware */
- MCFG_CPU_ADD("master", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("master", Z80, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(master_map)
MCFG_CPU_IO_MAP(master_io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", airbustr_state, airbustr_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("slave", Z80, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(slave_map)
MCFG_CPU_IO_MAP(slave_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", airbustr_state, slave_interrupt) /* nmi signal from master cpu */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", airbustr_state, irq0_line_hold) // nmi are caused by sub cpu writing a sound command
@@ -593,7 +593,7 @@ MACHINE_CONFIG_START(airbustr_state::airbustr)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1")) // DSW-1 connected to port A
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2")) // DSW-2 connected to port B
MCFG_SOUND_ROUTE(0, "mono", 0.25)
@@ -601,7 +601,7 @@ MACHINE_CONFIG_START(airbustr_state::airbustr)
MCFG_SOUND_ROUTE(2, "mono", 0.25)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/4, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/4, PIN7_LOW) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp
index 9601fbde89d..6998818a50b 100644
--- a/src/mame/drivers/airraid.cpp
+++ b/src/mame/drivers/airraid.cpp
@@ -380,11 +380,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(airraid_state::airraid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80,XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(airraid_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", airraid_state, cshooter_scanline, "airraid_vid:screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(airraid_sound_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(airraid_sound_decrypted_opcodes_map)
@@ -398,7 +398,7 @@ MACHINE_CONFIG_START(airraid_state::airraid)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4)
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp
index 09e167dbda2..4c7bb289c3f 100644
--- a/src/mame/drivers/ajax.cpp
+++ b/src/mame/drivers/ajax.cpp
@@ -170,7 +170,7 @@ WRITE8_MEMBER(ajax_state::volume_callback1)
MACHINE_CONFIG_START(ajax_state::ajax)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 12/4 MHz*/
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 12/4 MHz*/
MCFG_CPU_PROGRAM_MAP(ajax_main_map)
MCFG_CPU_ADD("sub", HD6309E, 3000000) /* ? */
@@ -185,9 +185,9 @@ MACHINE_CONFIG_START(ajax_state::ajax)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/3, 528, 108, 412, 256, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/3, 528, 108, 412, 256, 16, 240)
// 6MHz dotclock is more realistic, however needs drawing updates. replace when ready
-// MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 396, hbend, hbstart, 256, 16, 240)
+// MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4, 396, hbend, hbstart, 256, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(ajax_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/akaiax80.cpp b/src/mame/drivers/akaiax80.cpp
index 714fd2e4c93..0e88bb88b0e 100644
--- a/src/mame/drivers/akaiax80.cpp
+++ b/src/mame/drivers/akaiax80.cpp
@@ -89,7 +89,7 @@ static ADDRESS_MAP_START( ax80_map, AS_PROGRAM, 8, ax80_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(ax80_state::ax80)
- MCFG_CPU_ADD("maincpu", UPD7810, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", UPD7810, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(ax80_map)
//MCFG_CPU_IO_MAP(ax80_io)
diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp
index 213bf80f11a..15537b9bac2 100644
--- a/src/mame/drivers/albazg.cpp
+++ b/src/mame/drivers/albazg.cpp
@@ -44,7 +44,7 @@ PCB:
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
class albazg_state : public driver_device
{
diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp
index 0c49e78d194..84efd4fcbf7 100644
--- a/src/mame/drivers/alesis.cpp
+++ b/src/mame/drivers/alesis.cpp
@@ -357,7 +357,7 @@ HD44780_PIXEL_UPDATE(alesis_state::sr16_pixel_update)
MACHINE_CONFIG_START(alesis_state::hr16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8031, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu",I8031, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(hr16_mem)
MCFG_CPU_IO_MAP(hr16_io)
@@ -382,7 +382,7 @@ MACHINE_CONFIG_START(alesis_state::hr16)
MCFG_HD44780_LCD_SIZE(2, 16)
/* sound hardware */
- MCFG_ALESIS_DM3AG_ADD("dm3ag", XTAL_12MHz/2)
+ MCFG_ALESIS_DM3AG_ADD("dm3ag", XTAL(12'000'000)/2)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/alesis_qs.cpp b/src/mame/drivers/alesis_qs.cpp
index 784b4187716..12ea0764cb2 100644
--- a/src/mame/drivers/alesis_qs.cpp
+++ b/src/mame/drivers/alesis_qs.cpp
@@ -49,7 +49,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(qs_state::qs7)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83048, XTAL_10MHz) /* FIX-ME! Actual CPU is H8/510 and XTAL value is a guess */
+ MCFG_CPU_ADD("maincpu", H83048, XTAL(10'000'000)) /* FIX-ME! Actual CPU is H8/510 and XTAL value is a guess */
MCFG_CPU_PROGRAM_MAP(qs7_prog_map)
//MCFG_ALESIS_KEYSCAN_ASIC_ADD("keyscan")
diff --git a/src/mame/drivers/alien.cpp b/src/mame/drivers/alien.cpp
index 2f22185b43a..a2dbf1822a4 100644
--- a/src/mame/drivers/alien.cpp
+++ b/src/mame/drivers/alien.cpp
@@ -28,7 +28,7 @@
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_200MHz
+#define MASTER_CLOCK XTAL(200'000'000)
class alien_state : public driver_device
{
diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp
index cbfbaea5d78..4b0a71ac574 100644
--- a/src/mame/drivers/aliens.cpp
+++ b/src/mame/drivers/aliens.cpp
@@ -194,11 +194,11 @@ WRITE8_MEMBER( aliens_state::banking_callback )
MACHINE_CONFIG_START(aliens_state::aliens)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 (verified on pcb) */
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 (verified on pcb) */
MCFG_CPU_PROGRAM_MAP(aliens_map)
MCFG_KONAMICPU_LINE_CB(WRITE8(aliens_state, banking_callback))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(aliens_sound_map)
MCFG_DEVICE_ADD("bank0000", ADDRESS_MAP_BANK, 0)
@@ -212,9 +212,9 @@ MACHINE_CONFIG_START(aliens_state::aliens)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/3, 528, 112, 400, 256, 16, 240) // measured 59.17
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/3, 528, 112, 400, 256, 16, 240) // measured 59.17
// 6MHz dotclock is more realistic, however needs drawing updates. replace when ready
-// MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 396, hbend, hbstart, 256, 16, 240)
+// MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4, 396, hbend, hbstart, 256, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(aliens_state, screen_update_aliens)
MCFG_SCREEN_PALETTE("palette")
@@ -237,12 +237,12 @@ MACHINE_CONFIG_START(aliens_state::aliens)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(aliens_state,aliens_snd_bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545)) /* verified on pcb */
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(aliens_state, volume_callback))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp
index daa8b833f40..1fa77937d16 100644
--- a/src/mame/drivers/alpha68k.cpp
+++ b/src/mame/drivers/alpha68k.cpp
@@ -1903,7 +1903,7 @@ MACHINE_START_MEMBER(alpha68k_state,alpha68k_II)
// Pixel clock, assuming that it can't be 4 MHz because 4 MHz / 15,20 KHz = 263 HTOTAL (VERY unlikely).
-#define ALPHA68K_PIXEL_CLOCK XTAL_24MHz/4
+#define ALPHA68K_PIXEL_CLOCK XTAL(24'000'000)/4
#define ALPHA68K_HTOTAL 394
#define ALPHA68K_HBEND 0
#define ALPHA68K_HBSTART 256
@@ -1975,12 +1975,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(alpha68k_state::kyros)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* Verified on bootleg PCB */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* Verified on bootleg PCB */
MCFG_CPU_PROGRAM_MAP(kyros_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)
MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60) // MCU irq
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) /* Verified on bootleg PCB */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) /* Verified on bootleg PCB */
MCFG_CPU_PROGRAM_MAP(kyros_sound_map)
MCFG_CPU_IO_MAP(kyros_sound_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq0_line_hold)
@@ -2010,13 +2010,13 @@ MACHINE_CONFIG_START(alpha68k_state::kyros)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
- MCFG_SOUND_ADD("ym3", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
+ MCFG_SOUND_ADD("ym3", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.9)
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp
index 34c5106bc90..009a48a98ef 100644
--- a/src/mame/drivers/alphasma.cpp
+++ b/src/mame/drivers/alphasma.cpp
@@ -422,7 +422,7 @@ void alphasmart_state::machine_reset()
MACHINE_CONFIG_START(alphasmart_state::alphasmart)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC68HC11, XTAL_8MHz/2) // MC68HC11D0, XTAL is 8 Mhz, unknown divider
+ MCFG_CPU_ADD("maincpu", MC68HC11, XTAL(8'000'000)/2) // MC68HC11D0, XTAL is 8 Mhz, unknown divider
MCFG_CPU_PROGRAM_MAP(alphasmart_mem)
MCFG_CPU_IO_MAP(alphasmart_io)
MCFG_MC68HC11_CONFIG(0, 192, 0x00)
diff --git a/src/mame/drivers/alphatpx.cpp b/src/mame/drivers/alphatpx.cpp
index d34c212ee6c..37389da111f 100644
--- a/src/mame/drivers/alphatpx.cpp
+++ b/src/mame/drivers/alphatpx.cpp
@@ -597,13 +597,13 @@ void alphatpx_state::machine_reset()
//**************************************************************************
MACHINE_CONFIG_START(alphatpx_state::alphatp3)
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_6MHz)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(alphatp3_mem)
MCFG_CPU_IO_MAP(alphatp3_io)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("kbdmcu", I8041, XTAL_12_8544MHz/2)
+ MCFG_CPU_ADD("kbdmcu", I8041, XTAL(12'854'400)/2)
MCFG_MCS48_PORT_T0_IN_CB(READLINE(alphatpx_state, kbd_matrix_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(alphatpx_state, kbd_matrix_w))
MCFG_MCS48_PORT_P2_IN_CB(READ8(alphatpx_state, kbd_port2_r))
@@ -618,12 +618,12 @@ MACHINE_CONFIG_START(alphatpx_state::alphatp3)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS(XTAL_12_8544MHz, 824, 0, 640, 312, 0, 288)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'854'400), 824, 0, 640, 312, 0, 288)
MCFG_SCREEN_UPDATE_DRIVER(alphatpx_state, screen_update)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD("crtc", CRT5037, XTAL_12_8544MHz)
+ MCFG_DEVICE_ADD("crtc", CRT5037, XTAL(12'854'400))
MCFG_TMS9927_CHAR_WIDTH(8)
MCFG_TMS9927_VSYN_CALLBACK(INPUTLINE("maincpu", I8085_RST65_LINE)) MCFG_DEVCB_XOR(1)
@@ -637,9 +637,9 @@ MACHINE_CONFIG_START(alphatpx_state::alphatp3)
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_DEVICE_ADD("uart", I8251, 0)
- // XTAL_4_9152MHz serial clock
+ // XTAL(4'915'200) serial clock
- MCFG_FD1791_ADD("fdc", XTAL_4MHz / 4)
+ MCFG_FD1791_ADD("fdc", XTAL(4'000'000) / 4)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(alphatpx_state, fdcirq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(alphatpx_state, fdcdrq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(alphatpx_state, fdchld_w))
@@ -648,13 +648,13 @@ MACHINE_CONFIG_START(alphatpx_state::alphatp3)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(alphatpx_state::alphatp2)
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_6MHz)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(alphatp3_mem)
MCFG_CPU_IO_MAP(alphatp3_io)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("kbdmcu", I8041, XTAL_12_8544MHz/2)
+ MCFG_CPU_ADD("kbdmcu", I8041, XTAL(12'854'400)/2)
MCFG_MCS48_PORT_T0_IN_CB(READLINE(alphatpx_state, kbd_matrix_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(alphatpx_state, kbd_matrix_w))
MCFG_MCS48_PORT_P2_IN_CB(READ8(alphatpx_state, kbd_port2_r))
@@ -669,12 +669,12 @@ MACHINE_CONFIG_START(alphatpx_state::alphatp2)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS(XTAL_12_8544MHz, 824, 0, 640, 312, 0, 288)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'854'400), 824, 0, 640, 312, 0, 288)
MCFG_SCREEN_UPDATE_DRIVER(alphatpx_state, screen_update)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD("crtc", CRT5037, XTAL_12_8544MHz)
+ MCFG_DEVICE_ADD("crtc", CRT5037, XTAL(12'854'400))
MCFG_TMS9927_CHAR_WIDTH(8)
MCFG_TMS9927_HSYN_CALLBACK(INPUTLINE("maincpu", I8085_RST55_LINE))
MCFG_TMS9927_VSYN_CALLBACK(INPUTLINE("maincpu", I8085_RST65_LINE)) MCFG_DEVCB_XOR(1)
@@ -688,9 +688,9 @@ MACHINE_CONFIG_START(alphatpx_state::alphatp2)
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_DEVICE_ADD("uart", I8251, 0)
- // XTAL_4_9152MHz serial clock
+ // XTAL(4'915'200) serial clock
- MCFG_FD1791_ADD("fdc", XTAL_4MHz / 4)
+ MCFG_FD1791_ADD("fdc", XTAL(4'000'000) / 4)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(alphatpx_state, fdcirq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(alphatpx_state, fdcdrq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(alphatpx_state, fdchld_w))
diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp
index 328ebc922ef..c4e11a7b684 100644
--- a/src/mame/drivers/alphatro.cpp
+++ b/src/mame/drivers/alphatro.cpp
@@ -45,7 +45,7 @@
#include "softlist.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_4MHz
+#define MAIN_CLOCK XTAL(4'000'000)
class alphatro_state : public driver_device
@@ -727,7 +727,7 @@ MACHINE_CONFIG_START(alphatro_state::alphatro)
MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("fdc", upd765a_device, mdma_w))
MCFG_I8257_OUT_TC_CB(DEVWRITELINE("fdc", upd765a_device, tc_line_w))
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_12_288MHz / 8) // clk unknown
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(12'288'000) / 8) // clk unknown
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(alphatro_state, crtc_update_row)
diff --git a/src/mame/drivers/altair.cpp b/src/mame/drivers/altair.cpp
index 0957d94dfc6..a7735e6abec 100644
--- a/src/mame/drivers/altair.cpp
+++ b/src/mame/drivers/altair.cpp
@@ -93,7 +93,7 @@ void altair_state::machine_reset()
MACHINE_CONFIG_START(altair_state::altair)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_2MHz)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp
index 99b35501ad6..d06368e5861 100644
--- a/src/mame/drivers/alto2.cpp
+++ b/src/mame/drivers/alto2.cpp
@@ -277,14 +277,14 @@ MACHINE_CONFIG_START(alto2_state::alto2)
// Basic machine hardware
// SYSCLK is Display Control part A51 (tagged 29.4MHz) divided by 5(?)
// 5.8MHz according to de.wikipedia.org/wiki/Xerox_Alto
- MCFG_CPU_ADD("maincpu", ALTO2, XTAL_29_4912MHz/5)
+ MCFG_CPU_ADD("maincpu", ALTO2, XTAL(29'491'200)/5)
MCFG_CPU_PROGRAM_MAP(alto2_ucode_map)
MCFG_CPU_DATA_MAP(alto2_const_map)
MCFG_CPU_IO_MAP(alto2_iomem_map)
// Video hardware
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::white())
- MCFG_SCREEN_RAW_PARAMS(XTAL_20_16MHz,
+ MCFG_SCREEN_RAW_PARAMS(XTAL(20'160'000),
A2_DISP_TOTAL_WIDTH, 0, A2_DISP_WIDTH,
A2_DISP_TOTAL_HEIGHT, 0, A2_DISP_HEIGHT)
// Two interlaced fields at 60Hz => 30Hz frame rate
diff --git a/src/mame/drivers/altos2.cpp b/src/mame/drivers/altos2.cpp
index 0f8bb47802f..e570b3542c5 100644
--- a/src/mame/drivers/altos2.cpp
+++ b/src/mame/drivers/altos2.cpp
@@ -97,7 +97,7 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(altos2_state::altos2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) // unknown clock
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000)) // unknown clock
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
@@ -107,7 +107,7 @@ MACHINE_CONFIG_START(altos2_state::altos2)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("dart1", z80dart_device, txca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart1", z80dart_device, rxca_w))
@@ -115,16 +115,16 @@ MACHINE_CONFIG_START(altos2_state::altos2)
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("dart2", z80dart_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart2", z80dart_device, txca_w))
- MCFG_DEVICE_ADD("dart1", Z80DART, XTAL_4MHz)
+ MCFG_DEVICE_ADD("dart1", Z80DART, XTAL(4'000'000))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("dart2", Z80DART, XTAL_4MHz) // channel B not used for communications
+ MCFG_DEVICE_ADD("dart2", Z80DART, XTAL(4'000'000)) // channel B not used for communications
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE("novram", x2210_device, store)) MCFG_DEVCB_INVERT // FIXME: no inverter should be needed
MCFG_DEVICE_ADD("novram", X2210, 0)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz / 2, 960, 0, 800, 347, 0, 325)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(40'000'000) / 2, 960, 0, 800, 347, 0, 325)
MCFG_SCREEN_UPDATE_DRIVER(altos2_state, screen_update)
//MCFG_DEVICE_ADD("vpac", CRT9007, VPAC_CLOCK)
diff --git a/src/mame/drivers/altos486.cpp b/src/mame/drivers/altos486.cpp
index 44331e85752..e7a8eae4f79 100644
--- a/src/mame/drivers/altos486.cpp
+++ b/src/mame/drivers/altos486.cpp
@@ -121,12 +121,12 @@ static ADDRESS_MAP_START(altos486_z80_io, AS_IO, 8, altos486_state)
ADDRESS_MAP_END
MACHINE_CONFIG_START(altos486_state::altos486)
- MCFG_CPU_ADD("maincpu", I80186, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", I80186, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(altos486_mem)
MCFG_CPU_IO_MAP(altos486_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb) // yes, really
- MCFG_CPU_ADD("iocpu", Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("iocpu", Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(altos486_z80_mem)
MCFG_CPU_IO_MAP(altos486_z80_io)
@@ -165,7 +165,7 @@ MACHINE_CONFIG_START(altos486_state::altos486)
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232_lp", rs232_port_device, write_rts))
//MCFG_Z80DART_OUT_INT_CB(WRITELINE(altos486_state, sio_interrupt))
- MCFG_DEVICE_ADD("i8274", I8274, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD("i8274", I8274, XTAL(16'000'000)/4)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs422_wn", rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs422_wn", rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs422_wn", rs232_port_device, write_rts))
@@ -203,13 +203,13 @@ MACHINE_CONFIG_START(altos486_state::altos486)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("i8274", z80dart_device, ctsa_w))
MCFG_DEVICE_ADD("pit0", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_22_1184MHz/18)
- MCFG_PIT8253_CLK1(XTAL_22_1184MHz/144)
- MCFG_PIT8253_CLK2(XTAL_22_1184MHz/18)
+ MCFG_PIT8253_CLK0(XTAL(22'118'400)/18)
+ MCFG_PIT8253_CLK1(XTAL(22'118'400)/144)
+ MCFG_PIT8253_CLK2(XTAL(22'118'400)/18)
MCFG_DEVICE_ADD("pit1", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_22_1184MHz/18)
- MCFG_PIT8253_CLK1(XTAL_22_1184MHz/144)
- MCFG_PIT8253_CLK2(XTAL_22_1184MHz/18)
+ MCFG_PIT8253_CLK0(XTAL(22'118'400)/18)
+ MCFG_PIT8253_CLK1(XTAL(22'118'400)/144)
+ MCFG_PIT8253_CLK2(XTAL(22'118'400)/18)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp
index 0f6d009c12e..f08b004b689 100644
--- a/src/mame/drivers/altos5.cpp
+++ b/src/mame/drivers/altos5.cpp
@@ -347,18 +347,18 @@ DRIVER_INIT_MEMBER( altos5_state, altos5 )
MACHINE_CONFIG_START(altos5_state::altos5)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
- MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_8MHz / 4) // 2MHz
+ MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(8'000'000) / 4) // 2MHz
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc" ,z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc" ,z80ctc_device, trg1))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc" ,z80ctc_device, trg2))
/* devices */
- MCFG_DEVICE_ADD("dma", Z80DMA, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(8'000'000) / 2)
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(altos5_state, busreq_w))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
// BAO, not used
@@ -367,22 +367,22 @@ MACHINE_CONFIG_START(altos5_state::altos5)
MCFG_Z80DMA_IN_IORQ_CB(READ8(altos5_state, io_read_byte))
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(altos5_state, io_write_byte))
- MCFG_DEVICE_ADD("pio0", Z80PIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("pio0", Z80PIO, XTAL(8'000'000) / 2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(altos5_state, port08_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(altos5_state, port08_w))
MCFG_Z80PIO_IN_PB_CB(READ8(altos5_state, port09_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(altos5_state, port09_w))
- MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(8'000'000) / 2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("dart", Z80DART, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("dart", Z80DART, XTAL(8'000'000) / 2)
// Channel A - console #3
// Channel B - printer
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(8'000'000) / 2)
// Channel A - console #2
// WRDY connects to (altos5_state, fdc_intrq_w)
// Channel B - console #1
@@ -391,7 +391,7 @@ MACHINE_CONFIG_START(altos5_state::altos5)
MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w)) // SIO Ch B
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart", z80dart_device, txca_w)) // Z80DART Ch A, SIO Ch A
@@ -405,7 +405,7 @@ MACHINE_CONFIG_START(altos5_state::altos5)
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcdb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
- MCFG_FD1797_ADD("fdc", XTAL_8MHz / 8)
+ MCFG_FD1797_ADD("fdc", XTAL(8'000'000) / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(altos5_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", altos5_floppies, "525qd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/altos8600.cpp b/src/mame/drivers/altos8600.cpp
index fb45b6911ac..74a2aaa7fa5 100644
--- a/src/mame/drivers/altos8600.cpp
+++ b/src/mame/drivers/altos8600.cpp
@@ -679,7 +679,7 @@ static SLOT_INTERFACE_START(altos8600_floppies)
SLOT_INTERFACE_END
MACHINE_CONFIG_START(altos8600_state::altos8600)
- MCFG_CPU_ADD("maincpu", I8086, XTAL_5MHz)
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(cpu_mem)
MCFG_CPU_IO_MAP(cpu_io)
MCFG_CPU_DECRYPTED_OPCODES_MAP(code_mem)
@@ -689,7 +689,7 @@ MACHINE_CONFIG_START(altos8600_state::altos8600)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(altos8600_state, inta)
MCFG_I8086_IF_HANDLER(WRITELINE(altos8600_state, cpuif_w))
- MCFG_CPU_ADD("dmac", I8089, XTAL_5MHz)
+ MCFG_CPU_ADD("dmac", I8089, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(dmac_mem)
MCFG_CPU_IO_MAP(dmac_io)
MCFG_I8089_DATA_WIDTH(16)
@@ -713,7 +713,7 @@ MACHINE_CONFIG_START(altos8600_state::altos8600)
MCFG_RAM_DEFAULT_SIZE("1M")
//MCFG_RAM_EXTRA_OPTIONS("512K")
- MCFG_DEVICE_ADD("uart8274", I8274_NEW, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD("uart8274", I8274_NEW, XTAL(16'000'000)/4)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
diff --git a/src/mame/drivers/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp
index d3cfc480345..00c5ef87eb7 100644
--- a/src/mame/drivers/amaticmg.cpp
+++ b/src/mame/drivers/amaticmg.cpp
@@ -422,7 +422,7 @@
#include "suprstar.lh"
-#define MASTER_CLOCK XTAL_16MHz
+#define MASTER_CLOCK XTAL(16'000'000)
#define CPU_CLOCK MASTER_CLOCK/4 /* guess */
#define SND_CLOCK MASTER_CLOCK/4 /* guess */
#define CRTC_CLOCK MASTER_CLOCK/8 /* guess */
diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp
index 4d11d18004d..fccfbf1f12c 100644
--- a/src/mame/drivers/ambush.cpp
+++ b/src/mame/drivers/ambush.cpp
@@ -682,7 +682,7 @@ WRITE8_MEMBER(ambush_state::output_latches_w)
//**************************************************************************
MACHINE_CONFIG_START(ambush_state::ambush)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ambush_state, irq0_line_hold)
@@ -702,7 +702,7 @@ MACHINE_CONFIG_START(ambush_state::ambush)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_18_432MHz/3, 384, 0, 256, 264, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(18'432'000)/3, 384, 0, 256, 264, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(ambush_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -713,11 +713,11 @@ MACHINE_CONFIG_START(ambush_state::ambush)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8912, XTAL_18_432MHz/6/2)
+ MCFG_SOUND_ADD("ay1", AY8912, XTAL(18'432'000)/6/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("buttons"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MCFG_SOUND_ADD("ay2", AY8912, XTAL_18_432MHz/6/2)
+ MCFG_SOUND_ADD("ay2", AY8912, XTAL(18'432'000)/6/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("joystick"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
@@ -743,11 +743,11 @@ MACHINE_CONFIG_DERIVED(ambush_state::mariobl, ambush)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(ambush_state, mario)
- MCFG_SOUND_REPLACE("ay1", AY8910, XTAL_18_432MHz/6/2)
+ MCFG_SOUND_REPLACE("ay1", AY8910, XTAL(18'432'000)/6/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("buttons"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MCFG_SOUND_REPLACE("ay2", AY8910, XTAL_18_432MHz/6/2)
+ MCFG_SOUND_REPLACE("ay2", AY8910, XTAL(18'432'000)/6/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("joystick"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/amerihok.cpp b/src/mame/drivers/amerihok.cpp
index 337d1ec2ace..96ff255301d 100644
--- a/src/mame/drivers/amerihok.cpp
+++ b/src/mame/drivers/amerihok.cpp
@@ -75,7 +75,7 @@ void amerihok_state::machine_reset()
MACHINE_CONFIG_START(amerihok_state::amerihok)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z8681, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", Z8681, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(amerihok_map)
MCFG_CPU_DATA_MAP(amerihok_data_map)
diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp
index 0df199e8def..3650317097c 100644
--- a/src/mame/drivers/amiga.cpp
+++ b/src/mame/drivers/amiga.cpp
@@ -1463,7 +1463,7 @@ MACHINE_CONFIG_DERIVED(a2000_state::a2000, amiga_base)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x200000)
// real-time clock
- MCFG_DEVICE_ADD("u65", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("u65", MSM6242, XTAL(32'768))
// cpu slot
MCFG_EXPANSION_SLOT_ADD("maincpu", a2000_expansion_cards, nullptr)
@@ -1534,13 +1534,13 @@ MACHINE_CONFIG_DERIVED(cdtv_state::cdtv, amiga_base)
MCFG_CPU_PROGRAM_MAP(cdtv_mem)
// remote control input converter
- MCFG_CPU_ADD("u75", M6502, XTAL_3MHz)
+ MCFG_CPU_ADD("u75", M6502, XTAL(3'000'000))
MCFG_CPU_PROGRAM_MAP(cdtv_rc_mem)
MCFG_DEVICE_DISABLE()
// lcd controller
#if 0
- MCFG_CPU_ADD("u62", LC6554, XTAL_4MHz)
+ MCFG_CPU_ADD("u62", LC6554, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(lcd_mem)
#endif
@@ -1558,7 +1558,7 @@ MACHINE_CONFIG_DERIVED(cdtv_state::cdtv, amiga_base)
MCFG_NVRAM_ADD_0FILL("memcard")
// real-time clock
- MCFG_DEVICE_ADD("u61", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("u61", MSM6242, XTAL(32'768))
// cd-rom controller
MCFG_DMAC_ADD("u36", amiga_state::CLK_7M_PAL)
@@ -1604,7 +1604,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(a3000_state::a3000, amiga_base)
// main cpu
- MCFG_CPU_ADD("maincpu", M68030, XTAL_32MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68030, XTAL(32'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(a3000_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
@@ -1615,7 +1615,7 @@ MACHINE_CONFIG_DERIVED(a3000_state::a3000, amiga_base)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x200000)
// real-time clock
- MCFG_DEVICE_ADD("rtc", RP5C01, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768))
// todo: zorro3 slots, super dmac, scsi
@@ -1648,7 +1648,7 @@ MACHINE_CONFIG_DERIVED(a500p_state::a500p, amiga_base)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x200000)
// real-time clock
- MCFG_DEVICE_ADD("u9", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("u9", MSM6242, XTAL(32'768))
// cpu slot
MCFG_EXPANSION_SLOT_ADD("maincpu", a500_expansion_cards, nullptr)
@@ -1782,7 +1782,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(a4000_state::a4000, amiga_base)
// main cpu
- MCFG_CPU_ADD("maincpu", M68040, XTAL_50MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68040, XTAL(50'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(a4000_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
@@ -1801,7 +1801,7 @@ MACHINE_CONFIG_DERIVED(a4000_state::a4000, amiga_base)
MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga)
// real-time clock
- MCFG_DEVICE_ADD("rtc", RP5C01, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768))
// ide
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false)
@@ -1833,7 +1833,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(a4000_state::a400030, a4000)
// main cpu
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", M68EC030, XTAL_50MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68EC030, XTAL(50'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(a400030_mem)
// todo: ide
@@ -1922,7 +1922,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(a4000_state::a4000t, a4000)
// main cpu
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", M68040, XTAL_50MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68040, XTAL(50'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(a4000t_mem)
// todo: ide, zorro3, scsi, super dmac
diff --git a/src/mame/drivers/ampex.cpp b/src/mame/drivers/ampex.cpp
index a0e6dcbd693..e3bd9dd36b0 100644
--- a/src/mame/drivers/ampex.cpp
+++ b/src/mame/drivers/ampex.cpp
@@ -62,15 +62,15 @@ static INPUT_PORTS_START( ampex )
INPUT_PORTS_END
MACHINE_CONFIG_START(ampex_state::ampex)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_23_814MHz / 9) // clocked by 8224?
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(23'814'000) / 9) // clocked by 8224?
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_23_814MHz / 2, 105 * CHAR_WIDTH, 0, 80 * CHAR_WIDTH, 270, 0, 250)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(23'814'000) / 2, 105 * CHAR_WIDTH, 0, 80 * CHAR_WIDTH, 270, 0, 250)
MCFG_SCREEN_UPDATE_DRIVER(ampex_state, screen_update)
// FIXME: dot clock should be divided by char width
- MCFG_DEVICE_ADD("vtac", CRT5037, XTAL_23_814MHz / 2)
+ MCFG_DEVICE_ADD("vtac", CRT5037, XTAL(23'814'000) / 2)
MCFG_TMS9927_CHAR_WIDTH(CHAR_WIDTH)
MCFG_VIDEO_SET_SCREEN("screen")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp
index 3a7179fbd36..0b8e0fbff9f 100644
--- a/src/mame/drivers/ampoker2.cpp
+++ b/src/mame/drivers/ampoker2.cpp
@@ -374,7 +374,7 @@
*********************************************************************************/
-#define MASTER_CLOCK XTAL_6MHz
+#define MASTER_CLOCK XTAL(6'000'000)
#include "emu.h"
#include "includes/ampoker2.h"
diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp
index 749e4675bf5..1e89e9a2ca4 100644
--- a/src/mame/drivers/ampro.cpp
+++ b/src/mame/drivers/ampro.cpp
@@ -146,24 +146,24 @@ DRIVER_INIT_MEMBER( ampro_state, ampro )
MACHINE_CONFIG_START(ampro_state::ampro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(ampro_mem)
MCFG_CPU_IO_MAP(ampro_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
MCFG_MACHINE_RESET_OVERRIDE(ampro_state, ampro)
- MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_16MHz / 8) // 2MHz
+ MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(16'000'000) / 8) // 2MHz
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
/* Devices */
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("dart", z80dart_device, txca_w)) // Z80DART Ch A, SIO Ch A
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxca_w))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart", z80dart_device, rxtxcb_w)) // SIO Ch B
- MCFG_DEVICE_ADD("dart", Z80DART, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("dart", Z80DART, XTAL(16'000'000) / 4)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -172,7 +172,7 @@ MACHINE_CONFIG_START(ampro_state::ampro)
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart", z80dart_device, rxa_w))
- MCFG_WD1772_ADD("fdc", XTAL_16MHz / 2)
+ MCFG_WD1772_ADD("fdc", XTAL(16'000'000) / 2)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ampro_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_SOFTWARE_LIST_ADD("flop_list", "ampro")
diff --git a/src/mame/drivers/amstr_pc.cpp b/src/mame/drivers/amstr_pc.cpp
index d0a09fa54f3..b0f508ad1ee 100644
--- a/src/mame/drivers/amstr_pc.cpp
+++ b/src/mame/drivers/amstr_pc.cpp
@@ -526,7 +526,7 @@ MACHINE_CONFIG_DERIVED(amstrad_pc_state::ppc640, pc200)
MCFG_DEVICE_REMOVE("isa1")
MCFG_DEVICE_REMOVE("isa2")
- MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz )
+ MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(amstrad_pc_state::ppc512, ppc640)
diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp
index af49931da6e..37e268f7466 100644
--- a/src/mame/drivers/amstrad.cpp
+++ b/src/mame/drivers/amstrad.cpp
@@ -900,7 +900,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(amstrad_state::amstrad_base)
/* Machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(amstrad_mem)
MCFG_CPU_IO_MAP(amstrad_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
@@ -918,7 +918,7 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( XTAL_16MHz, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
+ MCFG_SCREEN_RAW_PARAMS( XTAL(16'000'000), 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(amstrad_state, screen_vblank_amstrad))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
@@ -927,7 +927,7 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_cpc)
- MCFG_MC6845_ADD("mc6845", HD6845, nullptr, XTAL_16MHz / 16)
+ MCFG_MC6845_ADD("mc6845", HD6845, nullptr, XTAL(16'000'000) / 16)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_de_changed))
@@ -941,7 +941,7 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay", AY8912, XTAL_16MHz / 16)
+ MCFG_SOUND_ADD("ay", AY8912, XTAL(16'000'000) / 16)
MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -1025,7 +1025,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(amstrad_state::cpcplus)
/* Machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_40MHz / 10)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(40'000'000) / 10)
MCFG_CPU_PROGRAM_MAP(amstrad_mem)
MCFG_CPU_IO_MAP(amstrad_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
@@ -1043,7 +1043,7 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( ( XTAL_40MHz * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
+ MCFG_SCREEN_RAW_PARAMS( ( XTAL(40'000'000) * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(amstrad_state, screen_vblank_amstrad))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
@@ -1052,7 +1052,7 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_plus)
- MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL_40MHz / 40)
+ MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL(40'000'000) / 40)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_plus_de_changed))
@@ -1065,7 +1065,7 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay", AY8912, XTAL_40MHz / 40)
+ MCFG_SOUND_ADD("ay", AY8912, XTAL(40'000'000) / 40)
MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -1104,7 +1104,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(amstrad_state::gx4000)
/* Machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_40MHz / 10)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(40'000'000) / 10)
MCFG_CPU_PROGRAM_MAP(amstrad_mem)
MCFG_CPU_IO_MAP(amstrad_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
@@ -1122,7 +1122,7 @@ MACHINE_CONFIG_START(amstrad_state::gx4000)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( ( XTAL_40MHz * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
+ MCFG_SCREEN_RAW_PARAMS( ( XTAL(40'000'000) * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(amstrad_state, screen_vblank_amstrad))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
@@ -1131,7 +1131,7 @@ MACHINE_CONFIG_START(amstrad_state::gx4000)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_plus)
- MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL_40MHz / 40)
+ MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL(40'000'000) / 40)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_plus_de_changed))
@@ -1142,7 +1142,7 @@ MACHINE_CONFIG_START(amstrad_state::gx4000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay", AY8912, XTAL_40MHz / 40)
+ MCFG_SOUND_ADD("ay", AY8912, XTAL(40'000'000) / 40)
MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -1158,14 +1158,14 @@ MACHINE_CONFIG_DERIVED(amstrad_state::aleste, cpc6128)
MCFG_MACHINE_START_OVERRIDE(amstrad_state,aleste)
MCFG_MACHINE_RESET_OVERRIDE(amstrad_state,aleste)
- MCFG_SOUND_REPLACE("ay", AY8912, XTAL_16MHz / 16)
+ MCFG_SOUND_REPLACE("ay", AY8912, XTAL(16'000'000) / 16)
MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(32+64)
MCFG_PALETTE_INIT_OWNER(amstrad_state,aleste)
- MCFG_MC146818_ADD( "rtc", XTAL_4_194304Mhz )
+ MCFG_MC146818_ADD( "rtc", XTAL(4'194'304) )
MCFG_DEVICE_REMOVE("upd765")
MCFG_I8272A_ADD("upd765", true)
diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp
index 5137cf5d78e..ca83c71a86c 100644
--- a/src/mame/drivers/amusco.cpp
+++ b/src/mame/drivers/amusco.cpp
@@ -86,8 +86,8 @@
#include "amusco.lh"
-#define MASTER_CLOCK XTAL_22_1184MHz /* confirmed */
-#define SECOND_CLOCK XTAL_15MHz /* confirmed */
+#define MASTER_CLOCK XTAL(22'118'400) /* confirmed */
+#define SECOND_CLOCK XTAL(15'000'000) /* confirmed */
#define CPU_CLOCK MASTER_CLOCK / 4 /* guess */
#define CRTC_CLOCK SECOND_CLOCK / 8 /* guess */
@@ -554,7 +554,7 @@ MACHINE_CONFIG_START(amusco_state::amusco)
MCFG_I8155_IN_PORTB_CB(READ8(amusco_state, lpt_status_r))
// Port C uses ALT 3 mode, which MAME does not currently emulate
- MCFG_MSM5832_ADD("rtc", XTAL_32_768kHz)
+ MCFG_MSM5832_ADD("rtc", XTAL(32'768))
MCFG_DEVICE_ADD("rtc_interface", I8155, 0)
MCFG_I8155_OUT_PORTA_CB(WRITE8(amusco_state, rtc_control_w))
diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp
index ccdfaf50b5d..fbba23ce7a3 100644
--- a/src/mame/drivers/amust.cpp
+++ b/src/mame/drivers/amust.cpp
@@ -373,7 +373,7 @@ DRIVER_INIT_MEMBER( amust_state, amust )
MACHINE_CONFIG_START(amust_state::amust)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", amust_state, irq_vs)
@@ -395,7 +395,7 @@ MACHINE_CONFIG_START(amust_state::amust)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_14_31818MHz / 8)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(14'318'181) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(amust_state, crtc_update_row)
diff --git a/src/mame/drivers/anes.cpp b/src/mame/drivers/anes.cpp
index 38bce775911..2f223df67ea 100644
--- a/src/mame/drivers/anes.cpp
+++ b/src/mame/drivers/anes.cpp
@@ -152,7 +152,7 @@ void anes_state::machine_start()
MACHINE_CONFIG_START(anes_state::anes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 2) // Z0840008PSC
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 2) // Z0840008PSC
MCFG_CPU_PROGRAM_MAP(prg_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", anes_state, irq0_line_hold)
@@ -170,7 +170,7 @@ MACHINE_CONFIG_START(anes_state::anes)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ym", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/angelkds.cpp b/src/mame/drivers/angelkds.cpp
index e82b09d2fe6..8fd41668baf 100644
--- a/src/mame/drivers/angelkds.cpp
+++ b/src/mame/drivers/angelkds.cpp
@@ -513,12 +513,12 @@ void angelkds_state::machine_reset()
MACHINE_CONFIG_START(angelkds_state::angelkds)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_6MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", angelkds_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("sub", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(sub_map)
MCFG_CPU_IO_MAP(sub_portmap)
@@ -551,14 +551,14 @@ MACHINE_CONFIG_START(angelkds_state::angelkds)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_4MHz)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(4'000'000))
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("sub", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.65)
MCFG_SOUND_ROUTE(1, "mono", 0.65)
MCFG_SOUND_ROUTE(2, "mono", 0.65)
MCFG_SOUND_ROUTE(3, "mono", 0.45)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_4MHz)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(4'000'000))
MCFG_SOUND_ROUTE(0, "mono", 0.65)
MCFG_SOUND_ROUTE(1, "mono", 0.65)
MCFG_SOUND_ROUTE(2, "mono", 0.65)
@@ -567,7 +567,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(angelkds_state::spcpostn, angelkds)
/* encryption */
- MCFG_CPU_REPLACE("maincpu", SEGA_317_0005, XTAL_6MHz)
+ MCFG_CPU_REPLACE("maincpu", SEGA_317_0005, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", angelkds_state, irq0_line_hold)
diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp
index f20879d0936..a02ba94bcf1 100644
--- a/src/mame/drivers/apc.cpp
+++ b/src/mame/drivers/apc.cpp
@@ -67,7 +67,7 @@
#include "speaker.h"
//#include "sound/ay8910.h"
-#define MAIN_CLOCK XTAL_5MHz
+#define MAIN_CLOCK XTAL(5'000'000)
class apc_state : public driver_device
{
@@ -946,7 +946,7 @@ MACHINE_CONFIG_START(apc_state::apc)
MCFG_I8237_OUT_DACK_3_CB(WRITELINE(apc_state, apc_dack3_w))
MCFG_NVRAM_ADD_1FILL("cmos")
- MCFG_UPD1990A_ADD("upd1990a", XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD1990A_ADD("upd1990a", XTAL(32'768), NOOP, NOOP)
MCFG_UPD765A_ADD("upd765", true, true)
MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic8259_slave", pic8259_device, ir4_w))
diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp
index 1d0ef3dfad2..d381df67c79 100644
--- a/src/mame/drivers/apf.cpp
+++ b/src/mame/drivers/apf.cpp
@@ -513,13 +513,13 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(apf_state::apfm1000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_3_579545MHz / 4 ) // divided by 4 in external clock circuit
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(3'579'545) / 4 ) // divided by 4 in external clock circuit
MCFG_CPU_PROGRAM_MAP(apfm1000_map)
/* video hardware */
MCFG_SCREEN_MC6847_NTSC_ADD("screen", "mc6847")
- MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, XTAL_3_579545MHz)
+ MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, XTAL(3'579'545))
MCFG_MC6847_FSYNC_CALLBACK(DEVWRITELINE("pia0", pia6821_device, cb1_w))
MCFG_MC6847_INPUT_CALLBACK(READ8(apf_state, videoram_r))
MCFG_MC6847_FIXED_MODE(mc6847_ntsc_device::MODE_GM2 | mc6847_ntsc_device::MODE_GM1)
diff --git a/src/mame/drivers/apogee.cpp b/src/mame/drivers/apogee.cpp
index 0fc0b837bd5..8ccee7f2fb3 100644
--- a/src/mame/drivers/apogee.cpp
+++ b/src/mame/drivers/apogee.cpp
@@ -215,16 +215,16 @@ GFXDECODE_END
/* Machine driver */
MACHINE_CONFIG_START(apogee_state::apogee)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_16MHz / 9)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
MCFG_CPU_PROGRAM_MAP(apogee_mem)
MCFG_MACHINE_RESET_OVERRIDE(apogee_state, radio86 )
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_16MHz/9)
+ MCFG_PIT8253_CLK0(XTAL(16'000'000)/9)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(apogee_state,pit8253_out0_changed))
- MCFG_PIT8253_CLK1(XTAL_16MHz/9)
+ MCFG_PIT8253_CLK1(XTAL(16'000'000)/9)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(apogee_state,pit8253_out1_changed))
- MCFG_PIT8253_CLK2(XTAL_16MHz/9)
+ MCFG_PIT8253_CLK2(XTAL(16'000'000)/9)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(apogee_state,pit8253_out2_changed))
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
@@ -235,7 +235,7 @@ MACHINE_CONFIG_START(apogee_state::apogee)
//MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_DEVICE_ADD("i8275", I8275, XTAL_16MHz / 12)
+ MCFG_DEVICE_ADD("i8275", I8275, XTAL(16'000'000) / 12)
MCFG_I8275_CHARACTER_WIDTH(6)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(apogee_state, display_pixels)
MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma8257",i8257_device, dreq2_w))
@@ -258,7 +258,7 @@ MACHINE_CONFIG_START(apogee_state::apogee)
MCFG_SPEAKER_LEVELS(4, speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_DEVICE_ADD("dma8257", I8257, XTAL_16MHz / 9)
+ MCFG_DEVICE_ADD("dma8257", I8257, XTAL(16'000'000) / 9)
MCFG_I8257_OUT_HRQ_CB(WRITELINE(radio86_state, hrq_w))
MCFG_I8257_IN_MEMR_CB(READ8(radio86_state, memory_read_byte))
MCFG_I8257_OUT_MEMW_CB(WRITE8(radio86_state, memory_write_byte))
diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp
index faf37205dad..903a3b598c6 100644
--- a/src/mame/drivers/apple1.cpp
+++ b/src/mame/drivers/apple1.cpp
@@ -592,7 +592,7 @@ MACHINE_CONFIG_START(apple1_state::apple1)
// video timings are identical to the Apple II, unsurprisingly
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz, (65*7)*2, 0, (40*7)*2, 262, 0, 192)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181), (65*7)*2, 0, (40*7)*2, 262, 0, 192)
MCFG_SCREEN_UPDATE_DRIVER(apple1_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp
index aa7decd6ed6..bdd1d117e87 100644
--- a/src/mame/drivers/apple2.cpp
+++ b/src/mame/drivers/apple2.cpp
@@ -1365,7 +1365,7 @@ MACHINE_CONFIG_START(napple2_state::apple2_common)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", napple2_state, apple2_interrupt, "screen", 0, 1)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_DEVICE_ADD(A2_VIDEO_TAG, APPLE2_VIDEO, XTAL_14_31818MHz)
+ MCFG_DEVICE_ADD(A2_VIDEO_TAG, APPLE2_VIDEO, XTAL(14'318'181))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(1021800*14, (65*7)*2, 0, (40*7)*2, 262, 0, 192)
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index 8fb88629dd6..84a96caf037 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -3853,7 +3853,7 @@ MACHINE_CONFIG_START(apple2e_state::apple2e)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", apple2e_state, apple2_interrupt, "screen", 0, 1)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_DEVICE_ADD(A2_VIDEO_TAG, APPLE2_VIDEO, XTAL_14_31818MHz)
+ MCFG_DEVICE_ADD(A2_VIDEO_TAG, APPLE2_VIDEO, XTAL(14'318'181))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(1021800*14, (65*7)*2, 0, (40*7)*2, 262, 0, 192)
@@ -4018,7 +4018,7 @@ MACHINE_CONFIG_DERIVED(apple2e_state::apple2ee, apple2e)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(apple2e_state::spectred, apple2e)
- MCFG_CPU_ADD("keyb_mcu", I8035, XTAL_4MHz) /* guessed frequency */
+ MCFG_CPU_ADD("keyb_mcu", I8035, XTAL(4'000'000)) /* guessed frequency */
MCFG_CPU_PROGRAM_MAP(spectred_keyb_map)
//TODO: implement the actual interfacing to this 8035 MCU and
@@ -4054,11 +4054,11 @@ MACHINE_CONFIG_DERIVED(apple2e_state::apple2c, apple2ee)
MCFG_A2BUS_SLOT_REMOVE("sl7")
MCFG_DEVICE_ADD(IIC_ACIA1_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_14_31818MHz / 8) // ~1.789 MHz
+ MCFG_MOS6551_XTAL(XTAL(14'318'181) / 8) // ~1.789 MHz
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_txd))
MCFG_DEVICE_ADD(IIC_ACIA2_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz) // matches SSC so modem software is compatible
+ MCFG_MOS6551_XTAL(XTAL(1'843'200)) // matches SSC so modem software is compatible
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("modem", rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD(PRINTER_PORT_TAG, default_rs232_devices, nullptr)
diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp
index 92c9b13e225..e1ece633c59 100644
--- a/src/mame/drivers/apple2gs.cpp
+++ b/src/mame/drivers/apple2gs.cpp
@@ -250,9 +250,9 @@ WRITE8_MEMBER(apple2gs_state::adbmicro_p3_out)
{
if (((data & 0x08) == 0x08) != m_adb_line)
{
- m_adb_dtime = (int)(machine().time().as_ticks(XTAL_3_579545MHz*2) - m_last_adb_time);
+ m_adb_dtime = (int)(machine().time().as_ticks(XTAL(3'579'545)*2) - m_last_adb_time);
// printf("ADB change to %d (dtime %d)\n", (data>>3) & 1, m_adb_dtime);
- m_last_adb_time = machine().time().as_ticks(XTAL_3_579545MHz*2);
+ m_last_adb_time = machine().time().as_ticks(XTAL(3'579'545)*2);
m_adb_line = (data & 0x8) ? true : false;
}
}
@@ -312,7 +312,7 @@ MACHINE_CONFIG_START(apple2gs_state::apple2gs)
MCFG_CPU_ADD("maincpu", G65816, APPLE2GS_14M/5)
MCFG_CPU_PROGRAM_MAP(apple2gs_map)
#if RUN_ADB_MICRO
- MCFG_CPU_ADD(ADBMICRO_TAG, M50741, XTAL_3_579545MHz)
+ MCFG_CPU_ADD(ADBMICRO_TAG, M50741, XTAL(3'579'545))
MCFG_M5074X_PORT0_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p0_in))
MCFG_M5074X_PORT0_WRITE_CALLBACK(WRITE8(apple2gs_state, adbmicro_p0_out))
MCFG_M5074X_PORT1_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p1_in))
@@ -419,7 +419,7 @@ MACHINE_CONFIG_DERIVED(apple2gs_state::apple2gsr1, apple2gs)
MCFG_MACHINE_START_OVERRIDE(apple2gs_state, apple2gsr1 )
#if RUN_ADB_MICRO
- MCFG_CPU_REPLACE(ADBMICRO_TAG, M50740, XTAL_3_579545MHz)
+ MCFG_CPU_REPLACE(ADBMICRO_TAG, M50740, XTAL(3'579'545))
MCFG_M5074X_PORT0_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p0_in))
MCFG_M5074X_PORT0_WRITE_CALLBACK(WRITE8(apple2gs_state, adbmicro_p0_out))
MCFG_M5074X_PORT1_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p1_in))
diff --git a/src/mame/drivers/apple3.cpp b/src/mame/drivers/apple3.cpp
index 44b0347afeb..879a30c77fb 100644
--- a/src/mame/drivers/apple3.cpp
+++ b/src/mame/drivers/apple3.cpp
@@ -115,7 +115,7 @@ MACHINE_CONFIG_START(apple3_state::apple3)
/* acia */
MCFG_DEVICE_ADD("acia", MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz) // HACK: The schematic shows an external clock generator but using a XTAL is faster to emulate.
+ MCFG_MOS6551_XTAL(XTAL(1'843'200)) // HACK: The schematic shows an external clock generator but using a XTAL is faster to emulate.
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(apple3_state, apple3_acia_irq_func))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -131,7 +131,7 @@ MACHINE_CONFIG_START(apple3_state::apple3)
MCFG_TIMER_DRIVER_ADD("pdltimer", apple3_state, paddle_timer);
/* rtc */
- MCFG_DEVICE_ADD("rtc", MM58167, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768))
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000)
diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp
index 30671715471..bfe3dfcf0d8 100644
--- a/src/mame/drivers/applix.cpp
+++ b/src/mame/drivers/applix.cpp
@@ -836,9 +836,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(applix_state::cass_timer)
MACHINE_CONFIG_START(applix_state::applix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_30MHz / 4) // MC68000-P10 @ 7.5 MHz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(30'000'000) / 4) // MC68000-P10 @ 7.5 MHz
MCFG_CPU_PROGRAM_MAP(applix_mem)
- MCFG_CPU_ADD("subcpu", Z80, XTAL_16MHz / 2) // Z80H
+ MCFG_CPU_ADD("subcpu", Z80, XTAL(16'000'000) / 2) // Z80H
MCFG_CPU_PROGRAM_MAP(subcpu_mem)
MCFG_CPU_IO_MAP(subcpu_io)
MCFG_CPU_ADD("kbdcpu", I8051, 11060250)
@@ -867,13 +867,13 @@ MACHINE_CONFIG_START(applix_state::applix)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
/* Devices */
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_30MHz / 16) // MC6545 @ 1.875 MHz
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(30'000'000) / 16) // MC6545 @ 1.875 MHz
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(applix_state, crtc_update_row)
MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(applix_state, vsync_w))
- MCFG_DEVICE_ADD("via6522", VIA6522, XTAL_30MHz / 4 / 10) // VIA uses 68000 E clock
+ MCFG_DEVICE_ADD("via6522", VIA6522, XTAL(30'000'000) / 4 / 10) // VIA uses 68000 E clock
MCFG_VIA6522_READPB_HANDLER(READ8(applix_state, applix_pb_r))
// in CB1 kbd clk
// in CA2 vsync
@@ -891,7 +891,7 @@ MACHINE_CONFIG_START(applix_state::applix)
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
- MCFG_WD1772_ADD("fdc", XTAL_16MHz / 2) //connected to Z80H clock pin
+ MCFG_WD1772_ADD("fdc", XTAL(16'000'000) / 2) //connected to Z80H clock pin
MCFG_FLOPPY_DRIVE_ADD("fdc:0", applix_floppies, "35dd", applix_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", applix_floppies, "35dd", applix_state::floppy_formats)
diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp
index cc4ffc38c85..774d48d7058 100644
--- a/src/mame/drivers/apricot.cpp
+++ b/src/mame/drivers/apricot.cpp
@@ -188,7 +188,7 @@ WRITE8_MEMBER( apricot_state::i8255_portb_w )
floppy->mon_w(0);
// switch video modes
- m_crtc->set_clock(m_video_mode ? XTAL_15MHz / 10 : XTAL_15MHz / 16);
+ m_crtc->set_clock(m_video_mode ? XTAL(15'000'000) / 10 : XTAL(15'000'000) / 16);
m_crtc->set_hpixels_per_column(m_video_mode ? 10 : 16);
// PB7 Centronics transceiver direction. 0 = output, 1 = input
@@ -352,14 +352,14 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(apricot_state::apricot)
// main cpu
- MCFG_CPU_ADD("ic91", I8086, XTAL_15MHz / 3)
+ MCFG_CPU_ADD("ic91", I8086, XTAL(15'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(apricot_mem)
MCFG_CPU_IO_MAP(apricot_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("ic31", pic8259_device, inta_cb)
MCFG_I8086_LOCK_HANDLER(WRITELINE(apricot_state, i8086_lock_w))
// i/o cpu
- MCFG_CPU_ADD("ic71", I8089, XTAL_15MHz / 3)
+ MCFG_CPU_ADD("ic71", I8089, XTAL(15'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(apricot_mem)
MCFG_CPU_IO_MAP(apricot_io)
MCFG_I8089_DATA_WIDTH(16)
@@ -379,7 +379,7 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
- MCFG_MC6845_ADD("ic30", HD6845, "screen", XTAL_15MHz / 10)
+ MCFG_MC6845_ADD("ic30", HD6845, "screen", XTAL(15'000'000) / 10)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(10)
MCFG_MC6845_UPDATE_ROW_CB(apricot_state, crtc_update_row)
@@ -387,7 +387,7 @@ MACHINE_CONFIG_START(apricot_state::apricot)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ic7", SN76489, XTAL_4MHz / 2)
+ MCFG_SOUND_ADD("ic7", SN76489, XTAL(4'000'000) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
// devices
@@ -402,11 +402,11 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("ic91", 0))
MCFG_DEVICE_ADD("ic16", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_4MHz / 16)
+ MCFG_PIT8253_CLK0(XTAL(4'000'000) / 16)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("ic31", pic8259_device, ir6_w))
- MCFG_PIT8253_CLK1(XTAL_4MHz / 2)
+ MCFG_PIT8253_CLK1(XTAL(4'000'000) / 2)
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("ic14", ttl153_device, i0a_w))
- MCFG_PIT8253_CLK2(XTAL_4MHz / 2)
+ MCFG_PIT8253_CLK2(XTAL(4'000'000) / 2)
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("ic14", ttl153_device, i0b_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ic14", ttl153_device, i2a_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ic14", ttl153_device, i2b_w))
@@ -415,10 +415,10 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_TTL153_ZA_CB(DEVWRITELINE("ic15", z80sio_device, rxca_w))
MCFG_TTL153_ZB_CB(DEVWRITELINE("ic15", z80sio_device, txca_w))
- MCFG_CLOCK_ADD("ic15_rxtxcb", XTAL_4MHz / 16)
+ MCFG_CLOCK_ADD("ic15_rxtxcb", XTAL(4'000'000) / 16)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ic15", z80sio_device, rxtxcb_w))
- MCFG_DEVICE_ADD("ic15", Z80SIO, XTAL_15MHz / 6)
+ MCFG_DEVICE_ADD("ic15", Z80SIO, XTAL(15'000'000) / 6)
MCFG_Z80SIO_CPU("ic91")
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
@@ -454,7 +454,7 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
// floppy
- MCFG_WD2797_ADD("ic68", XTAL_4MHz / 2)
+ MCFG_WD2797_ADD("ic68", XTAL(4'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(apricot_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("ic71", i8089_device, drq1_w))
MCFG_FLOPPY_DRIVE_ADD("ic68:0", apricot_floppies, "d32w", apricot_state::floppy_formats)
diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp
index 29ec8a3a295..1a0369f40fd 100644
--- a/src/mame/drivers/apricotf.cpp
+++ b/src/mame/drivers/apricotf.cpp
@@ -332,7 +332,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(f1_state::act_f1)
/* basic machine hardware */
- MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_14MHz/4)
+ MCFG_CPU_ADD(I8086_TAG, I8086, XTAL(14'000'000)/4)
MCFG_CPU_PROGRAM_MAP(act_f1_mem)
MCFG_CPU_IO_MAP(act_f1_io)
@@ -368,7 +368,7 @@ MACHINE_CONFIG_START(f1_state::act_f1)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
// floppy
- MCFG_WD2797_ADD(WD2797_TAG, XTAL_4MHz / 2 /* ? */)
+ MCFG_WD2797_ADD(WD2797_TAG, XTAL(4'000'000) / 2 /* ? */)
MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(I8086_TAG, INPUT_LINE_NMI))
MCFG_WD_FDC_DRQ_CALLBACK(INPUTLINE(I8086_TAG, INPUT_LINE_TEST))
diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp
index 77fe340d911..38fb1e435d0 100644
--- a/src/mame/drivers/apricotp.cpp
+++ b/src/mame/drivers/apricotp.cpp
@@ -577,7 +577,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(fp_state::fp)
/* basic machine hardware */
- MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_15MHz/3)
+ MCFG_CPU_ADD(I8086_TAG, I8086, XTAL(15'000'000)/3)
MCFG_CPU_PROGRAM_MAP(fp_mem)
MCFG_CPU_IO_MAP(fp_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb)
diff --git a/src/mame/drivers/aquarium.cpp b/src/mame/drivers/aquarium.cpp
index ba8f2cf66c7..f502b90a23d 100644
--- a/src/mame/drivers/aquarium.cpp
+++ b/src/mame/drivers/aquarium.cpp
@@ -287,11 +287,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(aquarium_state::aquarium)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // clock not verified on pcb
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) // clock not verified on pcb
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aquarium_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/6) // clock not verified on pcb
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/6) // clock not verified on pcb
MCFG_CPU_PROGRAM_MAP(snd_map)
MCFG_CPU_IO_MAP(snd_portmap)
@@ -320,12 +320,12 @@ MACHINE_CONFIG_START(aquarium_state::aquarium)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) // clock not verified on pcb
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) // clock not verified on pcb
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp
index 3a98374f985..95977aca0a8 100644
--- a/src/mame/drivers/aquarius.cpp
+++ b/src/mame/drivers/aquarius.cpp
@@ -33,7 +33,7 @@
***************************************************************************/
#define XTAL1 8866000
-#define XTAL2 XTAL_7_15909MHz
+#define XTAL2 XTAL(7'159'090)
/***************************************************************************
@@ -349,7 +349,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(aquarius_state::aquarius)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) // ???
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545)) // ???
MCFG_CPU_PROGRAM_MAP(aquarius_mem)
MCFG_CPU_IO_MAP(aquarius_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aquarius_state, irq0_line_hold)
@@ -364,7 +364,7 @@ MACHINE_CONFIG_START(aquarius_state::aquarius)
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", aquarius )
- MCFG_TEA1002_ADD("encoder", XTAL_8_867238MHz)
+ MCFG_TEA1002_ADD("encoder", XTAL(8'867'238))
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INDIRECT_ENTRIES(16)
MCFG_PALETTE_INIT_OWNER(aquarius_state, aquarius)
@@ -374,7 +374,7 @@ MACHINE_CONFIG_START(aquarius_state::aquarius)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL_3_579545MHz/2) // ??? AY-3-8914
+ MCFG_SOUND_ADD("ay8910", AY8910, XTAL(3'579'545)/2) // ??? AY-3-8914
MCFG_AY8910_PORT_A_READ_CB(IOPORT("RIGHT"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("LEFT"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/arabian.cpp b/src/mame/drivers/arabian.cpp
index 9f7589e81be..d12ecc3ff8a 100644
--- a/src/mame/drivers/arabian.cpp
+++ b/src/mame/drivers/arabian.cpp
@@ -55,7 +55,7 @@
/* constants */
-#define MAIN_OSC XTAL_12MHz
+#define MAIN_OSC XTAL(12'000'000)
/*************************************
diff --git a/src/mame/drivers/arachnid.cpp b/src/mame/drivers/arachnid.cpp
index 55ebbe329ea..2954a7185ad 100644
--- a/src/mame/drivers/arachnid.cpp
+++ b/src/mame/drivers/arachnid.cpp
@@ -420,7 +420,7 @@ void arachnid_state::machine_start()
MACHINE_CONFIG_START(arachnid_state::arachnid)
// basic machine hardware
- MCFG_CPU_ADD(M6809_TAG, M6809, XTAL_1MHz)
+ MCFG_CPU_ADD(M6809_TAG, M6809, XTAL(1'000'000))
MCFG_CPU_PROGRAM_MAP(arachnid_map)
// devices
@@ -441,7 +441,7 @@ MACHINE_CONFIG_START(arachnid_state::arachnid)
MCFG_PIA_CB2_HANDLER(WRITELINE(arachnid_state, pia_u17_pcb_w))
// video hardware
- MCFG_DEVICE_ADD( TMS9118_TAG, TMS9118, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( TMS9118_TAG, TMS9118, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE(M6809_TAG, INPUT_LINE_IRQ0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
@@ -452,7 +452,7 @@ MACHINE_CONFIG_START(arachnid_state::arachnid)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, XTAL(8'000'000) / 4)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
MCFG_PTM6840_OUT0_CB(WRITELINE(arachnid_state, ptm_o1_callback))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/arcadecl.cpp b/src/mame/drivers/arcadecl.cpp
index faed251705b..9e7a561dc46 100644
--- a/src/mame/drivers/arcadecl.cpp
+++ b/src/mame/drivers/arcadecl.cpp
@@ -78,7 +78,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_14_31818MHz
+#define MASTER_CLOCK XTAL(14'318'181)
/*************************************
diff --git a/src/mame/drivers/argox.cpp b/src/mame/drivers/argox.cpp
index e506809fb36..3bb61dc086b 100644
--- a/src/mame/drivers/argox.cpp
+++ b/src/mame/drivers/argox.cpp
@@ -66,7 +66,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(os214_state::os214)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83002, XTAL_16MHz) /* X1 xtal value is correct,
+ MCFG_CPU_ADD("maincpu", H83002, XTAL(16'000'000)) /* X1 xtal value is correct,
but there can be some clock divider perhaps ? */
MCFG_CPU_PROGRAM_MAP(os214_prg_map)
MCFG_CPU_IO_MAP(os214_io_map)
diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp
index baae97d1c35..3d14c757d8c 100644
--- a/src/mame/drivers/aristmk4.cpp
+++ b/src/mame/drivers/aristmk4.cpp
@@ -315,7 +315,7 @@
***********************************************************************************************************************************************/
-#define MAIN_CLOCK XTAL_12MHz
+#define MAIN_CLOCK XTAL(12'000'000)
#include "emu.h"
#include "cpu/m6809/m6809.h"
@@ -1798,7 +1798,7 @@ MACHINE_CONFIG_START(aristmk4_state::aristmk4)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
- MCFG_MC146818_ADD( "rtc", XTAL_4_194304Mhz )
+ MCFG_MC146818_ADD( "rtc", XTAL(4'194'304) )
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp
index abf9e74827a..ba75ccc9184 100644
--- a/src/mame/drivers/aristmk5.cpp
+++ b/src/mame/drivers/aristmk5.cpp
@@ -465,7 +465,7 @@
#include "swhr2u.lh" // 5 1, 2, 3, 4, 5 25
#include "wnpost.lh" // 5 1, 2, 3, 5, 10 50
-#define MASTER_CLOCK XTAL_72MHz /* confirmed */
+#define MASTER_CLOCK XTAL(72'000'000) /* confirmed */
class aristmk5_state : public archimedes_state
{
@@ -594,7 +594,7 @@ WRITE8_MEMBER(aristmk5_state::spi_data_w)
m_spi_bits = 0;
// start the SPI clock
- m_spi_timer->adjust(attotime::from_hz((double)MASTER_CLOCK / 9 / 512 / 2), 0, attotime::from_hz((double)MASTER_CLOCK / 9 / 512 / 2));
+ m_spi_timer->adjust(attotime::from_hz(MASTER_CLOCK / 9 / 512 / 2), 0, attotime::from_hz(MASTER_CLOCK / 9 / 512 / 2));
}
READ8_MEMBER(aristmk5_state::spi_data_r)
@@ -750,7 +750,7 @@ READ32_MEMBER(aristmk5_state::Ns5x58)
// reset 2KHz timer
- m_mk5_2KHz_timer->adjust(attotime::from_hz((double)MASTER_CLOCK / 9 / 4096));
+ m_mk5_2KHz_timer->adjust(attotime::from_hz(MASTER_CLOCK / 9 / 4096));
archimedes_clear_irq_a(0x01);
return 0xffffffff;
}
@@ -1980,7 +1980,7 @@ void aristmk5_state::machine_start()
void aristmk5_state::machine_reset()
{
archimedes_reset();
- m_mk5_2KHz_timer->adjust(attotime::from_hz((double)MASTER_CLOCK / 9 / 4096)); // 8MHz / 4096
+ m_mk5_2KHz_timer->adjust(attotime::from_hz(MASTER_CLOCK / 9 / 4096)); // 8MHz / 4096
m_mk5_VSYNC_timer->adjust(attotime::from_hz(50000)); // default bit 1 & bit 2 == 0
m_ioc_regs[IRQ_STATUS_B] |= 0x40; //hack, set keyboard irq empty to be ON
@@ -2066,7 +2066,7 @@ MACHINE_CONFIG_START(aristmk5_state::aristmk5)
MCFG_INPUT_MERGER_ANY_HIGH("uart_irq")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(aristmk5_state, uart_irq_callback))
- MCFG_DS1302_ADD("rtc", XTAL_32_768kHz)
+ MCFG_DS1302_ADD("rtc", XTAL(32'768))
MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index a60b30d7afd..f54d56f482f 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -316,7 +316,7 @@ static INPUT_PORTS_START( aristmk6 )
INPUT_PORTS_END
// ?
-#define ARISTMK6_CPU_CLOCK XTAL_200MHz
+#define ARISTMK6_CPU_CLOCK XTAL(200'000'000)
// ?
MACHINE_CONFIG_START(aristmk6_state::aristmk6)
@@ -338,8 +338,8 @@ MACHINE_CONFIG_START(aristmk6_state::aristmk6)
MCFG_CPU_FORCE_NO_DRC()
// MCFG_DEVICE_DISABLE()
- MCFG_DEVICE_ADD( "uart0", NS16550, XTAL_8MHz )
- MCFG_DEVICE_ADD( "uart1", NS16550, XTAL_8MHz )
+ MCFG_DEVICE_ADD( "uart0", NS16550, XTAL(8'000'000) )
+ MCFG_DEVICE_ADD( "uart1", NS16550, XTAL(8'000'000) )
MCFG_EEPROM_SERIAL_93C56_ADD("eeprom0")
MCFG_EEPROM_SERIAL_DEFAULT_VALUE(0xFF)
diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp
index c95fcc34c0e..bd4df7e52d3 100644
--- a/src/mame/drivers/arkanoid.cpp
+++ b/src/mame/drivers/arkanoid.cpp
@@ -1325,7 +1325,7 @@ void arkanoid_state::machine_reset()
/*
Pixel clock: 3 MHz = 192 HTotal, assuming it's 6 MHz
*/
-#define ARKANOID_PIXEL_CLOCK XTAL_12MHz/2
+#define ARKANOID_PIXEL_CLOCK XTAL(12'000'000)/2
#define ARKANOID_HTOTAL 384
#define ARKANOID_HBEND 0
#define ARKANOID_HBSTART 256
@@ -1336,14 +1336,14 @@ Pixel clock: 3 MHz = 192 HTotal, assuming it's 6 MHz
MACHINE_CONFIG_START(arkanoid_state::arkanoid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(arkanoid_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 128); // 74LS393 at ic21, counts 128 vblanks before firing watchdog; z80 /RESET ls08 ic19 pin 9 input comes from ls04 ic20 pin 8, ls04 ic20 pin 9 input comes from ic21 ls393 pin 8, and ls393 is set to chain both 4 bit counters together
- MCFG_DEVICE_ADD("mcu", ARKANOID_68705P5, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("mcu", ARKANOID_68705P5, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_ARKANOID_MCU_PORTB_R_CB(IOPORT("MUX"))
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per second to synchronize between the MCU and the main CPU
@@ -1364,7 +1364,7 @@ MACHINE_CONFIG_START(arkanoid_state::arkanoid)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL_12MHz/4) /* YM2149 clock is 3mhz, pin 26 is low so final clock is 3mhz/2, handled inside the ay core */
+ MCFG_SOUND_ADD("aysnd", YM2149, XTAL(12'000'000)/4) /* YM2149 clock is 3mhz, pin 26 is low so final clock is 3mhz/2, handled inside the ay core */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | YM2149_PIN26_LOW) // all outputs are tied together with no resistors, and pin 26 is low
MCFG_AY8910_PORT_A_READ_CB(IOPORT("UNUSED"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
@@ -1374,17 +1374,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(arkanoid_state::p3mcu, arkanoid)
/* unprotected MCU */
- MCFG_DEVICE_REPLACE("mcu", ARKANOID_68705P3, XTAL_12MHz/4)
+ MCFG_DEVICE_REPLACE("mcu", ARKANOID_68705P3, XTAL(12'000'000)/4)
MCFG_ARKANOID_MCU_PORTB_R_CB(IOPORT("MUX"))
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(arkanoid_state::p3mcuay, arkanoid)
/* unprotected MCU */
- MCFG_DEVICE_REPLACE("mcu", ARKANOID_68705P3, XTAL_12MHz/4)
+ MCFG_DEVICE_REPLACE("mcu", ARKANOID_68705P3, XTAL(12'000'000)/4)
MCFG_ARKANOID_MCU_PORTB_R_CB(IOPORT("MUX"))
- MCFG_SOUND_REPLACE("aysnd", AY8910, XTAL_12MHz/4) // AY-3-8910A
+ MCFG_SOUND_REPLACE("aysnd", AY8910, XTAL(12'000'000)/4) // AY-3-8910A
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("UNUSED"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
@@ -1401,7 +1401,7 @@ MACHINE_CONFIG_DERIVED(arkanoid_state::bootleg, arkanoid)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(arkanoid_state::aysnd, bootleg)
- MCFG_SOUND_REPLACE("aysnd", AY8910, XTAL_12MHz/4)
+ MCFG_SOUND_REPLACE("aysnd", AY8910, XTAL(12'000'000)/4)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("UNUSED"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
@@ -1412,7 +1412,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(arkanoid_state::hexa)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Imported from arkanoid - correct? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* Imported from arkanoid - correct? */
MCFG_CPU_PROGRAM_MAP(hexa_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
@@ -1433,7 +1433,7 @@ MACHINE_CONFIG_START(arkanoid_state::hexa)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_12MHz/4/2) /* Imported from arkanoid - correct? */
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(12'000'000)/4/2) /* Imported from arkanoid - correct? */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("INPUTS"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -1444,7 +1444,7 @@ MACHINE_CONFIG_DERIVED(arkanoid_state::hexaa, hexa)
MCFG_CPU_PROGRAM_MAP(hexaa_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
- MCFG_CPU_ADD("subcpu", Z80, XTAL_12MHz/2) // ?
+ MCFG_CPU_ADD("subcpu", Z80, XTAL(12'000'000)/2) // ?
MCFG_CPU_PROGRAM_MAP(hexaa_sub_map)
MCFG_CPU_IO_MAP(hexaa_sub_iomap)
MACHINE_CONFIG_END
@@ -1453,7 +1453,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(arkanoid_state::brixian)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2)
MCFG_CPU_PROGRAM_MAP(brixian_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
@@ -1475,7 +1475,7 @@ MACHINE_CONFIG_START(arkanoid_state::brixian)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_12MHz/4/2) /* Imported from arkanoid - correct? */
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(12'000'000)/4/2) /* Imported from arkanoid - correct? */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("INPUTS"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp
index 94224001ec9..96bfa3e3264 100644
--- a/src/mame/drivers/armedf.cpp
+++ b/src/mame/drivers/armedf.cpp
@@ -1238,16 +1238,16 @@ MACHINE_RESET_MEMBER(armedf_state,armedf)
MACHINE_CONFIG_START(armedf_state::terraf_sound)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_24MHz/6) // 4mhz
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // 4mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8) // 10-pin SIP with 74HC374P latch
@@ -1260,7 +1260,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::terraf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz?
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz?
MCFG_CPU_PROGRAM_MAP(terraf_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
@@ -1295,16 +1295,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::terrafjb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(terraf_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
- MCFG_CPU_ADD("extra", Z80, XTAL_16MHz/4) // 4mhz?
+ MCFG_CPU_ADD("extra", Z80, XTAL(16'000'000)/4) // 4mhz?
MCFG_CPU_PROGRAM_MAP(terrafjb_extraz80_map)
MCFG_CPU_IO_MAP(terrafjb_extraz80_portmap)
@@ -1334,7 +1334,7 @@ MACHINE_CONFIG_START(armedf_state::terrafjb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_24MHz/6) // 4mhz
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // 4mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8) // unknown DAC
@@ -1351,7 +1351,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::kozure)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(kozure_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
@@ -1385,14 +1385,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::armedf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(armedf_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1420,7 +1420,7 @@ MACHINE_CONFIG_START(armedf_state::armedf)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_24MHz/6) // 4mhz
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // 4mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
@@ -1433,14 +1433,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::cclimbr2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(cclimbr2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq2_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1470,7 +1470,7 @@ MACHINE_CONFIG_START(armedf_state::cclimbr2)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_24MHz/6) // or YM3526?
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // or YM3526?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
@@ -1483,14 +1483,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::legion)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(legion_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq2_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
MCFG_CPU_IO_MAP(sound_3526_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1520,7 +1520,7 @@ MACHINE_CONFIG_START(armedf_state::legion)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL_24MHz/6) // 4mhz
+ MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(24'000'000)/6) // 4mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // 10-pin SIP with 74HC374P latch
@@ -1533,14 +1533,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::legionjb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(legionjb_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq2_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1568,7 +1568,7 @@ MACHINE_CONFIG_START(armedf_state::legionjb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_24MHz/6) // or YM3526?
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // or YM3526?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
@@ -1580,11 +1580,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bigfghtr_state::bigfghtr)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // verified
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // verified
MCFG_CPU_PROGRAM_MAP(bigfghtr_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
- MCFG_CPU_ADD("mcu", I8751, XTAL_16MHz/2) // verified
+ MCFG_CPU_ADD("mcu", I8751, XTAL(16'000'000)/2) // verified
MCFG_CPU_PROGRAM_MAP(bigfghtr_mcu_map)
MCFG_CPU_IO_MAP(bigfghtr_mcu_io_map)
@@ -1593,7 +1593,7 @@ MACHINE_CONFIG_START(bigfghtr_state::bigfghtr)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz/2,531,12*8,(64-12)*8, 254, 1*8, 31*8) // guess, matches 59.3 Hz from reference - measured at 59.1358Hz
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000)/2,531,12*8,(64-12)*8, 254, 1*8, 31*8) // guess, matches 59.3 Hz from reference - measured at 59.1358Hz
MCFG_SCREEN_PALETTE("palette")
MCFG_VIDEO_START_OVERRIDE(armedf_state,armedf)
diff --git a/src/mame/drivers/artmagic.cpp b/src/mame/drivers/artmagic.cpp
index 7615b3f529a..ee7022c0884 100644
--- a/src/mame/drivers/artmagic.cpp
+++ b/src/mame/drivers/artmagic.cpp
@@ -38,8 +38,8 @@
#include "speaker.h"
-#define MASTER_CLOCK_40MHz (XTAL_40MHz)
-#define MASTER_CLOCK_25MHz (XTAL_25MHz)
+#define MASTER_CLOCK_40MHz (XTAL(40'000'000))
+#define MASTER_CLOCK_25MHz (XTAL(25'000'000))
/*************************************
diff --git a/src/mame/drivers/asterix.cpp b/src/mame/drivers/asterix.cpp
index 9d1da62fe81..bdd067c4775 100644
--- a/src/mame/drivers/asterix.cpp
+++ b/src/mame/drivers/asterix.cpp
@@ -260,11 +260,11 @@ void asterix_state::machine_reset()
MACHINE_CONFIG_START(asterix_state::asterix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) // 12MHz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) // 12MHz
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", asterix_state, asterix_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/4) // 8MHz Z80E ??
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/4) // 8MHz Z80E ??
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom")
@@ -297,11 +297,11 @@ MACHINE_CONFIG_START(asterix_state::asterix)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_32MHz/8) // 4MHz
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'000'000)/8) // 4MHz
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_K053260_ADD("k053260", XTAL_32MHz/8) // 4MHz
+ MCFG_K053260_ADD("k053260", XTAL(32'000'000)/8) // 4MHz
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp
index 0abbede0a58..b456b64fb1e 100644
--- a/src/mame/drivers/asteroid.cpp
+++ b/src/mame/drivers/asteroid.cpp
@@ -198,8 +198,8 @@ There is not a rev 03 known or dumped. An Asteroids rev 03 is not mentioned in a
#include "astdelux.lh"
-#define MASTER_CLOCK (XTAL_12_096MHz)
-#define CLOCK_3KHZ (double(MASTER_CLOCK) / 4096)
+#define MASTER_CLOCK (XTAL(12'096'000))
+#define CLOCK_3KHZ (MASTER_CLOCK / 4096)
/*************************************
*
@@ -716,7 +716,7 @@ MACHINE_CONFIG_DERIVED(asteroid_state::llander, asteroid_base)
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(llander_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(asteroid_state, llander_interrupt, (double)MASTER_CLOCK/4096/12)
+ MCFG_CPU_PERIODIC_INT_DRIVER(asteroid_state, llander_interrupt, MASTER_CLOCK/4096/12)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(CLOCK_3KHZ/12/6)
diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp
index 313f1bf8ad9..4c435e128e1 100644
--- a/src/mame/drivers/astinvad.cpp
+++ b/src/mame/drivers/astinvad.cpp
@@ -26,8 +26,8 @@ DIP locations verified for:
#include "speaker.h"
-#define MASTER_CLOCK XTAL_2MHz
-#define VIDEO_CLOCK XTAL_4_9152MHz
+#define MASTER_CLOCK XTAL(2'000'000)
+#define VIDEO_CLOCK XTAL(4'915'200)
/* sample sound IDs - must match sample file name table below */
diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp
index 9108e60b9ff..76146864009 100644
--- a/src/mame/drivers/astrcorp.cpp
+++ b/src/mame/drivers/astrcorp.cpp
@@ -489,7 +489,7 @@ static const uint16_t showhand_default_eeprom[15] = {0x0001,0x0007,0x000a,0x00
TODO: understand if later hardware uses different parameters (XTAL is almost surely NOT 20 MHz so ...). Also, weirdly enough, there's an unused
6x PAL XTAL according to notes, but VSync = 58,85 Hz?
*/
-#define ASTROCORP_PIXEL_CLOCK XTAL_20MHz/2
+#define ASTROCORP_PIXEL_CLOCK XTAL(20'000'000)/2
#define ASTROCORP_HTOTAL 651
#define ASTROCORP_HBEND 0
//#define ASTROCORP_HBSTART 320
@@ -500,7 +500,7 @@ TODO: understand if later hardware uses different parameters (XTAL is almost sur
MACHINE_CONFIG_START(astrocorp_state::showhand)
/* 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(showhand_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", astrocorp_state, irq4_line_hold)
@@ -527,7 +527,7 @@ MACHINE_CONFIG_START(astrocorp_state::showhand)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_20MHz/20, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(20'000'000)/20, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -552,7 +552,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(astrocorp_state::skilldrp_scanline)
MACHINE_CONFIG_START(astrocorp_state::skilldrp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) // JX-1689F1028N GRX586.V5
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) // JX-1689F1028N GRX586.V5
MCFG_CPU_PROGRAM_MAP(skilldrp_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", astrocorp_state, skilldrp_scanline, "screen", 0, 1)
@@ -581,7 +581,7 @@ MACHINE_CONFIG_START(astrocorp_state::skilldrp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/24, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000)/24, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp
index 239bc63c8aa..94ff5a56639 100644
--- a/src/mame/drivers/astrof.cpp
+++ b/src/mame/drivers/astrof.cpp
@@ -63,7 +63,7 @@
#include "cpu/m6502/m6502.h"
-#define MASTER_CLOCK (XTAL_10_595MHz)
+#define MASTER_CLOCK (XTAL(10'595'000))
#define MAIN_CPU_CLOCK (MASTER_CLOCK / 16)
#define PIXEL_CLOCK (MASTER_CLOCK / 2)
#define HTOTAL (0x150)
diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp
index 92736e2379f..b2958b925b2 100644
--- a/src/mame/drivers/asuka.cpp
+++ b/src/mame/drivers/asuka.cpp
@@ -835,7 +835,7 @@ MACHINE_CONFIG_START(asuka_state::bonzeadv)
MCFG_CPU_ADD("audiocpu", Z80,4000000) /* sound CPU, also required for test mode */
MCFG_CPU_PROGRAM_MAP(bonzeadv_z80_map)
- MCFG_TAITO_CCHIP_ADD("cchip", XTAL_12MHz/2) /* ? MHz */
+ MCFG_TAITO_CCHIP_ADD("cchip", XTAL(12'000'000)/2) /* ? MHz */
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -885,11 +885,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(asuka_state::asuka)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(asuka_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", asuka_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(z80_map)
@@ -934,13 +934,13 @@ MACHINE_CONFIG_START(asuka_state::asuka)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_16MHz/4) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(asuka_state,sound_bankswitch_2151_w))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_VCLK_CB(WRITELINE(asuka_state, asuka_msm5205_vck)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -956,11 +956,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(asuka_state::cadash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 68000p12 running at 16Mhz, verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 68000p12 running at 16Mhz, verified on pcb */
MCFG_CPU_PROGRAM_MAP(cadash_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", asuka_state, cadash_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cadash_z80_map)
MCFG_CPU_ADD("subcpu", Z180, 4000000) /* 4 MHz ??? */
@@ -1010,7 +1010,7 @@ MACHINE_CONFIG_START(asuka_state::cadash)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_8MHz/2) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(8'000'000)/2) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(asuka_state,sound_bankswitch_2151_w))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp
index 75a183ecca6..00548d1b4c1 100644
--- a/src/mame/drivers/at.cpp
+++ b/src/mame/drivers/at.cpp
@@ -364,7 +364,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(at_state::ibm5170)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80286, XTAL_12MHz/2 /*6000000*/)
+ MCFG_CPU_ADD("maincpu", I80286, XTAL(12'000'000)/2 /*6000000*/)
MCFG_CPU_PROGRAM_MAP(at16_map)
MCFG_CPU_IO_MAP(at16_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
@@ -389,7 +389,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(at_state::ibm5170a, ibm5170)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_16MHz/2)
+ MCFG_CPU_CLOCK(XTAL(16'000'000)/2)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(at_state::ec1842, ibm5170)
@@ -407,7 +407,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(at_state::ibmps1, ibm5170)
MCFG_MACHINE_START_OVERRIDE(at_state, vrom_fix)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_10MHz)
+ MCFG_CPU_CLOCK(XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(at16l_map)
MCFG_CPU_IO_MAP(ps1_16_io)
MCFG_DEVICE_MODIFY("isa1")
@@ -513,7 +513,7 @@ MACHINE_CONFIG_END
// Commodore PC 30-III
MACHINE_CONFIG_DERIVED(at_state::pc30iii, ibm5170)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(6000000) // should be XTAL_24MHz/2, but doesn't post with that setting
+ MCFG_CPU_CLOCK(6000000) // should be XTAL(24'000'000)/2, but doesn't post with that setting
MCFG_DEVICE_MODIFY("isa1")
MCFG_DEVICE_SLOT_INTERFACE(pc_isa16_cards, "vga", false) // should be ATI EGA Wonder 800+
MACHINE_CONFIG_END
@@ -521,18 +521,18 @@ MACHINE_CONFIG_END
// Commodore PC 40-III
MACHINE_CONFIG_DERIVED(at_state::pc40iii, ibm5170)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(6000000) // should be XTAL_24MHz/2, but doesn't post with that setting
+ MCFG_CPU_CLOCK(6000000) // should be XTAL(24'000'000)/2, but doesn't post with that setting
MCFG_DEVICE_MODIFY("isa1")
MCFG_DEVICE_SLOT_INTERFACE(pc_isa16_cards, "vga", false) // should be onboard Paradise VGA, see ROM declarations
MACHINE_CONFIG_END
MACHINE_CONFIG_START(megapc_state::megapc)
- MCFG_CPU_ADD("maincpu", I386SX, XTAL_50MHz / 2)
+ MCFG_CPU_ADD("maincpu", I386SX, XTAL(50'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(megapc_map)
MCFG_CPU_IO_MAP(megapc_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("wd7600", wd7600_device, intack_cb)
- MCFG_WD7600_ADD("wd7600",XTAL_50MHz / 2, ":maincpu", ":isa", ":bios", ":keybc")
+ MCFG_WD7600_ADD("wd7600",XTAL(50'000'000) / 2, ":maincpu", ":isa", ":bios", ":keybc")
MCFG_WD7600_HOLD(WRITELINE(megapc_state, wd7600_hold));
MCFG_WD7600_NMI(INPUTLINE("maincpu", INPUT_LINE_NMI));
MCFG_WD7600_INTR(INPUTLINE("maincpu", INPUT_LINE_IRQ0));
@@ -575,7 +575,7 @@ MACHINE_CONFIG_START(megapc_state::megapc)
// ISA cards
MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, nullptr, false)
- MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL_12MHz)
+ MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000))
MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(DEVWRITELINE("wd7600", wd7600_device, kbrst_w))
MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(DEVWRITELINE("wd7600", wd7600_device, gatea20_w))
MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("wd7600", wd7600_device, irq01_w))
@@ -689,7 +689,7 @@ MACHINE_CONFIG_END
// Compaq Portable III
MACHINE_CONFIG_START(at_state::comportiii)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80286, XTAL_48MHz/4 /*12000000*/)
+ MCFG_CPU_ADD("maincpu", I80286, XTAL(48'000'000)/4 /*12000000*/)
MCFG_CPU_PROGRAM_MAP(at16_map)
MCFG_CPU_IO_MAP(at16_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp
index 36519754105..fde4c670d00 100644
--- a/src/mame/drivers/atari_s1.cpp
+++ b/src/mame/drivers/atari_s1.cpp
@@ -56,7 +56,7 @@ ToDo:
#include "atari_s1.lh"
-#define MASTER_CLK XTAL_4MHz / 4
+#define MASTER_CLK XTAL(4'000'000) / 4
#define DMA_CLK MASTER_CLK / 2
#define AUDIO_CLK DMA_CLK / 4
#define DMA_INT DMA_CLK / 128
diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp
index 0acbd73284b..af72ef03f47 100644
--- a/src/mame/drivers/atari_s2.cpp
+++ b/src/mame/drivers/atari_s2.cpp
@@ -469,7 +469,7 @@ void atari_s2_state::machine_reset()
MACHINE_CONFIG_START(atari_s2_state::atari_s2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_4MHz / 4)
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(4'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(atari_s2_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_WATCHDOG_ADD("watchdog")
@@ -487,7 +487,7 @@ MACHINE_CONFIG_START(atari_s2_state::atari_s2)
/* Video */
MCFG_DEFAULT_LAYOUT(layout_atari_s2)
- MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", atari_s2_state, irq, attotime::from_hz(XTAL_4MHz / 8192))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", atari_s2_state, irq, attotime::from_hz(XTAL(4'000'000) / 8192))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_s", atari_s2_state, timer_s, attotime::from_hz(150000))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index dc6eb9ea3b7..b7f8252fc9b 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -2189,7 +2189,7 @@ MACHINE_CONFIG_START(megast_state::megast)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
- MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL(32'768))
MCFG_WD1772_ADD(WD1772_TAG, Y2/4)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT
@@ -2354,7 +2354,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(megaste_state::megaste, ste)
MCFG_CPU_MODIFY(M68000_TAG)
MCFG_CPU_PROGRAM_MAP(megaste_map)
- MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL(32'768))
MCFG_DEVICE_ADD(Z8530_TAG, SCC8530, Y2/4)
/* internal ram */
diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp
index 630d5b2857c..0ea5c72285a 100644
--- a/src/mame/drivers/atarisy2.cpp
+++ b/src/mame/drivers/atarisy2.cpp
@@ -132,9 +132,9 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_20MHz
-#define SOUND_CLOCK XTAL_14_31818MHz
-#define VIDEO_CLOCK XTAL_32MHz
+#define MASTER_CLOCK XTAL(20'000'000)
+#define SOUND_CLOCK XTAL(14'318'181)
+#define VIDEO_CLOCK XTAL(32'000'000)
@@ -1195,7 +1195,7 @@ MACHINE_CONFIG_START(atarisy2_state::atarisy2)
MCFG_CPU_ADD("audiocpu", M6502, SOUND_CLOCK/8)
MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, (double)MASTER_CLOCK/2/16/16/16/10)
+ MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, MASTER_CLOCK/2/16/16/16/10)
MCFG_MACHINE_START_OVERRIDE(atarisy2_state,atarisy2)
MCFG_MACHINE_RESET_OVERRIDE(atarisy2_state,atarisy2)
diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp
index 219419c0605..bdac29bac25 100644
--- a/src/mame/drivers/atetris.cpp
+++ b/src/mame/drivers/atetris.cpp
@@ -60,8 +60,8 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_14_31818MHz
-#define BOOTLEG_CLOCK XTAL_14_7456MHz
+#define MASTER_CLOCK XTAL(14'318'181)
+#define BOOTLEG_CLOCK XTAL(14'745'600)
/*************************************
diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp
index 68c665fba7a..a3210de8912 100644
--- a/src/mame/drivers/atlantis.cpp
+++ b/src/mame/drivers/atlantis.cpp
@@ -854,13 +854,13 @@ MACHINE_CONFIG_START(atlantis_state::mwskins)
}
// TL16C552 UART
- MCFG_DEVICE_ADD("uart1", NS16550, XTAL_24MHz)
+ MCFG_DEVICE_ADD("uart1", NS16550, XTAL(24'000'000))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("com1", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("com1", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("com1", rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(":", atlantis_state, duart_irq_callback))
- MCFG_DEVICE_ADD("uart2", NS16550, XTAL_24MHz)
+ MCFG_DEVICE_ADD("uart2", NS16550, XTAL(24'000'000))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("com2", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("com2", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("com2", rs232_port_device, write_rts))
diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp
index b9c059c3431..9a5d0b8bcfb 100644
--- a/src/mame/drivers/atom.cpp
+++ b/src/mame/drivers/atom.cpp
@@ -712,7 +712,7 @@ MACHINE_CONFIG_START(atom_state::atom)
/* video hardware */
MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, MC6847_TAG)
- MCFG_DEVICE_ADD(MC6847_TAG, MC6847_PAL, XTAL_4_433619MHz)
+ MCFG_DEVICE_ADD(MC6847_TAG, MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_INPUT_CALLBACK(READ8(atom_state, vdg_videoram_r))
/* sound hardware */
@@ -821,7 +821,7 @@ MACHINE_CONFIG_START(atom_state::atombb)
/* video hardware */
MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, MC6847_TAG)
- MCFG_DEVICE_ADD(MC6847_TAG, MC6847_PAL, XTAL_4_433619MHz)
+ MCFG_DEVICE_ADD(MC6847_TAG, MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_INPUT_CALLBACK(READ8(atom_state, vdg_videoram_r))
/* sound hardware */
diff --git a/src/mame/drivers/att4425.cpp b/src/mame/drivers/att4425.cpp
index 1c63726adb8..c48cf8f8418 100644
--- a/src/mame/drivers/att4425.cpp
+++ b/src/mame/drivers/att4425.cpp
@@ -234,7 +234,7 @@ static const z80_daisy_config att4425_daisy_chain[] =
MACHINE_CONFIG_START(att4425_state::att4425)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_32MHz/8) // XXX
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(32'000'000)/8) // XXX
MCFG_CPU_PROGRAM_MAP(att4425_mem)
MCFG_CPU_IO_MAP(att4425_io)
MCFG_Z80_DAISY_CHAIN(att4425_daisy_chain)
@@ -251,7 +251,7 @@ MACHINE_CONFIG_START(att4425_state::att4425)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
// ch.3 -- timer?
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_32MHz) // XXX
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(32'000'000)) // XXX
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
#ifdef notdef
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxca_w))
diff --git a/src/mame/drivers/att630.cpp b/src/mame/drivers/att630.cpp
index f87a2f96fca..1951e0cf46f 100644
--- a/src/mame/drivers/att630.cpp
+++ b/src/mame/drivers/att630.cpp
@@ -45,16 +45,16 @@ static INPUT_PORTS_START( att630 )
INPUT_PORTS_END
MACHINE_CONFIG_START(att630_state::att630)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_40MHz / 4) // clock not confirmed
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(40'000'000) / 4) // clock not confirmed
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_87_18336MHz, 1376, 0, 1024, 1056, 0, 1024)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(87'183'360), 1376, 0, 1024, 1056, 0, 1024)
MCFG_SCREEN_UPDATE_DRIVER(att630_state, screen_update)
- MCFG_DEVICE_ADD("duart1", SCN2681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart1", SCN2681, XTAL(3'686'400))
- MCFG_DEVICE_ADD("duart2", SCN2681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart2", SCN2681, XTAL(3'686'400))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp
index 689168e5552..d86bc478d96 100644
--- a/src/mame/drivers/attache.cpp
+++ b/src/mame/drivers/attache.cpp
@@ -1097,7 +1097,7 @@ void attache816_state::machine_reset()
}
MACHINE_CONFIG_START(attache_state::attache)
- MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu",Z80,XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(attache_map)
MCFG_CPU_IO_MAP(attache_io)
MCFG_Z80_DAISY_CHAIN(attache_daisy_chain)
@@ -1105,24 +1105,24 @@ MACHINE_CONFIG_START(attache_state::attache)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS(XTAL_12_324MHz, 784, 0, 640, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'324'000), 784, 0, 640, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(attache_state, screen_update)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("psg", AY8912, XTAL_8MHz / 4)
+ MCFG_SOUND_ADD("psg", AY8912, XTAL(8'000'000) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_MSM5832_ADD("rtc",XTAL_32_768kHz)
+ MCFG_MSM5832_ADD("rtc",XTAL(32'768))
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(8'000'000) / 2)
MCFG_Z80PIO_IN_PA_CB(READ8(attache_state, pio_portA_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(attache_state, pio_portA_w))
MCFG_Z80PIO_IN_PB_CB(READ8(attache_state, pio_portB_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(attache_state, pio_portB_w))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(8'000'000) / 2)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
@@ -1137,17 +1137,17 @@ MACHINE_CONFIG_START(attache_state::attache)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2)
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("brc", CLOCK, XTAL_8MHz / 26) // 307.692 KHz
+ MCFG_DEVICE_ADD("brc", CLOCK, XTAL(8'000'000) / 26) // 307.692 KHz
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
- MCFG_DEVICE_ADD("dma", AM9517A, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD("dma", AM9517A, XTAL(8'000'000) / 4)
MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(attache_state, hreq_w))
MCFG_AM9517A_OUT_EOP_CB(WRITELINE(attache_state, eop_w))
MCFG_AM9517A_IN_MEMR_CB(READ8(attache_state, dma_mem_r))
@@ -1175,37 +1175,37 @@ MACHINE_CONFIG_START(attache_state::attache)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(attache816_state::attache816)
- MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu",Z80,XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(attache_map)
MCFG_CPU_IO_MAP(attache816_io)
MCFG_Z80_DAISY_CHAIN(attache_daisy_chain)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_CPU_ADD("extcpu",I8086,XTAL_24MHz / 3)
+ MCFG_CPU_ADD("extcpu",I8086,XTAL(24'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(attache_x86_map)
MCFG_CPU_IO_MAP(attache_x86_io)
MCFG_QUANTUM_PERFECT_CPU("extcpu")
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS(XTAL_12_324MHz, 784, 0, 640, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'324'000), 784, 0, 640, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(attache_state, screen_update)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("psg", AY8912, XTAL_8MHz / 4)
+ MCFG_SOUND_ADD("psg", AY8912, XTAL(8'000'000) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_MSM5832_ADD("rtc",XTAL_32_768kHz)
+ MCFG_MSM5832_ADD("rtc",XTAL(32'768))
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(8'000'000) / 2)
MCFG_Z80PIO_IN_PA_CB(READ8(attache_state, pio_portA_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(attache_state, pio_portA_w))
MCFG_Z80PIO_IN_PB_CB(READ8(attache_state, pio_portB_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(attache_state, pio_portB_w))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(8'000'000) / 2)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
@@ -1220,13 +1220,13 @@ MACHINE_CONFIG_START(attache816_state::attache816)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2)
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("brc", CLOCK, XTAL_8MHz / 26) // 307.692 KHz
+ MCFG_DEVICE_ADD("brc", CLOCK, XTAL(8'000'000) / 26) // 307.692 KHz
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
@@ -1237,7 +1237,7 @@ MACHINE_CONFIG_START(attache816_state::attache816)
MCFG_I8255_OUT_PORTC_CB(WRITELINE(attache816_state, x86_dsr)) MCFG_DEVCB_BIT(0)
MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(attache816_state, ppi_irq)) MCFG_DEVCB_BIT(7) MCFG_DEVCB_INVERT
- MCFG_DEVICE_ADD("dma", AM9517A, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD("dma", AM9517A, XTAL(8'000'000) / 4)
MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(attache_state, hreq_w))
MCFG_AM9517A_OUT_EOP_CB(WRITELINE(attache_state, eop_w))
MCFG_AM9517A_IN_MEMR_CB(READ8(attache_state, dma_mem_r))
diff --git a/src/mame/drivers/attckufo.cpp b/src/mame/drivers/attckufo.cpp
index fe748071947..7fe822ba16d 100644
--- a/src/mame/drivers/attckufo.cpp
+++ b/src/mame/drivers/attckufo.cpp
@@ -112,7 +112,7 @@ READ8_MEMBER(attckufo_state::vic_colorram_r)
//**************************************************************************
MACHINE_CONFIG_START(attckufo_state::attckufo)
- MCFG_CPU_ADD("maincpu", M6502, XTAL_14_31818MHz / 14)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(14'318'181) / 14)
MCFG_CPU_PROGRAM_MAP(cpu_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
@@ -120,7 +120,7 @@ MACHINE_CONFIG_START(attckufo_state::attckufo)
MCFG_PIA_READPB_HANDLER(IOPORT("INPUT"))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_MOS656X_ATTACK_UFO_ADD("mos6560", "screen", XTAL_14_31818MHz / 14, vic_videoram_map, vic_colorram_map)
+ MCFG_MOS656X_ATTACK_UFO_ADD("mos6560", "screen", XTAL(14'318'181) / 14, vic_videoram_map, vic_colorram_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp
index 38e31873ed6..bf5c5e66386 100644
--- a/src/mame/drivers/atvtrack.cpp
+++ b/src/mame/drivers/atvtrack.cpp
@@ -550,7 +550,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( atvtrack )
INPUT_PORTS_END
-#define ATV_CPU_CLOCK XTAL_33MHz*6
+#define ATV_CPU_CLOCK XTAL(33'000'000)*6
MACHINE_CONFIG_START(atvtrack_state::atvtrack)
/* basic machine hardware */
diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp
index 3271bb4dc70..dde11c4ff0e 100644
--- a/src/mame/drivers/aussiebyte.cpp
+++ b/src/mame/drivers/aussiebyte.cpp
@@ -443,7 +443,7 @@ MACHINE_RESET_MEMBER( aussiebyte_state, aussiebyte )
MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(aussiebyte_map)
MCFG_CPU_IO_MAP(aussiebyte_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
@@ -474,12 +474,12 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
- MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_4_9152MHz / 4)
+ MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(4'915'200) / 4)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio1", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1", z80sio_device, txca_w))
@@ -489,7 +489,7 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
MCFG_Z80CTC_ZC2_CB(WRITELINE(aussiebyte_state, ctc_z2_w)) // SIO2 Ch B, CTC Ch 3
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio2", z80sio_device, rxtxcb_w))
- MCFG_DEVICE_ADD("dma", Z80DMA, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000) / 4)
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(aussiebyte_state, busreq_w))
// BAO, not used
@@ -498,22 +498,22 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
MCFG_Z80DMA_IN_IORQ_CB(READ8(aussiebyte_state, io_read_byte))
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(aussiebyte_state, io_write_byte))
- MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(16'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_Z80PIO_IN_PB_CB(DEVREAD8("cent_data_in", input_buffer_device, read))
MCFG_Z80PIO_OUT_ARDY_CB(DEVWRITELINE("centronics", centronics_device, write_strobe)) MCFG_DEVCB_INVERT
- MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL(16'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(aussiebyte_state, port20_w))
- MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(aussiebyte_state, sio1_rdya_w))
MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(aussiebyte_state, sio1_rdyb_w))
- MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(aussiebyte_state, sio2_rdya_w))
MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(aussiebyte_state, sio2_rdyb_w))
@@ -524,7 +524,7 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio2", z80sio_device, rxa_w))
- MCFG_WD2797_ADD("fdc", XTAL_16MHz / 16)
+ MCFG_WD2797_ADD("fdc", XTAL(16'000'000) / 16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(aussiebyte_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(aussiebyte_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", aussiebyte_floppies, "525qd", floppy_image_device::default_floppy_formats)
@@ -533,13 +533,13 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
MCFG_FLOPPY_DRIVE_SOUND(true)
/* devices */
- MCFG_MC6845_ADD("crtc", SY6545_1, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD("crtc", SY6545_1, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(aussiebyte_state, crtc_update_row)
MCFG_MC6845_ADDR_CHANGED_CB(aussiebyte_state, crtc_update_addr)
- MCFG_MSM5832_ADD("rtc", XTAL_32_768kHz)
+ MCFG_MSM5832_ADD("rtc", XTAL(32'768))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp
index c0bd018cf95..c19e1b6051c 100644
--- a/src/mame/drivers/avalnche.cpp
+++ b/src/mame/drivers/avalnche.cpp
@@ -39,7 +39,7 @@
#include "avalnche.lh"
-#define MASTER_CLOCK XTAL_12_096MHz
+#define MASTER_CLOCK XTAL(12'096'000)
/*************************************
diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp
index 0ce9c77b669..75bc83c881b 100644
--- a/src/mame/drivers/avigo.cpp
+++ b/src/mame/drivers/avigo.cpp
@@ -753,7 +753,7 @@ MACHINE_CONFIG_START(avigo_state::avigo)
MCFG_CPU_IO_MAP(avigo_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport", rs232_port_device, write_rts))
@@ -787,7 +787,7 @@ MACHINE_CONFIG_START(avigo_state::avigo)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* real time clock */
- MCFG_DEVICE_ADD("rtc", TC8521, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", TC8521, XTAL(32'768))
MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(avigo_state, tc8521_alarm_int))
/* flash ROMs */
diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp
index 809fe1f8e35..b0153799bc1 100644
--- a/src/mame/drivers/avt.cpp
+++ b/src/mame/drivers/avt.cpp
@@ -428,7 +428,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_16MHz /* unknown */
+#define MASTER_CLOCK XTAL(16'000'000) /* unknown */
#define CPU_CLOCK MASTER_CLOCK/4 /* guess... seems accurate */
#define CRTC_CLOCK MASTER_CLOCK/24 /* it gives 63.371293 Hz. with current settings */
diff --git a/src/mame/drivers/ax20.cpp b/src/mame/drivers/ax20.cpp
index aef08791b16..fc75f4ff6c3 100644
--- a/src/mame/drivers/ax20.cpp
+++ b/src/mame/drivers/ax20.cpp
@@ -124,7 +124,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(ax20_state::ax20)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3)
MCFG_CPU_PROGRAM_MAP(ax20_map)
MCFG_CPU_IO_MAP(ax20_io)
diff --git a/src/mame/drivers/b16.cpp b/src/mame/drivers/b16.cpp
index 807b46461e3..5ae948eb4ed 100644
--- a/src/mame/drivers/b16.cpp
+++ b/src/mame/drivers/b16.cpp
@@ -272,7 +272,7 @@ WRITE8_MEMBER(b16_state::memory_write_byte)
MACHINE_CONFIG_START(b16_state::b16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8086, XTAL_14_31818MHz/2) //unknown xtal
+ MCFG_CPU_ADD("maincpu",I8086, XTAL(14'318'181)/2) //unknown xtal
MCFG_CPU_PROGRAM_MAP(b16_map)
MCFG_CPU_IO_MAP(b16_io)
@@ -286,11 +286,11 @@ MACHINE_CONFIG_START(b16_state::b16)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1)
MCFG_SCREEN_PALETTE("palette")
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_14_31818MHz/5) /* unknown clock, hand tuned to get ~60 fps */
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(14'318'181)/5) /* unknown clock, hand tuned to get ~60 fps */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
- MCFG_DEVICE_ADD("8237dma", AM9517A, XTAL_14_31818MHz/2)
+ MCFG_DEVICE_ADD("8237dma", AM9517A, XTAL(14'318'181)/2)
MCFG_I8237_IN_MEMR_CB(READ8(b16_state, memory_read_byte))
MCFG_I8237_OUT_MEMW_CB(WRITE8(b16_state, memory_write_byte))
diff --git a/src/mame/drivers/b2m.cpp b/src/mame/drivers/b2m.cpp
index 9a72f7d5581..daf7193ce0b 100644
--- a/src/mame/drivers/b2m.cpp
+++ b/src/mame/drivers/b2m.cpp
@@ -238,7 +238,7 @@ MACHINE_CONFIG_START(b2m_state::b2m)
/* uart */
MCFG_DEVICE_ADD("uart", I8251, 0)
- MCFG_FD1793_ADD("fd1793", XTAL_8MHz / 8)
+ MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(b2m_state, b2m_fdc_drq))
MCFG_FLOPPY_DRIVE_ADD("fd0", b2m_floppies, "525qd", b2m_state::b2m_floppy_formats)
diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp
index 8623ad78c3f..8f8b4aa0c65 100644
--- a/src/mame/drivers/badlands.cpp
+++ b/src/mame/drivers/badlands.cpp
@@ -759,11 +759,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(badlands_state::bootleg_sound_scanline)
MACHINE_CONFIG_START(badlands_state::badlandsb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/4) /* Divisor estimated */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000)/4) /* Divisor estimated */
MCFG_CPU_PROGRAM_MAP(bootleg_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", badlands_state, irq1_line_hold) //vblank_int)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_20MHz/12) /* Divisor estimated */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(20'000'000)/12) /* Divisor estimated */
MCFG_CPU_PROGRAM_MAP(bootleg_audio_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", badlands_state, bootleg_sound_scanline, "screen", 0, 1)
@@ -796,7 +796,7 @@ MACHINE_CONFIG_START(badlands_state::badlandsb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_20MHz/8) /* Divisor estimated */
+ MCFG_YM2151_ADD("ymsnd", XTAL(20'000'000)/8) /* Divisor estimated */
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/balsente.cpp b/src/mame/drivers/balsente.cpp
index 36a23406088..66baf414bf6 100644
--- a/src/mame/drivers/balsente.cpp
+++ b/src/mame/drivers/balsente.cpp
@@ -1289,11 +1289,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(balsente_state::balsente)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_20MHz/16) /* xtal verified but not speed */
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(20'000'000)/16) /* xtal verified but not speed */
MCFG_CPU_PROGRAM_MAP(cpu1_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", balsente_state, balsente_update_analog_inputs)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* xtal verified but not speed */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* xtal verified but not speed */
MCFG_CPU_PROGRAM_MAP(cpu2_map)
MCFG_CPU_IO_MAP(cpu2_io_map)
diff --git a/src/mame/drivers/banctec.cpp b/src/mame/drivers/banctec.cpp
index f786e2120e7..57ad4b392d5 100644
--- a/src/mame/drivers/banctec.cpp
+++ b/src/mame/drivers/banctec.cpp
@@ -131,7 +131,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(banctec_state::banctec)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL_11_0592MHz)
+ MCFG_CPU_ADD("maincpu", I80C31, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(banctec_mem)
MCFG_CPU_ADD("mcu", M6803, 4000000) /* Actual MCU is a Motorola 6803 and the clock frequency is still unknown */
@@ -149,7 +149,7 @@ MACHINE_CONFIG_START(banctec_state::banctec)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", banctec)
- MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL_2MHz) /* (?) */
+ MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL(2'000'000)) /* (?) */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(banctec_state, crtc_update_row)
diff --git a/src/mame/drivers/bankp.cpp b/src/mame/drivers/bankp.cpp
index be8342ead7e..ab1a8e4b422 100644
--- a/src/mame/drivers/bankp.cpp
+++ b/src/mame/drivers/bankp.cpp
@@ -102,7 +102,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_15_468MHz
+#define MASTER_CLOCK XTAL(15'468'480)
// Video timing
// PCB measured: H = 15.61khz V = 60.99hz, +/- 0.01hz
diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp
index 7e5f962cf32..7a5559ba77d 100644
--- a/src/mame/drivers/baraduke.cpp
+++ b/src/mame/drivers/baraduke.cpp
@@ -373,11 +373,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(baraduke_state::baraduke)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_49_152MHz/32) // 68A09E
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(49'152'000)/32) // 68A09E
MCFG_CPU_PROGRAM_MAP(baraduke_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", baraduke_state, irq0_line_assert)
- MCFG_CPU_ADD("mcu", HD63701, XTAL_49_152MHz/8)
+ MCFG_CPU_ADD("mcu", HD63701, XTAL(49'152'000)/8)
MCFG_CPU_PROGRAM_MAP(mcu_map)
MCFG_CPU_IO_MAP(mcu_port_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", baraduke_state, irq0_line_hold)
@@ -388,7 +388,7 @@ MACHINE_CONFIG_START(baraduke_state::baraduke)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_49_152MHz/8, 384, 0, 36*8, 264, 2*8, 30*8)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(49'152'000)/8, 384, 0, 36*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(baraduke_state, screen_update_baraduke)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(baraduke_state, screen_vblank_baraduke))
MCFG_SCREEN_PALETTE("palette")
@@ -400,7 +400,7 @@ MACHINE_CONFIG_START(baraduke_state::baraduke)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL_49_152MHz/2048)
+ MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2048)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/barata.cpp b/src/mame/drivers/barata.cpp
index 9983df33cd0..61341adf869 100644
--- a/src/mame/drivers/barata.cpp
+++ b/src/mame/drivers/barata.cpp
@@ -41,7 +41,7 @@
#include "barata.lh"
-#define CPU_CLOCK (XTAL_6MHz) /* main cpu clock */
+#define CPU_CLOCK (XTAL(6'000'000)) /* main cpu clock */
class barata_state : public driver_device
{
diff --git a/src/mame/drivers/barni.cpp b/src/mame/drivers/barni.cpp
index 80b82806731..6d993a5683d 100644
--- a/src/mame/drivers/barni.cpp
+++ b/src/mame/drivers/barni.cpp
@@ -58,10 +58,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(barni_state::barni)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_4MHz / 4)
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(4'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(maincpu_map)
- MCFG_CPU_ADD("subcpu", MC6809E, XTAL_4MHz / 4)
+ MCFG_CPU_ADD("subcpu", MC6809E, XTAL(4'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(subcpu_map)
MCFG_CPU_ADD("audiocpu", M6802, 4000000) // uses own XTAL, but what is the value?
diff --git a/src/mame/drivers/basic52.cpp b/src/mame/drivers/basic52.cpp
index cc54d3ee011..0afa43daf99 100644
--- a/src/mame/drivers/basic52.cpp
+++ b/src/mame/drivers/basic52.cpp
@@ -102,7 +102,7 @@ void basic52_state::kbd_put(u8 data)
MACHINE_CONFIG_START(basic52_state::basic31)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8031, XTAL_11_0592MHz)
+ MCFG_CPU_ADD("maincpu", I8031, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(basic52_mem)
MCFG_CPU_IO_MAP(basic52_io)
MCFG_MCS51_SERIAL_TX_CB(DEVWRITE8("terminal", generic_terminal_device, write))
@@ -117,7 +117,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(basic52_state::basic52, basic31)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", I8052, XTAL_11_0592MHz)
+ MCFG_CPU_REPLACE("maincpu", I8052, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(basic52_mem)
MCFG_CPU_IO_MAP(basic52_io)
MCFG_MCS51_SERIAL_TX_CB(DEVWRITE8("terminal", generic_terminal_device, write))
diff --git a/src/mame/drivers/battlex.cpp b/src/mame/drivers/battlex.cpp
index 28817b66699..7ff7e72b081 100644
--- a/src/mame/drivers/battlex.cpp
+++ b/src/mame/drivers/battlex.cpp
@@ -291,7 +291,7 @@ void battlex_state::machine_reset()
MACHINE_CONFIG_START(battlex_state::battlex)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL_10MHz/4 ) // ?
+ MCFG_CPU_ADD("maincpu", Z80,XTAL(10'000'000)/4 ) // ?
MCFG_CPU_PROGRAM_MAP(battlex_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(battlex_state, battlex_interrupt, 400) /* controls game speed? */
@@ -311,7 +311,7 @@ MACHINE_CONFIG_START(battlex_state::battlex)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_10MHz/8) // ?
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(10'000'000)/8) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -322,7 +322,7 @@ MACHINE_CONFIG_DERIVED(battlex_state::dodgeman, battlex)
MCFG_VIDEO_START_OVERRIDE(battlex_state, dodgeman)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_10MHz/8) // ?
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(10'000'000)/8) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/battlnts.cpp b/src/mame/drivers/battlnts.cpp
index 7e63ff4e74d..eb458792b63 100644
--- a/src/mame/drivers/battlnts.cpp
+++ b/src/mame/drivers/battlnts.cpp
@@ -232,11 +232,11 @@ void battlnts_state::machine_reset()
MACHINE_CONFIG_START(battlnts_state::battlnts)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309, XTAL_24MHz / 2 /* 3000000*4? */)
+ MCFG_CPU_ADD("maincpu", HD6309, XTAL(24'000'000) / 2 /* 3000000*4? */)
MCFG_CPU_PROGRAM_MAP(battlnts_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", battlnts_state, battlnts_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz / 6 /* 3579545? */)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000) / 6 /* 3579545? */)
MCFG_CPU_PROGRAM_MAP(battlnts_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -269,10 +269,10 @@ MACHINE_CONFIG_START(battlnts_state::battlnts)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM3812, XTAL_24MHz / 8)
+ MCFG_SOUND_ADD("ym1", YM3812, XTAL(24'000'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL_24MHz / 8)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL(24'000'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp
index f3c4ce2d070..220ef2fce6b 100644
--- a/src/mame/drivers/bbc.cpp
+++ b/src/mame/drivers/bbc.cpp
@@ -853,7 +853,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::bbca)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_16MHz/8) /* 2.00 MHz */
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(16'000'000)/8) /* 2.00 MHz */
MCFG_CPU_PROGRAM_MAP(bbca_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bbc_state, bbcb_vsync) /* screen refresh interrupts */
MCFG_CPU_PERIODIC_INT_DRIVER(bbc_state, bbcb_keyscan, 1000) /* scan keyboard */
@@ -873,7 +873,7 @@ MACHINE_CONFIG_START(bbc_state::bbca)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- //MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz, 1024, 0, 640, 312, 0, 256)
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000), 1024, 0, 640, 312, 0, 256)
MCFG_SCREEN_SIZE(640, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -883,11 +883,11 @@ MACHINE_CONFIG_START(bbc_state::bbca)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(bbc_state,bbc)
- MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL_12MHz/2)
+ MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL(12'000'000)/2)
MCFG_SAA5050_SCREEN_SIZE(40, 25, 40)
/* crtc */
- MCFG_MC6845_ADD("hd6845", HD6845, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD("hd6845", HD6845, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(12)
MCFG_MC6845_UPDATE_ROW_CB(bbc_state, crtc_update_row)
@@ -901,7 +901,7 @@ MACHINE_CONFIG_START(bbc_state::bbca)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489", SN76489, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_SOUND_ADD("sn76489", SN76489, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* cassette */
@@ -924,11 +924,11 @@ MACHINE_CONFIG_START(bbc_state::bbca)
MCFG_RS232_DCD_HANDLER(WRITELINE(bbc_state, write_dcd_serial))
MCFG_RS232_CTS_HANDLER(WRITELINE(bbc_state, write_cts_serial))
- MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL_16MHz / 13)
+ MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(16'000'000) / 13)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(bbc_state, write_acia_clock))
/* system via */
- MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_READPA_HANDLER(READ8(bbc_state, bbcb_via_system_read_porta))
MCFG_VIA6522_READPB_HANDLER(READ8(bbc_state, bbcb_via_system_read_portb))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(bbc_state, bbcb_via_system_write_porta))
@@ -960,7 +960,7 @@ MACHINE_CONFIG_DERIVED(bbc_state::bbcb, bbca)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* user via */
- MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_VIA6522_READPB_HANDLER(DEVREAD8("userport", bbc_userport_slot_device, pb_r))
MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8("userport", bbc_userport_slot_device, pb_w))
@@ -1073,7 +1073,7 @@ MACHINE_CONFIG_DERIVED(bbc_state::bbcbp, bbcb)
/* fdc */
MCFG_DEVICE_REMOVE("fdc")
- MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2)
+ MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, fdc_drq_w))
@@ -1299,7 +1299,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::bbcm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65SC02, XTAL_16MHz/8) /* 2.00 MHz */
+ MCFG_CPU_ADD("maincpu", M65SC02, XTAL(16'000'000)/8) /* 2.00 MHz */
MCFG_CPU_PROGRAM_MAP(bbcm_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bbc_state, bbcb_vsync) /* screen refresh interrupts */
MCFG_CPU_PERIODIC_INT_DRIVER(bbc_state, bbcb_keyscan, 1000) /* scan keyboard */
@@ -1329,11 +1329,11 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(bbc_state, bbc)
- MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL_12MHz / 2)
+ MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL(12'000'000) / 2)
MCFG_SAA5050_SCREEN_SIZE(40, 25, 40)
/* crtc */
- MCFG_MC6845_ADD("hd6845", HD6845, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD("hd6845", HD6845, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(12)
MCFG_MC6845_UPDATE_ROW_CB(bbc_state, crtc_update_row)
@@ -1345,11 +1345,11 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489", SN76489, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_SOUND_ADD("sn76489", SN76489, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* rtc and cmos */
- MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz )
+ MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
@@ -1389,7 +1389,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_RS232_DCD_HANDLER(WRITELINE(bbc_state, write_dcd_serial))
MCFG_RS232_CTS_HANDLER(WRITELINE(bbc_state, write_cts_serial))
- MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL_16MHz / 13)
+ MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(16'000'000) / 13)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(bbc_state, write_acia_clock))
/* adc */
@@ -1398,7 +1398,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_UPD7002_EOC_CB(bbc_state, BBC_uPD7002_EOC)
/* system via */
- MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_READPA_HANDLER(READ8(bbc_state, bbcb_via_system_read_porta))
MCFG_VIA6522_READPB_HANDLER(READ8(bbc_state, bbcb_via_system_read_portb))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(bbc_state, bbcb_via_system_write_porta))
@@ -1406,7 +1406,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<1>))
/* user via */
- MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_VIA6522_READPB_HANDLER(DEVREAD8("userport", bbc_userport_slot_device, pb_r))
MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8("userport", bbc_userport_slot_device, pb_w))
@@ -1414,7 +1414,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<2>))
/* fdc */
- MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2)
+ MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, fdc_drq_w))
@@ -1586,7 +1586,7 @@ MACHINE_CONFIG_DERIVED(bbc_state::bbcmc, bbcm)
/* fdc */
MCFG_DEVICE_REMOVE("wd1770")
- MCFG_WD1772_ADD("wd1772", XTAL_16MHz / 2)
+ MCFG_WD1772_ADD("wd1772", XTAL(16'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, fdc_drq_w))
diff --git a/src/mame/drivers/bbcbc.cpp b/src/mame/drivers/bbcbc.cpp
index d392e07a9c4..51ea1fa81b7 100644
--- a/src/mame/drivers/bbcbc.cpp
+++ b/src/mame/drivers/bbcbc.cpp
@@ -58,7 +58,7 @@ private:
};
-#define MAIN_CLOCK XTAL_4_433619MHz
+#define MAIN_CLOCK XTAL(4'433'619)
static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, bbcbc_state )
@@ -118,7 +118,7 @@ MACHINE_CONFIG_START(bbcbc_state::bbcbc)
MCFG_Z80PIO_IN_PB_CB(READ8(bbcbc_state, input_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(bbcbc_state, input_select_w))
- MCFG_DEVICE_ADD( "tms9129", TMS9129, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9129", TMS9129, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("maincpu", 0))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp
index baccc7cf6d3..9d66b5f8bf3 100644
--- a/src/mame/drivers/bcs3.cpp
+++ b/src/mame/drivers/bcs3.cpp
@@ -380,7 +380,7 @@ DRIVER_INIT_MEMBER( bcs3_state, bcs3d )
MACHINE_CONFIG_START(bcs3_state::bcs3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz /2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) /2)
MCFG_CPU_PROGRAM_MAP(bcs3_mem)
MCFG_CPU_IO_MAP(bcs3_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
@@ -396,7 +396,7 @@ MACHINE_CONFIG_START(bcs3_state::bcs3)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bcs3)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_5MHz / 2)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(5'000'000) / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(bcs3_state, ctc_z0_w))
MCFG_Z80CTC_ZC1_CB(WRITELINE(bcs3_state, ctc_z1_w))
@@ -407,7 +407,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bcs3_state::bcs3a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_7MHz /2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(7'000'000) /2)
MCFG_CPU_PROGRAM_MAP(bcs3a_mem)
MCFG_CPU_IO_MAP(bcs3_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
@@ -423,7 +423,7 @@ MACHINE_CONFIG_START(bcs3_state::bcs3a)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bcs3)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_7MHz / 2)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(7'000'000) / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(bcs3_state, ctc_z0_w))
MCFG_Z80CTC_ZC1_CB(WRITELINE(bcs3_state, ctc_z1_w))
diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp
index c3bd10f0cdf..3ca835ef3ed 100644
--- a/src/mame/drivers/bebox.cpp
+++ b/src/mame/drivers/bebox.cpp
@@ -158,7 +158,7 @@ MACHINE_CONFIG_START(bebox_state::bebox)
MCFG_PIT8253_CLK2(4772720/4) /* pio port c pin 4, and speaker polling enough */
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("kbdc", kbdc8042_device, write_out2))
- MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 )
MCFG_I8237_OUT_HREQ_CB(WRITELINE(bebox_state, bebox_dma_hrq_changed))
MCFG_I8237_OUT_EOP_CB(WRITELINE(bebox_state, bebox_dma8237_out_eop))
MCFG_I8237_IN_MEMR_CB(READ8(bebox_state, bebox_dma_read_byte))
@@ -170,7 +170,7 @@ MACHINE_CONFIG_START(bebox_state::bebox)
MCFG_I8237_OUT_DACK_2_CB(WRITELINE(bebox_state, pc_dack2_w))
MCFG_I8237_OUT_DACK_3_CB(WRITELINE(bebox_state, pc_dack3_w))
- MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 )
MCFG_DEVICE_ADD("pic8259_1", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(WRITELINE(bebox_state, bebox_pic8259_master_set_int_line))
@@ -188,7 +188,7 @@ MACHINE_CONFIG_START(bebox_state::bebox)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -227,7 +227,7 @@ MACHINE_CONFIG_START(bebox_state::bebox)
MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma8237_1", am9517a_device, dreq2_w))
MCFG_FLOPPY_DRIVE_ADD("smc37c78:0", bebox_floppies, "35hd", bebox_state::floppy_formats)
- MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz )
+ MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
MCFG_DEVICE_ADD("kbdc", KBDC8042, 0)
MCFG_KBDC8042_KEYBOARD_TYPE(KBDC8042_STANDARD)
diff --git a/src/mame/drivers/beehive.cpp b/src/mame/drivers/beehive.cpp
index 74651e8aa68..96784d6278a 100644
--- a/src/mame/drivers/beehive.cpp
+++ b/src/mame/drivers/beehive.cpp
@@ -288,7 +288,7 @@ uint32_t beehive_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
MACHINE_CONFIG_START(beehive_state::beehive)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",I8085A, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(beehive_mem)
MCFG_CPU_IO_MAP(beehive_io)
diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp
index 64a06efbcaf..590d67d2e50 100644
--- a/src/mame/drivers/beezer.cpp
+++ b/src/mame/drivers/beezer.cpp
@@ -452,7 +452,7 @@ void beezer_state::machine_reset()
bankswitch_w(machine().dummy_space(), 0, 0);
// start timer
- m_timer_count->adjust(attotime::zero, 0, attotime::from_hz((XTAL_4MHz / 4) / 16));
+ m_timer_count->adjust(attotime::zero, 0, attotime::from_hz((XTAL(4'000'000) / 4) / 16));
}
@@ -462,7 +462,7 @@ void beezer_state::machine_reset()
MACHINE_CONFIG_START(beezer_state::beezer)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_12MHz / 3)
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(12'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("sysbank", ADDRESS_MAP_BANK, 0)
@@ -474,7 +474,7 @@ 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_12MHz / 12)
+ 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))
@@ -498,13 +498,13 @@ MACHINE_CONFIG_START(beezer_state::beezer)
MCFG_PALETTE_INIT_OWNER(beezer_state, beezer)
// sound hardware
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu", MC6809, XTAL(4'000'000))
MCFG_CPU_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_4MHz / 4)
+ 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))
@@ -513,7 +513,7 @@ MACHINE_CONFIG_START(beezer_state::beezer)
MCFG_VIA6522_CB2_HANDLER(WRITELINE(beezer_state, dmod_data_w))
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("audio_irqs", input_merger_device, in_w<0>))
- MCFG_DEVICE_ADD("ptm", PTM6840, XTAL_4MHz / 4)
+ MCFG_DEVICE_ADD("ptm", PTM6840, XTAL(4'000'000) / 4)
MCFG_PTM6840_OUT0_CB(WRITELINE(beezer_state, ptm_out0_w))
MCFG_PTM6840_OUT1_CB(WRITELINE(beezer_state, ptm_out1_w))
MCFG_PTM6840_OUT2_CB(WRITELINE(beezer_state, ptm_out2_w))
diff --git a/src/mame/drivers/berzerk.cpp b/src/mame/drivers/berzerk.cpp
index 82b0899d9ce..18a64937d1b 100644
--- a/src/mame/drivers/berzerk.cpp
+++ b/src/mame/drivers/berzerk.cpp
@@ -98,7 +98,7 @@ public:
};
-#define MASTER_CLOCK (XTAL_10MHz)
+#define MASTER_CLOCK (XTAL(10'000'000))
#define MAIN_CPU_CLOCK (MASTER_CLOCK / 4)
#define PIXEL_CLOCK (MASTER_CLOCK / 2)
#define S14001_CLOCK (MASTER_CLOCK / 4)
diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp
index 1ae78f61b11..16cc503da3d 100644
--- a/src/mame/drivers/beta.cpp
+++ b/src/mame/drivers/beta.cpp
@@ -338,7 +338,7 @@ void beta_state::machine_start()
MACHINE_CONFIG_START(beta_state::beta)
/* basic machine hardware */
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_4MHz/4)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(4'000'000)/4)
MCFG_CPU_PROGRAM_MAP(beta_mem)
/* video hardware */
@@ -350,7 +350,7 @@ MACHINE_CONFIG_START(beta_state::beta)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
- MCFG_DEVICE_ADD(M6532_TAG, MOS6532_NEW, XTAL_4MHz/4)
+ MCFG_DEVICE_ADD(M6532_TAG, MOS6532_NEW, XTAL(4'000'000)/4)
MCFG_MOS6530n_IN_PA_CB(READ8(beta_state, riot_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(beta_state, riot_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(beta_state, riot_pb_r))
diff --git a/src/mame/drivers/bfm_sc1.cpp b/src/mame/drivers/bfm_sc1.cpp
index 8590c5b23d2..07df0cc9ff8 100644
--- a/src/mame/drivers/bfm_sc1.cpp
+++ b/src/mame/drivers/bfm_sc1.cpp
@@ -224,7 +224,7 @@ public:
#define VFD_CLOCK1 0x80
#define VFD_DATA 0x40
-#define MASTER_CLOCK (XTAL_4MHz)
+#define MASTER_CLOCK (XTAL(4'000'000))
void bfm_sc1_state::save_state()
diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp
index a9f64d907b0..d9acd631343 100644
--- a/src/mame/drivers/bfm_sc2.cpp
+++ b/src/mame/drivers/bfm_sc2.cpp
@@ -389,7 +389,7 @@ public:
#define UART_LOG(x) do { if (VERBOSE) logerror x; } while (0)
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
-#define MASTER_CLOCK (XTAL_8MHz)
+#define MASTER_CLOCK (XTAL(8'000'000))
/* INPUTS layout
@@ -2249,7 +2249,7 @@ MACHINE_CONFIG_START(bfm_sc2_state::scorpion2_vid)
MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3716,7 +3716,7 @@ MACHINE_CONFIG_START(bfm_sc2_state::scorpion2)
MCFG_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd",YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd",YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -3770,7 +3770,7 @@ MACHINE_CONFIG_START(bfm_sc2_state::scorpion2_dm01)
MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(120000,100e-9))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd",YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd",YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_MACHINE_START_OVERRIDE(bfm_sc2_state,sc2dmd)
diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp
index b951e449d56..732c474d39b 100644
--- a/src/mame/drivers/bfm_sc4.cpp
+++ b/src/mame/drivers/bfm_sc4.cpp
@@ -906,7 +906,7 @@ MACHINE_CONFIG_START(sc4_state::sc4_common)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_DEVICE_ADD("duart68681", MC68681, 16000000/4) // ?? Mhz
- MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL_16MHz/2/8, XTAL_16MHz/2/16, XTAL_16MHz/2/16, XTAL_16MHz/2/8)
+ MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL(16'000'000)/2/8, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/8)
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sc4_state, bfm_sc4_duart_irq_handler))
MCFG_MC68681_A_TX_CALLBACK(WRITELINE(sc4_state, bfm_sc4_duart_txa))
MCFG_MC68681_INPORT_CALLBACK(READ8(sc4_state, bfm_sc4_duart_input_r))
diff --git a/src/mame/drivers/bfmsys85.cpp b/src/mame/drivers/bfmsys85.cpp
index 08417de869c..22b95111fb7 100644
--- a/src/mame/drivers/bfmsys85.cpp
+++ b/src/mame/drivers/bfmsys85.cpp
@@ -137,7 +137,7 @@ public:
void bfmsys85(machine_config &config);
};
-#define MASTER_CLOCK (XTAL_4MHz)
+#define MASTER_CLOCK (XTAL(4'000'000))
///////////////////////////////////////////////////////////////////////////
// Serial Communications (Where does this go?) ////////////////////////////
diff --git a/src/mame/drivers/big10.cpp b/src/mame/drivers/big10.cpp
index b61be68cd0f..c039d67e6da 100644
--- a/src/mame/drivers/big10.cpp
+++ b/src/mame/drivers/big10.cpp
@@ -51,7 +51,7 @@
***************************************************************************/
-#define MASTER_CLOCK XTAL_21_4772MHz /* Dumper notes poorly refers to a 21.?727 Xtal. */
+#define MASTER_CLOCK XTAL(21'477'272) /* Dumper notes poorly refers to a 21.?727 Xtal. */
#include "emu.h"
diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp
index 46c5ff9cdbf..b735cdacfc3 100644
--- a/src/mame/drivers/bigbord2.cpp
+++ b/src/mame/drivers/bigbord2.cpp
@@ -539,7 +539,7 @@ MC6845_UPDATE_ROW( bigbord2_state::crtc_update_row )
/* Machine Drivers */
-#define MAIN_CLOCK XTAL_8MHz / 2
+#define MAIN_CLOCK XTAL(8'000'000) / 2
MACHINE_CONFIG_START(bigbord2_state::bigbord2)
/* basic machine hardware */
@@ -550,7 +550,7 @@ MACHINE_CONFIG_START(bigbord2_state::bigbord2)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_10_69425MHz, 700, 0, 560, 260, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(10'694'250), 700, 0, 560, 260, 0, 240)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", crt8002)
MCFG_PALETTE_ADD_MONOCHROME("palette")
@@ -582,14 +582,14 @@ MACHINE_CONFIG_START(bigbord2_state::bigbord2)
MCFG_Z80CTC_ZC1_CB(WRITELINE(bigbord2_state, ctc_z1_w)) // to SIO Ch A
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc2", z80ctc_device, trg3))
- MCFG_MB8877_ADD("fdc", XTAL_16MHz / 8) // 2MHz for 8 inch, or 1MHz otherwise (jumper-selectable)
+ MCFG_MB8877_ADD("fdc", XTAL(16'000'000) / 8) // 2MHz for 8 inch, or 1MHz otherwise (jumper-selectable)
//MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", ??)) // info missing from schematic
MCFG_FLOPPY_DRIVE_ADD("fdc:0", bigbord2_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", bigbord2_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(bigbord2_state, crtc_update_row)
diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp
index 9e7861b0a08..4ae385d6e8b 100644
--- a/src/mame/drivers/binbug.cpp
+++ b/src/mame/drivers/binbug.cpp
@@ -296,7 +296,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(binbug_state::binbug)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz)
+ MCFG_CPU_ADD("maincpu",S2650, XTAL(1'000'000))
MCFG_CPU_PROGRAM_MAP(binbug_mem)
MCFG_CPU_DATA_MAP(binbug_data)
MCFG_S2650_SENSE_INPUT(READLINE(binbug_state, binbug_serial_r))
@@ -529,7 +529,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(dg680_state::uart_tick)
MACHINE_CONFIG_START(dg680_state::dg680)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz / 4)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(8'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(dg680_mem)
MCFG_CPU_IO_MAP(dg680_io)
MCFG_Z80_DAISY_CHAIN(dg680_daisy_chain)
@@ -557,11 +557,11 @@ MACHINE_CONFIG_START(dg680_state::dg680)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* Devices */
- MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(8'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1))
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(8'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(dg680_state, porta_r))
// OUT_ARDY - this activates to ask for kbd data but not known if actually used
diff --git a/src/mame/drivers/bingoman.cpp b/src/mame/drivers/bingoman.cpp
index b7a71cf0f58..645963c3367 100644
--- a/src/mame/drivers/bingoman.cpp
+++ b/src/mame/drivers/bingoman.cpp
@@ -375,7 +375,7 @@ PALETTE_INIT_MEMBER(bingoman_state, bingoman)
MACHINE_CONFIG_START(bingoman_state::bingoman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83002, XTAL_20MHz) /* TODO: correct CPU type */
+ MCFG_CPU_ADD("maincpu", H83002, XTAL(20'000'000)) /* TODO: correct CPU type */
MCFG_CPU_PROGRAM_MAP(bingoman_prg_map)
MCFG_CPU_IO_MAP(bingoman_io_map)
diff --git a/src/mame/drivers/bingor.cpp b/src/mame/drivers/bingor.cpp
index 4e14f5a99a5..e0b2b0cce10 100644
--- a/src/mame/drivers/bingor.cpp
+++ b/src/mame/drivers/bingor.cpp
@@ -681,7 +681,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(bingor_state::bingor)
- MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", I80186, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(bingor_map)
MCFG_CPU_IO_MAP(bingor_io)
MCFG_CPU_PERIODIC_INT_DRIVER(bingor_state, nmi_line_pulse, 30)
@@ -765,7 +765,7 @@ static ADDRESS_MAP_START( slave_io, AS_IO, 8, bingor_state)
ADDRESS_MAP_END
MACHINE_CONFIG_START(bingor_state::vip2000)
- MCFG_CPU_ADD("maincpu", I80186, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", I80186, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(vip2000_map)
MCFG_CPU_IO_MAP(vip2000_io)
MCFG_CPU_PERIODIC_INT_DRIVER(bingor_state, nmi_line_pulse, 30)
@@ -773,11 +773,11 @@ MACHINE_CONFIG_START(bingor_state::vip2000)
MCFG_ATMEL_49F4096_ADD("flash")
- MCFG_CPU_ADD("slavecpu", I80C31, XTAL_11_0592MHz)
+ MCFG_CPU_ADD("slavecpu", I80C31, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(slave_map)
MCFG_CPU_IO_MAP(slave_io)
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/bingowav.cpp b/src/mame/drivers/bingowav.cpp
index a841d3335d1..c2bcb01d45d 100644
--- a/src/mame/drivers/bingowav.cpp
+++ b/src/mame/drivers/bingowav.cpp
@@ -136,7 +136,7 @@ MACHINE_CONFIG_START(bingowav_state::bingowav)
MCFG_CPU_PROGRAM_MAP(bingowav_drive_map)
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("ctrlcpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("ctrlcpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(bingowav_control_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp
index 3545d007eac..753f3db252d 100644
--- a/src/mame/drivers/bionicc.cpp
+++ b/src/mame/drivers/bionicc.cpp
@@ -372,13 +372,13 @@ void bionicc_state::machine_reset()
MACHINE_CONFIG_START(bionicc_state::bionicc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz - verified in schematics */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz - verified in schematics */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bionicc_state, scanline, "screen", 0, 1)
/* Protection MCU Intel C8751H-88 runs at 24MHz / 4 = 6MHz */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181) / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */
MCFG_CPU_PROGRAM_MAP(sound_map)
/* FIXME: interrupt timing
* schematics indicate that nmi_line is set on M680000 access with AB1=1
@@ -390,7 +390,7 @@ MACHINE_CONFIG_START(bionicc_state::bionicc)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
/* FIXME: should be 257 visible horizontal pixels, first visible pixel should be repeated, back porch/front porch should be separated */
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz / 4, 386, 0, 256, 260, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000) / 4, 386, 0, 256, 260, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(bionicc_state, screen_update)
MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
@@ -408,7 +408,7 @@ MACHINE_CONFIG_START(bionicc_state::bionicc)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz / 4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181) / 4)
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp
index e7ad9e72d8f..49b812fdeac 100644
--- a/src/mame/drivers/bitgraph.cpp
+++ b/src/mame/drivers/bitgraph.cpp
@@ -528,11 +528,11 @@ MACHINE_CONFIG_START(bitgraph_state::bg_motherboard)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE(ACIA2_TAG, acia6850_device, write_cts))
// XXX actual part may be something else
- MCFG_DEVICE_ADD(COM8116_A_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(COM8116_A_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(WRITELINE(bitgraph_state, com8116_a_fr_w))
MCFG_COM8116_FT_HANDLER(WRITELINE(bitgraph_state, com8116_a_ft_w))
- MCFG_DEVICE_ADD(COM8116_B_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(COM8116_B_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(WRITELINE(bitgraph_state, com8116_b_fr_w))
MCFG_COM8116_FT_HANDLER(WRITELINE(bitgraph_state, com8116_b_ft_w))
@@ -547,14 +547,14 @@ MACHINE_CONFIG_START(bitgraph_state::bg_motherboard)
MCFG_ER2055_ADD(EAROM_TAG)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(PSG_TAG, AY8912, XTAL_1_2944MHz)
+ MCFG_SOUND_ADD(PSG_TAG, AY8912, XTAL(1'294'400))
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(bitgraph_state, earom_write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
#ifdef UNUSED_FUNCTION
MACHINE_CONFIG_START(bitgraph_state::bg_ppu)
- MCFG_CPU_ADD(PPU_TAG, I8035, XTAL_6_9MHz)
+ MCFG_CPU_ADD(PPU_TAG, I8035, XTAL(6'900'000))
MCFG_CPU_IO_MAP(ppu_io)
// MCFG_MCS48_PORT_T0_IN_CB(READLINE(bitgraph_state, ppu_t0_r))
MCFG_MCS48_PORT_PROG_OUT_CB(DEVWRITELINE("i8243", i8243_device, prog_w))
@@ -574,7 +574,7 @@ MACHINE_CONFIG_END
#endif
MACHINE_CONFIG_START(bitgraph_state::bitgrpha)
- MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_6_9MHz)
+ MCFG_CPU_ADD(M68K_TAG, M68000, XTAL(6'900'000))
MCFG_CPU_PROGRAM_MAP(bitgrapha_mem)
MCFG_FRAGMENT_ADD(bg_motherboard)
@@ -597,7 +597,7 @@ MACHINE_CONFIG_START(bitgraph_state::bitgrpha)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bitgraph_state::bitgrphb)
- MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_6_9MHz)
+ MCFG_CPU_ADD(M68K_TAG, M68000, XTAL(6'900'000))
MCFG_CPU_PROGRAM_MAP(bitgraphb_mem)
MCFG_FRAGMENT_ADD(bg_motherboard)
diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp
index 49d36630a9a..b60301fcd6b 100644
--- a/src/mame/drivers/bking.cpp
+++ b/src/mame/drivers/bking.cpp
@@ -388,12 +388,12 @@ MACHINE_RESET_MEMBER(bking_state,bking3)
MACHINE_CONFIG_START(bking_state::bking)
/* basic machine hardware */
- MCFG_CPU_ADD("main_cpu", Z80, XTAL_12MHz/4) /* 3 MHz */
+ MCFG_CPU_ADD("main_cpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */
MCFG_CPU_PROGRAM_MAP(bking_map)
MCFG_CPU_IO_MAP(bking_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bking_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_6MHz/2) /* 3 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(6'000'000)/2) /* 3 MHz */
MCFG_CPU_PROGRAM_MAP(bking_audio_map)
/* interrupts (from Jungle King hardware, might be wrong): */
/* - no interrupts synced with vblank */
@@ -426,10 +426,10 @@ MACHINE_CONFIG_START(bking_state::bking)
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_6MHz/4)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(6'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_6MHz/4)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(6'000'000)/4)
MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("dac", dac_byte_interface, write))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(bking_state, port_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
@@ -445,7 +445,7 @@ MACHINE_CONFIG_DERIVED(bking_state::bking3, bking)
MCFG_CPU_MODIFY("main_cpu")
MCFG_CPU_IO_MAP(bking3_io_map)
- MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL_3MHz) /* xtal is 3MHz, divided by 4 internally */
+ MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(3'000'000)) /* xtal is 3MHz, divided by 4 internally */
MCFG_MACHINE_START_OVERRIDE(bking_state,bking3)
MCFG_MACHINE_RESET_OVERRIDE(bking_state,bking3)
diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp
index 0a5af96ec25..3ba43e7b4e1 100644
--- a/src/mame/drivers/bladestl.cpp
+++ b/src/mame/drivers/bladestl.cpp
@@ -302,11 +302,11 @@ void bladestl_state::machine_reset()
MACHINE_CONFIG_START(bladestl_state::bladestl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, XTAL_24MHz / 8) // divider not verified (from 007342 custom)
+ MCFG_CPU_ADD("maincpu", HD6309E, XTAL(24'000'000) / 8) // divider not verified (from 007342 custom)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bladestl_state, bladestl_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL_24MHz / 16)
+ MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(24'000'000) / 16)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -347,10 +347,10 @@ MACHINE_CONFIG_START(bladestl_state::bladestl)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("upd", UPD7759, XTAL_640kHz)
+ MCFG_SOUND_ADD("upd", UPD7759, XTAL(640'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_24MHz / 8)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000) / 8)
MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("upd", upd775x_device, port_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(bladestl_state, bladestl_port_B_w))
MCFG_SOUND_ROUTE(0, "filter1", 0.45)
diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp
index f728d41dd5f..ac86656986e 100644
--- a/src/mame/drivers/blitz68k.cpp
+++ b/src/mame/drivers/blitz68k.cpp
@@ -1751,7 +1751,7 @@ MACHINE_CONFIG_DERIVED(blitz68k_state::steaser, ilpag)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::cjffruit)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(22'118'400)/2)
MCFG_CPU_PROGRAM_MAP(cjffruit_map)
// MC68HC705C8P (Sound MCU)
@@ -1765,7 +1765,7 @@ MACHINE_CONFIG_START(blitz68k_state::cjffruit)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-8-1)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k)
- MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL_22_1184MHz/8)
+ MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL(22'118'400)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1779,7 +1779,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::bankrob)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(bankrob_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc
// irq 2 reads from MCUs
@@ -1797,7 +1797,7 @@ MACHINE_CONFIG_START(blitz68k_state::bankrob)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k)
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_11_0592MHz/4)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(11'059'200)/4)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1811,7 +1811,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::bankroba)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz )
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200) )
MCFG_CPU_PROGRAM_MAP(bankroba_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq5_line_hold) // protection prevents correct irq frequency by crtc
// irq 3,4 read from MCUs
@@ -1827,7 +1827,7 @@ MACHINE_CONFIG_START(blitz68k_state::bankroba)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+7, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k)
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_11_0592MHz/4)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(11'059'200)/4)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1841,7 +1841,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::deucesw2)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(22'118'400) / 2)
MCFG_CPU_PROGRAM_MAP(deucesw2_map)
// irq 2 reads from MCUs
@@ -1856,7 +1856,7 @@ MACHINE_CONFIG_START(blitz68k_state::deucesw2)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k)
- MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL_22_1184MHz/8)
+ MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL(22'118'400)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1870,7 +1870,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::dualgame)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz )
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200) )
MCFG_CPU_PROGRAM_MAP(dualgame_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq2_line_hold) // lev 2 = MCUs, lev 3 = vblank
@@ -1887,7 +1887,7 @@ MACHINE_CONFIG_START(blitz68k_state::dualgame)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k)
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_11_0592MHz/4)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(11'059'200)/4)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1901,7 +1901,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::hermit)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz/2 )
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(22'118'400)/2 )
MCFG_CPU_PROGRAM_MAP(hermit_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq1_line_hold) // protection prevents correct irq frequency by crtc
@@ -1916,7 +1916,7 @@ MACHINE_CONFIG_START(blitz68k_state::hermit)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k)
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_22_1184MHz/8)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(22'118'400)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1930,7 +1930,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::maxidbl)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(maxidbl_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc
// irq 2 reads from MCUs
@@ -1950,7 +1950,7 @@ MACHINE_CONFIG_START(blitz68k_state::maxidbl)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k_noblit)
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_11_0592MHz/4)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(11'059'200)/4)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1960,7 +1960,7 @@ MACHINE_CONFIG_START(blitz68k_state::maxidbl)
MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SAA1099_ADD("saa", XTAL_8MHz/2)
+ MCFG_SAA1099_ADD("saa", XTAL(8'000'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp
index 1f66b74e86a..b19291d24a7 100644
--- a/src/mame/drivers/blktiger.cpp
+++ b/src/mame/drivers/blktiger.cpp
@@ -298,15 +298,15 @@ void blktiger_state::machine_reset()
MACHINE_CONFIG_START(blktiger_state::blktiger)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(blktiger_map)
MCFG_CPU_IO_MAP(blktiger_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blktiger_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(blktiger_sound_map)
- MCFG_CPU_ADD("mcu", I8751, XTAL_24MHz/4) /* ??? */
+ MCFG_CPU_ADD("mcu", I8751, XTAL(24'000'000)/4) /* ??? */
MCFG_CPU_PROGRAM_MAP(blktiger_mcu_map)
MCFG_CPU_IO_MAP(blktiger_mcu_io_map)
//MCFG_CPU_VBLANK_INT_DRIVER("screen", blktiger_state, irq0_line_hold)
@@ -335,11 +335,11 @@ MACHINE_CONFIG_START(blktiger_state::blktiger)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blmbycar.cpp b/src/mame/drivers/blmbycar.cpp
index f6d774bcc67..44505469126 100644
--- a/src/mame/drivers/blmbycar.cpp
+++ b/src/mame/drivers/blmbycar.cpp
@@ -346,7 +346,7 @@ MACHINE_RESET_MEMBER(blmbycar_state,blmbycar)
MACHINE_CONFIG_START(blmbycar_state::blmbycar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz */
MCFG_CPU_PROGRAM_MAP(blmbycar_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blmbycar_state, irq1_line_hold)
@@ -370,7 +370,7 @@ MACHINE_CONFIG_START(blmbycar_state::blmbycar)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(0, blmbycar_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
diff --git a/src/mame/drivers/blockade.cpp b/src/mame/drivers/blockade.cpp
index 3517fc36d07..efaeef97b9d 100644
--- a/src/mame/drivers/blockade.cpp
+++ b/src/mame/drivers/blockade.cpp
@@ -463,13 +463,13 @@ void blockade_state::device_timer(emu_timer &timer, device_timer_id id, int para
//**************************************************************************
MACHINE_CONFIG_START(blockade_state::blockade)
- MCFG_CPU_ADD("maincpu", I8080A, XTAL_20_079MHz / 10)
+ MCFG_CPU_ADD("maincpu", I8080A, XTAL(20'790'000) / 10)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_io_map)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_20_079MHz / 4, 330, 0, 256, 262, 0, 224)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(20'790'000) / 4, 330, 0, 256, 262, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(blockade_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp
index 6afb1bcd717..b25fde97ca3 100644
--- a/src/mame/drivers/blockhl.cpp
+++ b/src/mame/drivers/blockhl.cpp
@@ -273,7 +273,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(blockhl_state::blockhl)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/8) // Konami 052526
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/8) // Konami 052526
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_KONAMICPU_LINE_CB(WRITE8(blockhl_state, banking_callback))
@@ -284,16 +284,16 @@ MACHINE_CONFIG_START(blockhl_state::blockhl)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(12)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x0800)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(audio_map)
MCFG_WATCHDOG_ADD("watchdog")
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/3, 528, 112, 400, 256, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/3, 528, 112, 400, 256, 16, 240)
// 6MHz dotclock is more realistic, however needs drawing updates. replace when ready
-// MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 396, hbend, hbstart, 256, 16, 240)
+// MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4, 396, hbend, hbstart, 256, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(blockhl_state, screen_update_blockhl)
MCFG_SCREEN_PALETTE("palette")
@@ -317,7 +317,7 @@ MACHINE_CONFIG_START(blockhl_state::blockhl)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blockout.cpp b/src/mame/drivers/blockout.cpp
index 29465cda159..c7b88f3d9d3 100644
--- a/src/mame/drivers/blockout.cpp
+++ b/src/mame/drivers/blockout.cpp
@@ -76,8 +76,8 @@
#include "speaker.h"
-#define MAIN_CLOCK XTAL_10MHz
-#define AUDIO_CLOCK XTAL_3_579545MHz
+#define MAIN_CLOCK XTAL(10'000'000)
+#define AUDIO_CLOCK XTAL(3'579'545)
WRITE16_MEMBER(blockout_state::blockout_irq6_ack_w)
{
@@ -315,7 +315,7 @@ MACHINE_CONFIG_START(blockout_state::blockout)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
/* assume same as ddragon3 with adjusted visible display area */
- MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz / 4, 448, 0, 320, 272, 10, 250)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 448, 0, 320, 272, 10, 250)
MCFG_SCREEN_UPDATE_DRIVER(blockout_state, screen_update_blockout)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/bloodbro.cpp b/src/mame/drivers/bloodbro.cpp
index e7c1b1a5307..04fb23364fa 100644
--- a/src/mame/drivers/bloodbro.cpp
+++ b/src/mame/drivers/bloodbro.cpp
@@ -519,11 +519,11 @@ WRITE16_MEMBER( bloodbro_state::weststry_layer_scroll_w )
MACHINE_CONFIG_START(bloodbro_state::bloodbro)
// 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(bloodbro_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bloodbro_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_7_15909MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(7'159'090)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
// video hardware
@@ -548,11 +548,11 @@ MACHINE_CONFIG_START(bloodbro_state::bloodbro)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_7_15909MHz/2)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(7'159'090)/2)
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/12, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -569,7 +569,7 @@ MACHINE_CONFIG_DERIVED(bloodbro_state::weststry, bloodbro)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bloodbro_state, irq6_line_hold)
MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_CLOCK(XTAL_20MHz/4) /* 5MHz - verified on PCB */
+ MCFG_CPU_CLOCK(XTAL(20'000'000)/4) /* 5MHz - verified on PCB */
MCFG_CPU_PROGRAM_MAP(weststry_sound_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", weststry)
@@ -585,10 +585,10 @@ MACHINE_CONFIG_DERIVED(bloodbro_state::weststry, bloodbro)
// Bootleg sound hardware is close copy of Seibu, but uses different interrupts
- MCFG_OKIM6295_REPLACE("oki", XTAL_20MHz/16, PIN7_HIGH) /* 1.25MHz - verified on PCB */
+ MCFG_OKIM6295_REPLACE("oki", XTAL(20'000'000)/16, PIN7_HIGH) /* 1.25MHz - verified on PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_REPLACE("ymsnd", YM3812, XTAL_20MHz/4) /* ~4.9MHz - see notes at top */
+ MCFG_SOUND_REPLACE("ymsnd", YM3812, XTAL(20'000'000)/4) /* ~4.9MHz - see notes at top */
MCFG_YM3812_IRQ_HANDLER(WRITELINE(bloodbro_state, weststry_opl_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp
index 30737bd3f75..55acb371e40 100644
--- a/src/mame/drivers/bmcbowl.cpp
+++ b/src/mame/drivers/bmcbowl.cpp
@@ -452,7 +452,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, bmcbowl_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(bmcbowl_state::bmcbowl)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_21_4772MHz / 2 )
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(21'477'272) / 2 )
MCFG_CPU_PROGRAM_MAP(bmcbowl_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bmcbowl_state, irq2_line_hold)
@@ -471,11 +471,11 @@ MACHINE_CONFIG_START(bmcbowl_state::bmcbowl)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz ) // guessed chip type, clock not verified
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545) ) // guessed chip type, clock not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_3_579545MHz / 2)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(3'579'545) / 2)
MCFG_AY8910_PORT_A_READ_CB(READ8(bmcbowl_state, dips1_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(bmcbowl_state, input_mux_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp
index 514f671b284..24cd9425658 100644
--- a/src/mame/drivers/bmcpokr.cpp
+++ b/src/mame/drivers/bmcpokr.cpp
@@ -803,7 +803,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, bmcpokr_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(bmcpokr_state::bmcpokr)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_42MHz / 4) // 68000 @10.50MHz (42/4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(42'000'000) / 4) // 68000 @10.50MHz (42/4)
MCFG_CPU_PROGRAM_MAP(bmcpokr_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bmcpokr_state, interrupt, "screen", 0, 1)
@@ -826,11 +826,11 @@ MACHINE_CONFIG_START(bmcpokr_state::bmcpokr)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_42MHz / 12) // UM3567 @3.50MHz (42/12)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(42'000'000) / 12) // UM3567 @3.50MHz (42/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_42MHz / 40, PIN7_HIGH) // M6295 @1.05MHz (42/40), pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(42'000'000) / 40, PIN7_HIGH) // M6295 @1.05MHz (42/40), pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bmjr.cpp b/src/mame/drivers/bmjr.cpp
index 015f539707b..722ffb97786 100644
--- a/src/mame/drivers/bmjr.cpp
+++ b/src/mame/drivers/bmjr.cpp
@@ -336,7 +336,7 @@ void bmjr_state::machine_reset()
MACHINE_CONFIG_START(bmjr_state::bmjr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6800, XTAL_4MHz/4) //unknown clock / divider
+ MCFG_CPU_ADD("maincpu",M6800, XTAL(4'000'000)/4) //unknown clock / divider
MCFG_CPU_PROGRAM_MAP(bmjr_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bmjr_state, irq0_line_hold)
diff --git a/src/mame/drivers/bob85.cpp b/src/mame/drivers/bob85.cpp
index 24cc1cba8c3..3484575f637 100644
--- a/src/mame/drivers/bob85.cpp
+++ b/src/mame/drivers/bob85.cpp
@@ -201,7 +201,7 @@ READ_LINE_MEMBER( bob85_state::sid_r )
MACHINE_CONFIG_START(bob85_state::bob85)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_5MHz)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(bob85_mem)
MCFG_CPU_IO_MAP(bob85_io)
MCFG_I8085A_SID(READLINE(bob85_state, sid_r))
diff --git a/src/mame/drivers/bogeyman.cpp b/src/mame/drivers/bogeyman.cpp
index 6f5ba9acafd..3eb6467e7bd 100644
--- a/src/mame/drivers/bogeyman.cpp
+++ b/src/mame/drivers/bogeyman.cpp
@@ -243,7 +243,7 @@ MACHINE_CONFIG_START(bogeyman_state::bogeyman)
// MCFG_SCREEN_SIZE(32*8, 32*8)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
// DECO video CRTC, unverified
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2,384,0,256,272,8,248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2,384,0,256,272,8,248)
MCFG_SCREEN_UPDATE_DRIVER(bogeyman_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/bombjack.cpp b/src/mame/drivers/bombjack.cpp
index 61c298d4e61..32320841d74 100644
--- a/src/mame/drivers/bombjack.cpp
+++ b/src/mame/drivers/bombjack.cpp
@@ -345,11 +345,11 @@ INTERRUPT_GEN_MEMBER(bombjack_state::vblank_irq)
MACHINE_CONFIG_START(bombjack_state::bombjack)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) /* Confirmed from PCB */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000)) /* Confirmed from PCB */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bombjack_state, vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/4) /* Confirmed from PCB */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* Confirmed from PCB */
MCFG_CPU_PROGRAM_MAP(audio_map)
MCFG_CPU_IO_MAP(audio_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bombjack_state, nmi_line_pulse)
@@ -373,13 +373,13 @@ MACHINE_CONFIG_START(bombjack_state::bombjack)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8) /* Confirmed from PCB */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* Confirmed from PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
- MCFG_SOUND_ADD("ay3", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ay3", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp
index 748352a91d6..51c5b166a25 100644
--- a/src/mame/drivers/bottom9.cpp
+++ b/src/mame/drivers/bottom9.cpp
@@ -301,11 +301,11 @@ void bottom9_state::machine_reset()
MACHINE_CONFIG_START(bottom9_state::bottom9)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, XTAL_24MHz / 8) // 63C09E
+ MCFG_CPU_ADD("maincpu", HD6309E, XTAL(24'000'000) / 8) // 63C09E
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bottom9_state, bottom9_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(audio_map)
MCFG_CPU_PERIODIC_INT_DRIVER(bottom9_state, bottom9_sound_interrupt, 8*60) /* irq is triggered by the main CPU */
@@ -342,12 +342,12 @@ MACHINE_CONFIG_START(bottom9_state::bottom9)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("k007232_1", K007232, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("k007232_1", K007232, XTAL(3'579'545))
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(bottom9_state, volume_callback0))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
- MCFG_SOUND_ADD("k007232_2", K007232, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("k007232_2", K007232, XTAL(3'579'545))
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(bottom9_state, volume_callback1))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp
index afd92c51d1d..381dc41eeeb 100644
--- a/src/mame/drivers/boxer.cpp
+++ b/src/mame/drivers/boxer.cpp
@@ -15,7 +15,7 @@
#include "machine/watchdog.h"
#include "screen.h"
-#define MASTER_CLOCK XTAL_12_096MHz
+#define MASTER_CLOCK XTAL(12'096'000)
/*************************************
*
diff --git a/src/mame/drivers/bpmmicro.cpp b/src/mame/drivers/bpmmicro.cpp
index 2b81dd25610..2ca45d8f263 100644
--- a/src/mame/drivers/bpmmicro.cpp
+++ b/src/mame/drivers/bpmmicro.cpp
@@ -360,7 +360,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bpmmicro_state::bpmmicro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80286, XTAL_32MHz/4) /* divider is guessed, cpu is an AMD N80L286-16/S part */
+ MCFG_CPU_ADD("maincpu", I80286, XTAL(32'000'000)/4) /* divider is guessed, cpu is an AMD N80L286-16/S part */
MCFG_CPU_PROGRAM_MAP(i286_mem)
MCFG_CPU_IO_MAP(i286_io)
diff --git a/src/mame/drivers/br8641.cpp b/src/mame/drivers/br8641.cpp
index 6eb0070d0d4..02fb9b02d7e 100644
--- a/src/mame/drivers/br8641.cpp
+++ b/src/mame/drivers/br8641.cpp
@@ -156,7 +156,7 @@ static const z80_daisy_config daisy_chain_intf[] =
MACHINE_CONFIG_START(brandt8641_state::brandt8641)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) // U4 ,4MHz crystal on board
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000)) // U4 ,4MHz crystal on board
MCFG_CPU_PROGRAM_MAP(brandt8641_mem)
MCFG_CPU_IO_MAP(brandt8641_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
@@ -169,19 +169,19 @@ MACHINE_CONFIG_START(brandt8641_state::brandt8641)
// Z80APIO U9
// Z80APIO U14
// Z80PIO U7 - unknown which is which
- MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(brandt8641_state, port08_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(brandt8641_state, port08_w))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(brandt8641_state, port09_w))
- MCFG_DEVICE_ADD("pio3", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("pio3", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz) // Z80CTC U8
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000)) // Z80CTC U8
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/brkthru.cpp b/src/mame/drivers/brkthru.cpp
index c9877da23f1..9a0d89767a1 100644
--- a/src/mame/drivers/brkthru.cpp
+++ b/src/mame/drivers/brkthru.cpp
@@ -61,7 +61,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
/*************************************
diff --git a/src/mame/drivers/btime.cpp b/src/mame/drivers/btime.cpp
index 18e32e4dade..c9aee299e49 100644
--- a/src/mame/drivers/btime.cpp
+++ b/src/mame/drivers/btime.cpp
@@ -149,7 +149,7 @@ A few notes:
#include "machine/deco222.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
#define HCLK (MASTER_CLOCK/2)
#define HCLK1 (HCLK/2)
#define HCLK2 (HCLK1/2)
diff --git a/src/mame/drivers/btoads.cpp b/src/mame/drivers/btoads.cpp
index 82b821f5e01..182e3001820 100644
--- a/src/mame/drivers/btoads.cpp
+++ b/src/mame/drivers/btoads.cpp
@@ -14,9 +14,9 @@
#include "speaker.h"
-#define CPU_CLOCK XTAL_64MHz
-#define VIDEO_CLOCK XTAL_20MHz
-#define SOUND_CLOCK XTAL_24MHz
+#define CPU_CLOCK XTAL(64'000'000)
+#define VIDEO_CLOCK XTAL(20'000'000)
+#define SOUND_CLOCK XTAL(24'000'000)
diff --git a/src/mame/drivers/bublbobl.cpp b/src/mame/drivers/bublbobl.cpp
index c6a5fbe31b9..ec482967cda 100644
--- a/src/mame/drivers/bublbobl.cpp
+++ b/src/mame/drivers/bublbobl.cpp
@@ -284,7 +284,7 @@ TODO:
#include "speaker.h"
-#define MAIN_XTAL XTAL_24MHz
+#define MAIN_XTAL XTAL(24'000'000)
/*************************************
@@ -1003,7 +1003,7 @@ MACHINE_CONFIG_START(bublbobl_state::bublbobl_nomcu)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(bublbobl_state::bublbobl, bublbobl_nomcu)
- MCFG_CPU_ADD("mcu", M6801, XTAL_4MHz) // actually 6801U4 - xtal is 4MHz, divided by 4 internally
+ MCFG_CPU_ADD("mcu", M6801, XTAL(4'000'000)) // actually 6801U4 - xtal is 4MHz, divided by 4 internally
MCFG_CPU_PROGRAM_MAP(mcu_map)
MCFG_SCREEN_MODIFY("screen")
@@ -1064,7 +1064,7 @@ MACHINE_RESET_MEMBER(bub68705_state, bub68705)
MACHINE_CONFIG_DERIVED(bub68705_state::bub68705, bublbobl_nomcu)
/* basic machine hardware */
- MCFG_CPU_ADD("mcu", M68705P3, XTAL_4MHz) // xtal is 4MHz, divided by 4 internally
+ MCFG_CPU_ADD("mcu", M68705P3, XTAL(4'000'000)) // xtal is 4MHz, divided by 4 internally
MCFG_M68705_PORTC_R_CB(IOPORT("IN0"))
MCFG_M68705_PORTA_W_CB(WRITE8(bub68705_state, port_a_w))
MCFG_M68705_PORTB_W_CB(WRITE8(bub68705_state, port_b_w))
diff --git a/src/mame/drivers/buggychl.cpp b/src/mame/drivers/buggychl.cpp
index 1337637d6ea..5c56cf9e93e 100644
--- a/src/mame/drivers/buggychl.cpp
+++ b/src/mame/drivers/buggychl.cpp
@@ -449,13 +449,13 @@ void buggychl_state::machine_reset()
MACHINE_CONFIG_START(buggychl_state::buggychl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_48MHz/8) /* 6 MHz according to schematics, though it can be jumpered for 4MHz as well */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(48'000'000)/8) /* 6 MHz according to schematics, though it can be jumpered for 4MHz as well */
MCFG_CPU_PROGRAM_MAP(buggychl_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", buggychl_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* 4 MHz according to schematics */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz according to schematics */
MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(buggychl_state, irq0_line_hold, ((((XTAL_8MHz/2)/2)/256)/64)) // timer irq
+ MCFG_CPU_PERIODIC_INT_DRIVER(buggychl_state, irq0_line_hold, ((((XTAL(8'000'000)/2)/2)/256)/64)) // timer irq
// schematics shows a 61.035 (x2?) Hz, similar to flstory.cpp and other Taito MSM5232 based games.
// apparently schematics also shows a switch for the timer irq that makes it to run at half speed, no idea where this is located.
/* audiocpu nmi is caused by (main->sound semaphore)&&(sound_nmi_enabled), identical to bubble bobble. */
@@ -475,7 +475,7 @@ MACHINE_CONFIG_START(buggychl_state::buggychl)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
// derived from ladyfrog.cpp, causes glitches?
-// MCFG_SCREEN_RAW_PARAMS( XTAL_8MHz, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz
+// MCFG_SCREEN_RAW_PARAMS( XTAL(8'000'000), 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz
MCFG_SCREEN_UPDATE_DRIVER(buggychl_state, screen_update_buggychl)
MCFG_SCREEN_PALETTE("palette")
@@ -498,17 +498,17 @@ MACHINE_CONFIG_START(buggychl_state::buggychl)
MCFG_TA7630_ADD("ta7630")
- MCFG_SOUND_ADD("ay1", YM2149, XTAL_8MHz/4)
+ MCFG_SOUND_ADD("ay1", YM2149, XTAL(8'000'000)/4)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(buggychl_state, ta7630_volbal_ay1_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(buggychl_state, port_b_0_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", YM2149, XTAL_8MHz/4)
+ MCFG_SOUND_ADD("ay2", YM2149, XTAL(8'000'000)/4)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(buggychl_state, ta7630_volbal_ay2_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(buggychl_state, port_b_1_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5232, XTAL_8MHz/4)
+ MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4)
MCFG_MSM5232_SET_CAPACITORS(0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6) /* default 0.39 uF capacitors (not verified) */
MCFG_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp
index 2651c8c3baa..da830a9f641 100644
--- a/src/mame/drivers/bullet.cpp
+++ b/src/mame/drivers/bullet.cpp
@@ -302,7 +302,7 @@ WRITE8_MEMBER( bullet_state::hdcon_w )
if (m_hdcon_sw)
{
// FDC clock
- m_fdc->set_unscaled_clock(BIT(data, 2) ? XTAL_16MHz/16 : XTAL_16MHz/8);
+ m_fdc->set_unscaled_clock(BIT(data, 2) ? XTAL(16'000'000)/16 : XTAL(16'000'000)/8);
// density select
m_fdc->dden_w(BIT(data, 3));
@@ -495,7 +495,7 @@ WRITE8_MEMBER( bulletf_state::xfdc_w )
}
// FDC clock
- m_fdc->set_unscaled_clock(BIT(data, 6) ? XTAL_16MHz/16 : XTAL_16MHz/8);
+ m_fdc->set_unscaled_clock(BIT(data, 6) ? XTAL(16'000'000)/16 : XTAL(16'000'000)/8);
// density select
m_fdc->dden_w(BIT(data, 7));
@@ -1054,7 +1054,7 @@ void bullet_state::machine_reset()
uint8_t sw1 = m_sw1->read();
int mini = BIT(sw1, 6);
- m_fdc->set_unscaled_clock(mini ? XTAL_16MHz/16 : XTAL_16MHz/8);
+ m_fdc->set_unscaled_clock(mini ? XTAL(16'000'000)/16 : XTAL(16'000'000)/8);
m_fdc->dden_w(BIT(sw1, 7));
if (mini)
@@ -1101,21 +1101,21 @@ void bulletf_state::machine_reset()
MACHINE_CONFIG_START(bullet_state::bullet)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
MCFG_CPU_PROGRAM_MAP(bullet_mem)
MCFG_CPU_IO_MAP(bullet_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
// devices
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(bullet_state, dart_rxtxca_w))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
- MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", bullet_state, ctc_tick, attotime::from_hz(XTAL_4_9152MHz/4))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", bullet_state, ctc_tick, attotime::from_hz(XTAL(4'915'200)/4))
- MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(16'000'000)/4)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
@@ -1126,7 +1126,7 @@ MACHINE_CONFIG_START(bullet_state::bullet)
MCFG_Z80DART_OUT_WRDYB_CB(WRITELINE(bullet_state, dartbrdy_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(16'000'000)/4)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80DMA_IN_MREQ_CB(READ8(bullet_state, dma_mreq_r))
@@ -1134,12 +1134,12 @@ MACHINE_CONFIG_START(bullet_state::bullet)
MCFG_Z80DMA_IN_IORQ_CB(READ8(bullet_state, io_read_byte))
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(bullet_state, io_write_byte))
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(16'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_Z80PIO_IN_PB_CB(READ8(bullet_state, pio_pb_r))
- MCFG_MB8877_ADD(MB8877_TAG, XTAL_16MHz/16)
+ MCFG_MB8877_ADD(MB8877_TAG, XTAL(16'000'000)/16)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z80DART_TAG, z80dart_device, dcda_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bullet_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", bullet_525_floppies, "525qd", floppy_image_device::default_floppy_formats)
@@ -1181,21 +1181,21 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bulletf_state::bulletf)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
MCFG_CPU_PROGRAM_MAP(bulletf_mem)
MCFG_CPU_IO_MAP(bulletf_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
// devices
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(bullet_state, dart_rxtxca_w))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
- MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", bullet_state, ctc_tick, attotime::from_hz(XTAL_4_9152MHz/4))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", bullet_state, ctc_tick, attotime::from_hz(XTAL(4'915'200)/4))
- MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(16'000'000)/4)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
@@ -1206,7 +1206,7 @@ MACHINE_CONFIG_START(bulletf_state::bulletf)
MCFG_Z80DART_OUT_WRDYB_CB(WRITELINE(bullet_state, dartbrdy_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(16'000'000)/4)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80DMA_IN_MREQ_CB(READ8(bullet_state, dma_mreq_r))
@@ -1214,14 +1214,14 @@ MACHINE_CONFIG_START(bulletf_state::bulletf)
MCFG_Z80DMA_IN_IORQ_CB(READ8(bullet_state, io_read_byte))
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(bullet_state, io_write_byte))
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(16'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(DEVREAD8("scsi_ctrl_in", input_buffer_device, read))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(bulletf_state, pio_pa_w))
MCFG_Z80PIO_OUT_ARDY_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(bulletf_state, cstrb_w))
- MCFG_MB8877_ADD(MB8877_TAG, XTAL_16MHz/16)
+ MCFG_MB8877_ADD(MB8877_TAG, XTAL(16'000'000)/16)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z80DART_TAG, z80dart_device, rib_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bullet_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", bullet_525_floppies, "525qd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/buster.cpp b/src/mame/drivers/buster.cpp
index b48133dbe24..ddea6ffa18b 100644
--- a/src/mame/drivers/buster.cpp
+++ b/src/mame/drivers/buster.cpp
@@ -318,7 +318,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(buster_state::buster)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL_3_579545MHz) /* ? MHz */
+ MCFG_CPU_ADD("maincpu", Z80,XTAL(3'579'545)) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(mainmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", buster_state, irq0_line_hold)
@@ -331,7 +331,7 @@ MACHINE_CONFIG_START(buster_state::buster)
MCFG_SCREEN_UPDATE_DRIVER(buster_state, screen_update_buster)
MCFG_SCREEN_PALETTE("palette")
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_3_579545MHz/4) //unknown clock / type
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(3'579'545)/4) //unknown clock / type
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp
index 80379fcc7cf..666dcd45574 100644
--- a/src/mame/drivers/bw12.cpp
+++ b/src/mame/drivers/bw12.cpp
@@ -545,7 +545,7 @@ GFXDECODE_END
/* Machine Driver */
MACHINE_CONFIG_START(bw12_state::common)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
MCFG_CPU_PROGRAM_MAP(bw12_mem)
MCFG_CPU_IO_MAP(bw12_io)
@@ -560,7 +560,7 @@ MACHINE_CONFIG_START(bw12_state::common)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bw12)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/8)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(16'000'000)/8)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(bw12_state, crtc_update_row)
@@ -583,7 +583,7 @@ MACHINE_CONFIG_START(bw12_state::common)
MCFG_PIA_IRQA_HANDLER(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_PIA_IRQB_HANDLER(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(16'000'000)/4)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
@@ -593,11 +593,11 @@ MACHINE_CONFIG_START(bw12_state::common)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(PIT8253_TAG, PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_1_8432MHz)
+ MCFG_PIT8253_CLK0(XTAL(1'843'200))
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(bw12_state, pit_out0_w))
- MCFG_PIT8253_CLK1(XTAL_1_8432MHz)
+ MCFG_PIT8253_CLK1(XTAL(1'843'200))
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
- MCFG_PIT8253_CLK2(XTAL_1_8432MHz)
+ MCFG_PIT8253_CLK2(XTAL(1'843'200))
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(bw12_state, pit_out2_w))
MCFG_DEVICE_ADD(AY3600PRO002_TAG, AY3600, 0)
diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp
index a23911565b2..546c00cce97 100644
--- a/src/mame/drivers/bw2.cpp
+++ b/src/mame/drivers/bw2.cpp
@@ -571,7 +571,7 @@ void bw2_state::machine_start()
MACHINE_CONFIG_START(bw2_state::bw2)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
MCFG_CPU_PROGRAM_MAP(bw2_mem)
MCFG_CPU_IO_MAP(bw2_io)
@@ -588,7 +588,7 @@ MACHINE_CONFIG_START(bw2_state::bw2)
// devices
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_16MHz/4) // 8251 USART TXC, RXC
+ MCFG_PIT8253_CLK0(XTAL(16'000'000)/4) // 8251 USART TXC, RXC
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(I8251_TAG, i8251_device, write_rxc))
MCFG_PIT8253_CLK1(11000) // LCD controller
@@ -602,7 +602,7 @@ MACHINE_CONFIG_START(bw2_state::bw2)
MCFG_I8255_IN_PORTC_CB(READ8(bw2_state, ppi_pc_r))
MCFG_I8255_OUT_PORTC_CB(WRITE8(bw2_state, ppi_pc_w))
- MCFG_DEVICE_ADD(MSM6255_TAG, MSM6255, XTAL_16MHz)
+ MCFG_DEVICE_ADD(MSM6255_TAG, MSM6255, XTAL(16'000'000))
MCFG_DEVICE_ADDRESS_MAP(0, lcdc_map)
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
@@ -620,13 +620,13 @@ MACHINE_CONFIG_START(bw2_state::bw2)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr))
- MCFG_WD2797_ADD(WD2797_TAG, XTAL_16MHz/16)
+ MCFG_WD2797_ADD(WD2797_TAG, XTAL(16'000'000)/16)
MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bw2_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":0", bw2_floppies, "35dd", bw2_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":1", bw2_floppies, nullptr, bw2_state::floppy_formats)
- MCFG_BW2_EXPANSION_SLOT_ADD(BW2_EXPANSION_SLOT_TAG, XTAL_16MHz, bw2_expansion_cards, nullptr)
+ MCFG_BW2_EXPANSION_SLOT_ADD(BW2_EXPANSION_SLOT_TAG, XTAL(16'000'000), bw2_expansion_cards, nullptr)
// software list
MCFG_SOFTWARE_LIST_ADD("flop_list","bw2")
diff --git a/src/mame/drivers/bwing.cpp b/src/mame/drivers/bwing.cpp
index 99cdf1abc28..34b9b9eb642 100644
--- a/src/mame/drivers/bwing.cpp
+++ b/src/mame/drivers/bwing.cpp
@@ -400,10 +400,10 @@ MACHINE_CONFIG_START(bwing_state::bwing)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8912, XTAL_24MHz / 2 / 8)
+ MCFG_SOUND_ADD("ay1", AY8912, XTAL(24'000'000) / 2 / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("ay2", AY8912, XTAL_24MHz / 2 / 8)
+ MCFG_SOUND_ADD("ay2", AY8912, XTAL(24'000'000) / 2 / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_SOUND_ADD("dac", DAC08, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
diff --git a/src/mame/drivers/by6803.cpp b/src/mame/drivers/by6803.cpp
index 6da81b2db9b..e7de817e37e 100644
--- a/src/mame/drivers/by6803.cpp
+++ b/src/mame/drivers/by6803.cpp
@@ -373,7 +373,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( by6803_state::pia0_timer )
MACHINE_CONFIG_START(by6803_state::by6803)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6803, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("maincpu", M6803, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(by6803_map)
MCFG_CPU_IO_MAP(by6803_io)
diff --git a/src/mame/drivers/byvid.cpp b/src/mame/drivers/byvid.cpp
index 7cecc31a7d6..4745b9f3894 100644
--- a/src/mame/drivers/byvid.cpp
+++ b/src/mame/drivers/byvid.cpp
@@ -745,13 +745,13 @@ uint32_t by133_state::screen_update_granny(screen_device &screen, bitmap_rgb32 &
MACHINE_CONFIG_START(by133_state::babypac)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_3_579545MHz/4) // no xtal, just 2 chips
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(3'579'545)/4) // no xtal, just 2 chips
MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("videocpu", MC6809, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("videocpu", MC6809, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(video_map)
- MCFG_CPU_ADD("audiocpu", M6803, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", M6803, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_portmap)
@@ -790,7 +790,7 @@ MACHINE_CONFIG_START(by133_state::babypac)
MCFG_TIMER_DRIVER_ADD_PERIODIC("babypac2", by133_state, u11_timer, attotime::from_hz(634)) // 555 timer*2
/* video hardware */
- MCFG_DEVICE_ADD( "crtc", TMS9928A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "crtc", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("videocpu", M6809_IRQ_LINE))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
@@ -809,18 +809,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(by133_state::granny, babypac)
MCFG_DEVICE_REMOVE("videocpu")
- MCFG_CPU_ADD("videocpu", MC6809, XTAL_8MHz) // MC68B09P (XTAL value hard to read)
+ MCFG_CPU_ADD("videocpu", MC6809, XTAL(8'000'000)) // MC68B09P (XTAL value hard to read)
MCFG_CPU_PROGRAM_MAP(granny_map)
MCFG_DEVICE_REMOVE("screen")
- MCFG_DEVICE_ADD( "crtc2", TMS9928A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "crtc2", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("videocpu", M6809_IRQ_LINE))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_SCREEN_ADD( "screen", RASTER )
- MCFG_SCREEN_RAW_PARAMS( XTAL_10_738635MHz / 2, tms9928a_device::TOTAL_HORZ, tms9928a_device::HORZ_DISPLAY_START-12, tms9928a_device::HORZ_DISPLAY_START + 256 + 12, \
+ MCFG_SCREEN_RAW_PARAMS( XTAL(10'738'635) / 2, tms9928a_device::TOTAL_HORZ, tms9928a_device::HORZ_DISPLAY_START-12, tms9928a_device::HORZ_DISPLAY_START + 256 + 12, \
tms9928a_device::TOTAL_VERT_NTSC, tms9928a_device::VERT_DISPLAY_START_NTSC - 12, tms9928a_device::VERT_DISPLAY_START_NTSC + 192 + 12 )
MCFG_SCREEN_UPDATE_DRIVER(by133_state, screen_update_granny)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/c10.cpp b/src/mame/drivers/c10.cpp
index 8dcc94a5f39..6df6c1ee77b 100644
--- a/src/mame/drivers/c10.cpp
+++ b/src/mame/drivers/c10.cpp
@@ -156,7 +156,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(c10_state::c10)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(c10_mem)
MCFG_CPU_IO_MAP(c10_io)
diff --git a/src/mame/drivers/c128.cpp b/src/mame/drivers/c128.cpp
index 893272415b8..f5df2eadbe3 100644
--- a/src/mame/drivers/c128.cpp
+++ b/src/mame/drivers/c128.cpp
@@ -1681,12 +1681,12 @@ void c128_state::machine_reset()
MACHINE_CONFIG_START(c128_state::ntsc)
// basic hardware
- MCFG_CPU_ADD(Z80A_TAG, Z80, XTAL_14_31818MHz*2/3.5/2)
+ MCFG_CPU_ADD(Z80A_TAG, Z80, XTAL(14'318'181)*2/3.5/2)
MCFG_CPU_PROGRAM_MAP(z80_mem)
MCFG_CPU_IO_MAP(z80_io)
MCFG_QUANTUM_PERFECT_CPU(Z80A_TAG)
- MCFG_CPU_ADD(M8502_TAG, M8502, XTAL_14_31818MHz*2/3.5/8)
+ MCFG_CPU_ADD(M8502_TAG, M8502, XTAL(14'318'181)*2/3.5/8)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
MCFG_M8502_PORT_CALLBACKS(READ8(c128_state, cpu_r), WRITE8(c128_state, cpu_w))
MCFG_M8502_PORT_PULLS(0x07, 0x20)
@@ -1694,7 +1694,7 @@ MACHINE_CONFIG_START(c128_state::ntsc)
MCFG_QUANTUM_PERFECT_CPU(M8502_TAG)
// video hardware
- MCFG_MOS8563_ADD(MOS8563_TAG, SCREEN_VDC_TAG, XTAL_16MHz, vdc_videoram_map)
+ MCFG_MOS8563_ADD(MOS8563_TAG, SCREEN_VDC_TAG, XTAL(16'000'000), vdc_videoram_map)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_SCREEN_ADD(SCREEN_VDC_TAG, RASTER)
@@ -1703,7 +1703,7 @@ MACHINE_CONFIG_START(c128_state::ntsc)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1)
MCFG_SCREEN_UPDATE_DEVICE(MOS8563_TAG, mos8563_device, screen_update)
- MCFG_DEVICE_ADD(MOS8564_TAG, MOS8564, XTAL_14_31818MHz*2/3.5)
+ MCFG_DEVICE_ADD(MOS8564_TAG, MOS8564, XTAL(14'318'181)*2/3.5)
MCFG_MOS6566_CPU(M8502_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c128_state, vic_irq_w))
MCFG_MOS8564_K_CALLBACK(WRITE8(c128_state, vic_k_w))
@@ -1720,20 +1720,20 @@ MACHINE_CONFIG_START(c128_state::ntsc)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL_14_31818MHz*2/3.5/8)
+ MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(14'318'181)*2/3.5/8)
MCFG_MOS6581_POTX_CALLBACK(READ8(c128_state, sid_potx_r))
MCFG_MOS6581_POTY_CALLBACK(READ8(c128_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
// devices
- MCFG_DEVICE_ADD(MOS8722_TAG, MOS8722, XTAL_14_31818MHz*2/3.5/8)
+ MCFG_DEVICE_ADD(MOS8722_TAG, MOS8722, XTAL(14'318'181)*2/3.5/8)
MCFG_MOS8722_Z80EN_CALLBACK(WRITELINE(c128_state, mmu_z80en_w))
MCFG_MOS8722_FSDIR_CALLBACK(WRITELINE(c128_state, mmu_fsdir_w))
MCFG_MOS8722_GAME_CALLBACK(READLINE(c128_state, mmu_game_r))
MCFG_MOS8722_EXROM_CALLBACK(READLINE(c128_state, mmu_exrom_r))
MCFG_MOS8722_SENSE40_CALLBACK(READLINE(c128_state, mmu_sense40_r))
MCFG_MOS8721_ADD(MOS8721_TAG)
- MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL_14_31818MHz*2/3.5/8)
+ MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL(14'318'181)*2/3.5/8)
MCFG_MOS6526_TOD(60)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c128_state, cia1_irq_w))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c128_state, cia1_cnt_w))
@@ -1742,7 +1742,7 @@ MACHINE_CONFIG_START(c128_state::ntsc)
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c128_state, cia1_pa_w))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c128_state, cia1_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c128_state, cia1_pb_w))
- MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL_14_31818MHz*2/3.5/8)
+ MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL(14'318'181)*2/3.5/8)
MCFG_MOS6526_TOD(60)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c128_state, cia2_irq_w))
MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
@@ -1756,7 +1756,7 @@ MACHINE_CONFIG_START(c128_state::ntsc)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS8564_TAG, mos8564_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
- MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL_14_31818MHz*2/3.5/8, c64_expansion_cards, nullptr)
+ MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL(14'318'181)*2/3.5/8, c64_expansion_cards, nullptr)
MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(c128_state, exp_irq_w))
MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(c128_state, exp_nmi_w))
MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(c128_state, exp_reset_w))
@@ -1852,12 +1852,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c128_state::pal)
// basic hardware
- MCFG_CPU_ADD(Z80A_TAG, Z80, XTAL_17_734472MHz*2/4.5/2)
+ MCFG_CPU_ADD(Z80A_TAG, Z80, XTAL(17'734'472)*2/4.5/2)
MCFG_CPU_PROGRAM_MAP(z80_mem)
MCFG_CPU_IO_MAP(z80_io)
MCFG_QUANTUM_PERFECT_CPU(Z80A_TAG)
- MCFG_CPU_ADD(M8502_TAG, M8502, XTAL_17_734472MHz*2/4.5/8)
+ MCFG_CPU_ADD(M8502_TAG, M8502, XTAL(17'734'472)*2/4.5/8)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
MCFG_M8502_PORT_CALLBACKS(READ8(c128_state, cpu_r), WRITE8(c128_state, cpu_w))
MCFG_M8502_PORT_PULLS(0x07, 0x20)
@@ -1865,7 +1865,7 @@ MACHINE_CONFIG_START(c128_state::pal)
MCFG_QUANTUM_PERFECT_CPU(M8502_TAG)
// video hardware
- MCFG_MOS8563_ADD(MOS8563_TAG, SCREEN_VDC_TAG, XTAL_16MHz, vdc_videoram_map)
+ MCFG_MOS8563_ADD(MOS8563_TAG, SCREEN_VDC_TAG, XTAL(16'000'000), vdc_videoram_map)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_SCREEN_ADD(SCREEN_VDC_TAG, RASTER)
@@ -1874,7 +1874,7 @@ MACHINE_CONFIG_START(c128_state::pal)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1)
MCFG_SCREEN_UPDATE_DEVICE(MOS8563_TAG, mos8563_device, screen_update)
- MCFG_DEVICE_ADD(MOS8566_TAG, MOS8566, XTAL_17_734472MHz*2/4.5)
+ MCFG_DEVICE_ADD(MOS8566_TAG, MOS8566, XTAL(17'734'472)*2/4.5)
MCFG_MOS6566_CPU(M8502_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c128_state, vic_irq_w))
MCFG_MOS8564_K_CALLBACK(WRITE8(c128_state, vic_k_w))
@@ -1891,20 +1891,20 @@ MACHINE_CONFIG_START(c128_state::pal)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL_17_734472MHz*2/4.5/8)
+ MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(17'734'472)*2/4.5/8)
MCFG_MOS6581_POTX_CALLBACK(READ8(c128_state, sid_potx_r))
MCFG_MOS6581_POTY_CALLBACK(READ8(c128_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
// devices
- MCFG_DEVICE_ADD(MOS8722_TAG, MOS8722, XTAL_17_734472MHz*2/4.5/8)
+ MCFG_DEVICE_ADD(MOS8722_TAG, MOS8722, XTAL(17'734'472)*2/4.5/8)
MCFG_MOS8722_Z80EN_CALLBACK(WRITELINE(c128_state, mmu_z80en_w))
MCFG_MOS8722_FSDIR_CALLBACK(WRITELINE(c128_state, mmu_fsdir_w))
MCFG_MOS8722_GAME_CALLBACK(READLINE(c128_state, mmu_game_r))
MCFG_MOS8722_EXROM_CALLBACK(READLINE(c128_state, mmu_exrom_r))
MCFG_MOS8722_SENSE40_CALLBACK(READLINE(c128_state, mmu_sense40_r))
MCFG_MOS8721_ADD(MOS8721_TAG)
- MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL_17_734472MHz*2/4.5/8)
+ MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL(17'734'472)*2/4.5/8)
MCFG_MOS6526_TOD(50)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c128_state, cia1_irq_w))
MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c128_state, cia1_cnt_w))
@@ -1913,7 +1913,7 @@ MACHINE_CONFIG_START(c128_state::pal)
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c128_state, cia1_pa_w))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c128_state, cia1_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c128_state, cia1_pb_w))
- MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL_17_734472MHz*2/4.5/8)
+ MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL(17'734'472)*2/4.5/8)
MCFG_MOS6526_TOD(50)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c128_state, cia2_irq_w))
MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
@@ -1927,7 +1927,7 @@ MACHINE_CONFIG_START(c128_state::pal)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS8566_TAG, mos8566_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
- MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL_17_734472MHz*2/4.5/8, c64_expansion_cards, nullptr)
+ MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL(17'734'472)*2/4.5/8, c64_expansion_cards, nullptr)
MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(c128_state, exp_irq_w))
MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(c128_state, exp_nmi_w))
MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(c128_state, exp_reset_w))
diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp
index 4da62d04cf9..f82a1aab10b 100644
--- a/src/mame/drivers/c64.cpp
+++ b/src/mame/drivers/c64.cpp
@@ -1322,7 +1322,7 @@ void c64_state::machine_reset()
MACHINE_CONFIG_START(c64_state::ntsc)
// basic hardware
- MCFG_CPU_ADD(M6510_TAG, M6510, XTAL_14_31818MHz/14)
+ MCFG_CPU_ADD(M6510_TAG, M6510, XTAL(14'318'181)/14)
MCFG_CPU_PROGRAM_MAP(c64_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
MCFG_M6510_PORT_CALLBACKS(READ8(c64_state, cpu_r), WRITE8(c64_state, cpu_w))
@@ -1330,7 +1330,7 @@ MACHINE_CONFIG_START(c64_state::ntsc)
MCFG_QUANTUM_PERFECT_CPU(M6510_TAG)
// video hardware
- MCFG_DEVICE_ADD(MOS6567_TAG, MOS6567, XTAL_14_31818MHz/14)
+ MCFG_DEVICE_ADD(MOS6567_TAG, MOS6567, XTAL(14'318'181)/14)
MCFG_MOS6566_CPU(M6510_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c64_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
@@ -1344,14 +1344,14 @@ MACHINE_CONFIG_START(c64_state::ntsc)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL_14_31818MHz/14)
+ MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(14'318'181)/14)
MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r))
MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
MCFG_PLS100_ADD(PLA_TAG)
- MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL_14_31818MHz/14)
+ MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL(14'318'181)/14)
MCFG_MOS6526_TOD(60)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c64_state, cia1_irq_w))
MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_4))
@@ -1359,7 +1359,7 @@ MACHINE_CONFIG_START(c64_state::ntsc)
MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c64_state, cia1_pa_r))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c64_state, cia1_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c64_state, cia1_pb_w))
- MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL_14_31818MHz/14)
+ MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL(14'318'181)/14)
MCFG_MOS6526_TOD(60)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c64_state, cia2_irq_w))
MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
@@ -1376,7 +1376,7 @@ MACHINE_CONFIG_START(c64_state::ntsc)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS6567_TAG, mos6567_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
- MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL_14_31818MHz/14, c64_expansion_cards, nullptr)
+ MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL(14'318'181)/14, c64_expansion_cards, nullptr)
MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(c64_state, exp_irq_w))
MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(c64_state, exp_nmi_w))
MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(c64_state, exp_reset_w))
@@ -1465,7 +1465,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
MACHINE_CONFIG_DERIVED(c64c_state::ntsc_c, ntsc)
- MCFG_SOUND_REPLACE(MOS6581_TAG, MOS8580, XTAL_14_31818MHz/14)
+ MCFG_SOUND_REPLACE(MOS6581_TAG, MOS8580, XTAL(14'318'181)/14)
MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r))
MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -1478,7 +1478,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c64_state::pal)
// basic hardware
- MCFG_CPU_ADD(M6510_TAG, M6510, XTAL_17_734472MHz/18)
+ MCFG_CPU_ADD(M6510_TAG, M6510, XTAL(17'734'472)/18)
MCFG_CPU_PROGRAM_MAP(c64_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
MCFG_M6510_PORT_CALLBACKS(READ8(c64_state, cpu_r), WRITE8(c64_state, cpu_w))
@@ -1486,7 +1486,7 @@ MACHINE_CONFIG_START(c64_state::pal)
MCFG_QUANTUM_PERFECT_CPU(M6510_TAG)
// video hardware
- MCFG_DEVICE_ADD(MOS6569_TAG, MOS6569, XTAL_17_734472MHz/18)
+ MCFG_DEVICE_ADD(MOS6569_TAG, MOS6569, XTAL(17'734'472)/18)
MCFG_MOS6566_CPU(M6510_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c64_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
@@ -1500,14 +1500,14 @@ MACHINE_CONFIG_START(c64_state::pal)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL_17_734472MHz/18)
+ MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(17'734'472)/18)
MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r))
MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
MCFG_PLS100_ADD(PLA_TAG)
- MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL_17_734472MHz/18)
+ MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL(17'734'472)/18)
MCFG_MOS6526_TOD(50)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c64_state, cia1_irq_w))
MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_4))
@@ -1516,7 +1516,7 @@ MACHINE_CONFIG_START(c64_state::pal)
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c64_state, cia1_pa_w))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c64_state, cia1_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c64_state, cia1_pb_w))
- MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL_17_734472MHz/18)
+ MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL(17'734'472)/18)
MCFG_MOS6526_TOD(50)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c64_state, cia2_irq_w))
MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
@@ -1533,7 +1533,7 @@ MACHINE_CONFIG_START(c64_state::pal)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS6569_TAG, mos6569_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
- MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL_17_734472MHz/18, c64_expansion_cards, nullptr)
+ MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL(17'734'472)/18, c64_expansion_cards, nullptr)
MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(c64_state, exp_irq_w))
MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(c64_state, exp_nmi_w))
MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(c64_state, exp_reset_w))
@@ -1600,7 +1600,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
MACHINE_CONFIG_DERIVED(c64c_state::pal_c, pal)
- MCFG_SOUND_REPLACE(MOS6581_TAG, MOS8580, XTAL_17_734472MHz/18)
+ MCFG_SOUND_REPLACE(MOS6581_TAG, MOS8580, XTAL(17'734'472)/18)
MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r))
MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -1613,7 +1613,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c64gs_state::pal_gs)
// basic hardware
- MCFG_CPU_ADD(M6510_TAG, M6510, XTAL_17_734472MHz/18)
+ MCFG_CPU_ADD(M6510_TAG, M6510, XTAL(17'734'472)/18)
MCFG_CPU_PROGRAM_MAP(c64_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
MCFG_M6510_PORT_CALLBACKS(READ8(c64gs_state, cpu_r), WRITE8(c64gs_state, cpu_w))
@@ -1621,7 +1621,7 @@ MACHINE_CONFIG_START(c64gs_state::pal_gs)
MCFG_QUANTUM_PERFECT_CPU(M6510_TAG)
// video hardware
- MCFG_DEVICE_ADD(MOS6569_TAG, MOS8565, XTAL_17_734472MHz/18)
+ MCFG_DEVICE_ADD(MOS6569_TAG, MOS8565, XTAL(17'734'472)/18)
MCFG_MOS6566_CPU(M6510_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c64_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
@@ -1635,14 +1635,14 @@ MACHINE_CONFIG_START(c64gs_state::pal_gs)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS8580, XTAL_17_734472MHz/18)
+ MCFG_SOUND_ADD(MOS6581_TAG, MOS8580, XTAL(17'734'472)/18)
MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r))
MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
MCFG_PLS100_ADD(PLA_TAG)
- MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL_17_734472MHz/18)
+ MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL(17'734'472)/18)
MCFG_MOS6526_TOD(50)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c64_state, cia1_irq_w))
MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_4))
@@ -1651,7 +1651,7 @@ MACHINE_CONFIG_START(c64gs_state::pal_gs)
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c64_state, cia1_pa_w))
MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c64gs_state, cia1_pb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c64_state, cia1_pb_w))
- MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL_17_734472MHz/18)
+ MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL(17'734'472)/18)
MCFG_MOS6526_TOD(50)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c64_state, cia2_irq_w))
MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
@@ -1667,7 +1667,7 @@ MACHINE_CONFIG_START(c64gs_state::pal_gs)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS6569_TAG, mos6569_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
- MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL_17_734472MHz/18, c64_expansion_cards, nullptr)
+ MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL(17'734'472)/18, c64_expansion_cards, nullptr)
MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(c64_state, exp_irq_w))
MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(c64_state, exp_nmi_w))
MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(c64_state, exp_reset_w))
diff --git a/src/mame/drivers/c65.cpp b/src/mame/drivers/c65.cpp
index fe2fa3dcb17..d3bd76c4f4e 100644
--- a/src/mame/drivers/c65.cpp
+++ b/src/mame/drivers/c65.cpp
@@ -33,7 +33,7 @@ http://www.zimmers.net/anonftp/pub/cbm/schematics/computers/C64DX_aka_C65_System
#include "softlist_dev.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_28_37516MHz/8
+#define MAIN_CLOCK XTAL(28'375'160)/8
class c65_state : public driver_device
{
diff --git a/src/mame/drivers/c900.cpp b/src/mame/drivers/c900.cpp
index 20b0de890f9..34e77eff3d0 100644
--- a/src/mame/drivers/c900.cpp
+++ b/src/mame/drivers/c900.cpp
@@ -109,7 +109,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(c900_state::c900)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z8001, XTAL_12MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z8001, XTAL(12'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_DATA_MAP(data_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp
index 95847a5a71b..2740dca998d 100644
--- a/src/mame/drivers/cabal.cpp
+++ b/src/mame/drivers/cabal.cpp
@@ -492,11 +492,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(cabal_state::cabal)
/* 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(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cabal_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(sound_decrypted_opcodes_map)
@@ -524,7 +524,7 @@ MACHINE_CONFIG_START(cabal_state::cabal)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -561,20 +561,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cabal_state::cabalbl)
/* 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(cabalbl_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cabal_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cabalbl_sound_map)
/* there are 2x z80s for the ADPCM */
- MCFG_CPU_ADD("adpcm_1", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("adpcm_1", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cabalbl_talk1_map)
MCFG_CPU_IO_MAP(cabalbl_talk1_portmap)
MCFG_CPU_PERIODIC_INT_DRIVER(cabal_state, irq0_line_hold, 8000)
- MCFG_CPU_ADD("adpcm_2", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("adpcm_2", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cabalbl_talk2_map)
MCFG_CPU_IO_MAP(cabalbl_talk2_portmap)
MCFG_CPU_PERIODIC_INT_DRIVER(cabal_state, irq0_line_hold, 8000)
@@ -604,15 +604,15 @@ MACHINE_CONFIG_START(cabal_state::cabalbl)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_GENERIC_LATCH_8_ADD("soundlatch3")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80)
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL_12MHz/32) /* verified on pcb (no resonator) */
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL(12'000'000)/32) /* verified on pcb (no resonator) */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_SOUND_ADD("msm2", MSM5205, XTAL_12MHz/32) /* verified on pcb (no resonator)*/
+ MCFG_SOUND_ADD("msm2", MSM5205, XTAL(12'000'000)/32) /* verified on pcb (no resonator)*/
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp
index 795877d171c..988b29f111d 100644
--- a/src/mame/drivers/cabaret.cpp
+++ b/src/mame/drivers/cabaret.cpp
@@ -355,7 +355,7 @@ INTERRUPT_GEN_MEMBER(cabaret_state::cabaret_interrupt)
MACHINE_CONFIG_START(cabaret_state::cabaret)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(cabaret_map)
MCFG_CPU_IO_MAP(cabaret_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cabaret_state, cabaret_interrupt)
@@ -391,7 +391,7 @@ MACHINE_CONFIG_START(cabaret_state::cabaret)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/calcune.cpp b/src/mame/drivers/calcune.cpp
index 7e1ebf7a71b..0852f2b2422 100644
--- a/src/mame/drivers/calcune.cpp
+++ b/src/mame/drivers/calcune.cpp
@@ -293,7 +293,7 @@ MACHINE_CONFIG_START(calcune_state::calcune)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp
index 4bab868e074..fa2fcfb8f9e 100644
--- a/src/mame/drivers/calomega.cpp
+++ b/src/mame/drivers/calomega.cpp
@@ -653,7 +653,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_10MHz
+#define MASTER_CLOCK XTAL(10'000'000)
#define CPU_CLOCK (MASTER_CLOCK/16)
#define UART_CLOCK (MASTER_CLOCK/16)
#define SND_CLOCK (MASTER_CLOCK/8)
diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp
index 32f1bbddd1e..c6031aca3d8 100644
--- a/src/mame/drivers/camplynx.cpp
+++ b/src/mame/drivers/camplynx.cpp
@@ -807,7 +807,7 @@ MACHINE_CONFIG_START(camplynx_state::lynx_common)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(camplynx_state::lynx_disk)
- MCFG_FD1793_ADD("fdc", XTAL_24MHz / 24)
+ MCFG_FD1793_ADD("fdc", XTAL(24'000'000) / 24)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", camplynx_floppies, "525qd", camplynx_state::camplynx_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", camplynx_floppies, "525qd", camplynx_state::camplynx_floppy_formats)
@@ -817,7 +817,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(camplynx_state::lynx48k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000) / 6)
MCFG_CPU_PROGRAM_MAP(lynx48k_mem)
MCFG_CPU_IO_MAP(lynx48k_io)
@@ -839,7 +839,7 @@ MACHINE_CONFIG_START(camplynx_state::lynx48k)
//MCFG_CASSETTE_INTERFACE("camplynx_cass")
/* devices */
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_12MHz / 8 )
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(12'000'000) / 8 )
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(camplynx_state, lynx48k_update_row)
@@ -857,7 +857,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(camplynx_state::lynx128k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(lynx128k_mem)
MCFG_CPU_IO_MAP(lynx128k_io)
@@ -879,7 +879,7 @@ MACHINE_CONFIG_START(camplynx_state::lynx128k)
//MCFG_CASSETTE_INTERFACE("camplynx_cass")
/* devices */
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_12MHz / 8 )
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(12'000'000) / 8 )
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(camplynx_state, lynx128k_update_row)
diff --git a/src/mame/drivers/candela.cpp b/src/mame/drivers/candela.cpp
index b182664a634..7c06ea65e7f 100644
--- a/src/mame/drivers/candela.cpp
+++ b/src/mame/drivers/candela.cpp
@@ -659,11 +659,11 @@ DEVICE_INPUT_DEFAULTS_END
#endif
/* Fake clock values until we TODO: figure out how the PTM generates the clocks */
-#define CAN09T_BAUDGEN_CLOCK XTAL_1_8432MHz
+#define CAN09T_BAUDGEN_CLOCK XTAL(1'843'200)
#define CAN09T_ACIA_CLOCK (CAN09T_BAUDGEN_CLOCK / 12)
MACHINE_CONFIG_START(can09t_state::can09t)
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_4_9152MHz) // IPL crystal
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'915'200)) // IPL crystal
MCFG_CPU_PROGRAM_MAP(can09t_map)
/* --PIA inits----------------------- */
@@ -704,7 +704,7 @@ MACHINE_CONFIG_START(can09t_state::can09t)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE (can09t_state, write_acia_clock))
MACHINE_CONFIG_END
-#define CAN09_X1_CLOCK XTAL_22_1184MHz /* UKI 22118.40 Khz */
+#define CAN09_X1_CLOCK XTAL(22'118'400) /* UKI 22118.40 Khz */
#define CAN09_CPU_CLOCK (CAN09_X1_CLOCK / 16) /* ~1.38MHz Divider needs to be check but is the most likelly */
MACHINE_CONFIG_START(can09_state::can09)
MCFG_CPU_ADD("maincpu", MC6809E, CAN09_CPU_CLOCK) // MC68A09EP
@@ -746,13 +746,13 @@ MACHINE_CONFIG_START(can09_state::can09)
/* screen - totally faked value for now */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
- MCFG_SCREEN_RAW_PARAMS(XTAL_4MHz/2, 512, 0, 512, 576, 0, 576)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(4'000'000)/2, 512, 0, 512, 576, 0, 576)
MCFG_SCREEN_UPDATE_DRIVER(can09_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* Floppy */
- MCFG_WD1770_ADD("wd1770", XTAL_8MHz ) // TODO: Verify 8MHz UKI crystal assumed to be used
+ MCFG_WD1770_ADD("wd1770", XTAL(8'000'000) ) // TODO: Verify 8MHz UKI crystal assumed to be used
#if 0
MCFG_FLOPPY_DRIVE_ADD("wd1770:0", candela_floppies, "3dd", floppy_image_device::default_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop3_list", "candela")
diff --git a/src/mame/drivers/canyon.cpp b/src/mame/drivers/canyon.cpp
index 1394917aa0d..2a23f89dd2e 100644
--- a/src/mame/drivers/canyon.cpp
+++ b/src/mame/drivers/canyon.cpp
@@ -250,7 +250,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(canyon_state::canyon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz / 16)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(12'096'000) / 16)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", canyon_state, nmi_line_pulse)
diff --git a/src/mame/drivers/capbowl.cpp b/src/mame/drivers/capbowl.cpp
index 18729a62dc8..f716a011ab2 100644
--- a/src/mame/drivers/capbowl.cpp
+++ b/src/mame/drivers/capbowl.cpp
@@ -97,7 +97,7 @@
#include "sound/volt_reg.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_8MHz
+#define MASTER_CLOCK XTAL(8'000'000)
/*************************************
diff --git a/src/mame/drivers/cardline.cpp b/src/mame/drivers/cardline.cpp
index 93ae64642ea..6a9a5cd0839 100644
--- a/src/mame/drivers/cardline.cpp
+++ b/src/mame/drivers/cardline.cpp
@@ -31,7 +31,7 @@
#include "cardline.lh"
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
class cardline_state : public driver_device
{
diff --git a/src/mame/drivers/carjmbre.cpp b/src/mame/drivers/carjmbre.cpp
index afa62d69032..7feb0502cf3 100644
--- a/src/mame/drivers/carjmbre.cpp
+++ b/src/mame/drivers/carjmbre.cpp
@@ -352,11 +352,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(carjmbre_state::carjmbre)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", carjmbre_state, vblank_nmi)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6/2)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6/2)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
@@ -378,10 +378,10 @@ MACHINE_CONFIG_START(carjmbre_state::carjmbre)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/6/2)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/6/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/6/2)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'432'000)/6/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/carpolo.cpp b/src/mame/drivers/carpolo.cpp
index ad87fe0c77e..8dada9fdc6d 100644
--- a/src/mame/drivers/carpolo.cpp
+++ b/src/mame/drivers/carpolo.cpp
@@ -234,7 +234,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(carpolo_state::carpolo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz/12) /* 940.75 kHz */
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(11'289'000)/12) /* 940.75 kHz */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", carpolo_state, carpolo_timer_interrupt) /* this not strictly VBLANK,
but it's supposed to happen 60
diff --git a/src/mame/drivers/carrera.cpp b/src/mame/drivers/carrera.cpp
index bcb52512eed..ee1657613d0 100644
--- a/src/mame/drivers/carrera.cpp
+++ b/src/mame/drivers/carrera.cpp
@@ -46,7 +46,7 @@ TODO:
*/
-#define MASTER_CLOCK XTAL_22_1184MHz
+#define MASTER_CLOCK XTAL(22'118'400)
#include "emu.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp
index e478912e844..1044567d260 100644
--- a/src/mame/drivers/cat.cpp
+++ b/src/mame/drivers/cat.cpp
@@ -933,7 +933,7 @@ MACHINE_RESET_MEMBER(cat_state,cat)
m_6ms_counter = 0;
m_wdt_counter = 0;
m_floppy_control = 0;
- m_6ms_timer->adjust(attotime::zero, 0, attotime::from_hz((XTAL_19_968MHz/2)/65536));
+ m_6ms_timer->adjust(attotime::zero, 0, attotime::from_hz((XTAL(19'968'000)/2)/65536));
}
VIDEO_START_MEMBER(cat_state,cat)
@@ -1051,7 +1051,7 @@ WRITE_LINE_MEMBER(cat_state::prn_ack_ff) // switch the flipflop state on the ris
MACHINE_CONFIG_START(cat_state::cat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL_19_968MHz/4)
+ MCFG_CPU_ADD("maincpu",M68000, XTAL(19'968'000)/4)
MCFG_CPU_PROGRAM_MAP(cat_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cat_state,cat_int_ack)
@@ -1071,7 +1071,7 @@ MACHINE_CONFIG_START(cat_state::cat)
MCFG_VIDEO_START_OVERRIDE(cat_state,cat)
- MCFG_DEVICE_ADD( "duartn68681", MC68681, (XTAL_19_968MHz*2)/11 ) // duart is normally clocked by 3.6864mhz xtal, but cat seemingly uses a divider from the main xtal instead which probably yields 3.63054545Mhz. There is a trace to cut and a mounting area to allow using an actual 3.6864mhz xtal if you so desire
+ MCFG_DEVICE_ADD( "duartn68681", MC68681, (XTAL(19'968'000)*2)/11 ) // duart is normally clocked by 3.6864mhz xtal, but cat seemingly uses a divider from the main xtal instead which probably yields 3.63054545Mhz. There is a trace to cut and a mounting area to allow using an actual 3.6864mhz xtal if you so desire
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(cat_state, cat_duart_irq_handler))
MCFG_MC68681_A_TX_CALLBACK(WRITELINE(cat_state, cat_duart_txa))
MCFG_MC68681_B_TX_CALLBACK(WRITELINE(cat_state, cat_duart_txb))
diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp
index 376de01007a..bb177f4c1e6 100644
--- a/src/mame/drivers/cave.cpp
+++ b/src/mame/drivers/cave.cpp
@@ -2099,7 +2099,7 @@ MACHINE_RESET_MEMBER(cave_state,cave)
MACHINE_CONFIG_START(cave_state::dfeveron)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(dfeveron_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
@@ -2126,7 +2126,7 @@ MACHINE_CONFIG_START(cave_state::dfeveron)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2140,7 +2140,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::ddonpach)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(ddonpach_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
@@ -2167,7 +2167,7 @@ MACHINE_CONFIG_START(cave_state::ddonpach)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2180,7 +2180,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::donpachi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(donpachi_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
@@ -2207,10 +2207,10 @@ MACHINE_CONFIG_START(cave_state::donpachi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_4_224MHz/4, PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL(4'224'000)/4, PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.60)
- MCFG_OKIM6295_ADD("oki2", XTAL_4_224MHz/2, PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", XTAL(4'224'000)/2, PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
@@ -2227,7 +2227,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::esprade)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(esprade_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
@@ -2254,7 +2254,7 @@ MACHINE_CONFIG_START(cave_state::esprade)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2267,7 +2267,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::gaia)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(gaia_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
@@ -2295,7 +2295,7 @@ MACHINE_CONFIG_START(cave_state::gaia)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2308,7 +2308,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::guwange)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(guwange_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
@@ -2335,7 +2335,7 @@ MACHINE_CONFIG_START(cave_state::guwange)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2347,11 +2347,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::hotdogst)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2)
MCFG_CPU_PROGRAM_MAP(hotdogst_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8)
MCFG_CPU_PROGRAM_MAP(hotdogst_sound_map)
MCFG_CPU_IO_MAP(hotdogst_sound_portmap)
@@ -2380,14 +2380,14 @@ MACHINE_CONFIG_START(cave_state::hotdogst)
MCFG_GENERIC_LATCH_16_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_32MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(32'000'000)/8)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/16, PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/16, PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
@@ -2400,7 +2400,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::korokoro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(korokoro_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
@@ -2427,7 +2427,7 @@ MACHINE_CONFIG_START(cave_state::korokoro)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2445,11 +2445,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::mazinger)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(mazinger_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_4MHz) // Bidirectional communication
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000)) // Bidirectional communication
MCFG_CPU_PROGRAM_MAP(mazinger_sound_map)
MCFG_CPU_IO_MAP(mazinger_sound_portmap)
@@ -2481,14 +2481,14 @@ MACHINE_CONFIG_START(cave_state::mazinger)
MCFG_GENERIC_LATCH_16_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_4MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(4'000'000))
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
MCFG_SOUND_ROUTE(3, "mono", 0.60)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
@@ -2501,11 +2501,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::metmqstr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(metmqstr_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz / 4)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(metmqstr_sound_map)
MCFG_CPU_IO_MAP(metmqstr_sound_portmap)
@@ -2537,15 +2537,15 @@ MACHINE_CONFIG_START(cave_state::metmqstr)
MCFG_GENERIC_LATCH_16_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_16MHz / 4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000) / 4)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
- MCFG_OKIM6295_ADD("oki1", XTAL_32MHz / 16 , PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'000'000) / 16 , PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
- MCFG_OKIM6295_ADD("oki2", XTAL_32MHz / 16 , PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL(32'000'000) / 16 , PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MACHINE_CONFIG_END
@@ -2560,7 +2560,7 @@ MACHINE_CONFIG_START(cave_state::pacslot)
MCFG_NVRAM_ADD_0FILL("nvram")
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(pacslot_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
@@ -2592,12 +2592,12 @@ MACHINE_CONFIG_START(cave_state::pacslot)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", XTAL_28MHz / 28, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL(28'000'000) / 28, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
// oki2 chip is present but its rom socket is unpopulated
- MCFG_OKIM6295_ADD("oki2", XTAL_28MHz / 28, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", XTAL(28'000'000) / 28, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -2618,7 +2618,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( cave_state::timer_lev2_cb )
MACHINE_CONFIG_START(cave_state::ppsatan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(ppsatan_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt_ppsatan)
@@ -2666,7 +2666,7 @@ MACHINE_CONFIG_START(cave_state::ppsatan)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 2.0)
MACHINE_CONFIG_END
@@ -2681,11 +2681,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::pwrinst2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16 MHz */
MCFG_CPU_PROGRAM_MAP(pwrinst2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL_16MHz / 2) /* 8 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL(16'000'000) / 2) /* 8 MHz */
MCFG_CPU_PROGRAM_MAP(pwrinst2_sound_map)
MCFG_CPU_IO_MAP(pwrinst2_sound_portmap)
@@ -2714,17 +2714,17 @@ MACHINE_CONFIG_START(cave_state::pwrinst2)
MCFG_GENERIC_LATCH_16_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_16MHz / 4)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(16'000'000) / 4)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
MCFG_SOUND_ROUTE(2, "mono", 0.40)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki1", XTAL_3MHz , PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", XTAL(3'000'000) , PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki2", XTAL_3MHz , PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", XTAL(3'000'000) , PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
@@ -2752,14 +2752,14 @@ MACHINE_RESET_MEMBER(cave_state,sailormn)
MACHINE_CONFIG_START(cave_state::sailormn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(sailormn_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
// could be a wachdog, but if it is then our watchdog address is incorrect as there are periods where the game doesn't write it.
MCFG_TIMER_DRIVER_ADD("startup", cave_state, sailormn_startup)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz) // Bidirectional Communication
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)) // Bidirectional Communication
MCFG_CPU_PROGRAM_MAP(sailormn_sound_map)
MCFG_CPU_IO_MAP(sailormn_sound_portmap)
@@ -2790,7 +2790,7 @@ MACHINE_CONFIG_START(cave_state::sailormn)
MCFG_GENERIC_LATCH_16_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_16MHz/4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
@@ -2815,7 +2815,7 @@ MACHINE_CONFIG_START(cave_state::tekkencw)
MCFG_NVRAM_ADD_0FILL("nvram")
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(tekkencw_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
@@ -2847,7 +2847,7 @@ MACHINE_CONFIG_START(cave_state::tekkencw)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", XTAL_28MHz / 28, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL(28'000'000) / 28, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
@@ -2869,7 +2869,7 @@ MACHINE_CONFIG_START(cave_state::tjumpman)
MCFG_NVRAM_ADD_0FILL("nvram")
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(tjumpman_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
@@ -2901,7 +2901,7 @@ MACHINE_CONFIG_START(cave_state::tjumpman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", XTAL_28MHz / 28, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL(28'000'000) / 28, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
@@ -2916,7 +2916,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::uopoko)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(uopoko_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
@@ -2942,7 +2942,7 @@ MACHINE_CONFIG_START(cave_state::uopoko)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp
index bad1a3dc32f..492ba5550f1 100644
--- a/src/mame/drivers/cball.cpp
+++ b/src/mame/drivers/cball.cpp
@@ -263,7 +263,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(cball_state::cball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 16) /* ? */
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(12'096'000) / 16) /* ? */
MCFG_CPU_PROGRAM_MAP(cpu_map)
diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp
index 539cb653163..a8efdd0a130 100644
--- a/src/mame/drivers/cbm2.cpp
+++ b/src/mame/drivers/cbm2.cpp
@@ -2302,13 +2302,13 @@ MACHINE_CONFIG_START(p500_state::p500_ntsc)
MCFG_MACHINE_RESET_OVERRIDE(p500_state, p500)
// basic hardware
- MCFG_CPU_ADD(M6509_TAG, M6509, XTAL_14_31818MHz/14)
+ MCFG_CPU_ADD(M6509_TAG, M6509, XTAL(14'318'181)/14)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
MCFG_CPU_PROGRAM_MAP(p500_mem)
MCFG_QUANTUM_PERFECT_CPU(M6509_TAG)
// video hardware
- MCFG_DEVICE_ADD(MOS6567_TAG, MOS6567, XTAL_14_31818MHz/14)
+ MCFG_DEVICE_ADD(MOS6567_TAG, MOS6567, XTAL(14'318'181)/14)
MCFG_MOS6566_CPU(M6509_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(p500_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
@@ -2322,7 +2322,7 @@ MACHINE_CONFIG_START(p500_state::p500_ntsc)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL_14_31818MHz/14)
+ MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(14'318'181)/14)
MCFG_MOS6581_POTX_CALLBACK(READ8(p500_state, sid_potx_r))
MCFG_MOS6581_POTY_CALLBACK(READ8(p500_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -2344,13 +2344,13 @@ MACHINE_CONFIG_START(p500_state::p500_ntsc)
MCFG_TPI6525_IN_PC_CB(READ8(p500_state, tpi2_pc_r))
MCFG_TPI6525_OUT_PC_CB(WRITE8(p500_state, tpi2_pc_w))
MCFG_DEVICE_ADD(MOS6551A_TAG, MOS6551, VIC6567_CLOCK)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i4_w))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_MOS6551_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
MCFG_MOS6551_RXC_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_etc))
- MCFG_DEVICE_ADD(MOS6526_TAG, MOS6526A, XTAL_14_31818MHz/14)
+ MCFG_DEVICE_ADD(MOS6526_TAG, MOS6526A, XTAL(14'318'181)/14)
MCFG_MOS6526_TOD(60)
MCFG_MOS6526_IRQ_CALLBACK(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i2_w))
MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, cnt_w))
@@ -2384,7 +2384,7 @@ MACHINE_CONFIG_START(p500_state::p500_ntsc)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS6567_TAG, mos6567_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, nullptr)
- MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, XTAL_14_31818MHz/14, cbm2_expansion_cards, nullptr)
+ MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, XTAL(14'318'181)/14, cbm2_expansion_cards, nullptr)
MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, cbm2_user_port_cards, nullptr)
MCFG_CBM2_USER_PORT_IRQ_CALLBACK(WRITELINE(p500_state, user_irq_w))
MCFG_CBM2_USER_PORT_SP_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, sp_w))
@@ -2418,13 +2418,13 @@ MACHINE_CONFIG_START(p500_state::p500_pal)
MCFG_MACHINE_RESET_OVERRIDE(p500_state, p500)
// basic hardware
- MCFG_CPU_ADD(M6509_TAG, M6509, XTAL_17_734472MHz/18)
+ MCFG_CPU_ADD(M6509_TAG, M6509, XTAL(17'734'472)/18)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
MCFG_CPU_PROGRAM_MAP(p500_mem)
MCFG_QUANTUM_PERFECT_CPU(M6509_TAG)
// video hardware
- MCFG_DEVICE_ADD(MOS6569_TAG, MOS6569, XTAL_17_734472MHz/18)
+ MCFG_DEVICE_ADD(MOS6569_TAG, MOS6569, XTAL(17'734'472)/18)
MCFG_MOS6566_CPU(M6509_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(p500_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
@@ -2438,7 +2438,7 @@ MACHINE_CONFIG_START(p500_state::p500_pal)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL_17_734472MHz/18)
+ MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(17'734'472)/18)
MCFG_MOS6581_POTX_CALLBACK(READ8(p500_state, sid_potx_r))
MCFG_MOS6581_POTY_CALLBACK(READ8(p500_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -2460,10 +2460,10 @@ MACHINE_CONFIG_START(p500_state::p500_pal)
MCFG_TPI6525_IN_PC_CB(READ8(p500_state, tpi2_pc_r))
MCFG_TPI6525_OUT_PC_CB(WRITE8(p500_state, tpi2_pc_w))
MCFG_DEVICE_ADD(MOS6551A_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i4_w))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_DEVICE_ADD(MOS6526_TAG, MOS6526A, XTAL_17_734472MHz/18)
+ MCFG_DEVICE_ADD(MOS6526_TAG, MOS6526A, XTAL(17'734'472)/18)
MCFG_MOS6526_TOD(50)
MCFG_MOS6526_IRQ_CALLBACK(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i2_w))
MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, cnt_w))
@@ -2497,7 +2497,7 @@ MACHINE_CONFIG_START(p500_state::p500_pal)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS6569_TAG, mos6569_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, nullptr)
- MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, XTAL_17_734472MHz/18, cbm2_expansion_cards, nullptr)
+ MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, XTAL(17'734'472)/18, cbm2_expansion_cards, nullptr)
MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, cbm2_user_port_cards, nullptr)
MCFG_CBM2_USER_PORT_IRQ_CALLBACK(WRITELINE(p500_state, user_irq_w))
MCFG_CBM2_USER_PORT_SP_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, sp_w))
@@ -2531,7 +2531,7 @@ MACHINE_CONFIG_START(cbm2_state::cbm2lp_ntsc)
MCFG_MACHINE_RESET_OVERRIDE(cbm2_state, cbm2)
// basic hardware
- MCFG_CPU_ADD(M6509_TAG, M6509, XTAL_18MHz/9)
+ MCFG_CPU_ADD(M6509_TAG, M6509, XTAL(18'000'000)/9)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
MCFG_CPU_PROGRAM_MAP(cbm2_mem)
MCFG_QUANTUM_PERFECT_CPU(M6509_TAG)
@@ -2547,14 +2547,14 @@ MACHINE_CONFIG_START(cbm2_state::cbm2lp_ntsc)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD(MC68B45_TAG, MC6845, SCREEN_TAG, XTAL_18MHz/9)
+ MCFG_MC6845_ADD(MC68B45_TAG, MC6845, SCREEN_TAG, XTAL(18'000'000)/9)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(9)
MCFG_MC6845_UPDATE_ROW_CB(cbm2_state, crtc_update_row)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL_18MHz/9)
+ MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(18'000'000)/9)
MCFG_MOS6581_POTX_CALLBACK(READ8(cbm2_state, sid_potx_r))
MCFG_MOS6581_POTY_CALLBACK(READ8(cbm2_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -2573,10 +2573,10 @@ MACHINE_CONFIG_START(cbm2_state::cbm2lp_ntsc)
MCFG_TPI6525_OUT_PB_CB(WRITE8(cbm2_state, tpi2_pb_w))
MCFG_TPI6525_IN_PC_CB(READ8(cbm2_state, tpi2_pc_r))
MCFG_DEVICE_ADD(MOS6551A_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i4_w))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_DEVICE_ADD(MOS6526_TAG, MOS6526A, XTAL_18MHz/9)
+ MCFG_DEVICE_ADD(MOS6526_TAG, MOS6526A, XTAL(18'000'000)/9)
MCFG_MOS6526_TOD(60)
MCFG_MOS6526_IRQ_CALLBACK(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i2_w))
MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, cnt_w))
@@ -2609,7 +2609,7 @@ MACHINE_CONFIG_START(cbm2_state::cbm2lp_ntsc)
MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, nullptr, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, nullptr)
- MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, XTAL_18MHz/9, cbm2_expansion_cards, nullptr)
+ MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, XTAL(18'000'000)/9, cbm2_expansion_cards, nullptr)
MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, cbm2_user_port_cards, nullptr)
MCFG_CBM2_USER_PORT_IRQ_CALLBACK(WRITELINE(cbm2_state, user_irq_w))
MCFG_CBM2_USER_PORT_SP_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, sp_w))
@@ -2714,7 +2714,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(cbm2hp_state::bx256hp, b256hp)
MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2x_ntsc)
- MCFG_CPU_ADD(EXT_I8088_TAG, I8088, XTAL_12MHz)
+ MCFG_CPU_ADD(EXT_I8088_TAG, I8088, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(ext_mem)
MCFG_CPU_IO_MAP(ext_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(EXT_I8259A_TAG, pic8259_device, inta_cb)
@@ -2728,7 +2728,7 @@ MACHINE_CONFIG_DERIVED(cbm2hp_state::bx256hp, b256hp)
MCFG_TPI6525_OUT_PB_CB(WRITE8(cbm2_state, ext_tpi_pb_w))
MCFG_TPI6525_OUT_PC_CB(WRITE8(cbm2_state, ext_tpi_pc_w))
- MCFG_DEVICE_ADD(EXT_MOS6526_TAG, MOS6526, XTAL_18MHz/9)
+ MCFG_DEVICE_ADD(EXT_MOS6526_TAG, MOS6526, XTAL(18'000'000)/9)
MCFG_MOS6526_TOD(60)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(cbm2_state, ext_cia_irq_w))
MCFG_MOS6526_PA_INPUT_CALLBACK(DEVREAD8(EXT_MOS6525_TAG, tpi6525_device, pa_r))
@@ -2780,7 +2780,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(cbm2hp_state::cbm730, cbm720)
MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2x_pal)
- MCFG_CPU_ADD(EXT_I8088_TAG, I8088, XTAL_12MHz)
+ MCFG_CPU_ADD(EXT_I8088_TAG, I8088, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(ext_mem)
MCFG_CPU_IO_MAP(ext_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(EXT_I8259A_TAG, pic8259_device, inta_cb)
@@ -2794,7 +2794,7 @@ MACHINE_CONFIG_DERIVED(cbm2hp_state::cbm730, cbm720)
MCFG_TPI6525_OUT_PB_CB(WRITE8(cbm2_state, ext_tpi_pb_w))
MCFG_TPI6525_OUT_PC_CB(WRITE8(cbm2_state, ext_tpi_pc_w))
- MCFG_DEVICE_ADD(EXT_MOS6526_TAG, MOS6526, XTAL_18MHz/9)
+ MCFG_DEVICE_ADD(EXT_MOS6526_TAG, MOS6526, XTAL(18'000'000)/9)
MCFG_MOS6526_TOD(50)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(cbm2_state, ext_cia_irq_w))
MCFG_MOS6526_PA_INPUT_CALLBACK(DEVREAD8(EXT_MOS6525_TAG, tpi6525_device, pa_r))
diff --git a/src/mame/drivers/cbuster.cpp b/src/mame/drivers/cbuster.cpp
index 1926a3fe005..d31f5ec13c6 100644
--- a/src/mame/drivers/cbuster.cpp
+++ b/src/mame/drivers/cbuster.cpp
@@ -308,11 +308,11 @@ void cbuster_state::machine_reset()
MACHINE_CONFIG_START(cbuster_state::twocrude)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* Custom chip 59 @ 12MHz Verified */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* Custom chip 59 @ 12MHz Verified */
MCFG_CPU_PROGRAM_MAP(twocrude_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cbuster_state, irq4_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_24MHz/4) /* Custom chip 45, 6MHz Verified */
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(24'000'000)/4) /* Custom chip 45, 6MHz Verified */
MCFG_CPU_PROGRAM_MAP(sound_map)
@@ -368,18 +368,18 @@ MACHINE_CONFIG_START(cbuster_state::twocrude)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
// YM2203_PITCH_HACK - Pitch is too low at 1.3425MHz (see also stfight.cpp)
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_32_22MHz/24 * 3) /* 1.3425MHz Verified */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000)/24 * 3) /* 1.3425MHz Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_YM2151_ADD("ym2", XTAL_32_22MHz/9) /* 3.58MHz Verified */
+ MCFG_YM2151_ADD("ym2", XTAL(32'220'000)/9) /* 3.58MHz Verified */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ2 */
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, PIN7_HIGH) /* 1.0068MHz Verified */
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'220'000)/32, PIN7_HIGH) /* 1.0068MHz Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, PIN7_HIGH) /* 2.01375MHz Verified */
+ MCFG_OKIM6295_ADD("oki2", XTAL(32'220'000)/16, PIN7_HIGH) /* 2.01375MHz Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp
index 65280358d53..8d8cc7b3201 100644
--- a/src/mame/drivers/cc40.cpp
+++ b/src/mame/drivers/cc40.cpp
@@ -578,7 +578,7 @@ void cc40_state::machine_start()
MACHINE_CONFIG_START(cc40_state::cc40)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS70C20, XTAL_5MHz / 2)
+ MCFG_CPU_ADD("maincpu", TMS70C20, XTAL(5'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_TMS7000_IN_PORTA_CB(READ8(cc40_state, keyboard_r))
MCFG_TMS7000_OUT_PORTB_CB(WRITE8(cc40_state, keyboard_w))
diff --git a/src/mame/drivers/cchasm.cpp b/src/mame/drivers/cchasm.cpp
index 2633cb952f0..b6474f91709 100644
--- a/src/mame/drivers/cchasm.cpp
+++ b/src/mame/drivers/cchasm.cpp
@@ -27,7 +27,7 @@
#include "sound/volt_reg.h"
#include "speaker.h"
-#define CCHASM_68K_CLOCK (XTAL_8MHz)
+#define CCHASM_68K_CLOCK (XTAL(8'000'000))
/*************************************
*
@@ -192,7 +192,7 @@ MACHINE_CONFIG_START(cchasm_state::cchasm)
/* 6840 PTM */
MCFG_DEVICE_ADD("6840ptm", PTM6840, CCHASM_68K_CLOCK/10)
- MCFG_PTM6840_EXTERNAL_CLOCKS(0, CCHASM_68K_CLOCK / 10, 0)
+ MCFG_PTM6840_EXTERNAL_CLOCKS(0, (CCHASM_68K_CLOCK / 10).value(), 0)
MCFG_PTM6840_IRQ_CB(INPUTLINE("maincpu", 4))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp
index 49b8f8b216b..78a6100862a 100644
--- a/src/mame/drivers/cclimber.cpp
+++ b/src/mame/drivers/cclimber.cpp
@@ -249,7 +249,7 @@ Dip location verified from manual for: cclimber, guzzler, swimmer
#include "speaker.h"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
void cclimber_state::machine_start()
@@ -1230,7 +1230,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cclimber_state::swimmer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(swimmer_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cclimber_state, vblank_irq)
@@ -1241,7 +1241,7 @@ MACHINE_CONFIG_START(cclimber_state::swimmer)
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cclimber_state, sidebg_enable_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cclimber_state, palette_bank_w))
- MCFG_CPU_ADD("audiocpu", Z80,XTAL_4MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL(4'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(swimmer_audio_map)
MCFG_CPU_IO_MAP(swimmer_audio_portmap)
MCFG_CPU_PERIODIC_INT_DRIVER(cclimber_state, nmi_line_pulse, (double)4000000/16384) /* IRQs are triggered by the main CPU */
@@ -1266,10 +1266,10 @@ MACHINE_CONFIG_START(cclimber_state::swimmer)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_4MHz/2) /* verified on pcb */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(4'000'000)/2) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_4MHz/2) /* verified on pcb */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(4'000'000)/2) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ccs2810.cpp b/src/mame/drivers/ccs2810.cpp
index 55f6e4c61aa..7f5fb95f9cf 100644
--- a/src/mame/drivers/ccs2810.cpp
+++ b/src/mame/drivers/ccs2810.cpp
@@ -898,7 +898,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(ccs_state::ccs2810)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(ccs2810_mem)
MCFG_CPU_IO_MAP(ccs2810_io)
@@ -906,7 +906,7 @@ MACHINE_CONFIG_START(ccs_state::ccs2810)
MCFG_RAM_DEFAULT_SIZE("64K")
/* Devices */
- MCFG_DEVICE_ADD("ins8250", INS8250, XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("ins8250", INS8250, XTAL(1'843'200))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -922,7 +922,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ccs_state::ccs2422)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(ccs2810_mem)
MCFG_CPU_IO_MAP(ccs2422_io)
@@ -930,7 +930,7 @@ MACHINE_CONFIG_START(ccs_state::ccs2422)
MCFG_RAM_DEFAULT_SIZE("64K")
/* Devices */
- MCFG_DEVICE_ADD("ins8250", INS8250, XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("ins8250", INS8250, XTAL(1'843'200))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -943,7 +943,7 @@ MACHINE_CONFIG_START(ccs_state::ccs2422)
MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ins8250", ins8250_device, dsr_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ins8250", ins8250_device, cts_w))
- MCFG_MB8877_ADD("fdc", XTAL_16MHz / 8) // UB1793 or MB8877
+ MCFG_MB8877_ADD("fdc", XTAL(16'000'000) / 8) // UB1793 or MB8877
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ccs_floppies, "8sssd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ccs300.cpp b/src/mame/drivers/ccs300.cpp
index 538d20cbf5b..edba3c0bd04 100644
--- a/src/mame/drivers/ccs300.cpp
+++ b/src/mame/drivers/ccs300.cpp
@@ -113,7 +113,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(ccs300_state::ccs300)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(ccs300_mem)
MCFG_CPU_IO_MAP(ccs300_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
@@ -126,7 +126,7 @@ MACHINE_CONFIG_START(ccs300_state::ccs300)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxca_w))
/* Devices */
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'000'000))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
@@ -137,10 +137,10 @@ MACHINE_CONFIG_START(ccs300_state::ccs300)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal) // must be exactly here
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp
index 87fd7e1a23c..28e5164d59c 100644
--- a/src/mame/drivers/cd2650.cpp
+++ b/src/mame/drivers/cd2650.cpp
@@ -281,7 +281,7 @@ QUICKLOAD_LOAD_MEMBER( cd2650_state, cd2650 )
MACHINE_CONFIG_START(cd2650_state::cd2650)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, XTAL_14_192640MHz / 12) // 1.182720MHz according to RE schematic
+ MCFG_CPU_ADD("maincpu", S2650, XTAL(14'192'640) / 12) // 1.182720MHz according to RE schematic
MCFG_CPU_PROGRAM_MAP(cd2650_mem)
MCFG_CPU_IO_MAP(cd2650_io)
MCFG_CPU_DATA_MAP(cd2650_data)
@@ -298,7 +298,7 @@ MACHINE_CONFIG_START(cd2650_state::cd2650)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_14_192640MHz, 112 * CHARACTER_WIDTH, 0, 80 * CHARACTER_WIDTH, 22 * CHARACTER_LINES, 0, 16 * CHARACTER_LINES)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(14'192'640), 112 * CHARACTER_WIDTH, 0, 80 * CHARACTER_WIDTH, 22 * CHARACTER_LINES, 0, 16 * CHARACTER_LINES)
MCFG_SCREEN_UPDATE_DRIVER(cd2650_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp
index b1e766d1c26..201fdf429e5 100644
--- a/src/mame/drivers/cdi.cpp
+++ b/src/mame/drivers/cdi.cpp
@@ -43,8 +43,8 @@ TODO:
#include "cdi.lh"
-#define CLOCK_A XTAL_30MHz
-#define CLOCK_B XTAL_19_6608MHz
+#define CLOCK_A XTAL(30'000'000)
+#define CLOCK_B XTAL(19'660'800)
#if ENABLE_VERBOSE_LOG
static inline void ATTR_PRINTF(3,4) verboselog(device_t& device, int n_level, const char *s_fmt, ...)
diff --git a/src/mame/drivers/cgc7900.cpp b/src/mame/drivers/cgc7900.cpp
index 110e90e4798..0ce6cb67ad9 100644
--- a/src/mame/drivers/cgc7900.cpp
+++ b/src/mame/drivers/cgc7900.cpp
@@ -478,7 +478,7 @@ void cgc7900_state::machine_reset()
MACHINE_CONFIG_START(cgc7900_state::cgc7900)
/* basic machine hardware */
- MCFG_CPU_ADD(M68000_TAG, M68000, XTAL_28_48MHz/4)
+ MCFG_CPU_ADD(M68000_TAG, M68000, XTAL(28'480'000)/4)
MCFG_CPU_PROGRAM_MAP(cgc7900_mem)
MCFG_CPU_ADD(I8035_TAG, I8035, 1000000)
@@ -492,7 +492,7 @@ MACHINE_CONFIG_START(cgc7900_state::cgc7900)
//MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8())
MCFG_DEVICE_DISABLE()
-/* MCFG_CPU_ADD(AM2910_TAG, AM2910, XTAL_17_36MHz)
+/* MCFG_CPU_ADD(AM2910_TAG, AM2910, XTAL(17'360'000))
MCFG_CPU_PROGRAM_MAP(omti10_mem)*/
/* video hardware */
@@ -500,17 +500,17 @@ MACHINE_CONFIG_START(cgc7900_state::cgc7900)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(AY8910_TAG, AY8910, XTAL_28_48MHz/16)
+ MCFG_SOUND_ADD(AY8910_TAG, AY8910, XTAL(28'480'000)/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
MCFG_GENERIC_KEYBOARD_CB(PUT(cgc7900_state, kbd_put))
- MCFG_DEVICE_ADD(MM58167_TAG, MM58167, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(MM58167_TAG, MM58167, XTAL(32'768))
MCFG_MM58167_IRQ_CALLBACK(WRITELINE(cgc7900_state, irq<0x0>))
- MCFG_DEVICE_ADD(K1135A_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(K1135A_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(WRITELINE(cgc7900_state, write_rs232_clock))
MCFG_COM8116_FT_HANDLER(WRITELINE(cgc7900_state, write_rs449_clock))
diff --git a/src/mame/drivers/cgenie.cpp b/src/mame/drivers/cgenie.cpp
index 07af26fab26..38148f89f4a 100644
--- a/src/mame/drivers/cgenie.cpp
+++ b/src/mame/drivers/cgenie.cpp
@@ -436,16 +436,16 @@ const rgb_t cgenie_state::m_palette_nz[] =
MACHINE_CONFIG_START(cgenie_state::cgenie)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL_17_73447MHz / 8) // 2.2168 MHz
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(17'734'470) / 8) // 2.2168 MHz
MCFG_CPU_PROGRAM_MAP(cgenie_mem)
MCFG_CPU_IO_MAP(cgenie_io)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_17_73447MHz / 2, 568, 32, 416, 312, 28, 284)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(17'734'470) / 2, 568, 32, 416, 312, 28, 284)
MCFG_SCREEN_UPDATE_DEVICE("crtc", hd6845_device, screen_update)
- MCFG_MC6845_ADD("crtc", HD6845, "screen", XTAL_17_73447MHz / 16)
+ MCFG_MC6845_ADD("crtc", HD6845, "screen", XTAL(17'734'470) / 16)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_BEGIN_UPDATE_CB(cgenie_state, crtc_begin_update)
@@ -453,7 +453,7 @@ MACHINE_CONFIG_START(cgenie_state::cgenie)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL_17_73447MHz / 8)
+ MCFG_SOUND_ADD("ay8910", AY8910, XTAL(17'734'470) / 8)
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("par", cg_parallel_slot_device, pa_r))
MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("par", cg_parallel_slot_device, pa_w))
MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("par", cg_parallel_slot_device, pb_r))
diff --git a/src/mame/drivers/chaknpop.cpp b/src/mame/drivers/chaknpop.cpp
index 2cf00902511..90c9cf96d60 100644
--- a/src/mame/drivers/chaknpop.cpp
+++ b/src/mame/drivers/chaknpop.cpp
@@ -364,11 +364,11 @@ void chaknpop_state::machine_reset()
MACHINE_CONFIG_START(chaknpop_state::chaknpop)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz / 6) // Verified on PCB
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'000'000) / 6) // Verified on PCB
MCFG_CPU_PROGRAM_MAP(chaknpop_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", chaknpop_state, irq0_line_hold)
- MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL_18MHz / 6) // Verified on PCB
+ MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(18'000'000) / 6) // Verified on PCB
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
/* video hardware */
@@ -387,12 +387,12 @@ MACHINE_CONFIG_START(chaknpop_state::chaknpop)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_18MHz / 12) // Verified on PCB
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'000'000) / 12) // Verified on PCB
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_18MHz / 12) /* Verified on PCB */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'000'000) / 12) /* Verified on PCB */
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(chaknpop_state, unknown_port_1_w)) // ??
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(chaknpop_state, unknown_port_2_w)) // ??
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
diff --git a/src/mame/drivers/champbas.cpp b/src/mame/drivers/champbas.cpp
index 7ee6d373150..706da7661f4 100644
--- a/src/mame/drivers/champbas.cpp
+++ b/src/mame/drivers/champbas.cpp
@@ -512,7 +512,7 @@ INTERRUPT_GEN_MEMBER(champbas_state::vblank_irq)
MACHINE_CONFIG_START(champbas_state::talbot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
MCFG_CPU_PROGRAM_MAP(champbasj_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", champbas_state, vblank_irq)
@@ -526,7 +526,7 @@ MACHINE_CONFIG_START(champbas_state::talbot)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(champbas_state, mcu_start_w))
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(champbas_state, mcu_switch_w))
- MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL_18_432MHz/6/8)
+ MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL(18'432'000)/6/8)
MCFG_QUANTUM_PERFECT_CPU("alpha_8201:mcu")
MCFG_WATCHDOG_ADD("watchdog")
@@ -551,7 +551,7 @@ MACHINE_CONFIG_START(champbas_state::talbot)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
@@ -559,7 +559,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(champbas_state::champbas)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
MCFG_CPU_PROGRAM_MAP(champbas_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", champbas_state, vblank_irq)
@@ -573,7 +573,7 @@ MACHINE_CONFIG_START(champbas_state::champbas)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // no MCU
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // no MCU
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6)
MCFG_CPU_PROGRAM_MAP(champbas_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -598,7 +598,7 @@ MACHINE_CONFIG_START(champbas_state::champbas)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
MCFG_SOUND_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7) // unknown DAC
@@ -616,7 +616,7 @@ MACHINE_CONFIG_DERIVED(champbas_state::champbasj, champbas)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(champbas_state, mcu_start_w))
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(champbas_state, mcu_switch_w))
- MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL_18_432MHz/6/8) // note: 8302 rom on champbb2 (same device!)
+ MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL(18'432'000)/6/8) // note: 8302 rom on champbb2 (same device!)
MCFG_QUANTUM_PERFECT_CPU("alpha_8201:mcu")
MACHINE_CONFIG_END
@@ -649,7 +649,7 @@ MACHINE_CONFIG_DERIVED(champbas_state::tbasebal, champbas)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(tbasebal_map)
- MCFG_CPU_ADD("mcu", M68705P3, XTAL_18_432MHz/6) // ?Mhz
+ MCFG_CPU_ADD("mcu", M68705P3, XTAL(18'432'000)/6) // ?Mhz
MACHINE_CONFIG_END
@@ -657,7 +657,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(champbas_state::exctsccr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6 )
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6 )
MCFG_CPU_PROGRAM_MAP(exctsccr_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", champbas_state, vblank_irq)
@@ -671,7 +671,7 @@ MACHINE_CONFIG_START(champbas_state::exctsccr)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(champbas_state, mcu_start_w))
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(champbas_state, mcu_switch_w))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4 )
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4 )
MCFG_CPU_PROGRAM_MAP(exctsccr_sound_map)
MCFG_CPU_IO_MAP(exctsccr_sound_io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(champbas_state, nmi_line_pulse, 4000) // 4 kHz, updates the dac
@@ -679,7 +679,7 @@ MACHINE_CONFIG_START(champbas_state::exctsccr)
MCFG_TIMER_DRIVER_ADD_PERIODIC("exc_snd_irq", champbas_state, exctsccr_sound_irq, attotime::from_hz(75)) // irq source unknown, determines music tempo
MCFG_TIMER_START_DELAY(attotime::from_hz(75))
- MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL_18_432MHz/6/8) // note: 8302 rom, or 8303 on exctscc2 (same device!)
+ MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL(18'432'000)/6/8) // note: 8302 rom, or 8303 on exctscc2 (same device!)
MCFG_QUANTUM_PERFECT_CPU("alpha_8201:mcu")
MCFG_WATCHDOG_ADD("watchdog")
@@ -708,13 +708,13 @@ MACHINE_CONFIG_START(champbas_state::exctsccr)
MCFG_SOUND_ADD("ay1", AY8910, 1940000) /* VR has a factory mark and this is the value read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.08)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.08)
- MCFG_SOUND_ADD("ay3", AY8910, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("ay3", AY8910, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.08)
- MCFG_SOUND_ADD("ay4", AY8910, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("ay4", AY8910, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.08)
MCFG_SOUND_ADD("dac1", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // unknown DAC
@@ -728,7 +728,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(champbas_state::exctsccrb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
MCFG_CPU_PROGRAM_MAP(exctsccrb_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", champbas_state, vblank_irq)
@@ -742,10 +742,10 @@ MACHINE_CONFIG_START(champbas_state::exctsccrb)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(champbas_state, mcu_start_w))
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(champbas_state, mcu_switch_w))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6)
MCFG_CPU_PROGRAM_MAP(champbas_sound_map)
- MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL_18_432MHz/6/8) // champbasj 8201 on pcb, though unused
+ MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL(18'432'000)/6/8) // champbasj 8201 on pcb, though unused
MCFG_QUANTUM_PERFECT_CPU("alpha_8201:mcu")
MCFG_WATCHDOG_ADD("watchdog")
@@ -770,7 +770,7 @@ MACHINE_CONFIG_START(champbas_state::exctsccrb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
MCFG_SOUND_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7) // unknown DAC
diff --git a/src/mame/drivers/champbwl.cpp b/src/mame/drivers/champbwl.cpp
index 0188f8ad526..af758226bdf 100644
--- a/src/mame/drivers/champbwl.cpp
+++ b/src/mame/drivers/champbwl.cpp
@@ -551,7 +551,7 @@ MACHINE_START_MEMBER(champbwl_state,doraemon)
MACHINE_CONFIG_START(champbwl_state::doraemon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_14_31818MHz/4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(14'318'181)/4)
MCFG_CPU_PROGRAM_MAP(doraemon)
MCFG_CPU_VBLANK_INT_DRIVER("screen", champbwl_state, irq0_line_hold)
@@ -579,7 +579,7 @@ MACHINE_CONFIG_START(champbwl_state::doraemon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, XTAL_14_31818MHz)
+ MCFG_SOUND_ADD("x1snd", X1_010, XTAL(14'318'181))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/chanbara.cpp b/src/mame/drivers/chanbara.cpp
index 3682db94da4..3e7797e67ca 100644
--- a/src/mame/drivers/chanbara.cpp
+++ b/src/mame/drivers/chanbara.cpp
@@ -388,7 +388,7 @@ void chanbara_state::machine_reset()
MACHINE_CONFIG_START(chanbara_state::chanbara)
- MCFG_CPU_ADD("maincpu", M6809, XTAL_12MHz/8)
+ MCFG_CPU_ADD("maincpu", M6809, XTAL(12'000'000)/8)
MCFG_CPU_PROGRAM_MAP(chanbara_map)
@@ -399,7 +399,7 @@ MACHINE_CONFIG_START(chanbara_state::chanbara)
// MCFG_SCREEN_SIZE(32*8, 32*8)
// MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1)
// DECO video CRTC
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2,384,0,256,272,16,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2,384,0,256,272,16,240)
MCFG_SCREEN_UPDATE_DRIVER(chanbara_state, screen_update_chanbara)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp
index 2e25d92c127..8337a7ad05a 100644
--- a/src/mame/drivers/chance32.cpp
+++ b/src/mame/drivers/chance32.cpp
@@ -475,7 +475,7 @@ MACHINE_CONFIG_START(chance32_state::chance32)
MCFG_SPEAKER_STANDARD_MONO("mono")
/* clock at 1050 kHz match the 8000 Hz samples stored inside the ROM */
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/chaos.cpp b/src/mame/drivers/chaos.cpp
index 6813fbe64c9..40c3606c972 100644
--- a/src/mame/drivers/chaos.cpp
+++ b/src/mame/drivers/chaos.cpp
@@ -144,7 +144,7 @@ void chaos_state::machine_reset()
MACHINE_CONFIG_START(chaos_state::chaos)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, XTAL_1MHz)
+ MCFG_CPU_ADD("maincpu", S2650, XTAL(1'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_DATA_MAP(data_map)
diff --git a/src/mame/drivers/chessmst.cpp b/src/mame/drivers/chessmst.cpp
index 5c84b7e1069..7cdf1eb27c5 100644
--- a/src/mame/drivers/chessmst.cpp
+++ b/src/mame/drivers/chessmst.cpp
@@ -359,17 +359,17 @@ static const z80_daisy_config chessmstdm_daisy_chain[] =
MACHINE_CONFIG_START(chessmst_state::chessmst)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_9_8304MHz/4) // U880 Z80 clone
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(9'830'400)/4) // U880 Z80 clone
MCFG_CPU_PROGRAM_MAP(chessmst_mem)
MCFG_CPU_IO_MAP(chessmst_io)
MCFG_Z80_DAISY_CHAIN(chessmst_daisy_chain)
- MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL_9_8304MHz/4)
+ MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL(9'830'400)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(chessmst_state, pio1_port_a_w))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(chessmst_state, pio1_port_b_w))
- MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL_9_8304MHz/4)
+ MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL(9'830'400)/4)
MCFG_Z80PIO_IN_PA_CB(READ8(chessmst_state, pio2_port_a_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(chessmst_state, pio2_port_b_w))
@@ -384,17 +384,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(chessmst_state::chessmsta)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/4) // U880 Z80 clone
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/4) // U880 Z80 clone
MCFG_CPU_PROGRAM_MAP(chessmst_mem)
MCFG_CPU_IO_MAP(chessmst_io)
MCFG_Z80_DAISY_CHAIN(chessmst_daisy_chain)
- MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL_8MHz/4)
+ MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL(8'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(chessmst_state, pio1_port_a_w))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(chessmst_state, pio1_port_b_w))
- MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL_8MHz/4)
+ MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL(8'000'000)/4)
MCFG_Z80PIO_IN_PA_CB(READ8(chessmst_state, pio2_port_a_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(chessmst_state, pio2_port_b_w))
@@ -409,17 +409,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(chessmst_state::chessmstdm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) // U880 Z80 clone
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) // U880 Z80 clone
MCFG_CPU_PROGRAM_MAP(chessmstdm)
MCFG_CPU_IO_MAP(chessmstdm_io)
MCFG_Z80_DAISY_CHAIN(chessmstdm_daisy_chain)
- MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL_8MHz/4)
+ MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL(8'000'000)/4)
MCFG_Z80PIO_OUT_PA_CB(WRITE8(chessmst_state, pio1_port_a_w))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(chessmst_state, pio1_port_b_dm_w))
MCFG_Z80PIO_IN_PB_CB(IOPORT("EXTRA"))
- MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL_8MHz/4)
+ MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL(8'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(chessmst_state, pio2_port_a_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(chessmst_state, pio2_port_b_w))
diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp
index 67a742a27dc..b3ba9ef0659 100644
--- a/src/mame/drivers/chexx.cpp
+++ b/src/mame/drivers/chexx.cpp
@@ -26,7 +26,7 @@ Electro-mechanical bubble hockey games:
#include "chexx.lh"
-#define MAIN_CLOCK XTAL_4MHz
+#define MAIN_CLOCK XTAL(4'000'000)
class chexx_state : public driver_device
{
diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp
index d0a73625692..55596346052 100644
--- a/src/mame/drivers/chinagat.cpp
+++ b/src/mame/drivers/chinagat.cpp
@@ -83,7 +83,7 @@ Dip locations and factory settings verified with China Gate US manual.
#include "speaker.h"
-#define MAIN_CLOCK XTAL_12MHz
+#define MAIN_CLOCK XTAL(12'000'000)
#define PIXEL_CLOCK MAIN_CLOCK / 2
class chinagat_state : public ddragon_state
@@ -555,7 +555,7 @@ MACHINE_CONFIG_START(chinagat_state::chinagat)
MCFG_CPU_ADD("sub", HD6309, MAIN_CLOCK / 2) /* 1.5 MHz (12MHz oscillator / 4 internally) */
MCFG_CPU_PROGRAM_MAP(sub_map)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz */
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(3'579'545)) /* 3.579545 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
@@ -600,7 +600,7 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub1)
MCFG_CPU_ADD("sub", MC6809E, MAIN_CLOCK / 8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
MCFG_CPU_PROGRAM_MAP(sub_map)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz oscillator */
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(3'579'545)) /* 3.579545 MHz oscillator */
MCFG_CPU_PROGRAM_MAP(saiyugoub1_sound_map)
MCFG_CPU_ADD("mcu", I8748, 9263750) /* 9.263750 MHz oscillator, divided by 3*5 internally */
@@ -656,7 +656,7 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub2)
MCFG_CPU_ADD("sub", MC6809E, MAIN_CLOCK / 8) /* 1.5 MHz (12MHz oscillator) */
MCFG_CPU_PROGRAM_MAP(sub_map)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz oscillator */
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(3'579'545)) /* 3.579545 MHz oscillator */
MCFG_CPU_PROGRAM_MAP(ym2203c_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp
index 72cbfaa810e..5887737171c 100644
--- a/src/mame/drivers/chinsan.cpp
+++ b/src/mame/drivers/chinsan.cpp
@@ -498,7 +498,7 @@ DRIVER_INIT_MEMBER( chinsan_state, chinsan )
// C1-00114-B
MACHINE_CONFIG_START(chinsan_state::chinsan)
- MCFG_CPU_ADD("maincpu", MC8123, XTAL_10MHz/2) // 317-5012
+ MCFG_CPU_ADD("maincpu", MC8123, XTAL(10'000'000)/2) // 317-5012
MCFG_CPU_PROGRAM_MAP(chinsan_map)
MCFG_CPU_IO_MAP(chinsan_io_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
@@ -526,7 +526,7 @@ MACHINE_CONFIG_START(chinsan_state::chinsan)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_10MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(10'000'000)/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
@@ -534,7 +534,7 @@ MACHINE_CONFIG_START(chinsan_state::chinsan)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.10)
- MCFG_SOUND_ADD("adpcm", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("adpcm", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(chinsan_state, adpcm_int_w))
MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) // 8kHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -543,7 +543,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(chinsan_state::mayumi, chinsan)
// standard Z80 instead of MC-8123
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'000'000)/2)
MCFG_CPU_PROGRAM_MAP(chinsan_map)
MCFG_CPU_IO_MAP(mayumi_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", chinsan_state, vblank_int)
diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp
index 6e372cbba80..eeabb427ced 100644
--- a/src/mame/drivers/chqflag.cpp
+++ b/src/mame/drivers/chqflag.cpp
@@ -328,10 +328,10 @@ WRITE_LINE_MEMBER(chqflag_state::background_brt_w)
MACHINE_CONFIG_START(chqflag_state::chqflag)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 (verified on pcb) */
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 (verified on pcb) */
MCFG_CPU_PROGRAM_MAP(chqflag_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(chqflag_sound_map)
MCFG_DEVICE_ADD("bank1000", ADDRESS_MAP_BANK, 0)
@@ -347,9 +347,9 @@ MACHINE_CONFIG_START(chqflag_state::chqflag)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/3, 528, 96, 400, 256, 16, 240) // measured Vsync 59.17hz Hsync 15.13 / 15.19khz
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/3, 528, 96, 400, 256, 16, 240) // measured Vsync 59.17hz Hsync 15.13 / 15.19khz
// 6MHz dotclock is more realistic, however needs drawing updates. replace when ready
-// MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 396, hbend, hbstart, 256, 16, 240)
+// MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4, 396, hbend, hbstart, 256, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(chqflag_state, screen_update_chqflag)
MCFG_SCREEN_PALETTE("palette")
@@ -385,17 +385,17 @@ MACHINE_CONFIG_START(chqflag_state::chqflag)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
- MCFG_SOUND_ADD("k007232_1", K007232, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("k007232_1", K007232, XTAL(3'579'545)) /* verified on pcb */
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(chqflag_state, volume_callback0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
- MCFG_SOUND_ADD("k007232_2", K007232, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("k007232_2", K007232, XTAL(3'579'545)) /* verified on pcb */
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(chqflag_state, volume_callback1))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp
index b4cb173d742..75460f747e0 100644
--- a/src/mame/drivers/chsuper.cpp
+++ b/src/mame/drivers/chsuper.cpp
@@ -355,7 +355,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(chsuper_state::chsuper)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 4) /* HD64180RP8, 8 MHz? */
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 4) /* HD64180RP8, 8 MHz? */
MCFG_CPU_PROGRAM_MAP(chsuper_prg_map)
MCFG_CPU_IO_MAP(chsuper_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", chsuper_state, irq0_line_hold)
diff --git a/src/mame/drivers/cinemat.cpp b/src/mame/drivers/cinemat.cpp
index 59a1175bc43..36eb6ddaca7 100644
--- a/src/mame/drivers/cinemat.cpp
+++ b/src/mame/drivers/cinemat.cpp
@@ -44,7 +44,7 @@
#include "tailg.lh"
#include "wotw.lh"
-#define MASTER_CLOCK XTAL_19_923MHz
+#define MASTER_CLOCK XTAL(19'923'000)
/*************************************
diff --git a/src/mame/drivers/circus.cpp b/src/mame/drivers/circus.cpp
index 50c86a1a617..6898f800141 100644
--- a/src/mame/drivers/circus.cpp
+++ b/src/mame/drivers/circus.cpp
@@ -285,7 +285,7 @@ void circus_state::machine_reset()
MACHINE_CONFIG_START(circus_state::circus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(11'289'000) / 16) /* 705.562kHz */
MCFG_CPU_PROGRAM_MAP(circus_map)
@@ -320,7 +320,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(circus_state::robotbwl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(11'289'000) / 16) /* 705.562kHz */
MCFG_CPU_PROGRAM_MAP(circus_map)
// does not generate irq!
@@ -362,7 +362,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(circus_state::crash_scanline)
MACHINE_CONFIG_START(circus_state::crash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(11'289'000) / 16) /* 705.562kHz */
MCFG_CPU_PROGRAM_MAP(circus_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", circus_state, crash_scanline, "screen", 0, 1)
@@ -396,7 +396,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(circus_state::ripcord)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(11'289'000) / 16) /* 705.562kHz */
MCFG_CPU_PROGRAM_MAP(circus_map)
diff --git a/src/mame/drivers/circusc.cpp b/src/mame/drivers/circusc.cpp
index 4a5dd0f480c..4b62f39ef6d 100644
--- a/src/mame/drivers/circusc.cpp
+++ b/src/mame/drivers/circusc.cpp
@@ -359,7 +359,7 @@ MACHINE_CONFIG_START(circusc_state::circusc)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4)
MCFG_CPU_PROGRAM_MAP(sound_map)
@@ -382,10 +382,10 @@ MACHINE_CONFIG_START(circusc_state::circusc)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("sn1", SN76496, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("sn1", SN76496, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 0)
- MCFG_SOUND_ADD("sn2", SN76496, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("sn2", SN76496, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 1)
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 2) // ls374.7g + r44+r45+r47+r48+r50+r56+r57+r58+r59 (20k) + r46+r49+r51+r52+r53+r54+r55 (10k) + upc324.3h
diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp
index 130832c8910..85d8b997c13 100644
--- a/src/mame/drivers/cischeat.cpp
+++ b/src/mame/drivers/cischeat.cpp
@@ -2177,7 +2177,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::captflag_scanline)
MACHINE_CONFIG_START(cischeat_state::captflag)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL_24MHz / 2) // TMP68000P-12
+ MCFG_CPU_ADD("maincpu",M68000, XTAL(24'000'000) / 2) // TMP68000P-12
MCFG_CPU_PROGRAM_MAP(captflag_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", cischeat_state, captflag_scanline, "screen", 0, 1)
diff --git a/src/mame/drivers/citycon.cpp b/src/mame/drivers/citycon.cpp
index a3a4700b64a..a7d5fe3ebc9 100644
--- a/src/mame/drivers/citycon.cpp
+++ b/src/mame/drivers/citycon.cpp
@@ -189,11 +189,11 @@ void citycon_state::machine_reset()
MACHINE_CONFIG_START(citycon_state::citycon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_8MHz) // HD68B09P
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(8'000'000)) // HD68B09P
MCFG_CPU_PROGRAM_MAP(citycon_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", citycon_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL_20MHz / 32) // schematics allow for either a 6809 or 6809E; HD68A09EP found on one actual PCB
+ MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(20'000'000) / 32) // schematics allow for either a 6809 or 6809E; HD68A09EP found on one actual PCB
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", citycon_state, irq0_line_hold) //actually unused, probably it was during development
@@ -216,10 +216,10 @@ MACHINE_CONFIG_START(citycon_state::citycon)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_20MHz / 16) // schematics consistently specify AY-3-8910, though YM2149 found on one actual PCB
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(20'000'000) / 16) // schematics consistently specify AY-3-8910, though YM2149 found on one actual PCB
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_20MHz / 16)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(20'000'000) / 16)
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("soundlatch2", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
diff --git a/src/mame/drivers/ckz80.cpp b/src/mame/drivers/ckz80.cpp
index 8cac34f1786..724b2296d41 100644
--- a/src/mame/drivers/ckz80.cpp
+++ b/src/mame/drivers/ckz80.cpp
@@ -430,7 +430,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ckz80_state::master)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(master_trampoline)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", ckz80_state, irq_on, attotime::from_hz(429)) // theoretical frequency from 555 timer (22nF, 150K, 1K5), measurement was 418Hz
MCFG_TIMER_START_DELAY(attotime::from_hz(429) - attotime::from_nsec(22870)) // active for 22.87us
diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp
index 682f4cfdb53..5928d3d6f0a 100644
--- a/src/mame/drivers/clcd.cpp
+++ b/src/mame/drivers/clcd.cpp
@@ -754,7 +754,7 @@ MACHINE_CONFIG_START(clcd_state::clcd)
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w))
MCFG_DEVICE_ADD("acia", MOS6551, 2000000)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(clcd_state, write_irq_acia))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -793,7 +793,7 @@ MACHINE_CONFIG_START(clcd_state::clcd)
MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(8)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x400)
- MCFG_DEVICE_ADD("rtc", MSM58321, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM58321, XTAL(32'768))
MCFG_MSM58321_D0_HANDLER(DEVWRITELINE("via1", via6522_device, write_pa0))
MCFG_MSM58321_D1_HANDLER(DEVWRITELINE("via1", via6522_device, write_pa1))
MCFG_MSM58321_D2_HANDLER(DEVWRITELINE("via1", via6522_device, write_pa2))
diff --git a/src/mame/drivers/cliffhgr.cpp b/src/mame/drivers/cliffhgr.cpp
index 28c4544bb5e..3e1164fb089 100644
--- a/src/mame/drivers/cliffhgr.cpp
+++ b/src/mame/drivers/cliffhgr.cpp
@@ -689,7 +689,7 @@ MACHINE_CONFIG_START(cliffhgr_state::cliffhgr)
MCFG_LASERDISC_OVERLAY_CLIP(tms9928a_device::HORZ_DISPLAY_START-12, tms9928a_device::HORZ_DISPLAY_START+32*8+12-1, tms9928a_device::VERT_DISPLAY_START_NTSC - 12, tms9928a_device::VERT_DISPLAY_START_NTSC+24*8+12-1)
/* start with the TMS9928a video configuration */
- MCFG_DEVICE_ADD( "tms9928a", TMS9128, XTAL_10_738635MHz / 2 ) /* TMS9128NL on the board */
+ MCFG_DEVICE_ADD( "tms9928a", TMS9128, XTAL(10'738'635) / 2 ) /* TMS9128NL on the board */
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
diff --git a/src/mame/drivers/cloak.cpp b/src/mame/drivers/cloak.cpp
index dcf8528f039..f0de8641d53 100644
--- a/src/mame/drivers/cloak.cpp
+++ b/src/mame/drivers/cloak.cpp
@@ -363,12 +363,12 @@ MACHINE_CONFIG_START(cloak_state::cloak)
MCFG_SPEAKER_STANDARD_MONO("mono")
/* more low pass filters ==> DISCRETE processing */
- MCFG_SOUND_ADD("pokey1", POKEY, XTAL_10MHz/8) /* Accurate to recording */
+ MCFG_SOUND_ADD("pokey1", POKEY, XTAL(10'000'000)/8) /* Accurate to recording */
MCFG_POKEY_ALLPOT_R_CB(IOPORT("START"))
MCFG_POKEY_OUTPUT_OPAMP_LOW_PASS(RES_K(1), CAP_U(0.047), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("pokey2", POKEY, XTAL_10MHz/8) /* Accurate to recording */
+ MCFG_SOUND_ADD("pokey2", POKEY, XTAL(10'000'000)/8) /* Accurate to recording */
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW"))
MCFG_POKEY_OUTPUT_OPAMP_LOW_PASS(RES_K(1), CAP_U(0.022), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/clpoker.cpp b/src/mame/drivers/clpoker.cpp
index faba6636d69..f2dd0b9c944 100644
--- a/src/mame/drivers/clpoker.cpp
+++ b/src/mame/drivers/clpoker.cpp
@@ -249,7 +249,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(clpoker_state::clpoker)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 3) // Z0840004PSC, divider not verified
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 3) // Z0840004PSC, divider not verified
MCFG_CPU_PROGRAM_MAP(prg_map)
MCFG_CPU_IO_MAP(io_map)
@@ -283,7 +283,7 @@ MACHINE_CONFIG_START(clpoker_state::clpoker)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_12MHz / 8) // AY38910A/P, divider not verified
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(12'000'000) / 8) // AY38910A/P, divider not verified
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp
index f6527b6376b..a85924ba491 100644
--- a/src/mame/drivers/clshroad.cpp
+++ b/src/mame/drivers/clshroad.cpp
@@ -36,7 +36,7 @@ TODO:
#include "speaker.h"
/* unknown divider, assume /5 */
-#define MAIN_CLOCK XTAL_18_432MHz/5
+#define MAIN_CLOCK XTAL(18'432'000)/5
void clshroad_state::machine_reset()
{
diff --git a/src/mame/drivers/cm1800.cpp b/src/mame/drivers/cm1800.cpp
index 92048709bf3..f76fab329d1 100644
--- a/src/mame/drivers/cm1800.cpp
+++ b/src/mame/drivers/cm1800.cpp
@@ -110,7 +110,7 @@ void cm1800_state::machine_reset()
MACHINE_CONFIG_START(cm1800_state::cm1800)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_2MHz)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp
index 6ea086ccb41..1469cd70a0c 100644
--- a/src/mame/drivers/cmi.cpp
+++ b/src/mame/drivers/cmi.cpp
@@ -122,10 +122,10 @@
#include "speaker.h"
-#define Q209_CPU_CLOCK XTAL_40_210MHz / 40 // divider not verified (very complex circuit)
+#define Q209_CPU_CLOCK XTAL(40'210'000) / 40 // divider not verified (very complex circuit)
#define M6809_CLOCK 8000000 // wrong
-#define MASTER_OSCILLATOR XTAL_34_291712MHz
+#define MASTER_OSCILLATOR XTAL(34'291'712)
#define CPU_1 0
#define CPU_2 1
@@ -141,7 +141,7 @@
#define PAGE_MASK (PAGE_SIZE - 1)
#define PAGE_SHIFT 5
-#define PIXEL_CLOCK XTAL_10_38MHz
+#define PIXEL_CLOCK XTAL(10'380'000)
#define HTOTAL 672
#define HBLANK_END 0
#define HBLANK_START 512
@@ -149,8 +149,8 @@
#define VBLANK_END 0
#define VBLANK_START 256
-#define HBLANK_FREQ ((double)PIXEL_CLOCK / (double)HTOTAL)
-#define VBLANK_FREQ ((double)HBLANK_FREQ / (double)VTOTAL)
+#define HBLANK_FREQ (PIXEL_CLOCK / HTOTAL)
+#define VBLANK_FREQ (HBLANK_FREQ / VTOTAL)
#define MAPSEL_P2_B 0x00
#define MAPSEL_P2_A 0x03
@@ -1831,7 +1831,7 @@ void cmi01a_device::run_voice()
int o_val = (val_a >> 2) & 0xf;
int m_tune = m_cmi02_pia_0->b_output();
- double mfreq = (double)(0xf00 | m_tune) * ((double)MASTER_OSCILLATOR / 2.0) / 4096.0;
+ double mfreq = (double)(0xf00 | m_tune) * (MASTER_OSCILLATOR / 2.0 / 4096.0).dvalue();
double cfreq = ((double)(0x800 | (pitch << 1))* mfreq) / 4096.0;
@@ -2755,14 +2755,14 @@ MACHINE_CONFIG_START(cmi_state::cmi2x)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cmi_state, cpu2_interrupt_callback)
MCFG_QUANTUM_PERFECT_CPU("maincpu2")
- MCFG_CPU_ADD("muskeys", M6802, XTAL_4MHz)
+ MCFG_CPU_ADD("muskeys", M6802, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(muskeys_map)
- MCFG_CPU_ADD("alphakeys", M6802, XTAL_3_84MHz)
+ MCFG_CPU_ADD("alphakeys", M6802, XTAL(3'840'000))
MCFG_CPU_PROGRAM_MAP(alphakeys_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(cmi_state, irq0_line_hold, XTAL_3_84MHz / 400) // TODO: PIA controls this
+ MCFG_CPU_PERIODIC_INT_DRIVER(cmi_state, irq0_line_hold, XTAL(3'840'000) / 400) // TODO: PIA controls this
- MCFG_CPU_ADD("smptemidi", M68000, XTAL_20MHz / 2)
+ MCFG_CPU_ADD("smptemidi", M68000, XTAL(20'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(midicpu_map)
MCFG_CPU_ADD("cmi07cpu", MC6809E, Q209_CPU_CLOCK) // ?
@@ -2782,7 +2782,7 @@ MACHINE_CONFIG_START(cmi_state::cmi2x)
MCFG_SCREEN_UPDATE_DRIVER(cmi_state, screen_update_cmi2x)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MSM5832_ADD("msm5832", XTAL_32_768kHz)
+ MCFG_MSM5832_ADD("msm5832", XTAL(32'768))
MCFG_DEVICE_ADD("i8214_1", I8214, 1000000) // cmi_8214_intf_1
MCFG_I8214_INT_CALLBACK(WRITELINE(cmi_state, i8214_1_int_w))
@@ -2821,27 +2821,27 @@ MACHINE_CONFIG_START(cmi_state::cmi2x)
MCFG_PTM6840_OUT1_CB(WRITELINE(cmi_state, cmi02_ptm_o1))
MCFG_PTM6840_IRQ_CB(WRITELINE(cmi_state, cmi02_ptm_irq))
- MCFG_DEVICE_ADD("mkbd_acia_clock", CLOCK, XTAL_1_8432MHz / 12)
+ MCFG_DEVICE_ADD("mkbd_acia_clock", CLOCK, XTAL(1'843'200) / 12)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(cmi_state, mkbd_acia_clock))
- MCFG_DEVICE_ADD("q133_acia_0", MOS6551, XTAL_1_8432MHz)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("q133_acia_0", MOS6551, XTAL(1'843'200))
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(cmi_state, q133_acia_irq0))
- MCFG_DEVICE_ADD("q133_acia_1", MOS6551, XTAL_1_8432MHz)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("q133_acia_1", MOS6551, XTAL(1'843'200))
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(cmi_state, q133_acia_irq1))
- MCFG_DEVICE_ADD("q133_acia_2", MOS6551, XTAL_1_8432MHz)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("q133_acia_2", MOS6551, XTAL(1'843'200))
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(cmi_state, q133_acia_irq2))
- MCFG_DEVICE_ADD("q133_acia_3", MOS6551, XTAL_1_8432MHz)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("q133_acia_3", MOS6551, XTAL(1'843'200))
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(cmi_state, q133_acia_irq3))
- MCFG_DEVICE_ADD("acia_mkbd_kbd", ACIA6850, XTAL_1_8432MHz / 12) // acia_mkbd_kbd
- MCFG_DEVICE_ADD("acia_mkbd_cmi", ACIA6850, XTAL_1_8432MHz / 12) // acia_mkbd_cmi
+ MCFG_DEVICE_ADD("acia_mkbd_kbd", ACIA6850, XTAL(1'843'200) / 12) // acia_mkbd_kbd
+ MCFG_DEVICE_ADD("acia_mkbd_cmi", ACIA6850, XTAL(1'843'200) / 12) // acia_mkbd_cmi
MCFG_DEVICE_ADD("ank_pia", PIA6821, 0) // pia_ank_config
MCFG_DEVICE_MODIFY("q133_acia_0")
@@ -2875,7 +2875,7 @@ MACHINE_CONFIG_START(cmi_state::cmi2x)
MCFG_DEVICE_ADD("cmi07_ptm", PTM6840, 2000000) // ptm_cmi07_config TODO
MCFG_PTM6840_IRQ_CB(WRITELINE(cmi_state, cmi07_irq))
- MCFG_FD1791_ADD("wd1791", XTAL_16MHz / 8) // wd1791_interface
+ MCFG_FD1791_ADD("wd1791", XTAL(16'000'000) / 8) // wd1791_interface
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(cmi_state, wd1791_irq))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(cmi_state, wd1791_drq))
MCFG_FLOPPY_DRIVE_ADD("wd1791:0", cmi2x_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/cmmb.cpp b/src/mame/drivers/cmmb.cpp
index b501c979259..56f5d400174 100644
--- a/src/mame/drivers/cmmb.cpp
+++ b/src/mame/drivers/cmmb.cpp
@@ -51,7 +51,7 @@ OSC @ 72.576MHz
#include "machine/at29x.h"
#include "screen.h"
-#define MAIN_CLOCK XTAL_72_576MHz
+#define MAIN_CLOCK XTAL(72'576'000)
class cmmb_state : public driver_device
{
diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp
index 2dae128fa05..94f333ac5ee 100644
--- a/src/mame/drivers/cninja.cpp
+++ b/src/mame/drivers/cninja.cpp
@@ -813,10 +813,10 @@ DECOSPR_PRIORITY_CB_MEMBER(cninja_state::pri_callback)
MACHINE_CONFIG_START(cninja_state::cninja)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(cninja_map)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz / 8)
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_DECO_IRQ_ADD("irq", "screen")
@@ -826,7 +826,7 @@ MACHINE_CONFIG_START(cninja_state::cninja)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz / 4, 376, 0, 256, 274, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000) / 4, 376, 0, 256, 274, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_cninja)
MCFG_SCREEN_PALETTE("palette")
@@ -881,19 +881,19 @@ MACHINE_CONFIG_START(cninja_state::cninja)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_32_22MHz / 8)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_YM2151_ADD("ym2", XTAL_32_22MHz / 9)
+ MCFG_YM2151_ADD("ym2", XTAL(32'220'000) / 9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(cninja_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz / 32, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'220'000) / 32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz / 16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL(32'220'000) / 16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -901,7 +901,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cninja_state::stoneage)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(cninja_map)
MCFG_CPU_ADD("audiocpu", Z80, 3579545)
@@ -914,7 +914,7 @@ MACHINE_CONFIG_START(cninja_state::stoneage)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz / 4, 376, 0, 256, 274, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000) / 4, 376, 0, 256, 274, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_cninja)
MCFG_SCREEN_PALETTE("palette")
@@ -971,12 +971,12 @@ MACHINE_CONFIG_START(cninja_state::stoneage)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_32_22MHz / 9)
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000) / 9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz / 32, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'220'000) / 32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -992,7 +992,7 @@ MACHINE_CONFIG_DERIVED(cninja_state::cninjabl2, stoneage)
MCFG_DEVICE_REMOVE("ymsnd")
- MCFG_OKIM6295_REPLACE("oki1", XTAL_32_22MHz / 32, PIN7_LOW)
+ MCFG_OKIM6295_REPLACE("oki1", XTAL(32'220'000) / 32, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, cninjabl2_oki_map)
MACHINE_CONFIG_END
@@ -1000,7 +1000,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cninja_state::cninjabl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(cninjabl_map)
MCFG_CPU_ADD("audiocpu", Z80, 3579545)
@@ -1013,7 +1013,7 @@ MACHINE_CONFIG_START(cninja_state::cninjabl)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz / 4, 376, 0, 256, 274, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000) / 4, 376, 0, 256, 274, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_cninjabl)
MCFG_SCREEN_PALETTE("palette")
@@ -1059,12 +1059,12 @@ MACHINE_CONFIG_START(cninja_state::cninjabl)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_YM2151_ADD("ymsnd", XTAL_32_22MHz / 9)
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000) / 9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz / 32, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'220'000) / 32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -1072,10 +1072,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cninja_state::edrandy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(edrandy_map)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz / 8)
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
MCFG_CPU_PROGRAM_MAP(sound_map_146)
MCFG_DECO_IRQ_ADD("irq", "screen")
@@ -1085,7 +1085,7 @@ MACHINE_CONFIG_START(cninja_state::edrandy)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz / 4, 376, 0, 256, 274, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000) / 4, 376, 0, 256, 274, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_edrandy)
MCFG_SCREEN_PALETTE("palette")
@@ -1139,19 +1139,19 @@ MACHINE_CONFIG_START(cninja_state::edrandy)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_32_22MHz / 8)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_YM2151_ADD("ym2", XTAL_32_22MHz / 9)
+ MCFG_YM2151_ADD("ym2", XTAL(32'220'000) / 9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(cninja_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz / 32, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'220'000) / 32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz / 16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL(32'220'000) / 16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -1159,10 +1159,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cninja_state::robocop2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(robocop2_map)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz / 8)
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
MCFG_CPU_PROGRAM_MAP(sound_map_146)
MCFG_DECO_IRQ_ADD("irq", "screen")
@@ -1172,7 +1172,7 @@ MACHINE_CONFIG_START(cninja_state::robocop2)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz / 4, 442, 0, 320, 274, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_robocop2)
MCFG_SCREEN_PALETTE("palette")
@@ -1231,21 +1231,21 @@ MACHINE_CONFIG_START(cninja_state::robocop2)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_32_22MHz / 8)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
- MCFG_YM2151_ADD("ym2", XTAL_32_22MHz / 9)
+ MCFG_YM2151_ADD("ym2", XTAL(32'220'000) / 9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(cninja_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz / 32, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'220'000) / 32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz / 16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL(32'220'000) / 16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
@@ -1258,7 +1258,7 @@ MACHINE_CONFIG_START(cninja_state::mutantf)
MCFG_CPU_PROGRAM_MAP(mutantf_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cninja_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz / 8)
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
MCFG_CPU_PROGRAM_MAP(sound_map_mutantf)
/* video hardware */
@@ -1328,17 +1328,17 @@ MACHINE_CONFIG_START(cninja_state::mutantf)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_32_22MHz / 9)
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000) / 9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(cninja_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz / 32, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'220'000) / 32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz / 16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL(32'220'000) / 16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp
index 66879aba733..c3e4d238ff2 100644
--- a/src/mame/drivers/cobra.cpp
+++ b/src/mame/drivers/cobra.cpp
@@ -3323,7 +3323,7 @@ MACHINE_CONFIG_START(cobra_state::cobra)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC603, 100000000) /* 603EV, 100? MHz */
- MCFG_PPC_BUS_FREQUENCY(XTAL_66_6667MHz) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
+ MCFG_PPC_BUS_FREQUENCY(XTAL(66'666'700)) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
MCFG_CPU_PROGRAM_MAP(cobra_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cobra_state, cobra_vblank)
@@ -3331,7 +3331,7 @@ MACHINE_CONFIG_START(cobra_state::cobra)
MCFG_CPU_PROGRAM_MAP(cobra_sub_map)
MCFG_CPU_ADD("gfxcpu", PPC604, 100000000) /* 604, 100? MHz */
- MCFG_PPC_BUS_FREQUENCY(XTAL_66_6667MHz) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
+ MCFG_PPC_BUS_FREQUENCY(XTAL(66'666'700)) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
MCFG_CPU_PROGRAM_MAP(cobra_gfx_map)
MCFG_QUANTUM_TIME(attotime::from_hz(15005))
@@ -3354,7 +3354,7 @@ MACHINE_CONFIG_START(cobra_state::cobra)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_RF5C400_ADD("rfsnd", XTAL_16_9344MHz)
+ MCFG_RF5C400_ADD("rfsnd", XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp
index a0363845812..d5d65073aa7 100644
--- a/src/mame/drivers/coco12.cpp
+++ b/src/mame/drivers/coco12.cpp
@@ -430,7 +430,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(coco12_state::coco)
MCFG_DEVICE_MODIFY(":")
- MCFG_DEVICE_CLOCK(XTAL_14_31818MHz / 16)
+ MCFG_DEVICE_CLOCK(XTAL(14'318'181) / 16)
// basic machine hardware
MCFG_CPU_ADD(MAINCPU_TAG, MC6809E, DERIVED_CLOCK(1, 1))
@@ -456,7 +456,7 @@ MACHINE_CONFIG_START(coco12_state::coco)
MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia1_firq_a))
MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia1_firq_b))
- MCFG_SAM6883_ADD(SAM_TAG, XTAL_14_31818MHz, MAINCPU_TAG, AS_PROGRAM)
+ MCFG_SAM6883_ADD(SAM_TAG, XTAL(14'318'181), MAINCPU_TAG, AS_PROGRAM)
MCFG_SAM6883_RES_CALLBACK(READ8(coco12_state, sam_read))
// Becker Port device
@@ -478,7 +478,7 @@ MACHINE_CONFIG_START(coco12_state::coco)
// video hardware
MCFG_SCREEN_MC6847_NTSC_ADD(SCREEN_TAG, VDG_TAG)
- MCFG_DEVICE_ADD(VDG_TAG, MC6847_NTSC, XTAL_14_31818MHz / 4) // VClk output from MC6883
+ MCFG_DEVICE_ADD(VDG_TAG, MC6847_NTSC, XTAL(14'318'181) / 4) // VClk output from MC6883
MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(coco12_state, horizontal_sync))
MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(coco12_state, field_sync))
MCFG_MC6847_INPUT_CALLBACK(DEVREAD8(SAM_TAG, sam6883_device, display_read))
@@ -522,7 +522,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(coco12_state::coco2b, coco2)
MCFG_DEVICE_REMOVE(VDG_TAG)
- MCFG_DEVICE_ADD(VDG_TAG, MC6847T1_NTSC, XTAL_14_31818MHz / 4)
+ MCFG_DEVICE_ADD(VDG_TAG, MC6847T1_NTSC, XTAL(14'318'181) / 4)
MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(coco12_state, horizontal_sync))
MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(coco12_state, field_sync))
MCFG_MC6847_INPUT_CALLBACK(DEVREAD8(SAM_TAG, sam6883_device, display_read))
diff --git a/src/mame/drivers/coco3.cpp b/src/mame/drivers/coco3.cpp
index 914cc7f73ec..fa07e4852c3 100644
--- a/src/mame/drivers/coco3.cpp
+++ b/src/mame/drivers/coco3.cpp
@@ -243,7 +243,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(coco3_state::coco3)
MCFG_DEVICE_MODIFY(":")
- MCFG_DEVICE_CLOCK(XTAL_28_63636MHz / 32)
+ MCFG_DEVICE_CLOCK(XTAL(28'636'363) / 32)
// basic machine hardware
MCFG_CPU_ADD(MAINCPU_TAG, MC6809E, DERIVED_CLOCK(1, 1))
@@ -291,7 +291,7 @@ MACHINE_CONFIG_START(coco3_state::coco3)
// video hardware
MCFG_DEFAULT_LAYOUT(layout_coco3)
- MCFG_DEVICE_ADD(GIME_TAG, GIME_NTSC, XTAL_28_63636MHz)
+ MCFG_DEVICE_ADD(GIME_TAG, GIME_NTSC, XTAL(28'636'363))
MCFG_GIME_MAINCPU(MAINCPU_TAG)
MCFG_GIME_RAM(RAM_TAG)
MCFG_GIME_EXT(CARTRIDGE_TAG)
@@ -338,10 +338,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(coco3_state::coco3p, coco3)
MCFG_DEVICE_MODIFY(":")
- MCFG_DEVICE_CLOCK(XTAL_28_475MHz / 32)
+ MCFG_DEVICE_CLOCK(XTAL(28'475'000) / 32)
// An additional 4.433618 MHz XTAL is required for PAL color encoding
- MCFG_DEVICE_REPLACE(GIME_TAG, GIME_PAL, XTAL_28_475MHz)
+ MCFG_DEVICE_REPLACE(GIME_TAG, GIME_PAL, XTAL(28'475'000))
MCFG_GIME_MAINCPU(MAINCPU_TAG)
MCFG_GIME_RAM(RAM_TAG)
MCFG_GIME_EXT(CARTRIDGE_TAG)
diff --git a/src/mame/drivers/cocoloco.cpp b/src/mame/drivers/cocoloco.cpp
index 4f04a44bda4..a42c1859a1d 100644
--- a/src/mame/drivers/cocoloco.cpp
+++ b/src/mame/drivers/cocoloco.cpp
@@ -199,7 +199,7 @@
#include "netlist/devices/net_lib.h"
-#define MASTER_CLOCK XTAL_20MHz /* confirmed */
+#define MASTER_CLOCK XTAL(20'000'000) /* confirmed */
#define CPU_CLOCK MASTER_CLOCK / 16 /* confirmed */
#define SND_CLOCK MASTER_CLOCK / 8 /* confirmed */
diff --git a/src/mame/drivers/codata.cpp b/src/mame/drivers/codata.cpp
index d719c9f07c4..9e7575bf4f8 100644
--- a/src/mame/drivers/codata.cpp
+++ b/src/mame/drivers/codata.cpp
@@ -62,17 +62,17 @@ void codata_state::machine_reset()
MACHINE_CONFIG_START(codata_state::codata)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu",M68000, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_DEVICE_ADD("uart", UPD7201_NEW, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("uart", UPD7201_NEW, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs423a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs423a", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs423a", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs423b", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", M68K_IRQ_5))
- MCFG_DEVICE_ADD("timer", AM9513A, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("timer", AM9513A, XTAL(16'000'000) / 4)
MCFG_AM9513_OUT1_CALLBACK(NOOP) // Timer 1 = "Abort/Reset" (watchdog)
MCFG_AM9513_OUT2_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_6)) // Timer 2
MCFG_AM9513_OUT3_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_7)) // Refresh
diff --git a/src/mame/drivers/coinmstr.cpp b/src/mame/drivers/coinmstr.cpp
index 4cdf8c9ad0d..6b4e41caa3d 100644
--- a/src/mame/drivers/coinmstr.cpp
+++ b/src/mame/drivers/coinmstr.cpp
@@ -137,7 +137,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_14MHz
+#define MASTER_CLOCK XTAL(14'000'000)
#define CPU_CLOCK (MASTER_CLOCK/4)
#define SND_CLOCK (MASTER_CLOCK/8)
diff --git a/src/mame/drivers/coinmvga.cpp b/src/mame/drivers/coinmvga.cpp
index e53e6265e3d..adbdeb40af6 100644
--- a/src/mame/drivers/coinmvga.cpp
+++ b/src/mame/drivers/coinmvga.cpp
@@ -225,10 +225,10 @@
#include "speaker.h"
-#define CPU_CLOCK XTAL_14_7456MHz
-#define MACH_CLOCK XTAL_50MHz // 50.35
-#define COM_CLOCK XTAL_20MHz
-#define SND_CLOCK XTAL_16_9344MHz
+#define CPU_CLOCK XTAL(14'745'600)
+#define MACH_CLOCK XTAL(50'000'000) // 50.35
+#define COM_CLOCK XTAL(20'000'000)
+#define SND_CLOCK XTAL(16'934'400)
class coinmvga_state : public driver_device
diff --git a/src/mame/drivers/coleco.cpp b/src/mame/drivers/coleco.cpp
index fde2822cff2..8fc2f2f585d 100644
--- a/src/mame/drivers/coleco.cpp
+++ b/src/mame/drivers/coleco.cpp
@@ -374,12 +374,12 @@ void coleco_state::machine_reset()
MACHINE_CONFIG_START(coleco_state::coleco)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_7_15909MHz/2) // 3.579545 MHz
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(7'159'090)/2) // 3.579545 MHz
MCFG_CPU_PROGRAM_MAP(coleco_map)
MCFG_CPU_IO_MAP(coleco_io_map)
/* video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(coleco_state, coleco_vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
@@ -387,7 +387,7 @@ MACHINE_CONFIG_START(coleco_state::coleco)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489a", SN76489A, XTAL_7_15909MHz/2) // 3.579545 MHz
+ MCFG_SOUND_ADD("sn76489a", SN76489A, XTAL(7'159'090)/2) // 3.579545 MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* cartridge */
@@ -405,7 +405,7 @@ MACHINE_CONFIG_DERIVED(coleco_state::colecop, coleco)
MCFG_DEVICE_REMOVE("tms9928a")
MCFG_DEVICE_REMOVE("screen")
- MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(coleco_state, coleco_vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
@@ -425,7 +425,7 @@ MACHINE_CONFIG_DERIVED(coleco_state::dina, czz50)
MCFG_DEVICE_REMOVE("tms9928a")
MCFG_DEVICE_REMOVE("screen")
- MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(coleco_state, coleco_vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp
index 0bec5b30269..f099a21142d 100644
--- a/src/mame/drivers/combatsc.cpp
+++ b/src/mame/drivers/combatsc.cpp
@@ -714,7 +714,7 @@ MACHINE_CONFIG_START(combatsc_state::combatsc)
// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
// MCFG_SCREEN_SIZE(32*8, 32*8)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/3, 528, 0, 256, 256, 16, 240) // not accurate, assuming same to other Konami games (59.17)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/3, 528, 0, 256, 256, 16, 240) // not accurate, assuming same to other Konami games (59.17)
MCFG_SCREEN_UPDATE_DRIVER(combatsc_state, screen_update_combatsc)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/compc.cpp b/src/mame/drivers/compc.cpp
index 4f46d5b63ee..e59d7b797ba 100644
--- a/src/mame/drivers/compc.cpp
+++ b/src/mame/drivers/compc.cpp
@@ -195,11 +195,11 @@ MACHINE_CONFIG_START(compc_state::compc)
MCFG_PCNOPPI_MOTHERBOARD_ADD("mb", "maincpu")
MCFG_DEVICE_REMOVE("mb:pit8253")
MCFG_DEVICE_ADD("mb:pit8253", FE2010_PIT, 0)
- MCFG_PIT8253_CLK0(XTAL_14_31818MHz/12.0) /* heartbeat IRQ */
+ MCFG_PIT8253_CLK0(XTAL(14'318'181)/12.0) /* heartbeat IRQ */
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_14_31818MHz/12.0) /* dram refresh */
+ MCFG_PIT8253_CLK1(XTAL(14'318'181)/12.0) /* dram refresh */
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(ibm5160_mb_device, pc_pit8253_out1_changed))
- MCFG_PIT8253_CLK2(XTAL_14_31818MHz/12.0) /* pio port c pin 4, and speaker polling enough */
+ MCFG_PIT8253_CLK2(XTAL(14'318'181)/12.0) /* pio port c pin 4, and speaker polling enough */
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(ibm5160_mb_device, pc_pit8253_out2_changed))
MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "mda", false)
diff --git a/src/mame/drivers/compis.cpp b/src/mame/drivers/compis.cpp
index cecd77c3a35..a1f6f4e568e 100644
--- a/src/mame/drivers/compis.cpp
+++ b/src/mame/drivers/compis.cpp
@@ -747,7 +747,7 @@ void compis_state::machine_reset()
MACHINE_CONFIG_START(compis_state::compis)
// basic machine hardware
- MCFG_CPU_ADD(I80186_TAG, I80186, XTAL_15_36MHz)
+ MCFG_CPU_ADD(I80186_TAG, I80186, XTAL(15'360'000))
MCFG_CPU_PROGRAM_MAP(compis_mem)
MCFG_CPU_IO_MAP(compis_io)
MCFG_80186_IRQ_SLAVE_ACK(DEVREAD8(DEVICE_SELF, compis_state, compis_irq_callback))
@@ -755,17 +755,17 @@ MACHINE_CONFIG_START(compis_state::compis)
MCFG_80186_TMROUT1_HANDLER(DEVWRITELINE(DEVICE_SELF, compis_state, tmr1_w))
// devices
- MCFG_DEVICE_ADD(I80130_TAG, I80130, XTAL_15_36MHz/2)
+ MCFG_DEVICE_ADD(I80130_TAG, I80130, XTAL(15'360'000)/2)
MCFG_I80130_IRQ_CALLBACK(DEVWRITELINE(I80186_TAG, i80186_cpu_device, int0_w))
MCFG_I80130_SYSTICK_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir3_w))
MCFG_I80130_DELAY_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir7_w))
MCFG_I80130_BAUD_CALLBACK(WRITELINE(compis_state, tmr2_w))
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_15_36MHz/8)
+ MCFG_PIT8253_CLK0(XTAL(15'360'000)/8)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8274_TAG, i8274_device, rxtxcb_w))
- MCFG_PIT8253_CLK1(XTAL_15_36MHz/8)
- MCFG_PIT8253_CLK2(XTAL_15_36MHz/8)
+ MCFG_PIT8253_CLK1(XTAL(15'360'000)/8)
+ MCFG_PIT8253_CLK2(XTAL(15'360'000)/8)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(compis_state, tmr5_w))
MCFG_DEVICE_ADD(I8255_TAG, I8255, 0)
@@ -781,7 +781,7 @@ MACHINE_CONFIG_START(compis_state::compis)
MCFG_DEVICE_ADD(COMPIS_KEYBOARD_TAG, COMPIS_KEYBOARD, 0)
MCFG_COMPIS_KEYBOARD_OUT_TX_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_rxd))
- MCFG_DEVICE_ADD(I8274_TAG, I8274, XTAL_15_36MHz/4)
+ MCFG_DEVICE_ADD(I8274_TAG, I8274, XTAL(15'360'000)/4)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
@@ -790,7 +790,7 @@ MACHINE_CONFIG_START(compis_state::compis)
MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(DEVWRITELINE(I80186_TAG, i80186_cpu_device, int3_w))
- MCFG_DEVICE_ADD(MM58174A_TAG, MM58274C, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(MM58174A_TAG, MM58274C, XTAL(32'768))
MCFG_MM58274C_MODE24(1) // 24 hour
MCFG_MM58274C_DAY1(1) // monday
@@ -814,7 +814,7 @@ MACHINE_CONFIG_START(compis_state::compis)
MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(compis_state, write_centronics_select))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
- MCFG_COMPIS_GRAPHICS_SLOT_ADD(GRAPHICS_TAG, XTAL_15_36MHz/2, compis_graphics_cards, "hrg")
+ MCFG_COMPIS_GRAPHICS_SLOT_ADD(GRAPHICS_TAG, XTAL(15'360'000)/2, compis_graphics_cards, "hrg")
MCFG_ISBX_SLOT_ADD(ISBX_0_TAG, 0, isbx_cards, "fdc")
MCFG_ISBX_SLOT_MINTR0_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir1_w))
diff --git a/src/mame/drivers/compucolor.cpp b/src/mame/drivers/compucolor.cpp
index 85953236626..ce332b09492 100644
--- a/src/mame/drivers/compucolor.cpp
+++ b/src/mame/drivers/compucolor.cpp
@@ -392,19 +392,19 @@ void compucolor2_state::machine_reset()
MACHINE_CONFIG_START(compucolor2_state::compucolor2)
// basic machine hardware
- MCFG_CPU_ADD(I8080_TAG, I8080, XTAL_17_9712MHz/9)
+ MCFG_CPU_ADD(I8080_TAG, I8080, XTAL(17'971'200)/9)
MCFG_CPU_PROGRAM_MAP(compucolor2_mem)
MCFG_CPU_IO_MAP(compucolor2_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(compucolor2_state,int_ack)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_17_9712MHz/2, 93*6, 0, 64*6, 268, 0, 256)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(17'971'200)/2, 93*6, 0, 64*6, 268, 0, 256)
MCFG_SCREEN_UPDATE_DRIVER(compucolor2_state, screen_update)
MCFG_PALETTE_ADD_3BIT_RGB("palette")
- MCFG_DEVICE_ADD(CRT5027_TAG, CRT5027, XTAL_17_9712MHz/2)
+ MCFG_DEVICE_ADD(CRT5027_TAG, CRT5027, XTAL(17'971'200)/2)
MCFG_TMS9927_CHAR_WIDTH(6)
MCFG_TMS9927_VSYN_CALLBACK(DEVWRITELINE("blink", ripple_counter_device, clock_w))
MCFG_VIDEO_SET_SCREEN("screen")
@@ -414,7 +414,7 @@ MACHINE_CONFIG_START(compucolor2_state::compucolor2)
MCFG_RIPPLE_COUNTER_COUNT_OUT_CB(DEVWRITELINE(TMS5501_TAG, tms5501_device, sens_w)) MCFG_DEVCB_BIT(4)
// devices
- MCFG_DEVICE_ADD(TMS5501_TAG, TMS5501, XTAL_17_9712MHz/9)
+ MCFG_DEVICE_ADD(TMS5501_TAG, TMS5501, XTAL(17'971'200)/9)
MCFG_TMS5501_IRQ_CALLBACK(INPUTLINE(I8080_TAG, I8085_INTR_LINE))
MCFG_TMS5501_XMT_CALLBACK(WRITELINE(compucolor2_state, xmt_w))
MCFG_TMS5501_XI_CALLBACK(READ8(compucolor2_state, xi_r))
diff --git a/src/mame/drivers/concept.cpp b/src/mame/drivers/concept.cpp
index a561da9e49d..653e55aa961 100644
--- a/src/mame/drivers/concept.cpp
+++ b/src/mame/drivers/concept.cpp
@@ -248,15 +248,15 @@ MACHINE_CONFIG_START(concept_state::concept)
/* ACIAs */
MCFG_DEVICE_ADD(ACIA_0_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
MCFG_DEVICE_ADD(ACIA_1_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
MCFG_DEVICE_ADD(KBD_ACIA_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
/* Apple II bus */
MCFG_DEVICE_ADD(A2BUS_TAG, A2BUS, 0)
diff --git a/src/mame/drivers/contra.cpp b/src/mame/drivers/contra.cpp
index cc79c63d13e..79ed78174e5 100644
--- a/src/mame/drivers/contra.cpp
+++ b/src/mame/drivers/contra.cpp
@@ -197,11 +197,11 @@ void contra_state::machine_start()
MACHINE_CONFIG_START(contra_state::contra)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, XTAL_24MHz / 8) /* 3000000? (HD63C09EP) */
+ MCFG_CPU_ADD("maincpu", HD6309E, XTAL(24'000'000) / 8) /* 3000000? (HD63C09EP) */
MCFG_CPU_PROGRAM_MAP(contra_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", contra_state, contra_interrupt)
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL_24MHz/8) /* 3000000? (HD68B09EP) */
+ MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(24'000'000)/8) /* 3000000? (HD68B09EP) */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* enough for the sound CPU to read all commands */
@@ -234,7 +234,7 @@ MACHINE_CONFIG_START(contra_state::contra)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/controlid.cpp b/src/mame/drivers/controlid.cpp
index 7fdc9e85c04..2971ad32950 100644
--- a/src/mame/drivers/controlid.cpp
+++ b/src/mame/drivers/controlid.cpp
@@ -105,7 +105,7 @@ PALETTE_INIT_MEMBER(controlidx628_state, controlidx628)
MACHINE_CONFIG_START(controlidx628_state::controlidx628)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I80C32, XTAL_11_0592MHz) /* Actually the board has an Atmel AT89S52 mcu. */
+ MCFG_CPU_ADD("maincpu", I80C32, XTAL(11'059'200)) /* Actually the board has an Atmel AT89S52 mcu. */
MCFG_CPU_PROGRAM_MAP(prog_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/coolpool.cpp b/src/mame/drivers/coolpool.cpp
index 82d9ff8aabb..ac0ae5e0c24 100644
--- a/src/mame/drivers/coolpool.cpp
+++ b/src/mame/drivers/coolpool.cpp
@@ -781,16 +781,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(coolpool_state::amerdart)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
+ MCFG_CPU_ADD("maincpu", TMS34010, XTAL(40'000'000))
MCFG_CPU_PROGRAM_MAP(amerdart_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
- MCFG_TMS340X0_PIXEL_CLOCK(XTAL_40MHz/12) /* pixel clock */
+ MCFG_TMS340X0_PIXEL_CLOCK(XTAL(40'000'000)/12) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(2) /* pixels per clock */
MCFG_TMS340X0_SCANLINE_RGB32_CB(coolpool_state, amerdart_scanline) /* scanline callback (rgb32) */
MCFG_TMS340X0_TO_SHIFTREG_CB(coolpool_state, to_shiftreg) /* write to shiftreg function */
MCFG_TMS340X0_FROM_SHIFTREG_CB(coolpool_state, from_shiftreg) /* read from shiftreg function */
- MCFG_CPU_ADD("dsp", TMS32015, XTAL_40MHz/2)
+ MCFG_CPU_ADD("dsp", TMS32015, XTAL(40'000'000)/2)
MCFG_CPU_PROGRAM_MAP(amerdart_dsp_pgm_map)
/* Data Map is internal to the CPU */
MCFG_CPU_IO_MAP(amerdart_dsp_io_map)
@@ -804,7 +804,7 @@ MACHINE_CONFIG_START(coolpool_state::amerdart)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz/6, 212*2, 0, 161*2, 262, 0, 241)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(40'000'000)/6, 212*2, 0, 161*2, 262, 0, 241)
MCFG_SCREEN_UPDATE_DEVICE("maincpu", tms34010_device, tms340x0_rgb32)
/* sound hardware */
@@ -818,16 +818,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(coolpool_state::coolpool)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
+ MCFG_CPU_ADD("maincpu", TMS34010, XTAL(40'000'000))
MCFG_CPU_PROGRAM_MAP(coolpool_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
- MCFG_TMS340X0_PIXEL_CLOCK(XTAL_40MHz/6) /* pixel clock */
+ MCFG_TMS340X0_PIXEL_CLOCK(XTAL(40'000'000)/6) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
MCFG_TMS340X0_SCANLINE_RGB32_CB(coolpool_state, coolpool_scanline) /* scanline callback (rgb32) */
MCFG_TMS340X0_TO_SHIFTREG_CB(coolpool_state, to_shiftreg) /* write to shiftreg function */
MCFG_TMS340X0_FROM_SHIFTREG_CB(coolpool_state, from_shiftreg) /* read from shiftreg function */
- MCFG_CPU_ADD("dsp", TMS32026,XTAL_40MHz)
+ MCFG_CPU_ADD("dsp", TMS32026,XTAL(40'000'000))
MCFG_CPU_PROGRAM_MAP(coolpool_dsp_pgm_map)
MCFG_CPU_IO_MAP(coolpool_dsp_io_map)
MCFG_TMS32025_BIO_IN_CB(READ16(coolpool_state, dsp_bio_line_r))
@@ -843,7 +843,7 @@ MACHINE_CONFIG_START(coolpool_state::coolpool)
MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz/6, 424, 0, 320, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(40'000'000)/6, 424, 0, 320, 262, 0, 240)
MCFG_SCREEN_UPDATE_DEVICE("maincpu", tms34010_device, tms340x0_rgb32)
/* sound hardware */
diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp
index 9ec0f730b73..92210e34419 100644
--- a/src/mame/drivers/coolridr.cpp
+++ b/src/mame/drivers/coolridr.cpp
@@ -3687,7 +3687,7 @@ WRITE_LINE_MEMBER(coolridr_state::scsp2_to_sh1_irq)
sound_data &= ~0x20;
}
-#define MAIN_CLOCK XTAL_28_63636MHz
+#define MAIN_CLOCK XTAL(28'636'363)
MACHINE_CONFIG_START(coolridr_state::coolridr)
MCFG_CPU_ADD("maincpu", SH2, MAIN_CLOCK) // 28 mhz
diff --git a/src/mame/drivers/cop01.cpp b/src/mame/drivers/cop01.cpp
index 90f4d546e82..132a5a58c14 100644
--- a/src/mame/drivers/cop01.cpp
+++ b/src/mame/drivers/cop01.cpp
@@ -66,8 +66,8 @@ Mighty Guy board layout:
#define MIGHTGUY_HACK 0
#define TIMER_RATE 11475 /* unknown, hand-tuned to match audio reference */
-#define MAINCPU_CLOCK XTAL_12MHz
-#define AUDIOCPU_CLOCK XTAL_8MHz
+#define MAINCPU_CLOCK XTAL(12'000'000)
+#define AUDIOCPU_CLOCK XTAL(8'000'000)
/*************************************
*
@@ -517,7 +517,7 @@ MACHINE_CONFIG_START(cop01_state::cop01)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cop01_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3MHz) /* unknown clock / divider, hand-tuned to match audio reference */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'000'000)) /* unknown clock / divider, hand-tuned to match audio reference */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(audio_io_map)
diff --git a/src/mame/drivers/cops.cpp b/src/mame/drivers/cops.cpp
index 7f5e3d21105..7a9f79dd84a 100644
--- a/src/mame/drivers/cops.cpp
+++ b/src/mame/drivers/cops.cpp
@@ -47,7 +47,7 @@
#define CMP_REGISTER 0
#define AUX_REGISTER 1
-#define MAIN_CLOCK XTAL_4MHz
+#define MAIN_CLOCK XTAL(4'000'000)
class cops_state : public driver_device
{
@@ -473,9 +473,9 @@ WRITE8_MEMBER(cops_state::dacia_w)
{
m_dacia_reg1 = CMP_REGISTER;
}
- if (LOG_DACIA) logerror("DACIA TIME %02d\n", XTAL_3_6864MHz / m_dacia_ic_div_1);
+ if (LOG_DACIA) logerror("DACIA TIME %02d\n", (XTAL(3'686'400) / m_dacia_ic_div_1).value());
-// m_ld_timer->adjust(attotime::from_hz(XTAL_3_6864MHz / m_dacia_ic_div_1), 0, attotime::from_hz(XTAL_3_6864MHz / m_dacia_ic_div_1));
+// m_ld_timer->adjust(attotime::from_hz(XTAL(3'686'400) / m_dacia_ic_div_1), 0, attotime::from_hz(XTAL(3'686'400) / m_dacia_ic_div_1));
if (LOG_DACIA) logerror("DACIA Ctrl Register: %02x\n", data);
@@ -543,9 +543,9 @@ WRITE8_MEMBER(cops_state::dacia_w)
{
m_dacia_reg2 = CMP_REGISTER;
}
- if (LOG_DACIA) logerror("DACIA TIME 2 %02d\n", XTAL_3_6864MHz / m_dacia_ic_div_1);
+ if (LOG_DACIA) logerror("DACIA TIME 2 %02d\n", (XTAL(3'686'400) / m_dacia_ic_div_1).value());
- m_ld_timer->adjust(attotime::from_hz(XTAL_3_6864MHz / m_dacia_ic_div_2), 0, attotime::from_hz(XTAL_3_6864MHz / m_dacia_ic_div_2));
+ m_ld_timer->adjust(attotime::from_hz(XTAL(3'686'400) / m_dacia_ic_div_2), 0, attotime::from_hz(XTAL(3'686'400) / m_dacia_ic_div_2));
if (LOG_DACIA) logerror("DACIA Ctrl Register 2: %02x\n", data);
@@ -966,7 +966,7 @@ MACHINE_CONFIG_START(cops_state::revlatns)
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(cops_state, via1_b_w))
MCFG_VIA6522_CB1_HANDLER(WRITE8(cops_state, via1_cb1_w))
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
/* acia (really a 65C52)*/
diff --git a/src/mame/drivers/corona.cpp b/src/mame/drivers/corona.cpp
index b53eda26a64..ad6f4504ccf 100644
--- a/src/mame/drivers/corona.cpp
+++ b/src/mame/drivers/corona.cpp
@@ -312,10 +312,10 @@
#include "luckyrlt.lh"
-#define WC81_MAIN_XTAL XTAL_24MHz /* Main crystal for Winners Circle 28*28 pins PCB's */
-#define WC82_MAIN_XTAL XTAL_18_432MHz /* Main crystal for Winners Circle 18*22 pins PCB's */
-#define RE_MAIN_XTAL XTAL_16MHz /* Main for roulette boards */
-#define VIDEO_XTAL XTAL_20MHz /* Video circuitry crystal (all) */
+#define WC81_MAIN_XTAL XTAL(24'000'000) /* Main crystal for Winners Circle 28*28 pins PCB's */
+#define WC82_MAIN_XTAL XTAL(18'432'000) /* Main crystal for Winners Circle 18*22 pins PCB's */
+#define RE_MAIN_XTAL XTAL(16'000'000) /* Main for roulette boards */
+#define VIDEO_XTAL XTAL(20'000'000) /* Video circuitry crystal (all) */
#define AY_CLK1 1000000 /* AY-3-8912 clock for WC81 (28*28 PCB), measured */
#define AY_CLK2 2000000 /* AY-3-8910 clock for 81b & 82 (18*22 PCB), guessed */
#define VIDEOBUF_SIZE 512*512
diff --git a/src/mame/drivers/cortex.cpp b/src/mame/drivers/cortex.cpp
index 8e74b1068c7..d6088091800 100644
--- a/src/mame/drivers/cortex.cpp
+++ b/src/mame/drivers/cortex.cpp
@@ -180,7 +180,7 @@ MACHINE_CONFIG_START(cortex_state::cortex)
/* TMS9995 CPU @ 12.0 MHz */
// Standard variant, no overflow int
// No lines connected yet
- MCFG_TMS99xx_ADD("maincpu", TMS9995, XTAL_12MHz, mem_map, io_map)
+ MCFG_TMS99xx_ADD("maincpu", TMS9995, XTAL(12'000'000), mem_map, io_map)
MCFG_DEVICE_ADD("control", LS259, 0) // IC64
//MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cortex_state, basic_led_w))
@@ -192,7 +192,7 @@ MACHINE_CONFIG_START(cortex_state::cortex)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("beeper", beep_device, set_state))
/* video hardware */
- MCFG_DEVICE_ADD( "crtc", TMS9929A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "crtc", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("maincpu", INT_9995_INT1))
MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(cortex_state, vdp_int_w))
MCFG_TMS9928A_VRAM_SIZE(0x4000)
@@ -202,8 +202,8 @@ MACHINE_CONFIG_START(cortex_state::cortex)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
MCFG_GENERIC_KEYBOARD_CB(PUT(cortex_state, kbd_put))
- //MCFG_DEVICE_ADD("uart1", TMS9902, XTAL_12MHz / 4)
- //MCFG_DEVICE_ADD("uart2", TMS9902, XTAL_12MHz / 4)
+ //MCFG_DEVICE_ADD("uart1", TMS9902, XTAL(12'000'000) / 4)
+ //MCFG_DEVICE_ADD("uart2", TMS9902, XTAL(12'000'000) / 4)
/* Sound */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp
index dd5229cb909..55cf850b949 100644
--- a/src/mame/drivers/cosmicos.cpp
+++ b/src/mame/drivers/cosmicos.cpp
@@ -501,7 +501,7 @@ QUICKLOAD_LOAD_MEMBER( cosmicos_state, cosmicos )
MACHINE_CONFIG_START(cosmicos_state::cosmicos)
/* basic machine hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
MCFG_CPU_PROGRAM_MAP(cosmicos_mem)
MCFG_CPU_IO_MAP(cosmicos_io)
MCFG_COSMAC_WAIT_CALLBACK(READLINE(cosmicos_state, wait_r))
@@ -520,7 +520,7 @@ MACHINE_CONFIG_START(cosmicos_state::cosmicos)
MCFG_TIMER_DRIVER_ADD_PERIODIC("digit", cosmicos_state, digit_tick, attotime::from_hz(100))
MCFG_TIMER_DRIVER_ADD_PERIODIC("interrupt", cosmicos_state, int_tick, attotime::from_hz(1000))
- MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL_1_75MHz)
+ MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL(1'750'000))
MCFG_SCREEN_UPDATE_DEVICE(CDP1864_TAG, cdp1864_device, screen_update)
/* sound hardware */
@@ -529,7 +529,7 @@ MACHINE_CONFIG_START(cosmicos_state::cosmicos)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL_1_75MHz, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), WRITELINE(cosmicos_state, dmaout_w), WRITELINE(cosmicos_state, efx_w), NOOP, VCC, VCC, VCC)
+ MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(1'750'000), GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), WRITELINE(cosmicos_state, dmaout_w), WRITELINE(cosmicos_state, efx_w), NOOP, VCC, VCC, VCC)
MCFG_CDP1864_CHROMINANCE(RES_K(2), 0, 0, 0) // R2
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp
index 5c3bf15de02..9d9bc1b0193 100644
--- a/src/mame/drivers/cp1.cpp
+++ b/src/mame/drivers/cp1.cpp
@@ -254,7 +254,7 @@ QUICKLOAD_LOAD_MEMBER( cp1_state, quickload )
MACHINE_CONFIG_START(cp1_state::cp1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8049, XTAL_6MHz)
+ MCFG_CPU_ADD("maincpu", I8049, XTAL(6'000'000))
MCFG_CPU_IO_MAP(cp1_io)
MCFG_MCS48_PORT_P1_IN_CB(READ8(cp1_state, port1_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(cp1_state, port1_w))
diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp
index 4be6caf51c7..c6da909c855 100644
--- a/src/mame/drivers/cps1.cpp
+++ b/src/mame/drivers/cps1.cpp
@@ -3339,12 +3339,12 @@ MACHINE_START_MEMBER(cps_state,qsound)
MACHINE_CONFIG_START(cps_state::cps1_10MHz)
/* 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(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sub_map)
MCFG_MACHINE_START_OVERRIDE(cps_state,cps1)
@@ -3367,13 +3367,13 @@ MACHINE_CONFIG_START(cps_state::cps1_10MHz)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_YM2151_ADD("2151", XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("2151", XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.35)
MCFG_SOUND_ROUTE(1, "mono", 0.35)
/* CPS PPU is fed by a 16mhz clock,pin 117 outputs a 4mhz clock which is divided by 4 using 2 74ls74 */
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/4/4, PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -3390,7 +3390,7 @@ MACHINE_CONFIG_DERIVED(cps_state::cps1_12MHz, cps1_10MHz)
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL_12MHz ) /* verified on pcb */
+ MCFG_CPU_CLOCK( XTAL(12'000'000) ) /* verified on pcb */
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(cps_state::pang3, cps1_12MHz)
@@ -3411,12 +3411,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(cps_state::qsound, cps1_12MHz)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL_12MHz ) /* verified on pcb */
+ MCFG_CPU_REPLACE("maincpu", M68000, XTAL(12'000'000) ) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(qsound_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- MCFG_CPU_REPLACE("audiocpu", Z80, XTAL_8MHz) /* verified on pcb */
+ MCFG_CPU_REPLACE("audiocpu", Z80, XTAL(8'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(qsound_sub_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(qsound_decrypted_opcodes_map)
MCFG_CPU_PERIODIC_INT_DRIVER(cps_state, irq0_line_hold, 250) // measured (cps2.c)
diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp
index 1cee00646d2..db36476b236 100644
--- a/src/mame/drivers/cps2.cpp
+++ b/src/mame/drivers/cps2.cpp
@@ -1304,12 +1304,12 @@ MACHINE_START_MEMBER(cps_state,cps2)
MACHINE_CONFIG_START(cps_state::cps2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(cps2_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", cps_state, cps2_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(qsound_sub_map)
MCFG_CPU_PERIODIC_INT_DRIVER(cps_state, irq0_line_hold, 250) // measured
@@ -1353,7 +1353,7 @@ MACHINE_CONFIG_DERIVED(cps_state::gigaman2, cps2)
MCFG_CPU_MODIFY("maincpu")
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/32, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp
index d027b00af48..03a459be7ea 100644
--- a/src/mame/drivers/cps3.cpp
+++ b/src/mame/drivers/cps3.cpp
@@ -2536,7 +2536,7 @@ MACHINE_CONFIG_START(cps3_state::cps3)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_60MHz/8, 486, 0, 384, 259, 0, 224)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(60'000'000)/8, 486, 0, 384, 259, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(cps3_state, screen_update_cps3)
/*
Measured clocks:
diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp
index cfbc8136b91..6c1719f1cbd 100644
--- a/src/mame/drivers/crimfght.cpp
+++ b/src/mame/drivers/crimfght.cpp
@@ -300,11 +300,11 @@ CUSTOM_INPUT_MEMBER( crimfght_state::system_r )
MACHINE_CONFIG_START(crimfght_state::crimfght)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/8) /* 052001 (verified on pcb) */
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/8) /* 052001 (verified on pcb) */
MCFG_CPU_PROGRAM_MAP(crimfght_map)
MCFG_KONAMICPU_LINE_CB(WRITE8(crimfght_state, banking_callback))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(crimfght_sound_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, crimfght_state, audiocpu_irq_ack)
@@ -319,9 +319,9 @@ MACHINE_CONFIG_START(crimfght_state::crimfght)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/3, 528, 96, 416, 256, 16, 240) // measured 59.17
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/3, 528, 96, 416, 256, 16, 240) // measured 59.17
// 6MHz dotclock is more realistic, however needs drawing updates. replace when ready
-// MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 396, hbend, hbstart, 256, 16, 240)
+// MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4, 396, hbend, hbstart, 256, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(crimfght_state, screen_update_crimfght)
MCFG_SCREEN_PALETTE("palette")
@@ -344,12 +344,12 @@ MACHINE_CONFIG_START(crimfght_state::crimfght)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(crimfght_state, ym2151_ct_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545)) /* verified on pcb */
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(crimfght_state, volume_callback))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp
index b7993c83d3b..1ec330002ea 100644
--- a/src/mame/drivers/crvision.cpp
+++ b/src/mame/drivers/crvision.cpp
@@ -736,7 +736,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(crvision_state::creativision)
// basic machine hardware
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_2MHz)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(crvision_map)
// devices
@@ -761,7 +761,7 @@ MACHINE_CONFIG_START(crvision_state::creativision)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489_TAG, SN76489A, XTAL_2MHz)
+ MCFG_SOUND_ADD(SN76489_TAG, SN76489A, XTAL(2'000'000))
MCFG_SN76496_READY_HANDLER(DEVWRITELINE(PIA6821_TAG, pia6821_device, cb1_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -786,7 +786,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(crvision_state::ntsc, creativision)
// video hardware
- MCFG_DEVICE_ADD( TMS9929_TAG, TMS9918, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( TMS9929_TAG, TMS9918, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
@@ -799,7 +799,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(crvision_pal_state::pal, creativision)
// video hardware
- MCFG_DEVICE_ADD( TMS9929_TAG, TMS9929, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( TMS9929_TAG, TMS9929, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
MCFG_TMS9928A_SCREEN_ADD_PAL( SCREEN_TAG )
@@ -812,7 +812,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(laser2001_state::lasr2001)
// basic machine hardware
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_17_73447MHz/9)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(17'734'470)/9)
MCFG_CPU_PROGRAM_MAP(lasr2001_map)
// devices
@@ -834,7 +834,7 @@ MACHINE_CONFIG_START(laser2001_state::lasr2001)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
// video hardware
- MCFG_DEVICE_ADD( TMS9929_TAG, TMS9929A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( TMS9929_TAG, TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
MCFG_TMS9928A_SCREEN_ADD_PAL( SCREEN_TAG )
@@ -842,7 +842,7 @@ MACHINE_CONFIG_START(laser2001_state::lasr2001)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489_TAG, SN76489A, XTAL_17_73447MHz/9)
+ MCFG_SOUND_ADD(SN76489_TAG, SN76489A, XTAL(17'734'470)/9)
MCFG_SN76496_READY_HANDLER(WRITELINE(laser2001_state, write_psg_ready))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp
index aa0e4e3e9bb..2686684bac6 100644
--- a/src/mame/drivers/crystal.cpp
+++ b/src/mame/drivers/crystal.cpp
@@ -1498,7 +1498,7 @@ MACHINE_CONFIG_START(crystal_state::crystal)
MCFG_PALETTE_ADD_RRRRRGGGGGGBBBBB("palette")
- MCFG_DS1302_ADD("rtc", XTAL_32_768kHz)
+ MCFG_DS1302_ADD("rtc", XTAL(32'768))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp
index 9252856e672..18bf606be24 100644
--- a/src/mame/drivers/csplayh5.cpp
+++ b/src/mame/drivers/csplayh5.cpp
@@ -41,7 +41,7 @@
#include "audio/nichisnd.h"
#define USE_H8 0
-#define DVD_CLOCK XTAL_27MHz
+#define DVD_CLOCK XTAL(27'000'000)
class csplayh5_state : public driver_device
{
@@ -378,9 +378,9 @@ MACHINE_CONFIG_START(csplayh5_state::csplayh5)
MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL_21_4772MHz) // typical 9958 clock, not verified
+ MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL(21'477'272)) // typical 9958 clock, not verified
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(csplayh5_state, csplayh5_vdp0_interrupt))
- MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", XTAL_21_4772MHz)
+ MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", XTAL(21'477'272))
/* sound hardware */
MCFG_NICHISND_ADD("nichisnd")
diff --git a/src/mame/drivers/cswat.cpp b/src/mame/drivers/cswat.cpp
index 354e748e587..a21ea632c6b 100644
--- a/src/mame/drivers/cswat.cpp
+++ b/src/mame/drivers/cswat.cpp
@@ -257,7 +257,7 @@ void cswat_state::machine_start()
MACHINE_CONFIG_START(cswat_state::cswat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_18_432MHz/3/4) // HD68A09EP, 1.5MHz?
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(18'432'000)/3/4) // HD68A09EP, 1.5MHz?
MCFG_CPU_PROGRAM_MAP(cswat_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cswat_state, irq0_line_assert)
MCFG_CPU_PERIODIC_INT_DRIVER(cswat_state, nmi_handler, 300) // ?
diff --git a/src/mame/drivers/ct486.cpp b/src/mame/drivers/ct486.cpp
index 3830cebd37d..7d668bb8b36 100644
--- a/src/mame/drivers/ct486.cpp
+++ b/src/mame/drivers/ct486.cpp
@@ -106,12 +106,12 @@ ADDRESS_MAP_END
//**************************************************************************
MACHINE_CONFIG_START(ct486_state::ct486)
- MCFG_CPU_ADD("maincpu", I486, XTAL_25MHz)
+ MCFG_CPU_ADD("maincpu", I486, XTAL(25'000'000))
MCFG_CPU_PROGRAM_MAP(ct486_map)
MCFG_CPU_IO_MAP(ct486_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("cs4031", cs4031_device, int_ack_r)
- MCFG_CS4031_ADD("cs4031", XTAL_25MHz, "maincpu", "isa", "bios", "keybc")
+ MCFG_CS4031_ADD("cs4031", XTAL(25'000'000), "maincpu", "isa", "bios", "keybc")
// cpu connections
MCFG_CS4031_HOLD(WRITELINE(ct486_state, cs4031_hold));
MCFG_CS4031_NMI(INPUTLINE("maincpu", INPUT_LINE_NMI));
@@ -129,7 +129,7 @@ MACHINE_CONFIG_START(ct486_state::ct486)
MCFG_RAM_DEFAULT_SIZE("4M")
MCFG_RAM_EXTRA_OPTIONS("1M,2M,8M,16M,32M,64M")
- MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL_12MHz)
+ MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000))
MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(DEVWRITELINE("cs4031", cs4031_device, kbrst_w))
MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(DEVWRITELINE("cs4031", cs4031_device, gatea20_w))
MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("cs4031", cs4031_device, irq01_w))
diff --git a/src/mame/drivers/cubeqst.cpp b/src/mame/drivers/cubeqst.cpp
index 9166d20ff86..e5839635b08 100644
--- a/src/mame/drivers/cubeqst.cpp
+++ b/src/mame/drivers/cubeqst.cpp
@@ -514,19 +514,19 @@ WRITE16_MEMBER( cubeqst_state::sound_dac_w )
*************************************/
MACHINE_CONFIG_START(cubeqst_state::cubeqst)
- MCFG_CPU_ADD("main_cpu", M68000, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("main_cpu", M68000, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(m68k_program_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cubeqst_state, vblank)
- MCFG_CPU_ADD("rotate_cpu", CQUESTROT, XTAL_10MHz / 2)
+ MCFG_CPU_ADD("rotate_cpu", CQUESTROT, XTAL(10'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(rotate_map)
MCFG_CQUESTROT_CONFIG( DEVWRITE16( "line_cpu", cquestlin_cpu_device, linedata_w ) )
- MCFG_CPU_ADD("line_cpu", CQUESTLIN, XTAL_10MHz / 2)
+ MCFG_CPU_ADD("line_cpu", CQUESTLIN, XTAL(10'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(line_sound_map)
MCFG_CQUESTLIN_CONFIG( DEVREAD16( "rotate_cpu", cquestrot_cpu_device, linedata_r ) )
- MCFG_CPU_ADD("sound_cpu", CQUESTSND, XTAL_10MHz / 2)
+ MCFG_CPU_ADD("sound_cpu", CQUESTSND, XTAL(10'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(line_sound_map)
MCFG_CQUESTSND_CONFIG( WRITE16( cubeqst_state, sound_dac_w ), "soundproms" )
diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp
index 5ec2615f210..c73b60d453c 100644
--- a/src/mame/drivers/cv1k.cpp
+++ b/src/mame/drivers/cv1k.cpp
@@ -454,7 +454,7 @@ void cv1k_state::machine_reset()
MACHINE_CONFIG_START(cv1k_state::cv1k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH3BE, XTAL_12_8MHz*8) // 102.4MHz
+ MCFG_CPU_ADD("maincpu", SH3BE, XTAL(12'800'000)*8) // 102.4MHz
MCFG_SH4_MD0(0) // none of this is verified
MCFG_SH4_MD1(0) // (the sh3 is different to the sh4 anyway, should be changed)
MCFG_SH4_MD2(0)
@@ -464,7 +464,7 @@ MACHINE_CONFIG_START(cv1k_state::cv1k)
MCFG_SH4_MD6(0)
MCFG_SH4_MD7(1)
MCFG_SH4_MD8(0)
- MCFG_SH4_CLOCK(XTAL_12_8MHz*8) // 102.4MHz
+ MCFG_SH4_CLOCK(XTAL(12'800'000)*8) // 102.4MHz
MCFG_CPU_PROGRAM_MAP(cv1k_map)
MCFG_CPU_IO_MAP(cv1k_port)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cv1k_state, irq2_line_hold)
@@ -483,7 +483,7 @@ MACHINE_CONFIG_START(cv1k_state::cv1k)
MCFG_PALETTE_ADD("palette", 0x10000)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YMZ770_ADD("ymz770", XTAL_16_384MHz)
+ MCFG_YMZ770_ADD("ymz770", XTAL(16'384'000))
MCFG_SOUND_ROUTE(1, "mono", 1.0) // only Right output used, Left is not connected
MCFG_EPIC12_ADD("blitter")
@@ -495,7 +495,7 @@ MACHINE_CONFIG_DERIVED(cv1k_state::cv1k_d, cv1k)
/* basic machine hardware */
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", SH3BE, XTAL_12_8MHz*8) // 102.4MHz
+ MCFG_CPU_ADD("maincpu", SH3BE, XTAL(12'800'000)*8) // 102.4MHz
MCFG_SH4_MD0(0) // none of this is verified
MCFG_SH4_MD1(0) // (the sh3 is different to the sh4 anyway, should be changed)
MCFG_SH4_MD2(0)
@@ -505,7 +505,7 @@ MACHINE_CONFIG_DERIVED(cv1k_state::cv1k_d, cv1k)
MCFG_SH4_MD6(0)
MCFG_SH4_MD7(1)
MCFG_SH4_MD8(0)
- MCFG_SH4_CLOCK(XTAL_12_8MHz*8) // 102.4MHz
+ MCFG_SH4_CLOCK(XTAL(12'800'000)*8) // 102.4MHz
MCFG_CPU_PROGRAM_MAP(cv1k_d_map)
MCFG_CPU_IO_MAP(cv1k_port)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cv1k_state, irq2_line_hold)
diff --git a/src/mame/drivers/cvicny.cpp b/src/mame/drivers/cvicny.cpp
index b437b631b37..804ebf3f90a 100644
--- a/src/mame/drivers/cvicny.cpp
+++ b/src/mame/drivers/cvicny.cpp
@@ -131,7 +131,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cvicny_state::cvicny)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_2MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(cvicny_mem)
/* video hardware */
diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp
index 322f813ee40..01304e613f1 100644
--- a/src/mame/drivers/cvs.cpp
+++ b/src/mame/drivers/cvs.cpp
@@ -960,7 +960,7 @@ MACHINE_RESET_MEMBER(cvs_state,cvs)
MACHINE_CONFIG_START(cvs_state::cvs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, XTAL_14_31818MHz/16)
+ MCFG_CPU_ADD("maincpu", S2650, XTAL(14'318'181)/16)
MCFG_CPU_PROGRAM_MAP(cvs_main_cpu_map)
MCFG_CPU_IO_MAP(cvs_main_cpu_io_map)
MCFG_CPU_DATA_MAP(cvs_main_cpu_data_map)
@@ -968,12 +968,12 @@ MACHINE_CONFIG_START(cvs_state::cvs)
MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank))
MCFG_S2650_FLAG_OUTPUT(WRITELINE(cvs_state, write_s2650_flag))
- MCFG_CPU_ADD("audiocpu", S2650, XTAL_14_31818MHz/16)
+ MCFG_CPU_ADD("audiocpu", S2650, XTAL(14'318'181)/16)
MCFG_CPU_PROGRAM_MAP(cvs_dac_cpu_map)
/* doesn't look like it is used at all */
//MCFG_S2650_SENSE_INPUT(READLINE(cvs_state, cvs_393hz_clock_r))
- MCFG_CPU_ADD("speechcpu", S2650, XTAL_14_31818MHz/16)
+ MCFG_CPU_ADD("speechcpu", S2650, XTAL(14'318'181)/16)
MCFG_CPU_PROGRAM_MAP(cvs_speech_cpu_map)
/* romclk is much more probable, 393 Hz results in timing issues */
//MCFG_S2650_SENSE_INPUT(READLINE(cvs_state, cvs_393hz_clock_r))
@@ -1022,7 +1022,7 @@ MACHINE_CONFIG_START(cvs_state::cvs)
MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE_EX(0, "dac3", 1.0, DAC_VREF_POS_INPUT)
- MCFG_SOUND_ADD("tms", TMS5100, XTAL_640kHz)
+ MCFG_SOUND_ADD("tms", TMS5100, XTAL(640'000))
MCFG_TMS5110_DATA_CB(READLINE(cvs_state, speech_rom_read_bit))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cxgz80.cpp b/src/mame/drivers/cxgz80.cpp
index c0bd5bca488..c2184c0f887 100644
--- a/src/mame/drivers/cxgz80.cpp
+++ b/src/mame/drivers/cxgz80.cpp
@@ -396,7 +396,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cxgz80_state::ch2001)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(ch2001_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", cxgz80_state, irq_on, attotime::from_hz(484)) // theoretical frequency from 555 timer (22nF, 100K+33K, 1K2), measurement was 568Hz
MCFG_TIMER_START_DELAY(attotime::from_hz(484) - attotime::from_nsec(18300)) // active for 18.3us
diff --git a/src/mame/drivers/cxhumax.cpp b/src/mame/drivers/cxhumax.cpp
index f039aa7e548..2bea0e2e472 100644
--- a/src/mame/drivers/cxhumax.cpp
+++ b/src/mame/drivers/cxhumax.cpp
@@ -329,7 +329,7 @@ TIMER_CALLBACK_MEMBER(cxhumax_state::timer_tick)
m_maincpu->set_input_line(ARM7_IRQ_LINE, ASSERT_LINE);
}
}
- attotime period = attotime::from_hz(XTAL_54MHz)*m_timer_regs.timer[param].timebase;
+ attotime period = attotime::from_hz(XTAL(54'000'000))*m_timer_regs.timer[param].timebase;
m_timer_regs.timer[param].timer->adjust(period,param);
}
@@ -375,7 +375,7 @@ WRITE32_MEMBER( cxhumax_state::cx_timers_w )
case TIMER_MODE:
COMBINE_DATA(&m_timer_regs.timer[index].mode);
if(data&1) {
- attotime period = attotime::from_hz(XTAL_54MHz)*m_timer_regs.timer[index].timebase;
+ attotime period = attotime::from_hz(XTAL(54'000'000))*m_timer_regs.timer[index].timebase;
m_timer_regs.timer[index].timer->adjust(period,index);
} else {
m_timer_regs.timer[index].timer->adjust(attotime::never,index);
diff --git a/src/mame/drivers/cyberbal.cpp b/src/mame/drivers/cyberbal.cpp
index 3211871aad9..1f5daf2fd4b 100644
--- a/src/mame/drivers/cyberbal.cpp
+++ b/src/mame/drivers/cyberbal.cpp
@@ -403,7 +403,7 @@ MACHINE_CONFIG_START(cyberbal_state::cyberbal)
MCFG_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, (double)ATARI_CLOCK_14MHz/4/4/16/16/14)
+ MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, ATARI_CLOCK_14MHz/4/4/16/16/14)
MCFG_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
MCFG_CPU_PROGRAM_MAP(extra_map)
diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp
index a35997c40b6..c7e9bd18ab0 100644
--- a/src/mame/drivers/cybertnk.cpp
+++ b/src/mame/drivers/cybertnk.cpp
@@ -833,15 +833,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(cybertnk_state::cybertnk)
- MCFG_CPU_ADD("maincpu", M68000,XTAL_20MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000,XTAL(20'000'000)/2)
MCFG_CPU_PROGRAM_MAP(master_mem)
MCFG_CPU_VBLANK_INT_DRIVER("lscreen", cybertnk_state, irq1_line_assert)
- MCFG_CPU_ADD("slave", M68000,XTAL_20MHz/2)
+ MCFG_CPU_ADD("slave", M68000,XTAL(20'000'000)/2)
MCFG_CPU_PROGRAM_MAP(slave_mem)
MCFG_CPU_VBLANK_INT_DRIVER("lscreen", cybertnk_state, irq3_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(sound_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))//arbitrary value,needed to get the communication to work
@@ -874,11 +874,11 @@ MACHINE_CONFIG_START(cybertnk_state::cybertnk)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", Y8950, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ym1", Y8950, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("ym2", Y8950, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ym2", Y8950, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp
index 6dd01c923d8..556963da11b 100644
--- a/src/mame/drivers/cybiko.cpp
+++ b/src/mame/drivers/cybiko.cpp
@@ -386,7 +386,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(cybiko_state::cybikov1)
// cpu
- MCFG_CPU_ADD( "maincpu", H8S2241, XTAL_11_0592MHz )
+ MCFG_CPU_ADD( "maincpu", H8S2241, XTAL(11'059'200) )
MCFG_CPU_PROGRAM_MAP( cybikov1_mem )
MCFG_CPU_IO_MAP( cybikov1_io )
@@ -438,7 +438,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(cybiko_state::cybikov2, cybikov1)
// cpu
- MCFG_CPU_REPLACE("maincpu", H8S2246, XTAL_11_0592MHz)
+ MCFG_CPU_REPLACE("maincpu", H8S2246, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(cybikov2_mem)
MCFG_CPU_IO_MAP(cybikov2_io)
@@ -463,7 +463,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(cybiko_state::cybikoxt, cybikov1)
// cpu
- MCFG_CPU_REPLACE("maincpu", H8S2323, XTAL_18_432MHz)
+ MCFG_CPU_REPLACE("maincpu", H8S2323, XTAL(18'432'000))
MCFG_CPU_PROGRAM_MAP(cybikoxt_mem )
MCFG_CPU_IO_MAP(cybikoxt_io )
diff --git a/src/mame/drivers/cyclemb.cpp b/src/mame/drivers/cyclemb.cpp
index 08a84c80eb2..581bb28fa73 100644
--- a/src/mame/drivers/cyclemb.cpp
+++ b/src/mame/drivers/cyclemb.cpp
@@ -956,12 +956,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(cyclemb_state::cyclemb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/3) // Z8400BPS
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'000'000)/3) // Z8400BPS
MCFG_CPU_PROGRAM_MAP(cyclemb_map)
MCFG_CPU_IO_MAP(cyclemb_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cyclemb_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_18MHz/6)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'000'000)/6)
MCFG_CPU_PROGRAM_MAP(cyclemb_sound_map)
MCFG_CPU_IO_MAP(cyclemb_sound_io)
MCFG_CPU_PERIODIC_INT_DRIVER(cyclemb_state, irq0_line_hold, 60)
@@ -986,7 +986,7 @@ MACHINE_CONFIG_START(cyclemb_state::cyclemb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_18MHz/12)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(18'000'000)/12)
// MCFG_YM2203_IRQ_HANDLER(WRITELINE(cyclemb_state, ym_irq))
// MCFG_AY8910_PORT_B_READ_CB(IOPORT("UNK")) /* port B read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/czk80.cpp b/src/mame/drivers/czk80.cpp
index 191d6cb0f0c..6ff4380c363 100644
--- a/src/mame/drivers/czk80.cpp
+++ b/src/mame/drivers/czk80.cpp
@@ -190,7 +190,7 @@ void czk80_state::kbd_put(u8 data)
MACHINE_CONFIG_START(czk80_state::czk80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(czk80_mem)
MCFG_CPU_IO_MAP(czk80_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
@@ -201,19 +201,19 @@ MACHINE_CONFIG_START(czk80_state::czk80)
MCFG_UPD765A_ADD("fdc", false, true)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", czk80_floppies, "525dd", floppy_image_device::default_floppy_formats)
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(czk80_state, ctc_z0_w))
MCFG_Z80CTC_ZC1_CB(WRITELINE(czk80_state, ctc_z1_w))
MCFG_Z80CTC_ZC2_CB(WRITELINE(czk80_state, ctc_z2_w))
- MCFG_DEVICE_ADD("dart", Z80DART, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("dart", Z80DART, XTAL(16'000'000) / 4)
//MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
//MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
//MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(16'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/d400.cpp b/src/mame/drivers/d400.cpp
index 16963d4b4b0..bcf1a40ace9 100644
--- a/src/mame/drivers/d400.cpp
+++ b/src/mame/drivers/d400.cpp
@@ -53,13 +53,13 @@ MACHINE_CONFIG_START(d400_state::d461)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_59_2920MHz / 3, 1080, 0, 810, 305, 0, 300) // yes, 81 columns
- //MCFG_SCREEN_RAW_PARAMS(XTAL_59_2920MHz / 2, 1620, 0, 1215, 305, 0, 300) // for 135-column mode
+ MCFG_SCREEN_RAW_PARAMS(XTAL(59'292'000) / 3, 1080, 0, 810, 305, 0, 300) // yes, 81 columns
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(59'292'000) / 2, 1620, 0, 1215, 305, 0, 300) // for 135-column mode
MCFG_SCREEN_UPDATE_DRIVER(d400_state, screen_update)
MCFG_DEVICE_ADD("novram", X2210, 0)
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp
index 05c96b0e57d..2e974d95503 100644
--- a/src/mame/drivers/d6800.cpp
+++ b/src/mame/drivers/d6800.cpp
@@ -384,7 +384,7 @@ QUICKLOAD_LOAD_MEMBER( d6800_state, d6800 )
MACHINE_CONFIG_START(d6800_state::d6800)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6800, XTAL_4MHz/4)
+ MCFG_CPU_ADD("maincpu",M6800, XTAL(4'000'000)/4)
MCFG_CPU_PROGRAM_MAP(d6800_map)
/* video hardware */
diff --git a/src/mame/drivers/d6809.cpp b/src/mame/drivers/d6809.cpp
index 74ad54dba89..afe69f8f862 100644
--- a/src/mame/drivers/d6809.cpp
+++ b/src/mame/drivers/d6809.cpp
@@ -150,11 +150,11 @@ void d6809_state::machine_reset()
MACHINE_CONFIG_START(d6809_state::d6809)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_14_7456MHz / 8) // MC68B09EP
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(14'745'600) / 8) // MC68B09EP
MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_DEVICE_ADD("acia1", MOS6551, XTAL_14_7456MHz / 8) // uses Q clock
- MCFG_DEVICE_ADD("acia2", MOS6551, XTAL_14_7456MHz / 8) // uses Q clock
+ MCFG_DEVICE_ADD("acia1", MOS6551, XTAL(14'745'600) / 8) // uses Q clock
+ MCFG_DEVICE_ADD("acia2", MOS6551, XTAL(14'745'600) / 8) // uses Q clock
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp
index c0e69f9cfba..86bff9d4487 100644
--- a/src/mame/drivers/d9final.cpp
+++ b/src/mame/drivers/d9final.cpp
@@ -317,13 +317,13 @@ MACHINE_CONFIG_START(d9final_state::d9final)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
//MCFG_DEVICE_ADD("essnd", ES8712, 24000000/3) // clock unknown
//MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADD("rtc", RTC62421, XTAL_32_768kHz) // internal oscillator
+ MCFG_DEVICE_ADD("rtc", RTC62421, XTAL(32'768)) // internal oscillator
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp
index e7c949ee8a1..bad16ead743 100644
--- a/src/mame/drivers/dacholer.cpp
+++ b/src/mame/drivers/dacholer.cpp
@@ -646,12 +646,12 @@ PALETTE_INIT_MEMBER(dacholer_state, dacholer)
MACHINE_CONFIG_START(dacholer_state::dacholer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/4) /* ? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/4) /* ? */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dacholer_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_19_968MHz/8) /* ? */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(19'968'000)/8) /* ? */
MCFG_CPU_PROGRAM_MAP(snd_map)
MCFG_CPU_IO_MAP(snd_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dacholer_state, sound_irq)
@@ -677,16 +677,16 @@ MACHINE_CONFIG_START(dacholer_state::dacholer)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_19_968MHz/16)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(19'968'000)/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_19_968MHz/16)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(19'968'000)/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay3", AY8910, XTAL_19_968MHz/16)
+ MCFG_SOUND_ADD("ay3", AY8910, XTAL(19'968'000)/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(dacholer_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 1 / 96 = 3906.25Hz playback - guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
diff --git a/src/mame/drivers/dai3wksi.cpp b/src/mame/drivers/dai3wksi.cpp
index e1bc834f067..edf6a40032c 100644
--- a/src/mame/drivers/dai3wksi.cpp
+++ b/src/mame/drivers/dai3wksi.cpp
@@ -404,7 +404,7 @@ void dai3wksi_state::machine_reset()
MACHINE_CONFIG_START(dai3wksi_state::dai3wksi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'000'000)/4)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dai3wksi_state, irq0_line_hold)
diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp
index 88ad54fdd37..b5d64f43bfe 100644
--- a/src/mame/drivers/darius.cpp
+++ b/src/mame/drivers/darius.cpp
@@ -701,18 +701,18 @@ void darius_state::machine_reset()
MACHINE_CONFIG_START(darius_state::darius)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* 8 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_CPU_PROGRAM_MAP(darius_map)
MCFG_CPU_VBLANK_INT_DRIVER("lscreen", darius_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(darius_sound_map)
- MCFG_CPU_ADD("cpub", M68000, XTAL_16MHz/2) /* 8 MHz */
+ MCFG_CPU_ADD("cpub", M68000, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_CPU_PROGRAM_MAP(darius_cpub_map)
MCFG_CPU_VBLANK_INT_DRIVER("lscreen", darius_state, irq4_line_hold)
- MCFG_CPU_ADD("adpcm", Z80, XTAL_8MHz/2) /* 4 MHz */ /* ADPCM player using MSM5205 */
+ MCFG_CPU_ADD("adpcm", Z80, XTAL(8'000'000)/2) /* 4 MHz */ /* ADPCM player using MSM5205 */
MCFG_CPU_PROGRAM_MAP(darius_sound2_map)
MCFG_CPU_IO_MAP(darius_sound2_io_map)
@@ -760,7 +760,7 @@ MACHINE_CONFIG_START(darius_state::darius)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_8MHz/2) /* 4 MHz */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(8'000'000)/2) /* 4 MHz */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) /* assumes Z80 sandwiched between 68Ks */
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(darius_state, darius_write_portA0)) /* portA write */
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(darius_state, darius_write_portB0)) /* portB write */
@@ -773,7 +773,7 @@ MACHINE_CONFIG_START(darius_state::darius)
MCFG_SOUND_ROUTE(3, "filter0.3l", 0.60)
MCFG_SOUND_ROUTE(3, "filter0.3r", 0.60)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_8MHz/2) /* 4 MHz */
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(8'000'000)/2) /* 4 MHz */
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(darius_state, darius_write_portA1)) /* portA write */
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(darius_state, darius_write_portB1)) /* portB write */
MCFG_SOUND_ROUTE(0, "filter1.0l", 0.08)
@@ -785,7 +785,7 @@ MACHINE_CONFIG_START(darius_state::darius)
MCFG_SOUND_ROUTE(3, "filter1.3l", 0.60)
MCFG_SOUND_ROUTE(3, "filter1.3r", 0.60)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(darius_state, darius_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.l", 1.0)
diff --git a/src/mame/drivers/darkseal.cpp b/src/mame/drivers/darkseal.cpp
index fa0e0f82d49..6cf89c7c60b 100644
--- a/src/mame/drivers/darkseal.cpp
+++ b/src/mame/drivers/darkseal.cpp
@@ -231,11 +231,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(darkseal_state::darkseal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* Custom chip 59 */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* Custom chip 59 */
MCFG_CPU_PROGRAM_MAP(darkseal_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", darkseal_state, irq6_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000)/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
@@ -288,18 +288,18 @@ MACHINE_CONFIG_START(darkseal_state::darkseal)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_32_22MHz/8)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
- MCFG_YM2151_ADD("ym2", XTAL_32_22MHz/9)
+ MCFG_YM2151_ADD("ym2", XTAL(32'220'000)/9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2
MCFG_SOUND_ROUTE(0, "mono", 0.55)
MCFG_SOUND_ROUTE(1, "mono", 0.55)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'220'000)/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL(32'220'000)/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp
index 7c3ba5da175..ec30602a6c9 100644
--- a/src/mame/drivers/dassault.cpp
+++ b/src/mame/drivers/dassault.cpp
@@ -514,15 +514,15 @@ DECO16IC_BANK_CB_MEMBER(dassault_state::bank_callback)
MACHINE_CONFIG_START(dassault_state::dassault)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* 14MHz - Accurate */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000)/2) /* 14MHz - Accurate */
MCFG_CPU_PROGRAM_MAP(dassault_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dassault_state, irq4_line_assert)
- MCFG_CPU_ADD("sub", M68000, XTAL_28MHz/2) /* 14MHz - Accurate */
+ MCFG_CPU_ADD("sub", M68000, XTAL(28'000'000)/2) /* 14MHz - Accurate */
MCFG_CPU_PROGRAM_MAP(dassault_sub_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dassault_state, irq5_line_assert)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz/8) /* Accurate */
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000)/8) /* Accurate */
MCFG_CPU_PROGRAM_MAP(sound_map)
// MCFG_QUANTUM_TIME(attotime::from_hz(8400)) /* 140 CPU slices per frame */
@@ -597,21 +597,21 @@ MACHINE_CONFIG_START(dassault_state::dassault)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) // IRQ1
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_32_22MHz/8)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MCFG_YM2151_ADD("ym2", XTAL_32_22MHz/9)
+ MCFG_YM2151_ADD("ym2", XTAL(32'220'000)/9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1))
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(dassault_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, PIN7_HIGH) // verified
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'220'000)/32, PIN7_HIGH) // verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, PIN7_HIGH) // verified
+ MCFG_OKIM6295_ADD("oki2", XTAL(32'220'000)/16, PIN7_HIGH) // verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/datum.cpp b/src/mame/drivers/datum.cpp
index 2738b82af5b..450fc2cb33f 100644
--- a/src/mame/drivers/datum.cpp
+++ b/src/mame/drivers/datum.cpp
@@ -179,7 +179,7 @@ WRITE8_MEMBER( datum_state::pb_w )
MACHINE_CONFIG_START(datum_state::datum)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6802, XTAL_4MHz) // internally divided to 1 MHz
+ MCFG_CPU_ADD("maincpu",M6802, XTAL(4'000'000)) // internally divided to 1 MHz
MCFG_CPU_PROGRAM_MAP(datum_mem)
/* video hardware */
diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp
index 791eff14c39..14d034cda2f 100644
--- a/src/mame/drivers/dblcrown.cpp
+++ b/src/mame/drivers/dblcrown.cpp
@@ -40,7 +40,7 @@
***************************************************************************/
-#define MAIN_CLOCK XTAL_28_63636MHz
+#define MAIN_CLOCK XTAL(28'636'363)
#define CPU_CLOCK MAIN_CLOCK / 6
#define SND_CLOCK MAIN_CLOCK / 12
diff --git a/src/mame/drivers/dblewing.cpp b/src/mame/drivers/dblewing.cpp
index 36d256c4e03..2e71fb59227 100644
--- a/src/mame/drivers/dblewing.cpp
+++ b/src/mame/drivers/dblewing.cpp
@@ -343,12 +343,12 @@ DECOSPR_PRIORITY_CB_MEMBER(dblewing_state::pri_callback)
MACHINE_CONFIG_START(dblewing_state::dblewing)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* DE102 */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000)/2) /* DE102 */
MCFG_CPU_PROGRAM_MAP(dblewing_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dblewing_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32_22MHz/9)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'220'000)/9)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io)
@@ -403,11 +403,11 @@ MACHINE_CONFIG_START(dblewing_state::dblewing)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_32_22MHz/9)
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000)/9)
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundirq", input_merger_device, in_w<1>))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_OKIM6295_ADD("oki", XTAL_28MHz/28, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(28'000'000)/28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dbox.cpp b/src/mame/drivers/dbox.cpp
index 65124acc8cc..a4f55be8422 100644
--- a/src/mame/drivers/dbox.cpp
+++ b/src/mame/drivers/dbox.cpp
@@ -599,7 +599,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(dbox_state::dbox)
MCFG_CPU_ADD("maincpu", M68340, 0) // The 68340 has an internal VCO as clock source, hence need no CPU clock
- MCFG_MC68340_ADD_CRYSTAL(XTAL_32_768kHz) // The dbox uses the VCO and has a crystal as VCO reference and to synthesize internal clocks from
+ MCFG_MC68340_ADD_CRYSTAL(XTAL(32'768)) // The dbox uses the VCO and has a crystal as VCO reference and to synthesize internal clocks from
MCFG_CPU_PROGRAM_MAP(dbox_map)
MCFG_MC68340_PA_OUTPUT_CB(WRITE8(dbox_state, write_pa))
diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp
index ae4edd24093..61306e0cbe3 100644
--- a/src/mame/drivers/dccons.cpp
+++ b/src/mame/drivers/dccons.cpp
@@ -594,7 +594,7 @@ MACHINE_CONFIG_START(dc_cons_state::dc)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dc_state, dc_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("soundcpu", ARM7, ((XTAL_33_8688MHz*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8.
+ MCFG_CPU_ADD("soundcpu", ARM7, ((XTAL(33'868'800)*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8.
MCFG_CPU_PROGRAM_MAP(dc_audio_map)
MCFG_MACHINE_RESET_OVERRIDE(dc_cons_state,dc_console )
@@ -622,7 +622,7 @@ MACHINE_CONFIG_START(dc_cons_state::dc)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
- MCFG_AICARTC_ADD("aicartc", XTAL_32_768kHz)
+ MCFG_AICARTC_ADD("aicartc", XTAL(32'768))
MCFG_DEVICE_ADD("ata", ATA_INTERFACE, 0)
MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(dc_cons_state, ata_interrupt))
diff --git a/src/mame/drivers/dcon.cpp b/src/mame/drivers/dcon.cpp
index deca3f08cab..71798146ad5 100644
--- a/src/mame/drivers/dcon.cpp
+++ b/src/mame/drivers/dcon.cpp
@@ -320,11 +320,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dcon_state::sdgndmps) /* PCB number is PB91008 */
/* 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(sdgndmps_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dcon_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4)
MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
/* video hardware */
@@ -347,12 +347,12 @@ MACHINE_CONFIG_START(dcon_state::sdgndmps) /* PCB number is PB91008 */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4)
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_20MHz/16, PIN7_LOW) /* 1.25Mhz? unverified clock & divisor (was 1320000) */
+ MCFG_OKIM6295_ADD("oki", XTAL(20'000'000)/16, PIN7_LOW) /* 1.25Mhz? unverified clock & divisor (was 1320000) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp
index 0e19d171117..6d2403a3b45 100644
--- a/src/mame/drivers/ddealer.cpp
+++ b/src/mame/drivers/ddealer.cpp
@@ -619,7 +619,7 @@ INTERRUPT_GEN_MEMBER(ddealer_state::interrupt)
MACHINE_CONFIG_START(ddealer_state::ddealer)
- MCFG_CPU_ADD("maincpu" , M68000, XTAL_16MHz/2) /* 8MHz */
+ MCFG_CPU_ADD("maincpu" , M68000, XTAL(16'000'000)/2) /* 8MHz */
MCFG_CPU_PROGRAM_MAP(ddealer)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddealer_state, interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(ddealer_state, irq1_line_hold, 90)//guess, controls music tempo, 112 is way too fast
@@ -643,7 +643,7 @@ MACHINE_CONFIG_START(ddealer_state::ddealer)
MCFG_TIMER_DRIVER_ADD_PERIODIC("coinsim", ddealer_state, mcu_sim, attotime::from_hz(10000))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_6MHz / 8) /* 7.5KHz */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(6'000'000) / 8) /* 7.5KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp
index 8f813152cc1..257c108724b 100644
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@@ -4349,7 +4349,7 @@ MACHINE_CONFIG_START(ddenlovr_state::htengoku)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MACHINE_CONFIG_END
@@ -9646,7 +9646,7 @@ MACHINE_START_MEMBER(ddenlovr_state,sryudens)
MACHINE_CONFIG_START(ddenlovr_state::ddenlovr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL_24MHz / 2)
+ MCFG_CPU_ADD("maincpu",M68000, XTAL(24'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(ddenlovr_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddenlovr_state, irq1_line_hold)
@@ -9675,17 +9675,17 @@ MACHINE_CONFIG_START(ddenlovr_state::ddenlovr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", YMZ284, XTAL_28_63636MHz / 16) // or /8 ?
+ MCFG_SOUND_ADD("aysnd", YMZ284, XTAL(28'636'363) / 16) // or /8 ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MCFG_DEVICE_ADD("rtc", RTC72421, XTAL_32_768kHz) // internal oscillator
+ MCFG_DEVICE_ADD("rtc", RTC72421, XTAL(32'768)) // internal oscillator
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(ddenlovr_state::ddenlovj, ddenlovr)
@@ -9697,7 +9697,7 @@ MACHINE_CONFIG_DERIVED(ddenlovr_state::ddenlovj, ddenlovr)
MCFG_DEVICE_REPLACE("mainlatch", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(ddenlovr_state, ddenlovr_blitter_irq_ack_w))
- MCFG_DEVICE_REPLACE("rtc", RTC62421, XTAL_32_768kHz) // internal oscillator
+ MCFG_DEVICE_REPLACE("rtc", RTC62421, XTAL(32'768)) // internal oscillator
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(ddenlovr_state::ddenlovrk, ddenlovr)
@@ -9722,12 +9722,12 @@ MACHINE_CONFIG_DERIVED(ddenlovr_state::quiz365, ddenlovj)
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(ddenlovr_state, quiz365_oki_bank1_w))
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(ddenlovr_state, quiz365_oki_bank2_w))
- MCFG_SOUND_REPLACE("aysnd", YM2149, XTAL_28_63636MHz / 16) // or /8 ?
+ MCFG_SOUND_REPLACE("aysnd", YM2149, XTAL(28'636'363) / 16) // or /8 ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_AY8910_PORT_A_READ_CB(READ8(ddenlovr_state, quiz365_input_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ddenlovr_state, ddenlovr_select_w))
- MCFG_DEVICE_REPLACE("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_REPLACE("rtc", MSM6242, XTAL(32'768))
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(ddenlovr_state::nettoqc, ddenlovj)
@@ -9780,7 +9780,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::quizchq_rtc_irq )
MACHINE_CONFIG_START(ddenlovr_state::quizchq)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* Verified */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* Verified */
MCFG_CPU_PROGRAM_MAP(quizchq_map)
MCFG_CPU_IO_MAP(quizchq_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddenlovr_state, quizchq_irq)
@@ -9805,14 +9805,14 @@ MACHINE_CONFIG_START(ddenlovr_state::quizchq)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_28_63636MHz/8) // 3.579545Mhz, verified
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363)/8) // 3.579545Mhz, verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.50)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz/28, PIN7_HIGH) // clock frequency verified 1.022MHz, pin 7 verified high
+ MCFG_OKIM6295_ADD("oki", XTAL(28'636'363)/28, PIN7_HIGH) // clock frequency verified 1.022MHz, pin 7 verified high
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, quizchq_rtc_irq))
MACHINE_CONFIG_END
@@ -9901,7 +9901,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mmpanic)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, mmpanic_rtc_irq))
MACHINE_CONFIG_END
@@ -9975,7 +9975,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hanakanz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hanakanz_rtc_irq))
MACHINE_CONFIG_END
@@ -9989,7 +9989,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::kotbinyo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2) // !! KL5C80A12CFP @ 10MHz? (actually 4 times faster than Z80) !!
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(20'000'000) / 2) // !! KL5C80A12CFP @ 10MHz? (actually 4 times faster than Z80) !!
MCFG_CPU_PROGRAM_MAP(hanakanz_map)
MCFG_CPU_IO_MAP(kotbinyo_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddenlovr_state, hanakanz_irq)
@@ -10014,14 +10014,14 @@ MACHINE_CONFIG_START(ddenlovr_state::kotbinyo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_28_37516MHz / 8)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'375'160) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_28_37516MHz / 28, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(28'375'160) / 28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
-// MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+// MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
// MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hanakanz_rtc_irq))
MACHINE_CONFIG_END
@@ -10112,7 +10112,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::mjschuka)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,XTAL_16MHz/2)
+ MCFG_CPU_ADD("maincpu",Z80,XTAL(16'000'000)/2)
MCFG_CPU_PROGRAM_MAP(mjmyster_map)
MCFG_CPU_IO_MAP(mjschuka_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddenlovr_state, hginga_irq)
@@ -10137,17 +10137,17 @@ MACHINE_CONFIG_START(ddenlovr_state::mjschuka)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MCFG_DEVICE_ADD("rtc", RTC62421, XTAL_32_768kHz) // internal oscillator
+ MCFG_DEVICE_ADD("rtc", RTC62421, XTAL(32'768)) // internal oscillator
MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hginga_rtc_irq))
MACHINE_CONFIG_END
@@ -10203,7 +10203,7 @@ MACHINE_CONFIG_DERIVED(ddenlovr_state::mjmyster, quizchq)
/* basic machine hardware */
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* Verified */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* Verified */
MCFG_CPU_PROGRAM_MAP(mjmyster_map)
MCFG_CPU_IO_MAP(mjmyster_portmap)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ddenlovr_state, mjmyster_irq, "screen", 0, 1)
@@ -10312,7 +10312,7 @@ MACHINE_CONFIG_DERIVED(ddenlovr_state::mjmyuniv, quizchq)
/* basic machine hardware */
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* Verified */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* Verified */
MCFG_CPU_PROGRAM_MAP(mjmyster_map)
MCFG_CPU_IO_MAP(mjmyster_portmap)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ddenlovr_state, mjmyster_irq, "screen", 0, 1)
@@ -10332,7 +10332,7 @@ MACHINE_CONFIG_DERIVED(ddenlovr_state::mjmyornt, quizchq)
/* basic machine hardware */
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* Verified */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* Verified */
MCFG_CPU_PROGRAM_MAP(quizchq_map)
MCFG_CPU_IO_MAP(mjmyster_portmap)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ddenlovr_state, mjmyster_irq, "screen", 0, 1)
@@ -10369,14 +10369,14 @@ MACHINE_CONFIG_DERIVED(ddenlovr_state::mjflove, quizchq)
/* basic machine hardware */
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* Verified */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* Verified */
MCFG_CPU_PROGRAM_MAP(rongrong_map)
MCFG_CPU_IO_MAP(mjflove_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddenlovr_state, mjflove_irq)
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjflove)
- MCFG_DEVICE_REPLACE("rtc", RTC72421, XTAL_32_768kHz)
+ MCFG_DEVICE_REPLACE("rtc", RTC72421, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, mjflove_rtc_irq))
MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove) // blitter commands in the roms are shuffled around
@@ -10408,7 +10408,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::jongtei)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2) // TMPZ84C015
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(20'000'000) / 2) // TMPZ84C015
MCFG_CPU_PROGRAM_MAP(hanakanz_map)
MCFG_CPU_IO_MAP(jongtei_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddenlovr_state, hanakanz_irq)
@@ -10433,14 +10433,14 @@ MACHINE_CONFIG_START(ddenlovr_state::jongtei)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hanakanz_rtc_irq))
MACHINE_CONFIG_END
@@ -10460,7 +10460,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::sryudens)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 2) // ?
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(16'000'000) / 2) // ?
MCFG_CPU_PROGRAM_MAP(sryudens_map)
MCFG_CPU_IO_MAP(sryudens_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddenlovr_state, mjchuuka_irq)
@@ -10485,17 +10485,17 @@ MACHINE_CONFIG_START(ddenlovr_state::sryudens)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", YMZ284, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ADD("aysnd", YMZ284, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH) // ?
+ MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MCFG_DEVICE_ADD("rtc", RTC62421, XTAL_32_768kHz) // internal oscillator
+ MCFG_DEVICE_ADD("rtc", RTC62421, XTAL(32'768)) // internal oscillator
MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, mjchuuka_rtc_irq))
MACHINE_CONFIG_END
@@ -10507,7 +10507,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::janshinp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(janshinp_map)
MCFG_CPU_IO_MAP(janshinp_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddenlovr_state, mjchuuka_irq)
@@ -10532,17 +10532,17 @@ MACHINE_CONFIG_START(ddenlovr_state::janshinp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", YMZ284, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ADD("aysnd", YMZ284, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH) // ?
+ MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, mjchuuka_rtc_irq))
MACHINE_CONFIG_END
@@ -10574,7 +10574,7 @@ MACHINE_START_MEMBER(ddenlovr_state,seljan2)
MACHINE_CONFIG_START(ddenlovr_state::seljan2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(seljan2_map)
MCFG_CPU_IO_MAP(seljan2_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddenlovr_state, mjchuuka_irq)
@@ -10599,19 +10599,19 @@ MACHINE_CONFIG_START(ddenlovr_state::seljan2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(28'636'363) / 8)
MCFG_AY8910_PORT_A_READ_CB(READ8(ddenlovr_state, seljan2_dsw_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ddenlovr_state, ddenlovr_select_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH) // ?
+ MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, mjchuuka_rtc_irq))
MACHINE_CONFIG_END
@@ -10624,7 +10624,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::daimyojn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(20'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(hanakanz_map)
MCFG_CPU_IO_MAP(daimyojn_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddenlovr_state, hanakanz_irq)
@@ -10649,14 +10649,14 @@ MACHINE_CONFIG_START(ddenlovr_state::daimyojn)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hanakanz_rtc_irq))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp
index ce6a47959f3..6b90959c9b4 100644
--- a/src/mame/drivers/ddragon.cpp
+++ b/src/mame/drivers/ddragon.cpp
@@ -65,8 +65,8 @@ Dip locations verified with manual for ddragon & ddragon2
#include "speaker.h"
-#define MAIN_CLOCK XTAL_12MHz
-#define SOUND_CLOCK XTAL_3_579545MHz
+#define MAIN_CLOCK XTAL(12'000'000)
+#define SOUND_CLOCK XTAL(3'579'545)
#define MCU_CLOCK MAIN_CLOCK / 3
#define PIXEL_CLOCK MAIN_CLOCK / 2
@@ -1108,7 +1108,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(darktowr_state::darktowr, ddragon)
/* basic machine hardware */
- MCFG_CPU_ADD("mcu", M68705P3, XTAL_4MHz)
+ MCFG_CPU_ADD("mcu", M68705P3, XTAL(4'000'000))
MCFG_M68705_PORTA_W_CB(WRITE8(darktowr_state, mcu_port_a_w))
/* video hardware */
diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp
index 1a6914b2015..370e1a6e49a 100644
--- a/src/mame/drivers/ddragon3.cpp
+++ b/src/mame/drivers/ddragon3.cpp
@@ -817,16 +817,16 @@ void ddragon3_state::machine_reset()
MACHINE_CONFIG_START(ddragon3_state::ddragon3)
/* 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(ddragon3_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ddragon3_state, ddragon3_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
MCFG_SCREEN_UPDATE_DRIVER(ddragon3_state, screen_update_ddragon3)
MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
@@ -843,12 +843,12 @@ MACHINE_CONFIG_START(ddragon3_state::ddragon3)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_YM2151_ADD("ym2151", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ym2151", XTAL(3'579'545))
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.50)
MACHINE_CONFIG_END
@@ -892,18 +892,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(wwfwfest_state::wwfwfest)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 24 crystal, 12 rated chip */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 24 crystal, 12 rated chip */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ddragon3_state, ddragon3_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
MCFG_SCREEN_UPDATE_DRIVER(wwfwfest_state, screen_update_wwfwfest)
MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
@@ -918,7 +918,7 @@ MACHINE_CONFIG_START(wwfwfest_state::wwfwfest)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_YM2151_ADD("ym2151", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ym2151", XTAL(3'579'545))
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp
index 55dea17f9ec..27ae60830a3 100644
--- a/src/mame/drivers/ddribble.cpp
+++ b/src/mame/drivers/ddribble.cpp
@@ -259,15 +259,15 @@ void ddribble_state::machine_reset()
MACHINE_CONFIG_START(ddribble_state::ddribble)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cpu0_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddribble_state, ddribble_interrupt_0)
- MCFG_CPU_ADD("cpu1", MC6809E, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_ADD("cpu1", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cpu1_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddribble_state, ddribble_interrupt_1)
- MCFG_CPU_ADD("cpu2", MC6809E, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_ADD("cpu2", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cpu2_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* we need heavy synch */
@@ -294,7 +294,7 @@ MACHINE_CONFIG_START(ddribble_state::ddribble)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(3'579'545)) /* verified on pcb */
MCFG_AY8910_PORT_B_READ_CB(READ8(ddribble_state, ddribble_vlm5030_busy_r))
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(ddribble_state, ddribble_vlm5030_ctrl_w))
MCFG_SOUND_ROUTE(0, "filter1", 0.25)
@@ -302,7 +302,7 @@ MACHINE_CONFIG_START(ddribble_state::ddribble)
MCFG_SOUND_ROUTE(2, "filter3", 0.25)
MCFG_SOUND_ROUTE(3, "mono", 0.25)
- MCFG_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("vlm", VLM5030, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp
index 3a6f0bb195b..330e7ad507f 100644
--- a/src/mame/drivers/de_2.cpp
+++ b/src/mame/drivers/de_2.cpp
@@ -34,7 +34,7 @@
// 6808 CPU's input clock is 4MHz
// but because it has an internal /4 divider, its E clock runs at 1/4 that frequency
-#define E_CLOCK (XTAL_4MHz/4)
+#define E_CLOCK (XTAL(4'000'000)/4)
// Length of time in cycles between IRQs on the main 6808 CPU
// This length is determined by the settings of the W14 and W15 jumpers
@@ -525,16 +525,16 @@ WRITE8_MEMBER(de_2_state::lamps_w)
MACHINE_CONFIG_START(de_2_state::de_bg_audio)
/* sound CPU */
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL_8MHz / 4) // MC68B09E
+ MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
MCFG_CPU_PROGRAM_MAP(de_2_audio_map)
MCFG_SPEAKER_STANDARD_MONO("bg")
- MCFG_YM2151_ADD("ym2151", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ym2151", XTAL(3'579'545))
MCFG_YM2151_IRQ_HANDLER(WRITELINE(de_2_state, ym2151_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
- MCFG_SOUND_ADD("msm5205", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("msm5205", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(de_2_state, msm5205_irq_w))
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
@@ -542,7 +542,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(de_2_state::de_type1)
/* basic machine hardware */
- MCFG_DECOCPU_TYPE1_ADD("decocpu", XTAL_8MHz / 2, ":maincpu")
+ MCFG_DECOCPU_TYPE1_ADD("decocpu", XTAL(8'000'000) / 2, ":maincpu")
MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,display_w))
MCFG_DECOCPU_SOUNDLATCH(WRITE8(de_2_state,sound_w))
MCFG_DECOCPU_SWITCH(READ8(de_2_state,switch_r),WRITE8(de_2_state,switch_w))
@@ -558,7 +558,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(de_2_state::de_type2)
/* basic machine hardware */
- MCFG_DECOCPU_TYPE2_ADD("decocpu", XTAL_8MHz / 2, ":maincpu")
+ MCFG_DECOCPU_TYPE2_ADD("decocpu", XTAL(8'000'000) / 2, ":maincpu")
MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,display_w))
MCFG_DECOCPU_SOUNDLATCH(WRITE8(de_2_state,sound_w))
MCFG_DECOCPU_SWITCH(READ8(de_2_state,switch_r),WRITE8(de_2_state,switch_w))
@@ -574,7 +574,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(de_2_state::de_type2_alpha3)
/* basic machine hardware */
- MCFG_DECOCPU_TYPE2_ADD("decocpu", XTAL_8MHz / 2, ":maincpu")
+ MCFG_DECOCPU_TYPE2_ADD("decocpu", XTAL(8'000'000) / 2, ":maincpu")
MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,type2alpha3_display_w))
MCFG_DECOCPU_SOUNDLATCH(WRITE8(de_2_state,sound_w))
MCFG_DECOCPU_SWITCH(READ8(de_2_state,switch_r),WRITE8(de_2_state,switch_w))
@@ -590,7 +590,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(de_2_state::de_type3)
/* basic machine hardware */
- MCFG_DECOCPU_TYPE3_ADD("decocpu", XTAL_8MHz / 2, ":maincpu")
+ MCFG_DECOCPU_TYPE3_ADD("decocpu", XTAL(8'000'000) / 2, ":maincpu")
MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,alpha3_display_w))
MCFG_DECOCPU_SOUNDLATCH(WRITE8(de_2_state,sound_w))
MCFG_DECOCPU_SWITCH(READ8(de_2_state,switch_r),WRITE8(de_2_state,switch_w))
diff --git a/src/mame/drivers/de_3.cpp b/src/mame/drivers/de_3.cpp
index c01357dc06f..ee99eedf465 100644
--- a/src/mame/drivers/de_3.cpp
+++ b/src/mame/drivers/de_3.cpp
@@ -21,7 +21,7 @@
// 6808 CPU's input clock is 4MHz
// but because it has an internal /4 divider, its E clock runs at 1/4 that frequency
-#define E_CLOCK (XTAL_4MHz/4)
+#define E_CLOCK (XTAL(4'000'000)/4)
// Length of time in cycles between IRQs on the main 6808 CPU
// This length is determined by the settings of the W14 and W15 jumpers
@@ -396,7 +396,7 @@ DRIVER_INIT_MEMBER(de_3_state,de_3)
MACHINE_CONFIG_START(de_3_state::de_3)
/* basic machine hardware */
- MCFG_DECOCPU_TYPE3_ADD("decocpu",XTAL_8MHz / 2, ":maincpu")
+ MCFG_DECOCPU_TYPE3_ADD("decocpu",XTAL(8'000'000) / 2, ":maincpu")
MCFG_DECOCPU_DISPLAY(READ8(de_3_state,display_r),WRITE8(de_3_state,display_w))
MCFG_DECOCPU_SOUNDLATCH(WRITE8(de_3_state,sound_w))
MCFG_DECOCPU_SWITCH(READ8(de_3_state,switch_r),WRITE8(de_3_state,switch_w))
diff --git a/src/mame/drivers/de_3b.cpp b/src/mame/drivers/de_3b.cpp
index 916ed34fc4e..e27c43956c6 100644
--- a/src/mame/drivers/de_3b.cpp
+++ b/src/mame/drivers/de_3b.cpp
@@ -243,7 +243,7 @@ DRIVER_INIT_MEMBER(de_3b_state,de_3b)
MACHINE_CONFIG_START(de_3b_state::de_3b)
/* basic machine hardware */
- MCFG_DECOCPU_TYPE3B_ADD("decocpu",XTAL_8MHz / 2, ":maincpu")
+ MCFG_DECOCPU_TYPE3B_ADD("decocpu",XTAL(8'000'000) / 2, ":maincpu")
MCFG_DECOCPU_DISPLAY(READ8(de_3b_state,display_r),WRITE8(de_3b_state,display_w))
MCFG_DECOCPU_SOUNDLATCH(WRITE8(de_3b_state,sound_w))
MCFG_DECOCPU_SWITCH(READ8(de_3b_state,switch_r),WRITE8(de_3b_state,switch_w))
@@ -261,7 +261,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(de_3b_state::detest)
/* basic machine hardware */
- MCFG_DECOCPU_TYPE3B_ADD("decocpu",XTAL_8MHz / 2, ":maincpu")
+ MCFG_DECOCPU_TYPE3B_ADD("decocpu",XTAL(8'000'000) / 2, ":maincpu")
MCFG_FRAGMENT_ADD( genpin_audio )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/deadang.cpp b/src/mame/drivers/deadang.cpp
index 77b29520306..25716e76159 100644
--- a/src/mame/drivers/deadang.cpp
+++ b/src/mame/drivers/deadang.cpp
@@ -268,15 +268,15 @@ TIMER_DEVICE_CALLBACK_MEMBER(deadang_state::sub_scanline)
MACHINE_CONFIG_START(deadang_state::deadang)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
+ MCFG_CPU_ADD("maincpu", V30,XTAL(16'000'000)/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer1", deadang_state, main_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("sub", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
+ MCFG_CPU_ADD("sub", V30,XTAL(16'000'000)/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
MCFG_CPU_PROGRAM_MAP(sub_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer2", deadang_state, sub_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(sound_decrypted_opcodes_map)
@@ -309,11 +309,11 @@ MACHINE_CONFIG_START(deadang_state::deadang)
MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ym1", ym2203_device, read))
MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ym1", ym2203_device, write))
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_14_31818MHz/4)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(14'318'181)/4)
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_14_31818MHz/4)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MCFG_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000)
diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp
index eefb3cb71f6..b4d4ace1178 100644
--- a/src/mame/drivers/dec0.cpp
+++ b/src/mame/drivers/dec0.cpp
@@ -1595,7 +1595,7 @@ GFXDECODE_END
// DECO video CRTC, pixel clock is unverified (actually 24MHz/4?)
#define MCFG_SCREEN_RAW_PARAMS_DATA_EAST \
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2,384,0,256,272,8,248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2,384,0,256,272,8,248)
@@ -1635,11 +1635,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(dec0_state::dec0, dec0_base)
/* 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(dec0_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_assert) /* VBL */
- MCFG_CPU_ADD("audiocpu", M6502, XTAL_12MHz / 8)
+ MCFG_CPU_ADD("audiocpu", M6502, XTAL(12'000'000) / 8)
MCFG_CPU_PROGRAM_MAP(dec0_s_map)
/* video hardware */
@@ -1651,17 +1651,17 @@ MACHINE_CONFIG_DERIVED(dec0_state::dec0, dec0_base)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz / 8)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000) / 8)
MCFG_SOUND_ROUTE(0, "mono", 0.90)
MCFG_SOUND_ROUTE(1, "mono", 0.90)
MCFG_SOUND_ROUTE(2, "mono", 0.90)
MCFG_SOUND_ROUTE(3, "mono", 0.35)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz / 4)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL(12'000'000) / 4)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 2 / 10, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(20'000'000) / 2 / 10, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -1679,17 +1679,17 @@ MACHINE_CONFIG_DERIVED(dec0_state::dec1, dec0_base)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.90)
MCFG_SOUND_ROUTE(1, "mono", 0.90)
MCFG_SOUND_ROUTE(2, "mono", 0.90)
MCFG_SOUND_ROUTE(3, "mono", 0.35)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 1))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/12, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -1800,7 +1800,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec0_automat_state::secretab)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
MCFG_CPU_PROGRAM_MAP(secretab_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */
@@ -1871,7 +1871,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(dec0_state::hbarrel, dec0)
- MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz)
+ MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
MCFG_CPU_IO_MAP(mcu_io_map)
/* video hardware */
@@ -1881,7 +1881,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(dec0_state::baddudes, dec0)
- MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz)
+ MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
MCFG_CPU_IO_MAP(mcu_io_map)
/* video hardware */
@@ -1905,7 +1905,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(dec0_state::robocop, dec0)
- MCFG_CPU_ADD("sub", H6280, XTAL_21_4772MHz / 16)
+ MCFG_CPU_ADD("sub", H6280, XTAL(21'477'272) / 16)
MCFG_CPU_PROGRAM_MAP(robocop_sub_map)
MCFG_QUANTUM_TIME(attotime::from_hz(3000)) /* Interleave between HuC6280 & 68000 */
@@ -1924,7 +1924,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(dec0_state::hippodrm, dec0)
- MCFG_CPU_ADD("sub", H6280, XTAL_21_4772MHz / 16)
+ MCFG_CPU_ADD("sub", H6280, XTAL(21'477'272) / 16)
MCFG_CPU_PROGRAM_MAP(hippodrm_sub_map)
MCFG_QUANTUM_TIME(attotime::from_hz(300)) /* Interleave between H6280 & 68000 */
@@ -1936,7 +1936,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(dec0_state::ffantasybl, dec0)
-// MCFG_CPU_ADD("sub", H6280, XTAL_21_4772MHz / 16)
+// MCFG_CPU_ADD("sub", H6280, XTAL(21'477'272) / 16)
// MCFG_CPU_PROGRAM_MAP(hippodrm_sub_map)
// MCFG_QUANTUM_TIME(attotime::from_hz(300)) /* Interleave between H6280 & 68000 */
@@ -1958,12 +1958,12 @@ MACHINE_RESET_MEMBER(dec0_state,slyspy)
MACHINE_CONFIG_DERIVED(dec0_state::slyspy, dec1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
MCFG_CPU_PROGRAM_MAP(slyspy_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold) /* VBL, apparently it auto-acks */
// TODO: both games doesn't like /3 here, MT #06740
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_12MHz/2/2) /* verified on pcb (6Mhz is XIN on pin 10 of H6280) */
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(12'000'000)/2/2) /* verified on pcb (6Mhz is XIN on pin 10 of H6280) */
MCFG_CPU_PROGRAM_MAP(slyspy_s_map)
MCFG_DEVICE_ADD("pfprotect", ADDRESS_MAP_BANK, 0)
@@ -1991,11 +1991,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(dec0_state::midres, dec1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
MCFG_CPU_PROGRAM_MAP(midres_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_24MHz/4/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(24'000'000)/4/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
MCFG_CPU_PROGRAM_MAP(midres_s_map)
/* video hardware */
@@ -2012,7 +2012,7 @@ MACHINE_CONFIG_DERIVED(dec0_state::midresb, midres)
MCFG_CPU_REPLACE("audiocpu", M6502, 1500000 )
MCFG_CPU_PROGRAM_MAP(dec0_s_map)
- MCFG_CPU_ADD("mcu", M68705R3, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("mcu", M68705R3, XTAL(3'579'545))
MCFG_SOUND_MODIFY("ym2")
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp
index 42a52cc955f..103af266ff7 100644
--- a/src/mame/drivers/dec8.cpp
+++ b/src/mame/drivers/dec8.cpp
@@ -1951,7 +1951,7 @@ void dec8_state::machine_reset()
// DECO video CRTC, unverified
#define MCFG_SCREEN_RAW_PARAMS_DATA_EAST \
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2,384,0,256,272,8,248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2,384,0,256,272,8,248)
MACHINE_CONFIG_START(dec8_state::lastmisn)
@@ -2072,7 +2072,7 @@ MACHINE_CONFIG_START(dec8_state::gondo)
MCFG_CPU_PROGRAM_MAP(oscar_s_map)
/* NMIs are caused by the main CPU */
- MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz)
+ MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
MCFG_CPU_IO_MAP(dec8_mcu_io_map)
@@ -2126,7 +2126,7 @@ MACHINE_CONFIG_START(dec8_state::garyoret)
MCFG_CPU_PROGRAM_MAP(oscar_s_map)
/* NMIs are caused by the main CPU */
- MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz)
+ MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
MCFG_CPU_IO_MAP(dec8_mcu_io_map)
@@ -2233,14 +2233,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec8_state::csilver)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(csilver_map)
- MCFG_CPU_ADD("sub", MC6809E, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("sub", MC6809E, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(csilver_sub_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dec8_state, nmi_line_pulse)
- MCFG_CPU_ADD("audiocpu", M6502, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", M6502, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(csilver_s_map)
/* NMIs are caused by the main CPU */
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -2273,17 +2273,17 @@ MACHINE_CONFIG_START(dec8_state::csilver)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.23)
MCFG_SOUND_ROUTE(1, "mono", 0.23)
MCFG_SOUND_ROUTE(2, "mono", 0.23)
MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MCFG_SOUND_ADD("ym2", YM3526, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM3526, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_VCLK_CB(WRITELINE(dec8_state, csilver_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.88)
@@ -2292,14 +2292,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec8_state::oscar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", HD6309, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(oscar_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dec8_state, oscar_interrupt)
- MCFG_CPU_ADD("sub", HD6309, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("sub", HD6309, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(oscar_sub_map)
- MCFG_CPU_ADD("audiocpu", DECO_222, XTAL_12MHz/8)
+ MCFG_CPU_ADD("audiocpu", DECO_222, XTAL(12'000'000)/8)
MCFG_CPU_PROGRAM_MAP(oscar_s_map)
/* NMIs are caused by the main CPU */
MCFG_QUANTUM_TIME(attotime::from_hz(2400)) /* 40 CPU slices per frame */
@@ -2334,7 +2334,7 @@ MACHINE_CONFIG_START(dec8_state::oscar)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.23)
MCFG_SOUND_ROUTE(1, "mono", 0.23)
MCFG_SOUND_ROUTE(2, "mono", 0.23)
@@ -2342,7 +2342,7 @@ MACHINE_CONFIG_START(dec8_state::oscar)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym2", YM3526, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM3526, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -2358,7 +2358,7 @@ MACHINE_CONFIG_START(dec8_state::srdarwin)
MCFG_CPU_PROGRAM_MAP(dec8_s_map)
/* NMIs are caused by the main CPU */
- MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz) /* unknown frequency */
+ MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000)) /* unknown frequency */
MCFG_CPU_IO_MAP(srdarwin_mcu_io_map)
MCFG_QUANTUM_PERFECT_CPU("maincpu") /* needed for stability with emulated MCU or sometimes commands get missed and game crashes at bosses */
diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp
index 2c736765b10..3c0a9bcb6e0 100644
--- a/src/mame/drivers/deco32.cpp
+++ b/src/mame/drivers/deco32.cpp
@@ -1853,10 +1853,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(captaven_state::captaven)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, XTAL_28MHz/4) /* verified on pcb (Data East 101 custom)*/
+ MCFG_CPU_ADD("maincpu", ARM, XTAL(28'000'000)/4) /* verified on pcb (Data East 101 custom)*/
MCFG_CPU_PROGRAM_MAP(captaven_map)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz/4/3) /* pin 10 is 32mhz/4, pin 14 is High so internal divisor is 3 (verified on pcb) */
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000)/4/3) /* pin 10 is 32mhz/4, pin 14 is High so internal divisor is 3 (verified on pcb) */
MCFG_CPU_PROGRAM_MAP(h6280_sound_map)
MCFG_INPUT_MERGER_ANY_HIGH("irq_merger")
@@ -1867,7 +1867,7 @@ MACHINE_CONFIG_START(captaven_state::captaven)
MCFG_DECO_IRQ_VBLANK_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<1>))
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz / 4, 442, 0, 320, 274, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(captaven_state, screen_update_captaven)
MCFG_SCREEN_PALETTE("palette")
@@ -1919,34 +1919,34 @@ MACHINE_CONFIG_START(captaven_state::captaven)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_32_22MHz/9) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000)/9) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1))
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(deco32_state, sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, PIN7_HIGH) /* verified on pcb; pin 7 is floating to 2.5V (left unconnected), so I presume High */
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'220'000)/32, PIN7_HIGH) /* verified on pcb; pin 7 is floating to 2.5V (left unconnected), so I presume High */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, PIN7_HIGH) /* verified on pcb; pin 7 is floating to 2.5V (left unconnected), so I presume High */
+ MCFG_OKIM6295_ADD("oki2", XTAL(32'220'000)/16, PIN7_HIGH) /* verified on pcb; pin 7 is floating to 2.5V (left unconnected), so I presume High */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
MACHINE_CONFIG_END
// DE-0380-2
MACHINE_CONFIG_START(fghthist_state::fghthist)
- MCFG_CPU_ADD("maincpu", ARM, XTAL_28MHz / 4)
+ MCFG_CPU_ADD("maincpu", ARM, XTAL(28'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(fghthist_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz / 8)
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
MCFG_CPU_PROGRAM_MAP(h6280_sound_custom_latch_map)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz / 4, 442, 0, 320, 274, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(fghthist_state, screen_update_fghthist)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", fghthist)
@@ -2034,7 +2034,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(fghthist_state::fghthistu, fghthsta)
MCFG_DEVICE_REMOVE("audiocpu")
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32_22MHz / 9)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'220'000) / 9)
MCFG_CPU_PROGRAM_MAP(z80_sound_mem)
MCFG_CPU_IO_MAP(z80_sound_io)
@@ -2054,7 +2054,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dragngun_state::dragngun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, XTAL_28MHz / 4)
+ MCFG_CPU_ADD("maincpu", ARM, XTAL(28'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(dragngun_map)
MCFG_CPU_ADD("audiocpu", H6280, 32220000/8)
@@ -2071,7 +2071,7 @@ MACHINE_CONFIG_START(dragngun_state::dragngun)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz / 4, 442, 0, 320, 274, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(dragngun_state, screen_update_dragngun)
//MCFG_SCREEN_PALETTE("palette")
@@ -2167,7 +2167,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dragngun_state::lockload)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, XTAL_28MHz / 4)
+ MCFG_CPU_ADD("maincpu", ARM, XTAL(28'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(lockload_map)
MCFG_INPUT_MERGER_ANY_HIGH("irq_merger")
@@ -2193,7 +2193,7 @@ MACHINE_CONFIG_START(dragngun_state::lockload)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz / 4, 442, 0, 320, 274, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(dragngun_state, screen_update_dragngun)
MCFG_BUFFERED_SPRITERAM32_ADD("spriteram")
@@ -2281,7 +2281,7 @@ MACHINE_CONFIG_START(nslasher_state::tattass)
MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom")
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz / 4, 442, 0, 320, 274, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(nslasher_state, screen_update_nslasher)
MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0)
@@ -2341,7 +2341,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nslasher_state::nslasher)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, XTAL_28_322MHz / 4)
+ MCFG_CPU_ADD("maincpu", ARM, XTAL(28'322'000) / 4)
MCFG_CPU_PROGRAM_MAP(nslasher_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert)
@@ -2357,7 +2357,7 @@ MACHINE_CONFIG_START(nslasher_state::nslasher)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28_322MHz / 4, 442, 0, 320, 274, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'322'000) / 4, 442, 0, 320, 274, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(nslasher_state, screen_update_nslasher)
MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0)
diff --git a/src/mame/drivers/decocass.cpp b/src/mame/drivers/decocass.cpp
index 05512340aaf..1b9eb5b00c9 100644
--- a/src/mame/drivers/decocass.cpp
+++ b/src/mame/drivers/decocass.cpp
@@ -51,7 +51,7 @@
#include "sound/ay8910.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
#define HCLK (MASTER_CLOCK/2)
#define HCLK1 (HCLK/2)
#define HCLK2 (HCLK1/2)
diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp
index 01df0fe024b..7bc19f0f8dd 100644
--- a/src/mame/drivers/dectalk.cpp
+++ b/src/mame/drivers/dectalk.cpp
@@ -871,16 +871,16 @@ TIMER_CALLBACK_MEMBER(dectalk_state::outfifo_read_cb)
MACHINE_CONFIG_START(dectalk_state::dectalk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* E74 20MHz OSC (/2) */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* E74 20MHz OSC (/2) */
MCFG_CPU_PROGRAM_MAP(m68k_mem)
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_3_6864MHz) // MC2681 DUART ; Y3 3.6864MHz xtal */
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400)) // MC2681 DUART ; Y3 3.6864MHz xtal */
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(dectalk_state, duart_irq_handler))
MCFG_MC68681_A_TX_CALLBACK(WRITELINE(dectalk_state, duart_txa))
MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_MC68681_INPORT_CALLBACK(READ8(dectalk_state, duart_input))
MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(dectalk_state, duart_output))
- MCFG_CPU_ADD("dsp", TMS32010, XTAL_20MHz) /* Y1 20MHz xtal */
+ MCFG_CPU_ADD("dsp", TMS32010, XTAL(20'000'000)) /* Y1 20MHz xtal */
MCFG_CPU_PROGRAM_MAP(tms32010_mem)
MCFG_CPU_IO_MAP(tms32010_io)
MCFG_TMS32010_BIO_IN_CB(READLINE(dectalk_state, spc_semaphore_r)) //read infifo-has-data-in-it fifo readable status
diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp
index dd89218f9df..1ca1913f2bf 100644
--- a/src/mame/drivers/decwritr.cpp
+++ b/src/mame/drivers/decwritr.cpp
@@ -401,7 +401,7 @@ void decwriter_state::machine_reset()
MACHINE_CONFIG_START(decwriter_state::la120)
- MCFG_CPU_ADD("maincpu",I8080, XTAL_18MHz / 9) // 18Mhz xtal on schematics, using an i8224 clock divider/reset sanitizer IC
+ MCFG_CPU_ADD("maincpu",I8080, XTAL(18'000'000) / 9) // 18Mhz xtal on schematics, using an i8224 clock divider/reset sanitizer IC
MCFG_CPU_PROGRAM_MAP(la120_mem)
MCFG_CPU_IO_MAP(la120_io)
@@ -431,7 +431,7 @@ MACHINE_CONFIG_START(decwriter_state::la120)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxd))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE("i8251", i8251_device, write_dsr))
- MCFG_DEVICE_ADD(COM5016T_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(COM5016T_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxc))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE("i8251", i8251_device, write_txc))
*/
diff --git a/src/mame/drivers/deniam.cpp b/src/mame/drivers/deniam.cpp
index b7dc77e9cb6..90f5e0341c0 100644
--- a/src/mame/drivers/deniam.cpp
+++ b/src/mame/drivers/deniam.cpp
@@ -249,11 +249,11 @@ void deniam_state::machine_reset()
MACHINE_CONFIG_START(deniam_state::deniam16b)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL_25MHz/2) /* 12.5Mhz verified */
+ MCFG_CPU_ADD("maincpu", M68000,XTAL(25'000'000)/2) /* 12.5Mhz verified */
MCFG_CPU_PROGRAM_MAP(deniam16b_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", deniam_state, irq4_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL_25MHz/4) /* 6.25Mhz verified */
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL(25'000'000)/4) /* 6.25Mhz verified */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
@@ -278,18 +278,18 @@ MACHINE_CONFIG_START(deniam_state::deniam16b)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_25MHz/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(25'000'000)/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */
+ MCFG_OKIM6295_ADD("oki", XTAL(25'000'000)/24, PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(deniam_state::deniam16c)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL_25MHz/2) /* 12.5Mhz verified */
+ MCFG_CPU_ADD("maincpu", M68000,XTAL(25'000'000)/2) /* 12.5Mhz verified */
MCFG_CPU_PROGRAM_MAP(deniam16c_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", deniam_state, irq4_line_assert)
@@ -311,10 +311,10 @@ MACHINE_CONFIG_START(deniam_state::deniam16c)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_25MHz/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified) */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(25'000'000)/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */
+ MCFG_OKIM6295_ADD("oki", XTAL(25'000'000)/24, PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/deshoros.cpp b/src/mame/drivers/deshoros.cpp
index 1572c303e5d..45840987d5c 100644
--- a/src/mame/drivers/deshoros.cpp
+++ b/src/mame/drivers/deshoros.cpp
@@ -265,7 +265,7 @@ void destiny_state::machine_reset()
MACHINE_CONFIG_START(destiny_state::destiny)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, XTAL_4MHz/2)
+ MCFG_CPU_ADD("maincpu", M6809, XTAL(4'000'000)/2)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_PERIODIC_INT_DRIVER(destiny_state, irq0_line_hold, 50) // timer irq controls update speed, frequency needs to be determined yet (2MHz through three 74LS390)
diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp
index 60a1e836256..9d0c460eb37 100644
--- a/src/mame/drivers/destroyr.cpp
+++ b/src/mame/drivers/destroyr.cpp
@@ -476,7 +476,7 @@ void destroyr_state::machine_start()
MACHINE_CONFIG_START(destroyr_state::destroyr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 16)
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(12'096'000) / 16)
MCFG_CPU_PROGRAM_MAP(destroyr_map)
MCFG_CPU_PERIODIC_INT_DRIVER(destroyr_state, irq0_line_assert, 4*60)
diff --git a/src/mame/drivers/dfruit.cpp b/src/mame/drivers/dfruit.cpp
index 70f9e8ff4a0..2a7b700607f 100644
--- a/src/mame/drivers/dfruit.cpp
+++ b/src/mame/drivers/dfruit.cpp
@@ -364,7 +364,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(dfruit_state::dfruit_irq_scanline)
}
}
-#define MASTER_CLOCK XTAL_14MHz
+#define MASTER_CLOCK XTAL(14'000'000)
MACHINE_CONFIG_START(dfruit_state::dfruit)
diff --git a/src/mame/drivers/dgn_beta.cpp b/src/mame/drivers/dgn_beta.cpp
index 01b7b58163b..3adaec6e5d6 100644
--- a/src/mame/drivers/dgn_beta.cpp
+++ b/src/mame/drivers/dgn_beta.cpp
@@ -370,7 +370,7 @@ MACHINE_CONFIG_START(dgn_beta_state::dgnbeta)
MCFG_PIA_IRQA_HANDLER(WRITELINE(dgn_beta_state, d_pia2_irq_a))
MCFG_PIA_IRQB_HANDLER(WRITELINE(dgn_beta_state, d_pia2_irq_b))
- MCFG_WD2797_ADD(FDC_TAG, XTAL_1MHz)
+ MCFG_WD2797_ADD(FDC_TAG, XTAL(1'000'000))
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(dgn_beta_state, dgnbeta_fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(dgn_beta_state, dgnbeta_fdc_drq_w))
@@ -383,7 +383,7 @@ MACHINE_CONFIG_START(dgn_beta_state::dgnbeta)
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":3", dgnbeta_floppies, nullptr, dgn_beta_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
- MCFG_MC6845_ADD("crtc", HD6845, "screen", XTAL_12_288MHz / 16) //XTAL is guessed
+ MCFG_MC6845_ADD("crtc", HD6845, "screen", XTAL(12'288'000) / 16) //XTAL is guessed
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16) /*?*/
MCFG_MC6845_UPDATE_ROW_CB(dgn_beta_state, crtc_update_row)
diff --git a/src/mame/drivers/didact.cpp b/src/mame/drivers/didact.cpp
index 1796c6a8ce9..77d8a18dc63 100644
--- a/src/mame/drivers/didact.cpp
+++ b/src/mame/drivers/didact.cpp
@@ -588,7 +588,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(didact_state::scan_artwork)
}
MACHINE_CONFIG_START(md6802_state::md6802)
- MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", M6802, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(md6802_map)
MCFG_DEFAULT_LAYOUT(layout_md6802)
diff --git a/src/mame/drivers/dietgo.cpp b/src/mame/drivers/dietgo.cpp
index cb637ecd0a9..2c179ff0a88 100644
--- a/src/mame/drivers/dietgo.cpp
+++ b/src/mame/drivers/dietgo.cpp
@@ -212,12 +212,12 @@ void dietgo_state::machine_start()
MACHINE_CONFIG_START(dietgo_state::dietgo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* DE102 (verified on pcb) */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000)/2) /* DE102 (verified on pcb) */
MCFG_CPU_PROGRAM_MAP(dietgo_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dietgo_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz/4/3) /* Custom chip 45; XIN is 32.220MHZ/4, verified on pcb */
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000)/4/3) /* Custom chip 45; XIN is 32.220MHZ/4, verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
@@ -266,11 +266,11 @@ MACHINE_CONFIG_START(dietgo_state::dietgo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_32_22MHz/9) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000)/9) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki", XTAL_32_22MHz/32, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(32'220'000)/32, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/digel804.cpp b/src/mame/drivers/digel804.cpp
index c723726bf68..f0c71a43dc4 100644
--- a/src/mame/drivers/digel804.cpp
+++ b/src/mame/drivers/digel804.cpp
@@ -588,7 +588,7 @@ WRITE_LINE_MEMBER( digel804_state::ep804_acia_irq_w )
MACHINE_CONFIG_START(digel804_state::digel804)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_6864MHz/2) /* Z80A, X1(aka E0 on schematics): 3.6864Mhz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'686'400)/2) /* Z80A, X1(aka E0 on schematics): 3.6864Mhz */
MCFG_CPU_PROGRAM_MAP(z80_mem_804_1_4)
MCFG_CPU_IO_MAP(z80_io_1_4)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -607,7 +607,7 @@ MACHINE_CONFIG_START(digel804_state::digel804)
/* acia */
MCFG_DEVICE_ADD("acia", MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_3_6864MHz/2)
+ MCFG_MOS6551_XTAL(XTAL(3'686'400)/2)
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(digel804_state, acia_irq_w))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
diff --git a/src/mame/drivers/digijet.cpp b/src/mame/drivers/digijet.cpp
index 7a1eb95d0f6..43479efbb6f 100644
--- a/src/mame/drivers/digijet.cpp
+++ b/src/mame/drivers/digijet.cpp
@@ -48,7 +48,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(digijet_state::digijet)
/* basic machine hardware */
- MCFG_CPU_ADD(I8049_TAG, I8049, XTAL_11MHz)
+ MCFG_CPU_ADD(I8049_TAG, I8049, XTAL(11'000'000))
MCFG_CPU_IO_MAP(io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp
index 29076638791..9bd85a22218 100644
--- a/src/mame/drivers/dim68k.cpp
+++ b/src/mame/drivers/dim68k.cpp
@@ -149,13 +149,13 @@ WRITE16_MEMBER( dim68k_state::dim68k_video_control_w )
switch (data & 0x18)
{
- case 0x00: m_crtc->set_clock(XTAL_14MHz);
+ case 0x00: m_crtc->set_clock(XTAL(14'000'000));
break;
- case 0x08: m_crtc->set_clock(XTAL_3_579545MHz);
+ case 0x08: m_crtc->set_clock(XTAL(3'579'545));
break;
- case 0x10: m_crtc->set_clock(XTAL_14MHz / 2);
+ case 0x10: m_crtc->set_clock(XTAL(14'000'000) / 2);
break;
- case 0x18: m_crtc->set_clock(XTAL_3_579545MHz / 2);
+ case 0x18: m_crtc->set_clock(XTAL(3'579'545) / 2);
break;
}
}
@@ -306,7 +306,7 @@ void dim68k_state::kbd_put(u8 data)
MACHINE_CONFIG_START(dim68k_state::dim68k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(dim68k_mem)
/* video hardware */
diff --git a/src/mame/drivers/discoboy.cpp b/src/mame/drivers/discoboy.cpp
index e8ae5990841..60cc6879a5b 100644
--- a/src/mame/drivers/discoboy.cpp
+++ b/src/mame/drivers/discoboy.cpp
@@ -447,12 +447,12 @@ WRITE_LINE_MEMBER(discoboy_state::yunsung8_adpcm_int)
MACHINE_CONFIG_START(discoboy_state::discoboy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* 6 MHz? */
MCFG_CPU_PROGRAM_MAP(discoboy_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", discoboy_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_10MHz/2) /* 5 MHz? */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(10'000'000)/2) /* 5 MHz? */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_DEVICE_ADD("rambank1", ADDRESS_MAP_BANK, 0)
@@ -481,14 +481,14 @@ MACHINE_CONFIG_START(discoboy_state::discoboy)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_10MHz/4) /* 2.5 MHz? */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(10'000'000)/4) /* 2.5 MHz? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.6)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(400'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(discoboy_state, yunsung8_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp
index ec73c660ae9..3cad2bf7943 100644
--- a/src/mame/drivers/djmain.cpp
+++ b/src/mame/drivers/djmain.cpp
@@ -1410,12 +1410,12 @@ MACHINE_CONFIG_START(djmain_state::djmainj)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_DEVICE_ADD("k054539_1", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_DEVICE_ADD("k054539_2", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp
index 3a0abd3d91f..de396783144 100644
--- a/src/mame/drivers/dkong.cpp
+++ b/src/mame/drivers/dkong.cpp
@@ -1760,7 +1760,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dkong_state::dkong3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) /* verified in schematics */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2) /* verified in schematics */
MCFG_CPU_PROGRAM_MAP(dkong3_map)
MCFG_CPU_IO_MAP(dkong3_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dkong_state, vblank_irq)
diff --git a/src/mame/drivers/dlair2.cpp b/src/mame/drivers/dlair2.cpp
index 067cf299604..c3d5e29eb78 100644
--- a/src/mame/drivers/dlair2.cpp
+++ b/src/mame/drivers/dlair2.cpp
@@ -35,7 +35,7 @@ http://www.dragons-lair-project.com/tech/pages/dl2.asp
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_30MHz
+#define MAIN_CLOCK XTAL(30'000'000)
class dlair2_state : public driver_device
{
diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp
index d73b09878d7..f4fd1fb72a2 100644
--- a/src/mame/drivers/dmax8000.cpp
+++ b/src/mame/drivers/dmax8000.cpp
@@ -146,17 +146,17 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(dmax8000_state::dmax8000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz ) // no idea what crystal is used, but 4MHz clock is confirmed
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000) ) // no idea what crystal is used, but 4MHz clock is confirmed
MCFG_CPU_PROGRAM_MAP(dmax8000_mem)
MCFG_CPU_IO_MAP(dmax8000_io)
MCFG_MACHINE_RESET_OVERRIDE(dmax8000_state, dmax8000)
- MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_4MHz / 2) // 2MHz
+ MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(4'000'000) / 2) // 2MHz
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("dart1", z80dart_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart1", z80dart_device, txca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart2", z80dart_device, rxca_w))
@@ -164,7 +164,7 @@ MACHINE_CONFIG_START(dmax8000_state::dmax8000)
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart2", z80dart_device, rxtxcb_w))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("dart1", z80dart_device, rxtxcb_w))
- MCFG_DEVICE_ADD("dart1", Z80DART, XTAL_4MHz) // A = terminal; B = aux
+ MCFG_DEVICE_ADD("dart1", Z80DART, XTAL(4'000'000)) // A = terminal; B = aux
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -175,15 +175,15 @@ MACHINE_CONFIG_START(dmax8000_state::dmax8000)
MCFG_RS232_RI_HANDLER(DEVWRITELINE("dart1", z80dart_device, ria_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("dart1", z80dart_device, ctsa_w))
- MCFG_DEVICE_ADD("dart2", Z80DART, XTAL_4MHz) // RS232 ports
+ MCFG_DEVICE_ADD("dart2", Z80DART, XTAL(4'000'000)) // RS232 ports
- MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(dmax8000_state, port0c_w))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(dmax8000_state, port0d_w))
- MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL(4'000'000))
- MCFG_FD1793_ADD("fdc", XTAL_2MHz) // no idea
+ MCFG_FD1793_ADD("fdc", XTAL(2'000'000)) // no idea
MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(dmax8000_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", floppies, "8dsdd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/dms5000.cpp b/src/mame/drivers/dms5000.cpp
index 6bbbea7c251..1c3f6b42502 100644
--- a/src/mame/drivers/dms5000.cpp
+++ b/src/mame/drivers/dms5000.cpp
@@ -58,7 +58,7 @@ uint32_t dms5000_state::screen_update_dms5000(screen_device &screen, bitmap_ind1
MACHINE_CONFIG_START(dms5000_state::dms5000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8086, XTAL_9_8304MHz)
+ MCFG_CPU_ADD("maincpu",I8086, XTAL(9'830'400))
MCFG_CPU_PROGRAM_MAP(dms5000_mem)
MCFG_CPU_IO_MAP(dms5000_io)
diff --git a/src/mame/drivers/dms86.cpp b/src/mame/drivers/dms86.cpp
index 418e59b0bcc..f0a375392ef 100644
--- a/src/mame/drivers/dms86.cpp
+++ b/src/mame/drivers/dms86.cpp
@@ -112,19 +112,19 @@ void dms86_state::kbd_put(u8 data)
MACHINE_CONFIG_START(dms86_state::dms86)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL_14_7456MHz / 3) // according to the manual... hmm
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(14'745'600) / 3) // according to the manual... hmm
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
// According to the manual the clock is 14,765,600 / 4 but that couldn't possibly work.
// By maths, clock should be 9600*32*4*16 = 19,660,800 but not working either
// So, commented out because it makes the whole thing crawl, only get 18% on my machine
- //MCFG_DEVICE_ADD("ctc_clock", CLOCK, 19660800) //XTAL_14_7456MHz / 4)
+ //MCFG_DEVICE_ADD("ctc_clock", CLOCK, 19660800) //XTAL(14'745'600) / 4)
//MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc" ,z80ctc_device, trg0))
//MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc" ,z80ctc_device, trg1))
//MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc" ,z80ctc_device, trg2))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_14_7456MHz / 3)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(14'745'600) / 3)
//MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // frame rate interrupt to maincpu
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio1", z80sio_device, rxtxcb_w)) // SIO1 Ch B
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio1", z80sio_device, txca_w)) // SIO1 Ch A
@@ -133,7 +133,7 @@ MACHINE_CONFIG_START(dms86_state::dms86)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio2" ,z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio2" ,z80sio_device, rxca_w))
- MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL_14_7456MHz / 3)
+ MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(14'745'600) / 3)
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -143,7 +143,7 @@ MACHINE_CONFIG_START(dms86_state::dms86)
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio1", z80sio_device, dcdb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio1", z80sio_device, ctsb_w)) MCFG_DEVCB_INVERT
- MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL_14_7456MHz / 3)
+ MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL(14'745'600) / 3)
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(dms86_state, kbd_put))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp
index 5c530151fdc..a6a218c1aa5 100644
--- a/src/mame/drivers/dmv.cpp
+++ b/src/mame/drivers/dmv.cpp
@@ -715,11 +715,11 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(dmv_state::dmv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_24MHz / 6)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(24'000'000) / 6)
MCFG_CPU_PROGRAM_MAP(dmv_mem)
MCFG_CPU_IO_MAP(dmv_io)
- MCFG_CPU_ADD("kb_ctrl_mcu", I8741, XTAL_6MHz)
+ MCFG_CPU_ADD("kb_ctrl_mcu", I8741, XTAL(6'000'000))
MCFG_MCS48_PORT_P1_IN_CB(READ8(dmv_state, kb_mcu_port1_r)) // bit 0 data from kb
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(dmv_state, kb_mcu_port1_w)) // bit 1 data to kb
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(dmv_state, kb_mcu_port2_w))
@@ -740,12 +740,12 @@ MACHINE_CONFIG_START(dmv_state::dmv)
MCFG_DEFAULT_LAYOUT(layout_dmv)
// devices
- MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL_5MHz/2) // unk clock
+ MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL(5'000'000)/2) // unk clock
MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(dmv_state, hgdc_display_pixels)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(dmv_state, hgdc_draw_text)
- MCFG_DEVICE_ADD( "dma8237", AM9517A, XTAL_4MHz )
+ MCFG_DEVICE_ADD( "dma8237", AM9517A, XTAL(4'000'000) )
MCFG_I8237_OUT_HREQ_CB(WRITELINE(dmv_state, dma_hrq_changed))
MCFG_I8237_OUT_EOP_CB(WRITELINE(dmv_state, dmac_eop))
MCFG_I8237_IN_MEMR_CB(READ8(dmv_state, program_r))
@@ -769,7 +769,7 @@ MACHINE_CONFIG_START(dmv_state::dmv)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(50)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(dmv_state, pit_out0))
- MCFG_PIT8253_CLK2(XTAL_24MHz / 3 / 16)
+ MCFG_PIT8253_CLK2(XTAL(24'000'000) / 3 / 16)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(dmv_state, timint_w))
/* sound hardware */
diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp
index 19aafb9e1be..d447c0e274b 100644
--- a/src/mame/drivers/docastle.cpp
+++ b/src/mame/drivers/docastle.cpp
@@ -574,15 +574,15 @@ void docastle_state::machine_start()
MACHINE_CONFIG_START(docastle_state::docastle)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(docastle_map)
MCFG_CPU_IO_MAP(docastle_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", docastle_state, irq0_line_hold)
- MCFG_CPU_ADD("slave", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("slave", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(docastle_map2)
- MCFG_CPU_ADD("cpu3", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("cpu3", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(docastle_map3)
MCFG_CPU_VBLANK_INT_DRIVER("screen", docastle_state, nmi_line_pulse)
@@ -603,7 +603,7 @@ MACHINE_CONFIG_START(docastle_state::docastle)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_9_828MHz / 16)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(9'828'000) / 16)
/*
The games program the CRTC for a width of 32 characters (256 pixels).
However, the DE output from the CRTC is first ANDed with the NAND of
@@ -616,7 +616,7 @@ MACHINE_CONFIG_START(docastle_state::docastle)
MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(docastle_state, docastle_tint))
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_9_828MHz/2, 0x138, 8, 0x100-8, 0x108, 0, 0xc0) // from crtc
+ MCFG_SCREEN_RAW_PARAMS(XTAL(9'828'000)/2, 0x138, 8, 0x100-8, 0x108, 0, 0xc0) // from crtc
MCFG_SCREEN_UPDATE_DRIVER(docastle_state, screen_update_docastle)
MCFG_SCREEN_PALETTE("palette")
@@ -627,16 +627,16 @@ MACHINE_CONFIG_START(docastle_state::docastle)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489A, XTAL_4MHz)
+ MCFG_SOUND_ADD("sn1", SN76489A, XTAL(4'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("sn2", SN76489A, XTAL_4MHz)
+ MCFG_SOUND_ADD("sn2", SN76489A, XTAL(4'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("sn3", SN76489A, XTAL_4MHz)
+ MCFG_SOUND_ADD("sn3", SN76489A, XTAL(4'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("sn4", SN76489A, XTAL_4MHz)
+ MCFG_SOUND_ADD("sn4", SN76489A, XTAL(4'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -669,7 +669,7 @@ MACHINE_CONFIG_DERIVED(docastle_state::idsoccer, docastle)
MCFG_VIDEO_START_OVERRIDE(docastle_state,dorunrun)
/* sound hardware */
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* Crystal verified on American Soccer board. */
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) /* Crystal verified on American Soccer board. */
MCFG_MSM5205_VCLK_CB(WRITELINE(docastle_state, idsoccer_adpcm_int)) // interrupt function
MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) // 6 kHz ???
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp
index a3909d2b828..b39f1ac6cb0 100644
--- a/src/mame/drivers/dolphunk.cpp
+++ b/src/mame/drivers/dolphunk.cpp
@@ -226,7 +226,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(dauphin_state::dauphin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz)
+ MCFG_CPU_ADD("maincpu",S2650, XTAL(1'000'000))
MCFG_CPU_PROGRAM_MAP(dauphin_mem)
MCFG_CPU_IO_MAP(dauphin_io)
MCFG_S2650_SENSE_INPUT(READLINE(dauphin_state, cass_r))
diff --git a/src/mame/drivers/dominob.cpp b/src/mame/drivers/dominob.cpp
index fe64e76d69b..220184c639f 100644
--- a/src/mame/drivers/dominob.cpp
+++ b/src/mame/drivers/dominob.cpp
@@ -293,7 +293,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(dominob_state::dominob)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80,XTAL(12'000'000)/2)
MCFG_CPU_PROGRAM_MAP(memmap)
MCFG_CPU_IO_MAP(portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dominob_state, irq0_line_hold)
@@ -314,7 +314,7 @@ MACHINE_CONFIG_START(dominob_state::dominob)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_12MHz/4)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(12'000'000)/4)
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp
index a10f89a14f2..7b34db290cb 100644
--- a/src/mame/drivers/dooyong.cpp
+++ b/src/mame/drivers/dooyong.cpp
@@ -1449,12 +1449,12 @@ MACHINE_CONFIG_START(dooyong_z80_state::sound_2151)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz )
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545) )
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -1463,23 +1463,23 @@ MACHINE_CONFIG_START(dooyong_state::sound_2151_4mhz )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_16MHz/4) /* 4MHz (16MHz/4 for most, 8Mhz/2 for Super-X) */
+ MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* 4MHz (16MHz/4 for most, 8Mhz/2 for Super-X) */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* 1MHz (16MHz/16 for most, 8Mhz/8 for Super-X) */
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* 1MHz (16MHz/16 for most, 8Mhz/8 for Super-X) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* 8MHz verified for Last Day / D-day */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* 8MHz verified for Last Day / D-day */
MCFG_CPU_PROGRAM_MAP(lastday_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4MHz verified for Last Day / D-day */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4MHz verified for Last Day / D-day */
MCFG_CPU_PROGRAM_MAP(lastday_sound_map)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
@@ -1513,12 +1513,12 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_16MHz/4) /* 4MHz verified for Last Day / D-day */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(16'000'000)/4) /* 4MHz verified for Last Day / D-day */
MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_1))
MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_16MHz/4) /* 4MHz verified for Last Day / D-day */
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(16'000'000)/4) /* 4MHz verified for Last Day / D-day */
MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_2))
MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
@@ -1567,11 +1567,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dooyong_z80_ym2203_state::pollux)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* 8Mhz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* 8Mhz */
MCFG_CPU_PROGRAM_MAP(pollux_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4Mhz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4Mhz */
MCFG_CPU_PROGRAM_MAP(pollux_sound_map)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
@@ -1646,11 +1646,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dooyong_z80_state::flytiger)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* 8MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* 8MHz */
MCFG_CPU_PROGRAM_MAP(flytiger_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4Mhz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4Mhz */
MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
@@ -1685,11 +1685,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dooyong_z80_state::primella)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* 8MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* 8MHz */
MCFG_CPU_PROGRAM_MAP(primella_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4MHz */
MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
@@ -1735,10 +1735,10 @@ TIMER_DEVICE_CALLBACK_MEMBER(dooyong_68k_state::scanline)
MACHINE_CONFIG_START(rshark_state::dooyong_68k)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) // 8MHz measured on Super-X
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000)) // 8MHz measured on Super-X
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dooyong_68k_state, scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) // 4MHz measured on Super-X
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) // 4MHz measured on Super-X
MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
// video hardware
@@ -1784,11 +1784,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(popbingo_state::popbingo)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) // 10MHz measured
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) // 10MHz measured
MCFG_CPU_PROGRAM_MAP(popbingo_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dooyong_68k_state, scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) // 4MHz measured
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) // 4MHz measured
MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
// video hardware
diff --git a/src/mame/drivers/dotrikun.cpp b/src/mame/drivers/dotrikun.cpp
index 2eed5ce68c9..bdd354a425a 100644
--- a/src/mame/drivers/dotrikun.cpp
+++ b/src/mame/drivers/dotrikun.cpp
@@ -33,7 +33,7 @@ TODO:
#include "dotrikun.lh"
-#define MASTER_CLOCK XTAL_4MHz
+#define MASTER_CLOCK XTAL(4'000'000)
class dotrikun_state : public driver_device
diff --git a/src/mame/drivers/dps1.cpp b/src/mame/drivers/dps1.cpp
index e83035d8679..9d532cef5bd 100644
--- a/src/mame/drivers/dps1.cpp
+++ b/src/mame/drivers/dps1.cpp
@@ -190,7 +190,7 @@ MACHINE_CONFIG_START(dps1_state::dps1)
MCFG_MACHINE_RESET_OVERRIDE(dps1_state, dps1)
/* video hardware */
- MCFG_DEVICE_ADD("uart", MC2661, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD("uart", MC2661, XTAL(5'068'800))
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
diff --git a/src/mame/drivers/dragon.cpp b/src/mame/drivers/dragon.cpp
index a2ab8de498a..587396d1bc3 100644
--- a/src/mame/drivers/dragon.cpp
+++ b/src/mame/drivers/dragon.cpp
@@ -181,7 +181,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(dragon_state::dragon_base)
MCFG_DEVICE_MODIFY(":")
- MCFG_DEVICE_CLOCK(XTAL_14_218MHz / 16)
+ MCFG_DEVICE_CLOCK(XTAL(14'218'000) / 16)
// basic machine hardware
MCFG_CPU_ADD("maincpu", MC6809E, DERIVED_CLOCK(1, 1))
@@ -206,7 +206,7 @@ MACHINE_CONFIG_START(dragon_state::dragon_base)
MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia1_firq_a))
MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia1_firq_b))
- MCFG_SAM6883_ADD(SAM_TAG, XTAL_14_218MHz, MAINCPU_TAG, AS_PROGRAM)
+ MCFG_SAM6883_ADD(SAM_TAG, XTAL(14'218'000), MAINCPU_TAG, AS_PROGRAM)
MCFG_SAM6883_RES_CALLBACK(READ8(dragon_state, sam_read))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_FORMATS(coco_cassette_formats)
@@ -218,7 +218,7 @@ MACHINE_CONFIG_START(dragon_state::dragon_base)
// video hardware
MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, VDG_TAG)
- MCFG_DEVICE_ADD(VDG_TAG, MC6847_PAL, XTAL_4_433619MHz)
+ MCFG_DEVICE_ADD(VDG_TAG, MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(dragon_state, horizontal_sync))
MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(dragon_state, field_sync))
MCFG_MC6847_INPUT_CALLBACK(DEVREAD8(SAM_TAG, sam6883_device, display_read))
@@ -262,7 +262,7 @@ MACHINE_CONFIG_DERIVED(dragon64_state::dragon64, dragon_base)
// acia
MCFG_DEVICE_ADD("acia", MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
// software lists
MCFG_SOFTWARE_LIST_ADD("dragon_flex_list", "dragon_flex")
@@ -286,7 +286,7 @@ MACHINE_CONFIG_DERIVED(d64plus_state::d64plus, dragon64)
MCFG_PALETTE_ADD_MONOCHROME("palette")
// crtc
- MCFG_MC6845_ADD("crtc", HD6845, "plus_screen", XTAL_14_218MHz/4/2)
+ MCFG_MC6845_ADD("crtc", HD6845, "plus_screen", XTAL(14'218'000)/4/2)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(d64plus_state, crtc_update_row)
@@ -305,10 +305,10 @@ MACHINE_CONFIG_DERIVED(dragon_alpha_state::dgnalpha, dragon_base)
// acia
MCFG_DEVICE_ADD("acia", MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
// floppy
- MCFG_WD2797_ADD(WD2797_TAG, XTAL_1MHz)
+ MCFG_WD2797_ADD(WD2797_TAG, XTAL(1'000'000))
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(dragon_alpha_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(dragon_alpha_state, fdc_drq_w))
@@ -341,7 +341,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(dragon64_state::tanodr64, dragon64)
MCFG_DEVICE_MODIFY(":")
- MCFG_DEVICE_CLOCK(XTAL_14_31818MHz / 4)
+ MCFG_DEVICE_CLOCK(XTAL(14'318'181) / 4)
// video hardware
MCFG_SCREEN_MODIFY(SCREEN_TAG)
diff --git a/src/mame/drivers/dragrace.cpp b/src/mame/drivers/dragrace.cpp
index 35393d4c2d8..d1485c19125 100644
--- a/src/mame/drivers/dragrace.cpp
+++ b/src/mame/drivers/dragrace.cpp
@@ -285,7 +285,7 @@ void dragrace_state::machine_reset()
MACHINE_CONFIG_START(dragrace_state::dragrace)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 12)
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(12'096'000) / 12)
MCFG_CPU_PROGRAM_MAP(dragrace_map)
MCFG_CPU_PERIODIC_INT_DRIVER(dragrace_state, irq0_line_hold, 4*60)
diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp
index 6c6393d9914..e252560d3f6 100644
--- a/src/mame/drivers/dreamwld.cpp
+++ b/src/mame/drivers/dreamwld.cpp
@@ -797,7 +797,7 @@ void dreamwld_state::machine_reset()
MACHINE_CONFIG_START(dreamwld_state::baryon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* 16MHz verified */
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(32'000'000)/2) /* 16MHz verified */
MCFG_CPU_PROGRAM_MAP(baryon_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dreamwld_state, irq4_line_hold)
@@ -818,7 +818,7 @@ MACHINE_CONFIG_START(dreamwld_state::baryon)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", XTAL_32MHz/32, PIN7_LOW) /* 1MHz verified */
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'000'000)/32, PIN7_LOW) /* 1MHz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
@@ -832,7 +832,7 @@ MACHINE_CONFIG_DERIVED(dreamwld_state::dreamwld, baryon)
MCFG_CPU_PROGRAM_MAP(dreamwld_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dreamwld_state, irq4_line_hold)
- MCFG_OKIM6295_ADD("oki2", XTAL_32MHz/32, PIN7_LOW) /* 1MHz verified */
+ MCFG_OKIM6295_ADD("oki2", XTAL(32'000'000)/32, PIN7_LOW) /* 1MHz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
diff --git a/src/mame/drivers/drw80pkr.cpp b/src/mame/drivers/drw80pkr.cpp
index 8372cdf7f4a..f3ab82e2f88 100644
--- a/src/mame/drivers/drw80pkr.cpp
+++ b/src/mame/drivers/drw80pkr.cpp
@@ -79,7 +79,7 @@ public:
};
-#define CPU_CLOCK XTAL_8MHz
+#define CPU_CLOCK XTAL(8'000'000)
#define DATA_NVRAM_SIZE 0x100
diff --git a/src/mame/drivers/dsb46.cpp b/src/mame/drivers/dsb46.cpp
index 411e1334835..202c7952a67 100644
--- a/src/mame/drivers/dsb46.cpp
+++ b/src/mame/drivers/dsb46.cpp
@@ -105,7 +105,7 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(dsb46_state::dsb46)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000) / 6)
MCFG_CPU_PROGRAM_MAP(dsb46_mem)
MCFG_CPU_IO_MAP(dsb46_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
@@ -113,12 +113,12 @@ MACHINE_CONFIG_START(dsb46_state::dsb46)
MCFG_MACHINE_RESET_OVERRIDE(dsb46_state, dsb46)
/* video hardware */
- MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(1'843'200))
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc1", z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc1", z80ctc_device, trg2))
/* Devices */
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_24MHz / 6)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(24'000'000) / 6)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
@@ -128,7 +128,7 @@ MACHINE_CONFIG_START(dsb46_state::dsb46)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
- MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL_24MHz / 6)
+ MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(24'000'000) / 6)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
diff --git a/src/mame/drivers/dual68.cpp b/src/mame/drivers/dual68.cpp
index 9075404be4a..1e9730ea039 100644
--- a/src/mame/drivers/dual68.cpp
+++ b/src/mame/drivers/dual68.cpp
@@ -92,10 +92,10 @@ void dual68_state::kbd_put(u8 data)
MACHINE_CONFIG_START(dual68_state::dual68)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(dual68_mem)
- MCFG_CPU_ADD("siocpu", I8085A, XTAL_16MHz / 8)
+ MCFG_CPU_ADD("siocpu", I8085A, XTAL(16'000'000) / 8)
MCFG_CPU_PROGRAM_MAP(sio4_mem)
MCFG_CPU_IO_MAP(sio4_io)
diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp
index 0d312e821dd..19b8fafffe4 100644
--- a/src/mame/drivers/dvk_kcgd.cpp
+++ b/src/mame/drivers/dvk_kcgd.cpp
@@ -345,16 +345,16 @@ static GFXDECODE_START( kcgd )
GFXDECODE_END
MACHINE_CONFIG_START(kcgd_state::kcgd)
- MCFG_CPU_ADD("maincpu", K1801VM2, XTAL_30_8MHz/4)
+ MCFG_CPU_ADD("maincpu", K1801VM2, XTAL(30'800'000)/4)
MCFG_CPU_PROGRAM_MAP(kcgd_mem)
MCFG_T11_INITIAL_MODE(0100000)
MCFG_TIMER_DRIVER_ADD_PERIODIC("scantimer", kcgd_state, scanline_callback, attotime::from_hz(50*28*11)) // XXX verify
- MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL_30_8MHz/KCGD_HORZ_START))
+ MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL(30'800'000)/KCGD_HORZ_START))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_UPDATE_DRIVER(kcgd_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_30_8MHz, KCGD_TOTAL_HORZ, KCGD_HORZ_START,
+ MCFG_SCREEN_RAW_PARAMS(XTAL(30'800'000), KCGD_TOTAL_HORZ, KCGD_HORZ_START,
KCGD_HORZ_START+KCGD_DISP_HORZ, KCGD_TOTAL_VERT, KCGD_VERT_START,
KCGD_VERT_START+KCGD_DISP_VERT);
diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp
index be13554bf56..d0d60f6779f 100644
--- a/src/mame/drivers/dvk_ksm.cpp
+++ b/src/mame/drivers/dvk_ksm.cpp
@@ -412,7 +412,7 @@ static GFXDECODE_START( ksm )
GFXDECODE_END
MACHINE_CONFIG_START(ksm_state::ksm)
- MCFG_CPU_ADD("maincpu", I8080, XTAL_15_4MHz/10)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(15'400'000)/10)
MCFG_CPU_PROGRAM_MAP(ksm_mem)
MCFG_CPU_IO_MAP(ksm_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
@@ -421,7 +421,7 @@ MACHINE_CONFIG_START(ksm_state::ksm)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DRIVER(ksm_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_15_4MHz, KSM_TOTAL_HORZ, KSM_HORZ_START,
+ MCFG_SCREEN_RAW_PARAMS(XTAL(15'400'000), KSM_TOTAL_HORZ, KSM_HORZ_START,
KSM_HORZ_START+KSM_DISP_HORZ, KSM_TOTAL_VERT, KSM_VERT_START,
KSM_VERT_START+KSM_DISP_VERT);
diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp
index b24e9f2138d..cf7d25041a8 100644
--- a/src/mame/drivers/dynax.cpp
+++ b/src/mame/drivers/dynax.cpp
@@ -4185,7 +4185,7 @@ MACHINE_START_MEMBER(dynax_state,hanamai)
MACHINE_CONFIG_START(dynax_state::cdracula)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/4) /* 5.3693175MHz measured */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272)/4) /* 5.3693175MHz measured */
MCFG_CPU_PROGRAM_MAP(cdracula_mem_map)
MCFG_CPU_IO_MAP(cdracula_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dynax_state, sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
@@ -4217,7 +4217,7 @@ MACHINE_CONFIG_START(dynax_state::cdracula)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz / 4, PIN7_HIGH) /* 1MHz measured */
+ MCFG_OKIM6295_ADD("oki", XTAL(4'000'000) / 4, PIN7_HIGH) /* 1MHz measured */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -4293,7 +4293,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynax_state::hnoridur)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,XTAL_22MHz / 4) /* 5.5MHz */
+ MCFG_CPU_ADD("maincpu",Z80,XTAL(22'000'000) / 4) /* 5.5MHz */
MCFG_CPU_PROGRAM_MAP(hnoridur_mem_map)
MCFG_CPU_IO_MAP(hnoridur_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dynax_state, sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
@@ -4335,14 +4335,14 @@ MACHINE_CONFIG_START(dynax_state::hnoridur)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, XTAL_22MHz / 16)
+ MCFG_SOUND_ADD("aysnd", AY8912, XTAL(22'000'000) / 16)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW0"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(dynax_state, adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -4356,7 +4356,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynax_state::hjingi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_22MHz / 4)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(22'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(hjingi_mem_map)
MCFG_CPU_IO_MAP(hjingi_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dynax_state, sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
@@ -4400,14 +4400,14 @@ MACHINE_CONFIG_START(dynax_state::hjingi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, XTAL_22MHz / 16)
+ MCFG_SOUND_ADD("aysnd", AY8912, XTAL(22'000'000) / 16)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW0"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_3_579545MHz )
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(3'579'545) )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz )
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000) )
MCFG_MSM5205_VCLK_CB(WRITELINE(dynax_state, adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -4566,7 +4566,7 @@ MACHINE_CONFIG_DERIVED(dynax_state::yarunara, hnoridur)
MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 8, 256-1-8-1)
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(dynax_state::mjangels, yarunara)
@@ -4695,7 +4695,7 @@ MACHINE_CONFIG_START(dynax_state::jantouki)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(dynax_state::janyuki, jantouki)
@@ -4722,7 +4722,7 @@ void dynax_state::mjelctrn_update_irq()
}
MACHINE_CONFIG_DERIVED(dynax_state::mjelctrn, hnoridur)
- MCFG_CPU_REPLACE("maincpu", TMPZ84C015, XTAL_22MHz / 4)
+ MCFG_CPU_REPLACE("maincpu", TMPZ84C015, XTAL(22'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(nanajign_mem_map)
MCFG_CPU_IO_MAP(mjelctrn_io_map)
@@ -4851,7 +4851,7 @@ MACHINE_CONFIG_START(dynax_state::tenkai)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ2))
MACHINE_CONFIG_END
@@ -4873,7 +4873,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynax_state::gekisha)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",TMP90841, XTAL_10MHz ) // ?
+ MCFG_CPU_ADD("maincpu",TMP90841, XTAL(10'000'000) ) // ?
MCFG_CPU_PROGRAM_MAP(gekisha_map)
MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(dynax_state, gekisha_p4_w))
MCFG_CPU_VBLANK_INT_DRIVER("screen", dynax_state, irq0_line_hold)
@@ -4915,12 +4915,12 @@ MACHINE_CONFIG_START(dynax_state::gekisha)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_24MHz / 16) // ?
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(24'000'000) / 16) // ?
MCFG_AY8910_PORT_A_READ_CB(READ8(dynax_state, tenkai_dsw_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(dynax_state, tenkai_dswsel_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_24MHz / 8) // ?
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(24'000'000) / 8) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/e100.cpp b/src/mame/drivers/e100.cpp
index d4631266db1..18531ffa224 100644
--- a/src/mame/drivers/e100.cpp
+++ b/src/mame/drivers/e100.cpp
@@ -541,7 +541,7 @@ static INPUT_PORTS_START( e100 )
INPUT_PORTS_END
MACHINE_CONFIG_START(e100_state::e100)
- MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", M6802, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(e100_map)
/* Devices */
@@ -592,7 +592,7 @@ MACHINE_CONFIG_START(e100_state::e100)
/* screen TODO: simplify the screen config, look at zx.cpp */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_4MHz/2, 265, 0, 265, 265, 0, 265)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(4'000'000)/2, 265, 0, 265, 265, 0, 265)
MCFG_SCREEN_UPDATE_DRIVER(e100_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD_MONOCHROME("palette")
diff --git a/src/mame/drivers/eacc.cpp b/src/mame/drivers/eacc.cpp
index d4b349b808f..d420f9f66a2 100644
--- a/src/mame/drivers/eacc.cpp
+++ b/src/mame/drivers/eacc.cpp
@@ -241,7 +241,7 @@ WRITE8_MEMBER( eacc_state::eacc_digit_w )
MACHINE_CONFIG_START(eacc_state::eacc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL_3_579545MHz) /* Divided by 4 inside the m6802*/
+ MCFG_CPU_ADD("maincpu", M6802, XTAL(3'579'545)) /* Divided by 4 inside the m6802*/
MCFG_CPU_PROGRAM_MAP(eacc_mem)
MCFG_DEFAULT_LAYOUT(layout_eacc)
diff --git a/src/mame/drivers/ec65.cpp b/src/mame/drivers/ec65.cpp
index f6ddeaa94e7..b33581629b8 100644
--- a/src/mame/drivers/ec65.cpp
+++ b/src/mame/drivers/ec65.cpp
@@ -169,7 +169,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(ec65_state::ec65)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6502, XTAL_4MHz / 4)
+ MCFG_CPU_ADD("maincpu",M6502, XTAL(4'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(ec65_mem)
/* video hardware */
@@ -183,7 +183,7 @@ MACHINE_CONFIG_START(ec65_state::ec65)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ec65)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD(MC6845_TAG, MC6845, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8) /*?*/
MCFG_MC6845_UPDATE_ROW_CB(ec65_state, crtc_update_row)
@@ -193,12 +193,12 @@ MACHINE_CONFIG_START(ec65_state::ec65)
MCFG_DEVICE_ADD(ACIA6850_TAG, ACIA6850, 0)
- MCFG_DEVICE_ADD(VIA6522_0_TAG, VIA6522, XTAL_4MHz / 4)
+ MCFG_DEVICE_ADD(VIA6522_0_TAG, VIA6522, XTAL(4'000'000) / 4)
- MCFG_DEVICE_ADD(VIA6522_1_TAG, VIA6522, XTAL_4MHz / 4)
+ MCFG_DEVICE_ADD(VIA6522_1_TAG, VIA6522, XTAL(4'000'000) / 4)
MCFG_DEVICE_ADD(ACIA6551_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
MCFG_GENERIC_KEYBOARD_CB(PUT(ec65_state, kbd_put))
@@ -207,7 +207,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ec65k_state::ec65k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",G65816, XTAL_4MHz) // can use 4,2 or 1 MHz
+ MCFG_CPU_ADD("maincpu",G65816, XTAL(4'000'000)) // can use 4,2 or 1 MHz
MCFG_CPU_PROGRAM_MAP(ec65k_mem)
/* video hardware */
@@ -221,7 +221,7 @@ MACHINE_CONFIG_START(ec65k_state::ec65k)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ec65)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD(MC6845_TAG, MC6845, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8) /*?*/
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp
index c51c77533fe..86b13ce5004 100644
--- a/src/mame/drivers/einstein.cpp
+++ b/src/mame/drivers/einstein.cpp
@@ -41,8 +41,8 @@
#define VERBOSE_KEYBOARD 0
#define VERBOSE_DISK 0
-#define XTAL_X001 XTAL_10_738635MHz
-#define XTAL_X002 XTAL_8MHz
+#define XTAL_X001 XTAL(10'738'635)
+#define XTAL_X002 XTAL(8'000'000)
#define IC_I001 "i001" /* Z8400A */
#define IC_I030 "i030" /* AY-3-8910 */
@@ -609,7 +609,7 @@ MACHINE_CONFIG_START(einstein_state::einstein)
MCFG_Z80DAISY_GENERIC_INT_CB(WRITELINE(einstein_state, int_w<4>))
/* video hardware */
- MCFG_DEVICE_ADD("vdp", TMS9129, XTAL_10_738635MHz / 2)
+ MCFG_DEVICE_ADD("vdp", TMS9129, XTAL(10'738'635) / 2)
MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k RAM, provided by IC i040 and i041
MCFG_TMS9928A_SET_SCREEN("screen")
MCFG_TMS9928A_SCREEN_ADD_PAL("screen")
diff --git a/src/mame/drivers/electron.cpp b/src/mame/drivers/electron.cpp
index c3d344e53ce..40cb9d437e0 100644
--- a/src/mame/drivers/electron.cpp
+++ b/src/mame/drivers/electron.cpp
@@ -198,7 +198,7 @@ static INPUT_PORTS_START( electron )
INPUT_PORTS_END
MACHINE_CONFIG_START(electron_state::electron)
- MCFG_CPU_ADD( "maincpu", M6502, XTAL_16MHz/8 )
+ MCFG_CPU_ADD( "maincpu", M6502, XTAL(16'000'000)/8 )
MCFG_CPU_PROGRAM_MAP( electron_mem )
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/elekscmp.cpp b/src/mame/drivers/elekscmp.cpp
index c2055e2138d..4ab1821c71a 100644
--- a/src/mame/drivers/elekscmp.cpp
+++ b/src/mame/drivers/elekscmp.cpp
@@ -143,7 +143,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(elekscmp_state::elekscmp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",INS8060, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",INS8060, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
/* video hardware */
diff --git a/src/mame/drivers/elektronmono.cpp b/src/mame/drivers/elektronmono.cpp
index 6c3eda98887..44869b5bcd9 100644
--- a/src/mame/drivers/elektronmono.cpp
+++ b/src/mame/drivers/elektronmono.cpp
@@ -152,7 +152,7 @@ static ADDRESS_MAP_START( elektron_map, AS_PROGRAM, 32, elekmono_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(elekmono_state::elektron)
- MCFG_CPU_ADD("maincpu", MCF5206E, XTAL_25_447MHz)
+ MCFG_CPU_ADD("maincpu", MCF5206E, XTAL(25'447'000))
MCFG_CPU_PROGRAM_MAP(elektron_map)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp
index 33116a74ceb..d1035f144c4 100644
--- a/src/mame/drivers/elf.cpp
+++ b/src/mame/drivers/elf.cpp
@@ -232,7 +232,7 @@ QUICKLOAD_LOAD_MEMBER( elf2_state, elf )
MACHINE_CONFIG_START(elf2_state::elf2)
/* basic machine hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_3_579545MHz/2)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(3'579'545)/2)
MCFG_CPU_PROGRAM_MAP(elf2_mem)
MCFG_CPU_IO_MAP(elf2_io)
MCFG_COSMAC_WAIT_CALLBACK(READLINE(elf2_state, wait_r))
@@ -246,11 +246,11 @@ MACHINE_CONFIG_START(elf2_state::elf2)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_elf2)
- MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL_3_579545MHz/2)
+ MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL(3'579'545)/2)
MCFG_CDP1861_IRQ_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT))
MCFG_CDP1861_DMA_OUT_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT))
MCFG_CDP1861_EFX_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1))
- MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL_3_579545MHz/2)
+ MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL(3'579'545)/2)
/* devices */
MCFG_DEVICE_ADD(MM74C923_TAG, MM74C923, 0)
diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp
index dd5c939c3f7..22305603d67 100644
--- a/src/mame/drivers/eolith.cpp
+++ b/src/mame/drivers/eolith.cpp
@@ -550,7 +550,7 @@ MACHINE_CONFIG_START(eolith_state::eolith45)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", eolith_state, eolith_speedup, "screen", 0, 1)
/* Sound CPU */
- MCFG_CPU_ADD("soundcpu", I8032, XTAL_12MHz)
+ MCFG_CPU_ADD("soundcpu", I8032, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(sound_prg_map)
MCFG_CPU_IO_MAP(sound_io_map)
MCFG_MCS51_SERIAL_TX_CB(WRITE8(eolith_state, soundcpu_to_qs1000)) // Sound CPU -> QS1000 CPU serial link
@@ -581,7 +581,7 @@ MACHINE_CONFIG_START(eolith_state::eolith45)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("qs1000", QS1000, XTAL_24MHz)
+ MCFG_SOUND_ADD("qs1000", QS1000, XTAL(24'000'000))
MCFG_QS1000_EXTERNAL_ROM(true)
MCFG_QS1000_IN_P1_CB(READ8(eolith_state, qs1000_p1_r))
MCFG_QS1000_OUT_P1_CB(WRITE8(eolith_state, qs1000_p1_w))
diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp
index 3d30ade7a66..49f007af9e9 100644
--- a/src/mame/drivers/ep64.cpp
+++ b/src/mame/drivers/ep64.cpp
@@ -560,16 +560,16 @@ void ep64_state::machine_reset()
MACHINE_CONFIG_START(ep64_state::ep64)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(ep64_mem)
MCFG_CPU_IO_MAP(ep64_io)
// video hardware
- MCFG_NICK_ADD(NICK_TAG, SCREEN_TAG, XTAL_8MHz)
+ MCFG_NICK_ADD(NICK_TAG, SCREEN_TAG, XTAL(8'000'000))
MCFG_NICK_VIRQ_CALLBACK(DEVWRITELINE(DAVE_TAG, dave_device, int1_w))
// sound hardware
- MCFG_DAVE_ADD(DAVE_TAG, XTAL_8MHz, dave_64k_mem, dave_io)
+ MCFG_DAVE_ADD(DAVE_TAG, XTAL(8'000'000), dave_64k_mem, dave_io)
MCFG_DAVE_IRQ_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
// devices
diff --git a/src/mame/drivers/epos.cpp b/src/mame/drivers/epos.cpp
index 0c3e279a17a..9ba4f64b3e6 100644
--- a/src/mame/drivers/epos.cpp
+++ b/src/mame/drivers/epos.cpp
@@ -456,7 +456,7 @@ MACHINE_START_MEMBER(epos_state,dealer)
MACHINE_CONFIG_START(epos_state::epos) /* EPOS TRISTAR 8000 PCB */
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_11MHz/4) /* 2.75 MHz schematics confirm 11MHz XTAL (see notes) */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(11'000'000)/4) /* 2.75 MHz schematics confirm 11MHz XTAL (see notes) */
MCFG_CPU_PROGRAM_MAP(epos_map)
MCFG_CPU_IO_MAP(epos_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", epos_state, irq0_line_hold)
@@ -476,7 +476,7 @@ MACHINE_CONFIG_START(epos_state::epos) /* EPOS TRISTAR 8000 PCB */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, XTAL_11MHz/16) /* 0.6875 MHz, confirmed from schematics */
+ MCFG_SOUND_ADD("aysnd", AY8912, XTAL(11'000'000)/16) /* 0.6875 MHz, confirmed from schematics */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -484,7 +484,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(epos_state::dealer) /* EPOS TRISTAR 9000 PCB */
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_22_1184MHz/8) /* 2.7648 MHz (measured) */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(22'118'400)/8) /* 2.7648 MHz (measured) */
MCFG_CPU_PROGRAM_MAP(dealer_map)
MCFG_CPU_IO_MAP(dealer_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", epos_state, irq0_line_hold)
@@ -513,7 +513,7 @@ MACHINE_CONFIG_START(epos_state::dealer) /* EPOS TRISTAR 9000 PCB */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_22_1184MHz/32) /* 0.6912 MHz (measured) */
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(22'118'400)/32) /* 0.6912 MHz (measured) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_AY8910_PORT_A_READ_CB(READ8(epos_state, ay_porta_mpx_r))
// port a writes?
diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp
index cf1c2dfb292..bc9d738a669 100644
--- a/src/mame/drivers/equites.cpp
+++ b/src/mame/drivers/equites.cpp
@@ -1030,7 +1030,7 @@ static const char *const alphamc07_sample_names[] =
// the sound board is the same in all games
MACHINE_CONFIG_START(equites_state::common_sound)
- MCFG_CPU_ADD("audiocpu", I8085A, XTAL_6_144MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", I8085A, XTAL(6'144'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_portmap)
MCFG_I8085A_CLK_OUT_DEVICE("audio8155")
@@ -1061,7 +1061,7 @@ MACHINE_CONFIG_START(equites_state::common_sound)
MCFG_SOUND_ROUTE(9, "speaker", 1.0) // pin 2 SOLO 16' (this actually feeds an analog section)
MCFG_SOUND_ROUTE(10,"speaker", 0.12) // pin 22 Noise Output (this actually feeds an analog section)
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_6_144MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(6'144'000)/4) /* verified on pcb */
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(equites_state, equites_8910porta_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(equites_state, equites_8910portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
@@ -1130,7 +1130,7 @@ void equites_state::machine_reset()
MACHINE_CONFIG_START(equites_state::equites)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz/4) /* 68000P8 running at 3mhz! verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)/4) /* 68000P8 running at 3mhz! verified on pcb */
MCFG_CPU_PROGRAM_MAP(equites_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", equites_state, equites_scanline, "screen", 0, 1)
@@ -1180,7 +1180,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(equites_state::splndrbt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 68000P8 running at 6mhz, verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* 68000P8 running at 6mhz, verified on pcb */
MCFG_CPU_PROGRAM_MAP(splndrbt_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", equites_state, splndrbt_scanline, "screen", 0, 1)
diff --git a/src/mame/drivers/ertictac.cpp b/src/mame/drivers/ertictac.cpp
index efb215aa506..08e4c2dfcc4 100644
--- a/src/mame/drivers/ertictac.cpp
+++ b/src/mame/drivers/ertictac.cpp
@@ -221,17 +221,17 @@ INTERRUPT_GEN_MEMBER(ertictac_state::ertictac_podule_irq)
MACHINE_CONFIG_START(ertictac_state::ertictac)
- MCFG_CPU_ADD("maincpu", ARM, XTAL_24MHz/3) /* guess, 12MHz 8MHz or 6MHz, what's the correct divider 2, 3 or 4? */
+ MCFG_CPU_ADD("maincpu", ARM, XTAL(24'000'000)/3) /* guess, 12MHz 8MHz or 6MHz, what's the correct divider 2, 3 or 4? */
MCFG_CPU_PROGRAM_MAP(ertictac_map)
MCFG_CPU_PERIODIC_INT_DRIVER(ertictac_state, ertictac_podule_irq, 60) // FIXME: timing of this
MCFG_I2CMEM_ADD("i2cmem")
MCFG_I2CMEM_PAGE_SIZE(NVRAM_PAGE_SIZE)
MCFG_I2CMEM_DATA_SIZE(NVRAM_SIZE)
-// MCFG_AAKART_ADD("kart", XTAL_24MHz/3) // TODO: frequency
+// MCFG_AAKART_ADD("kart", XTAL(24'000'000)/3) // TODO: frequency
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz,1024,0,735,624/2,0,292) // RiscOS 3 default screen settings
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000),1024,0,735,624/2,0,292) // RiscOS 3 default screen settings
MCFG_SCREEN_UPDATE_DRIVER(archimedes_state, screen_update)
MCFG_PALETTE_ADD("palette", 0x200)
diff --git a/src/mame/drivers/esd16.cpp b/src/mame/drivers/esd16.cpp
index 870370d1687..a1b4f154952 100644
--- a/src/mame/drivers/esd16.cpp
+++ b/src/mame/drivers/esd16.cpp
@@ -608,11 +608,11 @@ DECOSPR_PRIORITY_CB_MEMBER(esd16_state::hedpanic_pri_callback)
MACHINE_CONFIG_START(esd16_state::esd16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL_16MHz) /* 16MHz */
+ MCFG_CPU_ADD("maincpu",M68000, XTAL(16'000'000)) /* 16MHz */
MCFG_CPU_PROGRAM_MAP(multchmp_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", esd16_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4MHz */
MCFG_CPU_PROGRAM_MAP(multchmp_sound_map)
MCFG_CPU_IO_MAP(multchmp_sound_io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(esd16_state, nmi_line_pulse, 32*60) /* IRQ By Main CPU */
@@ -644,10 +644,10 @@ MACHINE_CONFIG_START(esd16_state::esd16)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_16MHz/4) /* 4MHz */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(16'000'000)/4) /* 4MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* 1MHz */
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* 1MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -660,14 +660,14 @@ MACHINE_CONFIG_DERIVED(esd16_state::jumppop, esd16)
MCFG_CPU_PROGRAM_MAP(jumppop_map)
MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_CLOCK( XTAL_14MHz/4) /* 3.5MHz - Verified */
+ MCFG_CPU_CLOCK( XTAL(14'000'000)/4) /* 3.5MHz - Verified */
MCFG_GFXDECODE_MODIFY("gfxdecode", jumppop)
- MCFG_SOUND_REPLACE("ymsnd", YM3812, XTAL_14MHz/4) /* 3.5MHz - Verified */
+ MCFG_SOUND_REPLACE("ymsnd", YM3812, XTAL(14'000'000)/4) /* 3.5MHz - Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_REPLACE("oki", XTAL_14MHz/16, PIN7_HIGH) /* 875kHz - Verified */
+ MCFG_OKIM6295_REPLACE("oki", XTAL(14'000'000)/16, PIN7_HIGH) /* 875kHz - Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/esq1.cpp b/src/mame/drivers/esq1.cpp
index d0cf83f5ed6..194f927dcdd 100644
--- a/src/mame/drivers/esq1.cpp
+++ b/src/mame/drivers/esq1.cpp
@@ -582,11 +582,11 @@ INPUT_CHANGED_MEMBER(esq1_state::key_stroke)
}
MACHINE_CONFIG_START(esq1_state::esq1)
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_8MHz) // XTAL not directly attached to CPU
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(8'000'000)) // XTAL not directly attached to CPU
MCFG_CPU_PROGRAM_MAP(esq1_map)
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_8MHz / 2)
- MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL_8MHz / 16, XTAL_8MHz / 16, XTAL_8MHz / 8, XTAL_8MHz / 8)
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(8'000'000) / 2)
+ MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL(8'000'000) / 16, XTAL(8'000'000) / 16, XTAL(8'000'000) / 8, XTAL(8'000'000) / 8)
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_MC68681_A_TX_CALLBACK(WRITELINE(esq1_state, duart_tx_a))
MCFG_MC68681_B_TX_CALLBACK(WRITELINE(esq1_state, duart_tx_b))
@@ -606,7 +606,7 @@ MACHINE_CONFIG_START(esq1_state::esq1)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_ES5503_ADD("es5503", XTAL_8MHz)
+ MCFG_ES5503_ADD("es5503", XTAL(8'000'000))
MCFG_ES5503_OUTPUT_CHANNELS(8)
MCFG_ES5503_IRQ_FUNC(WRITELINE(esq1_state, esq1_doc_irq))
MCFG_ES5503_ADC_FUNC(READ8(esq1_state, esq1_adc_read))
diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp
index 281ff3262cb..0fa9a89d971 100644
--- a/src/mame/drivers/esq5505.cpp
+++ b/src/mame/drivers/esq5505.cpp
@@ -610,11 +610,11 @@ INPUT_CHANGED_MEMBER(esq5505_state::key_stroke)
#endif
MACHINE_CONFIG_START(esq5505_state::vfx)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(vfx_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(esq5505_state,maincpu_irq_acknowledge_callback)
- MCFG_CPU_ADD("esp", ES5510, XTAL_10MHz)
+ MCFG_CPU_ADD("esp", ES5510, XTAL(10'000'000))
MCFG_DEVICE_DISABLE()
MCFG_ESQPANEL2X40_VFX_ADD("panel")
@@ -635,11 +635,11 @@ MACHINE_CONFIG_START(esq5505_state::vfx)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("pump", ESQ_5505_5510_PUMP, XTAL_10MHz / (16 * 21))
+ MCFG_SOUND_ADD("pump", ESQ_5505_5510_PUMP, XTAL(10'000'000) / (16 * 21))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("otis", ES5505, XTAL_10MHz)
+ MCFG_SOUND_ADD("otis", ES5505, XTAL(10'000'000))
MCFG_ES5505_REGION0("waverom") /* Bank 0 */
MCFG_ES5505_REGION1("waverom2") /* Bank 1 */
MCFG_ES5505_CHANNELS(4) /* channels */
@@ -687,11 +687,11 @@ MACHINE_CONFIG_END
// 32-voice machines with the VFX-SD type config
MACHINE_CONFIG_START(esq5505_state::vfx32)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_30_4761MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(30'476'100) / 2)
MCFG_CPU_PROGRAM_MAP(vfxsd_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(esq5505_state,maincpu_irq_acknowledge_callback)
- MCFG_CPU_ADD("esp", ES5510, XTAL_10MHz)
+ MCFG_CPU_ADD("esp", ES5510, XTAL(10'000'000))
MCFG_DEVICE_DISABLE()
MCFG_ESQPANEL2X40_VFX_ADD("panel")
@@ -712,11 +712,11 @@ MACHINE_CONFIG_START(esq5505_state::vfx32)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("pump", ESQ_5505_5510_PUMP, XTAL_30_4761MHz / (2 * 16 * 32))
+ MCFG_SOUND_ADD("pump", ESQ_5505_5510_PUMP, XTAL(30'476'100) / (2 * 16 * 32))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("otis", ES5505, XTAL_30_4761MHz / 2)
+ MCFG_SOUND_ADD("otis", ES5505, XTAL(30'476'100) / 2)
MCFG_ES5505_REGION0("waverom") /* Bank 0 */
MCFG_ES5505_REGION1("waverom2") /* Bank 1 */
MCFG_ES5505_CHANNELS(4) /* channels */
diff --git a/src/mame/drivers/esqasr.cpp b/src/mame/drivers/esqasr.cpp
index 87ced9c65be..3ed482cf3a4 100644
--- a/src/mame/drivers/esqasr.cpp
+++ b/src/mame/drivers/esqasr.cpp
@@ -96,16 +96,16 @@ READ16_MEMBER(esqasr_state::esq5506_read_adc)
}
MACHINE_CONFIG_START(esqasr_state::asr)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // actually MC68302
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) // actually MC68302
MCFG_CPU_PROGRAM_MAP(asr_map)
- MCFG_CPU_ADD("esp", ES5510, XTAL_10MHz)
+ MCFG_CPU_ADD("esp", ES5510, XTAL(10'000'000))
MCFG_DEVICE_DISABLE()
MCFG_ESQ2X40_SQ1_ADD("sq1vfd")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ensoniq", ES5506, XTAL_16MHz)
+ MCFG_SOUND_ADD("ensoniq", ES5506, XTAL(16'000'000))
MCFG_ES5506_REGION0("waverom") /* Bank 0 */
MCFG_ES5506_REGION1("waverom2") /* Bank 1 */
MCFG_ES5506_REGION2("waverom3") /* Bank 0 */
@@ -118,16 +118,16 @@ MACHINE_CONFIG_START(esqasr_state::asr)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(esqasr_state::asrx)
- MCFG_CPU_ADD("maincpu", M68020, XTAL_16MHz) // unknown, possibly 68340?
+ MCFG_CPU_ADD("maincpu", M68020, XTAL(16'000'000)) // unknown, possibly 68340?
MCFG_CPU_PROGRAM_MAP(asrx_map)
- MCFG_CPU_ADD("esp", ES5510, XTAL_10MHz)
+ MCFG_CPU_ADD("esp", ES5510, XTAL(10'000'000))
MCFG_DEVICE_DISABLE()
MCFG_ESQ2X40_SQ1_ADD("sq1vfd")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ensoniq", ES5506, XTAL_16MHz)
+ MCFG_SOUND_ADD("ensoniq", ES5506, XTAL(16'000'000))
MCFG_ES5506_REGION0("waverom") /* Bank 0 */
MCFG_ES5506_REGION1("waverom2") /* Bank 1 */
MCFG_ES5506_REGION2("waverom3") /* Bank 0 */
diff --git a/src/mame/drivers/esqkt.cpp b/src/mame/drivers/esqkt.cpp
index b07298d716f..db8a4ed29df 100644
--- a/src/mame/drivers/esqkt.cpp
+++ b/src/mame/drivers/esqkt.cpp
@@ -203,10 +203,10 @@ WRITE_LINE_MEMBER(esqkt_state::duart_tx_b)
}
MACHINE_CONFIG_START(esqkt_state::kt)
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(kt_map)
- MCFG_CPU_ADD("esp", ES5510, XTAL_10MHz)
+ MCFG_CPU_ADD("esp", ES5510, XTAL(10'000'000))
MCFG_DEVICE_DISABLE()
MCFG_ESQPANEL2X16_SQ1_ADD("sq1panel")
@@ -226,7 +226,7 @@ MACHINE_CONFIG_START(esqkt_state::kt)
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ensoniq", ES5506, XTAL_16MHz)
+ MCFG_SOUND_ADD("ensoniq", ES5506, XTAL(16'000'000))
MCFG_ES5506_REGION0("waverom") /* Bank 0 */
MCFG_ES5506_REGION1("waverom2") /* Bank 1 */
MCFG_ES5506_REGION2("waverom3") /* Bank 0 */
@@ -236,7 +236,7 @@ MACHINE_CONFIG_START(esqkt_state::kt)
MCFG_ES5506_READ_PORT_CB(READ16(esqkt_state, esq5506_read_adc))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
- MCFG_SOUND_ADD("ensoniq2", ES5506, XTAL_16MHz)
+ MCFG_SOUND_ADD("ensoniq2", ES5506, XTAL(16'000'000))
MCFG_ES5506_REGION0("waverom") /* Bank 0 */
MCFG_ES5506_REGION1("waverom2") /* Bank 1 */
MCFG_ES5506_REGION2("waverom3") /* Bank 0 */
diff --git a/src/mame/drivers/esqmr.cpp b/src/mame/drivers/esqmr.cpp
index 84a328879f3..1593fe49f13 100644
--- a/src/mame/drivers/esqmr.cpp
+++ b/src/mame/drivers/esqmr.cpp
@@ -250,13 +250,13 @@ READ16_MEMBER(esqmr_state::esq5506_read_adc)
}
MACHINE_CONFIG_START(esqmr_state::mr)
- MCFG_CPU_ADD("maincpu", M68340, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68340, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(mr_map)
MCFG_ESQ2X40_SQ1_ADD("sq1vfd")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ensoniq", ES5506, XTAL_16MHz)
+ MCFG_SOUND_ADD("ensoniq", ES5506, XTAL(16'000'000))
MCFG_ES5506_REGION0("waverom") /* Bank 0 */
MCFG_ES5506_REGION1("waverom2") /* Bank 1 */
MCFG_ES5506_REGION2("waverom3") /* Bank 0 */
@@ -266,7 +266,7 @@ MACHINE_CONFIG_START(esqmr_state::mr)
MCFG_ES5506_READ_PORT_CB(READ16(esqmr_state, esq5506_read_adc))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
- MCFG_SOUND_ADD("ensoniq2", ES5506, XTAL_16MHz)
+ MCFG_SOUND_ADD("ensoniq2", ES5506, XTAL(16'000'000))
MCFG_ES5506_REGION0("waverom") /* Bank 0 */
MCFG_ES5506_REGION1("waverom2") /* Bank 1 */
MCFG_ES5506_REGION2("waverom3") /* Bank 0 */
diff --git a/src/mame/drivers/esripsys.cpp b/src/mame/drivers/esripsys.cpp
index 748e3befd0c..d00929c3074 100644
--- a/src/mame/drivers/esripsys.cpp
+++ b/src/mame/drivers/esripsys.cpp
@@ -661,15 +661,15 @@ DRIVER_INIT_MEMBER(esripsys_state,esripsys)
}
MACHINE_CONFIG_START(esripsys_state::esripsys)
- MCFG_CPU_ADD("game_cpu", MC6809E, XTAL_8MHz / 4)
+ MCFG_CPU_ADD("game_cpu", MC6809E, XTAL(8'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(game_cpu_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", esripsys_state, esripsys_vblank_irq)
MCFG_QUANTUM_PERFECT_CPU("game_cpu")
- MCFG_CPU_ADD("frame_cpu", MC6809E, XTAL_8MHz / 4)
+ MCFG_CPU_ADD("frame_cpu", MC6809E, XTAL(8'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(frame_cpu_map)
- MCFG_CPU_ADD("video_cpu", ESRIP, XTAL_40MHz / 4)
+ MCFG_CPU_ADD("video_cpu", ESRIP, XTAL(40'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(video_cpu_map)
MCFG_ESRIP_FDT_R_CALLBACK(READ16(esripsys_state, fdt_rip_r))
MCFG_ESRIP_FDT_W_CALLBACK(WRITE16(esripsys_state, fdt_rip_w))
@@ -677,7 +677,7 @@ MACHINE_CONFIG_START(esripsys_state::esripsys)
MCFG_ESRIP_DRAW_CALLBACK_OWNER(esripsys_state, esripsys_draw)
MCFG_ESRIP_LBRM_PROM("proms")
- MCFG_CPU_ADD("sound_cpu", MC6809E, XTAL_8MHz / 4)
+ MCFG_CPU_ADD("sound_cpu", MC6809E, XTAL(8'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(sound_cpu_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -701,7 +701,7 @@ MACHINE_CONFIG_START(esripsys_state::esripsys)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
/* 6840 PTM */
- MCFG_DEVICE_ADD("6840ptm", PTM6840, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD("6840ptm", PTM6840, XTAL(8'000'000) / 4)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
MCFG_PTM6840_IRQ_CB(WRITELINE(esripsys_state, ptm_irq))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp
index fbd3b5530c0..91ec6e087a4 100644
--- a/src/mame/drivers/et3400.cpp
+++ b/src/mame/drivers/et3400.cpp
@@ -206,7 +206,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(et3400_state::et3400)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_4MHz / 4 ) // 1MHz with memory i/o accessory, or 500khz without it
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(4'000'000) / 4 ) // 1MHz with memory i/o accessory, or 500khz without it
MCFG_CPU_PROGRAM_MAP(mem_map)
/* video hardware */
diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp
index 45b0760713f..d22c6afe2a0 100644
--- a/src/mame/drivers/eti660.cpp
+++ b/src/mame/drivers/eti660.cpp
@@ -304,7 +304,7 @@ QUICKLOAD_LOAD_MEMBER( eti660_state, eti660 )
MACHINE_CONFIG_START(eti660_state::eti660)
/* basic machine hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_8_867238MHz/5)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(8'867'238)/5)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
@@ -315,12 +315,12 @@ MACHINE_CONFIG_START(eti660_state::eti660)
MCFG_COSMAC_DMAW_CALLBACK(WRITE8(eti660_state, dma_w))
/* video hardware */
- MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL_8_867238MHz/5)
+ MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL(8'867'238)/5)
MCFG_SCREEN_UPDATE_DEVICE(CDP1864_TAG, cdp1864_device, screen_update)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL_8_867238MHz/5, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(eti660_state, rdata_r), READLINE(eti660_state, bdata_r), READLINE(eti660_state, gdata_r))
+ MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(8'867'238)/5, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(eti660_state, rdata_r), READLINE(eti660_state, bdata_r), READLINE(eti660_state, gdata_r))
MCFG_CDP1864_CHROMINANCE(RES_K(2.2), RES_K(1), RES_K(4.7), RES_K(4.7)) // R7, R5, R6, R4
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/eurocom2.cpp b/src/mame/drivers/eurocom2.cpp
index e3927672831..701184c75d1 100644
--- a/src/mame/drivers/eurocom2.cpp
+++ b/src/mame/drivers/eurocom2.cpp
@@ -429,11 +429,11 @@ static SLOT_INTERFACE_START( eurocom_floppies )
SLOT_INTERFACE_END
MACHINE_CONFIG_START(eurocom2_state::eurocom2)
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_10_7172MHz/2) // EXTAL = CLK/2 = 5.3586 MHz; Q = E = 1.33965 MHz
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(10'717'200)/2) // EXTAL = CLK/2 = 5.3586 MHz; Q = E = 1.33965 MHz
MCFG_CPU_PROGRAM_MAP(eurocom2_map)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS(XTAL_10_7172MHz, VC_TOTAL_HORZ, 0, VC_DISP_HORZ, VC_TOTAL_VERT, 0, VC_DISP_VERT)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(10'717'200), VC_TOTAL_HORZ, 0, VC_DISP_HORZ, VC_TOTAL_VERT, 0, VC_DISP_VERT)
MCFG_SCREEN_UPDATE_DRIVER(eurocom2_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -463,7 +463,7 @@ MACHINE_CONFIG_START(eurocom2_state::eurocom2)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE ("acia", acia6850_device, write_rxd))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE ("acia", acia6850_device, write_cts))
- MCFG_FD1793_ADD("fdc", XTAL_2MHz/2)
+ MCFG_FD1793_ADD("fdc", XTAL(2'000'000)/2)
// MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", eurocom_floppies, "525qd", eurocom2_state::floppy_formats)
// MCFG_FLOPPY_DRIVE_SOUND(true)
diff --git a/src/mame/drivers/eva.cpp b/src/mame/drivers/eva.cpp
index 3952cab8115..71eb8aa8f80 100644
--- a/src/mame/drivers/eva.cpp
+++ b/src/mame/drivers/eva.cpp
@@ -172,33 +172,33 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(eva_state::eva24)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP420, XTAL_640kHz/2) // guessed
+ MCFG_CPU_ADD("maincpu", COP420, XTAL(640'000)/2) // guessed
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_4, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
MCFG_COP400_WRITE_D_CB(WRITE8(eva_state, eva24_write_d))
MCFG_COP400_WRITE_G_CB(WRITE8(eva_state, eva24_write_g))
MCFG_COP400_READ_G_CB(READ8(eva_state, eva24_read_g))
/* sound hardware */
- MCFG_DEVICE_ADD("tms6100", TMS6100, XTAL_640kHz/4)
+ MCFG_DEVICE_ADD("tms6100", TMS6100, XTAL(640'000)/4)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("tms5100", TMS5110A, XTAL_640kHz)
+ MCFG_SOUND_ADD("tms5100", TMS5110A, XTAL(640'000))
MCFG_FRAGMENT_ADD(tms5110_route)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(eva_state::eva11)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, XTAL_640kHz/2) // from TMS5110A CPU CK
+ MCFG_CPU_ADD("maincpu", TMS1000, XTAL(640'000)/2) // from TMS5110A CPU CK
MCFG_TMS1XXX_READ_K_CB(READ8(eva_state, eva11_read_k))
MCFG_TMS1XXX_WRITE_O_CB(WRITE16(eva_state, eva11_write_o))
MCFG_TMS1XXX_WRITE_R_CB(WRITE16(eva_state, eva11_write_r))
/* sound hardware */
- MCFG_DEVICE_ADD("tms6100", TMS6100, XTAL_640kHz/4)
+ MCFG_DEVICE_ADD("tms6100", TMS6100, XTAL(640'000)/4)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("tms5100", TMS5110A, XTAL_640kHz)
+ MCFG_SOUND_ADD("tms5100", TMS5110A, XTAL(640'000))
MCFG_FRAGMENT_ADD(tms5110_route)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/evmbug.cpp b/src/mame/drivers/evmbug.cpp
index 3875de6a7cc..5b2472f3b39 100644
--- a/src/mame/drivers/evmbug.cpp
+++ b/src/mame/drivers/evmbug.cpp
@@ -112,13 +112,13 @@ MACHINE_CONFIG_START(evmbug_state::evmbug)
// basic machine hardware
// TMS9995 CPU @ 12.0 MHz
// We have no lines connected yet
- MCFG_TMS99xx_ADD("maincpu", TMS9995, XTAL_12MHz, mem_map, io_map )
+ MCFG_TMS99xx_ADD("maincpu", TMS9995, XTAL(12'000'000), mem_map, io_map )
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(evmbug_state, kbd_put))
- //MCFG_DEVICE_ADD("uart1", TMS9902, XTAL_12MHz / 4)
+ //MCFG_DEVICE_ADD("uart1", TMS9902, XTAL(12'000'000) / 4)
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp
index 3a0d54bf4f7..afe1fcdfd5a 100644
--- a/src/mame/drivers/excali64.cpp
+++ b/src/mame/drivers/excali64.cpp
@@ -546,7 +546,7 @@ MC6845_UPDATE_ROW( excali64_state::update_row )
MACHINE_CONFIG_START(excali64_state::excali64)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
@@ -557,11 +557,11 @@ MACHINE_CONFIG_START(excali64_state::excali64)
//MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
MCFG_DEVICE_ADD("pit", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_16MHz / 16) /* Timer 0: tone gen for speaker */
+ MCFG_PIT8253_CLK0(XTAL(16'000'000) / 16) /* Timer 0: tone gen for speaker */
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w))
- //MCFG_PIT8253_CLK1(XTAL_16MHz / 16) /* Timer 1: baud rate gen for 8251 */
+ //MCFG_PIT8253_CLK1(XTAL(16'000'000) / 16) /* Timer 1: baud rate gen for 8251 */
//MCFG_PIT8253_OUT1_HANDLER(WRITELINE(excali64_state, write_uart_clock))
- //MCFG_PIT8253_CLK2(XTAL_16MHz / 16) /* Timer 2: not used */
+ //MCFG_PIT8253_CLK2(XTAL(16'000'000) / 16) /* Timer 2: not used */
MCFG_DEVICE_ADD("ppi", I8255A, 0 )
MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write)) // parallel port
@@ -586,7 +586,7 @@ MACHINE_CONFIG_START(excali64_state::excali64)
MCFG_PALETTE_ADD("palette", 40)
MCFG_PALETTE_INIT_OWNER(excali64_state, excali64)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", excali64)
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_16MHz / 16) // 1MHz for lowres; 2MHz for highres
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(16'000'000) / 16) // 1MHz for lowres; 2MHz for highres
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(excali64_state, update_row)
@@ -596,14 +596,14 @@ MACHINE_CONFIG_START(excali64_state::excali64)
/* Devices */
MCFG_CASSETTE_ADD( "cassette" )
- MCFG_WD2793_ADD("fdc", XTAL_16MHz / 16)
+ MCFG_WD2793_ADD("fdc", XTAL(16'000'000) / 16)
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", excali64_floppies, "525qd", excali64_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", excali64_floppies, "525qd", excali64_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
- MCFG_DEVICE_ADD("dma", Z80DMA, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000)/4)
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(excali64_state, busreq_w))
MCFG_Z80DMA_IN_MREQ_CB(READ8(excali64_state, memory_read_byte))
MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(excali64_state, memory_write_byte))
diff --git a/src/mame/drivers/exelv.cpp b/src/mame/drivers/exelv.cpp
index 883db3b67b7..13a9e485861 100644
--- a/src/mame/drivers/exelv.cpp
+++ b/src/mame/drivers/exelv.cpp
@@ -478,7 +478,7 @@ MACHINE_START_MEMBER( exelv_state, exeltel)
MACHINE_CONFIG_START(exelv_state::exl100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS7020_EXL, XTAL_4_9152MHz)
+ MCFG_CPU_ADD("maincpu", TMS7020_EXL, XTAL(4'915'200))
MCFG_CPU_PROGRAM_MAP(tms7020_mem)
MCFG_TMS7000_IN_PORTA_CB(READ8(exelv_state, tms7020_porta_r))
MCFG_TMS7000_OUT_PORTB_CB(WRITE8(exelv_state, tms7020_portb_w))
@@ -486,7 +486,7 @@ MACHINE_CONFIG_START(exelv_state::exl100)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", exelv_state, exelv_hblank_interrupt, "screen", 0, 1)
MCFG_MACHINE_START_OVERRIDE(exelv_state, exl100)
- MCFG_CPU_ADD("tms7041", TMS7041, XTAL_4_9152MHz)
+ MCFG_CPU_ADD("tms7041", TMS7041, XTAL(4'915'200))
MCFG_TMS7000_IN_PORTA_CB(READ8(exelv_state, tms7041_porta_r))
MCFG_TMS7000_OUT_PORTB_CB(WRITE8(exelv_state, tms7041_portb_w))
MCFG_TMS7000_IN_PORTC_CB(READ8(exelv_state, tms7041_portc_r))
@@ -534,7 +534,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(exelv_state::exeltel)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS7040, XTAL_4_9152MHz)
+ MCFG_CPU_ADD("maincpu", TMS7040, XTAL(4'915'200))
MCFG_CPU_PROGRAM_MAP(tms7040_mem)
MCFG_TMS7000_IN_PORTA_CB(READ8(exelv_state, tms7020_porta_r))
MCFG_TMS7000_OUT_PORTB_CB(WRITE8(exelv_state, tms7020_portb_w))
@@ -542,7 +542,7 @@ MACHINE_CONFIG_START(exelv_state::exeltel)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", exelv_state, exelv_hblank_interrupt, "screen", 0, 1)
MCFG_MACHINE_START_OVERRIDE(exelv_state, exeltel)
- MCFG_CPU_ADD("tms7042", TMS7042, XTAL_4_9152MHz)
+ MCFG_CPU_ADD("tms7042", TMS7042, XTAL(4'915'200))
MCFG_TMS7000_IN_PORTA_CB(READ8(exelv_state, tms7041_porta_r))
MCFG_TMS7000_OUT_PORTB_CB(WRITE8(exelv_state, tms7041_portb_w))
MCFG_TMS7000_IN_PORTC_CB(READ8(exelv_state, tms7041_portc_r))
diff --git a/src/mame/drivers/exp85.cpp b/src/mame/drivers/exp85.cpp
index b30121947d2..c4c677508da 100644
--- a/src/mame/drivers/exp85.cpp
+++ b/src/mame/drivers/exp85.cpp
@@ -180,7 +180,7 @@ void exp85_state::machine_start()
MACHINE_CONFIG_START(exp85_state::exp85)
/* basic machine hardware */
- MCFG_CPU_ADD(I8085A_TAG, I8085A, XTAL_6_144MHz)
+ MCFG_CPU_ADD(I8085A_TAG, I8085A, XTAL(6'144'000))
MCFG_CPU_PROGRAM_MAP(exp85_mem)
MCFG_CPU_IO_MAP(exp85_io)
MCFG_I8085A_SID(READLINE(exp85_state, sid_r))
@@ -192,9 +192,9 @@ MACHINE_CONFIG_START(exp85_state::exp85)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
- MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL_6_144MHz/2)
+ MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(6'144'000)/2)
- MCFG_DEVICE_ADD(I8355_TAG, I8355, XTAL_6_144MHz/2)
+ MCFG_DEVICE_ADD(I8355_TAG, I8355, XTAL(6'144'000)/2)
MCFG_I8355_IN_PA_CB(READ8(exp85_state, i8355_a_r))
MCFG_I8355_OUT_PA_CB(WRITE8(exp85_state, i8355_a_w))
MCFG_CASSETTE_ADD("cassette")
diff --git a/src/mame/drivers/exprraid.cpp b/src/mame/drivers/exprraid.cpp
index 37dce931848..4a237efa900 100644
--- a/src/mame/drivers/exprraid.cpp
+++ b/src/mame/drivers/exprraid.cpp
@@ -490,11 +490,11 @@ void exprraid_state::machine_reset()
MACHINE_CONFIG_START(exprraid_state::exprraid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", DECO16, XTAL_12MHz / 8)
+ MCFG_CPU_ADD("maincpu", DECO16, XTAL(12'000'000) / 8)
MCFG_CPU_PROGRAM_MAP(master_map)
MCFG_CPU_IO_MAP(master_io_map)
- MCFG_CPU_ADD("slave", MC6809, XTAL_12MHz / 2) // MC68B09P
+ MCFG_CPU_ADD("slave", MC6809, XTAL(12'000'000) / 2) // MC68B09P
MCFG_CPU_PROGRAM_MAP(slave_map)
/* IRQs are caused by the YM3526 */
@@ -506,7 +506,7 @@ MACHINE_CONFIG_START(exprraid_state::exprraid)
// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
// MCFG_SCREEN_SIZE(32*8, 32*8)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2, 384, 0, 256, 262, 8, 256-8) /* not accurate */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2, 384, 0, 256, 262, 8, 256-8) /* not accurate */
MCFG_SCREEN_UPDATE_DRIVER(exprraid_state, screen_update_exprraid)
MCFG_SCREEN_PALETTE("palette")
@@ -519,10 +519,10 @@ MACHINE_CONFIG_START(exprraid_state::exprraid)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("slave", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz / 8)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ym2", YM3526, XTAL_12MHz / 4)
+ MCFG_SOUND_ADD("ym2", YM3526, XTAL(12'000'000) / 4)
MCFG_YM3526_IRQ_HANDLER(WRITELINE(exprraid_state, irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/f-32.cpp b/src/mame/drivers/f-32.cpp
index 28d63bac00c..f21114fd16c 100644
--- a/src/mame/drivers/f-32.cpp
+++ b/src/mame/drivers/f-32.cpp
@@ -161,7 +161,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mosaicf2_state::mosaicf2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", E132XN, XTAL_20MHz*4) /* 4x internal multiplier */
+ MCFG_CPU_ADD("maincpu", E132XN, XTAL(20'000'000)*4) /* 4x internal multiplier */
MCFG_CPU_PROGRAM_MAP(common_map)
MCFG_CPU_IO_MAP(mosaicf2_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", mosaicf2_state, irq0_line_hold)
@@ -184,11 +184,11 @@ MACHINE_CONFIG_START(mosaicf2_state::mosaicf2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545 MHz */
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/8, PIN7_HIGH) /* 1.7897725 MHz */
+ MCFG_OKIM6295_ADD("oki", XTAL(14'318'181)/8, PIN7_HIGH) /* 1.7897725 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -237,7 +237,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(mosaicf2_state::royalpk2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", GMS30C2132, XTAL_50MHz)
+ MCFG_CPU_ADD("maincpu", GMS30C2132, XTAL(50'000'000))
MCFG_CPU_PROGRAM_MAP(royalpk2_map)
MCFG_CPU_IO_MAP(royalpk2_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", mosaicf2_state, irq1_line_hold)
@@ -260,11 +260,11 @@ MACHINE_CONFIG_START(mosaicf2_state::royalpk2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-// MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545 MHz */
+// MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545 MHz */
// MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
// MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/8, PIN7_HIGH) /* 1.7897725 MHz */
+ MCFG_OKIM6295_ADD("oki", XTAL(14'318'181)/8, PIN7_HIGH) /* 1.7897725 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
diff --git a/src/mame/drivers/f1gp.cpp b/src/mame/drivers/f1gp.cpp
index 0bb100a935d..1b131e9335e 100644
--- a/src/mame/drivers/f1gp.cpp
+++ b/src/mame/drivers/f1gp.cpp
@@ -387,15 +387,15 @@ MACHINE_RESET_MEMBER(f1gp_state,f1gp)
MACHINE_CONFIG_START(f1gp_state::f1gp)
/* 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(f1gp_cpu1_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", f1gp_state, irq1_line_hold)
- MCFG_CPU_ADD("sub", M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("sub", M68000,XTAL(20'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(f1gp_cpu2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", f1gp_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL_20MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL(20'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
@@ -424,7 +424,7 @@ MACHINE_CONFIG_START(f1gp_state::f1gp)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0)
MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( f1gp_state, f1gp_old_tile_callback )
@@ -451,7 +451,7 @@ MACHINE_CONFIG_START(f1gp_state::f1gp)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000))
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
diff --git a/src/mame/drivers/fantland.cpp b/src/mame/drivers/fantland.cpp
index 5ea9efb94cd..54d2fa3d5c2 100644
--- a/src/mame/drivers/fantland.cpp
+++ b/src/mame/drivers/fantland.cpp
@@ -1029,11 +1029,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fantland_state::wheelrun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V20, XTAL_18MHz/2) // D701080C-8 (V20)
+ MCFG_CPU_ADD("maincpu", V20, XTAL(18'000'000)/2) // D701080C-8 (V20)
MCFG_CPU_PROGRAM_MAP(wheelrun_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", fantland_state, fantland_irq)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_18MHz/2) // Z8400BB1 (Z80B)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'000'000)/2) // Z8400BB1 (Z80B)
MCFG_CPU_PROGRAM_MAP(wheelrun_sound_map)
// IRQ by YM3526, NMI when soundlatch is written
@@ -1058,7 +1058,7 @@ MACHINE_CONFIG_START(fantland_state::wheelrun)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL_14MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(14'000'000)/4)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fanucs15.cpp b/src/mame/drivers/fanucs15.cpp
index f69e22eca1f..43339a4a0b1 100644
--- a/src/mame/drivers/fanucs15.cpp
+++ b/src/mame/drivers/fanucs15.cpp
@@ -362,19 +362,19 @@ void fanucs15_state::machine_reset()
MACHINE_CONFIG_START(fanucs15_state::fanucs15)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68020, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", M68020, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(maincpu_mem)
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("pmccpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("pmccpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(pmccpu_mem)
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("gfxcpu", M68000, XTAL_10MHz) // wants bit 15 of 70500 to be set
+ MCFG_CPU_ADD("gfxcpu", M68000, XTAL(10'000'000)) // wants bit 15 of 70500 to be set
MCFG_CPU_PROGRAM_MAP(gfxcpu_mem)
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("convcpu", I80286, XTAL_8MHz) // wants 70500 to return 0x8000 (same as what gfxcpu looks for, basically)
+ MCFG_CPU_ADD("convcpu", I80286, XTAL(8'000'000)) // wants 70500 to return 0x8000 (same as what gfxcpu looks for, basically)
MCFG_CPU_PROGRAM_MAP(convcpu_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fanucspmg.cpp b/src/mame/drivers/fanucspmg.cpp
index 2ced1cbd649..0c566e04889 100644
--- a/src/mame/drivers/fanucspmg.cpp
+++ b/src/mame/drivers/fanucspmg.cpp
@@ -959,20 +959,20 @@ FLOPPY_FORMATS_END
MACHINE_CONFIG_START(fanucspmg_state::fanucspmg)
/* basic machine hardware */
- MCFG_CPU_ADD(MAINCPU_TAG, I8086, XTAL_15MHz/3)
+ MCFG_CPU_ADD(MAINCPU_TAG, I8086, XTAL(15'000'000)/3)
MCFG_CPU_PROGRAM_MAP(maincpu_mem)
MCFG_CPU_IO_MAP(maincpu_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(PIC0_TAG, pic8259_device, inta_cb)
MCFG_I8086_ESC_OPCODE_HANDLER(DEVWRITE32("i8087", i8087_device, insn_w))
MCFG_I8086_ESC_DATA_HANDLER(DEVWRITE32("i8087", i8087_device, addr_w))
- MCFG_DEVICE_ADD("i8087", I8087, XTAL_15MHz/3)
+ MCFG_DEVICE_ADD("i8087", I8087, XTAL(15'000'000)/3)
MCFG_DEVICE_PROGRAM_MAP(maincpu_mem)
MCFG_I8087_DATA_WIDTH(16)
//MCFG_I8087_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI)) // TODO: presumably this is connected to the pic
MCFG_I8087_BUSY_HANDLER(INPUTLINE("maincpu", INPUT_LINE_TEST))
- MCFG_CPU_ADD(SUBCPU_TAG, I8085A, XTAL_16MHz/2/2)
+ MCFG_CPU_ADD(SUBCPU_TAG, I8085A, XTAL(16'000'000)/2/2)
MCFG_CPU_PROGRAM_MAP(subcpu_mem)
MCFG_DEVICE_ADD(USART0_TAG, I8251, 0)
@@ -981,15 +981,15 @@ MACHINE_CONFIG_START(fanucspmg_state::fanucspmg)
MCFG_DEVICE_ADD(USART3_TAG, I8251, 0)
MCFG_DEVICE_ADD(PIT0_TAG, PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_15MHz/12)
- MCFG_PIT8253_CLK1(XTAL_15MHz/12)
- MCFG_PIT8253_CLK2(XTAL_15MHz/12)
+ MCFG_PIT8253_CLK0(XTAL(15'000'000)/12)
+ MCFG_PIT8253_CLK1(XTAL(15'000'000)/12)
+ MCFG_PIT8253_CLK2(XTAL(15'000'000)/12)
MCFG_DEVICE_ADD(PIT1_TAG, PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_15MHz/12)
- MCFG_PIT8253_CLK1(XTAL_15MHz/12)
- MCFG_PIT8253_CLK2(XTAL_15MHz/12)
+ MCFG_PIT8253_CLK0(XTAL(15'000'000)/12)
+ MCFG_PIT8253_CLK1(XTAL(15'000'000)/12)
+ MCFG_PIT8253_CLK2(XTAL(15'000'000)/12)
- MCFG_DEVICE_ADD(DMAC_TAG, I8257, XTAL_15MHz / 5)
+ MCFG_DEVICE_ADD(DMAC_TAG, I8257, XTAL(15'000'000) / 5)
MCFG_I8257_OUT_HRQ_CB(WRITELINE(fanucspmg_state, hrq_w))
MCFG_I8257_OUT_TC_CB(WRITELINE(fanucspmg_state, tc_w))
MCFG_I8257_IN_MEMR_CB(READ8(fanucspmg_state, memory_read_byte))
@@ -1013,10 +1013,10 @@ MACHINE_CONFIG_START(fanucspmg_state::fanucspmg)
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":1", fanuc_floppies, "525dd", fanucspmg_state::floppy_formats)
MCFG_SCREEN_ADD( SCREEN_TAG, RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_15MHz, 640, 0, 512, 390, 0, 384 )
+ MCFG_SCREEN_RAW_PARAMS(XTAL(15'000'000), 640, 0, 512, 390, 0, 384 )
MCFG_SCREEN_UPDATE_DEVICE( CRTC_TAG, mc6845_device, screen_update )
- MCFG_MC6845_ADD( CRTC_TAG, HD6845, SCREEN_TAG, XTAL_8MHz/2)
+ MCFG_MC6845_ADD( CRTC_TAG, HD6845, SCREEN_TAG, XTAL(8'000'000)/2)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(fanucspmg_state, crtc_update_row)
@@ -1026,7 +1026,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(fanucspmg_state::fanucspmgm, fanucspmg)
MCFG_DEVICE_REMOVE( CRTC_TAG )
- MCFG_MC6845_ADD( CRTC_TAG, HD6845, SCREEN_TAG, XTAL_8MHz/2)
+ MCFG_MC6845_ADD( CRTC_TAG, HD6845, SCREEN_TAG, XTAL(8'000'000)/2)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(fanucspmg_state, crtc_update_row_mono)
diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp
index 76e1c0a7a59..c51e89f3f3f 100644
--- a/src/mame/drivers/fastfred.cpp
+++ b/src/mame/drivers/fastfred.cpp
@@ -629,11 +629,11 @@ INTERRUPT_GEN_MEMBER(fastfred_state::sound_timer_irq)
MACHINE_CONFIG_START(fastfred_state::fastfred)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12_432MHz/4) /* 3.108 MHz; xtal from pcb pics, divider not verified */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'432'000)/4) /* 3.108 MHz; xtal from pcb pics, divider not verified */
MCFG_CPU_PROGRAM_MAP(fastfred_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", fastfred_state, vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12_432MHz/8) /* 1.554 MHz; xtal from pcb pics, divider not verified */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'432'000)/8) /* 1.554 MHz; xtal from pcb pics, divider not verified */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(fastfred_state, sound_timer_irq, 4*60)
@@ -669,10 +669,10 @@ MACHINE_CONFIG_START(fastfred_state::fastfred)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay8910.1", AY8910, XTAL_12_432MHz/8) /* 1.554 MHz; xtal from pcb pics, divider not verified */
+ MCFG_SOUND_ADD("ay8910.1", AY8910, XTAL(12'432'000)/8) /* 1.554 MHz; xtal from pcb pics, divider not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay8910.2", AY8910, XTAL_12_432MHz/8) /* 1.554 MHz; xtal from pcb pics, divider not verified */
+ MCFG_SOUND_ADD("ay8910.2", AY8910, XTAL(12'432'000)/8) /* 1.554 MHz; xtal from pcb pics, divider not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fastlane.cpp b/src/mame/drivers/fastlane.cpp
index 9a01470c642..9c919d18c7a 100644
--- a/src/mame/drivers/fastlane.cpp
+++ b/src/mame/drivers/fastlane.cpp
@@ -201,7 +201,7 @@ void fastlane_state::machine_start()
MACHINE_CONFIG_START(fastlane_state::fastlane)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309, XTAL_24MHz/2) // 3MHz(XTAL_24MHz/8) internally
+ MCFG_CPU_ADD("maincpu", HD6309, XTAL(24'000'000)/2) // 3MHz(XTAL(24'000'000)/8) internally
MCFG_CPU_PROGRAM_MAP(fastlane_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", fastlane_state, fastlane_scanline, "screen", 0, 1)
@@ -229,12 +229,12 @@ MACHINE_CONFIG_START(fastlane_state::fastlane)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("k007232_1", K007232, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("k007232_1", K007232, XTAL(3'579'545))
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(fastlane_state, volume_callback0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_SOUND_ADD("k007232_2", K007232, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("k007232_2", K007232, XTAL(3'579'545))
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(fastlane_state, volume_callback1))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
diff --git a/src/mame/drivers/fb01.cpp b/src/mame/drivers/fb01.cpp
index 3a4732ce656..924e4835a61 100644
--- a/src/mame/drivers/fb01.cpp
+++ b/src/mame/drivers/fb01.cpp
@@ -175,7 +175,7 @@ PALETTE_INIT_MEMBER(fb01_state, fb01)
MACHINE_CONFIG_START(fb01_state::fb01)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2)
MCFG_CPU_PROGRAM_MAP(fb01_mem)
MCFG_CPU_IO_MAP(fb01_io)
@@ -198,12 +198,12 @@ MACHINE_CONFIG_START(fb01_state::fb01)
MCFG_HD44780_LCD_SIZE(2, 8) // 2x8 displayed as 1x16
MCFG_HD44780_PIXEL_UPDATE_CB(fb01_state,fb01_pixel_update)
- MCFG_DEVICE_ADD("upd71051", I8251, XTAL_4MHz)
+ MCFG_DEVICE_ADD("upd71051", I8251, XTAL(4'000'000))
MCFG_I8251_RXRDY_HANDLER(WRITELINE(fb01_state, upd71051_rxrdy_w))
MCFG_I8251_TXRDY_HANDLER(WRITELINE(fb01_state, upd71051_txrdy_w))
MCFG_I8251_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
- MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL_4MHz / 8) // 500KHz
+ MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL(4'000'000) / 8) // 500KHz
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(fb01_state, write_usart_clock))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
@@ -214,7 +214,7 @@ MACHINE_CONFIG_START(fb01_state::fb01)
MCFG_MIDI_PORT_ADD("mdthru", midiout_slot, "midiout")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ym2164", XTAL_4MHz)
+ MCFG_YM2151_ADD("ym2164", XTAL(4'000'000))
MCFG_YM2151_IRQ_HANDLER(WRITELINE(fb01_state, ym2164_irq_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp
index d1f7e161746..59a876d0f25 100644
--- a/src/mame/drivers/fc100.cpp
+++ b/src/mame/drivers/fc100.cpp
@@ -509,12 +509,12 @@ DRIVER_INIT_MEMBER( fc100_state, fc100 )
MACHINE_CONFIG_START(fc100_state::fc100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_7_15909MHz/2)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(7'159'090)/2)
MCFG_CPU_PROGRAM_MAP(fc100_mem)
MCFG_CPU_IO_MAP(fc100_io)
/* video hardware */
- MCFG_DEVICE_ADD("vdg", M5C6847P1, XTAL_7_15909MHz/3) // Clock not verified
+ MCFG_DEVICE_ADD("vdg", M5C6847P1, XTAL(7'159'090)/3) // Clock not verified
MCFG_MC6847_INPUT_CALLBACK(READ8(fc100_state, mc6847_videoram_r))
MCFG_MC6847_CHARROM_CALLBACK(fc100_state, get_char_rom)
MCFG_MC6847_FIXED_MODE(m5c6847p1_device::MODE_INTEXT)
@@ -528,7 +528,7 @@ MACHINE_CONFIG_START(fc100_state::fc100)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
- MCFG_SOUND_ADD("psg", AY8910, XTAL_7_15909MHz/3/2) /* AY-3-8910 - clock not verified */
+ MCFG_SOUND_ADD("psg", AY8910, XTAL(7'159'090)/3/2) /* AY-3-8910 - clock not verified */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("JOY0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("JOY1"))
//MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(fc100_state, ay_port_a_w))
@@ -542,7 +542,7 @@ MACHINE_CONFIG_START(fc100_state::fc100)
MCFG_DEVICE_ADD("uart", I8251, 0)
MCFG_I8251_TXD_HANDLER(WRITELINE(fc100_state, txdata_callback))
- MCFG_DEVICE_ADD("uart_clock", CLOCK, XTAL_4_9152MHz/16/16) // gives 19200
+ MCFG_DEVICE_ADD("uart_clock", CLOCK, XTAL(4'915'200)/16/16) // gives 19200
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp
index e74e0735589..d1605bfe75e 100644
--- a/src/mame/drivers/fccpu30.cpp
+++ b/src/mame/drivers/fccpu30.cpp
@@ -231,7 +231,7 @@
#define FUNCNAME __PRETTY_FUNCTION__
#endif
-#define DUSCC_CLOCK XTAL_14_7456MHz /* Verified */
+#define DUSCC_CLOCK XTAL(14'745'600) /* Verified */
class cpu30_state : public driver_device
{
@@ -655,7 +655,7 @@ SLOT_INTERFACE_END
*/
MACHINE_CONFIG_START(cpu30_state::cpu30)
/* basic machine hardware */
- MCFG_CPU_ADD ("maincpu", M68030, XTAL_25MHz)
+ MCFG_CPU_ADD ("maincpu", M68030, XTAL(25'000'000))
MCFG_CPU_PROGRAM_MAP (cpu30_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("fga002", fga002_device, iack)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -725,7 +725,7 @@ MACHINE_CONFIG_START(cpu30_state::cpu30)
MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc", duscc68562_device, ctsa_w))
/* PIT Parallel Interface and Timer device, assumed strapped for on board clock */
- MCFG_DEVICE_ADD ("pit1", PIT68230, XTAL_16MHz / 2) // The PIT clock is not verified on schema but reversed from behaviour
+ MCFG_DEVICE_ADD ("pit1", PIT68230, XTAL(16'000'000) / 2) // The PIT clock is not verified on schema but reversed from behaviour
MCFG_PIT68230_PA_INPUT_CB(READ8(cpu30_state, rotary_rd))
MCFG_PIT68230_PB_INPUT_CB(READ8(cpu30_state, flop_dmac_r))
MCFG_PIT68230_PB_OUTPUT_CB(WRITE8(cpu30_state, flop_dmac_w))
@@ -733,7 +733,7 @@ MACHINE_CONFIG_START(cpu30_state::cpu30)
MCFG_PIT68230_PC_OUTPUT_CB(WRITE8(cpu30_state, pit1c_w))
// MCFG_PIT68230_TIMER_IRQ_CB(DEVWRITELINE("fga002", fga002_device, lirq2_w)) // The timer interrupt seems to silence the terminal interrupt, needs invectigation
- MCFG_DEVICE_ADD ("pit2", PIT68230, XTAL_16MHz / 2) // Th PIT clock is not verified on schema but reversed from behaviour
+ MCFG_DEVICE_ADD ("pit2", PIT68230, XTAL(16'000'000) / 2) // Th PIT clock is not verified on schema but reversed from behaviour
MCFG_PIT68230_PB_INPUT_CB(READ8(cpu30_state, board_mem_id_rd))
MCFG_PIT68230_PA_INPUT_CB(READ8(cpu30_state, pit2a_r))
MCFG_PIT68230_PA_OUTPUT_CB(WRITE8(cpu30_state, pit2a_w))
@@ -748,7 +748,7 @@ MACHINE_CONFIG_START(cpu30_state::cpu30)
MCFG_FGA002_OUT_LIACK5_CB(DEVREAD8("duscc2", duscc_device, iack))
// RTC
- MCFG_DEVICE_ADD("rtc", RTC72423, XTAL_32_768kHz) // Fake crystal value, the 72423 uses it own internal crystal
+ MCFG_DEVICE_ADD("rtc", RTC72423, XTAL(32'768)) // Fake crystal value, the 72423 uses it own internal crystal
MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("fga002", fga002_device, lirq0_w))
// dual ported ram
@@ -760,7 +760,7 @@ MACHINE_CONFIG_END
/* SYS68K/CPU-30X Part No.1 01300: 16.7 MHz 68030 based CPU board with 68882 FPCP, DMAC, 1 Mbyte Dual Ported RAM capacity and VMEPROM. */
MACHINE_CONFIG_DERIVED(cpu30_state::cpu30x, cpu30)
MCFG_DEVICE_MODIFY("maincpu")
- MCFG_DEVICE_CLOCK(XTAL_16_777216MHz) /* 16.7 MHz from description, crystal needs verification */
+ MCFG_DEVICE_CLOCK(XTAL(16'777'216)) /* 16.7 MHz from description, crystal needs verification */
// MCFG_DEVICE_REMOVE("")
@@ -773,13 +773,13 @@ MACHINE_CONFIG_END
/* SYS68K/CPU-30XA Part No.1 01301: 20.0 MHz 68030 based CPU board with 68882 FPCP, DMAC, 1 Mbyte Dual Ported RAM capacity and VMEPROM. Documentation included.*/
MACHINE_CONFIG_DERIVED(cpu30_state::cpu30xa, cpu30x)
MCFG_DEVICE_MODIFY("maincpu")
- MCFG_DEVICE_CLOCK(XTAL_20MHz) /* 20.0 MHz from description, crystal needs verification */
+ MCFG_DEVICE_CLOCK(XTAL(20'000'000)) /* 20.0 MHz from description, crystal needs verification */
MACHINE_CONFIG_END
/* SYS68K/CPU-30ZA Part No.1 01302: 20.0 MHz 68030 based CPU board with 68882 FPCP, DMAC, 4 Mbyte Dual Ported RAM capacity and VMEPROM. Documentation included.*/
MACHINE_CONFIG_DERIVED(cpu30_state::cpu30za, cpu30xa)
MCFG_DEVICE_MODIFY("maincpu")
- MCFG_DEVICE_CLOCK(XTAL_20MHz) /* 20.0 MHz from description, crystal needs verification */
+ MCFG_DEVICE_CLOCK(XTAL(20'000'000)) /* 20.0 MHz from description, crystal needs verification */
// dual ported ram
MCFG_RAM_MODIFY(RAM_TAG)
@@ -790,7 +790,7 @@ MACHINE_CONFIG_END
/* SYS68K/CPU-30ZBE 68030/68882 CPU, 25 MHz, 4 Mbyte shared DRAM, 4 Mbyte Flash, SCSI, Ethernet, Floppy disk, 4 serial I/O ports, 32-bit VMEbus interface */
MACHINE_CONFIG_DERIVED(cpu30_state::cpu30zbe, cpu30za)
MCFG_DEVICE_MODIFY("maincpu")
- MCFG_DEVICE_CLOCK(XTAL_25MHz) /* 25.0 MHz from description, crystal needs verification */
+ MCFG_DEVICE_CLOCK(XTAL(25'000'000)) /* 25.0 MHz from description, crystal needs verification */
// dual ported ram
MCFG_RAM_MODIFY(RAM_TAG)
@@ -801,7 +801,7 @@ MACHINE_CONFIG_END
/* SYS68K/CPU-33 */
MACHINE_CONFIG_DERIVED(cpu30_state::cpu33, cpu30zbe)
MCFG_DEVICE_MODIFY("maincpu")
- MCFG_DEVICE_CLOCK(XTAL_25MHz) /* 25.0 MHz from description, crystal needs verification */
+ MCFG_DEVICE_CLOCK(XTAL(25'000'000)) /* 25.0 MHz from description, crystal needs verification */
// dual ported ram
MCFG_RAM_MODIFY(RAM_TAG)
diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp
index 91cd312d159..021affd4c67 100644
--- a/src/mame/drivers/fcrash.cpp
+++ b/src/mame/drivers/fcrash.cpp
@@ -1657,13 +1657,13 @@ MACHINE_CONFIG_START(cps_state::kodb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("2151", XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("2151", XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.35)
MCFG_SOUND_ROUTE(1, "mono", 0.35)
/* CPS PPU is fed by a 16mhz clock,pin 117 outputs a 4mhz clock which is divided by 4 using 2 74ls74 */
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/4/4, PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -2298,13 +2298,13 @@ MACHINE_CONFIG_START(cps_state::sgyxz)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_YM2151_ADD("2151", XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("2151", XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.35)
MCFG_SOUND_ROUTE(1, "mono", 0.35)
/* CPS PPU is fed by a 16mhz clock,pin 117 outputs a 4mhz clock which is divided by 4 using 2 74ls74 */
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/4/4, PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -2558,12 +2558,12 @@ DRIVER_INIT_MEMBER(cps_state, punipic3)
MACHINE_CONFIG_START(cps_state::sf2m1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz )
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000) )
MCFG_CPU_PROGRAM_MAP(sf2m1_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(sgyxz_sound_map)
MCFG_MACHINE_START_OVERRIDE(cps_state,sf2m1)
@@ -2583,11 +2583,11 @@ MACHINE_CONFIG_START(cps_state::sf2m1)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_YM2151_ADD("2151", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("2151", XTAL(3'579'545))
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.35)
MCFG_SOUND_ROUTE(1, "mono", 0.35)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/4/4, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -3025,12 +3025,12 @@ MACHINE_CONFIG_START(cps_state::varthb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_YM2151_ADD("2151", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("2151", XTAL(3'579'545))
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.35)
MCFG_SOUND_ROUTE(1, "mono", 0.35)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/4/4, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/feversoc.cpp b/src/mame/drivers/feversoc.cpp
index 41ef211ba1c..a22116af0c4 100644
--- a/src/mame/drivers/feversoc.cpp
+++ b/src/mame/drivers/feversoc.cpp
@@ -118,7 +118,7 @@ public:
};
-#define MASTER_CLOCK XTAL_28_63636MHz
+#define MASTER_CLOCK XTAL(28'636'363)
uint32_t feversoc_state::screen_update_feversoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
@@ -302,7 +302,7 @@ MACHINE_CONFIG_START(feversoc_state::feversoc)
MCFG_EEPROM_SERIAL_93C56_ADD("eeprom")
- MCFG_JRC6355E_ADD("rtc", XTAL_32_768kHz)
+ MCFG_JRC6355E_ADD("rtc", XTAL(32'768))
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp
index ef4adc7dcea..92e130d7d7e 100644
--- a/src/mame/drivers/fidel6502.cpp
+++ b/src/mame/drivers/fidel6502.cpp
@@ -1639,7 +1639,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::csc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_3_9MHz/2) // from 3.9MHz resonator
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(3'900'000)/2) // from 3.9MHz resonator
MCFG_CPU_PROGRAM_MAP(csc_map)
MCFG_CPU_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // 38400kHz/64
@@ -1684,7 +1684,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::eas)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R65C02, XTAL_3MHz)
+ MCFG_CPU_ADD("maincpu", R65C02, XTAL(3'000'000))
MCFG_CPU_PROGRAM_MAP(eas_map)
MCFG_CPU_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed
@@ -1719,7 +1719,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(fidel6502_state::eag, eas)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", R65C02, XTAL_5MHz) // R65C02P4
+ MCFG_CPU_REPLACE("maincpu", R65C02, XTAL(5'000'000)) // R65C02P4
MCFG_CPU_PROGRAM_MAP(eag_map)
MCFG_CPU_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed
@@ -1729,7 +1729,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::sc9d)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_3_9MHz/2) // R6502AP, 3.9MHz resonator
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(3'900'000)/2) // R6502AP, 3.9MHz resonator
MCFG_CPU_PROGRAM_MAP(sc9d_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel6502_state, irq_on, attotime::from_hz(610)) // from 555 timer (22nF, 102K, 2.7K)
MCFG_TIMER_START_DELAY(attotime::from_hz(610) - attotime::from_usec(41)) // active for 41us
@@ -1776,13 +1776,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::sc12)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R65C02, XTAL_3MHz) // R65C02P3
+ MCFG_CPU_ADD("maincpu", R65C02, XTAL(3'000'000)) // R65C02P3
MCFG_CPU_PROGRAM_MAP(sc12_trampoline)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel6502_state, irq_on, attotime::from_hz(630)) // from 556 timer (22nF, 102K, 1K)
MCFG_TIMER_START_DELAY(attotime::from_hz(630) - attotime::from_nsec(15250)) // active for 15.25us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(630))
- MCFG_TIMER_DRIVER_ADD_PERIODIC("dummy_timer", fidel6502_state, dummy, attotime::from_hz(XTAL_3MHz)) // MCFG_QUANTUM_PERFECT_CPU("maincpu") didn't work
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("dummy_timer", fidel6502_state, dummy, attotime::from_hz(XTAL(3'000'000))) // MCFG_QUANTUM_PERFECT_CPU("maincpu") didn't work
MCFG_DEVICE_ADD("sc12_map", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(sc12_map)
@@ -1810,7 +1810,7 @@ MACHINE_CONFIG_DERIVED(fidel6502_state::sc12b, sc12)
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
- MCFG_DEVICE_CLOCK(XTAL_4MHz) // R65C02P4
+ MCFG_DEVICE_CLOCK(XTAL(4'000'000)) // R65C02P4
// change irq timer frequency
MCFG_DEVICE_REMOVE("irq_on")
@@ -1820,13 +1820,13 @@ MACHINE_CONFIG_DERIVED(fidel6502_state::sc12b, sc12)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(596))
MCFG_DEVICE_REMOVE("dummy_timer")
- MCFG_TIMER_DRIVER_ADD_PERIODIC("dummy_timer", fidel6502_state, dummy, attotime::from_hz(XTAL_4MHz)) // MCFG_QUANTUM_PERFECT_CPU("maincpu") didn't work
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("dummy_timer", fidel6502_state, dummy, attotime::from_hz(XTAL(4'000'000))) // MCFG_QUANTUM_PERFECT_CPU("maincpu") didn't work
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::fexcel)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65SC02, XTAL_12MHz/4) // G65SC102P-3, 12.0M ceramic resonator
+ MCFG_CPU_ADD("maincpu", M65SC02, XTAL(12'000'000)/4) // G65SC102P-3, 12.0M ceramic resonator
MCFG_CPU_PROGRAM_MAP(fexcel_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel6502_state, irq_on, attotime::from_hz(630)) // from 556 timer (22nF, 102K, 1K)
MCFG_TIMER_START_DELAY(attotime::from_hz(630) - attotime::from_nsec(15250)) // active for 15.25us
@@ -1845,7 +1845,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(fidel6502_state::fexcel4, fexcel)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", R65C02, XTAL_4MHz) // R65C02P4
+ MCFG_CPU_REPLACE("maincpu", R65C02, XTAL(4'000'000)) // R65C02P4
MCFG_CPU_PROGRAM_MAP(fexcel_map)
MACHINE_CONFIG_END
@@ -1859,7 +1859,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(fidel6502_state::fexcelp, fexcel)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", R65C02, XTAL_5MHz) // R65C02P4
+ MCFG_CPU_REPLACE("maincpu", R65C02, XTAL(5'000'000)) // R65C02P4
MCFG_CPU_PROGRAM_MAP(fexcelp_map)
MACHINE_CONFIG_END
@@ -1867,13 +1867,13 @@ MACHINE_CONFIG_DERIVED(fidel6502_state::granits, fexcelp)
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
- MCFG_DEVICE_CLOCK(XTAL_8MHz) // overclocked
+ MCFG_DEVICE_CLOCK(XTAL(8'000'000)) // overclocked
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(fidel6502_state::fdes2100, fexcel)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M65C02, XTAL_5MHz) // WDC 65C02
+ MCFG_CPU_REPLACE("maincpu", M65C02, XTAL(5'000'000)) // WDC 65C02
MCFG_CPU_PROGRAM_MAP(fexcelp_map)
// change irq timer frequency
@@ -1889,7 +1889,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(fidel6502_state::fdes2000, fdes2100)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", R65C02, XTAL_3MHz) // RP65C02G
+ MCFG_CPU_REPLACE("maincpu", R65C02, XTAL(3'000'000)) // RP65C02G
MCFG_CPU_PROGRAM_MAP(fexcelp_map)
MACHINE_CONFIG_END
@@ -1910,7 +1910,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::fdes2100d)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65C02, XTAL_6MHz) // W65C02P-6
+ MCFG_CPU_ADD("maincpu", M65C02, XTAL(6'000'000)) // W65C02P-6
MCFG_CPU_PROGRAM_MAP(fdesdis_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel6502_state, irq_on, attotime::from_hz(630)) // from 556 timer (22nF, 102K, 1K)
MCFG_TIMER_START_DELAY(attotime::from_hz(630) - attotime::from_nsec(15250)) // active for 15.25us
@@ -1929,14 +1929,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(fidel6502_state::fdes2000d, fdes2100d)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", R65C02, XTAL_3MHz) // R65C02P3
+ MCFG_CPU_REPLACE("maincpu", R65C02, XTAL(3'000'000)) // R65C02P3
MCFG_CPU_PROGRAM_MAP(fdesdis_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::fphantom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R65C02, XTAL_4_9152MHz) // R65C02P4
+ MCFG_CPU_ADD("maincpu", R65C02, XTAL(4'915'200)) // R65C02P4
MCFG_CPU_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed
MCFG_CPU_PROGRAM_MAP(fphantom_map)
@@ -1955,7 +1955,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::chesster)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R65C02, XTAL_5MHz) // RP65C02G
+ MCFG_CPU_ADD("maincpu", R65C02, XTAL(5'000'000)) // RP65C02G
MCFG_CPU_PROGRAM_MAP(chesster_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel6502_state, irq_on, attotime::from_hz(9615)) // R/C circuit, measured
MCFG_TIMER_START_DELAY(attotime::from_hz(9615) - attotime::from_nsec(2600)) // active for 2.6us
@@ -1976,7 +1976,7 @@ MACHINE_CONFIG_DERIVED(fidel6502_state::kishon, chesster)
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
- MCFG_DEVICE_CLOCK(XTAL_3_579545MHz)
+ MCFG_DEVICE_CLOCK(XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(kishon_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp
index 7c5610499cb..e7baa59314f 100644
--- a/src/mame/drivers/fidel68k.cpp
+++ b/src/mame/drivers/fidel68k.cpp
@@ -542,7 +542,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(fidel68k_state::fex68k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) // HD68HC000P12
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) // HD68HC000P12
MCFG_CPU_PROGRAM_MAP(fex68k_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel68k_state, irq_on, attotime::from_hz(618)) // theoretical frequency from 556 timer (22nF, 91K + 20K POT @ 14.8K, 0.1K), measurement was 580Hz
MCFG_TIMER_START_DELAY(attotime::from_hz(618) - attotime::from_nsec(1525)) // active for 1.525us
@@ -569,14 +569,14 @@ MACHINE_CONFIG_DERIVED(fidel68k_state::fex68km3, fex68k)
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
- MCFG_DEVICE_CLOCK(XTAL_16MHz) // factory overclock
+ MCFG_DEVICE_CLOCK(XTAL(16'000'000)) // factory overclock
MCFG_CPU_PROGRAM_MAP(fex68km3_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel68k_state::fdes2265)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // MC68HC000P12F
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) // MC68HC000P12F
MCFG_CPU_PROGRAM_MAP(fdes2265_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel68k_state, irq_on, attotime::from_hz(597)) // from 555 timer, measured
MCFG_TIMER_START_DELAY(attotime::from_hz(597) - attotime::from_nsec(6000)) // active for 6us
@@ -595,7 +595,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(fidel68k_state::fdes2325, fdes2265)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68EC020, XTAL_20MHz) // MC68EC020RP25
+ MCFG_CPU_REPLACE("maincpu", M68EC020, XTAL(20'000'000)) // MC68EC020RP25
MCFG_CPU_PROGRAM_MAP(fdes2325_map)
MCFG_DEFAULT_LAYOUT(layout_fidel_desdis_68kg)
@@ -604,11 +604,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel68k_state::eag)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(eag_map)
- MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel68k_state, irq_on, attotime::from_hz(XTAL_4_9152MHz/0x2000)) // 600Hz
- MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL_4_9152MHz/0x2000) - attotime::from_nsec(8250)) // active for 8.25us
- MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel68k_state, irq_off, attotime::from_hz(XTAL_4_9152MHz/0x2000))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel68k_state, irq_on, attotime::from_hz(XTAL(4'915'200)/0x2000)) // 600Hz
+ MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL(4'915'200)/0x2000) - attotime::from_nsec(8250)) // active for 8.25us
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel68k_state, irq_off, attotime::from_hz(XTAL(4'915'200)/0x2000))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -635,7 +635,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(fidel68k_state::eagv7, eag)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68020, XTAL_20MHz)
+ MCFG_CPU_REPLACE("maincpu", M68020, XTAL(20'000'000))
MCFG_CPU_PROGRAM_MAP(eagv7_map)
MCFG_RAM_REMOVE("ram")
@@ -644,21 +644,21 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(fidel68k_state::eagv9, eagv7)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68030, XTAL_32MHz)
+ MCFG_CPU_REPLACE("maincpu", M68030, XTAL(32'000'000))
MCFG_CPU_PROGRAM_MAP(eagv7_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(fidel68k_state::eagv10, eagv7)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68040, XTAL_25MHz)
+ MCFG_CPU_REPLACE("maincpu", M68040, XTAL(25'000'000))
MCFG_CPU_PROGRAM_MAP(eagv11_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(fidel68k_state::eagv11, eagv7)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68EC040, XTAL_36MHz*2*2) // wrong! should be M68EC060 @ 72MHz
+ MCFG_CPU_REPLACE("maincpu", M68EC040, XTAL(36'000'000)*2*2) // wrong! should be M68EC060 @ 72MHz
MCFG_CPU_PROGRAM_MAP(eagv11_map)
MCFG_CPU_PERIODIC_INT_DRIVER(fidel68k_state, irq2_line_hold, 600)
diff --git a/src/mame/drivers/fidelmcs48.cpp b/src/mame/drivers/fidelmcs48.cpp
index ecde293e8fb..eb02df389d4 100644
--- a/src/mame/drivers/fidelmcs48.cpp
+++ b/src/mame/drivers/fidelmcs48.cpp
@@ -148,7 +148,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(fidelmcs48_state::sc6)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8040, XTAL_11MHz)
+ MCFG_CPU_ADD("maincpu", I8040, XTAL(11'000'000))
MCFG_CPU_PROGRAM_MAP(sc6_map)
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(fidelmcs48_state, sc6_mux_w))
MCFG_MCS48_PORT_P1_IN_CB(READ8(fidelmcs48_state, sc6_input_r))
diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp
index 716f420d1dd..6c7adb94ade 100644
--- a/src/mame/drivers/fidelz80.cpp
+++ b/src/mame/drivers/fidelz80.cpp
@@ -1631,7 +1631,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(fidelz80_state::bcc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(bcc_map)
MCFG_CPU_IO_MAP(bcc_io)
@@ -1648,7 +1648,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidelz80_state::scc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_9MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'900'000))
MCFG_CPU_PROGRAM_MAP(scc_map)
MCFG_CPU_IO_MAP(scc_io)
@@ -1665,7 +1665,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidelz80_state::cc10)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(cc10_map)
MCFG_CPU_IO_MAP(vcc_io)
@@ -1691,7 +1691,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidelz80_state::vcc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(vcc_map)
MCFG_CPU_IO_MAP(vcc_io)
@@ -1719,7 +1719,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidelz80_state::vsc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_9MHz) // 3.9MHz resonator
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'900'000)) // 3.9MHz resonator
MCFG_CPU_PROGRAM_MAP(vsc_map)
MCFG_CPU_IO_MAP(vsc_io)
MCFG_CPU_PERIODIC_INT_DRIVER(fidelz80_state, nmi_line_pulse, 587) // 555 timer, measured
@@ -1729,7 +1729,7 @@ MACHINE_CONFIG_START(fidelz80_state::vsc)
MCFG_I8255_OUT_PORTB_CB(WRITE8(fidelz80_state, vsc_ppi_portb_w))
MCFG_I8255_OUT_PORTC_CB(WRITE8(fidelz80_state, vsc_ppi_portc_w))
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_3_9MHz)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(3'900'000))
MCFG_Z80PIO_IN_PA_CB(READ8(fidelz80_state, vsc_pio_porta_r))
MCFG_Z80PIO_IN_PB_CB(READ8(fidelz80_state, vsc_pio_portb_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(fidelz80_state, vsc_pio_portb_w))
@@ -1747,12 +1747,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidelz80_state::vbrc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000)/2)
MCFG_CPU_PROGRAM_MAP(vbrc_main_map)
MCFG_CPU_IO_MAP(vbrc_main_io)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("mcu", I8041, XTAL_5MHz)
+ MCFG_CPU_ADD("mcu", I8041, XTAL(5'000'000))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(fidelz80_state, vbrc_mcu_p1_w))
MCFG_MCS48_PORT_P2_IN_CB(READ8(fidelz80_state, vbrc_mcu_p2_r))
MCFG_MCS48_PORT_P2_OUT_CB(DEVWRITE8("i8243", i8243_device, p2_w))
@@ -1775,7 +1775,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidelz80_state::dsc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_9MHz) // 3.9MHz resonator
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'900'000)) // 3.9MHz resonator
MCFG_CPU_PROGRAM_MAP(dsc_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidelz80_state, irq_on, attotime::from_hz(523)) // from 555 timer (22nF, 120K, 2.7K)
MCFG_TIMER_START_DELAY(attotime::from_hz(523) - attotime::from_usec(41)) // active for 41us
diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp
index d1219bc83da..4d435da0e38 100644
--- a/src/mame/drivers/finalizr.cpp
+++ b/src/mame/drivers/finalizr.cpp
@@ -263,11 +263,11 @@ void finalizr_state::machine_reset()
MACHINE_CONFIG_START(finalizr_state::finalizr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI1, XTAL_18_432MHz/6) /* ??? */
+ MCFG_CPU_ADD("maincpu", KONAMI1, XTAL(18'432'000)/6) /* ??? */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", finalizr_state, finalizr_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", I8039,XTAL_18_432MHz/2) /* 9.216MHz clkin ?? */
+ MCFG_CPU_ADD("audiocpu", I8039,XTAL(18'432'000)/2) /* 9.216MHz clkin ?? */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("dac", dac_byte_interface, write))
@@ -296,7 +296,7 @@ MACHINE_CONFIG_START(finalizr_state::finalizr)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("snsnd", SN76489A, XTAL_18_432MHz/12)
+ MCFG_SOUND_ADD("snsnd", SN76489A, XTAL(18'432'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.325) // unknown DAC
diff --git a/src/mame/drivers/fireball.cpp b/src/mame/drivers/fireball.cpp
index d4db2ed78e8..471fb3ef825 100644
--- a/src/mame/drivers/fireball.cpp
+++ b/src/mame/drivers/fireball.cpp
@@ -40,8 +40,8 @@
/****************************
* Clock defines *
****************************/
-#define CPU_CLK XTAL_11_0592MHz
-#define AY_CLK XTAL_11_0592MHz/8
+#define CPU_CLK XTAL(11'059'200)
+#define AY_CLK XTAL(11'059'200)/8
class fireball_state : public driver_device
diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp
index 112985d0711..b59b8fe66f0 100644
--- a/src/mame/drivers/firebeat.cpp
+++ b/src/mame/drivers/firebeat.cpp
@@ -1287,7 +1287,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(firebeat_state::firebeat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GCX, XTAL_64MHz)
+ MCFG_CPU_ADD("maincpu", PPC403GCX, XTAL(64'000'000))
MCFG_CPU_PROGRAM_MAP(firebeat_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", firebeat_state, firebeat_interrupt)
@@ -1335,19 +1335,19 @@ MACHINE_CONFIG_START(firebeat_state::firebeat)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_DEVICE_ADD("duart_com", PC16552D, 0) // pgmd to 9600baud
- MCFG_DEVICE_ADD("duart_com:chan0", NS16550, XTAL_19_6608MHz)
- MCFG_DEVICE_ADD("duart_com:chan1", NS16550, XTAL_19_6608MHz)
+ MCFG_DEVICE_ADD("duart_com:chan0", NS16550, XTAL(19'660'800))
+ MCFG_DEVICE_ADD("duart_com:chan1", NS16550, XTAL(19'660'800))
MCFG_DEVICE_ADD("duart_midi", PC16552D, 0) // in all memory maps, pgmd to 31250baud
- MCFG_DEVICE_ADD("duart_midi:chan0", NS16550, XTAL_24MHz)
+ MCFG_DEVICE_ADD("duart_midi:chan0", NS16550, XTAL(24'000'000))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(DEVICE_SELF_OWNER, firebeat_state, midi_uart_ch0_irq_callback))
- MCFG_DEVICE_ADD("duart_midi:chan1", NS16550, XTAL_24MHz)
+ MCFG_DEVICE_ADD("duart_midi:chan1", NS16550, XTAL(24'000'000))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(DEVICE_SELF_OWNER, firebeat_state, midi_uart_ch1_irq_callback))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(firebeat_state::firebeat2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GCX, XTAL_64MHz)
+ MCFG_CPU_ADD("maincpu", PPC403GCX, XTAL(64'000'000))
MCFG_CPU_PROGRAM_MAP(firebeat_map)
MCFG_CPU_VBLANK_INT_DRIVER("lscreen", firebeat_state, firebeat_interrupt)
@@ -1403,12 +1403,12 @@ MACHINE_CONFIG_START(firebeat_state::firebeat2)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_DEVICE_ADD("duart_com", PC16552D, 0)
- MCFG_DEVICE_ADD("duart_com:chan0", NS16550, XTAL_19_6608MHz)
- MCFG_DEVICE_ADD("duart_com:chan1", NS16550, XTAL_19_6608MHz)
+ MCFG_DEVICE_ADD("duart_com:chan0", NS16550, XTAL(19'660'800))
+ MCFG_DEVICE_ADD("duart_com:chan1", NS16550, XTAL(19'660'800))
MCFG_DEVICE_ADD("duart_midi", PC16552D, 0)
- MCFG_DEVICE_ADD("duart_midi:chan0", NS16550, XTAL_24MHz)
+ MCFG_DEVICE_ADD("duart_midi:chan0", NS16550, XTAL(24'000'000))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(DEVICE_SELF_OWNER, firebeat_state, midi_uart_ch0_irq_callback))
- MCFG_DEVICE_ADD("duart_midi:chan1", NS16550, XTAL_24MHz)
+ MCFG_DEVICE_ADD("duart_midi:chan1", NS16550, XTAL(24'000'000))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(DEVICE_SELF_OWNER, firebeat_state, midi_uart_ch1_irq_callback))
MCFG_MIDI_KBD_ADD("kbd0", DEVWRITELINE("duart_midi:chan0", ins8250_uart_device, rx_w), 31250)
MCFG_MIDI_KBD_ADD("kbd1", DEVWRITELINE("duart_midi:chan1", ins8250_uart_device, rx_w), 31250)
@@ -1422,7 +1422,7 @@ MACHINE_CONFIG_DERIVED(firebeat_state::firebeat_spu, firebeat)
MCFG_TIMER_DRIVER_ADD_PERIODIC("sputimer", firebeat_state, spu_timer_callback, attotime::from_hz(1000));
- MCFG_RF5C400_ADD("rf5c400", XTAL_16_9344MHz)
+ MCFG_RF5C400_ADD("rf5c400", XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp
index d4fb5d59983..80b7dd022d6 100644
--- a/src/mame/drivers/firefox.cpp
+++ b/src/mame/drivers/firefox.cpp
@@ -132,7 +132,7 @@ public:
-#define MASTER_XTAL XTAL_14_31818MHz
+#define MASTER_XTAL XTAL(14'318'181)
/*
@@ -756,7 +756,7 @@ MACHINE_CONFIG_START(firefox_state::firefox)
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(firefox_state, led3_w))
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_hz((double)MASTER_XTAL/8/16/16/16/16))
+ MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(MASTER_XTAL/8/16/16/16/16))
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", firefox)
diff --git a/src/mame/drivers/firetrap.cpp b/src/mame/drivers/firetrap.cpp
index 2df33c8b80d..c57a183b6c4 100644
--- a/src/mame/drivers/firetrap.cpp
+++ b/src/mame/drivers/firetrap.cpp
@@ -183,7 +183,7 @@ the MSM5205-derived interrupt assigned to the NMI line instead.
#include "screen.h"
#include "speaker.h"
-#define FIRETRAP_XTAL XTAL_12MHz
+#define FIRETRAP_XTAL XTAL(12'000'000)
WRITE8_MEMBER(firetrap_state::firetrap_nmi_disable_w)
@@ -623,7 +623,7 @@ MACHINE_CONFIG_START(firetrap_state::firetrap)
/* IRQs are caused by the ADPCM chip */
/* NMIs are caused by the main CPU */
- MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz)
+ MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
MCFG_DEVICE_DISABLE()
/* video hardware */
diff --git a/src/mame/drivers/firetrk.cpp b/src/mame/drivers/firetrk.cpp
index 29dc702af24..06e8f9efd83 100644
--- a/src/mame/drivers/firetrk.cpp
+++ b/src/mame/drivers/firetrk.cpp
@@ -14,7 +14,7 @@
#include "superbug.lh"
-#define MASTER_CLOCK (XTAL_12_096MHz)
+#define MASTER_CLOCK (XTAL(12'096'000))
void firetrk_state::set_service_mode(int enable)
diff --git a/src/mame/drivers/fk1.cpp b/src/mame/drivers/fk1.cpp
index 947e3deb46c..8c6e9562e68 100644
--- a/src/mame/drivers/fk1.cpp
+++ b/src/mame/drivers/fk1.cpp
@@ -408,7 +408,7 @@ uint32_t fk1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c
MACHINE_CONFIG_START(fk1_state::fk1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(fk1_mem)
MCFG_CPU_IO_MAP(fk1_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fk1_state,fk1_irq_callback)
diff --git a/src/mame/drivers/flicker.cpp b/src/mame/drivers/flicker.cpp
index b9298bb3a5f..7b2b99b97b1 100644
--- a/src/mame/drivers/flicker.cpp
+++ b/src/mame/drivers/flicker.cpp
@@ -382,7 +382,7 @@ void flicker_state::driver_start()
MACHINE_CONFIG_START(flicker_state::flicker)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I4004, XTAL_5MHz / 8)
+ MCFG_CPU_ADD("maincpu", I4004, XTAL(5'000'000) / 8)
MCFG_I4004_ROM_MAP(flicker_rom)
MCFG_I4004_RAM_MEMORY_MAP(flicker_memory)
MCFG_I4004_ROM_PORTS_MAP(flicker_rom_ports)
diff --git a/src/mame/drivers/flipjack.cpp b/src/mame/drivers/flipjack.cpp
index df51dc883fa..8e38e912ef5 100644
--- a/src/mame/drivers/flipjack.cpp
+++ b/src/mame/drivers/flipjack.cpp
@@ -85,8 +85,8 @@ ________________________|___________________________
#include "speaker.h"
-#define MASTER_CLOCK XTAL_16MHz
-#define VIDEO_CLOCK XTAL_6MHz
+#define MASTER_CLOCK XTAL(16'000'000)
+#define VIDEO_CLOCK XTAL(6'000'000)
class flipjack_state : public driver_device
diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp
index 44b35dbceaf..7f8d679c5f1 100644
--- a/src/mame/drivers/flower.cpp
+++ b/src/mame/drivers/flower.cpp
@@ -85,7 +85,7 @@ CHIP # POSITION TYPE
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
class flower_state : public driver_device
{
diff --git a/src/mame/drivers/flstory.cpp b/src/mame/drivers/flstory.cpp
index 67fc220ec36..32eeadf939c 100644
--- a/src/mame/drivers/flstory.cpp
+++ b/src/mame/drivers/flstory.cpp
@@ -729,16 +729,16 @@ MACHINE_RESET_MEMBER(flstory_state,flstory)
MACHINE_CONFIG_START(flstory_state::flstory)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10_733MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'733'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(flstory_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
- MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(18'432'000)/6) /* verified on pcb */
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -751,7 +751,7 @@ MACHINE_CONFIG_START(flstory_state::flstory)
// MCFG_SCREEN_SIZE(32*8, 32*8)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
// derived from ladyfrog.cpp, guess
- MCFG_SCREEN_RAW_PARAMS( XTAL_8MHz, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz
+ MCFG_SCREEN_RAW_PARAMS( XTAL(8'000'000), 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz
MCFG_SCREEN_UPDATE_DRIVER(flstory_state, screen_update_flstory)
MCFG_SCREEN_PALETTE("palette")
@@ -773,12 +773,12 @@ MACHINE_CONFIG_START(flstory_state::flstory)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_TA7630_ADD("ta7630")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL_8MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("aysnd", YM2149, XTAL(8'000'000)/4) /* verified on pcb */
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(flstory_state, sound_control_2_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(flstory_state, sound_control_3_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
- MCFG_SOUND_ADD("msm", MSM5232, XTAL_8MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4) /* verified on pcb */
MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -800,11 +800,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(flstory_state::onna34ro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10_733MHz/2) /* ??? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'733'000)/2) /* ??? */
MCFG_CPU_PROGRAM_MAP(onna34ro_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
@@ -820,7 +820,7 @@ MACHINE_CONFIG_START(flstory_state::onna34ro)
// MCFG_SCREEN_SIZE(32*8, 32*8)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
// derived from ladyfrog.cpp, guess
- MCFG_SCREEN_RAW_PARAMS( XTAL_8MHz, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz
+ MCFG_SCREEN_RAW_PARAMS( XTAL(8'000'000), 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz
MCFG_SCREEN_UPDATE_DRIVER(flstory_state, screen_update_flstory)
MCFG_SCREEN_PALETTE("palette")
@@ -842,12 +842,12 @@ MACHINE_CONFIG_START(flstory_state::onna34ro)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_TA7630_ADD("ta7630")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL_8MHz/4)
+ MCFG_SOUND_ADD("aysnd", YM2149, XTAL(8'000'000)/4)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(flstory_state, sound_control_2_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(flstory_state, sound_control_3_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
- MCFG_SOUND_ADD("msm", MSM5232, XTAL_8MHz/4)
+ MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4)
MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -870,22 +870,22 @@ MACHINE_CONFIG_DERIVED(flstory_state::onna34ro_mcu, onna34ro)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(onna34ro_mcu_map)
- MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL_18_432MHz/6) /* ? */
+ MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(18'432'000)/6) /* ? */
MACHINE_CONFIG_END
MACHINE_CONFIG_START(flstory_state::victnine)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* 4 MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(victnine_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
-// MCFG_CPU_ADD("mcu", M68705, XTAL_18_432MHz/6) /* ??? */
+// MCFG_CPU_ADD("mcu", M68705, XTAL(18'432'000)/6) /* ??? */
// MCFG_CPU_PROGRAM_MAP(m68705_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
@@ -899,7 +899,7 @@ MACHINE_CONFIG_START(flstory_state::victnine)
// MCFG_SCREEN_SIZE(32*8, 32*8)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
// derived from ladyfrog.cpp, guess
- MCFG_SCREEN_RAW_PARAMS( XTAL_8MHz, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHzs
+ MCFG_SCREEN_RAW_PARAMS( XTAL(8'000'000), 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHzs
MCFG_SCREEN_UPDATE_DRIVER(flstory_state, screen_update_victnine)
MCFG_SCREEN_PALETTE("palette")
@@ -921,12 +921,12 @@ MACHINE_CONFIG_START(flstory_state::victnine)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_TA7630_ADD("ta7630")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL_8MHz/4)
+ MCFG_SOUND_ADD("aysnd", YM2149, XTAL(8'000'000)/4)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(flstory_state, sound_control_2_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(flstory_state, sound_control_3_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("msm", MSM5232, XTAL_8MHz/4)
+ MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4)
MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -949,16 +949,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(flstory_state::rumba)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(rumba_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
- MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL_18_432MHz/6) /* ? */
+ MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(18'432'000)/6) /* ? */
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -972,7 +972,7 @@ MACHINE_CONFIG_START(flstory_state::rumba)
// MCFG_SCREEN_SIZE(32*8, 32*8)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
// derived from ladyfrog.cpp, guess
- MCFG_SCREEN_RAW_PARAMS( XTAL_8MHz, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz
+ MCFG_SCREEN_RAW_PARAMS( XTAL(8'000'000), 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz
MCFG_SCREEN_UPDATE_DRIVER(flstory_state, screen_update_rumba)
MCFG_SCREEN_PALETTE("palette")
@@ -994,12 +994,12 @@ MACHINE_CONFIG_START(flstory_state::rumba)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_TA7630_ADD("ta7630")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL_8MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("aysnd", YM2149, XTAL(8'000'000)/4) /* verified on pcb */
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(flstory_state, sound_control_2_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(flstory_state, sound_control_3_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("msm", MSM5232, XTAL_8MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4) /* verified on pcb */
MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp
index d7bd51a20df..a13bf997335 100644
--- a/src/mame/drivers/flyball.cpp
+++ b/src/mame/drivers/flyball.cpp
@@ -23,7 +23,7 @@ TODO:
#include "machine/74259.h"
#include "screen.h"
-#define MASTER_CLOCK XTAL_12_096MHz
+#define MASTER_CLOCK XTAL(12'096'000)
#define PIXEL_CLOCK (MASTER_CLOCK / 2)
diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp
index 35864848645..9749dafd6b1 100644
--- a/src/mame/drivers/fm7.cpp
+++ b/src/mame/drivers/fm7.cpp
@@ -2057,18 +2057,18 @@ MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000)
MACHINE_CONFIG_START(fm7_state::fm7)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_16_128MHz / 2)
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(16'128'000) / 2)
MCFG_CPU_PROGRAM_MAP(fm7_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("sub", MC6809, XTAL_16_128MHz / 2)
+ MCFG_CPU_ADD("sub", MC6809, XTAL(16'128'000) / 2)
MCFG_CPU_PROGRAM_MAP(fm7_sub_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("sub")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("psg", AY8910, XTAL_4_9152MHz / 4)
+ MCFG_SOUND_ADD("psg", AY8910, XTAL(4'915'200) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 1.00)
MCFG_SOUND_ADD("beeper", BEEP, 1200)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.50)
@@ -2079,7 +2079,7 @@ MACHINE_CONFIG_START(fm7_state::fm7)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16_128MHz, 1024, 0, 640, 262, 0, 200) // H = 15.75 KHz, V = 60.1145 Hz
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'128'000), 1024, 0, 640, 262, 0, 200) // H = 15.75 KHz, V = 60.1145 Hz
MCFG_SCREEN_UPDATE_DRIVER(fm7_state, screen_update_fm7)
MCFG_PALETTE_ADD_3BIT_BRG("palette")
@@ -2091,7 +2091,7 @@ MACHINE_CONFIG_START(fm7_state::fm7)
MCFG_SOFTWARE_LIST_ADD("cass_list","fm7_cass")
- MCFG_MB8877_ADD("fdc", XTAL_8MHz / 8)
+ MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w))
@@ -2112,12 +2112,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fm7_state::fm8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_4_9152MHz) // 1.2MHz 68A09
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'915'200)) // 1.2MHz 68A09
MCFG_CPU_PROGRAM_MAP(fm8_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("sub", MC6809, XTAL_16_128MHz / 2)
+ MCFG_CPU_ADD("sub", MC6809, XTAL(16'128'000) / 2)
MCFG_CPU_PROGRAM_MAP(fm7_sub_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("sub")
@@ -2132,7 +2132,7 @@ MACHINE_CONFIG_START(fm7_state::fm8)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16_128MHz, 1024, 0, 640, 262, 0, 200)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'128'000), 1024, 0, 640, 262, 0, 200)
MCFG_SCREEN_UPDATE_DRIVER(fm7_state, screen_update_fm7)
MCFG_PALETTE_ADD_3BIT_BRG("palette")
@@ -2142,7 +2142,7 @@ MACHINE_CONFIG_START(fm7_state::fm8)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("fm7_cass")
- MCFG_MB8877_ADD("fdc", XTAL_8MHz / 8)
+ MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w))
@@ -2160,18 +2160,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fm7_state::fm77av)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_16_128MHz / 8)
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(16'128'000) / 8)
MCFG_CPU_PROGRAM_MAP(fm77av_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("sub", MC6809E, XTAL_16_128MHz / 8)
+ MCFG_CPU_ADD("sub", MC6809E, XTAL(16'128'000) / 8)
MCFG_CPU_PROGRAM_MAP(fm77av_sub_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("sub")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym", YM2203, XTAL_4_9152MHz / 4)
+ MCFG_SOUND_ADD("ym", YM2203, XTAL(4'915'200) / 4)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(fm7_state, fm77av_fmirq))
MCFG_AY8910_PORT_A_READ_CB(READ8(fm7_state, fm77av_joy_1_r))
MCFG_AY8910_PORT_B_READ_CB(READ8(fm7_state, fm77av_joy_2_r))
@@ -2202,7 +2202,7 @@ MACHINE_CONFIG_START(fm7_state::fm77av)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16_128MHz, 1024, 0, 640, 262, 0, 200)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'128'000), 1024, 0, 640, 262, 0, 200)
MCFG_SCREEN_UPDATE_DRIVER(fm7_state, screen_update_fm7)
MCFG_PALETTE_ADD_3BIT_BRG("palette")
@@ -2215,7 +2215,7 @@ MACHINE_CONFIG_START(fm7_state::fm77av)
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_list", "fm7_cass")
- MCFG_MB8877_ADD("fdc", XTAL_8MHz / 8)
+ MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w))
@@ -2287,7 +2287,7 @@ MACHINE_CONFIG_START(fm7_state::fm11)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("fm7_cass")
- MCFG_MB8877_ADD("fdc", XTAL_8MHz / 8)
+ MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w))
@@ -2335,7 +2335,7 @@ MACHINE_CONFIG_START(fm7_state::fm16beta)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("fm7_cass")
- MCFG_MB8877_ADD("fdc", XTAL_8MHz / 8)
+ MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w))
diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp
index 75694320f83..d7a55505e6f 100644
--- a/src/mame/drivers/fmtowns.cpp
+++ b/src/mame/drivers/fmtowns.cpp
@@ -2858,7 +2858,7 @@ MACHINE_CONFIG_START(towns_state::towns_base)
MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir7_w))
MCFG_PIC8259_IN_SP_CB(GND)
- MCFG_MB8877_ADD("fdc",XTAL_8MHz/4) // clock unknown
+ MCFG_MB8877_ADD("fdc",XTAL(8'000'000)/4) // clock unknown
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(towns_state,mb8877a_irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(towns_state,mb8877a_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", towns_floppies, "35hd", towns_state::floppy_formats)
diff --git a/src/mame/drivers/fontwriter.cpp b/src/mame/drivers/fontwriter.cpp
index a3173193cdb..22e37bdf154 100644
--- a/src/mame/drivers/fontwriter.cpp
+++ b/src/mame/drivers/fontwriter.cpp
@@ -88,7 +88,7 @@ static INPUT_PORTS_START( fontwriter )
INPUT_PORTS_END
MACHINE_CONFIG_START(fontwriter_state::fontwriter)
- MCFG_CPU_ADD("maincpu", M37720S1, XTAL_16MHz) /* M37720S1 @ 16MHz - main CPU */
+ MCFG_CPU_ADD("maincpu", M37720S1, XTAL(16'000'000)) /* M37720S1 @ 16MHz - main CPU */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp
index 466f85532b5..a90a044a703 100644
--- a/src/mame/drivers/force68k.cpp
+++ b/src/mame/drivers/force68k.cpp
@@ -536,7 +536,7 @@ SLOT_INTERFACE_END
*/
MACHINE_CONFIG_START(force68k_state::fccpu1)
/* basic machine hardware */
- MCFG_CPU_ADD ("maincpu", M68000, XTAL_16MHz / 2)
+ MCFG_CPU_ADD ("maincpu", M68000, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP (force68k_mem)
/* P3/Host Port config
@@ -568,7 +568,7 @@ MACHINE_CONFIG_START(force68k_state::fccpu1)
MCFG_DEVICE_ADD ("aciaremt", ACIA6850, 0)
/* Bit Rate Generator */
- MCFG_MC14411_ADD ("brg", XTAL_1_8432MHz)
+ MCFG_MC14411_ADD ("brg", XTAL(1'843'200))
MCFG_MC14411_F1_CB(WRITELINE (force68k_state, write_f1_clock))
MCFG_MC14411_F3_CB(WRITELINE (force68k_state, write_f3_clock))
MCFG_MC14411_F5_CB(WRITELINE (force68k_state, write_f5_clock))
@@ -580,10 +580,10 @@ MACHINE_CONFIG_START(force68k_state::fccpu1)
MCFG_MC14411_F15_CB(WRITELINE (force68k_state, write_f15_clock))
/* RTC Real Time Clock device */
- MCFG_DEVICE_ADD ("rtc", MM58167, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD ("rtc", MM58167, XTAL(32'768))
/* PIT Parallel Interface and Timer device, assuming strapped for on board clock */
- MCFG_DEVICE_ADD ("pit", PIT68230, XTAL_16MHz / 2)
+ MCFG_DEVICE_ADD ("pit", PIT68230, XTAL(16'000'000) / 2)
MCFG_PIT68230_PA_OUTPUT_CB (DEVWRITE8 ("cent_data_out", output_latch_device, write))
MCFG_PIT68230_H2_CB (DEVWRITELINE ("centronics", centronics_device, write_strobe))
@@ -608,27 +608,27 @@ MACHINE_CONFIG_END
* such as an optional 68881 FPU
*/
MACHINE_CONFIG_START (force68k_state::fccpu6)
- MCFG_CPU_ADD ("maincpu", M68000, XTAL_8MHz) /* Jumper B10 Mode B */
+ MCFG_CPU_ADD ("maincpu", M68000, XTAL(8'000'000)) /* Jumper B10 Mode B */
MCFG_CPU_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START (force68k_state::fccpu6a)
- MCFG_CPU_ADD ("maincpu", M68000, XTAL_12_5MHz) /* Jumper B10 Mode A */
+ MCFG_CPU_ADD ("maincpu", M68000, XTAL(12'500'000)) /* Jumper B10 Mode A */
MCFG_CPU_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START (force68k_state::fccpu6v)
- MCFG_CPU_ADD ("maincpu", M68010, XTAL_8MHz) /* Jumper B10 Mode B */
+ MCFG_CPU_ADD ("maincpu", M68010, XTAL(8'000'000)) /* Jumper B10 Mode B */
MCFG_CPU_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START (force68k_state::fccpu6va)
- MCFG_CPU_ADD ("maincpu", M68010, XTAL_12_5MHz) /* Jumper B10 Mode A */
+ MCFG_CPU_ADD ("maincpu", M68010, XTAL(12'500'000)) /* Jumper B10 Mode A */
MCFG_CPU_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START (force68k_state::fccpu6vb)
- MCFG_CPU_ADD ("maincpu", M68010, XTAL_12_5MHz) /* Jumper B10 Mode A */
+ MCFG_CPU_ADD ("maincpu", M68010, XTAL(12'500'000)) /* Jumper B10 Mode A */
MCFG_CPU_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
#endif
diff --git a/src/mame/drivers/forte2.cpp b/src/mame/drivers/forte2.cpp
index cbbd0fa2762..e03634ab806 100644
--- a/src/mame/drivers/forte2.cpp
+++ b/src/mame/drivers/forte2.cpp
@@ -121,12 +121,12 @@ void forte2_state::machine_start()
MACHINE_CONFIG_START(forte2_state::pesadelo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(program_mem)
MCFG_CPU_IO_MAP(io_mem)
/* video hardware */
- MCFG_DEVICE_ADD("tms9928a", TMS9928A, XTAL_10_738635MHz/2)
+ MCFG_DEVICE_ADD("tms9928a", TMS9928A, XTAL(10'738'635)/2)
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_TMS9928A_SCREEN_ADD_NTSC("screen")
@@ -134,7 +134,7 @@ MACHINE_CONFIG_START(forte2_state::pesadelo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_3_579545MHz/2)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(3'579'545)/2)
MCFG_AY8910_PORT_A_READ_CB(READ8(forte2_state, forte2_ay8910_read_input))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(forte2_state, forte2_ay8910_set_input_mask))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/fortecar.cpp b/src/mame/drivers/fortecar.cpp
index 1ba3dc8310d..16c422a8024 100644
--- a/src/mame/drivers/fortecar.cpp
+++ b/src/mame/drivers/fortecar.cpp
@@ -324,7 +324,7 @@
#include "fortecrd.lh"
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
#define CPU_CLOCK (MASTER_CLOCK/4)
#define CRTC_CLOCK (MASTER_CLOCK/8)
#define AY_CLOCK (MASTER_CLOCK/8)
diff --git a/src/mame/drivers/fp200.cpp b/src/mame/drivers/fp200.cpp
index 18e4eec9518..1e271163505 100644
--- a/src/mame/drivers/fp200.cpp
+++ b/src/mame/drivers/fp200.cpp
@@ -25,7 +25,7 @@
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_6_144MHz
+#define MAIN_CLOCK XTAL(6'144'000)
class fp200_state : public driver_device
{
diff --git a/src/mame/drivers/freekick.cpp b/src/mame/drivers/freekick.cpp
index 6be0afa5a0d..89c5c93d7a7 100644
--- a/src/mame/drivers/freekick.cpp
+++ b/src/mame/drivers/freekick.cpp
@@ -718,7 +718,7 @@ MACHINE_RESET_MEMBER(freekick_state,oigas)
}
MACHINE_CONFIG_START(freekick_state::omega)
- MCFG_CPU_ADD("maincpu", MC8123, XTAL_18_432MHz/6) // unknown divisor
+ MCFG_CPU_ADD("maincpu", MC8123, XTAL(18'432'000)/6) // unknown divisor
MCFG_CPU_PROGRAM_MAP(omega_map)
MCFG_CPU_IO_MAP(omega_io_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
@@ -734,7 +734,7 @@ MACHINE_CONFIG_START(freekick_state::omega)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_18_432MHz/3, 768/2, 0, 512/2, 263, 0+16, 224+16) // unknown divisor
+ MCFG_SCREEN_RAW_PARAMS(XTAL(18'432'000)/3, 768/2, 0, 512/2, 263, 0+16, 224+16) // unknown divisor
MCFG_SCREEN_UPDATE_DRIVER(freekick_state, screen_update_gigas)
MCFG_SCREEN_PALETTE("palette")
@@ -744,23 +744,23 @@ MACHINE_CONFIG_START(freekick_state::omega)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489A, XTAL_18_432MHz/6) // unknown divisor
+ MCFG_SOUND_ADD("sn1", SN76489A, XTAL(18'432'000)/6) // unknown divisor
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76489A, XTAL_18_432MHz/6) // unknown divisor
+ MCFG_SOUND_ADD("sn2", SN76489A, XTAL(18'432'000)/6) // unknown divisor
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn3", SN76489A, XTAL_18_432MHz/6) // unknown divisor
+ MCFG_SOUND_ADD("sn3", SN76489A, XTAL(18'432'000)/6) // unknown divisor
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn4", SN76489A, XTAL_18_432MHz/6) // unknown divisor
+ MCFG_SOUND_ADD("sn4", SN76489A, XTAL(18'432'000)/6) // unknown divisor
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(freekick_state::base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4)
MCFG_CPU_PROGRAM_MAP(pbillrd_map)
MCFG_CPU_PERIODIC_INT_DRIVER(freekick_state, irq0_line_hold, 120) // measured on PCB
MCFG_CPU_VBLANK_INT_DRIVER("screen", freekick_state, freekick_irqgen)
@@ -772,7 +772,7 @@ MACHINE_CONFIG_START(freekick_state::base)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2, 768/2, 0, 512/2, 263, 0+16, 224+16)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2, 768/2, 0, 512/2, 263, 0+16, 224+16)
MCFG_SCREEN_UPDATE_DRIVER(freekick_state, screen_update_pbillrd)
MCFG_SCREEN_PALETTE("palette")
@@ -782,16 +782,16 @@ MACHINE_CONFIG_START(freekick_state::base)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489A, XTAL_12MHz/4)
+ MCFG_SOUND_ADD("sn1", SN76489A, XTAL(12'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76489A, XTAL_12MHz/4)
+ MCFG_SOUND_ADD("sn2", SN76489A, XTAL(12'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn3", SN76489A, XTAL_12MHz/4)
+ MCFG_SOUND_ADD("sn3", SN76489A, XTAL(12'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn4", SN76489A, XTAL_12MHz/4)
+ MCFG_SOUND_ADD("sn4", SN76489A, XTAL(12'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -806,7 +806,7 @@ MACHINE_CONFIG_DERIVED(freekick_state::pbillrd, base)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(freekick_state::pbillrdm, pbillrd)
- MCFG_CPU_REPLACE("maincpu", MC8123, XTAL_12MHz/4)
+ MCFG_CPU_REPLACE("maincpu", MC8123, XTAL(12'000'000)/4)
MCFG_CPU_PROGRAM_MAP(pbillrd_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
MCFG_CPU_PERIODIC_INT_DRIVER(freekick_state, irq0_line_hold, 120) // measured on PCB
@@ -865,7 +865,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(freekick_state::gigasm, base)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", MC8123, XTAL_12MHz/4)
+ MCFG_CPU_REPLACE("maincpu", MC8123, XTAL(12'000'000)/4)
MCFG_CPU_PROGRAM_MAP(gigas_map)
MCFG_CPU_IO_MAP(gigas_io_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
diff --git a/src/mame/drivers/fromanc2.cpp b/src/mame/drivers/fromanc2.cpp
index a4796f3ca4e..fdf84aeb6f2 100644
--- a/src/mame/drivers/fromanc2.cpp
+++ b/src/mame/drivers/fromanc2.cpp
@@ -629,11 +629,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fromanc2_state::fromanc4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16.00 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16.00 MHz */
MCFG_CPU_PROGRAM_MAP(fromanc4_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("lscreen", fromanc2_state, fromanc2_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/4) /* 8.00 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/4) /* 8.00 MHz */
MCFG_CPU_PROGRAM_MAP(fromanc2_sound_map)
MCFG_CPU_IO_MAP(fromanc2_sound_io_map)
diff --git a/src/mame/drivers/fromance.cpp b/src/mame/drivers/fromance.cpp
index d4cc48c5f70..947d761459b 100644
--- a/src/mame/drivers/fromance.cpp
+++ b/src/mame/drivers/fromance.cpp
@@ -942,11 +942,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fromance_state::idolmj)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2) /* 6.00 Mhz ? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 2) /* 6.00 Mhz ? */
MCFG_CPU_PROGRAM_MAP(fromance_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", fromance_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL_12MHz / 2) /* 6.00 Mhz ? */
+ MCFG_CPU_ADD("sub", Z80, XTAL(12'000'000) / 2) /* 6.00 Mhz ? */
MCFG_CPU_PROGRAM_MAP(fromance_sub_map)
MCFG_CPU_IO_MAP(idolmj_sub_io_map)
@@ -967,7 +967,7 @@ MACHINE_CONFIG_START(fromance_state::idolmj)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", fromance)
MCFG_PALETTE_ADD("palette", 2048)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(fromance_state, fromance_gga_data_w))
MCFG_VIDEO_START_OVERRIDE(fromance_state,fromance)
@@ -975,7 +975,7 @@ MACHINE_CONFIG_START(fromance_state::idolmj)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL_12MHz / 6)
+ MCFG_SOUND_ADD("aysnd", YM2149, XTAL(12'000'000) / 6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MCFG_SOUND_ADD("msm", MSM5205, 384000)
@@ -988,11 +988,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fromance_state::fromance)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2) /* 6.00 Mhz ? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 2) /* 6.00 Mhz ? */
MCFG_CPU_PROGRAM_MAP(fromance_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", fromance_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL_12MHz / 2) /* 6.00 Mhz ? */
+ MCFG_CPU_ADD("sub", Z80, XTAL(12'000'000) / 2) /* 6.00 Mhz ? */
MCFG_CPU_PROGRAM_MAP(fromance_sub_map)
MCFG_CPU_IO_MAP(fromance_sub_io_map)
@@ -1013,7 +1013,7 @@ MACHINE_CONFIG_START(fromance_state::fromance)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", fromance)
MCFG_PALETTE_ADD("palette", 2048)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(fromance_state, fromance_gga_data_w))
MCFG_VIDEO_START_OVERRIDE(fromance_state,fromance)
diff --git a/src/mame/drivers/ft68m.cpp b/src/mame/drivers/ft68m.cpp
index 59844352437..a3cd584ce02 100644
--- a/src/mame/drivers/ft68m.cpp
+++ b/src/mame/drivers/ft68m.cpp
@@ -82,7 +82,7 @@ void ft68m_state::machine_reset()
MACHINE_CONFIG_START(ft68m_state::ft68m)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_19_6608MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(19'660'800) / 2)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_DEVICE_ADD("mpsc", UPD7201_NEW, 0)
@@ -92,7 +92,7 @@ MACHINE_CONFIG_START(ft68m_state::ft68m)
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", M68K_IRQ_5))
- MCFG_DEVICE_ADD("stc", AM9513A, XTAL_19_6608MHz / 8)
+ MCFG_DEVICE_ADD("stc", AM9513A, XTAL(19'660'800) / 8)
MCFG_AM9513_OUT2_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_6))
MCFG_AM9513_OUT3_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_7))
MCFG_AM9513_OUT4_CALLBACK(DEVWRITELINE("mpsc", upd7201_new_device, rxca_w))
diff --git a/src/mame/drivers/funkyjet.cpp b/src/mame/drivers/funkyjet.cpp
index b33a978cee5..61bf7de8856 100644
--- a/src/mame/drivers/funkyjet.cpp
+++ b/src/mame/drivers/funkyjet.cpp
@@ -313,11 +313,11 @@ void funkyjet_state::machine_start()
MACHINE_CONFIG_START(funkyjet_state::funkyjet)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* 28 MHz crystal */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000)/2) /* 28 MHz crystal */
MCFG_CPU_PROGRAM_MAP(funkyjet_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", funkyjet_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000)/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
@@ -362,12 +362,12 @@ MACHINE_CONFIG_START(funkyjet_state::funkyjet)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_32_22MHz/9)
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000)/9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki", XTAL_28MHz/28, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(28'000'000)/28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp
index b7ed29568b9..9b5d217bbd7 100644
--- a/src/mame/drivers/funworld.cpp
+++ b/src/mame/drivers/funworld.cpp
@@ -983,7 +983,7 @@
****************************************************************************************/
-#define MASTER_CLOCK XTAL_16MHz
+#define MASTER_CLOCK XTAL(16'000'000)
#define CPU_CLOCK (MASTER_CLOCK/8)
#define SND_CLOCK (MASTER_CLOCK/8)
#define CRTC_CLOCK (MASTER_CLOCK/8)
diff --git a/src/mame/drivers/fuukifg2.cpp b/src/mame/drivers/fuukifg2.cpp
index aaa8c8ad00b..d32f6e5f946 100644
--- a/src/mame/drivers/fuukifg2.cpp
+++ b/src/mame/drivers/fuukifg2.cpp
@@ -441,10 +441,10 @@ void fuuki16_state::machine_reset()
MACHINE_CONFIG_START(fuuki16_state::fuuki16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2) /* 16 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000) / 2) /* 16 MHz */
MCFG_CPU_PROGRAM_MAP(fuuki16_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz / 2) /* 6 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000) / 2) /* 6 MHz */
MCFG_CPU_PROGRAM_MAP(fuuki16_sound_map)
MCFG_CPU_IO_MAP(fuuki16_sound_io_map)
@@ -469,16 +469,16 @@ MACHINE_CONFIG_START(fuuki16_state::fuuki16)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_28_64MHz / 8) /* 3.58 MHz */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(28'640'000) / 8) /* 3.58 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.15)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.15)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL_28_64MHz / 8) /* 3.58 MHz */
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL(28'640'000) / 8) /* 3.58 MHz */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz / 32, PIN7_HIGH) /* 1 Mhz */
+ MCFG_OKIM6295_ADD("oki", XTAL(32'000'000) / 32, PIN7_HIGH) /* 1 Mhz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.85)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.85)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp
index 77ba0ae41c5..3b91f074da3 100644
--- a/src/mame/drivers/gaelco.cpp
+++ b/src/mame/drivers/gaelco.cpp
@@ -615,7 +615,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gaelco_state::maniacsq)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2 ) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2 ) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(maniacsq_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco_state, irq6_line_hold)
@@ -637,7 +637,7 @@ MACHINE_CONFIG_START(gaelco_state::maniacsq)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) // pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -645,7 +645,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gaelco_state::squash)
/* 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(squash_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco_state, irq6_line_hold)
@@ -676,7 +676,7 @@ MACHINE_CONFIG_START(gaelco_state::squash)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -684,7 +684,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gaelco_state::thoop)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2 ) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2 ) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(thoop_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco_state, irq6_line_hold)
@@ -715,7 +715,7 @@ MACHINE_CONFIG_START(gaelco_state::thoop)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) // pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp
index f29e2e41c64..b20913c21c7 100644
--- a/src/mame/drivers/gaelco2.cpp
+++ b/src/mame/drivers/gaelco2.cpp
@@ -180,7 +180,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gaelco2_state::maniacsq)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_26MHz / 2) /* 13 MHz? */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(26'000'000) / 2) /* 13 MHz? */
MCFG_CPU_PROGRAM_MAP(maniacsq_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
@@ -212,7 +212,7 @@ MACHINE_CONFIG_START(gaelco2_state::maniacsq)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(gaelco2_state::maniacsq_d5002fp, maniacsq)
- MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) /* ? */
+ MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(24'000'000) / 2) /* ? */
MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
MACHINE_CONFIG_END
@@ -447,11 +447,11 @@ ROM_END
MACHINE_CONFIG_START(gaelco2_state::play2000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz) /* or from the 34MHz? (34MHz drives the CG-1V-149 PLD?) */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200)) /* or from the 34MHz? (34MHz drives the CG-1V-149 PLD?) */
MCFG_CPU_PROGRAM_MAP(play2000_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
- // MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_11_0592MHz) /* 11.0592MHz */
+ // MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(11'059'200)) /* 11.0592MHz */
// MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
/* video hardware */
@@ -544,7 +544,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bang_state::bang)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_30MHz / 2) /* 15 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(30'000'000) / 2) /* 15 MHz */
MCFG_CPU_PROGRAM_MAP(bang_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bang_state, bang_irq, "screen", 0, 1)
@@ -791,7 +791,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gaelco2_state::alighunt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(alighunt_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
@@ -823,7 +823,7 @@ MACHINE_CONFIG_START(gaelco2_state::alighunt)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(gaelco2_state::alighunt_d5002fp, alighunt)
- MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) /* 12 MHz */
+ MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(24'000'000) / 2) /* 12 MHz */
MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
MACHINE_CONFIG_END
@@ -1088,7 +1088,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gaelco2_state::touchgo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2) /* 16 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000) / 2) /* 16 MHz */
MCFG_CPU_PROGRAM_MAP(touchgo_map)
MCFG_CPU_VBLANK_INT_DRIVER("lscreen", gaelco2_state, irq6_line_hold)
@@ -1136,7 +1136,7 @@ MACHINE_CONFIG_START(gaelco2_state::touchgo)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(gaelco2_state::touchgo_d5002fp, touchgo)
- MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_40MHz / 4) /* 10MHz? - Not verified */
+ MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(40'000'000) / 4) /* 10MHz? - Not verified */
MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
MACHINE_CONFIG_END
@@ -1334,7 +1334,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gaelco2_state::snowboar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_30MHz / 2) /* 15 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(30'000'000) / 2) /* 15 MHz */
MCFG_CPU_PROGRAM_MAP(snowboar_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
@@ -1577,11 +1577,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(wrally2_state::wrally2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_26MHz / 2) /* 13 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(26'000'000) / 2) /* 13 MHz */
MCFG_CPU_PROGRAM_MAP(wrally2_map)
MCFG_CPU_VBLANK_INT_DRIVER("lscreen", gaelco2_state, irq6_line_hold)
- MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_34MHz / 4) /* 8.5MHz? (or 13MHz - 26MHz/2) - Not verified */
+ MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(34'000'000) / 4) /* 8.5MHz? (or 13MHz - 26MHz/2) - Not verified */
MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp
index 0a1b8f44b1b..0580a97f57b 100644
--- a/src/mame/drivers/galaga.cpp
+++ b/src/mame/drivers/galaga.cpp
@@ -720,7 +720,7 @@ TODO:
#include "speaker.h"
-#define MASTER_CLOCK (XTAL_18_432MHz)
+#define MASTER_CLOCK (XTAL(18'432'000))
diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp
index c0adc13b03b..ead28299aa9 100644
--- a/src/mame/drivers/galaxi.cpp
+++ b/src/mame/drivers/galaxi.cpp
@@ -42,8 +42,8 @@
#include "galaxi.lh"
-#define CPU_CLOCK (XTAL_10MHz)
-#define SND_CLOCK (XTAL_16MHz)/16
+#define CPU_CLOCK (XTAL(10'000'000))
+#define SND_CLOCK (XTAL(16'000'000))/16
class galaxi_state : public driver_device
{
diff --git a/src/mame/drivers/galaxia.cpp b/src/mame/drivers/galaxia.cpp
index cc7a28247da..689833aa344 100644
--- a/src/mame/drivers/galaxia.cpp
+++ b/src/mame/drivers/galaxia.cpp
@@ -287,7 +287,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(galaxia_state::galaxia)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, XTAL_14_31818MHz/8)
+ MCFG_CPU_ADD("maincpu", S2650, XTAL(14'318'181)/8)
MCFG_CPU_PROGRAM_MAP(galaxia_mem_map)
MCFG_CPU_IO_MAP(galaxia_io_map)
MCFG_CPU_DATA_MAP(galaxia_data_map)
@@ -331,7 +331,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxia_state::astrowar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, XTAL_14_31818MHz/8)
+ MCFG_CPU_ADD("maincpu", S2650, XTAL(14'318'181)/8)
MCFG_CPU_PROGRAM_MAP(astrowar_mem_map)
MCFG_CPU_IO_MAP(galaxia_io_map)
MCFG_CPU_DATA_MAP(galaxia_data_map)
diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp
index 77ff80f7cef..48c0f083701 100644
--- a/src/mame/drivers/galaxian.cpp
+++ b/src/mame/drivers/galaxian.cpp
@@ -669,7 +669,7 @@ TODO:
#include "speaker.h"
-#define KONAMI_SOUND_CLOCK XTAL_14_31818MHz
+#define KONAMI_SOUND_CLOCK XTAL(14'318'181)
@@ -6109,11 +6109,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(galaxian_state::takeoff, explorer) // takeoff shares the same main map as explorer, but uses only one AY8912 for sound.
MCFG_SOUND_MODIFY("maincpu")
- MCFG_DEVICE_CLOCK(XTAL_12MHz / 8) // XTAL verified, divider not verified
+ MCFG_DEVICE_CLOCK(XTAL(12'000'000) / 8) // XTAL verified, divider not verified
/* 2nd CPU to drive sound */
MCFG_SOUND_MODIFY("audiocpu")
- MCFG_DEVICE_CLOCK(XTAL_12MHz / 8)
+ MCFG_DEVICE_CLOCK(XTAL(12'000'000) / 8)
MCFG_CPU_PROGRAM_MAP(takeoff_sound_map)
MCFG_CPU_IO_MAP(takeoff_sound_portmap)
@@ -6121,7 +6121,7 @@ MACHINE_CONFIG_DERIVED(galaxian_state::takeoff, explorer) // takeoff shares the
MCFG_DEVICE_REMOVE("8910.0")
MCFG_DEVICE_REMOVE("8910.1")
- MCFG_SOUND_ADD("8912", AY8912, XTAL_12MHz / 8)
+ MCFG_SOUND_ADD("8912", AY8912, XTAL(12'000'000) / 8)
MCFG_AY8910_PORT_A_READ_CB(READ8(galaxian_state, explorer_sound_latch_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp
index 4c65babc7b9..4a60dd52468 100644
--- a/src/mame/drivers/galaxold.cpp
+++ b/src/mame/drivers/galaxold.cpp
@@ -117,7 +117,7 @@ Stephh's notes (based on the games Z80 code and some tests) for other games :
*
*************************************/
-#define MASTER_CLOCK (XTAL_18_432MHz)
+#define MASTER_CLOCK (XTAL(18'432'000))
#define PIXEL_CLOCK (MASTER_CLOCK/3)
diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp
index 0dc3c79e3bd..eba284ab0c6 100644
--- a/src/mame/drivers/galgames.cpp
+++ b/src/mame/drivers/galgames.cpp
@@ -184,7 +184,7 @@ protected:
DEFINE_DEVICE_TYPE(GALGAMES_STARPAK2_CART, galgames_starpak2_cart_device, "starpak2_cart", "Galaxy Games StarPak 2 Cartridge")
MACHINE_CONFIG_START(galgames_starpak2_cart_device::device_add_mconfig)
- MCFG_CPU_ADD("pic", PIC16C56, XTAL_4MHz) // !! PIC12C508 !! 4MHz internal RC oscillator (selected by the configuration word)
+ MCFG_CPU_ADD("pic", PIC16C56, XTAL(4'000'000)) // !! PIC12C508 !! 4MHz internal RC oscillator (selected by the configuration word)
MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r))
MCFG_PIC16C5x_WRITE_B_CB(WRITE8(galgames_cart_device, int_pic_data_w))
@@ -215,7 +215,7 @@ protected:
DEFINE_DEVICE_TYPE(GALGAMES_STARPAK3_CART, galgames_starpak3_cart_device, "starpak3_cart", "Galaxy Games StarPak 3 Cartridge")
MACHINE_CONFIG_START(galgames_starpak3_cart_device::device_add_mconfig)
- MCFG_CPU_ADD("pic", PIC16C56, XTAL_4MHz)
+ MCFG_CPU_ADD("pic", PIC16C56, XTAL(4'000'000))
MCFG_PIC16C5x_WRITE_A_CB(WRITE8(galgames_cart_device, int_pic_bank_w))
MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r))
MCFG_PIC16C5x_WRITE_B_CB(WRITE8(galgames_cart_device, int_pic_data_w))
@@ -972,7 +972,7 @@ int galgames_compute_addr(uint16_t reg_low, uint16_t reg_mid, uint16_t reg_high)
}
MACHINE_CONFIG_START(galgames_state::galgames_base)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(galgames_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galgames_state, scanline_interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -989,7 +989,7 @@ MACHINE_CONFIG_START(galgames_state::galgames_base)
MCFG_SCREEN_UPDATE_DRIVER(galgames_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_CESBLIT_ADD("blitter", "screen", XTAL_24MHz)
+ MCFG_CESBLIT_ADD("blitter", "screen", XTAL(24'000'000))
MCFG_CESBLIT_MAP(blitter_map)
MCFG_CESBLIT_COMPUTE_ADDR(galgames_compute_addr)
MCFG_CESBLIT_IRQ_CB(WRITELINE(galgames_state, blitter_irq_callback))
@@ -999,7 +999,7 @@ MACHINE_CONFIG_START(galgames_state::galgames_base)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz / 16, PIN7_HIGH) // clock frequency & pin 7 not verified (voices in galgame4 seem ok)
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000) / 16, PIN7_HIGH) // clock frequency & pin 7 not verified (voices in galgame4 seem ok)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galivan.cpp b/src/mame/drivers/galivan.cpp
index fed4b77b427..908420ea3a6 100644
--- a/src/mame/drivers/galivan.cpp
+++ b/src/mame/drivers/galivan.cpp
@@ -421,15 +421,15 @@ MACHINE_RESET_MEMBER(galivan_state,ninjemak)
MACHINE_CONFIG_START(galivan_state::galivan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* 6 MHz? */
MCFG_CPU_PROGRAM_MAP(galivan_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", galivan_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* 4 MHz? */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz? */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(galivan_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(galivan_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(galivan_state,galivan)
MCFG_MACHINE_RESET_OVERRIDE(galivan_state,galivan)
@@ -458,7 +458,7 @@ MACHINE_CONFIG_START(galivan_state::galivan)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL_8MHz/2)
+ MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(8'000'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
@@ -471,15 +471,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galivan_state::ninjemak)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* 6 MHz? */
MCFG_CPU_PROGRAM_MAP(ninjemak_map)
MCFG_CPU_IO_MAP(ninjemak_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", galivan_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* 4 MHz? */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz? */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(galivan_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(galivan_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(galivan_state,ninjemak)
MCFG_MACHINE_RESET_OVERRIDE(galivan_state,ninjemak)
@@ -510,7 +510,7 @@ MACHINE_CONFIG_START(galivan_state::ninjemak)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL_8MHz/2)
+ MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(8'000'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
diff --git a/src/mame/drivers/galpani2.cpp b/src/mame/drivers/galpani2.cpp
index e64325db341..878b2d55b9f 100644
--- a/src/mame/drivers/galpani2.cpp
+++ b/src/mame/drivers/galpani2.cpp
@@ -622,12 +622,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(galpani2_state::galpani2_interrupt2)
MACHINE_CONFIG_START(galpani2_state::galpani2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_27MHz/2) /* Confirmed on galpani2i PCB */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(27'000'000)/2) /* Confirmed on galpani2i PCB */
MCFG_CPU_PROGRAM_MAP(galpani2_mem1)
MCFG_TIMER_DRIVER_ADD_SCANLINE("m_scantimer", galpani2_state, galpani2_interrupt1, "screen", 0, 1)
//MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("sub", M68000, XTAL_27MHz/2) /* Confirmed on galpani2i PCB */
+ MCFG_CPU_ADD("sub", M68000, XTAL(27'000'000)/2) /* Confirmed on galpani2i PCB */
MCFG_CPU_PROGRAM_MAP(galpani2_mem2)
MCFG_TIMER_DRIVER_ADD_SCANLINE("s_scantimer", galpani2_state, galpani2_interrupt2, "screen", 0, 1)
@@ -660,10 +660,10 @@ MACHINE_CONFIG_START(galpani2_state::galpani2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", XTAL_20MHz/10, PIN7_HIGH) /* Confirmed on galpani2i PCB */
+ MCFG_OKIM6295_ADD("oki1", XTAL(20'000'000)/10, PIN7_HIGH) /* Confirmed on galpani2i PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_20MHz/10, PIN7_HIGH) /* Confirmed on galpani2i PCB */
+ MCFG_OKIM6295_ADD("oki2", XTAL(20'000'000)/10, PIN7_HIGH) /* Confirmed on galpani2i PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galpani3.cpp b/src/mame/drivers/galpani3.cpp
index c506f789e33..3db9950f207 100644
--- a/src/mame/drivers/galpani3.cpp
+++ b/src/mame/drivers/galpani3.cpp
@@ -504,7 +504,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(galpani3_state::galpani3)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28_63636MHz/2) // Confirmed from PCB
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'636'363)/2) // Confirmed from PCB
MCFG_CPU_PROGRAM_MAP(galpani3_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galpani3_state, galpani3_vblank, "screen", 0, 1)
@@ -543,7 +543,7 @@ MACHINE_CONFIG_START(galpani3_state::galpani3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_33_333MHz / 2) // Confirmed from PCB
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(33'333'000) / 2) // Confirmed from PCB
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galpanic.cpp b/src/mame/drivers/galpanic.cpp
index 6bb7b17aa5c..2f35f349c6e 100644
--- a/src/mame/drivers/galpanic.cpp
+++ b/src/mame/drivers/galpanic.cpp
@@ -232,7 +232,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(galpanic_state::galpanic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(galpanic_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galpanic_state, scanline, "screen", 0, 1)
@@ -260,7 +260,7 @@ MACHINE_CONFIG_START(galpanic_state::galpanic)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/6, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/6, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, galpanic_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galspnbl.cpp b/src/mame/drivers/galspnbl.cpp
index a98a7ed44a7..c9f592c7ec9 100644
--- a/src/mame/drivers/galspnbl.cpp
+++ b/src/mame/drivers/galspnbl.cpp
@@ -215,11 +215,11 @@ void galspnbl_state::machine_start()
MACHINE_CONFIG_START(galspnbl_state::galspnbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* 12 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* 12 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", galspnbl_state, irq3_line_hold)/* also has vector for 6, but it does nothing */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_4MHz) /* 4 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000)) /* 4 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */
MCFG_CPU_PROGRAM_MAP(audio_map)
/* NMI is caused by the main CPU */
@@ -250,11 +250,11 @@ MACHINE_CONFIG_START(galspnbl_state::galspnbl)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* Use value from Super Pinball Action - NEEDS VERIFICATION!! */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(4'000'000)) /* Use value from Super Pinball Action - NEEDS VERIFICATION!! */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, PIN7_HIGH) /* Use value from Super Pinball Action - clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", XTAL(4'000'000)/4, PIN7_HIGH) /* Use value from Super Pinball Action - clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gambl186.cpp b/src/mame/drivers/gambl186.cpp
index 6076a6a8a6a..8ee21199f1a 100644
--- a/src/mame/drivers/gambl186.cpp
+++ b/src/mame/drivers/gambl186.cpp
@@ -467,14 +467,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gambl186_state::gambl186)
- MCFG_CPU_ADD("maincpu", I80186, XTAL_40MHz)
+ MCFG_CPU_ADD("maincpu", I80186, XTAL(40'000'000))
MCFG_CPU_PROGRAM_MAP(gambl186_map)
MCFG_CPU_IO_MAP(gambl186_io)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
diff --git a/src/mame/drivers/gamecom.cpp b/src/mame/drivers/gamecom.cpp
index 5542e53683c..92d1a4ae425 100644
--- a/src/mame/drivers/gamecom.cpp
+++ b/src/mame/drivers/gamecom.cpp
@@ -249,7 +249,7 @@ INTERRUPT_GEN_MEMBER(gamecom_state::gamecom_interrupt)
MACHINE_CONFIG_START(gamecom_state::gamecom)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", SM8500, XTAL_11_0592MHz/2 ) /* actually it's an sm8521 microcontroller containing an sm8500 cpu */
+ MCFG_CPU_ADD( "maincpu", SM8500, XTAL(11'059'200)/2 ) /* actually it's an sm8521 microcontroller containing an sm8500 cpu */
MCFG_CPU_PROGRAM_MAP( gamecom_mem_map)
MCFG_SM8500_DMA_CB( WRITE8( gamecom_state, gamecom_handle_dma ) )
MCFG_SM8500_TIMER_CB( WRITE8( gamecom_state, gamecom_update_timers ) )
diff --git a/src/mame/drivers/gamepock.cpp b/src/mame/drivers/gamepock.cpp
index 0f8428aafe4..c6f6147f317 100644
--- a/src/mame/drivers/gamepock.cpp
+++ b/src/mame/drivers/gamepock.cpp
@@ -42,7 +42,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gamepock_state::gamepock)
- MCFG_CPU_ADD("maincpu", UPD78C06, XTAL_6MHz) /* uPD78C06AG */
+ MCFG_CPU_ADD("maincpu", UPD78C06, XTAL(6'000'000)) /* uPD78C06AG */
MCFG_CPU_PROGRAM_MAP( gamepock_mem)
MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(gamepock_state, port_a_w))
MCFG_UPD7810_PORTB_READ_CB(READ8(gamepock_state, port_b_r))
diff --git a/src/mame/drivers/gamtor.cpp b/src/mame/drivers/gamtor.cpp
index d8aab9ce691..1875da620ee 100644
--- a/src/mame/drivers/gamtor.cpp
+++ b/src/mame/drivers/gamtor.cpp
@@ -85,7 +85,7 @@ MACHINE_CONFIG_START(gaminator_state::gaminator)
MCFG_MCF5206E_PERIPHERAL_ADD("maincpu_onboard")
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", gamtor_vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp
index a8b3978601d..8acd3187211 100644
--- a/src/mame/drivers/gaplus.cpp
+++ b/src/mame/drivers/gaplus.cpp
@@ -515,15 +515,15 @@ void gaplus_state::machine_start()
MACHINE_CONFIG_START(gaplus_state::gaplus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_24_576MHz/16) /* 1.536 MHz */
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(24'576'000)/16) /* 1.536 MHz */
MCFG_CPU_PROGRAM_MAP(cpu1_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaplus_state, vblank_main_irq)
- MCFG_CPU_ADD("sub", MC6809E, XTAL_24_576MHz/16) /* 1.536 MHz */
+ MCFG_CPU_ADD("sub", MC6809E, XTAL(24'576'000)/16) /* 1.536 MHz */
MCFG_CPU_PROGRAM_MAP(cpu2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaplus_state, vblank_sub_irq)
- MCFG_CPU_ADD("sub2", MC6809E, XTAL_24_576MHz/16) /* 1.536 MHz */
+ MCFG_CPU_ADD("sub2", MC6809E, XTAL(24'576'000)/16) /* 1.536 MHz */
MCFG_CPU_PROGRAM_MAP(cpu3_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaplus_state, vblank_sub2_irq)
@@ -571,7 +571,7 @@ MACHINE_CONFIG_START(gaplus_state::gaplus)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO_15XX, XTAL_24_576MHz/1024)
+ MCFG_SOUND_ADD("namco", NAMCO_15XX, XTAL(24'576'000)/1024)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/gatron.cpp b/src/mame/drivers/gatron.cpp
index 5779c889e76..0f730fb77c7 100644
--- a/src/mame/drivers/gatron.cpp
+++ b/src/mame/drivers/gatron.cpp
@@ -336,7 +336,7 @@
#include "pulltabs.lh"
-#define MASTER_CLOCK XTAL_16MHz
+#define MASTER_CLOCK XTAL(16'000'000)
/****************************
* Read/Write Handlers *
diff --git a/src/mame/drivers/gb.cpp b/src/mame/drivers/gb.cpp
index f4fef62b62c..6e4c2c03c4b 100644
--- a/src/mame/drivers/gb.cpp
+++ b/src/mame/drivers/gb.cpp
@@ -607,7 +607,7 @@ PALETTE_INIT_MEMBER(megaduck_state, megaduck)
MACHINE_CONFIG_START(gb_state::gameboy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", LR35902, XTAL_4_194304Mhz)
+ MCFG_CPU_ADD("maincpu", LR35902, XTAL(4'194'304))
MCFG_CPU_PROGRAM_MAP(gameboy_map)
MCFG_LR35902_TIMER_CB( WRITE8( gb_state, gb_timer_callback ) )
MCFG_LR35902_HALT_BUG
@@ -632,7 +632,7 @@ MACHINE_CONFIG_START(gb_state::gameboy)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("apu", DMG_APU, XTAL_4_194304Mhz)
+ MCFG_SOUND_ADD("apu", DMG_APU, XTAL(4'194'304))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -722,7 +722,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gb_state::gbcolor)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", LR35902, XTAL_4_194304Mhz) // todo XTAL_8_388MHz
+ MCFG_CPU_ADD("maincpu", LR35902, XTAL(4'194'304)) // todo XTAL(8'388'000)
MCFG_CPU_PROGRAM_MAP(gbc_map)
MCFG_LR35902_TIMER_CB( WRITE8(gb_state, gb_timer_callback ) )
@@ -750,7 +750,7 @@ MACHINE_CONFIG_START(gb_state::gbcolor)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("apu", CGB04_APU, XTAL_4_194304Mhz)
+ MCFG_SOUND_ADD("apu", CGB04_APU, XTAL(4'194'304))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -768,7 +768,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(megaduck_state::megaduck)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", LR35902, XTAL_4_194304Mhz) /* 4.194304 MHz */
+ MCFG_CPU_ADD("maincpu", LR35902, XTAL(4'194'304)) /* 4.194304 MHz */
MCFG_CPU_PROGRAM_MAP(megaduck_map)
MCFG_LR35902_TIMER_CB( WRITE8(gb_state, gb_timer_callback ) )
MCFG_LR35902_HALT_BUG
@@ -796,7 +796,7 @@ MACHINE_CONFIG_START(megaduck_state::megaduck)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("apu", DMG_APU, XTAL_4_194304Mhz)
+ MCFG_SOUND_ADD("apu", DMG_APU, XTAL(4'194'304))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
diff --git a/src/mame/drivers/gba.cpp b/src/mame/drivers/gba.cpp
index ce33b878bc5..8f416c0c364 100644
--- a/src/mame/drivers/gba.cpp
+++ b/src/mame/drivers/gba.cpp
@@ -132,7 +132,7 @@ static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, co
}
}
-static const uint32_t timer_clks[4] = { XTAL_16_777216MHz, XTAL_16_777216MHz / 64, XTAL_16_777216MHz / 256, XTAL_16_777216MHz / 1024 };
+static const XTAL timer_clks[4] = { XTAL(16'777'216), XTAL(16'777'216) / 64, XTAL(16'777'216) / 256, XTAL(16'777'216) / 1024 };
void gba_state::request_irq(uint32_t int_type)
@@ -408,7 +408,7 @@ TIMER_CALLBACK_MEMBER(gba_state::timer_expire)
m_timer_recalc[tmr] = 0;
m_timer_regs[tmr] = (m_timer_regs[tmr] & 0xFFFF0000) | (m_timer_reload[tmr] & 0x0000FFFF);
rate = 0x10000 - (m_timer_regs[tmr] & 0xffff);
- clocksel = timer_clks[(m_timer_regs[tmr] >> 16) & 3];
+ clocksel = timer_clks[(m_timer_regs[tmr] >> 16) & 3].dvalue();
final = clocksel / rate;
m_timer_hz[tmr] = final;
time = attotime::from_hz(final);
@@ -1079,7 +1079,7 @@ WRITE32_MEMBER(gba_state::gba_io_w)
rate = 0x10000 - (m_timer_regs[timer] & 0xffff);
- clocksel = timer_clks[(m_timer_regs[timer] >> 16) & 3];
+ clocksel = timer_clks[(m_timer_regs[timer] >> 16) & 3].dvalue();
final = clocksel / rate;
@@ -1430,7 +1430,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(gba_state::gbadv)
- MCFG_CPU_ADD("maincpu", ARM7, XTAL_16_777216MHz)
+ MCFG_CPU_ADD("maincpu", ARM7, XTAL(16'777'216))
MCFG_CPU_PROGRAM_MAP(gba_map)
MCFG_GBA_LCD_ADD("lcd")
@@ -1441,7 +1441,7 @@ MACHINE_CONFIG_START(gba_state::gbadv)
MCFG_GBA_LCD_DMA_VBLANK(WRITELINE(gba_state, dma_vblank_callback))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("custom", CGB04_APU, XTAL_16_777216MHz/4)
+ MCFG_SOUND_ADD("custom", CGB04_APU, XTAL(16'777'216)/4)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
diff --git a/src/mame/drivers/gberet.cpp b/src/mame/drivers/gberet.cpp
index d047d931ec0..befe21fbeb1 100644
--- a/src/mame/drivers/gberet.cpp
+++ b/src/mame/drivers/gberet.cpp
@@ -408,7 +408,7 @@ MACHINE_RESET_MEMBER(gberet_state,gberet)
MACHINE_CONFIG_START(gberet_state::gberet)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) // X1S (generated by a custom IC)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) // X1S (generated by a custom IC)
MCFG_CPU_PROGRAM_MAP(gberet_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", gberet_state, gberet_interrupt_tick, "screen", 0, 16)
MCFG_WATCHDOG_ADD("watchdog")
@@ -434,7 +434,7 @@ MACHINE_CONFIG_START(gberet_state::gberet)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489A, XTAL_18_432MHz/12) /* type verified on real and bootleg pcb */
+ MCFG_SOUND_ADD("snsnd", SN76489A, XTAL(18'432'000)/12) /* type verified on real and bootleg pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -448,10 +448,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gberet_state::gberetb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz/4) // divider guessed
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(20'000'000)/4) // divider guessed
MCFG_CPU_PROGRAM_MAP(gberetb_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gberet_state, irq0_line_assert)
- MCFG_CPU_PERIODIC_INT_DRIVER(gberet_state, nmi_line_assert, XTAL_20MHz/0x8000) // divider guessed
+ MCFG_CPU_PERIODIC_INT_DRIVER(gberet_state, nmi_line_assert, XTAL(20'000'000)/0x8000) // divider guessed
MCFG_MACHINE_START_OVERRIDE(gberet_state,gberet)
MCFG_MACHINE_RESET_OVERRIDE(gberet_state,gberet)
@@ -474,7 +474,7 @@ MACHINE_CONFIG_START(gberet_state::gberetb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489A, XTAL_20MHz/12) // divider guessed
+ MCFG_SOUND_ADD("snsnd", SN76489A, XTAL(20'000'000)/12) // divider guessed
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gcpinbal.cpp b/src/mame/drivers/gcpinbal.cpp
index d9d50999184..4c7f25bdc46 100644
--- a/src/mame/drivers/gcpinbal.cpp
+++ b/src/mame/drivers/gcpinbal.cpp
@@ -452,7 +452,7 @@ void gcpinbal_state::machine_reset()
MACHINE_CONFIG_START(gcpinbal_state::gcpinbal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16 MHz */
MCFG_CPU_PROGRAM_MAP(gcpinbal_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gcpinbal_state, gcpinbal_interrupt)
@@ -479,13 +479,13 @@ MACHINE_CONFIG_START(gcpinbal_state::gcpinbal)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_DEVICE_ADD("adpcm_select", HCT157, 0)
MCFG_74157_OUT_CB(DEVWRITE8("msm", msm6585_device, data_w))
- MCFG_SOUND_ADD("msm", MSM6585, XTAL_640kHz)
+ MCFG_SOUND_ADD("msm", MSM6585, XTAL(640'000))
MCFG_MSM6585_VCK_CALLBACK(WRITELINE(gcpinbal_state, gcp_adpcm_int))
MCFG_MSM6585_PRESCALER_SELECTOR(S40) /* 16 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/geneve.cpp b/src/mame/drivers/geneve.cpp
index d31e63c2518..72b42de49fa 100644
--- a/src/mame/drivers/geneve.cpp
+++ b/src/mame/drivers/geneve.cpp
@@ -698,9 +698,9 @@ MACHINE_CONFIG_START(geneve_state::geneve_60hz)
MCFG_TMS9995_DBIN_HANDLER( WRITELINE(geneve_state, dbin_line) )
// Video hardware
- MCFG_V9938_ADD(TI_VDP_TAG, TI_SCREEN_TAG, 0x20000, XTAL_21_4772MHz) /* typical 9938 clock, not verified */
+ MCFG_V9938_ADD(TI_VDP_TAG, TI_SCREEN_TAG, 0x20000, XTAL(21'477'272)) /* typical 9938 clock, not verified */
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(geneve_state, set_tms9901_INT2_from_v9938))
- MCFG_V99X8_SCREEN_ADD_NTSC(TI_SCREEN_TAG, TI_VDP_TAG, XTAL_21_4772MHz)
+ MCFG_V99X8_SCREEN_ADD_NTSC(TI_SCREEN_TAG, TI_VDP_TAG, XTAL(21'477'272))
// Main board components
MCFG_DEVICE_ADD(TI_TMS9901_TAG, TMS9901, 3000000)
diff --git a/src/mame/drivers/geniusiq.cpp b/src/mame/drivers/geniusiq.cpp
index 6d0f7f1030d..a907f8f30c1 100644
--- a/src/mame/drivers/geniusiq.cpp
+++ b/src/mame/drivers/geniusiq.cpp
@@ -797,7 +797,7 @@ DEVICE_IMAGE_UNLOAD_MEMBER(geniusiq_state,iq128_cart)
MACHINE_CONFIG_START(geniusiq_state::iq128)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // The main crystal is at 32MHz, not sure whats the CPU freq
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) // The main crystal is at 32MHz, not sure whats the CPU freq
MCFG_CPU_PROGRAM_MAP(geniusiq_mem)
MCFG_CPU_PERIODIC_INT_DRIVER(geniusiq_state, irq6_line_hold, 125) // the internal clock is increased by 1 sec every 125 interrupts
@@ -833,7 +833,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gl8008cx_state::gl8008cx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // TODO wrong CPU and frequency
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) // TODO wrong CPU and frequency
MCFG_CPU_PROGRAM_MAP(gl8008cx_mem)
/* video hardware */
diff --git a/src/mame/drivers/ggconnie.cpp b/src/mame/drivers/ggconnie.cpp
index 97e6add7e0b..4aa8723f3e0 100644
--- a/src/mame/drivers/ggconnie.cpp
+++ b/src/mame/drivers/ggconnie.cpp
@@ -216,7 +216,7 @@ MACHINE_CONFIG_START(ggconnie_state::ggconnie)
MCFG_HUC6202_READ_1_CB(DEVREAD8("huc6270_1", huc6270_device, read))
MCFG_HUC6202_WRITE_1_CB(DEVWRITE8("huc6270_1", huc6270_device, write))
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
MCFG_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp
index b2e6b473c4b..1c895df508c 100644
--- a/src/mame/drivers/ghosteo.cpp
+++ b/src/mame/drivers/ghosteo.cpp
@@ -653,7 +653,7 @@ MACHINE_CONFIG_START(ghosteo_state::ghosteo)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("qs1000", QS1000, XTAL_24MHz)
+ MCFG_SOUND_ADD("qs1000", QS1000, XTAL(24'000'000))
MCFG_QS1000_EXTERNAL_ROM(true)
MCFG_QS1000_IN_P1_CB(READ8(ghosteo_state, qs1000_p1_r))
MCFG_QS1000_OUT_P1_CB(WRITE8(ghosteo_state, qs1000_p1_w))
diff --git a/src/mame/drivers/giclassic.cpp b/src/mame/drivers/giclassic.cpp
index a35714003fb..08bffcdad03 100644
--- a/src/mame/drivers/giclassic.cpp
+++ b/src/mame/drivers/giclassic.cpp
@@ -293,7 +293,7 @@ void giclassicsvr_state::machine_reset()
MACHINE_CONFIG_START(giclassic_state::giclassic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2) // PCB is marked "68000 12 MHz", but only visible osc is 20 MHz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000) / 2) // PCB is marked "68000 12 MHz", but only visible osc is 20 MHz
MCFG_CPU_PROGRAM_MAP(satellite_main)
MCFG_CPU_VBLANK_INT_DRIVER("screen", giclassic_state, giclassic_interrupt)
@@ -319,7 +319,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(giclassicsvr_state::giclassvr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // unknown speed
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) // unknown speed
MCFG_CPU_PROGRAM_MAP(server_main)
MCFG_CPU_VBLANK_INT_DRIVER("screen", giclassicsvr_state, giclassicsvr_interrupt)
@@ -346,10 +346,10 @@ MACHINE_CONFIG_START(giclassicsvr_state::giclassvr)
MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_PS, -60, 24)
MCFG_K055673_PALETTE("palette")
- MCFG_DEVICE_ADD("k053252a", K053252, XTAL_32MHz/4)
+ MCFG_DEVICE_ADD("k053252a", K053252, XTAL(32'000'000)/4)
MCFG_K053252_OFFSETS(40, 16) // TODO
- MCFG_DEVICE_ADD("k053252b", K053252, XTAL_32MHz/4)
+ MCFG_DEVICE_ADD("k053252b", K053252, XTAL(32'000'000)/4)
MCFG_K053252_OFFSETS(40, 16) // TODO
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gijoe.cpp b/src/mame/drivers/gijoe.cpp
index 7d552a99492..27e6e6532e0 100644
--- a/src/mame/drivers/gijoe.cpp
+++ b/src/mame/drivers/gijoe.cpp
@@ -292,11 +292,11 @@ void gijoe_state::machine_reset()
MACHINE_CONFIG_START(gijoe_state::gijoe)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz Confirmed */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz Confirmed */
MCFG_CPU_PROGRAM_MAP(gijoe_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gijoe_state, gijoe_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/4) /* Amuse & confirmed. Z80E at 8MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/4) /* Amuse & confirmed. Z80E at 8MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom")
@@ -332,7 +332,7 @@ MACHINE_CONFIG_START(gijoe_state::gijoe)
MCFG_K054321_ADD("k054321", ":lspeaker", ":rspeaker")
- MCFG_DEVICE_ADD("k054539", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
MCFG_K054539_TIMER_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/gimix.cpp b/src/mame/drivers/gimix.cpp
index 7dfe05b2300..1354d288874 100644
--- a/src/mame/drivers/gimix.cpp
+++ b/src/mame/drivers/gimix.cpp
@@ -447,9 +447,9 @@ INPUT_CHANGED_MEMBER(gimix_state::drive_size_cb)
{
// set FDC clock based on DIP Switch S2-9 (5.25"/8" drive select)
if(m_dma_dip->read() & 0x00000100)
- m_fdc->set_unscaled_clock(XTAL_8MHz / 4); // 8 inch (2MHz)
+ m_fdc->set_unscaled_clock(XTAL(8'000'000) / 4); // 8 inch (2MHz)
else
- m_fdc->set_unscaled_clock(XTAL_8MHz / 8); // 5.25 inch (1MHz)
+ m_fdc->set_unscaled_clock(XTAL(8'000'000) / 8); // 5.25 inch (1MHz)
}
void gimix_state::machine_reset()
@@ -470,9 +470,9 @@ void gimix_state::machine_reset()
// initialise FDC clock based on DIP Switch S2-9 (5.25"/8" drive select)
if(m_dma_dip->read() & 0x00000100)
- m_fdc->set_unscaled_clock(XTAL_8MHz / 4); // 8 inch (2MHz)
+ m_fdc->set_unscaled_clock(XTAL(8'000'000) / 4); // 8 inch (2MHz)
else
- m_fdc->set_unscaled_clock(XTAL_8MHz / 8); // 5.25 inch (1MHz)
+ m_fdc->set_unscaled_clock(XTAL(8'000'000) / 8); // 5.25 inch (1MHz)
}
void gimix_state::machine_start()
@@ -546,20 +546,20 @@ MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000)
MACHINE_CONFIG_START(gimix_state::gimix)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(gimix_mem)
MCFG_CPU_IO_MAP(gimix_io)
/* rtc */
- MCFG_DEVICE_ADD("rtc", MM58167, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768))
MCFG_MM58167_IRQ_CALLBACK(WRITELINE(gimix_state,irq_w))
/* timer */
- MCFG_DEVICE_ADD("timer", PTM6840, XTAL_2MHz) // clock is a guess
+ MCFG_DEVICE_ADD("timer", PTM6840, XTAL(2'000'000)) // clock is a guess
MCFG_PTM6840_IRQ_CB(WRITELINE(gimix_state,irq_w)) // PCB pictures show both the RTC and timer set to generate IRQs (are jumper configurable)
/* floppy disks */
- MCFG_FD1797_ADD("fdc",XTAL_8MHz / 4)
+ MCFG_FD1797_ADD("fdc",XTAL(8'000'000) / 4)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(gimix_state,fdc_irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(gimix_state,fdc_drq_w))
MCFG_WD_FDC_FORCE_READY
@@ -567,27 +567,27 @@ MACHINE_CONFIG_START(gimix_state::gimix)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", gimix_floppies, "525hd", gimix_state::floppy_formats)
/* parallel ports */
- MCFG_DEVICE_ADD("pia1",PIA6821,XTAL_2MHz)
+ MCFG_DEVICE_ADD("pia1",PIA6821,XTAL(2'000'000))
MCFG_PIA_WRITEPA_HANDLER(WRITE8(gimix_state,pia_pa_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(gimix_state,pia_pb_w))
MCFG_PIA_READPA_HANDLER(READ8(gimix_state,pia_pa_r))
MCFG_PIA_READPB_HANDLER(READ8(gimix_state,pia_pb_r))
- MCFG_DEVICE_ADD("pia2",PIA6821,XTAL_2MHz)
+ MCFG_DEVICE_ADD("pia2",PIA6821,XTAL(2'000'000))
/* serial ports */
- MCFG_DEVICE_ADD("acia1",ACIA6850,XTAL_2MHz)
+ MCFG_DEVICE_ADD("acia1",ACIA6850,XTAL(2'000'000))
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial1",rs232_port_device,write_txd))
MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial1",rs232_port_device,write_rts))
- MCFG_DEVICE_ADD("acia2",ACIA6850,XTAL_2MHz)
+ MCFG_DEVICE_ADD("acia2",ACIA6850,XTAL(2'000'000))
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial2",rs232_port_device,write_txd))
MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial2",rs232_port_device,write_rts))
- MCFG_DEVICE_ADD("acia3",ACIA6850,XTAL_2MHz)
+ MCFG_DEVICE_ADD("acia3",ACIA6850,XTAL(2'000'000))
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial3",rs232_port_device,write_txd))
MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial3",rs232_port_device,write_rts))
- MCFG_DEVICE_ADD("acia4",ACIA6850,XTAL_2MHz)
+ MCFG_DEVICE_ADD("acia4",ACIA6850,XTAL(2'000'000))
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial4",rs232_port_device,write_txd))
MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial4",rs232_port_device,write_rts))
diff --git a/src/mame/drivers/ginganin.cpp b/src/mame/drivers/ginganin.cpp
index 0b2b21cf5d1..cd83d4cf805 100644
--- a/src/mame/drivers/ginganin.cpp
+++ b/src/mame/drivers/ginganin.cpp
@@ -65,8 +65,8 @@ f5d6 print 7 digit BCD number: d0.l to (a1)+ color $3000
#include "speaker.h"
-#define MAIN_CLOCK XTAL_6MHz
-#define SOUND_CLOCK XTAL_3_579545MHz
+#define MAIN_CLOCK XTAL(6'000'000)
+#define SOUND_CLOCK XTAL(3'579'545)
/*
diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp
index 192bd9bbc9a..d4dcf76ccef 100644
--- a/src/mame/drivers/gkigt.cpp
+++ b/src/mame/drivers/gkigt.cpp
@@ -238,7 +238,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(igt_gameking_state::igt_gameking)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I960, XTAL_24MHz)
+ MCFG_CPU_ADD("maincpu", I960, XTAL(24'000'000))
MCFG_CPU_PROGRAM_MAP(igt_gameking_mem)
@@ -251,7 +251,7 @@ MACHINE_CONFIG_START(igt_gameking_state::igt_gameking)
MCFG_SCREEN_VISIBLE_AREA(8*8, 48*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(igt_gameking_state, screen_update_igt_gameking)
MCFG_SCREEN_PALETTE("palette")
- // Xilinx used as video chip XTAL_26_66666MHz on board
+ // Xilinx used as video chip XTAL(26'666'666) on board
MCFG_PALETTE_ADD("palette", 0x200)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -259,7 +259,7 @@ MACHINE_CONFIG_START(igt_gameking_state::igt_gameking)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz) // enhanced sound on optional Media-Lite sub board
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400)) // enhanced sound on optional Media-Lite sub board
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_NVRAM_ADD_1FILL("nvram")
diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp
index 1c5831f88c9..f0be0658d77 100644
--- a/src/mame/drivers/gladiatr.cpp
+++ b/src/mame/drivers/gladiatr.cpp
@@ -936,17 +936,17 @@ GFXDECODE_END
MACHINE_CONFIG_START(ppking_state::ppking)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(ppking_cpu1_map)
MCFG_CPU_IO_MAP(ppking_cpu1_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ppking_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("sub", Z80, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cpu2_map)
MCFG_CPU_IO_MAP(ppking_cpu2_io)
MCFG_CPU_PERIODIC_INT_DRIVER(ppking_state, irq0_line_assert, 60)
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", MC6809, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(ppking_cpu3_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -969,7 +969,7 @@ MACHINE_CONFIG_START(ppking_state::ppking)
// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
// MCFG_SCREEN_SIZE(32*8, 32*8)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2,384,0,256,264,16,240) // assume same as Arkanoid
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2,384,0,256,264,16,240) // assume same as Arkanoid
MCFG_SCREEN_UPDATE_DRIVER(ppking_state, screen_update_ppking)
MCFG_SCREEN_PALETTE("palette")
@@ -984,7 +984,7 @@ MACHINE_CONFIG_START(ppking_state::ppking)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(WRITELINE(gladiatr_state_base, ym_irq))
MCFG_AY8910_PORT_A_READ_CB(READ8(ppking_state, ppking_f1_r))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3")) /* port B read */
@@ -993,7 +993,7 @@ MACHINE_CONFIG_START(ppking_state::ppking)
MCFG_SOUND_ROUTE(2, "mono", 0.60)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_455kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(455'000)) /* verified on pcb */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* vclk input mode */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -1001,16 +1001,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gladiatr_state::gladiatr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(gladiatr_cpu1_map)
MCFG_CPU_IO_MAP(gladiatr_cpu1_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gladiatr_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("sub", Z80, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cpu2_map)
MCFG_CPU_IO_MAP(gladiatr_cpu2_io)
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", MC6809, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(gladiatr_cpu3_map)
MCFG_MACHINE_RESET_OVERRIDE(gladiatr_state,gladiator)
@@ -1023,27 +1023,27 @@ MACHINE_CONFIG_START(gladiatr_state::gladiatr)
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) // shadowed by aforementioned hack
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(gladiatr_state, flipscreen_w))
- MCFG_DEVICE_ADD("cctl", I8741, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_DEVICE_ADD("cctl", I8741, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_MCS48_PORT_T0_IN_CB(IOPORT("COINS")) MCFG_DEVCB_RSHIFT(3)
MCFG_MCS48_PORT_T1_IN_CB(IOPORT("COINS")) MCFG_DEVCB_RSHIFT(2)
MCFG_MCS48_PORT_P1_IN_CB(READ8(gladiatr_state, cctl_p1_r))
MCFG_MCS48_PORT_P2_IN_CB(READ8(gladiatr_state, cctl_p2_r))
- MCFG_DEVICE_ADD("ccpu", I8741, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_DEVICE_ADD("ccpu", I8741, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_MCS48_PORT_P1_IN_CB(IOPORT("IN0"))
MCFG_MCS48_PORT_P2_IN_CB(IOPORT("IN1"))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(gladiatr_state, ccpu_p2_w))
MCFG_MCS48_PORT_T0_IN_CB(IOPORT("COINS")) MCFG_DEVCB_RSHIFT(1)
MCFG_MCS48_PORT_T1_IN_CB(IOPORT("COINS")) MCFG_DEVCB_RSHIFT(0)
- MCFG_DEVICE_ADD("ucpu", I8741, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_DEVICE_ADD("ucpu", I8741, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_MCS48_PORT_P1_IN_CB(READ8(gladiatr_state, ucpu_p1_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(gladiatr_state, ucpu_p1_w))
MCFG_MCS48_PORT_P2_IN_CB(READ8(gladiatr_state, ucpu_p2_r))
MCFG_MCS48_PORT_T0_IN_CB(READLINE(gladiatr_state, tclk_r))
MCFG_MCS48_PORT_T1_IN_CB(READLINE(gladiatr_state, ucpu_t1_r))
- MCFG_DEVICE_ADD("csnd", I8741, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_DEVICE_ADD("csnd", I8741, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_MCS48_PORT_P1_IN_CB(READ8(gladiatr_state, csnd_p1_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(gladiatr_state, csnd_p1_w))
MCFG_MCS48_PORT_P2_IN_CB(READ8(gladiatr_state, csnd_p2_r))
@@ -1053,7 +1053,7 @@ MACHINE_CONFIG_START(gladiatr_state::gladiatr)
/* lazy way to make polled serial between MCUs work */
MCFG_QUANTUM_PERFECT_CPU("ucpu")
- MCFG_CLOCK_ADD("tclk", XTAL_12MHz/8/128/2) /* verified on pcb */
+ MCFG_CLOCK_ADD("tclk", XTAL(12'000'000)/8/128/2) /* verified on pcb */
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(gladiatr_state, tclk_w));
/* video hardware */
@@ -1075,7 +1075,7 @@ MACHINE_CONFIG_START(gladiatr_state::gladiatr)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(WRITELINE(gladiatr_state_base, ym_irq))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3")) /* port B read */
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(gladiatr_state, gladiator_int_control_w)) /* port A write */
@@ -1084,7 +1084,7 @@ MACHINE_CONFIG_START(gladiatr_state::gladiatr)
MCFG_SOUND_ROUTE(2, "mono", 0.60)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_455kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(455'000)) /* verified on pcb */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* vclk input mode */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
diff --git a/src/mame/drivers/glass.cpp b/src/mame/drivers/glass.cpp
index d343d047965..a9a7e49ad89 100644
--- a/src/mame/drivers/glass.cpp
+++ b/src/mame/drivers/glass.cpp
@@ -231,7 +231,7 @@ void glass_state::machine_reset()
MACHINE_CONFIG_START(glass_state::glass)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz verified on PCB */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz verified on PCB */
MCFG_CPU_PROGRAM_MAP(glass_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", glass_state, interrupt)
@@ -258,13 +258,13 @@ MACHINE_CONFIG_START(glass_state::glass)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* 1MHz Resonator & pin 7 high verified on PCB */
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) /* 1MHz Resonator & pin 7 high verified on PCB */
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(glass_state::glass_ds5002fp, glass)
- MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) /* verified on pcb */
+ MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(24'000'000) / 2) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp
index 2d7fd3f42a6..4e925bb6e95 100644
--- a/src/mame/drivers/gluck2.cpp
+++ b/src/mame/drivers/gluck2.cpp
@@ -199,8 +199,8 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_10MHz
-#define SND_CLOCK XTAL_3_579545MHz
+#define MASTER_CLOCK XTAL(10'000'000)
+#define SND_CLOCK XTAL(3'579'545)
class gluck2_state : public driver_device
diff --git a/src/mame/drivers/gmaster.cpp b/src/mame/drivers/gmaster.cpp
index aae7a696a36..f3cae0ed2b9 100644
--- a/src/mame/drivers/gmaster.cpp
+++ b/src/mame/drivers/gmaster.cpp
@@ -330,7 +330,7 @@ void gmaster_state::machine_start()
MACHINE_CONFIG_START(gmaster_state::gmaster)
- MCFG_CPU_ADD("maincpu", UPD7810, XTAL_12MHz/2/*?*/) // upd78c11 in the unit
+ MCFG_CPU_ADD("maincpu", UPD7810, XTAL(12'000'000)/2/*?*/) // upd78c11 in the unit
MCFG_CPU_PROGRAM_MAP(gmaster_mem)
MCFG_UPD7810_PORTA_READ_CB(IOPORT("JOY"))
MCFG_UPD7810_PORTB_READ_CB(READ8(gmaster_state, gmaster_portb_r))
diff --git a/src/mame/drivers/gng.cpp b/src/mame/drivers/gng.cpp
index faaa42892e3..d2e5edd8d92 100644
--- a/src/mame/drivers/gng.cpp
+++ b/src/mame/drivers/gng.cpp
@@ -388,11 +388,11 @@ void gng_state::machine_reset()
MACHINE_CONFIG_START(gng_state::gng)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(gng_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gng_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(gng_state, irq0_line_hold, 4*60)
@@ -425,13 +425,13 @@ MACHINE_CONFIG_START(gng_state::gng)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
MCFG_SOUND_ROUTE(2, "mono", 0.40)
MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
MCFG_SOUND_ROUTE(2, "mono", 0.40)
diff --git a/src/mame/drivers/goindol.cpp b/src/mame/drivers/goindol.cpp
index 35415bd0089..e2edc8918b4 100644
--- a/src/mame/drivers/goindol.cpp
+++ b/src/mame/drivers/goindol.cpp
@@ -236,11 +236,11 @@ void goindol_state::machine_reset()
MACHINE_CONFIG_START(goindol_state::goindol)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* XTAL confirmed, divisor is not */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* XTAL confirmed, divisor is not */
MCFG_CPU_PROGRAM_MAP(goindol_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goindol_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2) /* XTAL confirmed, divisor is not */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/2) /* XTAL confirmed, divisor is not */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(goindol_state, irq0_line_hold, 4*60)
@@ -262,7 +262,7 @@ MACHINE_CONFIG_START(goindol_state::goindol)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* Confirmed pitch from recording */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* Confirmed pitch from recording */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gokidetor.cpp b/src/mame/drivers/gokidetor.cpp
index ac51e256474..d615d9ab42d 100644
--- a/src/mame/drivers/gokidetor.cpp
+++ b/src/mame/drivers/gokidetor.cpp
@@ -117,7 +117,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(gokidetor_state::gokidetor)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) // divider not verified
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4) // divider not verified
MCFG_CPU_PROGRAM_MAP(main_map)
// IRQ from ???
// NMI related to E002 input and TE7750 port 7
diff --git a/src/mame/drivers/goldngam.cpp b/src/mame/drivers/goldngam.cpp
index 63041066079..6ae3466fe57 100644
--- a/src/mame/drivers/goldngam.cpp
+++ b/src/mame/drivers/goldngam.cpp
@@ -237,8 +237,8 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_8MHz /* from CPU Board */
-#define SECONDARY_CLOCK XTAL_6MHz /* from GFX Board */
+#define MASTER_CLOCK XTAL(8'000'000) /* from CPU Board */
+#define SECONDARY_CLOCK XTAL(6'000'000) /* from GFX Board */
class goldngam_state : public driver_device
diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp
index b4fc7ddddb9..091ea19c73f 100644
--- a/src/mame/drivers/goldnpkr.cpp
+++ b/src/mame/drivers/goldnpkr.cpp
@@ -1289,7 +1289,7 @@
#include "upndown.lh"
-#define MASTER_CLOCK XTAL_10MHz
+#define MASTER_CLOCK XTAL(10'000'000)
#define CPU_CLOCK (MASTER_CLOCK/16)
diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp
index 875e8bfabf6..64cb3e2446e 100644
--- a/src/mame/drivers/goldstar.cpp
+++ b/src/mame/drivers/goldstar.cpp
@@ -212,7 +212,7 @@
***************************************************************************/
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
#define CPU_CLOCK MASTER_CLOCK / 4
#define PSG_CLOCK MASTER_CLOCK / 4
#define AY_CLOCK MASTER_CLOCK / 8
@@ -9108,12 +9108,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(unkch_state::bonusch)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(bonusch_map)
MCFG_CPU_IO_MAP(bonusch_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse)
- MCFG_CPU_ADD("mcu", I80C51, XTAL_12MHz)
+ MCFG_CPU_ADD("mcu", I80C51, XTAL(12'000'000))
MCFG_DEVICE_DISABLE()
/* video hardware */
diff --git a/src/mame/drivers/gomoku.cpp b/src/mame/drivers/gomoku.cpp
index ec636e25fb8..da103e155e6 100644
--- a/src/mame/drivers/gomoku.cpp
+++ b/src/mame/drivers/gomoku.cpp
@@ -123,7 +123,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(gomoku_state::gomoku)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/12) /* 1.536 MHz ? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/12) /* 1.536 MHz ? */
MCFG_CPU_PROGRAM_MAP(gomoku_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gomoku_state, irq0_line_hold)
diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp
index 5d68fb43851..e0d4d3b2193 100644
--- a/src/mame/drivers/gottlieb.cpp
+++ b/src/mame/drivers/gottlieb.cpp
@@ -206,9 +206,9 @@ VBlank duration: 1/VSYNC * (16/256) = 1017.6 us
#define LOG_AUDIO_DECODE (0)
-#define SYSTEM_CLOCK XTAL_20MHz
-#define CPU_CLOCK XTAL_15MHz
-#define NTSC_CLOCK XTAL_14_31818MHz
+#define SYSTEM_CLOCK XTAL(20'000'000)
+#define CPU_CLOCK XTAL(15'000'000)
+#define NTSC_CLOCK XTAL(14'318'181)
#define LASERDISC_CLOCK PERIOD_OF_555_ASTABLE(16000, 10000, 0.001e-6)
#define AUDIORAM_SIZE 0x400
diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp
index dfbf2011af2..5ea554416d4 100644
--- a/src/mame/drivers/goupil.cpp
+++ b/src/mame/drivers/goupil.cpp
@@ -38,7 +38,7 @@
#include "logmacro.h"
-#define MAIN_CLOCK XTAL_4MHz
+#define MAIN_CLOCK XTAL(4'000'000)
#define VIDEO_CLOCK MAIN_CLOCK / 8 /* 1.75 Mhz */
#define CPU_CLOCK MAIN_CLOCK / 4 /* 1 Mhz */
@@ -566,7 +566,7 @@ MACHINE_CONFIG_START(goupil_g1_state::goupil_g1)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE))
/* Floppy */
- MCFG_FD1791_ADD("fd1791", XTAL_8MHz )
+ MCFG_FD1791_ADD("fd1791", XTAL(8'000'000) )
MCFG_FLOPPY_DRIVE_ADD("fd1791:0", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1791:1", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats)
@@ -611,7 +611,7 @@ MACHINE_CONFIG_START(goupil_g2_state::goupil_g2)
MCFG_SCREEN_VISIBLE_AREA(0, (80*8)-1, 0, (24*(8+4))-1)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_14_31818MHz/8)
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(14'318'181)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(goupil_g2_state, crtc_update_row)
@@ -629,7 +629,7 @@ MACHINE_CONFIG_START(goupil_g2_state::goupil_g2)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE))
/* Floppy */
- MCFG_FD1791_ADD("fd1791", XTAL_8MHz )
+ MCFG_FD1791_ADD("fd1791", XTAL(8'000'000) )
MCFG_FLOPPY_DRIVE_ADD("fd1791:0", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1791:1", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp
index 53502554f7a..edd240d8060 100644
--- a/src/mame/drivers/gradius3.cpp
+++ b/src/mame/drivers/gradius3.cpp
@@ -277,11 +277,11 @@ void gradius3_state::machine_reset()
MACHINE_CONFIG_START(gradius3_state::gradius3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(gradius3_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gradius3_state, cpuA_interrupt)
- MCFG_CPU_ADD("sub", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("sub", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(gradius3_map2)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", gradius3_state, gradius3_sub_scanline, "screen", 0, 1)
/* 4 is triggered by cpu A, the others are unknown but */
diff --git a/src/mame/drivers/gridcomp.cpp b/src/mame/drivers/gridcomp.cpp
index e1a573914bb..a8d014485ca 100644
--- a/src/mame/drivers/gridcomp.cpp
+++ b/src/mame/drivers/gridcomp.cpp
@@ -357,7 +357,7 @@ INPUT_PORTS_END
* IRQ7 ring
*/
MACHINE_CONFIG_START(gridcomp_state::grid1101)
- MCFG_CPU_ADD("maincpu", I8086, XTAL_15MHz / 3)
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(15'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(grid1101_map)
MCFG_CPU_IO_MAP(grid1101_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(gridcomp_state, irq_callback)
@@ -365,7 +365,7 @@ MACHINE_CONFIG_START(gridcomp_state::grid1101)
MCFG_MACHINE_START_OVERRIDE(gridcomp_state, gridcomp)
MCFG_MACHINE_RESET_OVERRIDE(gridcomp_state, gridcomp)
- MCFG_DEVICE_ADD(I80130_TAG, I80130, XTAL_15MHz/3)
+ MCFG_DEVICE_ADD(I80130_TAG, I80130, XTAL(15'000'000)/3)
MCFG_I80130_IRQ_CALLBACK(INPUTLINE("maincpu", 0))
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -374,7 +374,7 @@ MACHINE_CONFIG_START(gridcomp_state::grid1101)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber())
MCFG_SCREEN_UPDATE_DRIVER(gridcomp_state, screen_update_110x)
- MCFG_SCREEN_RAW_PARAMS(XTAL_15MHz/2, 424, 0, 320, 262, 0, 240) // XXX 66 Hz refresh
+ MCFG_SCREEN_RAW_PARAMS(XTAL(15'000'000)/2, 424, 0, 320, 262, 0, 240) // XXX 66 Hz refresh
MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir3_w))
MCFG_DEFAULT_LAYOUT(layout_lcd)
@@ -384,12 +384,12 @@ MACHINE_CONFIG_START(gridcomp_state::grid1101)
MCFG_DEVICE_ADD("keyboard", GRID_KEYBOARD, 0)
MCFG_GRID_KEYBOARD_CB(PUT(gridcomp_state, kbd_put))
- MCFG_DEVICE_ADD("i7220", I7220, XTAL_4MHz)
+ MCFG_DEVICE_ADD("i7220", I7220, XTAL(4'000'000))
MCFG_I7220_DATA_SIZE(3) // 3 1-Mbit MBM's
MCFG_I7220_IRQ_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir1_w))
MCFG_I7220_DRQ_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir1_w))
- MCFG_DEVICE_ADD("uart8274", I8274_NEW, XTAL_4_032MHz)
+ MCFG_DEVICE_ADD("uart8274", I8274_NEW, XTAL(4'032'000))
MCFG_DEVICE_ADD("modem", I8255, 0)
@@ -405,7 +405,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(gridcomp_state::grid1121, grid1101)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_24MHz / 3) // XXX
+ MCFG_CPU_CLOCK(XTAL(24'000'000) / 3) // XXX
MCFG_CPU_PROGRAM_MAP(grid1121_map)
MACHINE_CONFIG_END
@@ -417,7 +417,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(gridcomp_state::grid1131, grid1121)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(gridcomp_state, screen_update_113x)
- MCFG_SCREEN_RAW_PARAMS(XTAL_15MHz/2, 720, 0, 512, 262, 0, 240) // XXX
+ MCFG_SCREEN_RAW_PARAMS(XTAL(15'000'000)/2, 720, 0, 512, 262, 0, 240) // XXX
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(gridcomp_state::grid1139, grid1131)
diff --git a/src/mame/drivers/groundfx.cpp b/src/mame/drivers/groundfx.cpp
index 60fc9f25feb..aa55c256a16 100644
--- a/src/mame/drivers/groundfx.cpp
+++ b/src/mame/drivers/groundfx.cpp
@@ -271,7 +271,7 @@ INTERRUPT_GEN_MEMBER(groundfx_state::interrupt)
MACHINE_CONFIG_START(groundfx_state::groundfx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_40MHz/2) /* 20MHz - verified */
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(40'000'000)/2) /* 20MHz - verified */
MCFG_CPU_PROGRAM_MAP(groundfx_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", groundfx_state, interrupt)
diff --git a/src/mame/drivers/gstriker.cpp b/src/mame/drivers/gstriker.cpp
index 1e546c6d7eb..f47ea16b5b0 100644
--- a/src/mame/drivers/gstriker.cpp
+++ b/src/mame/drivers/gstriker.cpp
@@ -182,7 +182,7 @@ VSIS-20V3
12 Z80
Frequencies: 68k is XTAL_32MHZ/2
- z80 is XTAL_20MHz/4
+ z80 is XTAL(20'000'000)/4
******************************************************************************/
diff --git a/src/mame/drivers/gsword.cpp b/src/mame/drivers/gsword.cpp
index 48ba56c6083..f3975a9752c 100644
--- a/src/mame/drivers/gsword.cpp
+++ b/src/mame/drivers/gsword.cpp
@@ -777,17 +777,17 @@ GFXDECODE_END
MACHINE_CONFIG_START(gsword_state::gsword)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/6) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'000'000)/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cpu1_map)
MCFG_CPU_IO_MAP(cpu1_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gsword_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL_18MHz/6) /* verified on pcb */
+ MCFG_CPU_ADD("sub", Z80, XTAL(18'000'000)/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cpu2_map)
MCFG_CPU_IO_MAP(cpu2_io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(gsword_state, sound_interrupt, 4*60)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_18MHz/6) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'000'000)/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cpu3_map)
MCFG_QUANTUM_TIME(attotime::from_hz(12000)) /* Allow time for 2nd cpu to interleave*/
@@ -820,14 +820,14 @@ MACHINE_CONFIG_START(gsword_state::gsword)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_18MHz/12) /* verified on pcb */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'000'000)/12) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_SOUND_ADD("ay2", AY8910, 1500000)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(gsword_state, nmi_set_w)) /* portA write */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(400'000)) /* verified on pcb */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* vclk input mode */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gticlub.cpp b/src/mame/drivers/gticlub.cpp
index 3f3bbd83c2b..a2dcaa705dc 100644
--- a/src/mame/drivers/gticlub.cpp
+++ b/src/mame/drivers/gticlub.cpp
@@ -941,14 +941,14 @@ uint32_t gticlub_state::screen_update_hangplt(screen_device &screen, bitmap_rgb3
MACHINE_CONFIG_START(gticlub_state::gticlub)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */
+ MCFG_CPU_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
MCFG_CPU_PROGRAM_MAP(gticlub_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gticlub_state, gticlub_vblank)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL_64MHz/4) /* 16MHz */
+ MCFG_CPU_ADD("audiocpu", M68000, XTAL(64'000'000)/4) /* 16MHz */
MCFG_CPU_PROGRAM_MAP(sound_memmap)
- MCFG_CPU_ADD("dsp", ADSP21062, XTAL_36MHz)
+ MCFG_CPU_ADD("dsp", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
MCFG_CPU_DATA_MAP(sharc_map)
@@ -997,12 +997,12 @@ MACHINE_CONFIG_START(gticlub_state::gticlub)
MCFG_K001006_GFX_REGION("gfx1")
MCFG_K001006_TEX_LAYOUT(1)
- MCFG_K056800_ADD("k056800", XTAL_33_8688MHz/2)
+ MCFG_K056800_ADD("k056800", XTAL(33'868'800)/2)
MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_2))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_RF5C400_ADD("rfsnd", XTAL_33_8688MHz/2)
+ MCFG_RF5C400_ADD("rfsnd", XTAL(33'868'800)/2)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1048,17 +1048,17 @@ MACHINE_RESET_MEMBER(gticlub_state,hangplt)
MACHINE_CONFIG_START(gticlub_state::hangplt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */
+ MCFG_CPU_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
MCFG_CPU_PROGRAM_MAP(hangplt_map)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL_64MHz/4) /* 16MHz */
+ MCFG_CPU_ADD("audiocpu", M68000, XTAL(64'000'000)/4) /* 16MHz */
MCFG_CPU_PROGRAM_MAP(sound_memmap)
- MCFG_CPU_ADD("dsp", ADSP21062, XTAL_36MHz)
+ MCFG_CPU_ADD("dsp", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
MCFG_CPU_DATA_MAP(hangplt_sharc0_map)
- MCFG_CPU_ADD("dsp2", ADSP21062, XTAL_36MHz)
+ MCFG_CPU_ADD("dsp2", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
MCFG_CPU_DATA_MAP(hangplt_sharc1_map)
@@ -1124,12 +1124,12 @@ MACHINE_CONFIG_START(gticlub_state::hangplt)
MCFG_K001604_ROZ_OFFSET(16384)
MCFG_K001604_PALETTE("palette")
- MCFG_K056800_ADD("k056800", XTAL_33_8688MHz/2)
+ MCFG_K056800_ADD("k056800", XTAL(33'868'800)/2)
MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_2))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_RF5C400_ADD("rfsnd", XTAL_33_8688MHz/2)
+ MCFG_RF5C400_ADD("rfsnd", XTAL(33'868'800)/2)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/gts1.cpp b/src/mame/drivers/gts1.cpp
index 177e2f9db7c..57f90703d9e 100644
--- a/src/mame/drivers/gts1.cpp
+++ b/src/mame/drivers/gts1.cpp
@@ -678,7 +678,7 @@ WRITE8_MEMBER(gts1_state::gts1_do_w)
MACHINE_CONFIG_START(gts1_state::gts1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPS4_2, XTAL_3_579545MHz) // divided by 18 in the CPU
+ MCFG_CPU_ADD("maincpu", PPS4_2, XTAL(3'579'545)) // divided by 18 in the CPU
MCFG_CPU_PROGRAM_MAP(gts1_map)
MCFG_CPU_DATA_MAP(gts1_data)
MCFG_CPU_IO_MAP(gts1_io)
@@ -710,7 +710,7 @@ MACHINE_CONFIG_START(gts1_state::gts1)
WRITE8(gts1_state,gts1_lamp_apm_w) )
/* 10788 General Purpose Display and Keyboard */
- MCFG_DEVICE_ADD( "u6", R10788, XTAL_3_579545MHz / 18 ) // divided in the circuit
+ MCFG_DEVICE_ADD( "u6", R10788, XTAL(3'579'545) / 18 ) // divided in the circuit
MCFG_R10788_UPDATE( WRITE8(gts1_state,gts1_display_w) )
/* Video */
diff --git a/src/mame/drivers/gts3.cpp b/src/mame/drivers/gts3.cpp
index 6c47b9c994a..2c6862ec1ac 100644
--- a/src/mame/drivers/gts3.cpp
+++ b/src/mame/drivers/gts3.cpp
@@ -277,7 +277,7 @@ DRIVER_INIT_MEMBER( gts3_state, gts3 )
MACHINE_CONFIG_START(gts3_state::gts3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65C02, XTAL_4MHz / 2)
+ MCFG_CPU_ADD("maincpu", M65C02, XTAL(4'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(gts3_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -287,7 +287,7 @@ MACHINE_CONFIG_START(gts3_state::gts3)
/* Sound */
MCFG_FRAGMENT_ADD( genpin_audio )
- MCFG_DEVICE_ADD("u4", VIA6522, XTAL_4MHz / 2)
+ MCFG_DEVICE_ADD("u4", VIA6522, XTAL(4'000'000) / 2)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M65C02_IRQ_LINE))
MCFG_VIA6522_READPA_HANDLER(READ8(gts3_state, u4a_r))
MCFG_VIA6522_READPB_HANDLER(READ8(gts3_state, u4b_r))
@@ -295,7 +295,7 @@ MACHINE_CONFIG_START(gts3_state::gts3)
//MCFG_VIA6522_CA2_HANDLER(WRITELINE(gts3_state, u4ca2_w))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(gts3_state, nmi_w))
- MCFG_DEVICE_ADD("u5", VIA6522, XTAL_4MHz / 2)
+ MCFG_DEVICE_ADD("u5", VIA6522, XTAL(4'000'000) / 2)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M65C02_IRQ_LINE))
//MCFG_VIA6522_READPA_HANDLER(READ8(gts3_state, u5a_r))
//MCFG_VIA6522_READPB_HANDLER(READ8(gts3_state, u5b_r))
diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp
index 04b8f1ccdf1..d082b52d7aa 100644
--- a/src/mame/drivers/gts3a.cpp
+++ b/src/mame/drivers/gts3a.cpp
@@ -333,11 +333,11 @@ MC6845_UPDATE_ROW( gts3a_state::crtc_update_row )
MACHINE_CONFIG_START(gts3a_state::gts3a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65C02, XTAL_4MHz / 2)
+ MCFG_CPU_ADD("maincpu", M65C02, XTAL(4'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(gts3a_map)
MCFG_NVRAM_ADD_0FILL("nvram") // 6116LP + DS1210
- MCFG_CPU_ADD("dmdcpu", M65C02, XTAL_3_579545MHz / 2)
+ MCFG_CPU_ADD("dmdcpu", M65C02, XTAL(3'579'545) / 2)
MCFG_CPU_PROGRAM_MAP(gts3a_dmd_map)
/* Video */
@@ -350,7 +350,7 @@ MACHINE_CONFIG_START(gts3a_state::gts3a)
MCFG_PALETTE_ADD( "palette", 2 )
MCFG_PALETTE_INIT_OWNER(gts3a_state, gts3a)
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_3_579545MHz / 2)
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(3'579'545) / 2)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(gts3a_state, crtc_update_row)
@@ -358,7 +358,7 @@ MACHINE_CONFIG_START(gts3a_state::gts3a)
/* Sound */
MCFG_FRAGMENT_ADD( genpin_audio )
- MCFG_DEVICE_ADD("u4", VIA6522, XTAL_4MHz / 2)
+ MCFG_DEVICE_ADD("u4", VIA6522, XTAL(4'000'000) / 2)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M65C02_IRQ_LINE))
MCFG_VIA6522_READPA_HANDLER(READ8(gts3a_state, u4a_r))
MCFG_VIA6522_READPB_HANDLER(READ8(gts3a_state, u4b_r))
@@ -366,7 +366,7 @@ MACHINE_CONFIG_START(gts3a_state::gts3a)
//MCFG_VIA6522_CA2_HANDLER(WRITELINE(gts3a_state, u4ca2_w))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(gts3a_state, nmi_w))
- MCFG_DEVICE_ADD("u5", VIA6522, XTAL_4MHz / 2)
+ MCFG_DEVICE_ADD("u5", VIA6522, XTAL(4'000'000) / 2)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M65C02_IRQ_LINE))
//MCFG_VIA6522_READPA_HANDLER(READ8(gts3a_state, u5a_r))
//MCFG_VIA6522_READPB_HANDLER(READ8(gts3a_state, u5b_r))
diff --git a/src/mame/drivers/gts80.cpp b/src/mame/drivers/gts80.cpp
index 79f76f4b0ac..32d033349d7 100644
--- a/src/mame/drivers/gts80.cpp
+++ b/src/mame/drivers/gts80.cpp
@@ -350,7 +350,7 @@ DRIVER_INIT_MEMBER( gts80_state, gts80 )
/* with Sound Board */
MACHINE_CONFIG_START(gts80_state::gts80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_3_579545MHz/4)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(3'579'545)/4)
MCFG_CPU_PROGRAM_MAP(gts80_map)
MCFG_NVRAM_ADD_1FILL("nvram") // must be 1
@@ -359,19 +359,19 @@ MACHINE_CONFIG_START(gts80_state::gts80)
MCFG_DEFAULT_LAYOUT(layout_gts80)
/* Devices */
- MCFG_DEVICE_ADD("riot1", RIOT6532, XTAL_3_579545MHz/4)
+ MCFG_DEVICE_ADD("riot1", RIOT6532, XTAL(3'579'545)/4)
MCFG_RIOT6532_IN_PA_CB(READ8(gts80_state, port1a_r)) // sw_r
//MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80_state, port1a_w))
//MCFG_RIOT6532_IN_PB_CB(READ8(gts80_state, port1b_r))
MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80_state, port1b_w)) // sw_w
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
- MCFG_DEVICE_ADD("riot2", RIOT6532, XTAL_3_579545MHz/4)
+ MCFG_DEVICE_ADD("riot2", RIOT6532, XTAL(3'579'545)/4)
MCFG_RIOT6532_IN_PA_CB(READ8(gts80_state, port2a_r)) // pa7 - slam tilt
MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80_state, port2a_w)) // digit select
//MCFG_RIOT6532_IN_PB_CB(READ8(gts80_state, port2b_r))
MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80_state, port2b_w)) // seg
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
- MCFG_DEVICE_ADD("riot3", RIOT6532, XTAL_3_579545MHz/4)
+ MCFG_DEVICE_ADD("riot3", RIOT6532, XTAL(3'579'545)/4)
//MCFG_RIOT6532_IN_PA_CB(READ8(gts80_state, port3a_r))
MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80_state, port3a_w)) // sol, snd
//MCFG_RIOT6532_IN_PB_CB(READ8(gts80_state, port3b_r))
diff --git a/src/mame/drivers/gts80a.cpp b/src/mame/drivers/gts80a.cpp
index aa9bffed279..f884df371a1 100644
--- a/src/mame/drivers/gts80a.cpp
+++ b/src/mame/drivers/gts80a.cpp
@@ -340,7 +340,7 @@ DRIVER_INIT_MEMBER( gts80a_state, gts80a )
/* with Sound Board */
MACHINE_CONFIG_START(gts80a_state::gts80a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_3_579545MHz/4)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(3'579'545)/4)
MCFG_CPU_PROGRAM_MAP(gts80a_map)
MCFG_NVRAM_ADD_1FILL("nvram") // must be 1
@@ -349,19 +349,19 @@ MACHINE_CONFIG_START(gts80a_state::gts80a)
MCFG_DEFAULT_LAYOUT(layout_gts80a)
/* Devices */
- MCFG_DEVICE_ADD("riot1", RIOT6532, XTAL_3_579545MHz/4)
+ MCFG_DEVICE_ADD("riot1", RIOT6532, XTAL(3'579'545)/4)
MCFG_RIOT6532_IN_PA_CB(READ8(gts80a_state, port1a_r)) // sw_r
//MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80a_state, port1a_w))
//MCFG_RIOT6532_IN_PB_CB(READ8(gts80a_state, port1b_r))
MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80a_state, port1b_w)) // sw_w
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
- MCFG_DEVICE_ADD("riot2", RIOT6532, XTAL_3_579545MHz/4)
+ MCFG_DEVICE_ADD("riot2", RIOT6532, XTAL(3'579'545)/4)
MCFG_RIOT6532_IN_PA_CB(READ8(gts80a_state, port2a_r)) // pa7 - slam tilt
MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80a_state, port2a_w)) // digit select
//MCFG_RIOT6532_IN_PB_CB(READ8(gts80a_state, port2b_r))
MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80a_state, port2b_w)) // seg
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
- MCFG_DEVICE_ADD("riot3", RIOT6532, XTAL_3_579545MHz/4)
+ MCFG_DEVICE_ADD("riot3", RIOT6532, XTAL(3'579'545)/4)
//MCFG_RIOT6532_IN_PA_CB(READ8(gts80a_state, port3a_r))
MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80a_state, port3a_w)) // sol, snd
//MCFG_RIOT6532_IN_PB_CB(READ8(gts80a_state, port3b_r))
diff --git a/src/mame/drivers/gts80b.cpp b/src/mame/drivers/gts80b.cpp
index e133f424a98..56f6d6982e2 100644
--- a/src/mame/drivers/gts80b.cpp
+++ b/src/mame/drivers/gts80b.cpp
@@ -382,7 +382,7 @@ DRIVER_INIT_MEMBER( gts80b_state, gts80b )
/* with Sound Board */
MACHINE_CONFIG_START(gts80b_state::gts80b)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_3_579545MHz/4)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(3'579'545)/4)
MCFG_CPU_PROGRAM_MAP(gts80b_map)
MCFG_NVRAM_ADD_1FILL("nvram") // must be 1
@@ -391,19 +391,19 @@ MACHINE_CONFIG_START(gts80b_state::gts80b)
MCFG_DEFAULT_LAYOUT(layout_gts80b)
/* Devices */
- MCFG_DEVICE_ADD("riot1", RIOT6532, XTAL_3_579545MHz/4)
+ MCFG_DEVICE_ADD("riot1", RIOT6532, XTAL(3'579'545)/4)
MCFG_RIOT6532_IN_PA_CB(READ8(gts80b_state, port1a_r)) // sw_r
//MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80b_state, port1a_w))
//MCFG_RIOT6532_IN_PB_CB(READ8(gts80b_state, port1b_r))
MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80b_state, port1b_w)) // sw_w
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
- MCFG_DEVICE_ADD("riot2", RIOT6532, XTAL_3_579545MHz/4)
+ MCFG_DEVICE_ADD("riot2", RIOT6532, XTAL(3'579'545)/4)
MCFG_RIOT6532_IN_PA_CB(READ8(gts80b_state, port2a_r)) // pa7 - slam tilt
MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80b_state, port2a_w)) // digit select
//MCFG_RIOT6532_IN_PB_CB(READ8(gts80b_state, port2b_r))
MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80b_state, port2b_w)) // seg
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
- MCFG_DEVICE_ADD("riot3", RIOT6532, XTAL_3_579545MHz/4)
+ MCFG_DEVICE_ADD("riot3", RIOT6532, XTAL(3'579'545)/4)
//MCFG_RIOT6532_IN_PA_CB(READ8(gts80b_state, port3a_r))
MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80b_state, port3a_w)) // sol, snd
//MCFG_RIOT6532_IN_PB_CB(READ8(gts80b_state, port3b_r))
diff --git a/src/mame/drivers/gumbo.cpp b/src/mame/drivers/gumbo.cpp
index 5181c9789bf..a54ba0290a8 100644
--- a/src/mame/drivers/gumbo.cpp
+++ b/src/mame/drivers/gumbo.cpp
@@ -235,7 +235,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(gumbo_state::gumbo)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_14_31818MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(14'318'181)/2)
MCFG_CPU_PROGRAM_MAP(gumbo_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gumbo_state, irq1_line_hold) // all the same
@@ -254,7 +254,7 @@ MACHINE_CONFIG_START(gumbo_state::gumbo)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/16, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(14'318'181)/16, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gunbustr.cpp b/src/mame/drivers/gunbustr.cpp
index 6ce76170e65..5ecbcff396d 100644
--- a/src/mame/drivers/gunbustr.cpp
+++ b/src/mame/drivers/gunbustr.cpp
@@ -230,7 +230,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(gunbustr_state::gunbustr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(gunbustr_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gunbustr_state, gunbustr_interrupt) /* VBL */
diff --git a/src/mame/drivers/gundealr.cpp b/src/mame/drivers/gundealr.cpp
index 2cf17fdbc26..2ae3d12a4c6 100644
--- a/src/mame/drivers/gundealr.cpp
+++ b/src/mame/drivers/gundealr.cpp
@@ -427,7 +427,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(gundealr_state::gundealr_scanline)
MACHINE_CONFIG_START(gundealr_state::gundealr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz verified for Yam! Yam!? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* 6 MHz verified for Yam! Yam!? */
MCFG_CPU_PROGRAM_MAP(gundealr_main_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", gundealr_state, gundealr_scanline, "screen", 0, 1)
@@ -449,7 +449,7 @@ MACHINE_CONFIG_START(gundealr_state::gundealr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* 1.5Mhz verified for Yam! Yam!? */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* 1.5Mhz verified for Yam! Yam!? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gunpey.cpp b/src/mame/drivers/gunpey.cpp
index 7894ccedacc..8c4e40cf859 100644
--- a/src/mame/drivers/gunpey.cpp
+++ b/src/mame/drivers/gunpey.cpp
@@ -1459,11 +1459,11 @@ MACHINE_CONFIG_START(gunpey_state::gunpey)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MCFG_OKIM6295_ADD("oki", XTAL_16_9344MHz / 8, PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", XTAL(16'934'400) / 8, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gyruss.cpp b/src/mame/drivers/gyruss.cpp
index 8e7b6dfc3f8..a13c541f98f 100644
--- a/src/mame/drivers/gyruss.cpp
+++ b/src/mame/drivers/gyruss.cpp
@@ -73,8 +73,8 @@ and 1 SFX channel controlled by an 8039:
#include "speaker.h"
-#define MASTER_CLOCK XTAL_18_432MHz
-#define SOUND_CLOCK XTAL_14_31818MHz
+#define MASTER_CLOCK XTAL(18'432'000)
+#define SOUND_CLOCK XTAL(14'318'181)
// Video timing
// PCB measured: H = 15.50khz V = 60.56hz, +/- 0.01hz
@@ -486,7 +486,7 @@ MACHINE_CONFIG_START(gyruss_state::gyruss)
MCFG_CPU_PROGRAM_MAP(audio_cpu1_map)
MCFG_CPU_IO_MAP(audio_cpu1_io_map)
- MCFG_CPU_ADD("audio2", I8039, XTAL_8MHz)
+ MCFG_CPU_ADD("audio2", I8039, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(audio_cpu2_map)
MCFG_CPU_IO_MAP(audio_cpu2_io_map)
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(gyruss_state, gyruss_dac_w))
diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp
index c910686c3cd..ecc64f5ec92 100644
--- a/src/mame/drivers/h19.cpp
+++ b/src/mame/drivers/h19.cpp
@@ -61,9 +61,9 @@ Address Description
// Standard H19 used a 2.048 MHz clock
-#define H19_CLOCK (XTAL_12_288MHz / 6)
-#define MC6845_CLOCK (XTAL_12_288MHz /8)
-#define INS8250_CLOCK (XTAL_12_288MHz /4)
+#define H19_CLOCK (XTAL(12'288'000) / 6)
+#define MC6845_CLOCK (XTAL(12'288'000) /8)
+#define INS8250_CLOCK (XTAL(12'288'000) /4)
// Capacitor value in pF
#define H19_KEY_DEBOUNCE_CAPACITOR 5000
diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp
index 7fdf8e94b6b..e8a6acbe32f 100644
--- a/src/mame/drivers/h8.cpp
+++ b/src/mame/drivers/h8.cpp
@@ -98,7 +98,7 @@ private:
};
-#define H8_CLOCK (XTAL_12_288MHz / 6)
+#define H8_CLOCK (XTAL(12'288'000) / 6)
#define H8_BEEP_FRQ (H8_CLOCK / 1024)
#define H8_IRQ_PULSE (H8_BEEP_FRQ / 2)
diff --git a/src/mame/drivers/h89.cpp b/src/mame/drivers/h89.cpp
index 44a6cbafde1..9e8144accee 100644
--- a/src/mame/drivers/h89.cpp
+++ b/src/mame/drivers/h89.cpp
@@ -181,11 +181,11 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(h89_state::h89)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_12_288MHz / 6)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(12'288'000) / 6)
MCFG_CPU_PROGRAM_MAP(h89_mem)
MCFG_CPU_IO_MAP(h89_io)
- MCFG_DEVICE_ADD( "ins8250", INS8250, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "ins8250", INS8250, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "terminal")
diff --git a/src/mame/drivers/halleys.cpp b/src/mame/drivers/halleys.cpp
index fca737c7ab1..437b0fbfbbe 100644
--- a/src/mame/drivers/halleys.cpp
+++ b/src/mame/drivers/halleys.cpp
@@ -1923,11 +1923,11 @@ void halleys_state::machine_reset()
MACHINE_CONFIG_START(halleys_state::halleys)
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_19_968MHz/12) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(19'968'000)/12) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(halleys_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", halleys_state, halleys_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_6MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(6'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(halleys_state, irq0_line_hold, (double)6000000/(4*16*16*10*16))
@@ -1950,16 +1950,16 @@ MACHINE_CONFIG_START(halleys_state::halleys)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_6MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(6'000'000)/4) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_6MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(6'000'000)/4) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay3", AY8910, XTAL_6MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay3", AY8910, XTAL(6'000'000)/4) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay4", AY8910, XTAL_6MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay4", AY8910, XTAL(6'000'000)/4) /* verified on pcb */
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(halleys_state, sndnmi_msk_w)) // port Bwrite
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
@@ -1967,7 +1967,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(halleys_state::benberob, halleys)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_19_968MHz/12) /* not verified but pcb identical to halley's comet */
+ MCFG_CPU_CLOCK(XTAL(19'968'000)/12) /* not verified but pcb identical to halley's comet */
MCFG_TIMER_MODIFY("scantimer")
MCFG_TIMER_DRIVER_CALLBACK(halleys_state, benberob_scanline)
diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp
index 62c773464fd..ac234886bdc 100644
--- a/src/mame/drivers/harddriv.cpp
+++ b/src/mame/drivers/harddriv.cpp
@@ -1437,7 +1437,7 @@ MACHINE_CONFIG_START(harddriv_state::driver_nomsp)
MCFG_CPU_ADD("maincpu", M68010, HARDDRIV_MASTER_CLOCK/4)
MCFG_CPU_PROGRAM_MAP(driver_68k_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", harddriv_state, video_int_gen)
- MCFG_CPU_PERIODIC_INT_DRIVER(harddriv_state, hd68k_irq_gen, (double)HARDDRIV_MASTER_CLOCK/16/16/16/16/2)
+ MCFG_CPU_PERIODIC_INT_DRIVER(harddriv_state, hd68k_irq_gen, HARDDRIV_MASTER_CLOCK/16/16/16/16/2)
MCFG_SLAPSTIC_ADD("slapstic", 117)
MCFG_SLAPSTIC_68K_ACCESS(1)
@@ -1460,7 +1460,7 @@ MACHINE_CONFIG_START(harddriv_state::driver_nomsp)
MCFG_M48T02_ADD("200e") // MK48T02
MCFG_EEPROM_2816_ADD("210e") // MK48Z02
- MCFG_DEVICE_ADD("duartn68681", MC68681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duartn68681", MC68681, XTAL(3'686'400))
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(harddriv_state, harddriv_duart_irq_handler))
MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE ("rs232", rs232_port_device, write_txd))
@@ -1484,7 +1484,7 @@ MACHINE_CONFIG_START(harddriv_state::driver_msp)
MCFG_FRAGMENT_ADD( driver_nomsp )
/* basic machine hardware */
- MCFG_CPU_ADD("msp", TMS34010, XTAL_50MHz)
+ MCFG_CPU_ADD("msp", TMS34010, XTAL(50'000'000))
MCFG_CPU_PROGRAM_MAP(driver_msp_map)
MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(5000000) /* pixel clock */
@@ -1523,7 +1523,7 @@ MACHINE_CONFIG_START(harddriv_state::multisync_msp)
MCFG_FRAGMENT_ADD( multisync_nomsp )
/* basic machine hardware */
- MCFG_CPU_ADD("msp", TMS34010, XTAL_50MHz)
+ MCFG_CPU_ADD("msp", TMS34010, XTAL(50'000'000))
MCFG_CPU_PROGRAM_MAP(driver_msp_map)
MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(5000000) /* pixel clock */
@@ -1562,7 +1562,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(harddriv_state::adsp)
/* basic machine hardware */
- MCFG_CPU_ADD("adsp", ADSP2100, XTAL_32MHz/4)
+ MCFG_CPU_ADD("adsp", ADSP2100, XTAL(32'000'000)/4)
MCFG_CPU_PROGRAM_MAP(adsp_program_map)
MCFG_CPU_DATA_MAP(adsp_data_map)
MACHINE_CONFIG_END
@@ -1572,12 +1572,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(harddriv_state::ds3)
/* basic machine hardware */
- MCFG_CPU_ADD("adsp", ADSP2101, XTAL_12MHz)
+ MCFG_CPU_ADD("adsp", ADSP2101, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(ds3_program_map)
MCFG_CPU_DATA_MAP(ds3_data_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))
- MCFG_CPU_ADD("ds3sdsp", ADSP2105, XTAL_10MHz)
+ MCFG_CPU_ADD("ds3sdsp", ADSP2105, XTAL(10'000'000))
MCFG_ADSP21XX_SPORT_RX_CB(READ32(harddriv_state, hdds3sdsp_serial_rx_callback))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(harddriv_state, hdds3sdsp_serial_tx_callback))
MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(harddriv_state, hdds3sdsp_timer_enable_callback))
@@ -1585,7 +1585,7 @@ MACHINE_CONFIG_START(harddriv_state::ds3)
MCFG_CPU_DATA_MAP(ds3sdsp_data_map)
MCFG_TIMER_DRIVER_ADD("ds3sdsp_timer", harddriv_state, ds3sdsp_internal_timer_callback)
- MCFG_CPU_ADD("ds3xdsp", ADSP2105, XTAL_10MHz)
+ MCFG_CPU_ADD("ds3xdsp", ADSP2105, XTAL(10'000'000))
MCFG_ADSP21XX_SPORT_RX_CB(READ32(harddriv_state, hdds3xdsp_serial_rx_callback))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(harddriv_state, hdds3xdsp_serial_tx_callback))
MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(harddriv_state, hdds3xdsp_timer_enable_callback))
@@ -1614,7 +1614,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(harddriv_state::dsk)
/* basic machine hardware */
- MCFG_CPU_ADD("dsp32", DSP32C, XTAL_40MHz)
+ MCFG_CPU_ADD("dsp32", DSP32C, XTAL(40'000'000))
MCFG_DSP32C_OUTPUT_CALLBACK(WRITE32(harddriv_state,hddsk_update_pif))
MCFG_CPU_PROGRAM_MAP(dsk_dsp32_map)
@@ -1630,7 +1630,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(harddriv_state::dsk2)
/* basic machine hardware */
- MCFG_CPU_ADD("dsp32", DSP32C, XTAL_40MHz)
+ MCFG_CPU_ADD("dsp32", DSP32C, XTAL(40'000'000))
MCFG_DSP32C_OUTPUT_CALLBACK(WRITE32(harddriv_state,hddsk_update_pif))
MCFG_CPU_PROGRAM_MAP(dsk2_dsp32_map)
diff --git a/src/mame/drivers/harriet.cpp b/src/mame/drivers/harriet.cpp
index 0eb08e4051d..eb720140ee2 100644
--- a/src/mame/drivers/harriet.cpp
+++ b/src/mame/drivers/harriet.cpp
@@ -197,7 +197,7 @@ void harriet_state::machine_reset()
MACHINE_CONFIG_START(harriet_state::harriet)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68010,XTAL_8MHz) // TODO: clock
+ MCFG_CPU_ADD("maincpu",M68010,XTAL(8'000'000)) // TODO: clock
MCFG_CPU_PROGRAM_MAP(harriet_map)
/* video hardware */
diff --git a/src/mame/drivers/hazeltin.cpp b/src/mame/drivers/hazeltin.cpp
index a4d2aea8542..c8928fe3faf 100644
--- a/src/mame/drivers/hazeltin.cpp
+++ b/src/mame/drivers/hazeltin.cpp
@@ -58,8 +58,8 @@ References:
#define VBLANK_OUT_TAG "videobrd:vblank"
#define TVINTERQ_OUT_TAG "videobrd:tvinterq"
-#define VIDEO_CLOCK (XTAL_33_264MHz/2)
-#define VIDEOBRD_CLOCK (XTAL_33_264MHz*30)
+#define VIDEO_CLOCK (XTAL(33'264'000)/2)
+#define VIDEOBRD_CLOCK (XTAL(33'264'000)*30)
#define SR2_FULL_DUPLEX (0x01)
#define SR2_UPPER_ONLY (0x08)
@@ -460,7 +460,7 @@ WRITE8_MEMBER(hazl1500_state::refresh_address_w)
{
synchronize();
//printf("refresh: %02x, %d, %d\n", data, m_screen->hpos(), m_screen->vpos());
- m_iowq_timer->adjust(attotime::from_hz(XTAL_18MHz/9));
+ m_iowq_timer->adjust(attotime::from_hz(XTAL(18'000'000)/9));
m_cpu_iowq->write(0);
m_cpu_ba4->write(0);
m_cpu_db0->write((data >> 0) & 1);
@@ -689,7 +689,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(hazl1500_state::hazl1500)
/* basic machine hardware */
- MCFG_CPU_ADD(CPU_TAG, I8080, XTAL_18MHz/9) // 18MHz crystal on schematics, using an i8224 clock gen/driver IC
+ MCFG_CPU_ADD(CPU_TAG, I8080, XTAL(18'000'000)/9) // 18MHz crystal on schematics, using an i8224 clock gen/driver IC
MCFG_CPU_PROGRAM_MAP(hazl1500_mem)
MCFG_CPU_IO_MAP(hazl1500_io)
MCFG_QUANTUM_PERFECT_CPU(CPU_TAG)
@@ -697,17 +697,17 @@ MACHINE_CONFIG_START(hazl1500_state::hazl1500)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_UPDATE_DRIVER(hazl1500_state, screen_update_hazl1500)
- //MCFG_SCREEN_RAW_PARAMS(XTAL_33_264MHz / 2,
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(33'264'000) / 2,
// SCREEN_HTOTAL, SCREEN_HSTART, SCREEN_HSTART + SCREEN_HDISP,
// SCREEN_VTOTAL, SCREEN_VSTART, SCREEN_VSTART + SCREEN_VDISP); // TODO: Figure out exact visibility
- MCFG_SCREEN_RAW_PARAMS(XTAL_33_264MHz / 2,
+ MCFG_SCREEN_RAW_PARAMS(XTAL(33'264'000) / 2,
SCREEN_HTOTAL, 0, SCREEN_HTOTAL,
SCREEN_VTOTAL, 0, SCREEN_VTOTAL);
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", hazl1500)
- MCFG_DEVICE_ADD(BAUDGEN_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(BAUDGEN_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(WRITELINE(hazl1500_state, com5016_fr_w))
MCFG_DEVICE_ADD(UART_TAG, AY51013, 0)
diff --git a/src/mame/drivers/headonb.cpp b/src/mame/drivers/headonb.cpp
index ba47def1eb6..cff093c9cc0 100644
--- a/src/mame/drivers/headonb.cpp
+++ b/src/mame/drivers/headonb.cpp
@@ -161,7 +161,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(headonb_state::headonb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL_20MHz / 10) // divider guessed
+ MCFG_CPU_ADD("maincpu", I8080A, XTAL(20'000'000) / 10) // divider guessed
MCFG_CPU_PROGRAM_MAP(headonb_map)
MCFG_CPU_IO_MAP(headonb_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", headonb_state, irq0_line_hold) // where is irqack?
diff --git a/src/mame/drivers/hec2hrp.cpp b/src/mame/drivers/hec2hrp.cpp
index d2c74688bc8..ecb73e3f77e 100644
--- a/src/mame/drivers/hec2hrp.cpp
+++ b/src/mame/drivers/hec2hrp.cpp
@@ -404,7 +404,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(hec2hrp_state::hec2hr)
/******************************************************************************/
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(hec2hrp_mem)
MCFG_CPU_IO_MAP(hec2hrp_io)
MCFG_CPU_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) /* put on the Z80 irq in Hz*/
@@ -439,7 +439,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hec2hrp_state::hec2hrp)
/*****************************************************************************/
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(hec2hrp_mem)
MCFG_CPU_IO_MAP(hec2hrp_io)
MCFG_CPU_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) /* put on the Z80 irq in Hz*/
@@ -478,13 +478,13 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(hec2hrp_state::hec2mx40)
/*****************************************************************************/
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(hec2hrx_mem)
MCFG_CPU_IO_MAP(hec2mx40_io)
MCFG_CPU_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz
/* Disc II unit */
- MCFG_CPU_ADD("disc2cpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("disc2cpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(hecdisc2_mem)
MCFG_CPU_IO_MAP(hecdisc2_io)
MCFG_UPD765A_ADD("upd765", false, true)
@@ -522,7 +522,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hec2hrp_state::hec2hrx)
/*****************************************************************************/
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(hec2hrx_mem)
MCFG_CPU_IO_MAP(hec2hrx_io)
MCFG_CPU_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz
@@ -530,7 +530,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2hrx)
MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx)
/* Disc II unit */
- MCFG_CPU_ADD("disc2cpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("disc2cpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(hecdisc2_mem)
MCFG_CPU_IO_MAP(hecdisc2_io)
MCFG_UPD765A_ADD("upd765", false, true)
@@ -567,7 +567,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2mdhrx)
/*****************************************************************************/
// minidisc
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(hec2hrx_mem)
MCFG_CPU_IO_MAP(hec2mdhrx_io)
MCFG_CPU_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz
@@ -575,7 +575,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2mdhrx)
MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2mdhrx)
/* Mini Disc */
- MCFG_FD1793_ADD("wd179x", XTAL_1MHz)
+ MCFG_FD1793_ADD("wd179x", XTAL(1'000'000))
MCFG_FLOPPY_DRIVE_ADD("wd179x:0", minidisc_floppies, "dd", hec2hrp_state::minidisc_formats)
@@ -608,7 +608,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hec2hrp_state::hec2mx80)
/*****************************************************************************/
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(hec2hrx_mem)
MCFG_CPU_IO_MAP(hec2mx80_io)
MCFG_CPU_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz
@@ -616,7 +616,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2mx80)
MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx)
/* Disc II unit */
- MCFG_CPU_ADD("disc2cpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("disc2cpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(hecdisc2_mem)
MCFG_CPU_IO_MAP(hecdisc2_io)
MCFG_UPD765A_ADD("upd765", false, true)
diff --git a/src/mame/drivers/hexion.cpp b/src/mame/drivers/hexion.cpp
index 38ae4ee0eca..12b4a5bb23e 100644
--- a/src/mame/drivers/hexion.cpp
+++ b/src/mame/drivers/hexion.cpp
@@ -257,12 +257,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(hexion_state::scanline)
MACHINE_CONFIG_START(hexion_state::hexion)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* Z80B 6 MHz @ 17F, xtal verified, divider not verified */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* Z80B 6 MHz @ 17F, xtal verified, divider not verified */
MCFG_CPU_PROGRAM_MAP(hexion_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", hexion_state, scanline, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_DEVICE_ADD("k053252", K053252, XTAL_24MHz/2) /* K053252, X0-010(?) @8D, xtal verified, divider not verified */
+ MCFG_DEVICE_ADD("k053252", K053252, XTAL(24'000'000)/2) /* K053252, X0-010(?) @8D, xtal verified, divider not verified */
MCFG_K053252_INT1_ACK_CB(WRITELINE(hexion_state, irq_ack_w))
MCFG_K053252_INT2_ACK_CB(WRITELINE(hexion_state, nmi_ack_w))
MCFG_K053252_INT_TIME_CB(WRITE8(hexion_state, ccu_int_time_w))
@@ -285,7 +285,7 @@ MACHINE_CONFIG_START(hexion_state::hexion)
MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) /* MSM6295GS @ 5E, clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_K051649_ADD("k051649", XTAL_24MHz/16) /* KONAMI 051649 // 2212P003 // JAPAN 8910EAJ @ 1D, xtal verified, divider not verified */
+ MCFG_K051649_ADD("k051649", XTAL(24'000'000)/16) /* KONAMI 051649 // 2212P003 // JAPAN 8910EAJ @ 1D, xtal verified, divider not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp
index 30369acbeab..ac20faaa331 100644
--- a/src/mame/drivers/hh_melps4.cpp
+++ b/src/mame/drivers/hh_melps4.cpp
@@ -298,7 +298,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cfrogger_state::cfrogger)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M58846, XTAL_600kHz)
+ MCFG_CPU_ADD("maincpu", M58846, XTAL(600'000))
MCFG_MELPS4_READ_K_CB(READ16(cfrogger_state, input_r))
MCFG_MELPS4_WRITE_S_CB(WRITE8(cfrogger_state, plate_w))
MCFG_MELPS4_WRITE_F_CB(WRITE8(cfrogger_state, plate_w))
@@ -414,7 +414,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gjungler_state::gjungler)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M58846, XTAL_600kHz)
+ MCFG_CPU_ADD("maincpu", M58846, XTAL(600'000))
MCFG_MELPS4_READ_K_CB(READ16(gjungler_state, input_r))
MCFG_MELPS4_WRITE_S_CB(WRITE8(gjungler_state, plate_w))
MCFG_MELPS4_WRITE_F_CB(WRITE8(gjungler_state, plate_w))
diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp
index 47a6d404853..0d447278240 100644
--- a/src/mame/drivers/hh_sm510.cpp
+++ b/src/mame/drivers/hh_sm510.cpp
@@ -264,7 +264,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kdribble_state::kdribble)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(2) // confirmed
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -337,7 +337,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ktopgun_state::ktopgun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(2) // confirmed
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -412,7 +412,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kcontra_state::kcontra)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
@@ -485,7 +485,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ktmnt_state::ktmnt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
@@ -555,7 +555,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kgradius_state::kgradius)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
@@ -623,7 +623,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kloneran_state::kloneran)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
@@ -695,7 +695,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kblades_state::kblades)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
@@ -768,7 +768,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(knfl_state::knfl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
@@ -840,7 +840,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kbilly_state::kbilly)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
@@ -906,7 +906,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kbucky_state::kbucky)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
@@ -976,7 +976,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kgarfld_state::kgarfld)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
@@ -1069,7 +1069,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_mmouse_state::gnw_mmouse)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM5A, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM5A, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // ?
MCFG_SM500_WRITE_O_CB(WRITE8(hh_sm510_state, sm500_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -1102,7 +1102,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(gnw_mmouse_state::nupogodi, gnw_mmouse)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", KB1013VK12, XTAL_32_768kHz)
+ MCFG_CPU_REPLACE("maincpu", KB1013VK12, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM500_WRITE_O_CB(WRITE8(hh_sm510_state, sm500_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -1175,7 +1175,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_mickdon_state::gnw_mickdon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(2) // confirmed
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -1259,7 +1259,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_dkong2_state::gnw_dkong2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(2) // confirmed
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -1344,7 +1344,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_mario_state::gnw_mario)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(2) // confirmed
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -1436,7 +1436,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_dkjr_state::gnw_dkjr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(2) // confirmed
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -1518,7 +1518,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_mariocm_state::gnw_mariocm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(2) // confirmed
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -1603,7 +1603,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_smb_state::gnw_smb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
@@ -1705,7 +1705,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_boxing_state::gnw_boxing)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
@@ -1815,7 +1815,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tgaunt_state::tgaunt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -1917,7 +1917,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tddragon_state::tddragon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // confirmed
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -2012,7 +2012,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tkarnov_state::tkarnov)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -2106,7 +2106,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tvindictr_state::tvindictr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -2209,7 +2209,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tgaiden_state::tgaiden)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -2299,7 +2299,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tbatman_state::tbatman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -2393,7 +2393,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsharr2_state::tsharr2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // confirmed
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -2488,7 +2488,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tgoldnaxe_state::tgoldnaxe)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -2583,7 +2583,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(trobocop2_state::trobocop2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -2682,7 +2682,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(taltbeast_state::taltbeast)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // confirmed
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -2773,7 +2773,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tswampt_state::tswampt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -2869,7 +2869,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tmchammer_state::tmchammer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
@@ -2963,7 +2963,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tbtoads_state::tbtoads)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -3082,7 +3082,7 @@ static const s16 tsonic_speaker_levels[] = { 0, 0x7fff/3*1, 0x7fff/3*2, 0x7fff }
MACHINE_CONFIG_START(tsonic_state::tsonic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(tsonic_state, write_s))
@@ -3172,7 +3172,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tdummies_state::tdummies)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -3267,7 +3267,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsfight2_state::tsfight2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -3367,7 +3367,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsddragon_state::tsddragon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -3466,7 +3466,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tnmarebc_state::tnmarebc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -3562,7 +3562,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tmkombat_state::tmkombat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -3657,7 +3657,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tshadow_state::tshadow)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -3752,7 +3752,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tskelwarr_state::tskelwarr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -3848,7 +3848,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tbatfor_state::tbatfor)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -3944,7 +3944,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tjdredd_state::tjdredd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -4040,7 +4040,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tapollo13_state::tapollo13)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -4131,7 +4131,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsjam_state::tsjam)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) // no external XTAL
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768)) // no external XTAL
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -4236,7 +4236,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tigarden_state::tigarden)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768))
MCFG_SM510_R_MASK_OPTION(2) // confirmed
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
@@ -4337,7 +4337,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(nummunch_state::nummunch)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", SM511, XTAL(32'768))
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index b7f891861b0..0ab920fa945 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -4727,7 +4727,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(fxmcr165_state::fxmcr165)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, XTAL_400kHz)
+ MCFG_CPU_ADD("maincpu", TMS1100, XTAL(400'000))
MCFG_TMS1XXX_READ_K_CB(READ8(fxmcr165_state, read_k))
MCFG_TMS1XXX_WRITE_R_CB(WRITE16(fxmcr165_state, write_r))
MCFG_TMS1XXX_WRITE_O_CB(WRITE16(fxmcr165_state, write_o))
diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp
index 3efe611ccb0..6b8706d1462 100644
--- a/src/mame/drivers/hh_ucom4.cpp
+++ b/src/mame/drivers/hh_ucom4.cpp
@@ -969,7 +969,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bcclimbr_state::bcclimbr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
+ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL(400'000))
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
MCFG_UCOM4_WRITE_C_CB(WRITE8(bcclimbr_state, plate_w))
@@ -1186,7 +1186,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(invspace_state::invspace)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D552, XTAL_400kHz)
+ MCFG_CPU_ADD("maincpu", NEC_D552, XTAL(400'000))
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
MCFG_UCOM4_WRITE_C_CB(WRITE8(invspace_state, grid_w))
@@ -1302,7 +1302,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(efball_state::efball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
+ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL(400'000))
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
MCFG_UCOM4_READ_C_CB(IOPORT("IN.2"))
@@ -1402,7 +1402,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(galaxy2_state::galaxy2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
+ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL(400'000))
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
MCFG_UCOM4_WRITE_C_CB(WRITE8(galaxy2_state, grid_w))
@@ -1520,7 +1520,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(astrocmd_state::astrocmd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
+ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL(400'000))
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
MCFG_UCOM4_WRITE_C_CB(WRITE8(astrocmd_state, grid_w))
@@ -1616,7 +1616,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(edracula_state::edracula)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
+ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL(400'000))
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
MCFG_UCOM4_WRITE_C_CB(WRITE8(edracula_state, grid_w))
@@ -1704,7 +1704,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mcompgin_state::mcompgin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D650, XTAL_400kHz) // TDK FCR400K
+ MCFG_CPU_ADD("maincpu", NEC_D650, XTAL(400'000)) // TDK FCR400K
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
MCFG_UCOM4_WRITE_E_CB(WRITE8(mcompgin_state, lcd_w))
@@ -2276,7 +2276,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tmpacman_state::tmpacman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_430kHz)
+ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL(430'000))
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
MCFG_UCOM4_WRITE_C_CB(WRITE8(tmpacman_state, grid_w))
@@ -2379,7 +2379,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tmscramb_state::tmscramb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
+ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL(400'000))
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
MCFG_UCOM4_WRITE_C_CB(WRITE8(tmscramb_state, grid_w))
@@ -2479,7 +2479,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tcaveman_state::tcaveman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
+ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL(400'000))
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_WRITE_C_CB(WRITE8(tcaveman_state, grid_w))
MCFG_UCOM4_WRITE_D_CB(WRITE8(tcaveman_state, grid_w))
@@ -2611,7 +2611,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(alnchase_state::alnchase)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
+ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL(400'000))
MCFG_UCOM4_READ_A_CB(READ8(alnchase_state, input_r))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.2"))
MCFG_UCOM4_WRITE_C_CB(WRITE8(alnchase_state, output_w))
diff --git a/src/mame/drivers/higemaru.cpp b/src/mame/drivers/higemaru.cpp
index 59235995b8c..b662f59fc72 100644
--- a/src/mame/drivers/higemaru.cpp
+++ b/src/mame/drivers/higemaru.cpp
@@ -165,7 +165,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(higemaru_state::higemaru)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz Sharp LH0080A Z80A-CPU-D */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 3 MHz Sharp LH0080A Z80A-CPU-D */
MCFG_CPU_PROGRAM_MAP(higemaru_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", higemaru_state, higemaru_scanline, "screen", 0, 1)
@@ -187,10 +187,10 @@ MACHINE_CONFIG_START(higemaru_state::higemaru)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp
index 4c166e5753b..279a5bf5e85 100644
--- a/src/mame/drivers/highvdeo.cpp
+++ b/src/mame/drivers/highvdeo.cpp
@@ -1134,7 +1134,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(highvdeo_state::tv_vcf)
- MCFG_CPU_ADD("maincpu", V30, XTAL_12MHz/2 ) // ?
+ MCFG_CPU_ADD("maincpu", V30, XTAL(12'000'000)/2 ) // ?
MCFG_CPU_PROGRAM_MAP(tv_vcf_map)
MCFG_CPU_IO_MAP(tv_vcf_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", highvdeo_state, vblank_irq)
@@ -1157,7 +1157,7 @@ MACHINE_CONFIG_START(highvdeo_state::tv_vcf)
MCFG_SPEAKER_STANDARD_MONO("mono")
//OkiM6376
- MCFG_SOUND_ADD("oki", OKIM6376, XTAL_12MHz/2/2/20)//Guess, gives approx. same sample rate as previous emulation
+ MCFG_SOUND_ADD("oki", OKIM6376, XTAL(12'000'000)/2/2/20)//Guess, gives approx. same sample rate as previous emulation
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1233,7 +1233,7 @@ MACHINE_CONFIG_START(highvdeo_state::brasil)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("oki", OKIM6376, XTAL_12MHz/2/2/20)//Guess, gives same sample rate as previous emulation
+ MCFG_SOUND_ADD("oki", OKIM6376, XTAL(12'000'000)/2/2/20)//Guess, gives same sample rate as previous emulation
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1259,7 +1259,7 @@ MACHINE_CONFIG_START(highvdeo_state::grancapi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("oki", OKIM6376, XTAL_12MHz/2/2/20)//Guess, gives same sample rate as previous emulation
+ MCFG_SOUND_ADD("oki", OKIM6376, XTAL(12'000'000)/2/2/20)//Guess, gives same sample rate as previous emulation
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1285,7 +1285,7 @@ MACHINE_CONFIG_START(highvdeo_state::magicbom)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("oki", OKIM6376, XTAL_12MHz/2/2/20)//Guess, gives same sample rate as previous emulation
+ MCFG_SOUND_ADD("oki", OKIM6376, XTAL(12'000'000)/2/2/20)//Guess, gives same sample rate as previous emulation
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/himesiki.cpp b/src/mame/drivers/himesiki.cpp
index dbdcfe6f697..6b40250d256 100644
--- a/src/mame/drivers/himesiki.cpp
+++ b/src/mame/drivers/himesiki.cpp
@@ -101,8 +101,8 @@ A 12.000MHz
#include "speaker.h"
-#define MCLK XTAL_12MHz // this is on the video board
-#define CLK2 XTAL_8MHz // near the CPUs
+#define MCLK XTAL(12'000'000) // this is on the video board
+#define CLK2 XTAL(8'000'000) // near the CPUs
WRITE8_MEMBER(himesiki_state::himesiki_rombank_w)
{
diff --git a/src/mame/drivers/hitme.cpp b/src/mame/drivers/hitme.cpp
index 8fbc6ba676b..b09f539d268 100644
--- a/src/mame/drivers/hitme.cpp
+++ b/src/mame/drivers/hitme.cpp
@@ -25,7 +25,7 @@
#include "barricad.lh"
-#define MASTER_CLOCK (XTAL_8_945MHz) /* confirmed on schematic */
+#define MASTER_CLOCK (XTAL(8'945'000)) /* confirmed on schematic */
/*************************************
diff --git a/src/mame/drivers/hitpoker.cpp b/src/mame/drivers/hitpoker.cpp
index c129df2714b..192d699011b 100644
--- a/src/mame/drivers/hitpoker.cpp
+++ b/src/mame/drivers/hitpoker.cpp
@@ -95,7 +95,7 @@ public:
};
-#define CRTC_CLOCK XTAL_3_579545MHz
+#define CRTC_CLOCK XTAL(3'579'545)
void hitpoker_state::video_start()
{
diff --git a/src/mame/drivers/hk68v10.cpp b/src/mame/drivers/hk68v10.cpp
index 92773e42053..ea86b7440fd 100644
--- a/src/mame/drivers/hk68v10.cpp
+++ b/src/mame/drivers/hk68v10.cpp
@@ -186,7 +186,7 @@
#define FUNCNAME __PRETTY_FUNCTION__
#endif
-#define BAUDGEN_CLOCK XTAL_19_6608MHz /* Raltron */
+#define BAUDGEN_CLOCK XTAL(19'660'800) /* Raltron */
#define SCC_CLOCK (BAUDGEN_CLOCK / 4) /* through a 74LS393 counter */
class hk68v10_state : public driver_device
@@ -336,7 +336,7 @@ SLOT_INTERFACE_END
*/
MACHINE_CONFIG_START(hk68v10_state::hk68v10)
/* basic machine hardware */
- MCFG_CPU_ADD ("maincpu", M68010, XTAL_10MHz)
+ MCFG_CPU_ADD ("maincpu", M68010, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP (hk68v10_mem)
MCFG_DEVICE_ADD("cio", Z8536, SCC_CLOCK)
diff --git a/src/mame/drivers/hng64.cpp b/src/mame/drivers/hng64.cpp
index ebc8ae5cdc5..323e8c7c01b 100644
--- a/src/mame/drivers/hng64.cpp
+++ b/src/mame/drivers/hng64.cpp
@@ -1541,7 +1541,7 @@ MACHINE_CONFIG_START(hng64_state::hng64)
MCFG_NVRAM_ADD_0FILL("nvram")
- MCFG_DEVICE_ADD("rtc", RTC62423, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", RTC62423, XTAL(32'768))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", hng64)
diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp
index f195abd1bb4..4a9861268ec 100644
--- a/src/mame/drivers/homelab.cpp
+++ b/src/mame/drivers/homelab.cpp
@@ -737,7 +737,7 @@ QUICKLOAD_LOAD_MEMBER( homelab_state,homelab)
/* Machine driver */
MACHINE_CONFIG_START(homelab_state::homelab)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(homelab2_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", homelab_state, homelab_frame)
@@ -769,7 +769,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(homelab_state::homelab3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(homelab3_mem)
MCFG_CPU_IO_MAP(homelab3_io)
MCFG_MACHINE_RESET_OVERRIDE(homelab_state,homelab3)
@@ -802,7 +802,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(homelab_state::brailab4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(brailab4_mem)
MCFG_CPU_IO_MAP(brailab4_io)
MCFG_MACHINE_RESET_OVERRIDE(homelab_state,brailab4)
diff --git a/src/mame/drivers/homerun.cpp b/src/mame/drivers/homerun.cpp
index f1313a3f5d3..2fd04e49611 100644
--- a/src/mame/drivers/homerun.cpp
+++ b/src/mame/drivers/homerun.cpp
@@ -351,7 +351,7 @@ void homerun_state::machine_reset()
MACHINE_CONFIG_START(homerun_state::dynashot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz/4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(20'000'000)/4)
MCFG_CPU_PROGRAM_MAP(homerun_memmap)
MCFG_CPU_IO_MAP(homerun_iomap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", homerun_state, irq0_line_hold)
@@ -366,7 +366,7 @@ MACHINE_CONFIG_START(homerun_state::dynashot)
// MCFG_SCREEN_REFRESH_RATE(60)
// MCFG_SCREEN_SIZE(256, 256)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
- MCFG_SCREEN_RAW_PARAMS(XTAL_20MHz/4,328,0,256,253,0,240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(20'000'000)/4,328,0,256,253,0,240)
MCFG_SCREEN_UPDATE_DRIVER(homerun_state, screen_update_homerun)
MCFG_SCREEN_PALETTE("palette")
@@ -376,7 +376,7 @@ MACHINE_CONFIG_START(homerun_state::dynashot)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_20MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(20'000'000)/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW"))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(homerun_state, homerun_banking_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/homez80.cpp b/src/mame/drivers/homez80.cpp
index 30ae417d14c..4130d6498f7 100644
--- a/src/mame/drivers/homez80.cpp
+++ b/src/mame/drivers/homez80.cpp
@@ -281,7 +281,7 @@ INTERRUPT_GEN_MEMBER(homez80_state::homez80_interrupt)
MACHINE_CONFIG_START(homez80_state::homez80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(homez80_mem)
MCFG_CPU_IO_MAP(homez80_io)
MCFG_CPU_PERIODIC_INT_DRIVER(homez80_state, homez80_interrupt, 50)
diff --git a/src/mame/drivers/horizon.cpp b/src/mame/drivers/horizon.cpp
index 58e250c4a5e..e10030314dc 100644
--- a/src/mame/drivers/horizon.cpp
+++ b/src/mame/drivers/horizon.cpp
@@ -174,7 +174,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(horizon_state::horizon)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(horizon_mem)
MCFG_CPU_IO_MAP(horizon_io)
@@ -199,7 +199,7 @@ MACHINE_CONFIG_START(horizon_state::horizon)
MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_R_TAG, i8251_device, write_dsr))
// S-100
- MCFG_DEVICE_ADD("s100", S100_BUS, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD("s100", S100_BUS, XTAL(8'000'000) / 4)
MCFG_S100_RDY_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT))
//MCFG_S100_SLOT_ADD("s100:1", horizon_s100_cards, nullptr, nullptr) // CPU
MCFG_S100_SLOT_ADD("s100:2", horizon_s100_cards, nullptr) // RAM
@@ -220,10 +220,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(horizon_state::horizon2mhz, horizon)
MCFG_CPU_MODIFY("z80")
- MCFG_CPU_CLOCK(XTAL_4MHz / 2)
+ MCFG_CPU_CLOCK(XTAL(4'000'000) / 2)
MCFG_DEVICE_MODIFY("s100")
- MCFG_DEVICE_CLOCK(XTAL_4MHz / 2)
+ MCFG_DEVICE_CLOCK(XTAL(4'000'000) / 2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp
index 74c0f0eacae..22ca6c8593a 100644
--- a/src/mame/drivers/hornet.cpp
+++ b/src/mame/drivers/hornet.cpp
@@ -1012,14 +1012,14 @@ ADC12138_IPT_CONVERT_CB(hornet_state::adc12138_input_callback)
MACHINE_CONFIG_START(hornet_state::hornet)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */
+ MCFG_CPU_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
MCFG_CPU_PROGRAM_MAP(hornet_map)
MCFG_CPU_PERIODIC_INT_DRIVER(hornet_state, irq1_line_assert, 1000)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL_64MHz/4) /* 16MHz */
+ MCFG_CPU_ADD("audiocpu", M68000, XTAL(64'000'000)/4) /* 16MHz */
MCFG_CPU_PROGRAM_MAP(sound_memmap)
- MCFG_CPU_ADD("dsp", ADSP21062, XTAL_36MHz)
+ MCFG_CPU_ADD("dsp", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
MCFG_CPU_DATA_MAP(sharc0_map)
@@ -1052,12 +1052,12 @@ MACHINE_CONFIG_START(hornet_state::hornet)
MCFG_K037122_ADD("k037122_1", "screen")
MCFG_K037122_PALETTE("palette")
- MCFG_K056800_ADD("k056800", XTAL_16_9344MHz)
+ MCFG_K056800_ADD("k056800", XTAL(16'934'400))
MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_2))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_RF5C400_ADD("rfsnd", XTAL_16_9344MHz) // value from Guru readme, gives 44100 Hz sample rate
+ MCFG_RF5C400_ADD("rfsnd", XTAL(16'934'400)) // value from Guru readme, gives 44100 Hz sample rate
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1073,7 +1073,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(hornet_state::hornet_2board, hornet)
- MCFG_CPU_ADD("dsp2", ADSP21062, XTAL_36MHz)
+ MCFG_CPU_ADD("dsp2", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
MCFG_CPU_DATA_MAP(sharc1_map)
@@ -1130,7 +1130,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(hornet_state::terabrst, hornet)
- MCFG_CPU_ADD("gn680", M68000, XTAL_32MHz/2) /* 16MHz */
+ MCFG_CPU_ADD("gn680", M68000, XTAL(32'000'000)/2) /* 16MHz */
MCFG_CPU_PROGRAM_MAP(gn680_memmap)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hotstuff.cpp b/src/mame/drivers/hotstuff.cpp
index 60f03ad69b2..870f3c4770b 100644
--- a/src/mame/drivers/hotstuff.cpp
+++ b/src/mame/drivers/hotstuff.cpp
@@ -108,7 +108,7 @@ MACHINE_CONFIG_START(hotstuff_state::hotstuff)
MCFG_DEVICE_ADD("scc2", SCC8530N, 4915200)
MCFG_Z80SCC_OUT_INT_CB(INPUTLINE("maincpu", M68K_IRQ_5))
- MCFG_DEVICE_ADD("rtc", MC146818, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MC146818, XTAL(32'768))
MCFG_MC146818_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_1))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hp16500.cpp b/src/mame/drivers/hp16500.cpp
index 17d1d90174f..0eb5fb6285f 100644
--- a/src/mame/drivers/hp16500.cpp
+++ b/src/mame/drivers/hp16500.cpp
@@ -484,7 +484,7 @@ MACHINE_CONFIG_START(hp16500_state::hp16500)
// connecting it to VBLANK
MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("mlc", hp_hil_mlc_device, ap_w))
- MCFG_DEVICE_ADD("mlc", HP_HIL_MLC, XTAL_15_92MHz/2)
+ MCFG_DEVICE_ADD("mlc", HP_HIL_MLC, XTAL(15'920'000)/2)
MCFG_HP_HIL_INT_CALLBACK(WRITELINE(hp16500_state, irq_2))
// TODO: for now hook up the ipc hil keyboard - this might be replaced
diff --git a/src/mame/drivers/hp2620.cpp b/src/mame/drivers/hp2620.cpp
index e95a11357c1..4e3d919ddf0 100644
--- a/src/mame/drivers/hp2620.cpp
+++ b/src/mame/drivers/hp2620.cpp
@@ -93,20 +93,20 @@ static INPUT_PORTS_START( hp2622 )
INPUT_PORTS_END
MACHINE_CONFIG_START(hp2620_state::hp2622)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_25_7715MHz / 7) // 3.68 MHz
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(25'771'500) / 7) // 3.68 MHz
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_NVRAM_ADD_0FILL("nvram") // 5101 (A7 tied to GND) + battery (+ wait states)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_7715MHz, 1035, 0, 720, 415, 0, 390) // 498 total lines in 50 Hz mode
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'771'500), 1035, 0, 720, 415, 0, 390) // 498 total lines in 50 Hz mode
MCFG_SCREEN_UPDATE_DRIVER(hp2620_state, screen_update)
- //MCFG_DEVICE_ADD("crtc", DP8367, XTAL_25_7715MHz)
+ //MCFG_DEVICE_ADD("crtc", DP8367, XTAL(25'771'500))
MCFG_DEVICE_ADD("acia", MOS6551, 0) // SY6551
- MCFG_MOS6551_XTAL(XTAL_25_7715MHz / 14) // 1.84 MHz
+ MCFG_MOS6551_XTAL(XTAL(25'771'500) / 14) // 1.84 MHz
MCFG_MOS6551_IRQ_HANDLER(INPUTLINE("maincpu", 0))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hp2640.cpp b/src/mame/drivers/hp2640.cpp
index 3d0b61d0999..134874c9fa9 100644
--- a/src/mame/drivers/hp2640.cpp
+++ b/src/mame/drivers/hp2640.cpp
@@ -99,8 +99,8 @@ namespace {
}
// **** Constants ****
-constexpr unsigned SYS_CLOCK = XTAL_4_9152MHz;
-constexpr unsigned VIDEO_DOT_CLOCK = XTAL_21_06MHz;
+constexpr auto SYS_CLOCK = XTAL(4'915'200);
+constexpr auto VIDEO_DOT_CLOCK = XTAL(21'060'000);
constexpr unsigned VIDEO_VIS_ROWS = 24;
constexpr unsigned VIDEO_TOT_ROWS = 25;
constexpr unsigned VIDEO_VIS_COLS = 80;
@@ -710,7 +710,7 @@ void hp2645_state::update_async_control(uint8_t new_control)
if (new_rate_idx == 0) {
rxc_txc_freq = 0.0;
} else {
- rxc_txc_freq = double(SYS_CLOCK) / baud_rate_divisors[ new_rate_idx ];
+ rxc_txc_freq = SYS_CLOCK.dvalue() / baud_rate_divisors[ new_rate_idx ];
}
m_uart->set_receiver_clock(rxc_txc_freq);
m_uart->set_transmitter_clock(rxc_txc_freq);
diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp
index d9c7589278d..1cab01a64a3 100644
--- a/src/mame/drivers/hp64k.cpp
+++ b/src/mame/drivers/hp64k.cpp
@@ -1361,7 +1361,7 @@ MACHINE_CONFIG_START(hp64k_state::hp64k)
MCFG_SCREEN_SIZE(720 , 390)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
- MCFG_FD1791_ADD("fdc" , XTAL_4MHz / 4)
+ MCFG_FD1791_ADD("fdc" , XTAL(4'000'000) / 4)
MCFG_WD_FDC_FORCE_READY
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_flp_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_flp_drq_w))
@@ -1393,7 +1393,7 @@ MACHINE_CONFIG_START(hp64k_state::hp64k)
MCFG_TIMER_DRIVER_ADD("beep_timer" , hp64k_state , hp64k_beeper_off);
- MCFG_DEVICE_ADD("baud_rate" , COM8116 , XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD("baud_rate" , COM8116 , XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(WRITELINE(hp64k_state , hp64k_baud_clk_w));
MCFG_DEVICE_ADD("uart" , I8251 , 0)
diff --git a/src/mame/drivers/hp700.cpp b/src/mame/drivers/hp700.cpp
index 857b5554d22..1b93c53f8af 100644
--- a/src/mame/drivers/hp700.cpp
+++ b/src/mame/drivers/hp700.cpp
@@ -41,13 +41,13 @@ static INPUT_PORTS_START( hp700_92 )
INPUT_PORTS_END
MACHINE_CONFIG_START(hp700_state::hp700_92)
- MCFG_CPU_ADD("maincpu", V20, XTAL_29_4912MHz / 3) // divider not verified
+ MCFG_CPU_ADD("maincpu", V20, XTAL(29'491'200) / 3) // divider not verified
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_29_4912MHz / 8) // divider not verified
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(29'491'200) / 8) // divider not verified
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp
index 837ce2e2d99..1f152f1610c 100644
--- a/src/mame/drivers/hp9845.cpp
+++ b/src/mame/drivers/hp9845.cpp
@@ -3658,8 +3658,8 @@ const uint8_t hp9845t_state::m_back_arrow_shape[] = {
};
MACHINE_CONFIG_START(hp9845_state::hp9845a)
- //MCFG_CPU_ADD("lpu", HP_5061_3010, XTAL_11_4MHz)
- //MCFG_CPU_ADD("ppu", HP_5061_3011, XTAL_11_4MHz)
+ //MCFG_CPU_ADD("lpu", HP_5061_3010, XTAL(11'400'000))
+ //MCFG_CPU_ADD("ppu", HP_5061_3011, XTAL(11'400'000))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -3673,8 +3673,8 @@ MACHINE_CONFIG_START(hp9845_state::hp9845a)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp9845_state::hp9835a)
- //MCFG_CPU_ADD("lpu", HP_5061_3001, XTAL_11_4MHz)
- //MCFG_CPU_ADD("ppu", HP_5061_3001, XTAL_11_4MHz)
+ //MCFG_CPU_ADD("lpu", HP_5061_3001, XTAL(11'400'000))
+ //MCFG_CPU_ADD("ppu", HP_5061_3001, XTAL(11'400'000))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/hp9k.cpp b/src/mame/drivers/hp9k.cpp
index 11170d172a0..85ec6ec33d0 100644
--- a/src/mame/drivers/hp9k.cpp
+++ b/src/mame/drivers/hp9k.cpp
@@ -395,7 +395,7 @@ WRITE8_MEMBER( hp9k_state::kbd_put )
MACHINE_CONFIG_START(hp9k_state::hp9k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu",M68000, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(hp9k_mem)
/* video hardware */
@@ -411,7 +411,7 @@ MACHINE_CONFIG_START(hp9k_state::hp9k)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", hp9k)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD("mc6845", MC6845, "screen", XTAL_16MHz / 16)
+ MCFG_MC6845_ADD("mc6845", MC6845, "screen", XTAL(16'000'000) / 16)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp
index f650a033f18..418af31887a 100644
--- a/src/mame/drivers/hp9k_3xx.cpp
+++ b/src/mame/drivers/hp9k_3xx.cpp
@@ -380,7 +380,7 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k310)
MCFG_MCS48_PORT_P1_IN_CB(READ8(hp9k3xx_state, iocpu_port1_r))
MCFG_MCS48_PORT_T0_IN_CB(READ8(hp9k3xx_state, iocpu_test0_r))
- MCFG_DEVICE_ADD(MLC_TAG, HP_HIL_MLC, XTAL_15_92MHz/2)
+ MCFG_DEVICE_ADD(MLC_TAG, HP_HIL_MLC, XTAL(15'920'000)/2)
MCFG_HP_HIL_SLOT_ADD(MLC_TAG, "hil1", hp_hil_devices, "hp_ipc_kbd")
MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, 250000) // from oscillator module next to the 6840
@@ -409,7 +409,7 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k320)
MCFG_MCS48_PORT_P1_IN_CB(READ8(hp9k3xx_state, iocpu_port1_r))
MCFG_MCS48_PORT_T0_IN_CB(READ8(hp9k3xx_state, iocpu_test0_r))
- MCFG_DEVICE_ADD(MLC_TAG, HP_HIL_MLC, XTAL_15_92MHz/2)
+ MCFG_DEVICE_ADD(MLC_TAG, HP_HIL_MLC, XTAL(15'920'000)/2)
MCFG_HP_HIL_SLOT_ADD(MLC_TAG, "hil1", hp_hil_devices, "hp_ipc_kbd")
MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, 250000) // from oscillator module next to the 6840
@@ -444,7 +444,7 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k332)
MCFG_MCS48_PORT_P1_IN_CB(READ8(hp9k3xx_state, iocpu_port1_r))
MCFG_MCS48_PORT_T0_IN_CB(READ8(hp9k3xx_state, iocpu_test0_r))
- MCFG_DEVICE_ADD(MLC_TAG, HP_HIL_MLC, XTAL_15_92MHz/2)
+ MCFG_DEVICE_ADD(MLC_TAG, HP_HIL_MLC, XTAL(15'920'000)/2)
MCFG_HP_HIL_SLOT_ADD(MLC_TAG, "hil1", hp_hil_devices, "hp_ipc_kbd")
MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, 250000) // from oscillator module next to the 6840
diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp
index cce458a2fe6..97c2c0e7b1b 100644
--- a/src/mame/drivers/hp_ipc.cpp
+++ b/src/mame/drivers/hp_ipc.cpp
@@ -711,7 +711,7 @@ SLOT_INTERFACE_END
* 1 Real-time clock
*/
MACHINE_CONFIG_START(hp_ipc_state::hp_ipc)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_15_92MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(15'920'000) / 2)
MCFG_CPU_PROGRAM_MAP(hp_ipc_mem_outer)
MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0)
@@ -726,9 +726,9 @@ MACHINE_CONFIG_START(hp_ipc_state::hp_ipc)
// ver.period = 16.7ms (~60 hz)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber())
MCFG_SCREEN_UPDATE_DEVICE("gpu", hp1ll3_device, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_6MHz * 2, 720, 0, 512, 278, 0, 256)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(6'000'000) * 2, 720, 0, 512, 278, 0, 256)
// when _desktop == 0:
-// MCFG_SCREEN_RAW_PARAMS(XTAL_6MHz * 2, 720, 0, 640, 480, 0, 400)
+// MCFG_SCREEN_RAW_PARAMS(XTAL(6'000'000) * 2, 720, 0, 640, 480, 0, 400)
MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("mlc", hp_hil_mlc_device, ap_w)) // XXX actually it's driven by 555 (U59)
MCFG_DEFAULT_LAYOUT(layout_lcd)
@@ -741,17 +741,17 @@ MACHINE_CONFIG_START(hp_ipc_state::hp_ipc)
// XXX actual clock is 1MHz; remove this workaround (and change 2000 to 100 in hp_ipc_dsk.cpp)
// XXX when floppy code correctly handles 600 rpm drives.
- MCFG_WD2797_ADD("fdc", XTAL_2MHz)
+ MCFG_WD2797_ADD("fdc", XTAL(2'000'000))
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(hp_ipc_state, irq_5))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", hp_ipc_floppies, "35dd", hp_ipc_state::floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list","hp_ipc")
- MCFG_DEVICE_ADD("rtc", MM58167, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768))
MCFG_MM58167_IRQ_CALLBACK(WRITELINE(hp_ipc_state, irq_1))
// MCFG_MM58167_STANDBY_IRQ_CALLBACK(WRITELINE(hp_ipc_state, irq_6))
- MCFG_DEVICE_ADD("mlc", HP_HIL_MLC, XTAL_15_92MHz/2)
+ MCFG_DEVICE_ADD("mlc", HP_HIL_MLC, XTAL(15'920'000)/2)
MCFG_HP_HIL_INT_CALLBACK(WRITELINE(hp_ipc_state, irq_2))
MCFG_HP_HIL_NMI_CALLBACK(WRITELINE(hp_ipc_state, irq_7))
MCFG_HP_HIL_SLOT_ADD("mlc", "hil1", hp_hil_devices, "hp_ipc_kbd")
diff --git a/src/mame/drivers/hprot1.cpp b/src/mame/drivers/hprot1.cpp
index cd99fa4b864..e09a0154d25 100644
--- a/src/mame/drivers/hprot1.cpp
+++ b/src/mame/drivers/hprot1.cpp
@@ -305,7 +305,7 @@ HD44780_PIXEL_UPDATE(hprot1_state::hprot1_pixel_update)
MACHINE_CONFIG_START(hprot1_state::hprot1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", I80C31, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(i80c31_prg)
MCFG_CPU_IO_MAP(i80c31_io)
diff --git a/src/mame/drivers/hpz80unk.cpp b/src/mame/drivers/hpz80unk.cpp
index 6a30490d239..ad2360e11f5 100644
--- a/src/mame/drivers/hpz80unk.cpp
+++ b/src/mame/drivers/hpz80unk.cpp
@@ -216,7 +216,7 @@ void hpz80unk_state::machine_reset()
MACHINE_CONFIG_START(hpz80unk_state::hpz80unk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(hpz80unk_mem)
MCFG_CPU_IO_MAP(hpz80unk_io)
diff --git a/src/mame/drivers/ht68k.cpp b/src/mame/drivers/ht68k.cpp
index a1c1af325d4..0653189cc37 100644
--- a/src/mame/drivers/ht68k.cpp
+++ b/src/mame/drivers/ht68k.cpp
@@ -126,11 +126,11 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(ht68k_state::ht68k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu",M68000, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(ht68k_mem)
/* video hardware */
- MCFG_DEVICE_ADD( "duart68681", MC68681, XTAL_8MHz / 2 )
+ MCFG_DEVICE_ADD( "duart68681", MC68681, XTAL(8'000'000) / 2 )
MCFG_MC68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000)
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(ht68k_state, duart_irq_handler))
MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
@@ -140,7 +140,7 @@ MACHINE_CONFIG_START(ht68k_state::ht68k)
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart68681", mc68681_device, rx_a_w))
- MCFG_WD1770_ADD("wd1770", XTAL_8MHz )
+ MCFG_WD1770_ADD("wd1770", XTAL(8'000'000) )
MCFG_FLOPPY_DRIVE_ADD("wd1770:0", ht68k_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1770:1", ht68k_floppies, "525dd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/huebler.cpp b/src/mame/drivers/huebler.cpp
index ff2293e02df..7fdd66216e1 100644
--- a/src/mame/drivers/huebler.cpp
+++ b/src/mame/drivers/huebler.cpp
@@ -311,7 +311,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(amu880_state::amu880)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10MHz/4) // U880D
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(10'000'000)/4) // U880D
MCFG_CPU_PROGRAM_MAP(amu880_mem)
MCFG_CPU_IO_MAP(amu880_io)
MCFG_Z80_DAISY_CHAIN(amu880_daisy_chain)
@@ -327,19 +327,19 @@ MACHINE_CONFIG_START(amu880_state::amu880)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* devices */
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_10MHz/4)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(10'000'000)/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(amu880_state, ctc_z0_w))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
MCFG_Z80CTC_ZC2_CB(WRITELINE(amu880_state, ctc_z2_w))
- MCFG_DEVICE_ADD(Z80PIO1_TAG, Z80PIO, XTAL_10MHz/4)
+ MCFG_DEVICE_ADD(Z80PIO1_TAG, Z80PIO, XTAL(10'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(Z80PIO2_TAG, Z80PIO, XTAL_10MHz/4)
+ MCFG_DEVICE_ADD(Z80PIO2_TAG, Z80PIO, XTAL(10'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL_10MHz/4) // U856
+ MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(10'000'000)/4) // U856
MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(amu880_state, cassette_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
diff --git a/src/mame/drivers/hunter2.cpp b/src/mame/drivers/hunter2.cpp
index 013dfa266ff..780781d494f 100644
--- a/src/mame/drivers/hunter2.cpp
+++ b/src/mame/drivers/hunter2.cpp
@@ -368,7 +368,7 @@ WRITE_LINE_MEMBER(hunter2_state::rxd_w)
MACHINE_CONFIG_START(hunter2_state::hunter2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NSC800, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", NSC800, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(hunter2_mem)
MCFG_CPU_IO_MAP(hunter2_io)
@@ -383,7 +383,7 @@ MACHINE_CONFIG_START(hunter2_state::hunter2)
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_PALETTE_ADD("palette", 2)
MCFG_PALETTE_INIT_OWNER(hunter2_state, hunter2)
- MCFG_DEVICE_ADD("lcdc", HD61830, XTAL_4_9152MHz/2/2) // unknown clock
+ MCFG_DEVICE_ADD("lcdc", HD61830, XTAL(4'915'200)/2/2) // unknown clock
MCFG_VIDEO_SET_SCREEN("screen")
/* sound hardware */
@@ -397,7 +397,7 @@ MACHINE_CONFIG_START(hunter2_state::hunter2)
MCFG_MM58274C_MODE24(0) // 12 hour
MCFG_MM58274C_DAY1(1) // monday
- MCFG_NSC810_ADD("iotimer",XTAL_4MHz,XTAL_4MHz)
+ MCFG_NSC810_ADD("iotimer",XTAL(4'000'000),XTAL(4'000'000))
MCFG_NSC810_PORTA_READ(READ8(hunter2_state,keyboard_r))
MCFG_NSC810_PORTB_READ(READ8(hunter2_state,serial_dsr_r))
MCFG_NSC810_PORTB_WRITE(WRITE8(hunter2_state,keyboard_w))
diff --git a/src/mame/drivers/hx20.cpp b/src/mame/drivers/hx20.cpp
index 79876628942..a265595760e 100644
--- a/src/mame/drivers/hx20.cpp
+++ b/src/mame/drivers/hx20.cpp
@@ -891,11 +891,11 @@ void hx20_state::machine_start()
MACHINE_CONFIG_START(hx20_state::hx20)
// basic machine hardware
- MCFG_CPU_ADD(HD6301V1_MAIN_TAG, HD63701, XTAL_2_4576MHz)
+ MCFG_CPU_ADD(HD6301V1_MAIN_TAG, HD63701, XTAL(2'457'600))
MCFG_CPU_PROGRAM_MAP(hx20_mem)
MCFG_CPU_IO_MAP(hx20_io)
- MCFG_CPU_ADD(HD6301V1_SLAVE_TAG, HD63701, XTAL_2_4576MHz)
+ MCFG_CPU_ADD(HD6301V1_SLAVE_TAG, HD63701, XTAL(2'457'600))
MCFG_CPU_PROGRAM_MAP(hx20_sub_mem)
MCFG_CPU_IO_MAP(hx20_sub_io)
@@ -925,7 +925,7 @@ MACHINE_CONFIG_START(hx20_state::hx20)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
- MCFG_MC146818_ADD(MC146818_TAG, XTAL_4_194304Mhz)
+ MCFG_MC146818_ADD(MC146818_TAG, XTAL(4'194'304))
MCFG_MC146818_IRQ_HANDLER(WRITELINE(hx20_state, rtc_irq_w))
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
MCFG_CASSETTE_ADD(CASSETTE_TAG)
diff --git a/src/mame/drivers/hyperscan.cpp b/src/mame/drivers/hyperscan.cpp
index 66f8f99a6a3..9cf92df11fc 100644
--- a/src/mame/drivers/hyperscan.cpp
+++ b/src/mame/drivers/hyperscan.cpp
@@ -343,7 +343,7 @@ WRITE32_MEMBER(hyperscan_state::spg290_regs_w)
}
else if (addr == 0x2100e4) // Timer Source Clock Selection
{
- uint32_t timers_clk = XTAL_27MHz / ((data & 0xff) + 1);
+ const auto timers_clk = XTAL(27'000'000) / ((data & 0xff) + 1);
m_update_timer->adjust(attotime::from_hz(timers_clk), 0, attotime::from_hz(timers_clk));
}
else if(addr == 0x130020) // I2C configuration
@@ -360,7 +360,7 @@ WRITE32_MEMBER(hyperscan_state::spg290_regs_w)
else if(addr == 0x130028) // I2C clock setting
{
COMBINE_DATA(&m_i2c.clock);
- uint32_t i2c_clk = XTAL_27MHz / ((m_i2c.clock & 0x3ff) + 1);
+ const auto i2c_clk = XTAL(27'000'000) / ((m_i2c.clock & 0x3ff) + 1);
m_i2c_timer->adjust(attotime::from_hz(i2c_clk), 0, attotime::from_hz(i2c_clk));
}
else if(addr == 0x13002c) // I2C ID
@@ -619,7 +619,7 @@ void hyperscan_state::machine_reset()
MACHINE_CONFIG_START(hyperscan_state::hyperscan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SCORE7, XTAL_27MHz * 4) // 108MHz S+core 7
+ MCFG_CPU_ADD("maincpu", SCORE7, XTAL(27'000'000) * 4) // 108MHz S+core 7
MCFG_CPU_PROGRAM_MAP(spg290_mem)
/* video hardware */
diff --git a/src/mame/drivers/hyperspt.cpp b/src/mame/drivers/hyperspt.cpp
index 64e208512b7..bf96fb2a2cd 100644
--- a/src/mame/drivers/hyperspt.cpp
+++ b/src/mame/drivers/hyperspt.cpp
@@ -291,11 +291,11 @@ INTERRUPT_GEN_MEMBER(hyperspt_state::vblank_irq)
MACHINE_CONFIG_START(hyperspt_state::hyperspt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI1, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", KONAMI1, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(hyperspt_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", hyperspt_state, vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL(14'318'181)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(hyperspt_sound_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // F2
@@ -336,10 +336,10 @@ MACHINE_CONFIG_START(hyperspt_state::hyperspt)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("snsnd", SN76496, XTAL_14_31818MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("snsnd", SN76496, XTAL(14'318'181)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("vlm", VLM5030, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -372,7 +372,7 @@ MACHINE_CONFIG_DERIVED(hyperspt_state::hypersptb, hyperspt)
MCFG_CPU_MODIFY("audiocpu")
MCFG_CPU_PROGRAM_MAP(soundb_map)
- MCFG_CPU_ADD("adpcm", M6802, XTAL_14_31818MHz/8) /* unknown clock */
+ MCFG_CPU_ADD("adpcm", M6802, XTAL(14'318'181)/8) /* unknown clock */
MCFG_CPU_PROGRAM_MAP(hyprolyb_adpcm_map)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
diff --git a/src/mame/drivers/i7000.cpp b/src/mame/drivers/i7000.cpp
index d08df3e49b0..bbda3d26818 100644
--- a/src/mame/drivers/i7000.cpp
+++ b/src/mame/drivers/i7000.cpp
@@ -336,7 +336,7 @@ MC6845_ON_UPDATE_ADDR_CHANGED(i7000_state::crtc_addr)
MACHINE_CONFIG_START(i7000_state::i7000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NSC800, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", NSC800, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(i7000_mem)
MCFG_CPU_IO_MAP(i7000_io)
@@ -353,7 +353,7 @@ MACHINE_CONFIG_START(i7000_state::i7000)
MCFG_PALETTE_ADD("palette", 2)
MCFG_PALETTE_INIT_OWNER(i7000_state, i7000)
- MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL_20MHz) /* (?) */
+ MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL(20'000'000)) /* (?) */
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_ADDR_CHANGED_CB(i7000_state, crtc_addr)
@@ -365,11 +365,11 @@ MACHINE_CONFIG_START(i7000_state::i7000)
/* Programmable timer */
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
-// MCFG_PIT8253_CLK0(XTAL_4MHz / 2) /* TODO: verify on PCB */
+// MCFG_PIT8253_CLK0(XTAL(4'000'000) / 2) /* TODO: verify on PCB */
// MCFG_PIT8253_OUT0_HANDLER(WRITELINE(i7000_state,i7000_pit_out0))
-// MCFG_PIT8253_CLK1(XTAL_4MHz / 2) /* TODO: verify on PCB */
+// MCFG_PIT8253_CLK1(XTAL(4'000'000) / 2) /* TODO: verify on PCB */
// MCFG_PIT8253_OUT1_HANDLER(WRITELINE(i7000_state,i7000_pit_out1))
- MCFG_PIT8253_CLK2(XTAL_4MHz / 2) /* TODO: verify on PCB */
+ MCFG_PIT8253_CLK2(XTAL(4'000'000) / 2) /* TODO: verify on PCB */
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w))
/* Keyboard interface */
diff --git a/src/mame/drivers/ibm3153.cpp b/src/mame/drivers/ibm3153.cpp
index 86d91f93050..8e20fe76512 100644
--- a/src/mame/drivers/ibm3153.cpp
+++ b/src/mame/drivers/ibm3153.cpp
@@ -96,7 +96,7 @@ void ibm3153_state::machine_reset()
MACHINE_CONFIG_START(ibm3153_state::ibm3153)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C32, XTAL_16MHz) // no idea of clock
+ MCFG_CPU_ADD("maincpu", I80C32, XTAL(16'000'000)) // no idea of clock
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/ibm6580.cpp b/src/mame/drivers/ibm6580.cpp
index 1913e1cec69..d2d14bd6541 100644
--- a/src/mame/drivers/ibm6580.cpp
+++ b/src/mame/drivers/ibm6580.cpp
@@ -876,7 +876,7 @@ static SLOT_INTERFACE_START( dw_floppies )
SLOT_INTERFACE_END
MACHINE_CONFIG_START(ibm6580_state::ibm6580)
- MCFG_CPU_ADD("maincpu", I8086, XTAL_14_7456MHz/3)
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(14'745'600)/3)
MCFG_CPU_PROGRAM_MAP(ibm6580_mem)
MCFG_CPU_IO_MAP(ibm6580_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
@@ -886,7 +886,7 @@ MACHINE_CONFIG_START(ibm6580_state::ibm6580)
MCFG_RAM_EXTRA_OPTIONS("160K,192K,224K,256K,320K,384K")
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25MHz/2, 833, 0, 640, 428, 0, 400)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'000'000)/2, 833, 0, 640, 428, 0, 400)
MCFG_SCREEN_UPDATE_DRIVER(ibm6580_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ibm6580_state, vblank_w))
@@ -912,7 +912,7 @@ MACHINE_CONFIG_START(ibm6580_state::ibm6580)
MCFG_DW_KEYBOARD_OUT_STROBE_HANDLER(WRITELINE(ibm6580_state, kb_strobe_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ppi8255", i8255_device, pc4_w))
- MCFG_DEVICE_ADD("dma8257", I8257, XTAL_14_7456MHz/3)
+ MCFG_DEVICE_ADD("dma8257", I8257, XTAL(14'745'600)/3)
MCFG_I8257_OUT_HRQ_CB(WRITELINE(ibm6580_state, hrq_w))
MCFG_I8257_OUT_TC_CB(DEVWRITELINE(UPD765_TAG, upd765a_device, tc_line_w))
MCFG_I8257_IN_MEMR_CB(READ8(ibm6580_state, memory_read_byte))
diff --git a/src/mame/drivers/ibmpc.cpp b/src/mame/drivers/ibmpc.cpp
index 19139fea6ce..378f98ba682 100644
--- a/src/mame/drivers/ibmpc.cpp
+++ b/src/mame/drivers/ibmpc.cpp
@@ -291,7 +291,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(ibmpc_state::ibm5150)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3)
MCFG_CPU_PROGRAM_MAP(pc8_map)
MCFG_CPU_IO_MAP(pc8_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
@@ -328,7 +328,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ibmpc_state::ibm5160)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3)
MCFG_CPU_PROGRAM_MAP(pc8_map)
MCFG_CPU_IO_MAP(pc8_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp
index e71e59716ef..19ec0b84f6d 100644
--- a/src/mame/drivers/ibmpcjr.cpp
+++ b/src/mame/drivers/ibmpcjr.cpp
@@ -590,10 +590,10 @@ MACHINE_CONFIG_START(pcjr_state::ibmpcjr)
supported yet.
*/
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_14_31818MHz/12)
+ MCFG_PIT8253_CLK0(XTAL(14'318'181)/12)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_14_31818MHz/12)
- MCFG_PIT8253_CLK2(XTAL_14_31818MHz/12)
+ MCFG_PIT8253_CLK1(XTAL(14'318'181)/12)
+ MCFG_PIT8253_CLK2(XTAL(14'318'181)/12)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(pcjr_state, out2_changed))
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
@@ -604,7 +604,7 @@ MACHINE_CONFIG_START(pcjr_state::ibmpcjr)
MCFG_I8255_OUT_PORTB_CB(WRITE8(pcjr_state, pcjr_ppi_portb_w))
MCFG_I8255_IN_PORTC_CB(READ8(pcjr_state, pcjr_ppi_portc_r))
- MCFG_DEVICE_ADD( "ins8250", INS8250, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "ins8250", INS8250, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport", rs232_port_device, write_rts))
@@ -627,7 +627,7 @@ MACHINE_CONFIG_START(pcjr_state::ibmpcjr)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("sn76496", SN76496, XTAL_14_31818MHz/4)
+ MCFG_SOUND_ADD("sn76496", SN76496, XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* printer */
diff --git a/src/mame/drivers/icatel.cpp b/src/mame/drivers/icatel.cpp
index 4e2e8dfa481..e1fad969fca 100644
--- a/src/mame/drivers/icatel.cpp
+++ b/src/mame/drivers/icatel.cpp
@@ -242,7 +242,7 @@ HD44780_PIXEL_UPDATE(icatel_state::icatel_pixel_update)
MACHINE_CONFIG_START(icatel_state::icatel)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL_2_097152MHz)
+ MCFG_CPU_ADD("maincpu", I80C31, XTAL(2'097'152))
MCFG_CPU_PROGRAM_MAP(i80c31_prg)
MCFG_CPU_DATA_MAP(i80c31_data)
MCFG_CPU_IO_MAP(i80c31_io)
diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp
index a3fe384ac6c..37fd76cdb93 100644
--- a/src/mame/drivers/icecold.cpp
+++ b/src/mame/drivers/icecold.cpp
@@ -334,7 +334,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(icecold_state::icecold_motors_timer)
MACHINE_CONFIG_START(icecold_state::icecold)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_6MHz/4) // 68A09E
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(6'000'000)/4) // 68A09E
MCFG_CPU_PROGRAM_MAP(icecold_map)
MCFG_DEVICE_ADD( "pia0", PIA6821, 0)
@@ -354,7 +354,7 @@ MACHINE_CONFIG_START(icecold_state::icecold)
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
- MCFG_DEVICE_ADD("i8279", I8279, XTAL_6MHz/4)
+ MCFG_DEVICE_ADD("i8279", I8279, XTAL(6'000'000)/4)
MCFG_I8279_OUT_IRQ_CB(DEVWRITELINE("pia0", pia6821_device, cb1_w)) // irq
MCFG_I8279_OUT_SL_CB(WRITE8(icecold_state, scanlines_w)) // scan SL lines
MCFG_I8279_OUT_DISP_CB(WRITE8(icecold_state, digit_w)) // display A&B
@@ -371,12 +371,12 @@ MACHINE_CONFIG_START(icecold_state::icecold)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay0", AY8910, XTAL_6MHz/4)
+ MCFG_SOUND_ADD("ay0", AY8910, XTAL(6'000'000)/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(icecold_state, ay8910_0_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_6MHz/4)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(6'000'000)/4)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(icecold_state, ay8910_1_a_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(icecold_state, ay8910_1_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/ichiban.cpp b/src/mame/drivers/ichiban.cpp
index f0776765348..c50889e61fa 100644
--- a/src/mame/drivers/ichiban.cpp
+++ b/src/mame/drivers/ichiban.cpp
@@ -44,7 +44,7 @@ HSync - 15.510kHz
#include "speaker.h"
-#define MAIN_CLOCK XTAL_18_432MHz
+#define MAIN_CLOCK XTAL(18'432'000)
class ichibanjyan_state : public driver_device
{
diff --git a/src/mame/drivers/idsa.cpp b/src/mame/drivers/idsa.cpp
index ccd81445f6b..f51e679f8f2 100644
--- a/src/mame/drivers/idsa.cpp
+++ b/src/mame/drivers/idsa.cpp
@@ -328,11 +328,11 @@ void idsa_state::machine_reset()
MACHINE_CONFIG_START(idsa_state::idsa)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(maincpu_map)
MCFG_CPU_IO_MAP(maincpu_io_map)
- MCFG_DEVICE_ADD("irqclk", CLOCK, XTAL_8MHz / 4 )
+ MCFG_DEVICE_ADD("irqclk", CLOCK, XTAL(8'000'000) / 4 )
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(idsa_state, clock_w))
/* video hardware */
diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp
index 62d855a3625..d7fed8de731 100644
--- a/src/mame/drivers/igs009.cpp
+++ b/src/mame/drivers/igs009.cpp
@@ -812,7 +812,7 @@ INTERRUPT_GEN_MEMBER(igs009_state::interrupt)
MACHINE_CONFIG_START(igs009_state::jingbell)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 2) /* HD64180RP8, 8 MHz? */
MCFG_CPU_PROGRAM_MAP(jingbell_map)
MCFG_CPU_IO_MAP(jingbell_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", igs009_state, interrupt)
@@ -844,10 +844,10 @@ MACHINE_CONFIG_START(igs009_state::jingbell)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz / 12, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000) / 12, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp
index 52b6cf93dfc..84d0a9ff44f 100644
--- a/src/mame/drivers/igs011.cpp
+++ b/src/mame/drivers/igs011.cpp
@@ -4149,7 +4149,7 @@ GFXDECODE_END
#endif
MACHINE_CONFIG_START(igs011_state::igs011_base)
- MCFG_CPU_ADD("maincpu",M68000, XTAL_22MHz/3)
+ MCFG_CPU_ADD("maincpu",M68000, XTAL(22'000'000)/3)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -4168,7 +4168,7 @@ MACHINE_CONFIG_START(igs011_state::igs011_base)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_22MHz/21, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(22'000'000)/21, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4184,7 +4184,7 @@ MACHINE_CONFIG_DERIVED(igs011_state::drgnwrld, igs011_base)
MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_irq", igs011_state, lev5_timer_irq_cb, attotime::from_hz(240)) // lev5 frequency drives the music tempo
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -4253,7 +4253,7 @@ MACHINE_CONFIG_DERIVED(igs011_state::lhb2, igs011_base)
// MCFG_GFXDECODE_ADD("gfxdecode", "palette", igs011_hi)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -4269,7 +4269,7 @@ MACHINE_CONFIG_DERIVED(igs011_state::nkishusp, igs011_base)
// MCFG_GFXDECODE_ADD("gfxdecode", "palette", igs011_hi)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp
index 94e10a17a19..a1cdf3773dc 100644
--- a/src/mame/drivers/igs017.cpp
+++ b/src/mame/drivers/igs017.cpp
@@ -3261,7 +3261,7 @@ MACHINE_RESET_MEMBER(igs017_state,iqblocka)
}
MACHINE_CONFIG_START(igs017_state::iqblocka)
- MCFG_CPU_ADD("maincpu", Z180, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(iqblocka_map)
MCFG_CPU_IO_MAP(iqblocka_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, iqblocka_interrupt, "screen", 0, 1)
@@ -3291,10 +3291,10 @@ MACHINE_CONFIG_START(igs017_state::iqblocka)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz / 16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000) / 16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3326,7 +3326,7 @@ MACHINE_RESET_MEMBER(igs017_state,mgcs)
}
MACHINE_CONFIG_START(igs017_state::mgcs)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(22'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(mgcs)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
@@ -3356,7 +3356,7 @@ MACHINE_CONFIG_START(igs017_state::mgcs)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8MHz / 8, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(8'000'000) / 8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3365,7 +3365,7 @@ MACHINE_CONFIG_END
// lhzb2
MACHINE_CONFIG_START(igs017_state::lhzb2)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(22'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(lhzb2)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
@@ -3402,7 +3402,7 @@ MACHINE_CONFIG_START(igs017_state::lhzb2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8MHz / 8, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(8'000'000) / 8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3417,7 +3417,7 @@ MACHINE_RESET_MEMBER(igs017_state,lhzb2a)
}
MACHINE_CONFIG_START(igs017_state::lhzb2a)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(22'000'000)/2)
MCFG_CPU_PROGRAM_MAP(lhzb2a)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
@@ -3445,7 +3445,7 @@ MACHINE_CONFIG_START(igs017_state::lhzb2a)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_22MHz / 22, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(22'000'000) / 22, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3454,7 +3454,7 @@ MACHINE_CONFIG_END
// slqz2
MACHINE_CONFIG_START(igs017_state::slqz2)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(22'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(slqz2)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
@@ -3489,7 +3489,7 @@ MACHINE_CONFIG_START(igs017_state::slqz2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8MHz / 8, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(8'000'000) / 8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3498,7 +3498,7 @@ MACHINE_CONFIG_END
// sdmg2
MACHINE_CONFIG_START(igs017_state::sdmg2)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(22'000'000)/2)
MCFG_CPU_PROGRAM_MAP(sdmg2)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
@@ -3527,7 +3527,7 @@ MACHINE_CONFIG_START(igs017_state::sdmg2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_22MHz / 22, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(22'000'000) / 22, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3546,7 +3546,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(igs017_state::mgdh_interrupt)
}
MACHINE_CONFIG_START(igs017_state::mgdha)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(22'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(mgdha_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgdh_interrupt, "screen", 0, 1)
@@ -3574,7 +3574,7 @@ MACHINE_CONFIG_START(igs017_state::mgdha)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_22MHz / 22, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(22'000'000) / 22, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3582,7 +3582,7 @@ MACHINE_CONFIG_END
// tjsb
MACHINE_CONFIG_START(igs017_state::tjsb)
- MCFG_CPU_ADD("maincpu", Z180, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(tjsb_map)
MCFG_CPU_IO_MAP(tjsb_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, iqblocka_interrupt, "screen", 0, 1)
@@ -3614,10 +3614,10 @@ MACHINE_CONFIG_START(igs017_state::tjsb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz / 16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000) / 16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3625,7 +3625,7 @@ MACHINE_CONFIG_END
// spkrform
MACHINE_CONFIG_START(igs017_state::spkrform)
- MCFG_CPU_ADD("maincpu", Z180, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(spkrform_map)
MCFG_CPU_IO_MAP(spkrform_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, iqblocka_interrupt, "screen", 0, 1)
@@ -3655,10 +3655,10 @@ MACHINE_CONFIG_START(igs017_state::spkrform)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz / 16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000) / 16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp
index a825794f1ce..4314af21ef3 100644
--- a/src/mame/drivers/igspoker.cpp
+++ b/src/mame/drivers/igspoker.cpp
@@ -1954,7 +1954,7 @@ MACHINE_CONFIG_DERIVED(igspoker_state::number10, igspoker)
MCFG_SCREEN_UPDATE_DRIVER(igspoker_state, screen_update_cpokerpk)
MCFG_VIDEO_START_OVERRIDE(igspoker_state,cpokerpk)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz / 12, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000) / 12, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/imds.cpp b/src/mame/drivers/imds.cpp
index 29fa12596ab..4e6a6c10ab3 100644
--- a/src/mame/drivers/imds.cpp
+++ b/src/mame/drivers/imds.cpp
@@ -91,7 +91,7 @@ void imds_state::machine_reset()
MACHINE_CONFIG_START(imds_state::imds)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_4MHz) // no idea of clock.
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(4'000'000)) // no idea of clock.
MCFG_CPU_PROGRAM_MAP(imds_mem)
MCFG_CPU_IO_MAP(imds_io)
diff --git a/src/mame/drivers/imds2.cpp b/src/mame/drivers/imds2.cpp
index 948eebce9d0..e3c9f48d2e3 100644
--- a/src/mame/drivers/imds2.cpp
+++ b/src/mame/drivers/imds2.cpp
@@ -93,19 +93,19 @@
#include "speaker.h"
// CPU oscillator of IPC board: 8 MHz
-#define IPC_XTAL_Y2 XTAL_8MHz
+#define IPC_XTAL_Y2 XTAL(8'000'000)
// Y1 oscillator of IPC board: 19.6608 MHz
-#define IPC_XTAL_Y1 XTAL_19_6608MHz
+#define IPC_XTAL_Y1 XTAL(19'660'800)
// Main oscillator of IOC board: 22.032 MHz
#define IOC_XTAL_Y2 22032000
// FDC oscillator of IOC board: 8 MHz
-#define IOC_XTAL_Y1 XTAL_8MHz
+#define IOC_XTAL_Y1 XTAL(8'000'000)
// PIO oscillator: 6 MHz
-#define IOC_XTAL_Y3 XTAL_6MHz
+#define IOC_XTAL_Y3 XTAL(6'000'000)
// Frequency of beeper
#define IOC_BEEP_FREQ 3300
@@ -868,7 +868,7 @@ MACHINE_CONFIG_START(imds2_state::imds2)
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(imds2_state, imds2_pio_port_p2_w))
MCFG_QUANTUM_TIME(attotime::from_hz(100))
- MCFG_CPU_ADD("kbcpu", I8741, XTAL_3_579545MHz) /* 3.579545 MHz */
+ MCFG_CPU_ADD("kbcpu", I8741, XTAL(3'579'545)) /* 3.579545 MHz */
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(imds2_state, imds2_kb_port_p1_w))
MCFG_MCS48_PORT_P2_IN_CB(READ8(imds2_state, imds2_kb_port_p2_r))
MCFG_MCS48_PORT_T0_IN_CB(READLINE(imds2_state, imds2_kb_port_t0_r))
diff --git a/src/mame/drivers/imsai.cpp b/src/mame/drivers/imsai.cpp
index 2865776a9f2..203f71135eb 100644
--- a/src/mame/drivers/imsai.cpp
+++ b/src/mame/drivers/imsai.cpp
@@ -103,7 +103,7 @@ void imsai_state::machine_reset()
MACHINE_CONFIG_START(imsai_state::imsai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL_6MHz)
+ MCFG_CPU_ADD("maincpu",I8085A, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(imsai_mem)
MCFG_CPU_IO_MAP(imsai_io)
@@ -115,11 +115,11 @@ MACHINE_CONFIG_START(imsai_state::imsai)
MCFG_DEVICE_ADD("uart", I8251, 0)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_6MHz / 3) /* Timer 0: baud rate gen for 8251 */
+ MCFG_PIT8253_CLK0(XTAL(6'000'000) / 3) /* Timer 0: baud rate gen for 8251 */
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
- MCFG_PIT8253_CLK1(XTAL_6MHz / 3) /* Timer 1: user */
- MCFG_PIT8253_CLK2(XTAL_6MHz / 3) /* Timer 2: user */
+ MCFG_PIT8253_CLK1(XTAL(6'000'000) / 3) /* Timer 1: user */
+ MCFG_PIT8253_CLK2(XTAL(6'000'000) / 3) /* Timer 2: user */
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/inder.cpp b/src/mame/drivers/inder.cpp
index 6501f1fd62a..8ab5ad05d8a 100644
--- a/src/mame/drivers/inder.cpp
+++ b/src/mame/drivers/inder.cpp
@@ -1341,7 +1341,7 @@ DRIVER_INIT_MEMBER( inder_state, inder1 )
MACHINE_CONFIG_START(inder_state::brvteam)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(brvteam_map)
MCFG_CPU_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE556
@@ -1353,13 +1353,13 @@ MACHINE_CONFIG_START(inder_state::brvteam)
/* Sound */
MCFG_FRAGMENT_ADD( genpin_audio )
MCFG_SPEAKER_STANDARD_MONO("snvol")
- MCFG_SOUND_ADD("sn", SN76489, XTAL_8MHz / 2) // jumper choice of 2 or 4 MHz
+ MCFG_SOUND_ADD("sn", SN76489, XTAL(8'000'000) / 2) // jumper choice of 2 or 4 MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "snvol", 2.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(inder_state::canasta)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(canasta_map)
MCFG_CPU_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE556
@@ -1371,16 +1371,16 @@ MACHINE_CONFIG_START(inder_state::canasta)
/* Sound */
MCFG_FRAGMENT_ADD( genpin_audio )
MCFG_SPEAKER_STANDARD_MONO("ayvol")
- MCFG_SOUND_ADD("ay", AY8910, XTAL_4MHz / 2)
+ MCFG_SOUND_ADD("ay", AY8910, XTAL(4'000'000) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(inder_state::lapbylap)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(lapbylap_map)
MCFG_CPU_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE556
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_2MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(lapbylap_sub_map)
MCFG_CPU_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE555
@@ -1392,19 +1392,19 @@ MACHINE_CONFIG_START(inder_state::lapbylap)
/* Sound */
MCFG_FRAGMENT_ADD( genpin_audio )
MCFG_SPEAKER_STANDARD_MONO("ayvol")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_2MHz) // same xtal that drives subcpu
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(2'000'000)) // same xtal that drives subcpu
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 1.0)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_2MHz) // same xtal that drives subcpu
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(2'000'000)) // same xtal that drives subcpu
MCFG_AY8910_PORT_A_READ_CB(READ8(inder_state, sndcmd_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(inder_state::inder)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(inder_map)
MCFG_CPU_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE556
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_5MHz / 2)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(5'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(inder_sub_map)
MCFG_CPU_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE555
@@ -1416,7 +1416,7 @@ MACHINE_CONFIG_START(inder_state::inder)
/* Sound */
MCFG_FRAGMENT_ADD( genpin_audio )
MCFG_SPEAKER_STANDARD_MONO("msmvol")
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCK_CALLBACK(DEVWRITELINE("9a", ttl7474_device, clock_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("9b", ttl7474_device, clock_w)) // order of writes is sensitive
diff --git a/src/mame/drivers/indiana.cpp b/src/mame/drivers/indiana.cpp
index 949d6678717..2b3228fa551 100644
--- a/src/mame/drivers/indiana.cpp
+++ b/src/mame/drivers/indiana.cpp
@@ -89,7 +89,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(indiana_state::indiana)
/* basic machine hardware */
- MCFG_CPU_ADD(M68K_TAG, M68030, XTAL_16MHz)
+ MCFG_CPU_ADD(M68K_TAG, M68030, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(indiana_mem)
MCFG_DEVICE_ADD(ISABUS_TAG, ISA16, 0)
@@ -100,8 +100,8 @@ MACHINE_CONFIG_START(indiana_state::indiana)
MCFG_ISA16_SLOT_ADD(ISABUS_TAG, "isa3", indiana_isa_cards, "comat", false)
MCFG_ISA16_SLOT_ADD(ISABUS_TAG, "isa4", indiana_isa_cards, "ide", false)
- MCFG_DEVICE_ADD(MFP_TAG, MC68901, XTAL_16MHz/4)
- MCFG_MC68901_TIMER_CLOCK(XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(MFP_TAG, MC68901, XTAL(16'000'000)/4)
+ MCFG_MC68901_TIMER_CLOCK(XTAL(16'000'000)/4)
MCFG_MC68901_RX_CLOCK(0)
MCFG_MC68901_TX_CLOCK(0)
MCFG_MC68901_OUT_SO_CB(DEVWRITELINE("keyboard", rs232_port_device, write_txd))
diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp
index 446d6a1a0bb..89eed7ae805 100644
--- a/src/mame/drivers/indy_indigo2.cpp
+++ b/src/mame/drivers/indy_indigo2.cpp
@@ -68,10 +68,10 @@
#define RS232A_TAG "rs232a"
#define RS232B_TAG "rs232b"
-#define SCC_PCLK XTAL_10MHz
-#define SCC_RXA_CLK XTAL_3_6864MHz // Needs verification
+#define SCC_PCLK XTAL(10'000'000)
+#define SCC_RXA_CLK XTAL(3'686'400) // Needs verification
#define SCC_TXA_CLK 0
-#define SCC_RXB_CLK XTAL_3_6864MHz // Needs verification
+#define SCC_RXB_CLK XTAL(3'686'400) // Needs verification
#define SCC_TXB_CLK 0
#define MCFG_IOC2_GUINNESS_ADD(_tag) \
@@ -183,7 +183,7 @@ ioport_constructor ioc2_device::device_input_ports() const
}
MACHINE_CONFIG_START(ioc2_device::device_add_mconfig)
- MCFG_SCC85230_ADD(SCC_TAG, SCC_PCLK, SCC_RXA_CLK, SCC_TXA_CLK, SCC_RXB_CLK, SCC_TXB_CLK)
+ MCFG_SCC85230_ADD(SCC_TAG, SCC_PCLK, SCC_RXA_CLK.value(), SCC_TXA_CLK, SCC_RXB_CLK.value(), SCC_TXB_CLK)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_DTRA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_dtr))
MCFG_Z80SCC_OUT_RTSA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_rts))
diff --git a/src/mame/drivers/instantm.cpp b/src/mame/drivers/instantm.cpp
index 75816441d17..703c80e26e6 100644
--- a/src/mame/drivers/instantm.cpp
+++ b/src/mame/drivers/instantm.cpp
@@ -116,14 +116,14 @@ void instantm_state::machine_reset()
m_clock_en = true;
}
-// OSC1 = XTAL_3_579545MHz
+// OSC1 = XTAL(3'579'545)
MACHINE_CONFIG_START(instantm_state::instantm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("subcpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("subcpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(sub_map)
MCFG_CPU_IO_MAP(sub_io)
diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp
index dcfb8ead0bb..b8ad90ebdb0 100644
--- a/src/mame/drivers/instruct.cpp
+++ b/src/mame/drivers/instruct.cpp
@@ -411,7 +411,7 @@ QUICKLOAD_LOAD_MEMBER( instruct_state, instruct )
MACHINE_CONFIG_START(instruct_state::instruct)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",S2650, XTAL_3_579545MHz / 4)
+ MCFG_CPU_ADD("maincpu",S2650, XTAL(3'579'545) / 4)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_DATA_MAP(data_map)
diff --git a/src/mame/drivers/interact.cpp b/src/mame/drivers/interact.cpp
index 181e0bb6915..8f1f742a27e 100644
--- a/src/mame/drivers/interact.cpp
+++ b/src/mame/drivers/interact.cpp
@@ -125,7 +125,7 @@ uint32_t interact_state::screen_update_interact(screen_device &screen, bitmap_in
MACHINE_CONFIG_START(interact_state::interact)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_2MHz)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(interact_mem)
MCFG_CPU_PERIODIC_INT_DRIVER(interact_state, irq0_line_hold, 50) /* put on the I8080 irq in Hz*/
@@ -162,7 +162,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(interact_state::hector1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_1_75MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(1'750'000))
MCFG_CPU_PROGRAM_MAP(interact_mem)
MCFG_CPU_PERIODIC_INT_DRIVER(interact_state, irq0_line_hold, 50) /* put on the I8080 irq in Hz*/
diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp
index a5f9df98b76..5e4a0e3f27d 100644
--- a/src/mame/drivers/interpro.cpp
+++ b/src/mame/drivers/interpro.cpp
@@ -449,7 +449,7 @@ static SLOT_INTERFACE_START(interpro_floppies)
SLOT_INTERFACE_END
MACHINE_CONFIG_START(interpro_state::interpro_serial1)
- MCFG_SCC85C30_ADD(INTERPRO_SCC1_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
+ MCFG_SCC85C30_ADD(INTERPRO_SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(INTERPRO_SERIAL_PORT1_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(INTERPRO_SERIAL_PORT2_TAG, rs232_port_device, write_txd))
@@ -469,7 +469,7 @@ MACHINE_CONFIG_START(interpro_state::interpro_serial1)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(interpro_state::interpro_serial2)
- MCFG_SCC85C30_ADD(INTERPRO_SCC2_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
+ MCFG_SCC85C30_ADD(INTERPRO_SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(INTERPRO_KEYBOARD_PORT_TAG, interpro_keyboard_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(INTERPRO_SERIAL_PORT0_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_INT_CB(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir11_w))
@@ -501,7 +501,7 @@ void interpro_state::interpro_scsi_adapter(device_t *device)
{
devcb_base *devcb;
(void)devcb;
- MCFG_DEVICE_CLOCK(XTAL_24MHz)
+ MCFG_DEVICE_CLOCK(XTAL(24'000'000))
MCFG_NCR5390_IRQ_HANDLER(DEVWRITELINE(":" INTERPRO_IOGA_TAG, interpro_ioga_device, ir0_w))
MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":" INTERPRO_IOGA_TAG, interpro_ioga_device, drq_scsi))
}
@@ -548,7 +548,7 @@ MACHINE_CONFIG_START(interpro_state::interpro)
// serial
// real-time clock/non-volatile memory
- MCFG_MC146818_ADD(INTERPRO_RTC_TAG, XTAL_32_768kHz)
+ MCFG_MC146818_ADD(INTERPRO_RTC_TAG, XTAL(32'768))
MCFG_MC146818_UTC(true)
MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir9_w))
@@ -576,7 +576,7 @@ MACHINE_CONFIG_START(interpro_state::interpro)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(turquoise_state::turquoise, interpro)
- MCFG_CPU_ADD(INTERPRO_CPU_TAG, CLIPPER_C300, XTAL_12_5MHz)
+ MCFG_CPU_ADD(INTERPRO_CPU_TAG, CLIPPER_C300, XTAL(12'500'000))
MCFG_CPU_PROGRAM_MAP(c300_insn_map)
MCFG_CPU_DATA_MAP(c300_data_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(INTERPRO_IOGA_TAG, interpro_ioga_device, acknowledge_interrupt)
@@ -638,7 +638,7 @@ MACHINE_CONFIG_DERIVED(turquoise_state::turquoise, interpro)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(sapphire_state::sapphire, interpro)
- MCFG_CPU_ADD(INTERPRO_CPU_TAG, CLIPPER_C400, XTAL_12_5MHz)
+ MCFG_CPU_ADD(INTERPRO_CPU_TAG, CLIPPER_C400, XTAL(12'500'000))
MCFG_CPU_PROGRAM_MAP(c400_insn_map)
MCFG_CPU_DATA_MAP(c400_data_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(INTERPRO_IOGA_TAG, interpro_ioga_device, acknowledge_interrupt)
@@ -672,7 +672,7 @@ MACHINE_CONFIG_DERIVED(sapphire_state::sapphire, interpro)
MCFG_DEVICE_CARD_MACHINE_CONFIG(INTERPRO_SCSI_ADAPTER_TAG, interpro_scsi_adapter)
// ethernet controller
- MCFG_DEVICE_ADD(INTERPRO_ETH_TAG, I82596_LE32, XTAL_20MHz)
+ MCFG_DEVICE_ADD(INTERPRO_ETH_TAG, I82596_LE32, XTAL(20'000'000))
MCFG_I82586_IRQ_CB(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir12_w))
MCFG_DEVICE_ADDRESS_MAP(0, interpro_82596_map)
@@ -692,17 +692,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(turquoise_state::ip2000, turquoise)
//MCFG_DEVICE_MODIFY(INTERPRO_CPU_TAG)
- //MCFG_DEVICE_CLOCK(XTAL_40MHz)
+ //MCFG_DEVICE_CLOCK(XTAL(40'000'000))
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(sapphire_state::ip2400, sapphire)
//MCFG_DEVICE_MODIFY(INTERPRO_CPU_TAG)
- //MCFG_DEVICE_CLOCK(XTAL_40MHz)
+ //MCFG_DEVICE_CLOCK(XTAL(40'000'000))
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(sapphire_state::ip2500, sapphire)
//MCFG_DEVICE_MODIFY(INTERPRO_CPU_TAG)
- //MCFG_DEVICE_CLOCK(XTAL_50MHz)
+ //MCFG_DEVICE_CLOCK(XTAL(50'000'000))
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(sapphire_state::ip2700, sapphire)
diff --git a/src/mame/drivers/intv.cpp b/src/mame/drivers/intv.cpp
index 1498f1bc28c..ff74ec7ebf8 100644
--- a/src/mame/drivers/intv.cpp
+++ b/src/mame/drivers/intv.cpp
@@ -457,13 +457,13 @@ INTERRUPT_GEN_MEMBER(intv_state::intv_interrupt2)
MACHINE_CONFIG_START(intv_state::intv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", CP1610, XTAL_3_579545MHz/4) /* Colorburst/4 */
+ MCFG_CPU_ADD("maincpu", CP1610, XTAL(3'579'545)/4) /* Colorburst/4 */
MCFG_CPU_PROGRAM_MAP(intv_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", intv_state, intv_interrupt)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
- MCFG_DEVICE_ADD("stic", STIC, XTAL_3_579545MHz)
+ MCFG_DEVICE_ADD("stic", STIC, XTAL(3'579'545))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_SCREEN_ADD("screen", RASTER)
@@ -483,7 +483,7 @@ MACHINE_CONFIG_START(intv_state::intv)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8914", AY8914, XTAL_3_579545MHz/2)
+ MCFG_SOUND_ADD("ay8914", AY8914, XTAL(3'579'545)/2)
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("iopt_right_ctrl", intv_control_port_device, ctrl_r))
MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("iopt_left_ctrl", intv_control_port_device, ctrl_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
@@ -534,7 +534,7 @@ MACHINE_CONFIG_DERIVED(intv_state::intvkbd, intv)
MCFG_CPU_MODIFY( "maincpu" )
MCFG_CPU_PROGRAM_MAP(intvkbd_mem)
- MCFG_CPU_ADD("keyboard", M6502, XTAL_3_579545MHz/2) /* Colorburst/2 */
+ MCFG_CPU_ADD("keyboard", M6502, XTAL(3'579'545)/2) /* Colorburst/2 */
MCFG_CPU_PROGRAM_MAP(intvkbd2_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", intv_state, intv_interrupt2)
@@ -546,7 +546,7 @@ MACHINE_CONFIG_DERIVED(intv_state::intvkbd, intv)
MCFG_PALETTE_INIT_OWNER(intv_state, intv)
/* crt controller */
- MCFG_DEVICE_ADD("crtc", TMS9927, XTAL_7_15909MHz)
+ MCFG_DEVICE_ADD("crtc", TMS9927, XTAL(7'159'090))
MCFG_TMS9927_CHAR_WIDTH(8)
MCFG_TMS9927_OVERSCAN(stic_device::OVERSCAN_LEFT_WIDTH*stic_device::X_SCALE*INTVKBD_X_SCALE, stic_device::OVERSCAN_RIGHT_WIDTH*stic_device::X_SCALE*INTVKBD_X_SCALE,
stic_device::OVERSCAN_TOP_HEIGHT*stic_device::Y_SCALE*INTVKBD_Y_SCALE, stic_device::OVERSCAN_BOTTOM_HEIGHT*stic_device::Y_SCALE*INTVKBD_Y_SCALE)
diff --git a/src/mame/drivers/invqix.cpp b/src/mame/drivers/invqix.cpp
index ddab21e264a..7e3b7fefec2 100644
--- a/src/mame/drivers/invqix.cpp
+++ b/src/mame/drivers/invqix.cpp
@@ -329,7 +329,7 @@ static INPUT_PORTS_START( invqix )
INPUT_PORTS_END
MACHINE_CONFIG_START(invqix_state::invqix)
- MCFG_CPU_ADD("maincpu", H8S2394, XTAL_20MHz)
+ MCFG_CPU_ADD("maincpu", H8S2394, XTAL(20'000'000))
MCFG_CPU_PROGRAM_MAP(invqix_prg_map)
MCFG_CPU_IO_MAP(invqix_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", invqix_state, irq1_line_hold)
@@ -346,7 +346,7 @@ MACHINE_CONFIG_START(invqix_state::invqix)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM9810_ADD("oki", XTAL_4_096MHz)
+ MCFG_OKIM9810_ADD("oki", XTAL(4'096'000))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
diff --git a/src/mame/drivers/ipc.cpp b/src/mame/drivers/ipc.cpp
index 29ca62b3225..54cbcc54710 100644
--- a/src/mame/drivers/ipc.cpp
+++ b/src/mame/drivers/ipc.cpp
@@ -90,14 +90,14 @@ void ipc_state::machine_reset()
MACHINE_CONFIG_START(ipc_state::ipc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL_19_6608MHz / 4)
+ MCFG_CPU_ADD("maincpu",I8085A, XTAL(19'660'800) / 4)
MCFG_CPU_PROGRAM_MAP(ipc_mem)
MCFG_CPU_IO_MAP(ipc_io)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_19_6608MHz / 16)
- MCFG_PIT8253_CLK1(XTAL_19_6608MHz / 16)
- MCFG_PIT8253_CLK2(XTAL_19_6608MHz / 16)
+ MCFG_PIT8253_CLK0(XTAL(19'660'800) / 16)
+ MCFG_PIT8253_CLK1(XTAL(19'660'800) / 16)
+ MCFG_PIT8253_CLK2(XTAL(19'660'800) / 16)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("uart1", i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart1", i8251_device, write_rxc))
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart2", i8251_device, write_txc))
diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp
index 1cb7dc8b10c..59d712c608c 100644
--- a/src/mame/drivers/ipds.cpp
+++ b/src/mame/drivers/ipds.cpp
@@ -129,7 +129,7 @@ void ipds_state::kbd_put(u8 data)
MACHINE_CONFIG_START(ipds_state::ipds)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL_19_6608MHz / 4)
+ MCFG_CPU_ADD("maincpu",I8085A, XTAL(19'660'800) / 4)
MCFG_CPU_PROGRAM_MAP(ipds_mem)
MCFG_CPU_IO_MAP(ipds_io)
@@ -143,7 +143,7 @@ MACHINE_CONFIG_START(ipds_state::ipds)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ipds)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD("i8275", I8275, XTAL_19_6608MHz / 4)
+ MCFG_DEVICE_ADD("i8275", I8275, XTAL(19'660'800) / 4)
MCFG_I8275_CHARACTER_WIDTH(6)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(ipds_state, crtc_display_pixels)
diff --git a/src/mame/drivers/iq151.cpp b/src/mame/drivers/iq151.cpp
index 028e038c8ef..1541796a93b 100644
--- a/src/mame/drivers/iq151.cpp
+++ b/src/mame/drivers/iq151.cpp
@@ -384,7 +384,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(iq151_state::iq151)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL_2MHz)
+ MCFG_CPU_ADD("maincpu",I8080, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(iq151_mem)
MCFG_CPU_IO_MAP(iq151_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", iq151_state, iq151_vblank_interrupt)
diff --git a/src/mame/drivers/iris3130.cpp b/src/mame/drivers/iris3130.cpp
index 82b9be114fe..981f654611c 100644
--- a/src/mame/drivers/iris3130.cpp
+++ b/src/mame/drivers/iris3130.cpp
@@ -424,14 +424,14 @@ MACHINE_CONFIG_START(sgi_ip2_state::sgi_ip2)
MCFG_CPU_ADD("maincpu", M68020, 16000000)
MCFG_CPU_PROGRAM_MAP(sgi_ip2_map)
- MCFG_DEVICE_ADD( "duart68681a", MC68681, XTAL_3_6864MHz ) /* Y3 3.6864MHz Xtal ??? copy-over from dectalk */
+ MCFG_DEVICE_ADD( "duart68681a", MC68681, XTAL(3'686'400) ) /* Y3 3.6864MHz Xtal ??? copy-over from dectalk */
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sgi_ip2_state, duarta_irq_handler))
MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_DEVICE_ADD( "duart68681b", MC68681, XTAL_3_6864MHz ) /* Y3 3.6864MHz Xtal ??? copy-over from dectalk */
+ MCFG_DEVICE_ADD( "duart68681b", MC68681, XTAL(3'686'400) ) /* Y3 3.6864MHz Xtal ??? copy-over from dectalk */
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sgi_ip2_state, duartb_irq_handler))
- MCFG_MC146818_ADD( "rtc", XTAL_4_194304Mhz )
+ MCFG_MC146818_ADD( "rtc", XTAL(4'194'304) )
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart68681a", mc68681_device, rx_b_w))
diff --git a/src/mame/drivers/irisha.cpp b/src/mame/drivers/irisha.cpp
index 92ad685ee51..dbd53ebf642 100644
--- a/src/mame/drivers/irisha.cpp
+++ b/src/mame/drivers/irisha.cpp
@@ -360,7 +360,7 @@ void irisha_state::machine_reset()
/* Machine driver */
MACHINE_CONFIG_START(irisha_state::irisha)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_16MHz / 9)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
MCFG_CPU_PROGRAM_MAP(irisha_mem)
MCFG_CPU_IO_MAP(irisha_io)
@@ -385,12 +385,12 @@ MACHINE_CONFIG_START(irisha_state::irisha)
MCFG_DEVICE_ADD("uart", I8251, 0)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_16MHz / 9)
+ MCFG_PIT8253_CLK0(XTAL(16'000'000) / 9)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_16MHz / 9 / 8 / 8)
+ MCFG_PIT8253_CLK1(XTAL(16'000'000) / 9 / 8 / 8)
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
- MCFG_PIT8253_CLK2(XTAL_16MHz / 9)
+ MCFG_PIT8253_CLK2(XTAL(16'000'000) / 9)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(irisha_state, speaker_w))
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
diff --git a/src/mame/drivers/irobot.cpp b/src/mame/drivers/irobot.cpp
index f9fe0789092..ae19de17951 100644
--- a/src/mame/drivers/irobot.cpp
+++ b/src/mame/drivers/irobot.cpp
@@ -86,8 +86,8 @@
#include "machine/nvram.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_12_096MHz
-#define VIDEO_CLOCK XTAL_20MHz
+#define MAIN_CLOCK XTAL(12'096'000)
+#define VIDEO_CLOCK XTAL(20'000'000)
/*************************************
*
diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp
index a52272212c9..e82e956028e 100644
--- a/src/mame/drivers/isbc.cpp
+++ b/src/mame/drivers/isbc.cpp
@@ -334,7 +334,7 @@ WRITE_LINE_MEMBER(isbc_state::megabyte_select_w)
MACHINE_CONFIG_START(isbc_state::isbc86)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL_5MHz)
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(isbc86_mem)
MCFG_CPU_IO_MAP(isbc_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic_0", pic8259_device, inta_cb)
@@ -343,10 +343,10 @@ MACHINE_CONFIG_START(isbc_state::isbc86)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("pit", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_22_1184MHz/18)
+ MCFG_PIT8253_CLK0(XTAL(22'118'400)/18)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic_0", pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_22_1184MHz/18)
- MCFG_PIT8253_CLK2(XTAL_22_1184MHz/18)
+ MCFG_PIT8253_CLK1(XTAL(22'118'400)/18)
+ MCFG_PIT8253_CLK2(XTAL(22'118'400)/18)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(isbc_state, isbc86_tmr2_w))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
@@ -367,7 +367,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(isbc_state::rpc86)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL_5MHz)
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(rpc86_mem)
MCFG_CPU_IO_MAP(rpc86_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic_0", pic8259_device, inta_cb)
@@ -376,10 +376,10 @@ MACHINE_CONFIG_START(isbc_state::rpc86)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("pit", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_22_1184MHz/18)
+ MCFG_PIT8253_CLK0(XTAL(22'118'400)/18)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic_0", pic8259_device, ir2_w))
- MCFG_PIT8253_CLK1(XTAL_22_1184MHz/144)
- MCFG_PIT8253_CLK2(XTAL_22_1184MHz/18)
+ MCFG_PIT8253_CLK1(XTAL(22'118'400)/144)
+ MCFG_PIT8253_CLK2(XTAL(22'118'400)/18)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(isbc_state, isbc86_tmr2_w))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
@@ -436,7 +436,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(isbc_state::isbc286)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80286, XTAL_16MHz/2)
+ MCFG_CPU_ADD("maincpu", I80286, XTAL(16'000'000)/2)
MCFG_CPU_PROGRAM_MAP(isbc286_mem)
MCFG_CPU_IO_MAP(isbc286_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic_0", pic8259_device, inta_cb)
@@ -451,12 +451,12 @@ MACHINE_CONFIG_START(isbc_state::isbc286)
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("pit", PIT8254, 0)
- MCFG_PIT8253_CLK0(XTAL_22_1184MHz/18)
+ MCFG_PIT8253_CLK0(XTAL(22'118'400)/18)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic_0", pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_22_1184MHz/18)
+ MCFG_PIT8253_CLK1(XTAL(22'118'400)/18)
// MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart8274", z80dart_device, rxtxcb_w))
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxtxcb_w))
- MCFG_PIT8253_CLK2(XTAL_22_1184MHz/18)
+ MCFG_PIT8253_CLK2(XTAL(22'118'400)/18)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(isbc_state, isbc286_tmr2_w))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
@@ -474,7 +474,7 @@ MACHINE_CONFIG_START(isbc_state::isbc286)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
#if 0
- MCFG_DEVICE_ADD("uart8274", I8274, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD("uart8274", I8274, XTAL(16'000'000)/4)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
@@ -483,7 +483,7 @@ MACHINE_CONFIG_START(isbc_state::isbc286)
MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(WRITELINE(isbc_state, isbc_uart8274_irq))
#else
- MCFG_DEVICE_ADD("uart8274", I8274_NEW, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD("uart8274", I8274_NEW, XTAL(16'000'000)/4)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
diff --git a/src/mame/drivers/isbc8010.cpp b/src/mame/drivers/isbc8010.cpp
index d17199e84ae..dc26699e4f6 100644
--- a/src/mame/drivers/isbc8010.cpp
+++ b/src/mame/drivers/isbc8010.cpp
@@ -164,7 +164,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(isbc8010_state::isbc8010)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL_18_432MHz/9)
+ MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'432'000)/9)
MCFG_CPU_PROGRAM_MAP(isbc8010_mem)
MCFG_CPU_IO_MAP(isbc8010_io)
@@ -182,7 +182,7 @@ MACHINE_CONFIG_START(isbc8010_state::isbc8010)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_cts))
MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal)
- MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL_18_432MHz/60)
+ MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL(18'432'000)/60)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(isbc8010_state, usart_clock_tick))
/* video hardware */
@@ -209,8 +209,8 @@ MACHINE_CONFIG_START(isbc8010_state::isbc8010)
// Video board UART
// MCFG_DEVICE_ADD( "hd6402", AY31015, 0 )
-// MCFG_AY31015_TX_CLOCK(( XTAL_16MHz / 16 ) / 256)
-// MCFG_AY31015_RX_CLOCK(( XTAL_16MHz / 16 ) / 256)
+// MCFG_AY31015_TX_CLOCK(( XTAL(16'000'000) / 16 ) / 256)
+// MCFG_AY31015_RX_CLOCK(( XTAL(16'000'000) / 16 ) / 256)
// MCFG_AY51013_READ_SI_CB(READ8(sdk80_state, nascom1_hd6402_si))
// MCFG_AY51013_WRITE_SO_CB(WRITE8(sdk80_state, nascom1_hd6402_so))
diff --git a/src/mame/drivers/isbc8030.cpp b/src/mame/drivers/isbc8030.cpp
index 0a07a8e8304..6ed5435a643 100644
--- a/src/mame/drivers/isbc8030.cpp
+++ b/src/mame/drivers/isbc8030.cpp
@@ -88,7 +88,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(isbc8030_state::isbc8030)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_22_1184MHz / 4)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(22'118'400) / 4)
MCFG_CPU_PROGRAM_MAP(isbc8030_mem)
MCFG_CPU_IO_MAP(isbc8030_io)
@@ -96,10 +96,10 @@ MACHINE_CONFIG_START(isbc8030_state::isbc8030)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_22_1184MHz / 18)
+ MCFG_PIT8253_CLK0(XTAL(22'118'400) / 18)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8259A_TAG, pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_22_1184MHz / 18)
- MCFG_PIT8253_CLK2(XTAL_22_1184MHz / 18)
+ MCFG_PIT8253_CLK1(XTAL(22'118'400) / 18)
+ MCFG_PIT8253_CLK2(XTAL(22'118'400) / 18)
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_rxc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(I8251A_TAG, i8251_device, write_txc))
diff --git a/src/mame/drivers/istrebiteli.cpp b/src/mame/drivers/istrebiteli.cpp
index c9ce9c50364..bf9bc0013e7 100644
--- a/src/mame/drivers/istrebiteli.cpp
+++ b/src/mame/drivers/istrebiteli.cpp
@@ -416,7 +416,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(istrebiteli_state::istreb)
/* basic machine hardware */
- MCFG_CPU_ADD(I8080_TAG, I8080, XTAL_8MHz / 4) // KR580VM80A
+ MCFG_CPU_ADD(I8080_TAG, I8080, XTAL(8'000'000) / 4) // KR580VM80A
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
@@ -432,7 +432,7 @@ MACHINE_CONFIG_START(istrebiteli_state::istreb)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_8MHz / 2, 256, 64, 256, 312, 0, 256)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(8'000'000) / 2, 256, 64, 256, 312, 0, 256)
MCFG_SCREEN_UPDATE_DRIVER(istrebiteli_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -442,7 +442,7 @@ MACHINE_CONFIG_START(istrebiteli_state::istreb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("custom", ISTREBITELI_SOUND, XTAL_8MHz / 2 / 256)
+ MCFG_SOUND_ADD("custom", ISTREBITELI_SOUND, XTAL(8'000'000) / 2 / 256)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/itgambl2.cpp b/src/mame/drivers/itgambl2.cpp
index 78828e2ff4c..aa45eefcd15 100644
--- a/src/mame/drivers/itgambl2.cpp
+++ b/src/mame/drivers/itgambl2.cpp
@@ -59,8 +59,8 @@
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_16MHz
-#define SND_CLOCK XTAL_14_31818MHz
+#define MAIN_CLOCK XTAL(16'000'000)
+#define SND_CLOCK XTAL(14'318'181)
class itgambl2_state : public driver_device
diff --git a/src/mame/drivers/itgambl3.cpp b/src/mame/drivers/itgambl3.cpp
index 8d9bf628a91..d1ce4cd1ba9 100644
--- a/src/mame/drivers/itgambl3.cpp
+++ b/src/mame/drivers/itgambl3.cpp
@@ -46,7 +46,7 @@
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_16MHz
+#define MAIN_CLOCK XTAL(16'000'000)
class itgambl3_state : public driver_device
diff --git a/src/mame/drivers/itgamble.cpp b/src/mame/drivers/itgamble.cpp
index a6a3a43ec19..9aa7073b728 100644
--- a/src/mame/drivers/itgamble.cpp
+++ b/src/mame/drivers/itgamble.cpp
@@ -54,13 +54,13 @@
#include "speaker.h"
-#define MAIN_CLOCK XTAL_30MHz
-#define SND_CLOCK XTAL_1MHz
+#define MAIN_CLOCK XTAL(30'000'000)
+#define SND_CLOCK XTAL(1'000'000)
-#define MNUMBER_MAIN_CLOCK XTAL_24MHz
-#define MNUMBER_SND_CLOCK XTAL_16MHz
+#define MNUMBER_MAIN_CLOCK XTAL(24'000'000)
+#define MNUMBER_SND_CLOCK XTAL(16'000'000)
-#define EJOLLYX5_MAIN_CLOCK XTAL_16MHz
+#define EJOLLYX5_MAIN_CLOCK XTAL(16'000'000)
class itgamble_state : public driver_device
diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp
index 5177554d3d2..f3c28f74fdd 100644
--- a/src/mame/drivers/itt3030.cpp
+++ b/src/mame/drivers/itt3030.cpp
@@ -661,7 +661,7 @@ PALETTE_INIT_MEMBER(itt3030_state, itt3030)
MACHINE_CONFIG_START(itt3030_state::itt3030)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80,XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(itt3030_map)
MCFG_CPU_IO_MAP(itt3030_io)
@@ -670,7 +670,7 @@ MACHINE_CONFIG_START(itt3030_state::itt3030)
// bits 0-2 select bit to read back, bits 3-6 choose column to read from, bit 7 clocks the process (rising edge strobes the row, falling edge reads the data)
// T0 is the key matrix return
// pin 23 is the UPI-41 host IRQ line, it's unknown how it's connected to the Z80
- MCFG_CPU_ADD("kbdmcu", I8741, XTAL_6MHz)
+ MCFG_CPU_ADD("kbdmcu", I8741, XTAL(6'000'000))
MCFG_MCS48_PORT_T0_IN_CB(READLINE(itt3030_state, kbd_matrix_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(itt3030_state, kbd_matrix_w))
MCFG_MCS48_PORT_P2_IN_CB(READ8(itt3030_state, kbd_port2_r))
@@ -693,10 +693,10 @@ MACHINE_CONFIG_START(itt3030_state::itt3030)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(20)
MCFG_ADDRESS_MAP_BANK_STRIDE(0xc000)
- MCFG_DEVICE_ADD("crt5027", CRT5027, XTAL_6MHz)
+ MCFG_DEVICE_ADD("crt5027", CRT5027, XTAL(6'000'000))
MCFG_TMS9927_CHAR_WIDTH(8)
- MCFG_FD1791_ADD("fdc", XTAL_20MHz / 20)
+ MCFG_FD1791_ADD("fdc", XTAL(20'000'000) / 20)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(itt3030_state, fdcirq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(itt3030_state, fdcdrq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(itt3030_state, fdchld_w))
diff --git a/src/mame/drivers/jack.cpp b/src/mame/drivers/jack.cpp
index 099416bb4e5..eba0daac0a8 100644
--- a/src/mame/drivers/jack.cpp
+++ b/src/mame/drivers/jack.cpp
@@ -906,11 +906,11 @@ MACHINE_RESET_MEMBER(jack_state,joinem)
MACHINE_CONFIG_START(jack_state::jack)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'000'000)/6)
MCFG_CPU_PROGRAM_MAP(jack_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", jack_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_18MHz/6)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'000'000)/6)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(jack_state, jack_sh_irq_ack)
@@ -935,7 +935,7 @@ MACHINE_CONFIG_START(jack_state::jack)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(ASSERTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_18MHz/12)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(18'000'000)/12)
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device,read))
MCFG_AY8910_PORT_B_READ_CB(READ8(jack_state, timer_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp
index e96e3c39c5a..11d8834f9de 100644
--- a/src/mame/drivers/jackie.cpp
+++ b/src/mame/drivers/jackie.cpp
@@ -600,7 +600,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(jackie_state::irq)
MACHINE_CONFIG_START(jackie_state::jackie)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(jackie_prg_map)
MCFG_CPU_IO_MAP(jackie_io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", jackie_state, irq, "screen", 0, 1)
diff --git a/src/mame/drivers/jade.cpp b/src/mame/drivers/jade.cpp
index ebfe0f0a445..cfbd8d3c70a 100644
--- a/src/mame/drivers/jade.cpp
+++ b/src/mame/drivers/jade.cpp
@@ -60,21 +60,21 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(jade_state::jade)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
- MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(4'000'000))
- MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
- MCFG_DEVICE_ADD("trg0", CLOCK, XTAL_4MHz / 2)
+ MCFG_DEVICE_ADD("trg0", CLOCK, XTAL(4'000'000) / 2)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc2", z80ctc_device, trg0))
/* Devices */
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'000'000))
//MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // no evidence of a daisy chain because IM2 is not set
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp
index 6e9c5b985e2..d7830fb4893 100644
--- a/src/mame/drivers/jaguar.cpp
+++ b/src/mame/drivers/jaguar.cpp
@@ -352,9 +352,9 @@ Notes:
#include "softlist.h"
#include "speaker.h"
-#define COJAG_CLOCK XTAL_52MHz
-#define R3000_CLOCK XTAL_40MHz
-#define M68K_CLOCK XTAL_50MHz
+#define COJAG_CLOCK XTAL(52'000'000)
+#define R3000_CLOCK XTAL(40'000'000)
+#define M68K_CLOCK XTAL(50'000'000)
/*************************************
diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp
index 0c3f9276787..255e0854b17 100644
--- a/src/mame/drivers/jangou.cpp
+++ b/src/mame/drivers/jangou.cpp
@@ -38,7 +38,7 @@ $c088-$c095 player tiles
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_19_968MHz
+#define MASTER_CLOCK XTAL(19'968'000)
class jangou_state : public driver_device
{
@@ -899,7 +899,7 @@ MACHINE_CONFIG_DERIVED(jangou_state::jngolady, jangou)
/* sound hardware */
MCFG_DEVICE_REMOVE("cvsd")
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(400'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(jangou_state, jngolady_vclk_cb))
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp
index 84fbd4e9fb7..07b9f54482e 100644
--- a/src/mame/drivers/jankenmn.cpp
+++ b/src/mame/drivers/jankenmn.cpp
@@ -156,7 +156,7 @@
#include "jankenmn.lh"
-#define MASTER_CLOCK XTAL_2_5MHz
+#define MASTER_CLOCK XTAL(2'500'000)
class jankenmn_state : public driver_device
diff --git a/src/mame/drivers/jantotsu.cpp b/src/mame/drivers/jantotsu.cpp
index 5b2a775f98d..1dd57856304 100644
--- a/src/mame/drivers/jantotsu.cpp
+++ b/src/mame/drivers/jantotsu.cpp
@@ -102,7 +102,7 @@ dumped by sayu
#include "speaker.h"
-#define MAIN_CLOCK XTAL_18_432MHz
+#define MAIN_CLOCK XTAL(18'432'000)
class jantotsu_state : public driver_device
{
@@ -524,7 +524,7 @@ MACHINE_CONFIG_START(jantotsu_state::jantotsu)
MCFG_SOUND_ADD("sn2", SN76489A, MAIN_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("adpcm", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("adpcm", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(jantotsu_state, jan_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) /* 6 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/mame/drivers/joctronic.cpp b/src/mame/drivers/joctronic.cpp
index 2e2d194de6b..7b59c8af40e 100644
--- a/src/mame/drivers/joctronic.cpp
+++ b/src/mame/drivers/joctronic.cpp
@@ -317,12 +317,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(joctronic_state::joctronic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) // 3 MHz - uses WAIT
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) // 3 MHz - uses WAIT
MCFG_CPU_PROGRAM_MAP(maincpu_map) // 139
MCFG_CPU_IO_MAP(maincpu_io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_12MHz/2) // 6 MHz - uses WAIT
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
MCFG_CPU_PROGRAM_MAP(joctronic_sound_map)
MCFG_CPU_IO_MAP(joctronic_sound_io_map)
@@ -333,7 +333,7 @@ MACHINE_CONFIG_START(joctronic_state::joctronic)
//MCFG_DEVCB_CHAIN_OUTPUT(WRITE8(joctronic_state, ls145_w)) MCFG_DEVCB_RSHIFT(4)
//MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(joctronic_state, display_reset_w))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_12MHz/4) // 3 MHz
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(12'000'000)/4) // 3 MHz
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(ASSERTLINE("soundcpu", INPUT_LINE_IRQ0)) // SINT
@@ -346,12 +346,12 @@ MACHINE_CONFIG_START(joctronic_state::joctronic)
MCFG_SPEAKER_STANDARD_MONO("mono")
// Datasheet suggests YM2203 as a possible replacement for this AY8910
- MCFG_SOUND_ADD("aysnd1", AY8910, XTAL_12MHz/8) // 1.5 MHz
+ MCFG_SOUND_ADD("aysnd1", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("r2r1", dac_8bit_r2r_device, write))
MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("r2r2", dac_8bit_r2r_device, write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("aysnd2", AY8910, XTAL_12MHz/8) // 1.5 MHz
+ MCFG_SOUND_ADD("aysnd2", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_SOUND_ADD("r2r1", DAC_8BIT_R2R, 0)
@@ -363,12 +363,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(joctronic_state::slalom03)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) // 6 MHz - uses WAIT
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
MCFG_CPU_PROGRAM_MAP(slalom03_maincpu_map) // 138, 368, 32
MCFG_CPU_IO_MAP(maincpu_io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_12MHz/2) // 6 MHz - uses WAIT
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
MCFG_CPU_PROGRAM_MAP(slalom03_sound_map)
MCFG_CPU_IO_MAP(slalom03_sound_io_map)
@@ -379,7 +379,7 @@ MACHINE_CONFIG_START(joctronic_state::slalom03)
//MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(joctronic_state, ls145_w)) MCFG_DEVCB_RSHIFT(3) MCFG_DEVCB_MASK(0x38)
//MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(joctronic_state, slalom03_reset_w))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_12MHz/2) // 6 MHz
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(12'000'000)/2) // 6 MHz
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
//MCFG_Z80CTC_ZC0_CB(ASSERTLINE("soundcpu", INPUT_LINE_IRQ0)) // SINT
@@ -393,12 +393,12 @@ MACHINE_CONFIG_START(joctronic_state::slalom03)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd1", AY8910, XTAL_12MHz/8) // 1.5 MHz
+ MCFG_SOUND_ADD("aysnd1", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(joctronic_state, slalom03_oki_bank_w))
MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("adpcm_select", ls157_device, ba_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("aysnd2", AY8910, XTAL_12MHz/8) // 1.5 MHz
+ MCFG_SOUND_ADD("aysnd2", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("r2r", dac_8bit_r2r_device, write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
@@ -408,7 +408,7 @@ MACHINE_CONFIG_START(joctronic_state::slalom03)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
MCFG_74157_OUT_CB(DEVWRITE8("oki", msm5205_device, data_w))
- MCFG_SOUND_ADD("oki", MSM5205, XTAL_12MHz/2/16) // 375 kHz
+ MCFG_SOUND_ADD("oki", MSM5205, XTAL(12'000'000)/2/16) // 375 kHz
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) // frequency modifiable during operation
MCFG_MSM5205_VCK_CALLBACK(WRITELINE(joctronic_state, vck_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp
index 52b453178ad..571654d5eb3 100644
--- a/src/mame/drivers/jokrwild.cpp
+++ b/src/mame/drivers/jokrwild.cpp
@@ -78,7 +78,7 @@
#include "machine/nvram.h"
#include "screen.h"
-#define MASTER_CLOCK XTAL_8MHz /* guess */
+#define MASTER_CLOCK XTAL(8'000'000) /* guess */
class jokrwild_state : public driver_device
diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp
index c9896479013..f9f5a76a2e9 100644
--- a/src/mame/drivers/jollyjgr.cpp
+++ b/src/mame/drivers/jollyjgr.cpp
@@ -674,7 +674,7 @@ void jollyjgr_state::machine_reset()
MACHINE_CONFIG_START(jollyjgr_state::jollyjgr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/6) /* 3MHz verified */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'000'000)/6) /* 3MHz verified */
MCFG_CPU_PROGRAM_MAP(jollyjgr_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", jollyjgr_state, jollyjgr_interrupt)
@@ -694,7 +694,7 @@ MACHINE_CONFIG_START(jollyjgr_state::jollyjgr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_3_579545MHz/2) /* 1.7897725MHz verified */
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(3'579'545)/2) /* 1.7897725MHz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jonos.cpp b/src/mame/drivers/jonos.cpp
index 7ab12b0f3b1..ad604bef3ca 100644
--- a/src/mame/drivers/jonos.cpp
+++ b/src/mame/drivers/jonos.cpp
@@ -172,7 +172,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(jonos_state::jonos)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(jonos_mem)
/* video hardware */
diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp
index e8c59639973..f34e8ebff33 100644
--- a/src/mame/drivers/joystand.cpp
+++ b/src/mame/drivers/joystand.cpp
@@ -583,7 +583,7 @@ INTERRUPT_GEN_MEMBER(joystand_state::joystand_interrupt)
MACHINE_CONFIG_START(joystand_state::joystand)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // !! TMP68301 !!
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) // !! TMP68301 !!
MCFG_CPU_PROGRAM_MAP(joystand_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", joystand_state, joystand_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
@@ -609,10 +609,10 @@ MACHINE_CONFIG_START(joystand_state::joystand)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz / 16, PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000) / 16, PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
// cart
@@ -631,7 +631,7 @@ MACHINE_CONFIG_START(joystand_state::joystand)
// devices
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jp.cpp b/src/mame/drivers/jp.cpp
index 22d1773e01a..1575045460a 100644
--- a/src/mame/drivers/jp.cpp
+++ b/src/mame/drivers/jp.cpp
@@ -324,9 +324,9 @@ DRIVER_INIT_MEMBER( jp_state, jp )
MACHINE_CONFIG_START(jp_state::jp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(jp_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(jp_state, irq0_line_hold, XTAL_8MHz / 8192) // 4020 divider
+ MCFG_CPU_PERIODIC_INT_DRIVER(jp_state, irq0_line_hold, XTAL(8'000'000) / 8192) // 4020 divider
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -364,7 +364,7 @@ MACHINE_CONFIG_START(jp_state::jp)
/* Sound */
MCFG_FRAGMENT_ADD( genpin_audio )
MCFG_SPEAKER_STANDARD_MONO("ayvol")
- MCFG_SOUND_ADD("ay", AY8910, XTAL_8MHz / 4)
+ MCFG_SOUND_ADD("ay", AY8910, XTAL(8'000'000) / 4)
MCFG_AY8910_PORT_A_READ_CB(READ8(jp_state, porta_r))
MCFG_AY8910_PORT_B_READ_CB(READ8(jp_state, portb_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 0.9)
@@ -398,7 +398,7 @@ IRQ_CALLBACK_MEMBER(jp_state::sound_int_cb)
}
MACHINE_CONFIG_DERIVED(jp_state::jps, jp)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(jp_sound_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(jp_state, sound_int_cb)
@@ -406,7 +406,7 @@ MACHINE_CONFIG_DERIVED(jp_state::jps, jp)
MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
MCFG_SPEAKER_STANDARD_MONO("msmvol")
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) // not labeled in manual; clock unknown
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) // not labeled in manual; clock unknown
MCFG_MSM5205_VCK_CALLBACK(WRITELINE(jp_state, vck_w))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) // unknown
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmvol", 1.0)
diff --git a/src/mame/drivers/jpmmps.cpp b/src/mame/drivers/jpmmps.cpp
index d83988c841c..d4d3ffc2863 100644
--- a/src/mame/drivers/jpmmps.cpp
+++ b/src/mame/drivers/jpmmps.cpp
@@ -227,7 +227,7 @@ WRITE8_MEMBER(jpmmps_state::jpmmps_ic22_portc_w)
// BCLKOUT (used by peripherals) is normally TMS9995 CLKOUT; however, MPS1 allows an external CLK DMA to be selected instead
-#define MAIN_CLOCK XTAL_6MHz
+#define MAIN_CLOCK XTAL(6'000'000)
#define SOUND_CLOCK (MAIN_CLOCK / 4)
#define DUART_CLOCK (MAIN_CLOCK / 4)
@@ -255,7 +255,7 @@ MACHINE_CONFIG_START(jpmmps_state::jpmmps)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // bb
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // diagnostic led
- //MCFG_CPU_ADD("reelmcu", TMS7041, XTAL_5MHz)
+ //MCFG_CPU_ADD("reelmcu", TMS7041, XTAL(5'000'000))
MCFG_DEVICE_ADD("ppi8255_ic26", I8255, 0)
// Port B 0 is coin lockout
diff --git a/src/mame/drivers/jpmsys5.cpp b/src/mame/drivers/jpmsys5.cpp
index bcd55f7ccf8..513d3653bf9 100644
--- a/src/mame/drivers/jpmsys5.cpp
+++ b/src/mame/drivers/jpmsys5.cpp
@@ -617,7 +617,7 @@ MACHINE_RESET_MEMBER(jpmsys5_state,jpmsys5v)
*************************************/
MACHINE_CONFIG_START(jpmsys5_state::jpmsys5v)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(68000_map)
MCFG_DEVICE_ADD("acia6850_0", ACIA6850, 0)
@@ -643,7 +643,7 @@ MACHINE_CONFIG_START(jpmsys5_state::jpmsys5v)
MCFG_MACHINE_RESET_OVERRIDE(jpmsys5_state,jpmsys5v)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz / 4, 676, 20*4, 147*4, 256, 0, 254)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(40'000'000) / 4, 676, 20*4, 147*4, 256, 0, 254)
MCFG_SCREEN_UPDATE_DRIVER(jpmsys5_state, screen_update_jpmsys5v)
MCFG_DEVICE_ADD("tms34061", TMS34061, 0)
@@ -833,7 +833,7 @@ MACHINE_RESET_MEMBER(jpmsys5_state,jpmsys5)
// later (incompatible with earlier revision) motherboards used a YM2413
MACHINE_CONFIG_START(jpmsys5_state::jpmsys5_ym)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(68000_awp_map)
@@ -887,7 +887,7 @@ MACHINE_CONFIG_END
// the first rev PCB used an SAA1099
MACHINE_CONFIG_START(jpmsys5_state::jpmsys5)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(68000_awp_map_saa)
MCFG_DEVICE_ADD("acia6850_0", ACIA6850, 0)
diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp
index 8d6af7149df..4680b5c2816 100644
--- a/src/mame/drivers/jr100.cpp
+++ b/src/mame/drivers/jr100.cpp
@@ -369,7 +369,7 @@ QUICKLOAD_LOAD_MEMBER( jr100_state,jr100)
MACHINE_CONFIG_START(jr100_state::jr100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6802, XTAL_14_31818MHz / 4) // clock devided internaly by 4
+ MCFG_CPU_ADD("maincpu",M6802, XTAL(14'318'181) / 4) // clock devided internaly by 4
MCFG_CPU_PROGRAM_MAP(jr100_mem)
/* video hardware */
@@ -384,7 +384,7 @@ MACHINE_CONFIG_START(jr100_state::jr100)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", jr100)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD("via", VIA6522, XTAL_14_31818MHz / 16)
+ MCFG_DEVICE_ADD("via", VIA6522, XTAL(14'318'181) / 16)
MCFG_VIA6522_READPB_HANDLER(READ8(jr100_state,jr100_via_read_b))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(jr100_state,jr100_via_write_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(jr100_state,jr100_via_write_b))
@@ -402,7 +402,7 @@ MACHINE_CONFIG_START(jr100_state::jr100)
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
- MCFG_TIMER_DRIVER_ADD_PERIODIC("sound_tick", jr100_state, sound_tick, attotime::from_hz(XTAL_14_31818MHz / 16))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("sound_tick", jr100_state, sound_tick, attotime::from_hz(XTAL(14'318'181) / 16))
/* quickload */
MCFG_QUICKLOAD_ADD("quickload", jr100_state, jr100, "prg", 2)
diff --git a/src/mame/drivers/jr200.cpp b/src/mame/drivers/jr200.cpp
index 8e2e631304b..236726645fa 100644
--- a/src/mame/drivers/jr200.cpp
+++ b/src/mame/drivers/jr200.cpp
@@ -359,7 +359,7 @@ WRITE8_MEMBER(jr200_state::mn1271_io_w)
{
case 0xc805: break; //LPT printer port W
case 0xc816: if (data!=0) {
- m_timer_d->adjust(attotime::zero, 0, attotime::from_hz(XTAL_14_31818MHz) * (m_mn1271_ram[0x17]*0x100 + m_mn1271_ram[0x18]));
+ m_timer_d->adjust(attotime::zero, 0, attotime::from_hz(XTAL(14'318'181)) * (m_mn1271_ram[0x17]*0x100 + m_mn1271_ram[0x18]));
} else {
m_timer_d->adjust(attotime::zero, 0, attotime::zero);
}
@@ -535,7 +535,7 @@ void jr200_state::machine_reset()
MACHINE_CONFIG_START(jr200_state::jr200)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL_14_31818MHz / 4) /* MN1800A, ? Mhz assumption that it is same as JR-100*/
+ MCFG_CPU_ADD("maincpu", M6802, XTAL(14'318'181) / 4) /* MN1800A, ? Mhz assumption that it is same as JR-100*/
MCFG_CPU_PROGRAM_MAP(jr200_mem)
// MCFG_CPU_ADD("mn1544", MN1544, ?)
diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp
index 6ca2808088a..23c6fbb7f78 100644
--- a/src/mame/drivers/jtc.cpp
+++ b/src/mame/drivers/jtc.cpp
@@ -719,7 +719,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(jtc_state::basic)
/* basic machine hardware */
- MCFG_CPU_ADD(UB8830D_TAG, UB8830D, XTAL_8MHz)
+ MCFG_CPU_ADD(UB8830D_TAG, UB8830D, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(jtc_mem)
MCFG_Z8_PORT_P2_WRITE_CB(WRITE8(jtc_state, p2_w))
MCFG_Z8_PORT_P3_READ_CB(READ8(jtc_state, p3_r))
diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp
index 00a2acde6d7..ab757ed19ed 100644
--- a/src/mame/drivers/jubilee.cpp
+++ b/src/mame/drivers/jubilee.cpp
@@ -199,7 +199,7 @@
#include "video/mc6845.h"
#include "screen.h"
-#define MASTER_CLOCK XTAL_6MHz /* confirmed */
+#define MASTER_CLOCK XTAL(6'000'000) /* confirmed */
#define CPU_CLOCK (MASTER_CLOCK / 2) /* guess */
#define CRTC_CLOCK (MASTER_CLOCK / 8) /* guess */
diff --git a/src/mame/drivers/jungleyo.cpp b/src/mame/drivers/jungleyo.cpp
index db5b4a22fbf..b166cc415a2 100644
--- a/src/mame/drivers/jungleyo.cpp
+++ b/src/mame/drivers/jungleyo.cpp
@@ -114,7 +114,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(jungleyo_state::jungleyo)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(jungleyo_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", jungleyo_state, irq1_line_hold)
@@ -133,7 +133,7 @@ MACHINE_CONFIG_START(jungleyo_state::jungleyo)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/16, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/16, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/junior.cpp b/src/mame/drivers/junior.cpp
index 0c03af60afe..04d5e0c79e6 100644
--- a/src/mame/drivers/junior.cpp
+++ b/src/mame/drivers/junior.cpp
@@ -216,7 +216,7 @@ void junior_state::machine_reset()
MACHINE_CONFIG_START(junior_state::junior)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6502, XTAL_1MHz)
+ MCFG_CPU_ADD("maincpu",M6502, XTAL(1'000'000))
MCFG_CPU_PROGRAM_MAP(junior_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
@@ -224,7 +224,7 @@ MACHINE_CONFIG_START(junior_state::junior)
MCFG_DEFAULT_LAYOUT( layout_junior )
/* Devices */
- MCFG_DEVICE_ADD("riot", MOS6532_NEW, XTAL_1MHz)
+ MCFG_DEVICE_ADD("riot", MOS6532_NEW, XTAL(1'000'000))
MCFG_MOS6530n_IN_PA_CB(READ8(junior_state, junior_riot_a_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(junior_state, junior_riot_a_w))
MCFG_MOS6530n_IN_PB_CB(READ8(junior_state, junior_riot_b_r))
diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp
index 2f87656fd65..bd48db76edf 100644
--- a/src/mame/drivers/jupace.cpp
+++ b/src/mame/drivers/jupace.cpp
@@ -749,7 +749,7 @@ void ace_state::machine_start()
MACHINE_CONFIG_START(ace_state::ace)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_6_5MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(6'500'000)/2)
MCFG_CPU_PROGRAM_MAP(ace_mem)
MCFG_CPU_IO_MAP(ace_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -757,7 +757,7 @@ MACHINE_CONFIG_START(ace_state::ace)
// video hardware
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_UPDATE_DRIVER(ace_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_6_5MHz, 416, 0, 336, 312, 0, 304)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(6'500'000), 416, 0, 336, 312, 0, 304)
MCFG_SCREEN_PALETTE("palette")
MCFG_TIMER_DRIVER_ADD_SCANLINE("set_irq", ace_state, set_irq, SCREEN_TAG, 31*8, 264)
@@ -774,10 +774,10 @@ MACHINE_CONFIG_START(ace_state::ace)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_SOUND_ADD(AY8910_TAG, AY8910, XTAL_6_5MHz/2)
+ MCFG_SOUND_ADD(AY8910_TAG, AY8910, XTAL(6'500'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD(SP0256AL2_TAG, SP0256, XTAL_3MHz)
+ MCFG_SOUND_ADD(SP0256AL2_TAG, SP0256, XTAL(3'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
@@ -792,7 +792,7 @@ MACHINE_CONFIG_START(ace_state::ace)
MCFG_I8255_IN_PORTB_CB(READ8(ace_state, sby_r))
MCFG_I8255_OUT_PORTB_CB(WRITE8(ace_state, ald_w))
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_6_5MHz/2)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(6'500'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(ace_state, pio_pa_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(ace_state, pio_pa_w))
diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp
index b7da6e92ed3..b7abb883d25 100644
--- a/src/mame/drivers/jupiter.cpp
+++ b/src/mame/drivers/jupiter.cpp
@@ -279,7 +279,7 @@ MACHINE_CONFIG_START(jupiter2_state::jupiter2)
MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":0", jupiter_floppies, "525ssdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":1", jupiter_floppies, nullptr, floppy_image_device::default_floppy_formats)
- MCFG_DEVICE_ADD("acia0", ACIA6850, XTAL_2MHz) // unknown frequency
+ MCFG_DEVICE_ADD("acia0", ACIA6850, XTAL(2'000'000)) // unknown frequency
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial0", rs232_port_device, write_txd))
MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial0", rs232_port_device, write_rts))
@@ -287,7 +287,7 @@ MACHINE_CONFIG_START(jupiter2_state::jupiter2)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia0", acia6850_device, write_rxd))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia0", acia6850_device, write_cts))
- MCFG_DEVICE_ADD("acia1", ACIA6850, XTAL_2MHz) // unknown frequency
+ MCFG_DEVICE_ADD("acia1", ACIA6850, XTAL(2'000'000)) // unknown frequency
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial1", rs232_port_device, write_txd))
MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial1", rs232_port_device, write_rts))
diff --git a/src/mame/drivers/jvh.cpp b/src/mame/drivers/jvh.cpp
index 86774213bef..627fa92490e 100644
--- a/src/mame/drivers/jvh.cpp
+++ b/src/mame/drivers/jvh.cpp
@@ -115,10 +115,10 @@ MACHINE_CONFIG_START(jvh_state::jvh)
// CPU TMS9980A; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9980A, 1000000, jvh_map, escape_io)
- MCFG_CPU_ADD("soundcpu", M6802, XTAL_4MHz)
+ MCFG_CPU_ADD("soundcpu", M6802, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(jvh_sub_map)
- MCFG_DEVICE_ADD("via", VIA6522, XTAL_4MHz / 4) // MC6802 E clock
+ MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 4) // MC6802 E clock
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("soundcpu", M6802_IRQ_LINE))
MACHINE_CONFIG_END
@@ -126,10 +126,10 @@ MACHINE_CONFIG_START(jvh_state::jvh2)
// CPU TMS9980At; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9980A, 1000000, jvh_map, movmastr_io)
- MCFG_CPU_ADD("soundcpu", M6802, XTAL_4MHz)
+ MCFG_CPU_ADD("soundcpu", M6802, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(jvh_sub_map)
- MCFG_DEVICE_ADD("via", VIA6522, XTAL_4MHz / 4)
+ MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 4)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("soundcpu", M6802_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/k28.cpp b/src/mame/drivers/k28.cpp
index de463c240ae..35e1e3406bb 100644
--- a/src/mame/drivers/k28.cpp
+++ b/src/mame/drivers/k28.cpp
@@ -454,7 +454,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(k28_state::k28)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8021, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("maincpu", I8021, XTAL(3'579'545))
MCFG_CPU_IO_MAP(k28_mcu_map)
MCFG_MCS48_PORT_P1_IN_CB(READ8(k28_state, mcu_p1_r))
MCFG_MCS48_PORT_P2_IN_CB(READ8(k28_state, mcu_p2_r))
@@ -462,7 +462,7 @@ MACHINE_CONFIG_START(k28_state::k28)
MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE(k28_state, mcu_prog_w))
MCFG_MCS48_PORT_T1_IN_CB(DEVREADLINE("speech", votrax_sc01_device, request)) // SC-01 A/R pin
- MCFG_DEVICE_ADD("tms6100", TMS6100, XTAL_3_579545MHz) // CLK tied to 8021 ALE pin
+ MCFG_DEVICE_ADD("tms6100", TMS6100, XTAL(3'579'545)) // CLK tied to 8021 ALE pin
MCFG_TIMER_ADD_NONE("on_button")
diff --git a/src/mame/drivers/k8915.cpp b/src/mame/drivers/k8915.cpp
index c8ccf869f5d..7f472c491ed 100644
--- a/src/mame/drivers/k8915.cpp
+++ b/src/mame/drivers/k8915.cpp
@@ -129,7 +129,7 @@ uint32_t k8915_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
MACHINE_CONFIG_START(k8915_state::k8915)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4_9152MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'915'200) / 2)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
@@ -144,13 +144,13 @@ MACHINE_CONFIG_START(k8915_state::k8915)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_4_9152MHz / 2)
+ MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(4'915'200) / 2)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg2))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4_9152MHz / 2)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'915'200) / 2)
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_4_9152MHz / 2)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'915'200) / 2)
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp
index cb2d438791e..6e621570089 100644
--- a/src/mame/drivers/kaneko16.cpp
+++ b/src/mame/drivers/kaneko16.cpp
@@ -1929,7 +1929,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kaneko16_state::bakubrkr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(bakubrkr)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_state, kaneko16_interrupt, "screen", 0, 1)
@@ -1974,15 +1974,15 @@ MACHINE_CONFIG_START(kaneko16_state::bakubrkr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2149_1", YM2149, XTAL_12MHz/6) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2149_1", YM2149, XTAL(12'000'000)/6) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ym2149_2", YM2149, XTAL_12MHz/6) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2149_2", YM2149, XTAL(12'000'000)/6) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(READ8(kaneko16_state, eeprom_r)) /* inputs A: 0,EEPROM bit read */
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(kaneko16_state, eeprom_w)) /* outputs B: 0,EEPROM reset */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/6, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/6, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2058,11 +2058,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kaneko16_state::wingforc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* TMP68HC000N-16 */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* TMP68HC000N-16 */
MCFG_CPU_PROGRAM_MAP(blazeon)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_state, kaneko16_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* D780C-2 (6 MHz) */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* D780C-2 (6 MHz) */
MCFG_CPU_PROGRAM_MAP(blazeon_soundmem)
MCFG_CPU_IO_MAP(wingforc_soundport)
@@ -2099,10 +2099,10 @@ MACHINE_CONFIG_START(kaneko16_state::wingforc)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_16MHz/4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2124,7 +2124,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kaneko16_gtmr_state::gtmr)
/* 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(gtmr_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_state, kaneko16_interrupt, "screen", 0, 1)
@@ -2172,10 +2172,10 @@ MACHINE_CONFIG_START(kaneko16_gtmr_state::gtmr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/8, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL(16'000'000)/8, PIN7_LOW) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/8, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki2", XTAL(16'000'000)/8, PIN7_LOW) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -2247,7 +2247,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kaneko16_state::mgcrystl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb, TMP68HC000N-12 @U31 and X2 is 12MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* verified on pcb, TMP68HC000N-12 @U31 and X2 is 12MHz */
MCFG_CPU_PROGRAM_MAP(mgcrystl)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_state, kaneko16_interrupt, "screen", 0, 1)
@@ -2291,15 +2291,15 @@ MACHINE_CONFIG_START(kaneko16_state::mgcrystl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2149_1", YM2149, XTAL_12MHz/6) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2149_1", YM2149, XTAL(12'000'000)/6) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ym2149_2", YM2149, XTAL_12MHz/6) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2149_2", YM2149, XTAL(12'000'000)/6) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(READ8(kaneko16_state, eeprom_r)) /* inputs A: 0,EEPROM bit read */
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(kaneko16_state, eeprom_w)) /* outputs B: 0,EEPROM reset */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/6, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/6, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2376,7 +2376,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(kaneko16_shogwarr_state::shogwarr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(shogwarr)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_shogwarr_state, shogwarr_interrupt, "screen", 0, 1)
@@ -2423,11 +2423,11 @@ MACHINE_CONFIG_START(kaneko16_shogwarr_state::shogwarr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/8, PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", XTAL(16'000'000)/8, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, shogwarr_oki1_map)
- MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/8, PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", XTAL(16'000'000)/8, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, shogwarr_oki2_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kangaroo.cpp b/src/mame/drivers/kangaroo.cpp
index 688d115db8f..ff4e5ba91ba 100644
--- a/src/mame/drivers/kangaroo.cpp
+++ b/src/mame/drivers/kangaroo.cpp
@@ -166,7 +166,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_10MHz
+#define MASTER_CLOCK XTAL(10'000'000)
diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp
index 1d6be0b7a2b..ae813d6fdc2 100644
--- a/src/mame/drivers/kas89.cpp
+++ b/src/mame/drivers/kas89.cpp
@@ -201,7 +201,7 @@
#include "kas89.lh"
-#define MASTER_CLOCK XTAL_21_4772MHz
+#define MASTER_CLOCK XTAL(21'477'272)
#define VDP_MEM 0x40000
diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp
index 673e64df215..eeef8d1315a 100644
--- a/src/mame/drivers/kaypro.cpp
+++ b/src/mame/drivers/kaypro.cpp
@@ -193,7 +193,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(kaypro_state::kayproii)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz / 8)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(20'000'000) / 8)
MCFG_CPU_PROGRAM_MAP(kaypro_map)
MCFG_CPU_IO_MAP(kayproii_io)
MCFG_Z80_DAISY_CHAIN(kayproii_daisy_chain)
@@ -237,28 +237,28 @@ MACHINE_CONFIG_START(kaypro_state::kayproii)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcda_w))
- MCFG_DEVICE_ADD("brg", COM8116, XTAL_5_0688MHz) // WD1943, SMC8116
+ MCFG_DEVICE_ADD("brg", COM8116, XTAL(5'068'800)) // WD1943, SMC8116
MCFG_COM8116_FR_HANDLER(DEVWRITELINE("sio", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
- MCFG_DEVICE_ADD("z80pio_g", Z80PIO, XTAL_20MHz / 8)
+ MCFG_DEVICE_ADD("z80pio_g", Z80PIO, XTAL(20'000'000) / 8)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_DEVICE_ADD("z80pio_s", Z80PIO, XTAL_20MHz / 8)
+ MCFG_DEVICE_ADD("z80pio_s", Z80PIO, XTAL(20'000'000) / 8)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(kaypro_state, pio_system_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(kaypro_state, kayproii_pio_system_w))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_20MHz / 8)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(20'000'000) / 8)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("serial", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("serial", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("serial", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("kbd", kaypro_10_keyboard_device, txd_w))
- MCFG_FD1793_ADD("fdc", XTAL_20MHz / 20)
+ MCFG_FD1793_ADD("fdc", XTAL(20'000'000) / 20)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(kaypro_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(kaypro_state, fdc_drq_w))
MCFG_WD_FDC_FORCE_READY
@@ -284,7 +284,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kaypro_state::kaypro484)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(kaypro_map)
MCFG_CPU_IO_MAP(kaypro484_io)
MCFG_Z80_DAISY_CHAIN(kaypro484_daisy_chain)
@@ -340,24 +340,24 @@ MACHINE_CONFIG_START(kaypro_state::kaypro484)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio_2", z80sio_device, synca_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio_2", z80sio_device, ctsa_w))
- MCFG_DEVICE_ADD("sio_1", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio_1", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // FIXME: use a combiner
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("modem", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("modem", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("modem", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("kbd", kaypro_10_keyboard_device, txd_w))
- MCFG_DEVICE_ADD("sio_2", Z80SIO, XTAL_16MHz / 4) /* extra sio for modem and printer */
+ MCFG_DEVICE_ADD("sio_2", Z80SIO, XTAL(16'000'000) / 4) /* extra sio for modem and printer */
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // FIXME: use a combiner
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("serprn", rs232_port_device, write_txd))
- MCFG_DEVICE_ADD("brg", COM8116, XTAL_5_0688MHz) // WD1943, SMC8116
+ MCFG_DEVICE_ADD("brg", COM8116, XTAL(5'068'800)) // WD1943, SMC8116
MCFG_COM8116_FR_HANDLER(DEVWRITELINE("sio_1", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio_1", z80sio_device, txca_w))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE("sio_2", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio_2", z80sio_device, txca_w))
- MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16)
+ MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(kaypro_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(kaypro_state, fdc_drq_w))
MCFG_WD_FDC_FORCE_READY
diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp
index 804aec0d06d..7c25414948a 100644
--- a/src/mame/drivers/kc.cpp
+++ b/src/mame/drivers/kc.cpp
@@ -115,7 +115,7 @@ MACHINE_CONFIG_START(kc_state::kc85_3)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28_37516MHz/2, 908, 0, 320, 312, 0, 256)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'375'160)/2, 908, 0, 320, 312, 0, 256)
MCFG_SCREEN_UPDATE_DRIVER(kc_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kc_state, kc_scanline, "screen", 0, 1)
@@ -123,7 +123,7 @@ MACHINE_CONFIG_START(kc_state::kc85_3)
MCFG_PALETTE_ADD("palette", KC85_PALETTE_SIZE)
MCFG_PALETTE_INIT_OWNER(kc_state, kc85 )
- MCFG_DEVICE_ADD("keyboard", KC_KEYBOARD, XTAL_4MHz)
+ MCFG_DEVICE_ADD("keyboard", KC_KEYBOARD, XTAL(4'000'000))
MCFG_KC_KEYBOARD_OUT_CALLBACK(WRITELINE(kc_state, keyboard_cb))
/* sound hardware */
@@ -199,7 +199,7 @@ MACHINE_CONFIG_START(kc85_4_state::kc85_4)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28_37516MHz/2, 908, 0, 320, 312, 0, 256)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'375'160)/2, 908, 0, 320, 312, 0, 256)
MCFG_SCREEN_UPDATE_DRIVER(kc85_4_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kc85_4_state, kc_scanline, "screen", 0, 1)
@@ -207,7 +207,7 @@ MACHINE_CONFIG_START(kc85_4_state::kc85_4)
MCFG_PALETTE_ADD("palette", KC85_PALETTE_SIZE)
MCFG_PALETTE_INIT_OWNER(kc85_4_state, kc85 )
- MCFG_DEVICE_ADD("keyboard", KC_KEYBOARD, XTAL_4MHz)
+ MCFG_DEVICE_ADD("keyboard", KC_KEYBOARD, XTAL(4'000'000))
MCFG_KC_KEYBOARD_OUT_CALLBACK(WRITELINE(kc_state, keyboard_cb))
/* sound hardware */
diff --git a/src/mame/drivers/kchamp.cpp b/src/mame/drivers/kchamp.cpp
index 5a0d74c2fb0..96b895d9d13 100644
--- a/src/mame/drivers/kchamp.cpp
+++ b/src/mame/drivers/kchamp.cpp
@@ -397,13 +397,13 @@ void kchamp_state::machine_reset()
MACHINE_CONFIG_START(kchamp_state::kchampvs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(kchampvs_map)
MCFG_CPU_IO_MAP(kchampvs_io_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", kchamp_state, kc_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(kchampvs_sound_map)
MCFG_CPU_IO_MAP(kchampvs_sound_io_map) /* irq's triggered from main cpu */
/* nmi's from msm5205 */
@@ -435,10 +435,10 @@ MACHINE_CONFIG_START(kchamp_state::kchampvs)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0) // at 4C
@@ -457,12 +457,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kchamp_state::kchamp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 12MHz / 4 = 3.0 MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 12MHz / 4 = 3.0 MHz */
MCFG_CPU_PROGRAM_MAP(kchamp_map)
MCFG_CPU_IO_MAP(kchamp_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", kchamp_state, kc_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/4) /* 12MHz / 4 = 3.0 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* 12MHz / 4 = 3.0 MHz */
MCFG_CPU_PROGRAM_MAP(kchamp_sound_map)
MCFG_CPU_IO_MAP(kchamp_sound_io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(kchamp_state, sound_int, 125) /* Hz */
@@ -495,10 +495,10 @@ MACHINE_CONFIG_START(kchamp_state::kchamp)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/12) /* Guess based on actual pcb recordings of karatedo */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/12) /* Guess based on actual pcb recordings of karatedo */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/12) /* Guess based on actual pcb recordings of karatedo */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/12) /* Guess based on actual pcb recordings of karatedo */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
MCFG_SOUND_ADD("dac", DAC08, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // IC11
diff --git a/src/mame/drivers/kdt6.cpp b/src/mame/drivers/kdt6.cpp
index 52f23c6a4b1..43e39e93d11 100644
--- a/src/mame/drivers/kdt6.cpp
+++ b/src/mame/drivers/kdt6.cpp
@@ -482,7 +482,7 @@ WRITE8_MEMBER( kdt6_state::status0_w )
// ------1- system frequency (0 = half)
// -------0 watchdog enable
- m_cpu->set_unscaled_clock((XTAL_16MHz / 4) * (BIT(data, 1) ? 1 : 0.5));
+ m_cpu->set_unscaled_clock((XTAL(16'000'000) / 4) * (BIT(data, 1) ? 1 : 0.5));
if ((BIT(m_status0, 2) ^ BIT(data, 2)) && BIT(data, 2))
{
@@ -610,20 +610,20 @@ static const z80_daisy_config daisy_chain_intf[] =
};
MACHINE_CONFIG_START(kdt6_state::psi98)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(psi98_mem)
MCFG_CPU_IO_MAP(psi98_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS(XTAL_13_5168MHz, 824, 48, 688, 274, 0, 250)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(13'516'800), 824, 48, 688, 274, 0, 250)
MCFG_SCREEN_UPDATE_DRIVER(kdt6_state, screen_update)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEFAULT_LAYOUT(layout_kdt6)
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_13_5168MHz / 8)
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(13'516'800) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(kdt6_state, crtc_update_row)
@@ -638,7 +638,7 @@ MACHINE_CONFIG_START(kdt6_state::psi98)
MCFG_TIMER_DRIVER_ADD("beep_timer", kdt6_state, beeper_off)
- MCFG_DEVICE_ADD("dma", Z80DMA, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000) / 4)
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(kdt6_state, busreq_w))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80DMA_IN_MREQ_CB(READ8(kdt6_state, memory_r))
@@ -647,22 +647,22 @@ MACHINE_CONFIG_START(kdt6_state::psi98)
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(kdt6_state, io_w))
// jumper J3 allows selection of 16MHz / 8 instead
- MCFG_CLOCK_ADD("uart_clk", XTAL_9_8304MHz / 8)
+ MCFG_CLOCK_ADD("uart_clk", XTAL(9'830'400) / 8)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc1", z80ctc_device, trg1))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc1", z80ctc_device, trg2))
- MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
- MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("speaker", speaker_sound_device, level_w))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc2", z80ctc_device, trg3))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
@@ -683,7 +683,7 @@ MACHINE_CONFIG_START(kdt6_state::psi98)
MCFG_RS232_DSR_HANDLER(DEVWRITELINE("sio", z80sio_device, syncb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w)) MCFG_DEVCB_XOR(1)
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(16'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(kdt6_state, pio_porta_w))
MCFG_Z80PIO_IN_PB_CB(DEVREAD8("cent_data_in", input_buffer_device, read))
@@ -699,7 +699,7 @@ MACHINE_CONFIG_START(kdt6_state::psi98)
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
- MCFG_UPD1990A_ADD("rtc", XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD1990A_ADD("rtc", XTAL(32'768), NOOP, NOOP)
MCFG_UPD765A_ADD("fdc", true, true)
MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("ctc1", z80ctc_device, trg0))
diff --git a/src/mame/drivers/kenseim.cpp b/src/mame/drivers/kenseim.cpp
index 565ad8b09cb..ccee1e984c6 100644
--- a/src/mame/drivers/kenseim.cpp
+++ b/src/mame/drivers/kenseim.cpp
@@ -474,7 +474,7 @@ static const z80_daisy_config daisy_chain_gamecpu[] =
MACHINE_CONFIG_DERIVED(kenseim_state::kenseim, cps1_12MHz)
/* basic machine hardware */
- MCFG_CPU_ADD("gamecpu", TMPZ84C011, XTAL_16MHz/2) // tmpz84c011-8
+ MCFG_CPU_ADD("gamecpu", TMPZ84C011, XTAL(16'000'000)/2) // tmpz84c011-8
MCFG_Z80_DAISY_CHAIN(daisy_chain_gamecpu)
MCFG_CPU_PROGRAM_MAP(kenseim_map)
MCFG_CPU_IO_MAP(kenseim_io_map)
diff --git a/src/mame/drivers/kickgoal.cpp b/src/mame/drivers/kickgoal.cpp
index 0bd1387844d..b60c008eb84 100644
--- a/src/mame/drivers/kickgoal.cpp
+++ b/src/mame/drivers/kickgoal.cpp
@@ -674,11 +674,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kickgoal_state::actionhw)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(kickgoal_program_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", kickgoal_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL_12MHz/3) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(12'000'000)/3) /* verified on pcb */
MCFG_DEVICE_DISABLE() /* Disabled since the internal rom isn't dumped */
/* Program and Data Maps are internal to the MCU */
@@ -705,7 +705,7 @@ MACHINE_CONFIG_START(kickgoal_state::actionhw)
//MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/12, PIN7_HIGH) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kingdrby.cpp b/src/mame/drivers/kingdrby.cpp
index 273ab9f89b0..5df9d46bf5c 100644
--- a/src/mame/drivers/kingdrby.cpp
+++ b/src/mame/drivers/kingdrby.cpp
@@ -136,8 +136,8 @@ public:
};
-#define CLK_1 XTAL_20MHz
-#define CLK_2 XTAL_3_579545MHz
+#define CLK_1 XTAL(20'000'000)
+#define CLK_2 XTAL(3'579'545)
/*************************************
diff --git a/src/mame/drivers/kingpin.cpp b/src/mame/drivers/kingpin.cpp
index 6f54abe7e70..968fb9beab5 100644
--- a/src/mame/drivers/kingpin.cpp
+++ b/src/mame/drivers/kingpin.cpp
@@ -131,7 +131,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kingpin_state::kingpin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(kingpin_program_map)
MCFG_CPU_IO_MAP(kingpin_io_map)
@@ -147,12 +147,12 @@ MACHINE_CONFIG_START(kingpin_state::kingpin)
MCFG_NVRAM_ADD_1FILL("nvram")
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(kingpin_sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(kingpin_state, irq0_line_hold, 1000) // unknown freq
/* video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("maincpu", 0))
@@ -164,7 +164,7 @@ MACHINE_CONFIG_START(kingpin_state::kingpin)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8912, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("aysnd", AY8912, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kinst.cpp b/src/mame/drivers/kinst.cpp
index 5c2eb0be2fb..5e7b533a1b1 100644
--- a/src/mame/drivers/kinst.cpp
+++ b/src/mame/drivers/kinst.cpp
@@ -238,7 +238,7 @@ protected:
/* constants */
-#define MASTER_CLOCK XTAL_50MHz
+#define MASTER_CLOCK XTAL(50'000'000)
diff --git a/src/mame/drivers/kncljoe.cpp b/src/mame/drivers/kncljoe.cpp
index 728a96fa184..2811e68a40e 100644
--- a/src/mame/drivers/kncljoe.cpp
+++ b/src/mame/drivers/kncljoe.cpp
@@ -255,11 +255,11 @@ void kncljoe_state::machine_reset()
MACHINE_CONFIG_START(kncljoe_state::kncljoe)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_6MHz) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(6'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", kncljoe_state, irq0_line_hold)
- MCFG_CPU_ADD("soundcpu", M6803, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("soundcpu", M6803, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_portmap)
MCFG_CPU_PERIODIC_INT_DRIVER(kncljoe_state, sound_nmi, (double)3970) //measured 3.970 kHz
@@ -285,15 +285,15 @@ MACHINE_CONFIG_START(kncljoe_state::kncljoe)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(kncljoe_state, unused_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("sn1", SN76489, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("sn1", SN76489, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("sn2", SN76489, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("sn2", SN76489, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp
index f936126606c..bccef20ed74 100644
--- a/src/mame/drivers/koftball.cpp
+++ b/src/mame/drivers/koftball.cpp
@@ -231,7 +231,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(koftball_state::koftball)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_21_4772MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(21'477'272) / 2)
MCFG_CPU_PROGRAM_MAP(koftball_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", koftball_state, bmc_interrupt, "screen", 0, 1)
@@ -250,7 +250,7 @@ MACHINE_CONFIG_START(koftball_state::koftball)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) // guessed chip type, clock not verified
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545)) // guessed chip type, clock not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
diff --git a/src/mame/drivers/konamigq.cpp b/src/mame/drivers/konamigq.cpp
index 58e1a952f81..9980d38ff96 100644
--- a/src/mame/drivers/konamigq.cpp
+++ b/src/mame/drivers/konamigq.cpp
@@ -314,7 +314,7 @@ MACHINE_RESET_MEMBER(konamigq_state,konamigq)
MACHINE_CONFIG_START(konamigq_state::konamigq)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", CXD8530BQ, XTAL_67_7376MHz)
+ MCFG_CPU_ADD("maincpu", CXD8530BQ, XTAL(67'737'600))
MCFG_CPU_PROGRAM_MAP(konamigq_map)
MCFG_RAM_MODIFY("maincpu:ram")
@@ -323,10 +323,10 @@ MACHINE_CONFIG_START(konamigq_state::konamigq)
MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&konamigq_state::scsi_dma_read, this ) )
MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&konamigq_state::scsi_dma_write, this ) )
- MCFG_CPU_ADD("soundcpu", M68000, XTAL_32MHz/4) /* 8MHz - measured */
+ MCFG_CPU_ADD("soundcpu", M68000, XTAL(32'000'000)/4) /* 8MHz - measured */
MCFG_CPU_PROGRAM_MAP(konamigq_sound_map)
- MCFG_CPU_ADD("dasp", TMS57002, XTAL_48MHz/2) /* 24MHz - measured */
+ MCFG_CPU_ADD("dasp", TMS57002, XTAL(48'000'000)/2) /* 24MHz - measured */
MCFG_CPU_DATA_MAP(konamigq_dasp_map)
MCFG_CPU_PERIODIC_INT_DRIVER(konamigq_state, tms_sync, 48000)
@@ -345,21 +345,21 @@ MACHINE_CONFIG_START(konamigq_state::konamigq)
MCFG_AM53CF96_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10))
/* video hardware */
- MCFG_PSXGPU_ADD("maincpu", "gpu", CXD8538Q, 0x200000, XTAL_53_693175MHz)
+ MCFG_PSXGPU_ADD("maincpu", "gpu", CXD8538Q, 0x200000, XTAL(53'693'175))
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_K056800_ADD("k056800", XTAL_18_432MHz)
+ MCFG_K056800_ADD("k056800", XTAL(18'432'000))
MCFG_K056800_INT_HANDLER(INPUTLINE("soundcpu", M68K_IRQ_1))
- MCFG_DEVICE_ADD("k054539_1", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_K054539_TIMER_HANDLER(WRITELINE(konamigq_state, k054539_irq_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_DEVICE_ADD("k054539_2", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/konamigv.cpp b/src/mame/drivers/konamigv.cpp
index ba63654c662..b2e198bc824 100644
--- a/src/mame/drivers/konamigv.cpp
+++ b/src/mame/drivers/konamigv.cpp
@@ -322,7 +322,7 @@ void konamigv_state::cdrom_config(device_t *device)
MACHINE_CONFIG_START(konamigv_state::konamigv)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8530BQ, XTAL_67_7376MHz )
+ MCFG_CPU_ADD( "maincpu", CXD8530BQ, XTAL(67'737'600) )
MCFG_CPU_PROGRAM_MAP( konamigv_map )
MCFG_RAM_MODIFY("maincpu:ram")
@@ -343,12 +343,12 @@ MACHINE_CONFIG_START(konamigv_state::konamigv)
MCFG_AM53CF96_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10))
/* video hardware */
- MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8514Q, 0x100000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8514Q, 0x100000, XTAL(53'693'175) )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SPU_ADD( "spu", XTAL_67_7376MHz/2 )
+ MCFG_SPU_ADD( "spu", XTAL(67'737'600)/2 )
MCFG_SOUND_ROUTE( 0, "lspeaker", 0.75 )
MCFG_SOUND_ROUTE( 1, "rspeaker", 0.75 )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp
index 5c1632b3504..62525cb183d 100644
--- a/src/mame/drivers/konamigx.cpp
+++ b/src/mame/drivers/konamigx.cpp
@@ -110,8 +110,8 @@
// TODO: check on PCB
-#define MASTER_CLOCK XTAL_24MHz
-#define SUB_CLOCK XTAL_16MHz
+#define MASTER_CLOCK XTAL(24'000'000)
+#define SUB_CLOCK XTAL(16'000'000)
/**********************************************************************************/
/*
@@ -503,7 +503,7 @@ WRITE32_MEMBER(konamigx_state::eeprom_w)
WRITE32_MEMBER(konamigx_state::control_w)
{
// TODO: derive from reported PCB XTALs
- const uint32_t pixclock[4] = { XTAL_6MHz, XTAL_8MHz, XTAL_12MHz, XTAL_16MHz};
+ const uint32_t pixclock[4] = { 6'000'000, 8'000'000, 12'000'000, 16'000'000 };
//logerror("write %x to control register (mask=%x)\n", data, mem_mask);
// known controls:
@@ -1673,10 +1673,10 @@ MACHINE_CONFIG_START(konamigx_state::konamigx)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.3)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.3)
- MCFG_K056800_ADD("k056800", XTAL_18_432MHz)
+ MCFG_K056800_ADD("k056800", XTAL(18'432'000))
MCFG_K056800_INT_HANDLER(INPUTLINE("soundcpu", M68K_IRQ_1))
- MCFG_DEVICE_ADD("k054539_1", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_K054539_TIMER_HANDLER(WRITELINE(konamigx_state, k054539_irq_gen))
MCFG_SOUND_ROUTE_EX(0, "dasp", 0.5, 0)
@@ -1684,7 +1684,7 @@ MACHINE_CONFIG_START(konamigx_state::konamigx)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_DEVICE_ADD("k054539_2", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_SOUND_ROUTE_EX(0, "dasp", 0.5, 2)
MCFG_SOUND_ROUTE_EX(1, "dasp", 0.5, 3)
diff --git a/src/mame/drivers/konin.cpp b/src/mame/drivers/konin.cpp
index cc5a3efd4bf..1d10e950618 100644
--- a/src/mame/drivers/konin.cpp
+++ b/src/mame/drivers/konin.cpp
@@ -112,7 +112,7 @@ void konin_state::machine_start()
MACHINE_CONFIG_START(konin_state::konin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(konin_mem)
MCFG_CPU_IO_MAP(konin_io)
MCFG_I8085A_INTE(DEVWRITELINE("picu", i8214_device, inte_w))
@@ -123,7 +123,7 @@ MACHINE_CONFIG_START(konin_state::konin)
MCFG_I8212_DI_CALLBACK(DEVREAD8("picu", i8214_device, vector_r))
MCFG_I8212_INT_CALLBACK(INPUTLINE("maincpu", I8085_INTR_LINE))
- MCFG_DEVICE_ADD("picu", I8214, XTAL_4MHz)
+ MCFG_DEVICE_ADD("picu", I8214, XTAL(4'000'000))
MCFG_I8214_INT_CALLBACK(DEVWRITELINE("intlatch", i8212_device, stb_w))
MCFG_DEVICE_ADD("mainpit", PIT8253, 0)
diff --git a/src/mame/drivers/konmedal.cpp b/src/mame/drivers/konmedal.cpp
index e09fbb8cb11..ed7e0720da2 100644
--- a/src/mame/drivers/konmedal.cpp
+++ b/src/mame/drivers/konmedal.cpp
@@ -383,7 +383,7 @@ void konmedal_state::machine_reset()
MACHINE_CONFIG_START(konmedal_state::tsukande)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_14_31818MHz/2) // z84c0008pec 8mhz part, 14.31818Mhz xtal verified on PCB, divisor unknown
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(14'318'181)/2) // z84c0008pec 8mhz part, 14.31818Mhz xtal verified on PCB, divisor unknown
MCFG_CPU_PROGRAM_MAP(medal_main)
MCFG_CPU_VBLANK_INT_DRIVER("screen", konmedal_state, konmedal_interrupt)
@@ -409,14 +409,14 @@ MACHINE_CONFIG_START(konmedal_state::tsukande)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL_16_9344MHz) // 16.9344MHz xtal verified on PCB
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400)) // 16.9344MHz xtal verified on PCB
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(konmedal_state::ddboy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_14_31818MHz/2) // z84c0008pec 8mhz part, 14.31818Mhz xtal verified on PCB, divisor unknown
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(14'318'181)/2) // z84c0008pec 8mhz part, 14.31818Mhz xtal verified on PCB, divisor unknown
MCFG_CPU_PROGRAM_MAP(ddboy_main)
MCFG_CPU_VBLANK_INT_DRIVER("screen", konmedal_state, konmedal_interrupt)
@@ -441,11 +441,11 @@ MACHINE_CONFIG_START(konmedal_state::ddboy)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/14, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(14'318'181)/14, PIN7_HIGH)
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
- MCFG_K051649_ADD("k051649", XTAL_14_31818MHz/8)
+ MCFG_K051649_ADD("k051649", XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
@@ -543,7 +543,7 @@ WRITE8_MEMBER(konmedal_state::shuri_vrom_bank_w)
MACHINE_CONFIG_START(konmedal_state::shuriboy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 3) // divisor unknown
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000) / 3) // divisor unknown
MCFG_CPU_PROGRAM_MAP(shuriboy_main)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", konmedal_state, scanline, "screen", 0, 1)
@@ -570,7 +570,7 @@ MACHINE_CONFIG_START(konmedal_state::shuriboy)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_K051649_ADD("k051649", XTAL_24MHz / 12) // divisor unknown
+ MCFG_K051649_ADD("k051649", XTAL(24'000'000) / 12) // divisor unknown
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
// upd7759c
diff --git a/src/mame/drivers/kontest.cpp b/src/mame/drivers/kontest.cpp
index 06dcd274011..a522312a533 100644
--- a/src/mame/drivers/kontest.cpp
+++ b/src/mame/drivers/kontest.cpp
@@ -26,7 +26,7 @@
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_24MHz
+#define MAIN_CLOCK XTAL(24'000'000)
class kontest_state : public driver_device
{
diff --git a/src/mame/drivers/kron.cpp b/src/mame/drivers/kron.cpp
index 538bcad7dac..6a17265ab98 100644
--- a/src/mame/drivers/kron.cpp
+++ b/src/mame/drivers/kron.cpp
@@ -294,7 +294,7 @@ WRITE_LINE_MEMBER(kron180_state::keyb_interrupt)
*/
MACHINE_CONFIG_START(kron180_state::kron180)
/* basic machine hardware */
- MCFG_CPU_ADD ("maincpu", Z180, XTAL_12_288MHz)
+ MCFG_CPU_ADD ("maincpu", Z180, XTAL(12'288'000))
MCFG_CPU_PROGRAM_MAP (kron180_mem)
MCFG_CPU_IO_MAP(kron180_iomap)
diff --git a/src/mame/drivers/krz2000.cpp b/src/mame/drivers/krz2000.cpp
index 2e6130c3b50..9e3147516f1 100644
--- a/src/mame/drivers/krz2000.cpp
+++ b/src/mame/drivers/krz2000.cpp
@@ -56,7 +56,7 @@ static ADDRESS_MAP_START( k2000_map, AS_PROGRAM, 16, k2000_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(k2000_state::k2000)
- MCFG_CPU_ADD("maincpu", M68301, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", M68301, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(k2000_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
diff --git a/src/mame/drivers/ksayakyu.cpp b/src/mame/drivers/ksayakyu.cpp
index 5d1c83576d6..3d89b3f596f 100644
--- a/src/mame/drivers/ksayakyu.cpp
+++ b/src/mame/drivers/ksayakyu.cpp
@@ -75,7 +75,7 @@ SRAM:
#include "speaker.h"
-#define MAIN_CLOCK XTAL_18_432MHz
+#define MAIN_CLOCK XTAL(18'432'000)
WRITE8_MEMBER(ksayakyu_state::bank_select_w)
diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp
index 6561f5a124a..41d5e15cf16 100644
--- a/src/mame/drivers/ksys573.cpp
+++ b/src/mame/drivers/ksys573.cpp
@@ -2061,7 +2061,7 @@ void ksys573_state::cr589_config(device_t *device)
MACHINE_CONFIG_START(ksys573_state::konami573)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz )
+ MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) )
MCFG_CPU_PROGRAM_MAP( konami573_map )
MCFG_RAM_MODIFY( "maincpu:ram" )
@@ -2105,13 +2105,13 @@ MACHINE_CONFIG_START(ksys573_state::konami573)
MCFG_ADDRESS_MAP_BANK_STRIDE( 0x400000 )
/* video hardware */
- MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL(53'693'175) )
MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate(&ksys573_state::sys573_vblank, this ))
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO( "lspeaker", "rspeaker" )
- MCFG_SPU_ADD( "spu", XTAL_67_7376MHz/2 )
+ MCFG_SPU_ADD( "spu", XTAL(67'737'600)/2 )
MCFG_SOUND_ROUTE( 0, "lspeaker", 1.0 )
MCFG_SOUND_ROUTE( 1, "rspeaker", 1.0 )
@@ -2125,7 +2125,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(ksys573_state::k573d, konami573)
MCFG_CPU_MODIFY( "maincpu" )
MCFG_CPU_PROGRAM_MAP( konami573d_map )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_ADD( "k573dio", XTAL_19_6608MHz )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_ADD( "k573dio", XTAL(19'660'800) )
MACHINE_CONFIG_END
// Variants with additional analogue i/o board
diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp
index 2bd60e4cce3..9617c850bc0 100644
--- a/src/mame/drivers/kungfur.cpp
+++ b/src/mame/drivers/kungfur.cpp
@@ -309,12 +309,12 @@ MACHINE_CONFIG_START(kungfur_state::kungfur)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("adpcm1", MSM5205, XTAL_384kHz) // clock verified with recording
+ MCFG_SOUND_ADD("adpcm1", MSM5205, XTAL(384'000)) // clock verified with recording
MCFG_MSM5205_VCLK_CB(WRITELINE(kungfur_state, kfr_adpcm1_int))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD("adpcm2", MSM5205, XTAL_384kHz) // "
+ MCFG_SOUND_ADD("adpcm2", MSM5205, XTAL(384'000)) // "
MCFG_MSM5205_VCLK_CB(WRITELINE(kungfur_state, kfr_adpcm2_int))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
diff --git a/src/mame/drivers/kurukuru.cpp b/src/mame/drivers/kurukuru.cpp
index 34b3929b1a7..0ee8caddc5c 100644
--- a/src/mame/drivers/kurukuru.cpp
+++ b/src/mame/drivers/kurukuru.cpp
@@ -430,10 +430,10 @@ public:
void kurukuru(machine_config &config);
};
-#define MAIN_CLOCK XTAL_21_4772MHz
+#define MAIN_CLOCK XTAL(21'477'272)
#define CPU_CLOCK MAIN_CLOCK/6
#define YM2149_CLOCK MAIN_CLOCK/6/2 // '/SEL' pin tied to GND, so internal divisor x2 is active
-#define M5205_CLOCK XTAL_384kHz
+#define M5205_CLOCK XTAL(384'000)
#define HOPPER_PULSE 50 // time between hopper pulses in milliseconds
#define VDP_MEM 0x30000
diff --git a/src/mame/drivers/kyocera.cpp b/src/mame/drivers/kyocera.cpp
index 372986c4191..1e28db8639a 100644
--- a/src/mame/drivers/kyocera.cpp
+++ b/src/mame/drivers/kyocera.cpp
@@ -1341,7 +1341,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(tandy200_state::tandy200_tp_tick)
MACHINE_CONFIG_START(kc85_state::kc85)
/* basic machine hardware */
- MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL_4_9152MHz)
+ MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL(4'915'200))
MCFG_CPU_PROGRAM_MAP(kc85_mem)
MCFG_CPU_IO_MAP(kc85_io)
MCFG_I8085A_SID(READLINE(kc85_state,kc85_sid_r))
@@ -1356,13 +1356,13 @@ MACHINE_CONFIG_START(kc85_state::kc85)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
- MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL_4_9152MHz/2)
+ MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(4'915'200)/2)
MCFG_I8155_OUT_PORTA_CB(WRITE8(kc85_state, i8155_pa_w))
MCFG_I8155_OUT_PORTB_CB(WRITE8(kc85_state, i8155_pb_w))
MCFG_I8155_IN_PORTC_CB(READ8(kc85_state, i8155_pc_r))
MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(kc85_state, i8155_to_w))
- MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NOOP, INPUTLINE(I8085_TAG, I8085_RST75_LINE))
+ MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, INPUTLINE(I8085_TAG, I8085_RST75_LINE))
MCFG_IM6402_ADD(IM6402_TAG, 0, 0)
MCFG_IM6402_TRO_CALLBACK(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
@@ -1391,7 +1391,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc8201_state::pc8201)
/* basic machine hardware */
- MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL_4_9152MHz)
+ MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL(4'915'200))
MCFG_CPU_PROGRAM_MAP(pc8201_mem)
MCFG_CPU_IO_MAP(pc8201_io)
MCFG_I8085A_SID(READLINE(kc85_state,kc85_sid_r))
@@ -1406,13 +1406,13 @@ MACHINE_CONFIG_START(pc8201_state::pc8201)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
- MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL_4_9152MHz/2)
+ MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(4'915'200)/2)
MCFG_I8155_OUT_PORTA_CB(WRITE8(kc85_state, i8155_pa_w))
MCFG_I8155_OUT_PORTB_CB(WRITE8(kc85_state, i8155_pb_w))
MCFG_I8155_IN_PORTC_CB(READ8(kc85_state, i8155_pc_r))
MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(kc85_state, i8155_to_w))
- MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NOOP, INPUTLINE(I8085_TAG, I8085_RST75_LINE))
+ MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, INPUTLINE(I8085_TAG, I8085_RST75_LINE))
MCFG_IM6402_ADD(IM6402_TAG, 0, 0)
MCFG_IM6402_TRO_CALLBACK(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
@@ -1451,7 +1451,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(trsm100_state::trsm100)
/* basic machine hardware */
- MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL_4_9152MHz)
+ MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL(4'915'200))
MCFG_CPU_PROGRAM_MAP(kc85_mem)
MCFG_CPU_IO_MAP(trsm100_io)
MCFG_I8085A_SID(READLINE(kc85_state,kc85_sid_r))
@@ -1466,13 +1466,13 @@ MACHINE_CONFIG_START(trsm100_state::trsm100)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
- MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL_4_9152MHz/2)
+ MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(4'915'200)/2)
MCFG_I8155_OUT_PORTA_CB(WRITE8(kc85_state, i8155_pa_w))
MCFG_I8155_OUT_PORTB_CB(WRITE8(kc85_state, i8155_pb_w))
MCFG_I8155_IN_PORTC_CB(READ8(kc85_state, i8155_pc_r))
MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(kc85_state, i8155_to_w))
- MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NOOP, INPUTLINE(I8085_TAG, I8085_RST75_LINE))
+ MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, INPUTLINE(I8085_TAG, I8085_RST75_LINE))
MCFG_IM6402_ADD(IM6402_TAG, 0, 0)
MCFG_IM6402_TRO_CALLBACK(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
@@ -1483,7 +1483,7 @@ MACHINE_CONFIG_START(trsm100_state::trsm100)
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
-// MCFG_MC14412_ADD(MC14412_TAG, XTAL_1MHz)
+// MCFG_MC14412_ADD(MC14412_TAG, XTAL(1'000'000))
/* option ROM cartridge */
MCFG_GENERIC_CARTSLOT_ADD("opt_cartslot", generic_linear_slot, "trsm100_cart")
@@ -1506,7 +1506,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tandy200_state::tandy200)
/* basic machine hardware */
- MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL_4_9152MHz)
+ MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL(4'915'200))
MCFG_CPU_PROGRAM_MAP(tandy200_mem)
MCFG_CPU_IO_MAP(tandy200_io)
MCFG_I8085A_SID(READLINE(tandy200_state,kc85_sid_r))
@@ -1516,24 +1516,24 @@ MACHINE_CONFIG_START(tandy200_state::tandy200)
MCFG_FRAGMENT_ADD(tandy200_video)
/* TP timer */
- MCFG_TIMER_DRIVER_ADD_PERIODIC("tp", tandy200_state, tandy200_tp_tick, attotime::from_hz(XTAL_4_9152MHz/2/8192))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("tp", tandy200_state, tandy200_tp_tick, attotime::from_hz(XTAL(4'915'200)/2/8192))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
-// MCFG_TCM5089_ADD(TCM5089_TAG, XTAL_3_579545MHz)
+// MCFG_TCM5089_ADD(TCM5089_TAG, XTAL(3'579'545))
/* devices */
- MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL_4_9152MHz/2)
+ MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(4'915'200)/2)
MCFG_I8155_OUT_PORTA_CB(WRITE8(tandy200_state, i8155_pa_w))
MCFG_I8155_OUT_PORTB_CB(WRITE8(tandy200_state, i8155_pb_w))
MCFG_I8155_IN_PORTC_CB(READ8(tandy200_state, i8155_pc_r))
MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(tandy200_state, i8155_to_w))
- MCFG_DEVICE_ADD(RP5C01A_TAG, RP5C01, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(RP5C01A_TAG, RP5C01, XTAL(32'768))
- MCFG_DEVICE_ADD(I8251_TAG, I8251, 0) /*XTAL_4_9152MHz/2,*/
+ MCFG_DEVICE_ADD(I8251_TAG, I8251, 0) /*XTAL(4'915'200)/2,*/
MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
@@ -1542,7 +1542,7 @@ MACHINE_CONFIG_START(tandy200_state::tandy200)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr))
-// MCFG_MC14412_ADD(MC14412_TAG, XTAL_1MHz)
+// MCFG_MC14412_ADD(MC14412_TAG, XTAL(1'000'000))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(tandy200_state, write_centronics_busy))
MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(tandy200_state, write_centronics_select))
diff --git a/src/mame/drivers/kyugo.cpp b/src/mame/drivers/kyugo.cpp
index a3e31809299..516014f829a 100644
--- a/src/mame/drivers/kyugo.cpp
+++ b/src/mame/drivers/kyugo.cpp
@@ -510,12 +510,12 @@ INTERRUPT_GEN_MEMBER(kyugo_state::vblank_irq)
MACHINE_CONFIG_START(kyugo_state::kyugo_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(kyugo_main_map)
MCFG_CPU_IO_MAP(kyugo_main_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", kyugo_state, vblank_irq)
- MCFG_CPU_ADD("sub", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_ADD("sub", Z80, XTAL(18'432'000)/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(gyrodine_sub_map)
MCFG_CPU_IO_MAP(gyrodine_sub_portmap)
MCFG_CPU_PERIODIC_INT_DRIVER(kyugo_state, irq0_line_hold, 4*60)
@@ -542,12 +542,12 @@ MACHINE_CONFIG_START(kyugo_state::kyugo_base)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ladyfrog.cpp b/src/mame/drivers/ladyfrog.cpp
index c2dbb12196d..3968b1e4730 100644
--- a/src/mame/drivers/ladyfrog.cpp
+++ b/src/mame/drivers/ladyfrog.cpp
@@ -289,11 +289,11 @@ void ladyfrog_state::machine_reset()
MACHINE_CONFIG_START(ladyfrog_state::ladyfrog)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL_8MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80,XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(ladyfrog_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ladyfrog_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL_8MHz/2)
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(ladyfrog_sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(ladyfrog_state, irq0_line_hold, 2*60)
@@ -306,7 +306,7 @@ MACHINE_CONFIG_START(ladyfrog_state::ladyfrog)
// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
// MCFG_SCREEN_SIZE(32*8, 32*8)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) // black borders in ladyfrog gameplay are correct
- MCFG_SCREEN_RAW_PARAMS( XTAL_8MHz, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz
+ MCFG_SCREEN_RAW_PARAMS( XTAL(8'000'000), 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz
MCFG_SCREEN_UPDATE_DRIVER(ladyfrog_state, screen_update_ladyfrog)
MCFG_SCREEN_PALETTE("palette")
@@ -319,12 +319,12 @@ MACHINE_CONFIG_START(ladyfrog_state::ladyfrog)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_8MHz/4)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(8'000'000)/4)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(ladyfrog_state, unk_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ladyfrog_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("msm", MSM5232, XTAL_8MHz/4)
+ MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4)
MCFG_MSM5232_SET_CAPACITORS(0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6)
MCFG_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
diff --git a/src/mame/drivers/laserbat.cpp b/src/mame/drivers/laserbat.cpp
index 12eff821edf..be4394784b8 100644
--- a/src/mame/drivers/laserbat.cpp
+++ b/src/mame/drivers/laserbat.cpp
@@ -464,7 +464,7 @@ void laserbat_state_base::device_timer(emu_timer &timer, device_timer_id id, int
MACHINE_CONFIG_START(laserbat_state_base::laserbat_base)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", S2650, XTAL_14_31818MHz/4)
+ MCFG_CPU_ADD("maincpu", S2650, XTAL(14'318'181)/4)
MCFG_CPU_PROGRAM_MAP(laserbat_map)
MCFG_CPU_IO_MAP(laserbat_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", laserbat_state_base, laserbat_interrupt)
@@ -472,21 +472,21 @@ MACHINE_CONFIG_START(laserbat_state_base::laserbat_base)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz, 227*4, 43*4-1, 227*4-1, 312, 8, 255)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181), 227*4, 43*4-1, 227*4-1, 312, 8, 255)
MCFG_SCREEN_UPDATE_DRIVER(laserbat_state_base, screen_update_laserbat)
MCFG_SCREEN_PALETTE("palette")
MCFG_PLS100_ADD("gfxmix")
- MCFG_DEVICE_ADD("pvi1", S2636, XTAL_14_31818MHz/3)
+ MCFG_DEVICE_ADD("pvi1", S2636, XTAL(14'318'181)/3)
MCFG_S2636_OFFSETS(-8, -16)
MCFG_S2636_DIVIDER(3)
- MCFG_DEVICE_ADD("pvi2", S2636, XTAL_14_31818MHz/3)
+ MCFG_DEVICE_ADD("pvi2", S2636, XTAL(14'318'181)/3)
MCFG_S2636_OFFSETS(-8, -16)
MCFG_S2636_DIVIDER(3)
- MCFG_DEVICE_ADD("pvi3", S2636, XTAL_14_31818MHz/3)
+ MCFG_DEVICE_ADD("pvi3", S2636, XTAL(14'318'181)/3)
MCFG_S2636_OFFSETS(-8, -16)
MCFG_S2636_DIVIDER(3)
@@ -518,10 +518,10 @@ MACHINE_CONFIG_DERIVED(laserbat_state::laserbat, laserbat_base)
MCFG_SN76477_ENVELOPE_PARAMS(0, 1) // GND, Vreg
MCFG_SN76477_ENABLE(0) // AB SOUND
- MCFG_TMS3615_ADD("synth_low", XTAL_4MHz/16/2) // from the other one's /2 clock output
+ MCFG_TMS3615_ADD("synth_low", XTAL(4'000'000)/16/2) // from the other one's /2 clock output
MCFG_SOUND_ROUTE(tms3615_device::FOOTAGE_8, "speaker", 1.0)
- MCFG_TMS3615_ADD("synth_high", XTAL_4MHz/16) // 4MHz divided down with a 74LS161
+ MCFG_TMS3615_ADD("synth_high", XTAL(4'000'000)/16) // 4MHz divided down with a 74LS161
MCFG_SOUND_ROUTE(tms3615_device::FOOTAGE_8, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp
index 4da1ee51eb6..3147da1679e 100644
--- a/src/mame/drivers/lasso.cpp
+++ b/src/mame/drivers/lasso.cpp
@@ -575,11 +575,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(lasso_state::pinbo, base)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M6502, XTAL_18MHz/24)
+ MCFG_CPU_REPLACE("maincpu", M6502, XTAL(18'000'000)/24)
MCFG_CPU_PROGRAM_MAP(pinbo_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", lasso_state, irq0_line_hold)
- MCFG_CPU_REPLACE("audiocpu", Z80, XTAL_18MHz/6)
+ MCFG_CPU_REPLACE("audiocpu", Z80, XTAL(18'000'000)/6)
MCFG_CPU_PROGRAM_MAP(pinbo_audio_map)
MCFG_CPU_IO_MAP(pinbo_audio_io_map)
@@ -595,10 +595,10 @@ MACHINE_CONFIG_DERIVED(lasso_state::pinbo, base)
MCFG_DEVICE_REMOVE("sn76489.1")
MCFG_DEVICE_REMOVE("sn76489.2")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_18MHz/12)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'000'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.55)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_18MHz/12)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'000'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.55)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lastbank.cpp b/src/mame/drivers/lastbank.cpp
index e2b24a5ef76..3915ee6c25c 100644
--- a/src/mame/drivers/lastbank.cpp
+++ b/src/mame/drivers/lastbank.cpp
@@ -22,7 +22,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_14_31818MHz
+#define MASTER_CLOCK XTAL(14'318'181)
class lastbank_state : public driver_device
{
diff --git a/src/mame/drivers/lastduel.cpp b/src/mame/drivers/lastduel.cpp
index 5b9babea151..9ffbec24699 100644
--- a/src/mame/drivers/lastduel.cpp
+++ b/src/mame/drivers/lastduel.cpp
@@ -491,7 +491,7 @@ MACHINE_CONFIG_START(lastduel_state::lastduel)
MCFG_CPU_VBLANK_INT_DRIVER("screen", lastduel_state, irq2_line_hold)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_irq", lastduel_state, lastduel_timer_cb, attotime::from_hz(120))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_MACHINE_START_OVERRIDE(lastduel_state,lastduel)
@@ -519,11 +519,11 @@ MACHINE_CONFIG_START(lastduel_state::lastduel)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(3'579'545))
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -531,12 +531,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(lastduel_state::madgear)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(madgear_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", lastduel_state, irq5_line_hold)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_irq", lastduel_state, madgear_timer_cb, attotime::from_hz(120))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(madgear_sound_map)
MCFG_MACHINE_START_OVERRIDE(lastduel_state,madgear)
@@ -564,14 +564,14 @@ MACHINE_CONFIG_START(lastduel_state::madgear)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(3'579'545))
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki", XTAL_10MHz/10, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(10'000'000)/10, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.98)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lazercmd.cpp b/src/mame/drivers/lazercmd.cpp
index d3cf2134cbc..4b48e81591f 100644
--- a/src/mame/drivers/lazercmd.cpp
+++ b/src/mame/drivers/lazercmd.cpp
@@ -243,7 +243,7 @@
#include "lazercmd.lh"
#include "medlanes.lh"
-#define MASTER_CLOCK XTAL_8MHz
+#define MASTER_CLOCK XTAL(8'000'000)
/*************************************************************
* Interrupt for the cpu
diff --git a/src/mame/drivers/lb186.cpp b/src/mame/drivers/lb186.cpp
index 3e6a9ee8d83..89fcd0dc3c7 100644
--- a/src/mame/drivers/lb186.cpp
+++ b/src/mame/drivers/lb186.cpp
@@ -125,11 +125,11 @@ FLOPPY_FORMATS_MEMBER( lb186_state::floppy_formats )
FLOPPY_FORMATS_END
MACHINE_CONFIG_START(lb186_state::lb186)
- MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu", I80186, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(lb186_map)
MCFG_CPU_IO_MAP(lb186_io)
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400))
MCFG_MC68681_IRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, int0_w))
MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("rs232_1", rs232_port_device, write_txd))
MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("rs232_2", rs232_port_device, write_txd))
@@ -140,7 +140,7 @@ MACHINE_CONFIG_START(lb186_state::lb186)
MCFG_RS232_PORT_ADD("rs232_2", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart", scn2681_device, rx_b_w))
- MCFG_WD1772_ADD("fdc", XTAL_16MHz/2)
+ MCFG_WD1772_ADD("fdc", XTAL(16'000'000)/2)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, int2_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq0_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", lb186_floppies, "525dd", lb186_state::floppy_formats)
diff --git a/src/mame/drivers/lbeach.cpp b/src/mame/drivers/lbeach.cpp
index e40adf926e6..efb2112cc77 100644
--- a/src/mame/drivers/lbeach.cpp
+++ b/src/mame/drivers/lbeach.cpp
@@ -328,7 +328,7 @@ void lbeach_state::machine_reset()
MACHINE_CONFIG_START(lbeach_state::lbeach)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_16MHz / 32) // Motorola MC6800P, 500kHz
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(16'000'000) / 32) // Motorola MC6800P, 500kHz
MCFG_CPU_PROGRAM_MAP(lbeach_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", lbeach_state, nmi_line_pulse)
diff --git a/src/mame/drivers/lcmate2.cpp b/src/mame/drivers/lcmate2.cpp
index 33c2bdd3a1f..cd0883de271 100644
--- a/src/mame/drivers/lcmate2.cpp
+++ b/src/mame/drivers/lcmate2.cpp
@@ -226,7 +226,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(lcmate2_state::lcmate2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) // confirmed
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545)) // confirmed
MCFG_CPU_PROGRAM_MAP(lcmate2_mem)
MCFG_CPU_IO_MAP(lcmate2_io)
@@ -255,7 +255,7 @@ MACHINE_CONFIG_START(lcmate2_state::lcmate2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
- MCFG_DEVICE_ADD("rtc", RP5C15, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", RP5C15, XTAL(32'768))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/leland.cpp b/src/mame/drivers/leland.cpp
index e842500bdb1..ab5ff39e3f3 100644
--- a/src/mame/drivers/leland.cpp
+++ b/src/mame/drivers/leland.cpp
@@ -70,9 +70,9 @@
/* Master Clock2 is for Asylum, Ataxx, Brute Force, Danny Sullivan's Indy Heat, World Soccer Finals */
#define MASTER_CLOCK2 XTAL_28_63636MHZ
-#define MASTER_CLOCK XTAL_12MHz
-#define VIDEO_CLOCK XTAL_14_31818MHz
-#define MCU_CLOCK XTAL_16MHz
+#define MASTER_CLOCK XTAL(12'000'000)
+#define VIDEO_CLOCK XTAL(14'318'181)
+#define MCU_CLOCK XTAL(16'000'000)
@@ -1033,7 +1033,7 @@ MACHINE_CONFIG_START(leland_state::ataxx)
MCFG_CPU_PROGRAM_MAP(slave_map_program)
MCFG_CPU_IO_MAP(slave_map_io_2)
- MCFG_CPU_ADD("audiocpu", I80186, XTAL_16MHz)
+ MCFG_CPU_ADD("audiocpu", I80186, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(leland_80186_map_program)
MCFG_CPU_IO_MAP(ataxx_80186_map_io)
MCFG_80186_CHIP_SELECT_CB(DEVWRITE16("custom", leland_80186_sound_device, peripheral_ctrl))
diff --git a/src/mame/drivers/lethal.cpp b/src/mame/drivers/lethal.cpp
index 094599b7f81..591a4fb5a37 100644
--- a/src/mame/drivers/lethal.cpp
+++ b/src/mame/drivers/lethal.cpp
@@ -258,8 +258,8 @@ maybe some sprite placement issues
#include "speaker.h"
-#define MAIN_CLOCK XTAL_24MHz
-#define SOUND_CLOCK XTAL_18_432MHz
+#define MAIN_CLOCK XTAL(24'000'000)
+#define SOUND_CLOCK XTAL(18'432'000)
static const char *const gunnames[] = { "LIGHT0_X", "LIGHT0_Y", "LIGHT1_X", "LIGHT1_Y" };
@@ -536,7 +536,7 @@ MACHINE_CONFIG_START(lethal_state::lethalen)
MCFG_K054321_ADD("k054321", ":lspeaker", ":rspeaker")
- MCFG_DEVICE_ADD("k054539", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
MCFG_K054539_TIMER_HANDLER(INPUTLINE("soundcpu", INPUT_LINE_NMI))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/lethalj.cpp b/src/mame/drivers/lethalj.cpp
index 6106b74c146..32cf64bd085 100644
--- a/src/mame/drivers/lethalj.cpp
+++ b/src/mame/drivers/lethalj.cpp
@@ -146,11 +146,11 @@ Pin #11(+) | | R |
#include "speaker.h"
-#define MASTER_CLOCK XTAL_40MHz
-#define SOUND_CLOCK XTAL_2MHz
+#define MASTER_CLOCK XTAL(40'000'000)
+#define SOUND_CLOCK XTAL(2'000'000)
-#define VIDEO_CLOCK XTAL_11_289MHz
-#define VIDEO_CLOCK_LETHALJ XTAL_11_0592MHz
+#define VIDEO_CLOCK XTAL(11'289'000)
+#define VIDEO_CLOCK_LETHALJ XTAL(11'059'200)
diff --git a/src/mame/drivers/lg-dvd.cpp b/src/mame/drivers/lg-dvd.cpp
index b4c2892d9dc..8e252aeba3f 100644
--- a/src/mame/drivers/lg-dvd.cpp
+++ b/src/mame/drivers/lg-dvd.cpp
@@ -30,7 +30,7 @@ static ADDRESS_MAP_START( lg_dvd_map, AS_PROGRAM, 8, lg_dvd_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(lg_dvd_state::lg)
- MCFG_CPU_ADD( "maincpu", I80C52, XTAL_16MHz )
+ MCFG_CPU_ADD( "maincpu", I80C52, XTAL(16'000'000) )
MCFG_CPU_PROGRAM_MAP( lg_dvd_map )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/limenko.cpp b/src/mame/drivers/limenko.cpp
index 9b8dd7168a1..a0e65246f35 100644
--- a/src/mame/drivers/limenko.cpp
+++ b/src/mame/drivers/limenko.cpp
@@ -758,7 +758,7 @@ MACHINE_CONFIG_START(limenko_state::limenko)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("qs1000", QS1000, XTAL_24MHz)
+ MCFG_SOUND_ADD("qs1000", QS1000, XTAL(24'000'000))
MCFG_QS1000_EXTERNAL_ROM(true)
MCFG_QS1000_IN_P1_CB(READ8(limenko_state, qs1000_p1_r))
MCFG_QS1000_OUT_P1_CB(WRITE8(limenko_state, qs1000_p1_w))
diff --git a/src/mame/drivers/littlerb.cpp b/src/mame/drivers/littlerb.cpp
index 7e9d7075b66..6ccbcb49e03 100644
--- a/src/mame/drivers/littlerb.cpp
+++ b/src/mame/drivers/littlerb.cpp
@@ -252,12 +252,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(littlerb_state::littlerb_sound_step_cb)
}
MACHINE_CONFIG_START(littlerb_state::littlerb)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 10MHz rated part, near 16Mhz XTAL
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 10MHz rated part, near 16Mhz XTAL
MCFG_CPU_PROGRAM_MAP(littlerb_main)
- MCFG_INDER_VIDEO_ADD("inder_vid") // XTAL_40MHz
+ MCFG_INDER_VIDEO_ADD("inder_vid") // XTAL(40'000'000)
- // TODO: not accurate - driven by XTAL_6MHz?
+ // TODO: not accurate - driven by XTAL(6'000'000)?
MCFG_TIMER_DRIVER_ADD_PERIODIC("step_timer", littlerb_state, littlerb_sound_step_cb, attotime::from_hz(7500/150))
MCFG_TIMER_DRIVER_ADD_PERIODIC("sound_timer", littlerb_state, littlerb_sound_cb, attotime::from_hz(7500))
diff --git a/src/mame/drivers/lkage.cpp b/src/mame/drivers/lkage.cpp
index 9806f530782..db6c38ccb8f 100644
--- a/src/mame/drivers/lkage.cpp
+++ b/src/mame/drivers/lkage.cpp
@@ -95,10 +95,10 @@ TODO:
#include "speaker.h"
-#define MAIN_CPU_CLOCK (XTAL_12MHz/2)
-#define SOUND_CPU_CLOCK (XTAL_8MHz/2)
-#define AUDIO_CLOCK (XTAL_8MHz/2)
-#define MCU_CLOCK (XTAL_12MHz/4)
+#define MAIN_CPU_CLOCK (XTAL(12'000'000)/2)
+#define SOUND_CPU_CLOCK (XTAL(8'000'000)/2)
+#define AUDIO_CLOCK (XTAL(8'000'000)/2)
+#define MCU_CLOCK (XTAL(12'000'000)/4)
WRITE8_MEMBER(lkage_state::lkage_sh_nmi_disable_w)
diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp
index 7c797394aa6..2a456c8feec 100644
--- a/src/mame/drivers/llc.cpp
+++ b/src/mame/drivers/llc.cpp
@@ -197,7 +197,7 @@ GFXDECODE_END
/* Machine driver */
MACHINE_CONFIG_START(llc_state::llc1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'000'000))
MCFG_Z80_DAISY_CHAIN(llc1_daisy_chain)
MCFG_CPU_PROGRAM_MAP(llc1_mem)
MCFG_CPU_IO_MAP(llc1_io)
@@ -218,16 +218,16 @@ MACHINE_CONFIG_START(llc_state::llc1)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEFAULT_LAYOUT(layout_llc1)
- MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL_3MHz)
+ MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL(3'000'000))
MCFG_Z80PIO_IN_PA_CB(READ8(llc_state, llc1_port1_a_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(llc_state, llc1_port1_a_w))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(llc_state, llc1_port1_b_w))
- MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL_3MHz)
+ MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL(3'000'000))
MCFG_Z80PIO_IN_PA_CB(READ8(llc_state, llc1_port2_a_r))
MCFG_Z80PIO_IN_PB_CB(READ8(llc_state, llc1_port2_b_r))
- MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_3MHz)
+ MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(3'000'000))
// timer 0 irq does digit display, and timer 3 irq does scan of the
// monitor keyboard.
// No idea how the CTC is connected, so guessed.
@@ -241,7 +241,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(llc_state::llc2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'000'000))
MCFG_Z80_DAISY_CHAIN(llc2_daisy_chain)
MCFG_CPU_PROGRAM_MAP(llc2_mem)
MCFG_CPU_IO_MAP(llc2_io)
@@ -265,15 +265,15 @@ MACHINE_CONFIG_START(llc_state::llc2)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL_3MHz)
+ MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL(3'000'000))
MCFG_Z80PIO_IN_PA_CB(DEVREAD8(K7659_KEYBOARD_TAG, k7659_keyboard_device, read))
MCFG_Z80PIO_IN_PB_CB(READ8(llc_state, llc2_port1_b_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(llc_state, llc2_port1_b_w))
- MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL_3MHz)
+ MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL(3'000'000))
MCFG_Z80PIO_IN_PA_CB(READ8(llc_state, llc2_port2_a_r))
- MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_3MHz)
+ MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(3'000'000))
MCFG_K7659_KEYBOARD_ADD()
diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp
index 1b5dd1e3f6b..e3206331a39 100644
--- a/src/mame/drivers/lockon.cpp
+++ b/src/mame/drivers/lockon.cpp
@@ -482,16 +482,16 @@ void lockon_state::machine_reset()
MACHINE_CONFIG_START(lockon_state::lockon)
- MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu", V30, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(main_v30)
- MCFG_CPU_ADD("ground", V30, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("ground", V30, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(ground_v30)
- MCFG_CPU_ADD("object", V30, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("object", V30, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(object_v30)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(sound_prg)
MCFG_CPU_IO_MAP(sound_io)
@@ -513,7 +513,7 @@ MACHINE_CONFIG_START(lockon_state::lockon)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_16MHz / 4)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(16'000'000) / 4)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(lockon_state, ym2203_irq))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("YM2203"))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(lockon_state, ym2203_out_b))
diff --git a/src/mame/drivers/lola8a.cpp b/src/mame/drivers/lola8a.cpp
index 7db10ad9176..51501405593 100644
--- a/src/mame/drivers/lola8a.cpp
+++ b/src/mame/drivers/lola8a.cpp
@@ -260,14 +260,14 @@ WRITE_LINE_MEMBER(lola8a_state::crtc_vsync)
MACHINE_CONFIG_START(lola8a_state::lola8a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_4_9152MHz)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(4'915'200))
MCFG_CPU_PROGRAM_MAP(lola8a_mem)
MCFG_CPU_IO_MAP(lola8a_io)
MCFG_I8085A_SID(READLINE(lola8a_state, cass_r))
MCFG_I8085A_SOD(WRITELINE(lola8a_state, cass_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(AY8910_TAG, AY8910, XTAL_4_9152MHz / 4)
+ MCFG_SOUND_ADD(AY8910_TAG, AY8910, XTAL(4'915'200) / 4)
MCFG_AY8910_PORT_A_READ_CB(READ8(lola8a_state, lola8a_port_a_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(lola8a_state, lola8a_port_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",1.0)
@@ -280,7 +280,7 @@ MACHINE_CONFIG_START(lola8a_state::lola8a)
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
- MCFG_MC6845_ADD(HD46505SP_TAG, HD6845, "screen", XTAL_8MHz / 8) // HD6845 == HD46505S
+ MCFG_MC6845_ADD(HD46505SP_TAG, HD6845, "screen", XTAL(8'000'000) / 8) // HD6845 == HD46505S
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(lola8a_state, crtc_update_row)
diff --git a/src/mame/drivers/lordgun.cpp b/src/mame/drivers/lordgun.cpp
index f75a4f2dc4b..41fc1a5b7e1 100644
--- a/src/mame/drivers/lordgun.cpp
+++ b/src/mame/drivers/lordgun.cpp
@@ -633,11 +633,11 @@ void lordgun_state::machine_start()
}
MACHINE_CONFIG_START(lordgun_state::lordgun)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(lordgun_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", lordgun_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_20MHz / 4)
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(20'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(lordgun_soundmem_map)
MCFG_CPU_IO_MAP(lordgun_soundio_map)
@@ -675,21 +675,21 @@ MACHINE_CONFIG_START(lordgun_state::lordgun)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(3'579'545))
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 20, PIN7_HIGH) // ? 5MHz can't be right!
+ MCFG_OKIM6295_ADD("oki", XTAL(20'000'000) / 20, PIN7_HIGH) // ? 5MHz can't be right!
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(lordgun_state::aliencha)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(aliencha_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", lordgun_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_20MHz / 4)
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(20'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(lordgun_soundmem_map)
MCFG_CPU_IO_MAP(aliencha_soundio_map)
@@ -732,10 +732,10 @@ MACHINE_CONFIG_START(lordgun_state::aliencha)
MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 20, PIN7_HIGH) // ? 5MHz can't be right
+ MCFG_OKIM6295_ADD("oki", XTAL(20'000'000) / 20, PIN7_HIGH) // ? 5MHz can't be right
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_20MHz / 20, PIN7_HIGH) // ? 5MHz can't be right
+ MCFG_OKIM6295_ADD("oki2", XTAL(20'000'000) / 20, PIN7_HIGH) // ? 5MHz can't be right
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp
index 6ae7e36627e..2b8814829ee 100644
--- a/src/mame/drivers/lsasquad.cpp
+++ b/src/mame/drivers/lsasquad.cpp
@@ -154,7 +154,7 @@ Notes:
#include "speaker.h"
-#define MASTER_CLOCK XTAL_24MHz
+#define MASTER_CLOCK XTAL(24'000'000)
WRITE8_MEMBER(lsasquad_state::lsasquad_bankswitch_w)
diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp
index a57b9f9147e..ad13cecc124 100644
--- a/src/mame/drivers/ltd.cpp
+++ b/src/mame/drivers/ltd.cpp
@@ -520,7 +520,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( ltd_state::timer_r )
MACHINE_CONFIG_START(ltd_state::ltd3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("maincpu", M6802, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(ltd3_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -536,7 +536,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ltd_state::ltd4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6803, XTAL_3_579545MHz) // guess, no details available
+ MCFG_CPU_ADD("maincpu", M6803, XTAL(3'579'545)) // guess, no details available
MCFG_CPU_PROGRAM_MAP(ltd4_map)
MCFG_CPU_IO_MAP(ltd4_io)
@@ -549,9 +549,9 @@ MACHINE_CONFIG_START(ltd_state::ltd4)
MCFG_FRAGMENT_ADD( genpin_audio )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd_0", AY8910, XTAL_3_579545MHz/2) /* guess */
+ MCFG_SOUND_ADD("aysnd_0", AY8910, XTAL(3'579'545)/2) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.3)
- MCFG_SOUND_ADD("aysnd_1", AY8910, XTAL_3_579545MHz/2) /* guess */
+ MCFG_SOUND_ADD("aysnd_1", AY8910, XTAL(3'579'545)/2) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.3)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp
index 6daa3832925..026e0cc04a2 100644
--- a/src/mame/drivers/lucky74.cpp
+++ b/src/mame/drivers/lucky74.cpp
@@ -773,7 +773,7 @@
#include "lucky74.lh"
-#define MASTER_CLOCK XTAL_12MHz /* confirmed */
+#define MASTER_CLOCK XTAL(12'000'000) /* confirmed */
/* custom 06B49P clocks */
#define C_06B49P_CLKOUT_01 (MASTER_CLOCK/2) /* 6 MHz. */
diff --git a/src/mame/drivers/luckybal.cpp b/src/mame/drivers/luckybal.cpp
index 17aa3d15f1f..31ad74b039a 100644
--- a/src/mame/drivers/luckybal.cpp
+++ b/src/mame/drivers/luckybal.cpp
@@ -266,9 +266,9 @@
*********************************************************************/
-#define CPU_CLOCK XTAL_12_288MHz
-#define MCU_CLOCK XTAL_8MHz
-#define VID_CLOCK XTAL_21_4772MHz
+#define CPU_CLOCK XTAL(12'288'000)
+#define MCU_CLOCK XTAL(8'000'000)
+#define VID_CLOCK XTAL(21'477'272)
#define VDP_MEM 0x20000 // 4x 4464 (64K x 4 DRAM)
diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp
index dad629f310e..1790ec925c0 100644
--- a/src/mame/drivers/lwings.cpp
+++ b/src/mame/drivers/lwings.cpp
@@ -919,11 +919,11 @@ void lwings_state::machine_reset()
MACHINE_CONFIG_START(lwings_state::lwings)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on PCB */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on PCB */
MCFG_CPU_PROGRAM_MAP(lwings_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", lwings_state, lwings_interrupt)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_12MHz/4) /* verified on PCB */
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(12'000'000)/4) /* verified on PCB */
MCFG_CPU_PROGRAM_MAP(lwings_sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(lwings_state, irq0_line_hold, 222) // approximation from pcb music recording - where is the frequency actually derived from??
@@ -951,13 +951,13 @@ MACHINE_CONFIG_START(lwings_state::lwings)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("2203a", YM2203, XTAL_12MHz/8) /* verified on PCB */
+ MCFG_SOUND_ADD("2203a", YM2203, XTAL(12'000'000)/8) /* verified on PCB */
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
MCFG_SOUND_ROUTE(3, "mono", 0.10)
- MCFG_SOUND_ADD("2203b", YM2203, XTAL_12MHz/8) /* verified on PCB */
+ MCFG_SOUND_ADD("2203b", YM2203, XTAL(12'000'000)/8) /* verified on PCB */
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
@@ -975,11 +975,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(lwings_state::fball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2)
MCFG_CPU_PROGRAM_MAP(fball_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", lwings_state, avengers_interrupt)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_12MHz/4) // ?
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(12'000'000)/4) // ?
MCFG_CPU_PROGRAM_MAP(fball_sound_map)
// MCFG_CPU_PERIODIC_INT_DRIVER(lwings_state, irq0_line_hold, 222)
@@ -1007,7 +1007,7 @@ MACHINE_CONFIG_START(lwings_state::fball)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/12, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, fball_oki_map)
@@ -1018,13 +1018,13 @@ MACHINE_CONFIG_DERIVED(lwings_state::trojan, lwings)
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_12MHz/4) /* verified on PCB */
+ MCFG_CPU_CLOCK(XTAL(12'000'000)/4) /* verified on PCB */
MCFG_CPU_PROGRAM_MAP(trojan_map)
MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_CLOCK(XTAL_12MHz/4) /* verified on PCB */
+ MCFG_CPU_CLOCK(XTAL(12'000'000)/4) /* verified on PCB */
- MCFG_CPU_ADD("adpcm", Z80, XTAL_12MHz/4) /* verified on PCB */
+ MCFG_CPU_ADD("adpcm", Z80, XTAL(12'000'000)/4) /* verified on PCB */
MCFG_CPU_PROGRAM_MAP(trojan_adpcm_map)
MCFG_CPU_IO_MAP(trojan_adpcm_io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(lwings_state, irq0_line_hold, 4000)
@@ -1040,7 +1040,7 @@ MACHINE_CONFIG_DERIVED(lwings_state::trojan, lwings)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("5205", MSM5205, XTAL_384kHz) /* verified on PCB */
+ MCFG_SOUND_ADD("5205", MSM5205, XTAL(384'000)) /* verified on PCB */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* slave mode */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lwriter.cpp b/src/mame/drivers/lwriter.cpp
index 788ee3bf7d4..011c080831c 100644
--- a/src/mame/drivers/lwriter.cpp
+++ b/src/mame/drivers/lwriter.cpp
@@ -347,8 +347,8 @@ WRITE_LINE_MEMBER(lwriter_state::scc_int)
m_via->write_ca1(state);
}*/
-#define CPU_CLK (XTAL_22_3210MHz / 2) // Based on pictures form here: http://picclick.co.uk/Apple-Postscript-LaserWriter-IINT-Printer-640-4105-M6009-Mainboard-282160713108.html#&gid=1&pid=7
-#define RXC_CLK ((CPU_CLK - (87 * 16 * 70)) / 3) // Tuned to get 9600 baud according to manual, needs rework based on real hardware
+#define CPU_CLK (XTAL(22'321'000) / 2) // Based on pictures form here: http://picclick.co.uk/Apple-Postscript-LaserWriter-IINT-Printer-640-4105-M6009-Mainboard-282160713108.html#&gid=1&pid=7
+#define RXC_CLK ((CPU_CLK.value() - (87 * 16 * 70)) / 3) // Tuned to get 9600 baud according to manual, needs rework based on real hardware
MACHINE_CONFIG_START(lwriter_state::lwriter)
MCFG_CPU_ADD("maincpu", M68000, CPU_CLK)
diff --git a/src/mame/drivers/m107.cpp b/src/mame/drivers/m107.cpp
index fed20a09bed..5544de48bf2 100644
--- a/src/mame/drivers/m107.cpp
+++ b/src/mame/drivers/m107.cpp
@@ -714,12 +714,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(m107_state::firebarr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V33, XTAL_28MHz/2) /* NEC V33, 28MHz clock */
+ MCFG_CPU_ADD("maincpu", V33, XTAL(28'000'000)/2) /* NEC V33, 28MHz clock */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
- MCFG_CPU_ADD("soundcpu", V35, XTAL_14_31818MHz)
+ MCFG_CPU_ADD("soundcpu", V35, XTAL(14'318'181))
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_V25_CONFIG(rtypeleo_decryption_table)
@@ -752,12 +752,12 @@ MACHINE_CONFIG_START(m107_state::firebarr)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("upd71059c", pic8259_device, ir3_w))
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", NEC_INPUT_LINE_INTP0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
- MCFG_IREMGA20_ADD("irem", XTAL_14_31818MHz/4)
+ MCFG_IREMGA20_ADD("irem", XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m20.cpp b/src/mame/drivers/m20.cpp
index fbc23ea99fb..88ebaed092c 100644
--- a/src/mame/drivers/m20.cpp
+++ b/src/mame/drivers/m20.cpp
@@ -118,7 +118,7 @@ public:
#define MAIN_CLOCK 4000000 /* 4 MHz */
-#define PIXEL_CLOCK XTAL_4_433619MHz
+#define PIXEL_CLOCK XTAL(4'433'619)
MC6845_UPDATE_ROW( m20_state::update_row )
diff --git a/src/mame/drivers/m24.cpp b/src/mame/drivers/m24.cpp
index aa53a996fbb..fa53d1af21d 100644
--- a/src/mame/drivers/m24.cpp
+++ b/src/mame/drivers/m24.cpp
@@ -248,7 +248,7 @@ void m24_state::cfg_m20_format(device_t *device)
MACHINE_CONFIG_START(m24_state::olivetti)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(m24_map)
MCFG_CPU_IO_MAP(m24_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
@@ -270,7 +270,7 @@ MACHINE_CONFIG_START(m24_state::olivetti)
MCFG_RAM_DEFAULT_SIZE("640K")
MCFG_RAM_EXTRA_OPTIONS("64K, 128K, 256K, 512K")
- MCFG_CPU_ADD("kbc", TMS7000, XTAL_4MHz)
+ MCFG_CPU_ADD("kbc", TMS7000, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(kbc_map)
MCFG_TMS7000_IN_PORTA_CB(READ8(m24_state, pa_r))
MCFG_TMS7000_OUT_PORTB_CB(WRITE8(m24_state, pb_w))
diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp
index 60da94c6495..5db3ba7d6f6 100644
--- a/src/mame/drivers/m5.cpp
+++ b/src/mame/drivers/m5.cpp
@@ -1398,22 +1398,22 @@ void brno_state::machine_reset()
MACHINE_CONFIG_START(m5_state::m5)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_14_31818MHz/4)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(14'318'181)/4)
MCFG_CPU_PROGRAM_MAP(m5_mem)
MCFG_CPU_IO_MAP(m5_io)
MCFG_Z80_DAISY_CHAIN(m5_daisy_chain)
- MCFG_CPU_ADD(Z80_FD5_TAG, Z80, XTAL_14_31818MHz/4)
+ MCFG_CPU_ADD(Z80_FD5_TAG, Z80, XTAL(14'318'181)/4)
MCFG_CPU_PROGRAM_MAP(fd5_mem)
MCFG_CPU_IO_MAP(fd5_io)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL_14_31818MHz/4)
+ MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_14_31818MHz/4)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(14'318'181)/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
// CK0 = EXINT, CK1 = GND, CK2 = TCK, CK3 = VDP INT
// ZC2 = EXCLK
@@ -1461,7 +1461,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(m5_state::ntsc, m5)
// video hardware
- MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(m5_state, sordm5_video_interrupt_callback))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
@@ -1475,7 +1475,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(m5_state::pal, m5)
// video hardware
- MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(m5_state, sordm5_video_interrupt_callback))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
@@ -1502,7 +1502,7 @@ MACHINE_CONFIG_DERIVED(brno_state::brno, m5)
MCFG_DEVICE_REMOVE(UPD765_TAG)
// video hardware
- MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(m5_state, sordm5_video_interrupt_callback))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
@@ -1510,7 +1510,7 @@ MACHINE_CONFIG_DERIVED(brno_state::brno, m5)
// floppy
- MCFG_WD2797_ADD(WD2797_TAG, XTAL_1MHz)
+ MCFG_WD2797_ADD(WD2797_TAG, XTAL(1'000'000))
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":0", brno_floppies, "35hd", brno_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":1", brno_floppies, "35hd", brno_state::floppy_formats)
diff --git a/src/mame/drivers/m52.cpp b/src/mame/drivers/m52.cpp
index 6ba0cc8acfb..29cf84c4167 100644
--- a/src/mame/drivers/m52.cpp
+++ b/src/mame/drivers/m52.cpp
@@ -51,7 +51,7 @@
#include "includes/m52.h"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
/*************************************
diff --git a/src/mame/drivers/m57.cpp b/src/mame/drivers/m57.cpp
index caee476fd0e..b0b1a66a4ec 100644
--- a/src/mame/drivers/m57.cpp
+++ b/src/mame/drivers/m57.cpp
@@ -59,7 +59,7 @@
#include "screen.h"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
@@ -231,7 +231,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(m57_state::m57)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", m57_state, irq0_line_hold)
diff --git a/src/mame/drivers/m58.cpp b/src/mame/drivers/m58.cpp
index 91e390d8542..d49894b4e5e 100644
--- a/src/mame/drivers/m58.cpp
+++ b/src/mame/drivers/m58.cpp
@@ -18,7 +18,7 @@
#include "includes/iremipt.h"
#include "includes/m58.h"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
/*************************************
diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp
index d851ba88ae9..dcf430117c5 100644
--- a/src/mame/drivers/m63.cpp
+++ b/src/mame/drivers/m63.cpp
@@ -747,7 +747,7 @@ INTERRUPT_GEN_MEMBER(m63_state::vblank_irq)
MACHINE_CONFIG_START(m63_state::m63)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,XTAL_12MHz/4) /* 3 MHz */
+ MCFG_CPU_ADD("maincpu",Z80,XTAL(12'000'000)/4) /* 3 MHz */
MCFG_CPU_PROGRAM_MAP(m63_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", m63_state, vblank_irq)
@@ -758,7 +758,7 @@ MACHINE_CONFIG_START(m63_state::m63)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(m63_state, coin1_w))
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(m63_state, coin2_w))
- MCFG_CPU_ADD("soundcpu",I8039,XTAL_12MHz/4) /* ????? */
+ MCFG_CPU_ADD("soundcpu",I8039,XTAL(12'000'000)/4) /* ????? */
MCFG_CPU_PROGRAM_MAP(i8039_map)
MCFG_CPU_IO_MAP(i8039_port_map)
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(m63_state, p1_w))
@@ -789,10 +789,10 @@ MACHINE_CONFIG_START(m63_state::m63)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8) /* ????? */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* ????? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -804,7 +804,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m63_state::fghtbskt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */
MCFG_CPU_PROGRAM_MAP(fghtbskt_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", m63_state, vblank_irq)
@@ -813,7 +813,7 @@ MACHINE_CONFIG_START(m63_state::fghtbskt)
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(m63_state, fghtbskt_flipscreen_w))
//MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(m63_state, fghtbskt_samples_w))
- MCFG_CPU_ADD("soundcpu", I8039,XTAL_12MHz/4) /* ????? */
+ MCFG_CPU_ADD("soundcpu", I8039,XTAL(12'000'000)/4) /* ????? */
MCFG_CPU_PROGRAM_MAP(i8039_map)
MCFG_CPU_IO_MAP(i8039_port_map)
MCFG_CPU_PERIODIC_INT_DRIVER(m63_state, snd_irq, 60/2)
@@ -839,7 +839,7 @@ MACHINE_CONFIG_START(m63_state::fghtbskt)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_ADD("samples", SAMPLES, 0)
diff --git a/src/mame/drivers/m6805evs.cpp b/src/mame/drivers/m6805evs.cpp
index efaae0b6fbb..12e62c809c7 100644
--- a/src/mame/drivers/m6805evs.cpp
+++ b/src/mame/drivers/m6805evs.cpp
@@ -101,7 +101,7 @@ void m6805evs_state::machine_reset()
MACHINE_CONFIG_START(m6805evs_state::m6805evs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6805, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", M6805, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m68705prg.cpp b/src/mame/drivers/m68705prg.cpp
index 2a8cd89e531..143ce5d47a1 100644
--- a/src/mame/drivers/m68705prg.cpp
+++ b/src/mame/drivers/m68705prg.cpp
@@ -240,28 +240,28 @@ MACHINE_CONFIG_START(m68705prg_state_base::m68705prg)
MACHINE_CONFIG_END
template<> MACHINE_CONFIG_DERIVED(p3prg_state::prg, m68705prg)
- MCFG_CPU_ADD("mcu", M68705P3, XTAL_1MHz)
+ MCFG_CPU_ADD("mcu", M68705P3, XTAL(1'000'000))
MCFG_M68705_PORTB_W_CB(WRITE8(p3prg_state, pb_w))
MCFG_MACHINE_RESET_OVERRIDE(p3prg_state, m68705prg)
MACHINE_CONFIG_END
template<> MACHINE_CONFIG_DERIVED(p5prg_state::prg, m68705prg)
- MCFG_CPU_ADD("mcu", M68705P5, XTAL_1MHz)
+ MCFG_CPU_ADD("mcu", M68705P5, XTAL(1'000'000))
MCFG_M68705_PORTB_W_CB(WRITE8(p5prg_state, pb_w))
MCFG_MACHINE_RESET_OVERRIDE(p5prg_state, m68705prg)
MACHINE_CONFIG_END
template<> MACHINE_CONFIG_DERIVED(r3prg_state::prg, m68705prg)
- MCFG_CPU_ADD("mcu", M68705R3, XTAL_1MHz)
+ MCFG_CPU_ADD("mcu", M68705R3, XTAL(1'000'000))
MCFG_M68705_PORTB_W_CB(WRITE8(r3prg_state, pb_w))
MCFG_MACHINE_RESET_OVERRIDE(r3prg_state, m68705prg)
MACHINE_CONFIG_END
template<> MACHINE_CONFIG_DERIVED(u3prg_state::prg, m68705prg)
- MCFG_CPU_ADD("mcu", M68705U3, XTAL_1MHz)
+ MCFG_CPU_ADD("mcu", M68705U3, XTAL(1'000'000))
MCFG_M68705_PORTB_W_CB(WRITE8(u3prg_state, pb_w))
MCFG_MACHINE_RESET_OVERRIDE(u3prg_state, m68705prg)
diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp
index 0ab38b9f2d1..81332048fac 100644
--- a/src/mame/drivers/m72.cpp
+++ b/src/mame/drivers/m72.cpp
@@ -198,8 +198,8 @@ other supported games as well.
#include "speaker.h"
-#define MASTER_CLOCK XTAL_32MHz
-#define SOUND_CLOCK XTAL_3_579545MHz
+#define MASTER_CLOCK XTAL(32'000'000)
+#define SOUND_CLOCK XTAL(3'579'545)
@@ -1892,7 +1892,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(m72_state::m72_8751, m72_base)
- MCFG_CPU_ADD("mcu",I8751, XTAL_8MHz) /* Uses its own XTAL */
+ MCFG_CPU_ADD("mcu",I8751, XTAL(8'000'000)) /* Uses its own XTAL */
MCFG_CPU_IO_MAP(mcu_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", m72_state, mcu_int)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m79152pc.cpp b/src/mame/drivers/m79152pc.cpp
index 824d04ebc76..61fa7136400 100644
--- a/src/mame/drivers/m79152pc.cpp
+++ b/src/mame/drivers/m79152pc.cpp
@@ -122,7 +122,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(m79152pc_state::m79152pc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
@@ -141,10 +141,10 @@ MACHINE_CONFIG_START(m79152pc_state::m79152pc)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart", z80sio_device, txca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", z80sio_device, rxca_w))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
//MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("uart", Z80SIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("uart", Z80SIO, XTAL(4'000'000))
//MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
diff --git a/src/mame/drivers/m79amb.cpp b/src/mame/drivers/m79amb.cpp
index 5a5b08ebc5f..6774ee641d8 100644
--- a/src/mame/drivers/m79amb.cpp
+++ b/src/mame/drivers/m79amb.cpp
@@ -192,7 +192,7 @@ INTERRUPT_GEN_MEMBER(m79amb_state::m79amb_interrupt)
MACHINE_CONFIG_START(m79amb_state::m79amb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_19_6608MHz / 10)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(19'660'800) / 10)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", m79amb_state, m79amb_interrupt)
diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp
index e1a9405f5d9..0ad909ddbc9 100644
--- a/src/mame/drivers/m90.cpp
+++ b/src/mame/drivers/m90.cpp
@@ -716,12 +716,12 @@ INTERRUPT_GEN_MEMBER(m90_state::bomblord_interrupt)
/* Basic hardware -- no decryption table is setup for CPU */
MACHINE_CONFIG_START(m90_state::m90)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V35, XTAL_32MHz/2)
+ MCFG_CPU_ADD("maincpu", V35, XTAL(32'000'000)/2)
MCFG_CPU_PROGRAM_MAP(m90_main_cpu_map)
MCFG_CPU_IO_MAP(m90_main_cpu_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", m90_state, m90_interrupt)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(m90_sound_cpu_map)
MCFG_CPU_IO_MAP(m90_sound_cpu_io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(m90_state, nmi_line_pulse, 128*60) /* clocked by V1? (Vigilante) */
@@ -748,7 +748,7 @@ MACHINE_CONFIG_START(m90_state::m90)
MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0)
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("m72", m72_audio_device, ym2151_irq_handler))
MCFG_SOUND_ROUTE(0, "speaker", 0.15)
MCFG_SOUND_ROUTE(1, "speaker", 0.15)
diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp
index 8e7ad3a47ec..502384f47d9 100644
--- a/src/mame/drivers/m92.cpp
+++ b/src/mame/drivers/m92.cpp
@@ -930,12 +930,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(m92_state::m92)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",V33,XTAL_18MHz/2)
+ MCFG_CPU_ADD("maincpu",V33,XTAL(18'000'000)/2)
MCFG_CPU_PROGRAM_MAP(m92_map)
MCFG_CPU_IO_MAP(m92_portmap)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
- MCFG_CPU_ADD("soundcpu" ,V35, XTAL_14_31818MHz)
+ MCFG_CPU_ADD("soundcpu" ,V35, XTAL(14'318'181))
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_DEVICE_ADD("upd71059c", PIC8259, 0)
@@ -968,12 +968,12 @@ MACHINE_CONFIG_START(m92_state::m92)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", NEC_INPUT_LINE_INTP0))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
- MCFG_IREMGA20_ADD("irem", XTAL_14_31818MHz/4)
+ MCFG_IREMGA20_ADD("irem", XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp
index 0f6f8fd46d5..a1fb49ad535 100644
--- a/src/mame/drivers/mac.cpp
+++ b/src/mame/drivers/mac.cpp
@@ -938,7 +938,7 @@ MACHINE_CONFIG_START(mac_state::mac512ke)
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
/* devices */
- MCFG_RTC3430042_ADD("rtc", XTAL_32_768kHz)
+ MCFG_RTC3430042_ADD("rtc", XTAL(32'768))
MCFG_IWM_ADD("fdc", mac_iwm_interface)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface)
@@ -1062,7 +1062,7 @@ MACHINE_CONFIG_START(mac_state::macprtb)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
/* devices */
- MCFG_RTC3430042_ADD("rtc", XTAL_32_768kHz)
+ MCFG_RTC3430042_ADD("rtc", XTAL(32'768))
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_6)
@@ -1110,7 +1110,7 @@ MACHINE_CONFIG_START(mac_state::macii)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
/* devices */
- MCFG_RTC3430042_ADD("rtc", XTAL_32_768kHz)
+ MCFG_RTC3430042_ADD("rtc", XTAL(32'768))
MCFG_DEVICE_ADD("nubus", NUBUS, 0)
MCFG_NUBUS_CPU("maincpu")
MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(mac_state, nubus_irq_9_w))
@@ -1186,7 +1186,7 @@ MACHINE_CONFIG_START(mac_state::maciifx)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
/* devices */
- MCFG_RTC3430042_ADD("rtc", XTAL_32_768kHz)
+ MCFG_RTC3430042_ADD("rtc", XTAL(32'768))
MCFG_DEVICE_ADD("nubus", NUBUS, 0)
MCFG_NUBUS_CPU("maincpu")
MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(mac_state, nubus_irq_9_w))
@@ -1474,7 +1474,7 @@ MACHINE_CONFIG_START(mac_state::macse30)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
/* devices */
- MCFG_RTC3430042_ADD("rtc", XTAL_32_768kHz)
+ MCFG_RTC3430042_ADD("rtc", XTAL(32'768))
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_6)
@@ -1911,7 +1911,7 @@ MACHINE_CONFIG_START(mac_state::macqd700)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
/* devices */
- MCFG_RTC3430042_ADD("rtc", XTAL_32_768kHz)
+ MCFG_RTC3430042_ADD("rtc", XTAL(32'768))
MCFG_DEVICE_ADD("nubus", NUBUS, 0)
MCFG_NUBUS_CPU("maincpu")
MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(mac_state, nubus_irq_9_w))
diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp
index faf5fe55f99..d99d8602501 100644
--- a/src/mame/drivers/mac128.cpp
+++ b/src/mame/drivers/mac128.cpp
@@ -1349,7 +1349,7 @@ MACHINE_CONFIG_START(mac128_state::mac512ke)
MCFG_SOUND_ROUTE_EX(0, DAC_TAG, 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, DAC_TAG, -1.0, DAC_VREF_NEG_INPUT)
/* devices */
- MCFG_RTC3430042_ADD("rtc", XTAL_32_768kHz)
+ MCFG_RTC3430042_ADD("rtc", XTAL(32'768))
MCFG_IWM_ADD("fdc", mac_iwm_interface)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface)
diff --git a/src/mame/drivers/madalien.cpp b/src/mame/drivers/madalien.cpp
index 84b65042ac0..1e7cc2b57e6 100644
--- a/src/mame/drivers/madalien.cpp
+++ b/src/mame/drivers/madalien.cpp
@@ -18,7 +18,7 @@
#include "speaker.h"
-#define SOUND_CLOCK XTAL_4MHz
+#define SOUND_CLOCK XTAL(4'000'000)
INPUT_CHANGED_MEMBER(madalien_state::coin_inserted)
diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp
index 3851c09f3b3..cc6ca0966a9 100644
--- a/src/mame/drivers/magic10.cpp
+++ b/src/mame/drivers/magic10.cpp
@@ -101,8 +101,8 @@
#include "musicsrt.lh"
-#define MAIN_CLOCK XTAL_20MHz
-#define AUX_CLOCK XTAL_30MHz
+#define MAIN_CLOCK XTAL(20'000'000)
+#define AUX_CLOCK XTAL(30'000'000)
#define CPU_CLOCK MAIN_CLOCK/2
diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp
index f70b31996c5..3c00afa066a 100644
--- a/src/mame/drivers/magicard.cpp
+++ b/src/mame/drivers/magicard.cpp
@@ -403,9 +403,9 @@
#include "speaker.h"
-#define CLOCK_A XTAL_30MHz
-#define CLOCK_B XTAL_8MHz
-#define CLOCK_C XTAL_19_6608MHz
+#define CLOCK_A XTAL(30'000'000)
+#define CLOCK_B XTAL(8'000'000)
+#define CLOCK_C XTAL(19'660'800)
class magicard_state : public driver_device
diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp
index 743ea260cf1..b4d4cfa4592 100644
--- a/src/mame/drivers/magicfly.cpp
+++ b/src/mame/drivers/magicfly.cpp
@@ -450,7 +450,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_10MHz
+#define MASTER_CLOCK XTAL(10'000'000)
class magicfly_state : public driver_device
diff --git a/src/mame/drivers/magmax.cpp b/src/mame/drivers/magmax.cpp
index c1782f97239..46a848507f4 100644
--- a/src/mame/drivers/magmax.cpp
+++ b/src/mame/drivers/magmax.cpp
@@ -328,11 +328,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(magmax_state::magmax)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(magmax_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", magmax_state, irq1_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL_20MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL(20'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(magmax_sound_map)
MCFG_CPU_IO_MAP(magmax_sound_io_map)
@@ -355,15 +355,15 @@ MACHINE_CONFIG_START(magmax_state::magmax)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_20MHz/16) /* verified on pcb */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(20'000'000)/16) /* verified on pcb */
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(magmax_state, ay8910_portA_0_w)) /*write port A*/
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(magmax_state, ay8910_portB_0_w)) /*write port B*/
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_20MHz/16) /* verified on pcb */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(20'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ay3", AY8910, XTAL_20MHz/16) /* verified on pcb */
+ MCFG_SOUND_ADD("ay3", AY8910, XTAL(20'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
diff --git a/src/mame/drivers/magnum.cpp b/src/mame/drivers/magnum.cpp
index 16d779b8409..d7c0a4e924d 100644
--- a/src/mame/drivers/magnum.cpp
+++ b/src/mame/drivers/magnum.cpp
@@ -145,11 +145,11 @@ static ADDRESS_MAP_START( magnum_io, AS_IO, 16, magnum_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(magnum_state::magnum)
- MCFG_CPU_ADD("maincpu", I80186, XTAL_12MHz / 2)
+ MCFG_CPU_ADD("maincpu", I80186, XTAL(12'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(magnum_map)
MCFG_CPU_IO_MAP(magnum_io)
- MCFG_DEVICE_ADD("rtc", CDP1879, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", CDP1879, XTAL(32'768))
MCFG_SCREEN_ADD("screen", LCD)
MCFG_SCREEN_UPDATE_DRIVER(magnum_state, screen_update)
diff --git a/src/mame/drivers/magreel.cpp b/src/mame/drivers/magreel.cpp
index 44b36937ffd..64cb031028f 100644
--- a/src/mame/drivers/magreel.cpp
+++ b/src/mame/drivers/magreel.cpp
@@ -28,7 +28,7 @@ UNDUMPED:
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_58MHz // Actual Xtal on board
+#define MAIN_CLOCK XTAL(58'000'000) // Actual Xtal on board
class magreel_state : public driver_device
{
diff --git a/src/mame/drivers/magtouch.cpp b/src/mame/drivers/magtouch.cpp
index 544f86717de..c8699c7cb47 100644
--- a/src/mame/drivers/magtouch.cpp
+++ b/src/mame/drivers/magtouch.cpp
@@ -197,7 +197,7 @@ MACHINE_CONFIG_START(magtouch_state::magtouch)
MCFG_DEVICE_REPLACE("vga", TVGA9000_VGA, 0)
MCFG_FRAGMENT_ADD( pcat_common )
- MCFG_DEVICE_ADD( "ns16450_0", NS16450, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "ns16450_0", NS16450, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir4_w))
MCFG_MICROTOUCH_ADD( "microtouch", 9600, DEVWRITELINE("ns16450_0", ins8250_uart_device, rx_w) )
diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp
index a5b88491fc1..3dda13ab2fe 100644
--- a/src/mame/drivers/majorpkr.cpp
+++ b/src/mame/drivers/majorpkr.cpp
@@ -463,7 +463,7 @@
#include "majorpkr.lh"
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
#define CPU_CLOCK (MASTER_CLOCK / 2) // 6 MHz, measured.
#define OKI_CLOCK (MASTER_CLOCK / 8) // 1.5 MHz, measured.
#define CRTC_CLOCK (MASTER_CLOCK / 16) // 750 kHz, measured.
diff --git a/src/mame/drivers/manohman.cpp b/src/mame/drivers/manohman.cpp
index d1752747c44..25308374be8 100644
--- a/src/mame/drivers/manohman.cpp
+++ b/src/mame/drivers/manohman.cpp
@@ -234,21 +234,21 @@ INPUT_PORTS_END
*********************************************/
MACHINE_CONFIG_START(manohman_state::manohman)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) // MC68000P8
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000)) // MC68000P8
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(manohman_state, iack_handler)
- MCFG_DEVICE_ADD("pit", PIT68230, XTAL_8MHz) // MC68230P8
+ MCFG_DEVICE_ADD("pit", PIT68230, XTAL(8'000'000)) // MC68230P8
- MCFG_DEVICE_ADD("duart", MC68681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart", MC68681, XTAL(3'686'400))
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz) // M62X42B
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768)) // M62X42B
MCFG_NVRAM_ADD_NO_FILL("nvram") // KM6264BL-10 x2 + MAX696CFL + battery
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("saa", SAA1099, XTAL_8MHz / 2) // clock not verified
+ MCFG_SOUND_ADD("saa", SAA1099, XTAL(8'000'000) / 2) // clock not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp
index ee416686790..e2208de3442 100644
--- a/src/mame/drivers/mappy.cpp
+++ b/src/mame/drivers/mappy.cpp
@@ -565,7 +565,7 @@ TODO:
*
*************************************/
-#define MASTER_CLOCK (XTAL_18_432MHz)
+#define MASTER_CLOCK (XTAL(18'432'000))
#define PIXEL_CLOCK (MASTER_CLOCK/3)
diff --git a/src/mame/drivers/marineb.cpp b/src/mame/drivers/marineb.cpp
index 6fd9efd7b27..f77653eabaf 100644
--- a/src/mame/drivers/marineb.cpp
+++ b/src/mame/drivers/marineb.cpp
@@ -46,7 +46,7 @@ write
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK (XTAL_12MHz)
+#define MASTER_CLOCK (XTAL(12'000'000))
#define CPU_CLOCK (MASTER_CLOCK/4)
#define SOUND_CLOCK (MASTER_CLOCK/8)
diff --git a/src/mame/drivers/marinedt.cpp b/src/mame/drivers/marinedt.cpp
index e77699b3d17..ad73c7744a3 100644
--- a/src/mame/drivers/marinedt.cpp
+++ b/src/mame/drivers/marinedt.cpp
@@ -105,7 +105,7 @@ Lower PCB is plugged in with components facing up.
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_9_987MHz
+#define MAIN_CLOCK XTAL(9'987'000)
class marinedt_state : public driver_device
{
diff --git a/src/mame/drivers/marywu.cpp b/src/mame/drivers/marywu.cpp
index 2a1a8107186..cfc56ec133c 100644
--- a/src/mame/drivers/marywu.cpp
+++ b/src/mame/drivers/marywu.cpp
@@ -184,12 +184,12 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(marywu_state::marywu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL_10_738635MHz) //actual CPU is a Winbond w78c31b-24
+ MCFG_CPU_ADD("maincpu", I80C31, XTAL(10'738'635)) //actual CPU is a Winbond w78c31b-24
MCFG_CPU_PROGRAM_MAP(program_map)
MCFG_CPU_IO_MAP(io_map)
/* Keyboard & display interface */
- MCFG_DEVICE_ADD("i8279", I8279, XTAL_10_738635MHz) /* should it be perhaps a fraction of the XTAL clock ? */
+ MCFG_DEVICE_ADD("i8279", I8279, XTAL(10'738'635)) /* should it be perhaps a fraction of the XTAL clock ? */
MCFG_I8279_OUT_SL_CB(WRITE8(marywu_state, multiplex_7seg_w)) // select block of 7seg modules by multiplexing the SL scan lines
MCFG_I8279_IN_RL_CB(READ8(marywu_state, keyboard_r)) // keyboard Return Lines
MCFG_I8279_OUT_DISP_CB(WRITE8(marywu_state, display_7seg_data_w))
@@ -199,12 +199,12 @@ MACHINE_CONFIG_START(marywu_state::marywu)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_10_738635MHz) /* should it be perhaps a fraction of the XTAL clock ? */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(10'738'635)) /* should it be perhaps a fraction of the XTAL clock ? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(marywu_state, ay1_port_a_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(marywu_state, ay1_port_b_w))
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_10_738635MHz) /* should it be perhaps a fraction of the XTAL clock ? */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(10'738'635)) /* should it be perhaps a fraction of the XTAL clock ? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(marywu_state, ay2_port_a_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(marywu_state, ay2_port_b_w))
diff --git a/src/mame/drivers/maygayv1.cpp b/src/mame/drivers/maygayv1.cpp
index 2e9f66dbd92..622eb2e3bb7 100644
--- a/src/mame/drivers/maygayv1.cpp
+++ b/src/mame/drivers/maygayv1.cpp
@@ -148,10 +148,10 @@ Find lamps/reels after UPD changes.
*
*************************************/
-#define DUART_CLOCK XTAL_3_6864MHz
+#define DUART_CLOCK XTAL(3'686'400)
#define PIXEL_CLOCK 0
-#define MASTER_CLOCK XTAL_16MHz
-#define SOUND_CLOCK XTAL_11_0592MHz
+#define MASTER_CLOCK XTAL(16'000'000)
+#define SOUND_CLOCK XTAL(11'059'200)
/*************************************
*
diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp
index 15dca30496d..47d419a3f2b 100644
--- a/src/mame/drivers/mazerbla.cpp
+++ b/src/mame/drivers/mazerbla.cpp
@@ -115,8 +115,8 @@ video z80
#include "speaker.h"
-#define MASTER_CLOCK XTAL_4MHz
-#define SOUND_CLOCK XTAL_14_31818MHz
+#define MASTER_CLOCK XTAL(4'000'000)
+#define SOUND_CLOCK XTAL(14'318'181)
class mazerbla_state : public driver_device
diff --git a/src/mame/drivers/mbc200.cpp b/src/mame/drivers/mbc200.cpp
index db1cfd0c33b..7f2f80fc8b7 100644
--- a/src/mame/drivers/mbc200.cpp
+++ b/src/mame/drivers/mbc200.cpp
@@ -293,11 +293,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(mbc200_state::mbc200)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz/2) // NEC D780C-1
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(8'000'000)/2) // NEC D780C-1
MCFG_CPU_PROGRAM_MAP(mbc200_mem)
MCFG_CPU_IO_MAP(mbc200_io)
- MCFG_CPU_ADD("subcpu",Z80, XTAL_8MHz/2) // NEC D780C-1
+ MCFG_CPU_ADD("subcpu",Z80, XTAL(8'000'000)/2) // NEC D780C-1
MCFG_CPU_PROGRAM_MAP(mbc200_sub_mem)
MCFG_CPU_IO_MAP(mbc200_sub_io)
@@ -311,7 +311,7 @@ MACHINE_CONFIG_START(mbc200_state::mbc200)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mbc200)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_8MHz / 4) // HD46505SP
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(8'000'000) / 4) // HD46505SP
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(mbc200_state, update_row)
@@ -337,7 +337,7 @@ MACHINE_CONFIG_START(mbc200_state::mbc200)
MCFG_DEVICE_ADD("uart2", I8251, 0) // INS8251A
- MCFG_MB8876_ADD("fdc", XTAL_8MHz / 8) // guess
+ MCFG_MB8876_ADD("fdc", XTAL(8'000'000) / 8) // guess
MCFG_FLOPPY_DRIVE_ADD("fdc:0", mbc200_floppies, "qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", mbc200_floppies, "qd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/mbc55x.cpp b/src/mame/drivers/mbc55x.cpp
index 53530769422..e85d16a6304 100644
--- a/src/mame/drivers/mbc55x.cpp
+++ b/src/mame/drivers/mbc55x.cpp
@@ -247,7 +247,7 @@ MACHINE_CONFIG_START(mbc55x_state::mbc55x)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,896,0,300,262,0,200)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181),896,0,300,262,0,200)
MCFG_SCREEN_UPDATE_DEVICE(VID_MC6845_NAME, mc6845_device, screen_update)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mbc55x_state, screen_vblank_mbc55x))
@@ -288,7 +288,7 @@ MACHINE_CONFIG_START(mbc55x_state::mbc55x)
MCFG_I8255_IN_PORTC_CB(READ8(mbc55x_state, mbc55x_ppi_portc_r))
MCFG_I8255_OUT_PORTC_CB(WRITE8(mbc55x_state, mbc55x_ppi_portc_w))
- MCFG_MC6845_ADD(VID_MC6845_NAME, MC6845, SCREEN_TAG, XTAL_14_31818MHz/8)
+ MCFG_MC6845_ADD(VID_MC6845_NAME, MC6845, SCREEN_TAG, XTAL(14'318'181)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(mbc55x_state, crtc_update_row)
@@ -296,7 +296,7 @@ MACHINE_CONFIG_START(mbc55x_state::mbc55x)
MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(mbc55x_state, vid_vsync_changed))
/* Backing storage */
- MCFG_FD1793_ADD(FDC_TAG, XTAL_1MHz)
+ MCFG_FD1793_ADD(FDC_TAG, XTAL(1'000'000))
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", mbc55x_floppies, "qd", mbc55x_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", mbc55x_floppies, "qd", mbc55x_state::floppy_formats)
diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp
index 6cf212aee08..a0c67f9a964 100644
--- a/src/mame/drivers/mbee.cpp
+++ b/src/mame/drivers/mbee.cpp
@@ -631,14 +631,14 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(mbee_state::mbee)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 6) /* 2 MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 6) /* 2 MHz */
MCFG_CPU_PROGRAM_MAP(mbee_mem)
MCFG_CPU_IO_MAP(mbee_io)
MCFG_Z80_DAISY_CHAIN(mbee_daisy_chain)
MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee)
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_12MHz / 6)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(12'000'000) / 6)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(mbee_state, pio_ardy))
@@ -667,7 +667,7 @@ MACHINE_CONFIG_START(mbee_state::mbee)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* devices */
- MCFG_MC6845_ADD("crtc", SY6545_1, "screen", XTAL_12MHz / 8)
+ MCFG_MC6845_ADD("crtc", SY6545_1, "screen", XTAL(12'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(mbee_state, crtc_update_row)
@@ -760,7 +760,7 @@ MACHINE_CONFIG_DERIVED(mbee_state::mbeeppc, mbeeic)
MCFG_GFXDECODE_MODIFY("gfxdecode", premium)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(mbee_state, premium)
- MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz )
+ MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
MCFG_MC146818_IRQ_HANDLER(WRITELINE(mbee_state, rtc_irq_w))
MACHINE_CONFIG_END
@@ -769,7 +769,7 @@ MACHINE_CONFIG_DERIVED(mbee_state::mbee56, mbeeic)
MCFG_CPU_PROGRAM_MAP(mbee56_mem)
MCFG_CPU_IO_MAP(mbee56_io)
MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee56)
- MCFG_WD2793_ADD("fdc", XTAL_4MHz / 2)
+ MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(mbee_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(mbee_state, fdc_drq_w))
MCFG_WD_FDC_ENMF_CALLBACK(GND)
@@ -784,7 +784,7 @@ MACHINE_CONFIG_DERIVED(mbee_state::mbee128, mbee56)
MCFG_CPU_PROGRAM_MAP(mbee256_mem)
MCFG_CPU_IO_MAP(mbee128_io)
MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee128)
- MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz )
+ MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
MCFG_MC146818_IRQ_HANDLER(WRITELINE(mbee_state, rtc_irq_w))
MACHINE_CONFIG_END
@@ -793,7 +793,7 @@ MACHINE_CONFIG_DERIVED(mbee_state::mbee128p, mbeeppc)
MCFG_CPU_PROGRAM_MAP(mbee256_mem)
MCFG_CPU_IO_MAP(mbee128_io)
MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee128)
- MCFG_WD2793_ADD("fdc", XTAL_4MHz / 2)
+ MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(mbee_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(mbee_state, fdc_drq_w))
MCFG_WD_FDC_ENMF_CALLBACK(GND)
diff --git a/src/mame/drivers/mc10.cpp b/src/mame/drivers/mc10.cpp
index 1b56b618b67..abccddab66b 100644
--- a/src/mame/drivers/mc10.cpp
+++ b/src/mame/drivers/mc10.cpp
@@ -503,14 +503,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mc10_state::mc10)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6803, XTAL_3_579545MHz) /* 0,894886 MHz */
+ MCFG_CPU_ADD("maincpu", M6803, XTAL(3'579'545)) /* 0,894886 MHz */
MCFG_CPU_PROGRAM_MAP(mc10_mem)
MCFG_CPU_IO_MAP(mc10_io)
/* video hardware */
MCFG_SCREEN_MC6847_NTSC_ADD("screen", "mc6847")
- MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, XTAL_3_579545MHz)
+ MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, XTAL(3'579'545))
MCFG_MC6847_INPUT_CALLBACK(READ8(mc10_state, mc6847_videoram_r))
/* sound hardware */
@@ -539,7 +539,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mc10_state::alice32)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6803, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("maincpu", M6803, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(alice32_mem)
MCFG_CPU_IO_MAP(mc10_io)
diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp
index 71dd2552c04..c7a3d3f7e2e 100644
--- a/src/mame/drivers/mc1000.cpp
+++ b/src/mame/drivers/mc1000.cpp
@@ -552,7 +552,7 @@ MACHINE_CONFIG_START(mc1000_state::mc1000)
/* video hardware */
MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, MC6847_TAG)
- MCFG_DEVICE_ADD(MC6847_TAG, MC6847_NTSC, XTAL_3_579545MHz)
+ MCFG_DEVICE_ADD(MC6847_TAG, MC6847_NTSC, XTAL(3'579'545))
MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(mc1000_state, hs_w))
MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(mc1000_state, fs_w))
MCFG_MC6847_INPUT_CALLBACK(READ8(mc1000_state, videoram_r))
diff --git a/src/mame/drivers/mc1502.cpp b/src/mame/drivers/mc1502.cpp
index 29d41117105..27cc0b5c801 100644
--- a/src/mame/drivers/mc1502.cpp
+++ b/src/mame/drivers/mc1502.cpp
@@ -247,7 +247,7 @@ static INPUT_PORTS_START( mc1502 )
INPUT_PORTS_END
MACHINE_CONFIG_START(mc1502_state::mc1502)
- MCFG_CPU_ADD("maincpu", I8088, XTAL_16MHz/3)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(16'000'000)/3)
MCFG_CPU_PROGRAM_MAP(mc1502_map)
MCFG_CPU_IO_MAP(mc1502_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
@@ -256,11 +256,11 @@ MACHINE_CONFIG_START(mc1502_state::mc1502)
MCFG_MACHINE_RESET_OVERRIDE( mc1502_state, mc1502 )
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_16MHz/12) /* heartbeat IRQ */
+ MCFG_PIT8253_CLK0(XTAL(16'000'000)/12) /* heartbeat IRQ */
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_16MHz/12) /* serial port */
+ MCFG_PIT8253_CLK1(XTAL(16'000'000)/12) /* serial port */
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(mc1502_state, mc1502_pit8253_out1_changed))
- MCFG_PIT8253_CLK2(XTAL_16MHz/12) /* pio port c pin 4, and speaker polling enough */
+ MCFG_PIT8253_CLK2(XTAL(16'000'000)/12) /* pio port c pin 4, and speaker polling enough */
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(mc1502_state, mc1502_pit8253_out2_changed))
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
diff --git a/src/mame/drivers/mc8020.cpp b/src/mame/drivers/mc8020.cpp
index 6423ad513d5..cb84603ac59 100644
--- a/src/mame/drivers/mc8020.cpp
+++ b/src/mame/drivers/mc8020.cpp
@@ -292,7 +292,7 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(mc8020_state::mc8020)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_2_4576MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(2'457'600))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
@@ -309,15 +309,15 @@ MACHINE_CONFIG_START(mc8020_state::mc8020)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* devices */
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_2_4576MHz)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(2'457'600))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(mc8020_state, port_a_w))
MCFG_Z80PIO_IN_PB_CB(READ8(mc8020_state, port_b_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(mc8020_state, port_b_w))
- MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_2_4576MHz / 64) // guess
+ MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(2'457'600) / 64) // guess
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg2))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_2_4576MHz)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(2'457'600))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc", z80ctc_device, trg1))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg0))
diff --git a/src/mame/drivers/mc8030.cpp b/src/mame/drivers/mc8030.cpp
index 019603831e1..bbf10ff4092 100644
--- a/src/mame/drivers/mc8030.cpp
+++ b/src/mame/drivers/mc8030.cpp
@@ -179,7 +179,7 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(mc8030_state::mc8030)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_2_4576MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(2'457'600))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
@@ -196,25 +196,25 @@ MACHINE_CONFIG_START(mc8030_state::mc8030)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* Devices */
- MCFG_DEVICE_ADD("zve_pio", Z80PIO, XTAL_2_4576MHz)
+ MCFG_DEVICE_ADD("zve_pio", Z80PIO, XTAL(2'457'600))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(mc8030_state, zve_port_a_r))
//MCFG_Z80PIO_OUT_PA_CB(WRITE8(mc8030_state, zve_port_a_w))
MCFG_Z80PIO_IN_PB_CB(READ8(mc8030_state, zve_port_b_r))
//MCFG_Z80PIO_OUT_PB_CB(WRITE8(mc8030_state, zve_port_b_w))
- MCFG_DEVICE_ADD("zve_ctc", Z80CTC, XTAL_2_4576MHz)
+ MCFG_DEVICE_ADD("zve_ctc", Z80CTC, XTAL(2'457'600))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
// ZC0, ZC1, ZC2 for user
- MCFG_DEVICE_ADD("asp_pio", Z80PIO, XTAL_2_4576MHz)
+ MCFG_DEVICE_ADD("asp_pio", Z80PIO, XTAL(2'457'600))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(mc8030_state, asp_port_a_r))
//MCFG_Z80PIO_OUT_PA_CB(WRITE8(mc8030_state, asp_port_a_w))
MCFG_Z80PIO_IN_PB_CB(READ8(mc8030_state, asp_port_b_r))
//MCFG_Z80PIO_OUT_PB_CB(WRITE8(mc8030_state, asp_port_b_w))
- MCFG_DEVICE_ADD("asp_ctc", Z80CTC, XTAL_2_4576MHz)
+ MCFG_DEVICE_ADD("asp_ctc", Z80CTC, XTAL(2'457'600))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
// ZC0: to SIO CLK CH A
// ZC1: to SIO CLK CH B
diff --git a/src/mame/drivers/mcatadv.cpp b/src/mame/drivers/mcatadv.cpp
index b03ff79e43e..9abd192aa16 100644
--- a/src/mame/drivers/mcatadv.cpp
+++ b/src/mame/drivers/mcatadv.cpp
@@ -431,11 +431,11 @@ void mcatadv_state::machine_start()
MACHINE_CONFIG_START(mcatadv_state::mcatadv)
/* 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(mcatadv_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", mcatadv_state, irq1_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(mcatadv_sound_map)
MCFG_CPU_IO_MAP(mcatadv_sound_io_map)
@@ -464,7 +464,7 @@ MACHINE_CONFIG_START(mcatadv_state::mcatadv)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.32)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.32)
@@ -481,7 +481,7 @@ MACHINE_CONFIG_DERIVED(mcatadv_state::nost, mcatadv)
MCFG_DEVICE_REMOVE("lspeaker")
MCFG_DEVICE_REMOVE("rspeaker")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_REPLACE("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_SOUND_REPLACE("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.2)
MCFG_SOUND_ROUTE(1, "mono", 0.5)
diff --git a/src/mame/drivers/mccpm.cpp b/src/mame/drivers/mccpm.cpp
index 4393be8f8ea..f7c34e32f03 100644
--- a/src/mame/drivers/mccpm.cpp
+++ b/src/mame/drivers/mccpm.cpp
@@ -76,7 +76,7 @@ void mccpm_state::machine_reset()
MACHINE_CONFIG_START(mccpm_state::mccpm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(mccpm_mem)
MCFG_CPU_IO_MAP(mccpm_io)
@@ -85,7 +85,7 @@ MACHINE_CONFIG_START(mccpm_state::mccpm)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("sio", z80sio_device, txca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxca_w))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'000'000))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
@@ -95,7 +95,7 @@ MACHINE_CONFIG_START(mccpm_state::mccpm)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(4'000'000))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp
index e960ad6d577..f72bf246631 100644
--- a/src/mame/drivers/mcr3.cpp
+++ b/src/mame/drivers/mcr3.cpp
@@ -115,7 +115,7 @@
#include "turbotag.lh"
-#define MASTER_CLOCK XTAL_20MHz
+#define MASTER_CLOCK XTAL(20'000'000)
diff --git a/src/mame/drivers/meadows.cpp b/src/mame/drivers/meadows.cpp
index 5bf2b390c30..d7327b97843 100644
--- a/src/mame/drivers/meadows.cpp
+++ b/src/mame/drivers/meadows.cpp
@@ -128,7 +128,7 @@
#include "gypsyjug.lh"
#include "minferno.lh"
-#define MASTER_CLOCK XTAL_5MHz
+#define MASTER_CLOCK XTAL(5'000'000)
diff --git a/src/mame/drivers/megaplay.cpp b/src/mame/drivers/megaplay.cpp
index 05e869b74d7..927cfbbd3d7 100644
--- a/src/mame/drivers/megaplay.cpp
+++ b/src/mame/drivers/megaplay.cpp
@@ -692,7 +692,7 @@ MACHINE_CONFIG_START(mplay_state::megaplay)
/* New update functions to handle the extra layer */
MCFG_SCREEN_MODIFY("megadriv")
- MCFG_SCREEN_RAW_PARAMS(XTAL_10_738635MHz/2, \
+ MCFG_SCREEN_RAW_PARAMS(XTAL(10'738'635)/2, \
sega315_5124_device::WIDTH, sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH, sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256, \
sega315_5124_device::HEIGHT_NTSC, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT + 224)
MCFG_SCREEN_UPDATE_DRIVER(mplay_state, screen_update_megplay)
diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp
index 21bd1127edc..a04d54faf7d 100644
--- a/src/mame/drivers/megasys1.cpp
+++ b/src/mame/drivers/megasys1.cpp
@@ -128,12 +128,12 @@ RAM RW 0f0000-0f3fff 0e0000-0effff? <
#include "machine/jalcrpt.h"
#include "speaker.h"
-#define SYS_A_CPU_CLOCK (XTAL_12MHz / 2) /* clock for main 68000 */
-#define SYS_B_CPU_CLOCK XTAL_8MHz /* clock for main 68000 */
-#define SYS_C_CPU_CLOCK (XTAL_24MHz / 2) /* clock for main 68000 */
-#define SYS_D_CPU_CLOCK XTAL_8MHz /* clock for main 68000 */
-#define SOUND_CPU_CLOCK XTAL_7MHz /* clock for sound 68000 */
-#define OKI4_SOUND_CLOCK XTAL_4MHz
+#define SYS_A_CPU_CLOCK (XTAL(12'000'000) / 2) /* clock for main 68000 */
+#define SYS_B_CPU_CLOCK XTAL(8'000'000) /* clock for main 68000 */
+#define SYS_C_CPU_CLOCK (XTAL(24'000'000) / 2) /* clock for main 68000 */
+#define SYS_D_CPU_CLOCK XTAL(8'000'000) /* clock for main 68000 */
+#define SOUND_CPU_CLOCK XTAL(7'000'000) /* clock for sound 68000 */
+#define OKI4_SOUND_CLOCK XTAL(4'000'000)
MACHINE_RESET_MEMBER(megasys1_state,megasys1)
diff --git a/src/mame/drivers/megatech.cpp b/src/mame/drivers/megatech.cpp
index b9732856f8e..3fae3dcb2c2 100644
--- a/src/mame/drivers/megatech.cpp
+++ b/src/mame/drivers/megatech.cpp
@@ -698,7 +698,7 @@ MACHINE_CONFIG_START(mtech_state::megatech)
MCFG_DEFAULT_LAYOUT(layout_dualhovu)
MCFG_SCREEN_MODIFY("megadriv")
- MCFG_SCREEN_RAW_PARAMS(XTAL_10_738635MHz/2, \
+ MCFG_SCREEN_RAW_PARAMS(XTAL(10'738'635)/2, \
sega315_5124_device::WIDTH , sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH, sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256, \
sega315_5124_device::HEIGHT_NTSC, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT + 224)
MCFG_SCREEN_UPDATE_DRIVER(mtech_state, screen_update_main)
@@ -709,7 +709,7 @@ MACHINE_CONFIG_START(mtech_state::megatech)
MCFG_SCREEN_ADD("menu", RASTER)
// check frq
- MCFG_SCREEN_RAW_PARAMS(XTAL_10_738635MHz/2, \
+ MCFG_SCREEN_RAW_PARAMS(XTAL(10'738'635)/2, \
sega315_5124_device::WIDTH , sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH, sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256, \
sega315_5124_device::HEIGHT_NTSC, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT + 224)
MCFG_SCREEN_UPDATE_DRIVER(mtech_state, screen_update_menu)
diff --git a/src/mame/drivers/megazone.cpp b/src/mame/drivers/megazone.cpp
index 9601567ab3f..1eaa6f53a32 100644
--- a/src/mame/drivers/megazone.cpp
+++ b/src/mame/drivers/megazone.cpp
@@ -292,16 +292,16 @@ INTERRUPT_GEN_MEMBER(megazone_state::vblank_irq)
MACHINE_CONFIG_START(megazone_state::megazone)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI1, XTAL_18_432MHz/9) /* 2.048 MHz */
+ MCFG_CPU_ADD("maincpu", KONAMI1, XTAL(18'432'000)/9) /* 2.048 MHz */
MCFG_CPU_PROGRAM_MAP(megazone_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", megazone_state, vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6) /* Z80 Clock is derived from the H1 signal */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* Z80 Clock is derived from the H1 signal */
MCFG_CPU_PROGRAM_MAP(megazone_sound_map)
MCFG_CPU_IO_MAP(megazone_sound_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", megazone_state, irq0_line_hold)
- MCFG_CPU_ADD("daccpu", I8039, XTAL_14_31818MHz/2) /* 7.15909MHz */
+ MCFG_CPU_ADD("daccpu", I8039, XTAL(14'318'181)/2) /* 7.15909MHz */
MCFG_CPU_PROGRAM_MAP(megazone_i8039_map)
MCFG_CPU_IO_MAP(megazone_i8039_io_map)
MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("dac", dac_byte_interface, write))
@@ -336,7 +336,7 @@ MACHINE_CONFIG_START(megazone_state::megazone)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(14'318'181)/8)
MCFG_AY8910_PORT_A_READ_CB(READ8(megazone_state, megazone_port_a_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(megazone_state, megazone_port_b_w))
MCFG_SOUND_ROUTE(0, "filter.0.0", 0.30)
diff --git a/src/mame/drivers/mephisto_montec.cpp b/src/mame/drivers/mephisto_montec.cpp
index 6e317b6ce2b..491f59aefec 100644
--- a/src/mame/drivers/mephisto_montec.cpp
+++ b/src/mame/drivers/mephisto_montec.cpp
@@ -441,9 +441,9 @@ static INPUT_PORTS_START( smondial2 )
INPUT_PORTS_END
MACHINE_CONFIG_START(mephisto_montec_state::montec)
- MCFG_CPU_ADD("maincpu", M65C02, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", M65C02, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP( montec_mem )
- MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_assert, (double)XTAL_4MHz / (1 << 13))
+ MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_assert, XTAL(4'000'000) / (1 << 13))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -458,14 +458,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(mephisto_montec_state::monteciv, montec)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL_8MHz )
+ MCFG_CPU_CLOCK( XTAL(8'000'000) )
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(mephisto_montec_state::megaiv, montec)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL_4_9152MHz )
+ MCFG_CPU_CLOCK( XTAL(4'915'200) )
MCFG_CPU_PROGRAM_MAP(megaiv_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, (double)XTAL_4_9152MHz / (1 << 13))
+ MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, XTAL(4'915'200) / (1 << 13))
MCFG_DEVICE_REMOVE("board")
MCFG_MEPHISTO_BUTTONS_BOARD_ADD("board")
@@ -475,9 +475,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(mephisto_montec_state::mondial2, megaiv)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL_2MHz )
+ MCFG_CPU_CLOCK( XTAL(2'000'000) )
MCFG_CPU_PROGRAM_MAP(mondial2_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, (double)XTAL_2MHz / (1 << 12))
+ MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, XTAL(2'000'000) / (1 << 12))
MCFG_TIMER_DRIVER_ADD_PERIODIC("refresh_leds", mephisto_montec_state, refresh_leds, attotime::from_hz(10))
MCFG_DEFAULT_LAYOUT(layout_mephisto_mondial2)
@@ -485,9 +485,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(mephisto_montec_state::smondial, megaiv)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL_4MHz )
+ MCFG_CPU_CLOCK( XTAL(4'000'000) )
MCFG_CPU_PROGRAM_MAP(smondial_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, (double)XTAL_4MHz / (1 << 13))
+ MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, XTAL(4'000'000) / (1 << 13))
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(mephisto_montec_state::smondial2, smondial)
diff --git a/src/mame/drivers/mephistp.cpp b/src/mame/drivers/mephistp.cpp
index 6aadcc10f75..3807f15da2c 100644
--- a/src/mame/drivers/mephistp.cpp
+++ b/src/mame/drivers/mephistp.cpp
@@ -157,29 +157,29 @@ void mephisto_pinball_state::machine_reset()
MACHINE_CONFIG_START(mephisto_pinball_state::mephisto)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, XTAL_18MHz/3)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(18'000'000)/3)
MCFG_CPU_PROGRAM_MAP(mephisto_map)
//MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("muart", i8256_device, inta_cb)
MCFG_NVRAM_ADD_0FILL("nvram")
- //MCFG_DEVICE_ADD("muart", I8256, XTAL_18MHz/3)
+ //MCFG_DEVICE_ADD("muart", I8256, XTAL(18'000'000)/3)
//MCFG_I8256_IRQ_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
//MCFG_I8256_TXD_HANDLER(INPUTLINE("audiocpu", MCS51_RX_LINE))
- MCFG_DEVICE_ADD("ic20", I8155, XTAL_18MHz/6)
+ MCFG_DEVICE_ADD("ic20", I8155, XTAL(18'000'000)/6)
//MCFG_I8155_OUT_TIMEROUT_CB(DEVWRITELINE("muart", i8256_device, write_txc))
- MCFG_DEVICE_ADD("ic9", I8155, XTAL_18MHz/6)
+ MCFG_DEVICE_ADD("ic9", I8155, XTAL(18'000'000)/6)
//MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(mephisto_pinball_state, clk_shift_w))
- MCFG_CPU_ADD("soundcpu", I8051, XTAL_12MHz)
+ MCFG_CPU_ADD("soundcpu", I8051, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(mephisto_8051_map)
MCFG_CPU_IO_MAP(mephisto_8051_io)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(12'000'000)/8)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(mephisto_pinball_state, ay8910_columns_w))
MCFG_AY8910_PORT_B_READ_CB(READ8(mephisto_pinball_state, ay8910_inputs_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
@@ -195,7 +195,7 @@ static MACHINE_CONFIG_DERIVED(sport2k, mephisto)
MCFG_CPU_MODIFY("soundcpu")
MCFG_CPU_IO_MAP(sport2k_8051_io)
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_14_31818MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
#endif
diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp
index f4e179ac9f7..8a9afad9a5d 100644
--- a/src/mame/drivers/merit.cpp
+++ b/src/mame/drivers/merit.cpp
@@ -77,7 +77,7 @@ Merit Riviera Notes - There are several known versions:
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK (XTAL_10MHz)
+#define MASTER_CLOCK (XTAL(10'000'000))
#define CPU_CLOCK (MASTER_CLOCK / 4)
#define PIXEL_CLOCK (MASTER_CLOCK / 1)
#define CRTC_CLOCK (MASTER_CLOCK / 8)
diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp
index dc5f4d850bb..fb3c061934f 100644
--- a/src/mame/drivers/meritm.cpp
+++ b/src/mame/drivers/meritm.cpp
@@ -274,8 +274,8 @@ public:
};
-#define SYSTEM_CLK XTAL_21_4772MHz
-#define UART_CLK XTAL_1_8432MHz // standard 8250 clock
+#define SYSTEM_CLK XTAL(21'477'272)
+#define UART_CLK XTAL(1'843'200) // standard 8250 clock
/*************************************
diff --git a/src/mame/drivers/mes.cpp b/src/mame/drivers/mes.cpp
index 7321ff172aa..805f73b2769 100644
--- a/src/mame/drivers/mes.cpp
+++ b/src/mame/drivers/mes.cpp
@@ -126,7 +126,7 @@ void mes_state::kbd_put(u8 data)
MACHINE_CONFIG_START(mes_state::mes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/metalmx.cpp b/src/mame/drivers/metalmx.cpp
index 136afb5b19d..2499102b939 100644
--- a/src/mame/drivers/metalmx.cpp
+++ b/src/mame/drivers/metalmx.cpp
@@ -687,10 +687,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(metalmx_state::metalmx)
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_14_31818MHz)
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(14'318'181))
MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("adsp", ADSP2105, XTAL_10MHz)
+ MCFG_CPU_ADD("adsp", ADSP2105, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(adsp_program_map)
MCFG_CPU_DATA_MAP(adsp_data_map)
diff --git a/src/mame/drivers/metlfrzr.cpp b/src/mame/drivers/metlfrzr.cpp
index 53b5c24270c..2bb6489a069 100644
--- a/src/mame/drivers/metlfrzr.cpp
+++ b/src/mame/drivers/metlfrzr.cpp
@@ -361,7 +361,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(metlfrzr_state::scanline)
MACHINE_CONFIG_START(metlfrzr_state::metlfrzr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(metlfrzr_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", metlfrzr_state, scanline, "screen", 0, 1)
@@ -386,7 +386,7 @@ MACHINE_CONFIG_START(metlfrzr_state::metlfrzr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz / 4) /* 3.579545 MHz */
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181) / 4) /* 3.579545 MHz */
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("t5182", t5182_device, ym2151_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp
index d10ea8175b1..dd2847b3de6 100644
--- a/src/mame/drivers/metro.cpp
+++ b/src/mame/drivers/metro.cpp
@@ -3038,7 +3038,7 @@ void metro_state::machine_start()
}
MACHINE_CONFIG_START(metro_state::i4100_config)
- MCFG_DEVICE_ADD("vdp", I4100, XTAL_26_666MHz)
+ MCFG_DEVICE_ADD("vdp", I4100, XTAL(26'666'000))
MCFG_I4100_GFXDECODE("gfxdecode")
MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(metro_state,vdp_blit_end_w))
@@ -3054,7 +3054,7 @@ MACHINE_CONFIG_START(metro_state::i4100_config)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::i4220_config)
- MCFG_DEVICE_ADD("vdp2", I4220, XTAL_26_666MHz)
+ MCFG_DEVICE_ADD("vdp2", I4220, XTAL(26'666'000))
MCFG_I4100_GFXDECODE("gfxdecode")
MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(metro_state,vdp_blit_end_w))
@@ -3070,7 +3070,7 @@ MACHINE_CONFIG_START(metro_state::i4220_config)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::i4300_config)
- MCFG_DEVICE_ADD("vdp3", I4300, XTAL_26_666MHz)
+ MCFG_DEVICE_ADD("vdp3", I4300, XTAL(26'666'000))
MCFG_I4100_GFXDECODE("gfxdecode")
MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(metro_state,vdp_blit_end_w))
@@ -3130,7 +3130,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::msgogo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(msgogo_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt) // timing is off, shaking sprites in intro
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 60) // ?
@@ -3189,7 +3189,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::metro_upd7810_sound)
- MCFG_CPU_ADD("audiocpu", UPD7810, XTAL_24MHz/2)
+ MCFG_CPU_ADD("audiocpu", UPD7810, XTAL(24'000'000)/2)
MCFG_UPD7810_RXD(READLINE(metro_state, metro_rxd_r))
MCFG_CPU_PROGRAM_MAP(metro_sound_map)
MCFG_UPD7810_PORTA_READ_CB(READ8(metro_state, metro_porta_r))
@@ -3199,7 +3199,7 @@ MACHINE_CONFIG_START(metro_state::metro_upd7810_sound)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::daitorid_upd7810_sound)
- MCFG_CPU_ADD("audiocpu", UPD7810, XTAL_12MHz)
+ MCFG_CPU_ADD("audiocpu", UPD7810, XTAL(12'000'000))
MCFG_UPD7810_RXD(READLINE(metro_state, metro_rxd_r))
MCFG_CPU_PROGRAM_MAP(metro_sound_map)
MCFG_UPD7810_PORTA_READ_CB(READ8(metro_state, metro_porta_r))
@@ -3212,7 +3212,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::daitorid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2)
MCFG_CPU_PROGRAM_MAP(daitorid_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
@@ -3229,7 +3229,7 @@ MACHINE_CONFIG_START(metro_state::daitorid)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", UPD7810_INTF2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -3241,7 +3241,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::dharma)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
MCFG_CPU_PROGRAM_MAP(dharma_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
@@ -3256,17 +3256,17 @@ MACHINE_CONFIG_START(metro_state::dharma)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // sample rate = M6295 clock / 132
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000)/20, PIN7_HIGH) // sample rate = M6295 clock / 132
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::karatour)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
MCFG_CPU_PROGRAM_MAP(karatour_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, karatour_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
@@ -3281,10 +3281,10 @@ MACHINE_CONFIG_START(metro_state::karatour)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000)/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3292,7 +3292,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::_3kokushi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
MCFG_CPU_PROGRAM_MAP(kokushi_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, karatour_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
@@ -3307,10 +3307,10 @@ MACHINE_CONFIG_START(metro_state::_3kokushi)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000)/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3318,7 +3318,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::lastfort)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
MCFG_CPU_PROGRAM_MAP(lastfort_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
@@ -3333,17 +3333,17 @@ MACHINE_CONFIG_START(metro_state::lastfort)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_LOW) // sample rate = M6295 clock / 165
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000)/20, PIN7_LOW) // sample rate = M6295 clock / 165
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::lastforg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
MCFG_CPU_PROGRAM_MAP(lastforg_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, karatour_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
@@ -3357,17 +3357,17 @@ MACHINE_CONFIG_START(metro_state::lastforg)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000)/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::dokyusei)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(dokyusei_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
@@ -3381,14 +3381,14 @@ MACHINE_CONFIG_START(metro_state::dokyusei)
MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::dokyusp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2)
MCFG_CPU_PROGRAM_MAP(dokyusp_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
@@ -3406,7 +3406,7 @@ MACHINE_CONFIG_START(metro_state::dokyusp)
MCFG_OKIM6295_ADD("oki", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3432,7 +3432,7 @@ MACHINE_CONFIG_START(metro_state::gakusai)
MCFG_OKIM6295_ADD("oki", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00)
MACHINE_CONFIG_END
@@ -3458,7 +3458,7 @@ MACHINE_CONFIG_START(metro_state::gakusai2)
MCFG_OKIM6295_ADD("oki", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00)
MACHINE_CONFIG_END
@@ -3466,7 +3466,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::pangpoms)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
MCFG_CPU_PROGRAM_MAP(pangpoms_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
@@ -3481,10 +3481,10 @@ MACHINE_CONFIG_START(metro_state::pangpoms)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000)/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3492,7 +3492,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::poitto)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
MCFG_CPU_PROGRAM_MAP(poitto_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
@@ -3507,10 +3507,10 @@ MACHINE_CONFIG_START(metro_state::poitto)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000)/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3518,7 +3518,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::pururun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* Not confirmed */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* Not confirmed */
MCFG_CPU_PROGRAM_MAP(pururun_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
@@ -3533,11 +3533,11 @@ MACHINE_CONFIG_START(metro_state::pururun)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* Confirmed match to reference video */
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* Confirmed match to reference video */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", UPD7810_INTF2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_3_579545MHz/3, PIN7_HIGH) // sample rate = M6295 clock / 132
+ MCFG_OKIM6295_ADD("oki", XTAL(3'579'545)/3, PIN7_HIGH) // sample rate = M6295 clock / 132
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -3545,7 +3545,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::skyalert)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
MCFG_CPU_PROGRAM_MAP(skyalert_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
@@ -3560,10 +3560,10 @@ MACHINE_CONFIG_START(metro_state::skyalert)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_LOW) // sample rate = M6295 clock / 165
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000)/20, PIN7_LOW) // sample rate = M6295 clock / 165
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3571,7 +3571,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::toride2g)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
MCFG_CPU_PROGRAM_MAP(toride2g_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
@@ -3586,10 +3586,10 @@ MACHINE_CONFIG_START(metro_state::toride2g)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000)/20, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3597,7 +3597,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::mouja)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(mouja_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
@@ -3609,11 +3609,11 @@ MACHINE_CONFIG_START(metro_state::mouja)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/1024*132, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/1024*132, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(0, mouja_okimap)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -3621,7 +3621,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::vmetal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(vmetal_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
@@ -3636,7 +3636,7 @@ MACHINE_CONFIG_START(metro_state::vmetal)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_ES8712_ADD("essnd", 12000)
@@ -3650,17 +3650,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::blzntrnd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(blzntrnd_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, karatour_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/2)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/2)
MCFG_CPU_PROGRAM_MAP(blzntrnd_sound_map)
MCFG_CPU_IO_MAP(blzntrnd_sound_io_map)
/* video hardware */
- MCFG_DEVICE_ADD("vdp2", I4220, XTAL_26_666MHz)
+ MCFG_DEVICE_ADD("vdp2", I4220, XTAL(26'666'000))
MCFG_I4100_GFXDECODE("gfxdecode")
MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(metro_state,vdp_blit_end_w))
@@ -3684,7 +3684,7 @@ MACHINE_CONFIG_START(metro_state::blzntrnd)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2)
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -3706,7 +3706,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::puzzlet)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83007, XTAL_20MHz) // H8/3007 - Hitachi HD6413007F20 CPU. Clock 20MHz
+ MCFG_CPU_ADD("maincpu", H83007, XTAL(20'000'000)) // H8/3007 - Hitachi HD6413007F20 CPU. Clock 20MHz
MCFG_CPU_PROGRAM_MAP(puzzlet_map)
MCFG_CPU_IO_MAP(puzzlet_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, puzzlet_interrupt)
@@ -3725,10 +3725,10 @@ MACHINE_CONFIG_START(metro_state::puzzlet)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_20MHz/5, PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", XTAL(20'000'000)/5, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_20MHz/5)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(20'000'000)/5)
MCFG_SOUND_ROUTE(0, "mono", 0.90)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/meyc8080.cpp b/src/mame/drivers/meyc8080.cpp
index e3712d1c417..89183aa8457 100644
--- a/src/mame/drivers/meyc8080.cpp
+++ b/src/mame/drivers/meyc8080.cpp
@@ -583,7 +583,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(meyc8080_state::meyc8080)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_20MHz / 10) // divider guessed
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(20'000'000) / 10) // divider guessed
MCFG_CPU_PROGRAM_MAP(meyc8080_map)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/meyc8088.cpp b/src/mame/drivers/meyc8088.cpp
index 8bbc63e3c37..3fe66266de9 100644
--- a/src/mame/drivers/meyc8088.cpp
+++ b/src/mame/drivers/meyc8088.cpp
@@ -348,17 +348,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(meyc8088_state::meyc8088)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, (XTAL_15MHz / 3) * 0.95) // NOTE: underclocked to prevent errors on diagnostics, MAME i8088 cycle timing is probably inaccurate
+ MCFG_CPU_ADD("maincpu", I8088, (XTAL(15'000'000) / 3) * 0.95) // NOTE: underclocked to prevent errors on diagnostics, MAME i8088 cycle timing is probably inaccurate
MCFG_CPU_PROGRAM_MAP(meyc8088_map)
- MCFG_DEVICE_ADD("i8155_1", I8155, XTAL_15MHz / (3*1))
+ MCFG_DEVICE_ADD("i8155_1", I8155, XTAL(15'000'000) / (3*1))
// all ports set to input
MCFG_I8155_IN_PORTA_CB(READ8(meyc8088_state, meyc8088_input_r))
MCFG_I8155_IN_PORTB_CB(IOPORT("SW"))
MCFG_I8155_IN_PORTC_CB(READ8(meyc8088_state, meyc8088_status_r))
// i8251A trigger txc/rxc (debug related, unpopulated on sold boards)
- MCFG_DEVICE_ADD("i8155_2", I8155, XTAL_15MHz / (3*32))
+ MCFG_DEVICE_ADD("i8155_2", I8155, XTAL(15'000'000) / (3*32))
// all ports set to output
MCFG_I8155_OUT_PORTA_CB(WRITE8(meyc8088_state, meyc8088_lights2_w))
MCFG_I8155_OUT_PORTB_CB(WRITE8(meyc8088_state, meyc8088_lights1_w))
@@ -371,7 +371,7 @@ MACHINE_CONFIG_START(meyc8088_state::meyc8088)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_15MHz/3, 320, 0, 256, 261, 0, 224)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(15'000'000)/3, 320, 0, 256, 261, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(meyc8088_state, screen_update_meyc8088)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(meyc8088_state, screen_vblank_meyc8088))
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/mfabfz.cpp b/src/mame/drivers/mfabfz.cpp
index cd14a902002..249266a239d 100644
--- a/src/mame/drivers/mfabfz.cpp
+++ b/src/mame/drivers/mfabfz.cpp
@@ -97,7 +97,7 @@ void mfabfz_state::machine_reset()
MACHINE_CONFIG_START(mfabfz_state::mfabfz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL_4MHz / 2)
+ MCFG_CPU_ADD("maincpu",I8085A, XTAL(4'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(mfabfz_mem)
MCFG_CPU_IO_MAP(mfabfz_io)
@@ -131,7 +131,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(mfabfz_state::mfabfz85)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL_4MHz / 2)
+ MCFG_CPU_ADD("maincpu",I8085A, XTAL(4'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(mfabfz_mem)
MCFG_CPU_IO_MAP(mfabfz85_io)
MCFG_I8085A_SID(DEVREADLINE("rs232", rs232_port_device, rxd_r))
diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp
index 33dbe4f012a..6ed1136deb8 100644
--- a/src/mame/drivers/mgames.cpp
+++ b/src/mame/drivers/mgames.cpp
@@ -212,7 +212,7 @@
**********************************************************************************/
-#define MASTER_CLOCK XTAL_18MHz
+#define MASTER_CLOCK XTAL(18'000'000)
#include "emu.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp
index 62e528e923a..c70bd2b1dd3 100644
--- a/src/mame/drivers/mgavegas.cpp
+++ b/src/mame/drivers/mgavegas.cpp
@@ -43,7 +43,7 @@ Ver. 2.2 should exist
/****************************
* Clock defines *
****************************/
-#define MAIN_XTAL XTAL_8MHz
+#define MAIN_XTAL XTAL(8'000'000)
#define CPU_CLK MAIN_XTAL/2
#define AY_CLK CPU_CLK/2
#define MSM_CLK 384000
diff --git a/src/mame/drivers/mice.cpp b/src/mame/drivers/mice.cpp
index a8fa9f8400a..1a47b5f37f8 100644
--- a/src/mame/drivers/mice.cpp
+++ b/src/mame/drivers/mice.cpp
@@ -155,11 +155,11 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(mice_state::mice)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'144'000))
MCFG_CPU_PROGRAM_MAP(mice_mem)
MCFG_CPU_IO_MAP(mice_io)
- MCFG_DEVICE_ADD("uart", I8251, XTAL_6_144MHz / 2)
+ MCFG_DEVICE_ADD("uart", I8251, XTAL(6'144'000) / 2)
MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -172,7 +172,7 @@ MACHINE_CONFIG_START(mice_state::mice)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", i8251_device, write_cts))
MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", mice_terminal)
- MCFG_DEVICE_ADD("rpt", I8155, XTAL_6_144MHz / 2)
+ MCFG_DEVICE_ADD("rpt", I8155, XTAL(6'144'000) / 2)
MCFG_I8155_IN_PORTC_CB(IOPORT("BAUD"))
MCFG_I8155_OUT_TIMEROUT_CB(DEVWRITELINE("uart", i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp
index e918cd662dd..23c6a5801c8 100644
--- a/src/mame/drivers/micral.cpp
+++ b/src/mame/drivers/micral.cpp
@@ -369,10 +369,10 @@ MACHINE_RESET_MEMBER( micral_state, micral )
MACHINE_CONFIG_START(micral_state::micral)
// basic machine hardware
- MCFG_CPU_ADD( "maincpu", Z80, XTAL_4MHz )
+ MCFG_CPU_ADD( "maincpu", Z80, XTAL(4'000'000) )
MCFG_CPU_PROGRAM_MAP(mem_map)
// no i/o ports on main cpu
- MCFG_CPU_ADD( "keyboard", Z80, XTAL_1MHz ) // freq unknown
+ MCFG_CPU_ADD( "keyboard", Z80, XTAL(1'000'000) ) // freq unknown
MCFG_CPU_PROGRAM_MAP(mem_kbd)
MCFG_CPU_IO_MAP(io_kbd)
diff --git a/src/mame/drivers/micro20.cpp b/src/mame/drivers/micro20.cpp
index 29c6ec77748..6b3dd1f2337 100644
--- a/src/mame/drivers/micro20.cpp
+++ b/src/mame/drivers/micro20.cpp
@@ -154,26 +154,26 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(micro20_state::micro20)
/* basic machine hardware */
- MCFG_CPU_ADD(MAINCPU_TAG, M68020, XTAL_16_67MHz)
+ MCFG_CPU_ADD(MAINCPU_TAG, M68020, XTAL(16'670'000))
MCFG_CPU_PROGRAM_MAP(micro20_map)
- MCFG_DEVICE_ADD(DUART_A_TAG, MC68681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD(DUART_A_TAG, MC68681, XTAL(3'686'400))
MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(DUART_A_TAG, mc68681_device, rx_a_w))
- MCFG_DEVICE_ADD(DUART_B_TAG, MC68681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD(DUART_B_TAG, MC68681, XTAL(3'686'400))
- MCFG_WD1772_ADD(FDC_TAG, XTAL_16_67MHz / 2)
+ MCFG_WD1772_ADD(FDC_TAG, XTAL(16'670'000) / 2)
- MCFG_DEVICE_ADD(PIT_TAG, PIT68230, XTAL_16_67MHz / 2)
+ MCFG_DEVICE_ADD(PIT_TAG, PIT68230, XTAL(16'670'000) / 2)
MCFG_PIT68230_TIMER_IRQ_CB(WRITELINE(micro20_state, timerirq_w))
MCFG_PIT68230_H4_CB(WRITELINE(micro20_state, h4_w))
MCFG_PIT68230_PB_OUTPUT_CB(WRITE8(micro20_state, portb_w))
MCFG_PIT68230_PC_OUTPUT_CB(WRITE8(micro20_state, portc_w))
- MCFG_DEVICE_ADD(RTC_TAG, MSM58321, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(RTC_TAG, MSM58321, XTAL(32'768))
MCFG_MSM58321_DEFAULT_24H(false)
MCFG_MSM58321_D0_HANDLER(DEVWRITELINE(PIT_TAG, pit68230_device, pb0_w))
MCFG_MSM58321_D1_HANDLER(DEVWRITELINE(PIT_TAG, pit68230_device, pb1_w))
diff --git a/src/mame/drivers/micro3d.cpp b/src/mame/drivers/micro3d.cpp
index 7e2e9be25a9..fd353051a0c 100644
--- a/src/mame/drivers/micro3d.cpp
+++ b/src/mame/drivers/micro3d.cpp
@@ -297,37 +297,37 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(micro3d_state::micro3d)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(hostmem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", micro3d_state, micro3d_vblank)
- MCFG_CPU_ADD("vgb", TMS34010, XTAL_40MHz)
+ MCFG_CPU_ADD("vgb", TMS34010, XTAL(40'000'000))
MCFG_CPU_PROGRAM_MAP(vgbmem)
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
- MCFG_TMS340X0_PIXEL_CLOCK(XTAL_40MHz / 8) /* pixel clock */
+ MCFG_TMS340X0_PIXEL_CLOCK(XTAL(40'000'000) / 8) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(4) /* pixels per clock */
MCFG_TMS340X0_SCANLINE_IND16_CB(micro3d_state, scanline_update) /* scanline updater (indexed16) */
MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(micro3d_state, tms_interrupt))
- MCFG_CPU_ADD("drmath", AM29000, XTAL_32MHz / 2)
+ MCFG_CPU_ADD("drmath", AM29000, XTAL(32'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(drmath_prg)
MCFG_CPU_DATA_MAP(drmath_data)
- MCFG_SCC8530_ADD("scc", XTAL_32MHz / 2 / 2, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD("scc", XTAL(32'000'000) / 2 / 2, 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE("monitor_drmath", rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD("monitor_drmath", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("scc", z80scc_device, rxb_w))
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("scc", z80scc_device, dcdb_w)) MCFG_DEVCB_XOR(1)
- MCFG_CPU_ADD("audiocpu", I8051, XTAL_11_0592MHz)
+ MCFG_CPU_ADD("audiocpu", I8051, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(soundmem_prg)
MCFG_CPU_IO_MAP(soundmem_io)
MCFG_MCS51_SERIAL_TX_CB(WRITE8(micro3d_state, data_from_i8031))
MCFG_MCS51_SERIAL_RX_CB(READ8(micro3d_state, data_to_i8031))
- MCFG_DEVICE_ADD("duart", MC68681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart", MC68681, XTAL(3'686'400))
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(micro3d_state, duart_irq_handler))
MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("monitor_host", rs232_port_device, write_txd))
MCFG_MC68681_B_TX_CALLBACK(WRITELINE(micro3d_state, duart_txb))
@@ -350,11 +350,11 @@ MACHINE_CONFIG_START(micro3d_state::micro3d)
MCFG_PALETTE_FORMAT(BBBBBRRRRRGGGGGx)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz/8*4, 192*4, 0, 144*4, 434, 0, 400)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(40'000'000)/8*4, 192*4, 0, 144*4, 434, 0, 400)
MCFG_SCREEN_UPDATE_DEVICE("vgb", tms34010_device, tms340x0_ind16)
MCFG_SCREEN_PALETTE("palette")
- MCFG_DEVICE_ADD("uart", MC2661, XTAL_40MHz / 8) // actually SCN2651
+ MCFG_DEVICE_ADD("uart", MC2661, XTAL(40'000'000) / 8) // actually SCN2651
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("monitor_vgb", rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD("monitor_vgb", default_rs232_devices, nullptr)
@@ -371,11 +371,11 @@ MACHINE_CONFIG_START(micro3d_state::micro3d)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("upd7759", UPD7759, XTAL_640kHz)
+ MCFG_SOUND_ADD("upd7759", UPD7759, XTAL(640'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
- MCFG_YM2151_ADD("ym2151", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ym2151", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
diff --git a/src/mame/drivers/microdec.cpp b/src/mame/drivers/microdec.cpp
index 6ba4162ed72..cf9b3a825d4 100644
--- a/src/mame/drivers/microdec.cpp
+++ b/src/mame/drivers/microdec.cpp
@@ -184,7 +184,7 @@ DRIVER_INIT_MEMBER( microdec_state, microdec )
MACHINE_CONFIG_START(microdec_state::microdec)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(microdec_mem)
MCFG_CPU_IO_MAP(microdec_io)
diff --git a/src/mame/drivers/micronic.cpp b/src/mame/drivers/micronic.cpp
index c88b019d83b..5d154c9b197 100644
--- a/src/mame/drivers/micronic.cpp
+++ b/src/mame/drivers/micronic.cpp
@@ -350,7 +350,7 @@ WRITE_LINE_MEMBER( micronic_state::mc146818_irq )
MACHINE_CONFIG_START(micronic_state::micronic)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(micronic_mem)
MCFG_CPU_IO_MAP(micronic_io)
@@ -367,7 +367,7 @@ MACHINE_CONFIG_START(micronic_state::micronic)
MCFG_PALETTE_ADD("palette", 2)
MCFG_PALETTE_INIT_OWNER(micronic_state, micronic)
- MCFG_DEVICE_ADD(HD61830_TAG, HD61830, XTAL_4_9152MHz/2/2)
+ MCFG_DEVICE_ADD(HD61830_TAG, HD61830, XTAL(4'915'200)/2/2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
@@ -381,7 +381,7 @@ MACHINE_CONFIG_START(micronic_state::micronic)
MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram1", micronic_state, nvram_init) // base ram
MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram2", micronic_state, nvram_init) // additional ram banks
- MCFG_MC146818_ADD( MC146818_TAG, XTAL_32_768kHz )
+ MCFG_MC146818_ADD( MC146818_TAG, XTAL(32'768) )
MCFG_MC146818_IRQ_HANDLER(WRITELINE(micronic_state, mc146818_irq))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/micropin.cpp b/src/mame/drivers/micropin.cpp
index 5c8b7b8945c..6bd213e7407 100644
--- a/src/mame/drivers/micropin.cpp
+++ b/src/mame/drivers/micropin.cpp
@@ -288,7 +288,7 @@ DRIVER_INIT_MEMBER( micropin_state, micropin )
MACHINE_CONFIG_START(micropin_state::micropin)
/* basic machine hardware */
- MCFG_CPU_ADD("v1cpu", M6800, XTAL_2MHz / 2)
+ MCFG_CPU_ADD("v1cpu", M6800, XTAL(2'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(micropin_map)
MCFG_CPU_PERIODIC_INT_DRIVER(micropin_state, irq0_line_hold, 500)
diff --git a/src/mame/drivers/microtan.cpp b/src/mame/drivers/microtan.cpp
index ccb6d5201bf..b33cdf34c1f 100644
--- a/src/mame/drivers/microtan.cpp
+++ b/src/mame/drivers/microtan.cpp
@@ -211,7 +211,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(microtan_state::microtan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_6MHz / 8) // 750 kHz
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(6'000'000) / 8) // 750 kHz
MCFG_CPU_PROGRAM_MAP(microtan_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", microtan_state, microtan_interrupt)
@@ -247,10 +247,10 @@ MACHINE_CONFIG_START(microtan_state::microtan)
/* acia */
MCFG_DEVICE_ADD("acia", MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
/* via */
- MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL_6MHz / 8)
+ MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL(6'000'000) / 8)
MCFG_VIA6522_READPA_HANDLER(READ8(microtan_state, via_0_in_a))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(microtan_state, via_0_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(microtan_state, via_0_out_b))
@@ -258,7 +258,7 @@ MACHINE_CONFIG_START(microtan_state::microtan)
MCFG_VIA6522_CB2_HANDLER(WRITELINE(microtan_state, via_0_out_cb2))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(microtan_state, via_0_irq))
- MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL_6MHz / 8)
+ MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL(6'000'000) / 8)
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(microtan_state, via_1_out_a))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(microtan_state, via_1_out_b))
MCFG_VIA6522_CA2_HANDLER(WRITELINE(microtan_state, via_1_out_ca2))
diff --git a/src/mame/drivers/microterm.cpp b/src/mame/drivers/microterm.cpp
index e44b1058995..281d6361608 100644
--- a/src/mame/drivers/microterm.cpp
+++ b/src/mame/drivers/microterm.cpp
@@ -87,24 +87,24 @@ MACHINE_CONFIG_START(microterm_state::mt420)
MCFG_CPU_PROGRAM_MAP(mt420_mem_map)
MCFG_CPU_IO_MAP(mt420_io_map)
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_3_6864MHz) // MC2681
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400)) // MC2681
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", 0))
MCFG_MC68681_OUTPORT_CALLBACK(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(5)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(3)
- MCFG_DEVICE_ADD("aci", MC2661, XTAL_3_6864MHz) // SCN2641
+ MCFG_DEVICE_ADD("aci", MC2661, XTAL(3'686'400)) // SCN2641
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_EEPROM_SERIAL_DO_CALLBACK(DEVWRITELINE("duart", scn2681_device, ip6_w))
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_9_87768MHz, 612, 0, 480, 269, 0, 250)
- //MCFG_SCREEN_RAW_PARAMS(XTAL_15_30072MHz, 948, 0, 792, 269, 0, 250)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(9'877'680), 612, 0, 480, 269, 0, 250)
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(15'300'720), 948, 0, 792, 269, 0, 250)
MCFG_SCREEN_UPDATE_DEVICE("avdc", scn2674_device, screen_update)
- MCFG_DEVICE_ADD("avdc", SCN2674, XTAL_9_87768MHz / 6)
- //MCFG_DEVICE_CLOCK(XTAL_15_30072MHz / 6)
+ MCFG_DEVICE_ADD("avdc", SCN2674, XTAL(9'877'680) / 6)
+ //MCFG_DEVICE_CLOCK(XTAL(15'300'720) / 6)
MCFG_SCN2674_TEXT_CHARACTER_WIDTH(6)
MCFG_SCN2674_GFX_CHARACTER_WIDTH(6)
MCFG_SCN2674_DRAW_CHARACTER_CALLBACK_OWNER(microterm_state, draw_character)
@@ -113,11 +113,11 @@ MACHINE_CONFIG_START(microterm_state::mt420)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(microterm_state::mt5510)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_6MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(mt5510_mem_map)
MCFG_CPU_IO_MAP(mt5510_io_map)
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400))
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", 0))
MCFG_MC68681_OUTPORT_CALLBACK(DEVWRITELINE("eeprom1", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom2", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(5)
@@ -133,7 +133,7 @@ MACHINE_CONFIG_START(microterm_state::mt5510)
MCFG_EEPROM_SERIAL_DO_CALLBACK(DEVWRITELINE("duart", scn2681_device, ip5_w))
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_45_8304MHz / 2, 1120, 0, 960, 341, 0, 300) // wild guess at resolution
+ MCFG_SCREEN_RAW_PARAMS(XTAL(45'830'400) / 2, 1120, 0, 960, 341, 0, 300) // wild guess at resolution
MCFG_SCREEN_UPDATE_DRIVER(microterm_state, mt5510_update)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/midas.cpp b/src/mame/drivers/midas.cpp
index f276dc2a27d..a17c24061a6 100644
--- a/src/mame/drivers/midas.cpp
+++ b/src/mame/drivers/midas.cpp
@@ -627,7 +627,7 @@ WRITE_LINE_MEMBER(midas_state::screen_vblank_midas)
MACHINE_CONFIG_START(midas_state::livequiz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(livequiz_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", midas_state, irq1_line_hold)
@@ -647,7 +647,7 @@ MACHINE_CONFIG_START(midas_state::livequiz)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -655,7 +655,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(midas_state::hammer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(hammer_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", midas_state, irq1_line_hold)
@@ -680,7 +680,7 @@ MACHINE_CONFIG_START(midas_state::hammer)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/midyunit.cpp b/src/mame/drivers/midyunit.cpp
index 3ec66154f6f..0340e978216 100644
--- a/src/mame/drivers/midyunit.cpp
+++ b/src/mame/drivers/midyunit.cpp
@@ -123,13 +123,13 @@ Notes:
/* master clocks vary based on game */
-#define SLOW_MASTER_CLOCK XTAL_40MHz /* "slow" == smashtv, trog, hiimpact */
-#define FAST_MASTER_CLOCK XTAL_48MHz /* "fast" == narc, mk, totcarn, strkforc */
-#define FASTER_MASTER_CLOCK XTAL_50MHz /* "faster" == term2 */
+#define SLOW_MASTER_CLOCK XTAL(40'000'000) /* "slow" == smashtv, trog, hiimpact */
+#define FAST_MASTER_CLOCK XTAL(48'000'000) /* "fast" == narc, mk, totcarn, strkforc */
+#define FASTER_MASTER_CLOCK XTAL(50'000'000) /* "faster" == term2 */
/* pixel clocks are 48MHz (narc) or 24MHz (all others) regardless */
-#define MEDRES_PIXEL_CLOCK (XTAL_48MHz / 6)
-#define STDRES_PIXEL_CLOCK (XTAL_24MHz / 6)
+#define MEDRES_PIXEL_CLOCK (XTAL(48'000'000) / 6)
+#define STDRES_PIXEL_CLOCK (XTAL(24'000'000) / 6)
@@ -1257,7 +1257,7 @@ MACHINE_CONFIG_DERIVED(midyunit_state::mkyawdim, yunit_core)
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(yawdim_sound_map)
/* video hardware */
@@ -1269,7 +1269,7 @@ MACHINE_CONFIG_DERIVED(midyunit_state::mkyawdim, yunit_core)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_8MHz / 8, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(8'000'000) / 8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/midzeus.cpp b/src/mame/drivers/midzeus.cpp
index a7e4531a377..914e295f4b0 100644
--- a/src/mame/drivers/midzeus.cpp
+++ b/src/mame/drivers/midzeus.cpp
@@ -39,7 +39,7 @@ The Grid v1.2 10/18/2000
#define LOG_FW (0)
-#define CPU_CLOCK XTAL_60MHz
+#define CPU_CLOCK XTAL(60'000'000)
#define BEAM_DY 3
#define BEAM_DX 3
diff --git a/src/mame/drivers/mightyframe.cpp b/src/mame/drivers/mightyframe.cpp
index f12e6efa3dc..04eaf9b96fa 100644
--- a/src/mame/drivers/mightyframe.cpp
+++ b/src/mame/drivers/mightyframe.cpp
@@ -37,7 +37,7 @@ static INPUT_PORTS_START( mightyframe )
INPUT_PORTS_END
MACHINE_CONFIG_START(mightyframe_state::mightyframe)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // no idea of clock
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) // no idea of clock
MCFG_CPU_PROGRAM_MAP(mem_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mikromik.cpp b/src/mame/drivers/mikromik.cpp
index e8767433188..49b438e45dc 100644
--- a/src/mame/drivers/mikromik.cpp
+++ b/src/mame/drivers/mikromik.cpp
@@ -457,7 +457,7 @@ void mm1_state::machine_reset()
MACHINE_CONFIG_START(mm1_state::mm1)
// basic system hardware
- MCFG_CPU_ADD(I8085A_TAG, I8085A, XTAL_6_144MHz)
+ MCFG_CPU_ADD(I8085A_TAG, I8085A, XTAL(6'144'000))
MCFG_CPU_PROGRAM_MAP(mm1_map)
MCFG_I8085A_SID(READLINE(mm1_state, dsra_r))
MCFG_I8085A_SOD(DEVWRITELINE(KB_TAG, mm1_keyboard_device, bell_w))
@@ -468,7 +468,7 @@ MACHINE_CONFIG_START(mm1_state::mm1)
MCFG_I8212_INT_CALLBACK(INPUTLINE(I8085A_TAG, I8085_RST65_LINE))
MCFG_I8212_DI_CALLBACK(DEVREAD8(KB_TAG, mm1_keyboard_device, read))
- MCFG_DEVICE_ADD(I8237_TAG, AM9517A, XTAL_6_144MHz/2)
+ MCFG_DEVICE_ADD(I8237_TAG, AM9517A, XTAL(6'144'000)/2)
MCFG_I8237_OUT_HREQ_CB(WRITELINE(mm1_state, dma_hrq_w))
MCFG_I8237_OUT_EOP_CB(WRITELINE(mm1_state, dma_eop_w))
MCFG_I8237_IN_MEMR_CB(READ8(mm1_state, read))
@@ -481,14 +481,14 @@ MACHINE_CONFIG_START(mm1_state::mm1)
MCFG_I8237_OUT_DACK_3_CB(WRITELINE(mm1_state, dack3_w))
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_6_144MHz/2/2)
+ MCFG_PIT8253_CLK0(XTAL(6'144'000)/2/2)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(mm1_state, itxc_w))
- MCFG_PIT8253_CLK1(XTAL_6_144MHz/2/2)
+ MCFG_PIT8253_CLK1(XTAL(6'144'000)/2/2)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(mm1_state, irxc_w))
- MCFG_PIT8253_CLK2(XTAL_6_144MHz/2/2)
+ MCFG_PIT8253_CLK2(XTAL(6'144'000)/2/2)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(mm1_state, auxc_w))
- MCFG_UPD765A_ADD(UPD765_TAG, /* XTAL_16MHz/2/2 */ true, true)
+ MCFG_UPD765A_ADD(UPD765_TAG, /* XTAL(16'000'000)/2/2 */ true, true)
MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE(I8085A_TAG, I8085_RST55_LINE))
MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE(I8237_TAG, am9517a_device, dreq3_w))
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", mm1_floppies, "525qd", mm1_state::floppy_formats)
@@ -496,7 +496,7 @@ MACHINE_CONFIG_START(mm1_state::mm1)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", mm1_floppies, "525qd", mm1_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
- MCFG_DEVICE_ADD(UPD7201_TAG, UPD7201, XTAL_6_144MHz/2)
+ MCFG_DEVICE_ADD(UPD7201_TAG, UPD7201, XTAL(6'144'000)/2)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
@@ -509,7 +509,7 @@ MACHINE_CONFIG_START(mm1_state::mm1)
MCFG_RS232_PORT_ADD(RS232_C_TAG, default_rs232_devices, nullptr)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE(UPD7201_TAG, z80dart_device, ctsb_w))
- MCFG_DEVICE_ADD(KB_TAG, MM1_KEYBOARD, 2500) // actual KBCLK is XTAL_6_144MHz/2/16
+ MCFG_DEVICE_ADD(KB_TAG, MM1_KEYBOARD, 2500) // actual KBCLK is XTAL(6'144'000)/2/16
MCFG_MM1_KEYBOARD_KBST_CALLBACK(DEVWRITELINE(I8212_TAG, i8212_device, stb_w))
// internal ram
diff --git a/src/mame/drivers/mikrosha.cpp b/src/mame/drivers/mikrosha.cpp
index 6dfebaa5524..0cb3c3fc65b 100644
--- a/src/mame/drivers/mikrosha.cpp
+++ b/src/mame/drivers/mikrosha.cpp
@@ -206,7 +206,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(mikrosha_state::mikrosha)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_16MHz / 9)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
MCFG_CPU_PROGRAM_MAP(mikrosha_mem)
MCFG_CPU_IO_MAP(mikrosha_io)
@@ -221,7 +221,7 @@ MACHINE_CONFIG_START(mikrosha_state::mikrosha)
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
MCFG_I8255_OUT_PORTB_CB(WRITE8(radio86_state, mikrosha_8255_font_page_w))
- MCFG_DEVICE_ADD("i8275", I8275, XTAL_16MHz / 12)
+ MCFG_DEVICE_ADD("i8275", I8275, XTAL(16'000'000) / 12)
MCFG_I8275_CHARACTER_WIDTH(6)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(mikrosha_state, display_pixels)
MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma8257",i8257_device, dreq2_w))
@@ -247,7 +247,7 @@ MACHINE_CONFIG_START(mikrosha_state::mikrosha)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_DEVICE_ADD("dma8257", I8257, XTAL_16MHz / 9)
+ MCFG_DEVICE_ADD("dma8257", I8257, XTAL(16'000'000) / 9)
MCFG_I8257_OUT_HRQ_CB(WRITELINE(radio86_state, hrq_w))
MCFG_I8257_IN_MEMR_CB(READ8(radio86_state, memory_read_byte))
MCFG_I8257_OUT_MEMW_CB(WRITE8(radio86_state, memory_write_byte))
diff --git a/src/mame/drivers/mil4000.cpp b/src/mame/drivers/mil4000.cpp
index 09f247a0cd4..e539c621fc2 100644
--- a/src/mame/drivers/mil4000.cpp
+++ b/src/mame/drivers/mil4000.cpp
@@ -117,8 +117,8 @@
#include "mil4000.lh"
-#define MAIN_CLOCK XTAL_12MHz
-#define SEC_CLOCK XTAL_14_31818MHz
+#define MAIN_CLOCK XTAL(12'000'000)
+#define SEC_CLOCK XTAL(14'318'181)
#define CPU_CLOCK MAIN_CLOCK
diff --git a/src/mame/drivers/milwaukee.cpp b/src/mame/drivers/milwaukee.cpp
index 3e299ea5f9e..0b26564d7d6 100644
--- a/src/mame/drivers/milwaukee.cpp
+++ b/src/mame/drivers/milwaukee.cpp
@@ -51,13 +51,13 @@ static INPUT_PORTS_START( milwaukee )
INPUT_PORTS_END
MACHINE_CONFIG_START(milwaukee_state::milwaukee)
- MCFG_CPU_ADD("maincpu", M6502, XTAL_16MHz / 16)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(16'000'000) / 16)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_16MHz / 16 / 4) // 250 kHz
+ MCFG_PIT8253_CLK0(XTAL(16'000'000) / 16 / 4) // 250 kHz
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pit", pit8253_device, write_gate0)) MCFG_DEVCB_INVERT
- MCFG_PIT8253_CLK1(double(XTAL_16MHz) / 2 / 13 / 2048 / 5) // 60.09 Hz?
+ MCFG_PIT8253_CLK1(XTAL(16'000'000) / 2 / 13 / 2048 / 5) // 60.09 Hz?
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pit", pit8253_device, write_clk2)) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
@@ -65,7 +65,7 @@ MACHINE_CONFIG_START(milwaukee_state::milwaukee)
MCFG_DEVICE_ADD("acia2", ACIA6850, 0)
MCFG_DEVICE_ADD("ssda", MC6852, 0)
- MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL_16MHz / 2 / 13 / 4)
+ MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(16'000'000) / 2 / 13 / 4)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia1", acia6850_device, write_rxc))
diff --git a/src/mame/drivers/miniboy7.cpp b/src/mame/drivers/miniboy7.cpp
index c584f812a1a..e449c2ecd1b 100644
--- a/src/mame/drivers/miniboy7.cpp
+++ b/src/mame/drivers/miniboy7.cpp
@@ -144,7 +144,7 @@
#include "miniboy7.lh"
-#define MASTER_CLOCK XTAL_12_4725MHz /* 12.4725 MHz */
+#define MASTER_CLOCK XTAL(12'472'500) /* 12.4725 MHz */
class miniboy7_state : public driver_device
diff --git a/src/mame/drivers/minicom.cpp b/src/mame/drivers/minicom.cpp
index 2fc811edfbd..d82b0251584 100644
--- a/src/mame/drivers/minicom.cpp
+++ b/src/mame/drivers/minicom.cpp
@@ -228,7 +228,7 @@ DRIVER_INIT_MEMBER( minicom_state, minicom )
MACHINE_CONFIG_START(minicom_state::minicom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I87C52, XTAL_10MHz) /*FIX-ME: verify the correct clock frequency */
+ MCFG_CPU_ADD("maincpu", I87C52, XTAL(10'000'000)) /*FIX-ME: verify the correct clock frequency */
MCFG_CPU_IO_MAP(i87c52_io)
/* video hardware */
diff --git a/src/mame/drivers/miniframe.cpp b/src/mame/drivers/miniframe.cpp
index defc37426e8..f8569fc6948 100644
--- a/src/mame/drivers/miniframe.cpp
+++ b/src/mame/drivers/miniframe.cpp
@@ -219,7 +219,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(miniframe_state::miniframe)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68010, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68010, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(miniframe_mem)
// internal ram
diff --git a/src/mame/drivers/minitel_2_rpic.cpp b/src/mame/drivers/minitel_2_rpic.cpp
index c2749cb8aa7..6edb8572bde 100644
--- a/src/mame/drivers/minitel_2_rpic.cpp
+++ b/src/mame/drivers/minitel_2_rpic.cpp
@@ -415,7 +415,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(minitel_state::minitel2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C32, XTAL_14_31818MHz) //verified on pcb
+ MCFG_CPU_ADD("maincpu", I80C32, XTAL(14'318'181)) //verified on pcb
MCFG_CPU_PROGRAM_MAP(mem_prg)
MCFG_CPU_IO_MAP(mem_io)
diff --git a/src/mame/drivers/minivadr.cpp b/src/mame/drivers/minivadr.cpp
index 187c979c8b9..f1bc2702a5b 100644
--- a/src/mame/drivers/minivadr.cpp
+++ b/src/mame/drivers/minivadr.cpp
@@ -109,7 +109,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(minivadr_state::minivadr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000) / 6)
MCFG_CPU_PROGRAM_MAP(minivadr_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", minivadr_state, irq0_line_hold)
diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp
index cfbebdd794d..2d23a45a20b 100644
--- a/src/mame/drivers/missile.cpp
+++ b/src/mame/drivers/missile.cpp
@@ -430,7 +430,7 @@ public:
-#define MASTER_CLOCK XTAL_10MHz
+#define MASTER_CLOCK XTAL(10'000'000)
#define PIXEL_CLOCK (MASTER_CLOCK/2)
#define HTOTAL (320)
diff --git a/src/mame/drivers/mitchell.cpp b/src/mame/drivers/mitchell.cpp
index 15e2e727ae5..e098e2448b9 100644
--- a/src/mame/drivers/mitchell.cpp
+++ b/src/mame/drivers/mitchell.cpp
@@ -1154,7 +1154,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mitchell_state::mitchell_irq)
MACHINE_CONFIG_START(mitchell_state::mgakuen)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* probably same clock as the other mitchell hardware games */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* probably same clock as the other mitchell hardware games */
MCFG_CPU_PROGRAM_MAP(mgakuen_map)
MCFG_CPU_IO_MAP(mitchell_io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mitchell_state, mitchell_irq, "screen", 0, 1)
@@ -1183,10 +1183,10 @@ MACHINE_CONFIG_START(mitchell_state::mgakuen)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* probably same clock as the other mitchell hardware games */
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* probably same clock as the other mitchell hardware games */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_16MHz/4) /* probably same clock as the other mitchell hardware games */
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(16'000'000)/4) /* probably same clock as the other mitchell hardware games */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1194,7 +1194,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mitchell_state::pang)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(mitchell_map)
MCFG_CPU_IO_MAP(mitchell_io_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
@@ -1224,10 +1224,10 @@ MACHINE_CONFIG_START(mitchell_state::pang)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- 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.30)
- MCFG_SOUND_ADD("ymsnd",YM2413, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd",YM2413, XTAL(16'000'000)/4) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1349,7 +1349,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mitchell_state::marukin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(mitchell_map)
MCFG_CPU_IO_MAP(mitchell_io_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
@@ -1376,10 +1376,10 @@ MACHINE_CONFIG_START(mitchell_state::marukin)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- 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.30)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(16'000'000)/4) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1404,7 +1404,7 @@ Vsync is 59.09hz
MACHINE_CONFIG_START(mitchell_state::pkladiesbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(mitchell_map)
MCFG_CPU_IO_MAP(mitchell_io_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
@@ -1431,7 +1431,7 @@ MACHINE_CONFIG_START(mitchell_state::pkladiesbl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* It should be a OKIM5205 with a 384khz resonator */
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* It should be a OKIM5205 with a 384khz resonator */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD("ymsnd", YM2413, 3750000) /* verified on pcb, read the comments */
diff --git a/src/mame/drivers/mits680b.cpp b/src/mame/drivers/mits680b.cpp
index 14d3cecd0c2..8ff8e5596f3 100644
--- a/src/mame/drivers/mits680b.cpp
+++ b/src/mame/drivers/mits680b.cpp
@@ -63,7 +63,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mits680b_state::mits680b)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_1MHz / 2)
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(1'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
diff --git a/src/mame/drivers/mk14.cpp b/src/mame/drivers/mk14.cpp
index cbd14d94292..4e5765663ee 100644
--- a/src/mame/drivers/mk14.cpp
+++ b/src/mame/drivers/mk14.cpp
@@ -192,7 +192,7 @@ void mk14_state::machine_reset()
MACHINE_CONFIG_START(mk14_state::mk14)
/* basic machine hardware */
// IC1 1SP-8A/600 (8060) SC/MP Microprocessor
- MCFG_CPU_ADD("maincpu", INS8060, XTAL_4_433619MHz)
+ MCFG_CPU_ADD("maincpu", INS8060, XTAL(4'433'619))
MCFG_SCMP_CONFIG(WRITELINE(mk14_state, cass_w), NOOP, READLINE(mk14_state, cass_r), NOOP, READLINE(mk14_state, cass_r), NOOP)
MCFG_CPU_PROGRAM_MAP(mem_map)
diff --git a/src/mame/drivers/mk85.cpp b/src/mame/drivers/mk85.cpp
index eb37584075c..408935b5774 100644
--- a/src/mame/drivers/mk85.cpp
+++ b/src/mame/drivers/mk85.cpp
@@ -67,7 +67,7 @@ uint32_t mk85_state::screen_update_mk85(screen_device &screen, bitmap_ind16 &bit
MACHINE_CONFIG_START(mk85_state::mk85)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", K1801VM2, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", K1801VM2, XTAL(4'000'000))
MCFG_T11_INITIAL_MODE(0)
MCFG_CPU_PROGRAM_MAP(mk85_mem)
diff --git a/src/mame/drivers/mk90.cpp b/src/mame/drivers/mk90.cpp
index 9e3310387e3..11d455b606c 100644
--- a/src/mame/drivers/mk90.cpp
+++ b/src/mame/drivers/mk90.cpp
@@ -70,7 +70,7 @@ uint32_t mk90_state::screen_update_mk90(screen_device &screen, bitmap_ind16 &bit
MACHINE_CONFIG_START(mk90_state::mk90)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", K1801VM2, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", K1801VM2, XTAL(4'000'000))
MCFG_T11_INITIAL_MODE(0x8000)
MCFG_CPU_PROGRAM_MAP(mk90_mem)
diff --git a/src/mame/drivers/mkit09.cpp b/src/mame/drivers/mkit09.cpp
index d399fbb1127..59482e5bbea 100644
--- a/src/mame/drivers/mkit09.cpp
+++ b/src/mame/drivers/mkit09.cpp
@@ -193,7 +193,7 @@ WRITE8_MEMBER( mkit09_state::pb_w )
MACHINE_CONFIG_START(mkit09_state::mkit09)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(mkit09_mem)
MCFG_CPU_IO_MAP(mkit09_io)
@@ -219,7 +219,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mkit09_state::mkit09a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(mkit09a_mem)
MCFG_CPU_IO_MAP(mkit09_io)
diff --git a/src/mame/drivers/mmagic.cpp b/src/mame/drivers/mmagic.cpp
index 6d8b3524ee1..644a80a3005 100644
--- a/src/mame/drivers/mmagic.cpp
+++ b/src/mame/drivers/mmagic.cpp
@@ -302,13 +302,13 @@ void mmagic_state::machine_start()
MACHINE_CONFIG_START(mmagic_state::mmagic)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz) // NEC D8085A
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'144'000)) // NEC D8085A
MCFG_CPU_PROGRAM_MAP(mmagic_mem)
MCFG_CPU_IO_MAP(mmagic_io)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_6_144MHz, 384, 0, 256, 264, 0, 192)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(6'144'000), 384, 0, 256, 264, 0, 192)
MCFG_SCREEN_UPDATE_DRIVER(mmagic_state, screen_update)
MCFG_PALETTE_ADD_3BIT_RGB("palette")
diff --git a/src/mame/drivers/mmodular.cpp b/src/mame/drivers/mmodular.cpp
index b7f204b2cb9..85d10356c1a 100644
--- a/src/mame/drivers/mmodular.cpp
+++ b/src/mame/drivers/mmodular.cpp
@@ -239,7 +239,7 @@ DRIVER_INIT_MEMBER(mmodular_state, gen32)
}
MACHINE_CONFIG_START(mmodular_state::alm16)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(alm16_mem)
MCFG_CPU_PERIODIC_INT_DRIVER(mmodular_state, irq2_line_hold, 600)
@@ -256,7 +256,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mmodular_state::alm32)
- MCFG_CPU_ADD("maincpu", M68020, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", M68020, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(alm32_mem)
MCFG_CPU_PERIODIC_INT_DRIVER(mmodular_state, irq6_line_hold, 750)
@@ -275,7 +275,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mmodular_state::gen32)
- MCFG_CPU_ADD("maincpu", M68030, XTAL_33_333MHz)
+ MCFG_CPU_ADD("maincpu", M68030, XTAL(33'333'000))
MCFG_CPU_PROGRAM_MAP(gen32_mem)
MCFG_CPU_PERIODIC_INT_DRIVER(mmodular_state, irq2_line_hold, 375)
@@ -288,7 +288,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(berlinp_state::berlinp)
- MCFG_CPU_ADD("maincpu", M68020, XTAL_24_576MHz)
+ MCFG_CPU_ADD("maincpu", M68020, XTAL(24'576'000))
MCFG_CPU_PROGRAM_MAP(berlinp_mem)
MCFG_CPU_PERIODIC_INT_DRIVER(berlinp_state, irq2_line_hold, 750)
diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp
index be363979e92..55e53bc5865 100644
--- a/src/mame/drivers/model1.cpp
+++ b/src/mame/drivers/model1.cpp
@@ -1632,7 +1632,7 @@ MACHINE_CONFIG_START(model1_state::model1)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
- MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz, 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000), 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/)
MCFG_SCREEN_UPDATE_DRIVER(model1_state, screen_update_model1)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(model1_state, screen_vblank_model1))
@@ -1702,7 +1702,7 @@ MACHINE_CONFIG_START(model1_state::model1_vr)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
- MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz, 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000), 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/)
MCFG_SCREEN_UPDATE_DRIVER(model1_state, screen_update_model1)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(model1_state, screen_vblank_model1))
diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp
index ecd15bc89dc..dc72218d0a6 100644
--- a/src/mame/drivers/model2.cpp
+++ b/src/mame/drivers/model2.cpp
@@ -2128,7 +2128,7 @@ ADDRESS_MAP_END
/*****************************************************************************/
-#define VIDEO_CLOCK XTAL_32MHz
+#define VIDEO_CLOCK XTAL(32'000'000)
/* original Model 2 */
MACHINE_CONFIG_START(model2_state::model2o)
@@ -2214,7 +2214,7 @@ static ADDRESS_MAP_START( drive_io_map, AS_IO, 8, model2_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(model2_state::sj25_0207_01)
- MCFG_CPU_ADD("drivecpu", Z80, XTAL_8MHz/2) // confirmed
+ MCFG_CPU_ADD("drivecpu", Z80, XTAL(8'000'000)/2) // confirmed
MCFG_CPU_PROGRAM_MAP(drive_map)
MCFG_CPU_IO_MAP(drive_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", model2_state, irq0_line_hold)
diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp
index 35becc40b66..ab3b190880d 100644
--- a/src/mame/drivers/model3.cpp
+++ b/src/mame/drivers/model3.cpp
@@ -5816,7 +5816,7 @@ MACHINE_CONFIG_START(model3_state::model3_10)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_NVRAM_ADD_1FILL("backup")
- MCFG_DEVICE_ADD("rtc", RTC72421, XTAL_32_768kHz) // internal oscillator
+ MCFG_DEVICE_ADD("rtc", RTC72421, XTAL(32'768)) // internal oscillator
MCFG_SCREEN_ADD("screen", RASTER)
@@ -5862,7 +5862,7 @@ MACHINE_CONFIG_START(model3_state::model3_15)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_NVRAM_ADD_1FILL("backup")
- MCFG_DEVICE_ADD("rtc", RTC72421, XTAL_32_768kHz) // internal oscillator
+ MCFG_DEVICE_ADD("rtc", RTC72421, XTAL(32'768)) // internal oscillator
MCFG_SCREEN_ADD("screen", RASTER)
@@ -5923,7 +5923,7 @@ MACHINE_CONFIG_START(model3_state::model3_20)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_NVRAM_ADD_1FILL("backup")
- MCFG_DEVICE_ADD("rtc", RTC72421, XTAL_32_768kHz) // internal oscillator
+ MCFG_DEVICE_ADD("rtc", RTC72421, XTAL(32'768)) // internal oscillator
MCFG_SCREEN_ADD("screen", RASTER)
@@ -5968,7 +5968,7 @@ MACHINE_CONFIG_START(model3_state::model3_21)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_NVRAM_ADD_1FILL("backup")
- MCFG_DEVICE_ADD("rtc", RTC72421, XTAL_32_768kHz) // internal oscillator
+ MCFG_DEVICE_ADD("rtc", RTC72421, XTAL(32'768)) // internal oscillator
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp
index 6c2b9f8d81b..1e9dee2d75f 100644
--- a/src/mame/drivers/modellot.cpp
+++ b/src/mame/drivers/modellot.cpp
@@ -173,7 +173,7 @@ uint32_t modellot_state::screen_update_modellot(screen_device &screen, bitmap_in
MACHINE_CONFIG_START(modellot_state::modellot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/molecular.cpp b/src/mame/drivers/molecular.cpp
index a300fd237c8..eae19450758 100644
--- a/src/mame/drivers/molecular.cpp
+++ b/src/mame/drivers/molecular.cpp
@@ -55,8 +55,8 @@ TODO:
#include "speaker.h"
-#define I86_CLOCK XTAL_24MHz
-#define Z80_CLOCK XTAL_16MHz
+#define I86_CLOCK XTAL(24'000'000)
+#define Z80_CLOCK XTAL(16'000'000)
class molecula_state : public driver_device
{
diff --git a/src/mame/drivers/momoko.cpp b/src/mame/drivers/momoko.cpp
index 49a5d830af9..e6de58aa63e 100644
--- a/src/mame/drivers/momoko.cpp
+++ b/src/mame/drivers/momoko.cpp
@@ -256,11 +256,11 @@ void momoko_state::machine_reset()
MACHINE_CONFIG_START(momoko_state::momoko)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/2) /* 5.0MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'000'000)/2) /* 5.0MHz */
MCFG_CPU_PROGRAM_MAP(momoko_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", momoko_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_10MHz/4) /* 2.5MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(10'000'000)/4) /* 2.5MHz */
MCFG_CPU_PROGRAM_MAP(momoko_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -284,13 +284,13 @@ MACHINE_CONFIG_START(momoko_state::momoko)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_10MHz/8)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(10'000'000)/8)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_10MHz/8)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(10'000'000)/8)
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
diff --git a/src/mame/drivers/moo.cpp b/src/mame/drivers/moo.cpp
index e99e354bb28..9c665accbbe 100644
--- a/src/mame/drivers/moo.cpp
+++ b/src/mame/drivers/moo.cpp
@@ -493,11 +493,11 @@ MACHINE_RESET_MEMBER(moo_state,moo)
MACHINE_CONFIG_START(moo_state::moo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // 16MHz verified
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) // 16MHz verified
MCFG_CPU_PROGRAM_MAP(moo_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", moo_state, moo_interrupt)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_32MHz/4) // 8MHz verified
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(32'000'000)/4) // 8MHz verified
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_MACHINE_START_OVERRIDE(moo_state,moo)
@@ -505,7 +505,7 @@ MACHINE_CONFIG_START(moo_state::moo)
MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom")
- MCFG_DEVICE_ADD("k053252", K053252, XTAL_32MHz/4) // 8MHz
+ MCFG_DEVICE_ADD("k053252", K053252, XTAL(32'000'000)/4) // 8MHz
MCFG_K053252_OFFSETS(40, 16)
/* video hardware */
@@ -543,11 +543,11 @@ MACHINE_CONFIG_START(moo_state::moo)
MCFG_K054321_ADD("k054321", ":lspeaker", ":rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_32MHz/8) // 4MHz verified
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'000'000)/8) // 4MHz verified
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_DEVICE_ADD("k054539", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mosaic.cpp b/src/mame/drivers/mosaic.cpp
index d3d4275f026..171534517da 100644
--- a/src/mame/drivers/mosaic.cpp
+++ b/src/mame/drivers/mosaic.cpp
@@ -275,7 +275,7 @@ void mosaic_state::machine_reset()
MACHINE_CONFIG_START(mosaic_state::mosaic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL_12_288MHz/2) /* 6.144MHz */
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(12'288'000)/2) /* 6.144MHz */
MCFG_CPU_PROGRAM_MAP(mosaic_map)
MCFG_CPU_IO_MAP(mosaic_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", mosaic_state, irq0_line_hold)
@@ -298,7 +298,7 @@ MACHINE_CONFIG_START(mosaic_state::mosaic)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12_288MHz/4) /* 3.072MHz or 3.579545MHz (14.31818MHz/4)? */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'288'000)/4) /* 3.072MHz or 3.579545MHz (14.31818MHz/4)? */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp
index 00b6f0eed31..00bc233ef27 100644
--- a/src/mame/drivers/mpf1.cpp
+++ b/src/mame/drivers/mpf1.cpp
@@ -355,17 +355,17 @@ void mpf1_state::machine_reset()
MACHINE_CONFIG_START(mpf1_state::mpf1)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_3_579545MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(3'579'545)/2)
MCFG_CPU_PROGRAM_MAP(mpf1_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(mpf1_step)
MCFG_CPU_IO_MAP(mpf1_io_map)
MCFG_Z80_DAISY_CHAIN(mpf1_daisy_chain)
/* devices */
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_3_579545MHz/2)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(3'579'545)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_3_579545MHz/2)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(3'579'545)/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
@@ -389,17 +389,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpf1_state::mpf1b)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_3_579545MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(3'579'545)/2)
MCFG_CPU_PROGRAM_MAP(mpf1b_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(mpf1_step)
MCFG_CPU_IO_MAP(mpf1b_io_map)
MCFG_Z80_DAISY_CHAIN(mpf1_daisy_chain)
/* devices */
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_3_579545MHz/2)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(3'579'545)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_3_579545MHz/2)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(3'579'545)/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
diff --git a/src/mame/drivers/mpu12wbk.cpp b/src/mame/drivers/mpu12wbk.cpp
index 98882ec18e2..83039fcbc12 100644
--- a/src/mame/drivers/mpu12wbk.cpp
+++ b/src/mame/drivers/mpu12wbk.cpp
@@ -214,7 +214,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_8MHz
+#define MASTER_CLOCK XTAL(8'000'000)
class mpu12wbk_state : public driver_device
diff --git a/src/mame/drivers/mpu3.cpp b/src/mame/drivers/mpu3.cpp
index d13bafe7dfa..5f44997ac01 100644
--- a/src/mame/drivers/mpu3.cpp
+++ b/src/mame/drivers/mpu3.cpp
@@ -165,7 +165,7 @@ TODO: - Distinguish door switches using manual
#include "video/awpvid.h" //Fruit Machines Only
-#define MPU3_MASTER_CLOCK (XTAL_4MHz)
+#define MPU3_MASTER_CLOCK (XTAL(4'000'000))
/* Lookup table for CHR data */
diff --git a/src/mame/drivers/mpz80.cpp b/src/mame/drivers/mpz80.cpp
index 8b28bc18ce4..af0681621f8 100644
--- a/src/mame/drivers/mpz80.cpp
+++ b/src/mame/drivers/mpz80.cpp
@@ -711,12 +711,12 @@ void mpz80_state::machine_reset()
MACHINE_CONFIG_START(mpz80_state::mpz80)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(mpz80_mem)
MCFG_CPU_IO_MAP(mpz80_io)
// S-100
- MCFG_DEVICE_ADD(S100_TAG, S100_BUS, XTAL_4MHz / 2)
+ MCFG_DEVICE_ADD(S100_TAG, S100_BUS, XTAL(4'000'000) / 2)
MCFG_S100_IRQ_CALLBACK(WRITELINE(mpz80_state, s100_pint_w))
MCFG_S100_NMI_CALLBACK(WRITELINE(mpz80_state, s100_nmi_w))
MCFG_S100_RDY_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT))
diff --git a/src/mame/drivers/mrdo.cpp b/src/mame/drivers/mrdo.cpp
index 93de5bf76bc..649b270d44a 100644
--- a/src/mame/drivers/mrdo.cpp
+++ b/src/mame/drivers/mrdo.cpp
@@ -30,8 +30,8 @@ There's a chance that certain bootlegs might have the different 8/20 MHz XTALS.
#include "speaker.h"
-#define MAIN_CLOCK XTAL_8_2MHz
-#define VIDEO_CLOCK XTAL_19_6MHz
+#define MAIN_CLOCK XTAL(8'200'000)
+#define VIDEO_CLOCK XTAL(19'600'000)
diff --git a/src/mame/drivers/mrgame.cpp b/src/mame/drivers/mrgame.cpp
index 27f05afa0ab..25e9d1574e6 100644
--- a/src/mame/drivers/mrgame.cpp
+++ b/src/mame/drivers/mrgame.cpp
@@ -463,16 +463,16 @@ uint32_t mrgame_state::screen_update_mrgame(screen_device &screen, bitmap_ind16
MACHINE_CONFIG_START(mrgame_state::mrgame)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_6MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_PERIODIC_INT_DRIVER(mrgame_state, irq1_line_hold, 183)
- MCFG_CPU_ADD("videocpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_ADD("videocpu", Z80, XTAL(18'432'000)/6)
MCFG_CPU_PROGRAM_MAP(video_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", mrgame_state, nmi_line_pulse)
- MCFG_CPU_ADD("audiocpu1", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu1", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(audio1_map)
MCFG_CPU_IO_MAP(audio1_io)
- MCFG_CPU_ADD("audiocpu2", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu2", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(audio2_map)
MCFG_CPU_IO_MAP(audio2_io)
diff --git a/src/mame/drivers/ms0515.cpp b/src/mame/drivers/ms0515.cpp
index d1a64c6611f..77449ca6c10 100644
--- a/src/mame/drivers/ms0515.cpp
+++ b/src/mame/drivers/ms0515.cpp
@@ -516,13 +516,13 @@ WRITE_LINE_MEMBER(ms0515_state::irq11_w)
MACHINE_CONFIG_START(ms0515_state::ms0515)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", T11, XTAL_15MHz / 2) // actual CPU is T11 clone, KR1807VM1
+ MCFG_CPU_ADD("maincpu", T11, XTAL(15'000'000) / 2) // actual CPU is T11 clone, KR1807VM1
MCFG_T11_INITIAL_MODE(0xf2ff)
MCFG_CPU_PROGRAM_MAP(ms0515_mem)
/* video hardware -- 50 Hz refresh rate */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( XTAL_15MHz, 958,0,640, 313,0,200 )
+ MCFG_SCREEN_RAW_PARAMS( XTAL(15'000'000), 958,0,640, 313,0,200 )
MCFG_SCREEN_UPDATE_DRIVER(ms0515_state, screen_update_ms0515)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ms0515_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
@@ -570,11 +570,11 @@ MACHINE_CONFIG_START(ms0515_state::ms0515)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(ms0515_state, write_keyboard_clock))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_2MHz)
+ MCFG_PIT8253_CLK0(XTAL(2'000'000))
// MCFG_PIT8253_OUT0_HANDLER(WRITELINE(ms0515_state, write_keyboard_clock))
- MCFG_PIT8253_CLK1(XTAL_2MHz)
+ MCFG_PIT8253_CLK1(XTAL(2'000'000))
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(ms0515_state, write_line_clock))
- MCFG_PIT8253_CLK2(XTAL_2MHz)
+ MCFG_PIT8253_CLK2(XTAL(2'000'000))
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(ms0515_state, pit8253_out2_changed))
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/ms6102.cpp b/src/mame/drivers/ms6102.cpp
index 9ce1cea1f59..a5cc95d61af 100644
--- a/src/mame/drivers/ms6102.cpp
+++ b/src/mame/drivers/ms6102.cpp
@@ -249,7 +249,7 @@ DRIVER_INIT_MEMBER( ms6102_state, ms6102 )
MACHINE_CONFIG_START(ms6102_state::ms6102)
- MCFG_CPU_ADD("maincpu", I8080, XTAL_18_432MHz / 9)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(18'432'000) / 9)
MCFG_CPU_PROGRAM_MAP(ms6102_mem)
MCFG_CPU_IO_MAP(ms6102_io)
MCFG_I8085A_INTE(DEVWRITELINE("i8214", i8214_device, inte_w))
@@ -257,7 +257,7 @@ MACHINE_CONFIG_START(ms6102_state::ms6102)
MCFG_NVRAM_ADD_0FILL("nvram")
- MCFG_DEVICE_ADD("i8214", I8214, XTAL_18_432MHz / 9)
+ MCFG_DEVICE_ADD("i8214", I8214, XTAL(18'432'000) / 9)
MCFG_I8214_INT_CALLBACK(INPUTLINE("maincpu", I8085_INTR_LINE))
/* video hardware */
@@ -269,12 +269,12 @@ MACHINE_CONFIG_START(ms6102_state::ms6102)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ms6102)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
- MCFG_DEVICE_ADD("dma8257", I8257, XTAL_18_432MHz / 9)
+ MCFG_DEVICE_ADD("dma8257", I8257, XTAL(18'432'000) / 9)
MCFG_I8257_OUT_HRQ_CB(WRITELINE(ms6102_state, hrq_w))
MCFG_I8257_IN_MEMR_CB(READ8(ms6102_state, memory_read_byte))
MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("i8275", i8275_device, dack_w))
- MCFG_DEVICE_ADD("i8275", I8275, XTAL_16_4MHz / 8) // XXX
+ MCFG_DEVICE_ADD("i8275", I8275, XTAL(16'400'000) / 8) // XXX
MCFG_I8275_CHARACTER_WIDTH(8)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(ms6102_state, display_pixels)
MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma8257", i8257_device, dreq2_w))
@@ -295,9 +295,9 @@ MACHINE_CONFIG_START(ms6102_state::ms6102)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxd))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_16_4MHz / 9)
+ MCFG_PIT8253_CLK0(XTAL(16'400'000) / 9)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("i8251", i8251_device, write_txc))
- MCFG_PIT8253_CLK1(XTAL_16_4MHz / 9)
+ MCFG_PIT8253_CLK1(XTAL(16'400'000) / 9)
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxc))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/msbc1.cpp b/src/mame/drivers/msbc1.cpp
index 9fc12b93035..5c009eb1f5f 100644
--- a/src/mame/drivers/msbc1.cpp
+++ b/src/mame/drivers/msbc1.cpp
@@ -93,7 +93,7 @@ void msbc1_state::machine_reset()
MACHINE_CONFIG_START(msbc1_state::msbc1)
/* basic machine hardware */
- MCFG_CPU_ADD(MC68000R12_TAG, M68000, XTAL_12_5MHz)
+ MCFG_CPU_ADD(MC68000R12_TAG, M68000, XTAL(12'500'000))
MCFG_CPU_PROGRAM_MAP(msbc1_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mstation.cpp b/src/mame/drivers/mstation.cpp
index f3de69f9ef3..b6c118ed26d 100644
--- a/src/mame/drivers/mstation.cpp
+++ b/src/mame/drivers/mstation.cpp
@@ -439,7 +439,7 @@ PALETTE_INIT_MEMBER(mstation_state, mstation)
MACHINE_CONFIG_START(mstation_state::mstation)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) //unknown clock
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000)) //unknown clock
MCFG_CPU_PROGRAM_MAP(mstation_mem)
MCFG_CPU_IO_MAP(mstation_io)
@@ -465,7 +465,7 @@ MACHINE_CONFIG_START(mstation_state::mstation)
// IRQ 1 is used for scan the kb and for cursor blinking
MCFG_TIMER_DRIVER_ADD_PERIODIC("kb_timer", mstation_state, mstation_kb_timer, attotime::from_hz(50))
- MCFG_DEVICE_ADD("rtc", RP5C01, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768))
MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(mstation_state, rtc_irq))
MCFG_DEVICE_ADD("bank0", ADDRESS_MAP_BANK, 0)
diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp
index 898fb0367f9..0a7d8e8ee12 100644
--- a/src/mame/drivers/msx.cpp
+++ b/src/mame/drivers/msx.cpp
@@ -1231,7 +1231,7 @@ WRITE_LINE_MEMBER(msx_state::turbo_w)
{
// 0 - 5.369317 MHz
// 1 - 3.579545 MHz
- m_maincpu->set_unscaled_clock(state ? XTAL_21_4772MHz/6 : XTAL_21_4772MHz/4);
+ m_maincpu->set_unscaled_clock(state ? XTAL(21'477'272)/6 : XTAL(21'477'272)/4);
}
@@ -1285,7 +1285,7 @@ static SLOT_INTERFACE_START( msx_floppies )
SLOT_INTERFACE_END
MACHINE_CONFIG_START(msx_state::msx_fd1793)
- MCFG_FD1793_ADD("fdc", XTAL_4MHz / 4)
+ MCFG_FD1793_ADD("fdc", XTAL(4'000'000) / 4)
MCFG_WD_FDC_FORCE_READY
MACHINE_CONFIG_END
@@ -1293,19 +1293,19 @@ MACHINE_CONFIG_START(msx_state::msx_wd2793_force_ready)
// From NMS8245 schematics:
// READY + HLT - pulled high
// SSO/-ENMF + -DDEN + ENP + -5/8 - pulled low
- MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4)
+ MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 4)
MCFG_WD_FDC_FORCE_READY
MACHINE_CONFIG_END
MACHINE_CONFIG_START(msx_state::msx_wd2793)
- MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4)
+ MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 4)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(msx_state::msx_mb8877a)
// From CF-3300 FDC schematic:
// READY + HLT - pulled high
// -DDEN - pulled low
- MCFG_MB8877_ADD("fdc", XTAL_4MHz / 4)
+ MCFG_MB8877_ADD("fdc", XTAL(4'000'000) / 4)
MCFG_WD_FDC_FORCE_READY
MACHINE_CONFIG_END
@@ -1314,7 +1314,7 @@ MACHINE_CONFIG_START(msx_state::msx_tc8566af)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(msx_state::msx_microsol)
- MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4)
+ MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 4)
MCFG_WD_FDC_FORCE_READY
MACHINE_CONFIG_END
@@ -1332,7 +1332,7 @@ MACHINE_CONFIG_START(msx_state::msx_2_35_dd_drive)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(msx_state::msx_ym2413)
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_21_4772MHz/6)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(21'477'272)/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4)
MACHINE_CONFIG_END
@@ -1343,7 +1343,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(msx_state::msx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3) /* 3.579545 MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635)/3) /* 3.579545 MHz */
MCFG_CPU_PROGRAM_MAP(msx_memory_map)
MCFG_CPU_IO_MAP(msx_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", msx_state, msx_interrupt) /* Needed for mouse updates */
@@ -1362,7 +1362,7 @@ MACHINE_CONFIG_START(msx_state::msx)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL_10_738635MHz/3/2)
+ MCFG_SOUND_ADD("ay8910", AY8910, XTAL(10'738'635)/3/2)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_READ_CB(READ8(msx_state, msx_psg_port_a_r))
MCFG_AY8910_PORT_B_READ_CB(READ8(msx_state, msx_psg_port_b_r))
@@ -1393,7 +1393,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(msx_state::msx_ntsc, msx)
/* Video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
@@ -1403,7 +1403,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(msx_state::msx_tms9118, msx)
/* Video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9118, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9118, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
@@ -1413,7 +1413,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(msx_state::msx_tms9128, msx)
/* Video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9128, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9128, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
@@ -1423,7 +1423,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(msx_state::msx_tms9918, msx)
/* Video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9918, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9918, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
@@ -1433,7 +1433,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(msx_state::msx_tms9918a, msx)
/* Video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9918A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9918A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
@@ -1443,7 +1443,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(msx_state::msx_tms9928, msx)
/* Video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
@@ -1453,7 +1453,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(msx_state::msx_pal, msx)
/* Video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
@@ -1463,7 +1463,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(msx_state::msx_tms9129, msx)
/* Video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9129, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9129, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
@@ -1473,7 +1473,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(msx_state::msx_tms9929, msx)
/* Video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
@@ -1483,7 +1483,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(msx_state::msx2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) /* 3.579545 MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272)/6) /* 3.579545 MHz */
MCFG_CPU_PROGRAM_MAP(msx_memory_map)
MCFG_CPU_IO_MAP(msx2_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1494,9 +1494,9 @@ MACHINE_CONFIG_START(msx_state::msx2)
MCFG_I8255_OUT_PORTC_CB(WRITE8(msx_state, msx_ppi_port_c_w))
/* video hardware */
- MCFG_V9938_ADD("v9938", "screen", 0x20000, XTAL_21_4772MHz)
+ MCFG_V9938_ADD("v9938", "screen", 0x20000, XTAL(21'477'272))
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(msx_state,msx_irq_source0))
- MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9938", XTAL_21_4772MHz)
+ MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9938", XTAL(21'477'272))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
@@ -1506,7 +1506,7 @@ MACHINE_CONFIG_START(msx_state::msx2)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL_21_4772MHz/6/2)
+ MCFG_SOUND_ADD("ay8910", AY8910, XTAL(21'477'272)/6/2)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_READ_CB(READ8(msx_state, msx_psg_port_a_r))
MCFG_AY8910_PORT_B_READ_CB(READ8(msx_state, msx_psg_port_b_r))
@@ -1531,7 +1531,7 @@ MACHINE_CONFIG_START(msx_state::msx2)
MCFG_CASSETTE_INTERFACE("msx_cass")
/* real time clock */
- MCFG_DEVICE_ADD("rtc", RP5C01, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768))
/* Software lists */
MCFG_SOFTWARE_LIST_ADD("cass_list", "msx2_cass")
@@ -1541,7 +1541,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(msx_state::msx2p)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) /* 3.579545 MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272)/6) /* 3.579545 MHz */
MCFG_CPU_PROGRAM_MAP(msx_memory_map)
MCFG_CPU_IO_MAP(msx2p_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1552,9 +1552,9 @@ MACHINE_CONFIG_START(msx_state::msx2p)
MCFG_I8255_OUT_PORTC_CB(WRITE8(msx_state, msx_ppi_port_c_w))
/* video hardware */
- MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL_21_4772MHz)
+ MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL(21'477'272))
MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(msx_state,msx_irq_source0))
- MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", XTAL_21_4772MHz)
+ MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", XTAL(21'477'272))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
@@ -1564,7 +1564,7 @@ MACHINE_CONFIG_START(msx_state::msx2p)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL_21_4772MHz/6/2)
+ MCFG_SOUND_ADD("ay8910", AY8910, XTAL(21'477'272)/6/2)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_READ_CB(READ8(msx_state, msx_psg_port_a_r))
MCFG_AY8910_PORT_B_READ_CB(READ8(msx_state, msx_psg_port_b_r))
@@ -1589,7 +1589,7 @@ MACHINE_CONFIG_START(msx_state::msx2p)
MCFG_CASSETTE_INTERFACE("msx_cass")
/* real time clock */
- MCFG_DEVICE_ADD("rtc", RP5C01, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768))
/* Software lists */
MCFG_SOFTWARE_LIST_ADD("cass_list", "msx2_cass")
@@ -1599,7 +1599,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(msx_state::msx2_pal, msx2)
MCFG_DEVICE_REMOVE("screen")
- MCFG_V99X8_SCREEN_ADD_PAL("screen", "v9938", XTAL_21_4772MHz)
+ MCFG_V99X8_SCREEN_ADD_PAL("screen", "v9938", XTAL(21'477'272))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mt735.cpp b/src/mame/drivers/mt735.cpp
index 883fea205d1..63a693a3ed8 100644
--- a/src/mame/drivers/mt735.cpp
+++ b/src/mame/drivers/mt735.cpp
@@ -61,7 +61,7 @@ static INPUT_PORTS_START( mt735 )
INPUT_PORTS_END
MACHINE_CONFIG_START(mt735_state::mt735)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_48MHz/6)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(48'000'000)/6)
MCFG_CPU_PROGRAM_MAP(mt735_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mtouchxl.cpp b/src/mame/drivers/mtouchxl.cpp
index 78e1465b189..4a5936f1a2b 100644
--- a/src/mame/drivers/mtouchxl.cpp
+++ b/src/mame/drivers/mtouchxl.cpp
@@ -216,7 +216,7 @@ MACHINE_CONFIG_START(mtxl_state::at486)
MCFG_SLOT_OPTION_MACHINE_CONFIG("ide", cdrom)
MCFG_ISA16_SLOT_ADD("mb:isabus","isa1", pc_isa16_cards, "svga_dm", true) // original is a gd-5440
- MCFG_DEVICE_ADD("ns16550", NS16550, XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("ns16550", NS16550, XTAL(1'843'200))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("mb:pic8259_master", pic8259_device, ir4_w))
MCFG_MICROTOUCH_ADD("microtouch", 9600, DEVWRITELINE("ns16550", ins8250_uart_device, rx_w))
diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp
index 028f0ca5c16..b42f4aaca7b 100644
--- a/src/mame/drivers/mtx.cpp
+++ b/src/mame/drivers/mtx.cpp
@@ -283,7 +283,7 @@ WRITE_LINE_MEMBER(mtx_state::mtx_tms9929a_interrupt)
MACHINE_CONFIG_START(mtx_state::mtx512)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(mtx_mem)
MCFG_CPU_IO_MAP(mtx_io)
MCFG_Z80_DAISY_CHAIN(mtx_daisy_chain)
@@ -292,7 +292,7 @@ MACHINE_CONFIG_START(mtx_state::mtx512)
MCFG_MACHINE_RESET_OVERRIDE(mtx_state,mtx512)
/* video hardware */
- MCFG_DEVICE_ADD( "tms9929a", TMS9929A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9929a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(mtx_state, mtx_tms9929a_interrupt))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
@@ -300,16 +300,16 @@ MACHINE_CONFIG_START(mtx_state::mtx512)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489A_TAG, SN76489A, XTAL_4MHz)
+ MCFG_SOUND_ADD(SN76489A_TAG, SN76489A, XTAL(4'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC1_CB(WRITELINE(mtx_state, ctc_trg1_w))
MCFG_Z80CTC_ZC2_CB(WRITELINE(mtx_state, ctc_trg2_w))
- MCFG_TIMER_DRIVER_ADD_PERIODIC("z80ctc_timer", mtx_state, ctc_tick, attotime::from_hz(XTAL_4MHz/13))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("z80ctc_timer", mtx_state, ctc_tick, attotime::from_hz(XTAL(4'000'000)/13))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(mtx_state, write_centronics_busy))
@@ -371,7 +371,7 @@ MACHINE_CONFIG_DERIVED(mtx_state::rs128, mtx512)
MCFG_Z80_DAISY_CHAIN(rs128_daisy_chain)
/* devices */
- MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL_4MHz)
+ MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(4'000'000))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
/* internal ram */
diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp
index 210205bbbde..78f887bc5df 100644
--- a/src/mame/drivers/multfish.cpp
+++ b/src/mame/drivers/multfish.cpp
@@ -1022,7 +1022,7 @@ void igrosoft_gamble_state::machine_reset()
MACHINE_CONFIG_START(igrosoft_gamble_state::igrosoft_gamble)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4)
MCFG_CPU_PROGRAM_MAP(igrosoft_gamble_map)
MCFG_CPU_IO_MAP(igrosoft_gamble_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", igrosoft_gamble_state, irq0_line_hold)
diff --git a/src/mame/drivers/multi8.cpp b/src/mame/drivers/multi8.cpp
index 3827d17e167..8b392e4acf1 100644
--- a/src/mame/drivers/multi8.cpp
+++ b/src/mame/drivers/multi8.cpp
@@ -562,7 +562,7 @@ void multi8_state::machine_reset()
MACHINE_CONFIG_START(multi8_state::multi8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(multi8_mem)
MCFG_CPU_IO_MAP(multi8_io)
@@ -588,7 +588,7 @@ MACHINE_CONFIG_START(multi8_state::multi8)
/* devices */
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard_timer", multi8_state, keyboard_callback, attotime::from_hz(240/32))
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_3_579545MHz/2) /* unknown clock, hand tuned to get ~60 fps */
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(3'579'545)/2) /* unknown clock, hand tuned to get ~60 fps */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(multi8_state, crtc_update_row)
diff --git a/src/mame/drivers/munchmo.cpp b/src/mame/drivers/munchmo.cpp
index c3c6213a2a8..00e0618a7e0 100644
--- a/src/mame/drivers/munchmo.cpp
+++ b/src/mame/drivers/munchmo.cpp
@@ -316,11 +316,11 @@ void munchmo_state::machine_start()
MACHINE_CONFIG_START(munchmo_state::mnchmobl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_15MHz/4) // from pin 13 of XTAL-driven 163
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(15'000'000)/4) // from pin 13 of XTAL-driven 163
MCFG_CPU_PROGRAM_MAP(mnchmobl_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(munchmo_state, generic_irq_ack) // IORQ clears flip-flop at 1-2C
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_15MHz/8) // from pin 12 of XTAL-driven 163
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(15'000'000)/8) // from pin 12 of XTAL-driven 163
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(munchmo_state, generic_irq_ack) // IORQ clears flip-flop at 1-7H
@@ -354,11 +354,11 @@ MACHINE_CONFIG_START(munchmo_state::mnchmobl)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(ASSERTLINE("audiocpu", 0))
/* AY clock speeds confirmed to match known recording */
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_15MHz/8)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(15'000'000)/8)
//MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_15MHz/8)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(15'000'000)/8)
//MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mvme147.cpp b/src/mame/drivers/mvme147.cpp
index 35ba11abe0d..97c01a386a3 100644
--- a/src/mame/drivers/mvme147.cpp
+++ b/src/mame/drivers/mvme147.cpp
@@ -184,7 +184,7 @@
#endif
/* from documentataion: http://www.m88k.com/Docs/147/147aih.pdf but crystal and divider not known */
-#define BAUDGEN_CLOCK XTAL_5MHz
+#define BAUDGEN_CLOCK XTAL(5'000'000)
#define SCC_CLOCK (BAUDGEN_CLOCK) /* This gives prompt at the RS232 terminal device (9600) */
class mvme147_state : public driver_device
@@ -647,7 +647,7 @@ SLOT_INTERFACE_END
*/
MACHINE_CONFIG_START(mvme147_state::mvme147)
/* basic machine hardware */
- MCFG_CPU_ADD ("maincpu", M68030, XTAL_16MHz)
+ MCFG_CPU_ADD ("maincpu", M68030, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP (mvme147_mem)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_SLOT_ADD ("vme", 1, mvme147_vme_cards, nullptr)
diff --git a/src/mame/drivers/mw18w.cpp b/src/mame/drivers/mw18w.cpp
index b824f6a0bc3..6bc99901f66 100644
--- a/src/mame/drivers/mw18w.cpp
+++ b/src/mame/drivers/mw18w.cpp
@@ -269,7 +269,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mw18w_state::mw18w)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_19_968MHz/8)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(19'968'000)/8)
MCFG_CPU_PERIODIC_INT_DRIVER(mw18w_state, irq0_line_assert, 960.516) // 555 IC
MCFG_CPU_PROGRAM_MAP(mw18w_map)
MCFG_CPU_IO_MAP(mw18w_portmap)
diff --git a/src/mame/drivers/mwarr.cpp b/src/mame/drivers/mwarr.cpp
index e37eb9510d0..f6403999654 100644
--- a/src/mame/drivers/mwarr.cpp
+++ b/src/mame/drivers/mwarr.cpp
@@ -47,8 +47,8 @@ Notes:
#include "speaker.h"
-#define MASTER_CLOCK XTAL_12MHz
-#define SOUND_CLOCK XTAL_45MHz
+#define MASTER_CLOCK XTAL(12'000'000)
+#define SOUND_CLOCK XTAL(45'000'000)
class mwarr_state : public driver_device
diff --git a/src/mame/drivers/mwsub.cpp b/src/mame/drivers/mwsub.cpp
index 78edffbc9a0..39789d9a85b 100644
--- a/src/mame/drivers/mwsub.cpp
+++ b/src/mame/drivers/mwsub.cpp
@@ -200,7 +200,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(submar_state::submar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_19_968MHz/8)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(19'968'000)/8)
MCFG_CPU_PERIODIC_INT_DRIVER(submar_state, irq0_line_assert, 124.675) // 555 IC
MCFG_CPU_PROGRAM_MAP(submar_map)
MCFG_CPU_IO_MAP(submar_portmap)
diff --git a/src/mame/drivers/mx2178.cpp b/src/mame/drivers/mx2178.cpp
index abbf1dae590..85d177951a4 100644
--- a/src/mame/drivers/mx2178.cpp
+++ b/src/mame/drivers/mx2178.cpp
@@ -126,7 +126,7 @@ void mx2178_state::machine_reset()
MACHINE_CONFIG_START(mx2178_state::mx2178)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_8696MHz / 5) // guess
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'869'600) / 5) // guess
MCFG_CPU_PROGRAM_MAP(mx2178_mem)
MCFG_CPU_IO_MAP(mx2178_io)
@@ -141,13 +141,13 @@ MACHINE_CONFIG_START(mx2178_state::mx2178)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* Devices */
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_18_8696MHz / 8) // clk unknown
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(18'869'600) / 8) // clk unknown
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(mx2178_state, crtc_update_row)
MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL_18_8696MHz / 30)
+ MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(18'869'600) / 30)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia1", acia6850_device, write_rxc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia2", acia6850_device, write_rxc))
diff --git a/src/mame/drivers/myb3k.cpp b/src/mame/drivers/myb3k.cpp
index 45824bade07..f68b96fe2e9 100644
--- a/src/mame/drivers/myb3k.cpp
+++ b/src/mame/drivers/myb3k.cpp
@@ -927,7 +927,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(myb3k_state::myb3k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz / 3) /* 14.3182 main crystal divided by three through a 8284A */
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181) / 3) /* 14.3182 main crystal divided by three through a 8284A */
MCFG_CPU_PROGRAM_MAP(myb3k_map)
MCFG_CPU_IO_MAP(myb3k_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic", pic8259_device, inta_cb)
@@ -948,7 +948,7 @@ MACHINE_CONFIG_START(myb3k_state::myb3k)
MCFG_I8255_OUT_PORTC_CB(WRITE8(myb3k_state, ppi_portc_w))
/* DMA controller */
- MCFG_DEVICE_ADD("dma", I8257, XTAL_14_31818MHz / 6)
+ MCFG_DEVICE_ADD("dma", I8257, XTAL(14'318'181) / 6)
MCFG_I8257_OUT_HRQ_CB(WRITELINE(myb3k_state, hrq_w))
MCFG_I8257_OUT_TC_CB(WRITELINE(myb3k_state, tc_w))
MCFG_I8257_IN_MEMR_CB(READ8(myb3k_state, dma_memory_read_byte))
@@ -968,15 +968,15 @@ MACHINE_CONFIG_START(myb3k_state::myb3k)
/* Timer */
MCFG_DEVICE_ADD("pit", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_14_31818MHz / 12.0) /* TIMINT straight into IRQ0 */
+ MCFG_PIT8253_CLK0(XTAL(14'318'181) / 12.0) /* TIMINT straight into IRQ0 */
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic", pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_14_31818MHz / 12.0) /* speaker if port c bit 5 is low */
+ MCFG_PIT8253_CLK1(XTAL(14'318'181) / 12.0) /* speaker if port c bit 5 is low */
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(myb3k_state, pit_out1_changed))
- // MCFG_PIT8253_CLK2(XTAL_14_31818MHz / 12.0) /* ANDed with port c bit 6 but marked as "not use"*/
+ // MCFG_PIT8253_CLK2(XTAL(14'318'181) / 12.0) /* ANDed with port c bit 6 but marked as "not use"*/
// MCFG_PIT8253_OUT2_HANDLER(WRITELINE(myb3k_state, pit_out2_changed))
/* Video controller */
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_14_31818MHz / 16) /* Main crystal divided by 16 through a 74163 4 bit counter */
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(14'318'181) / 16) /* Main crystal divided by 16 through a 74163 4 bit counter */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(myb3k_state, crtc_update_row)
@@ -1017,7 +1017,7 @@ MACHINE_CONFIG_START(myb3k_state::myb3k)
/* Monitor */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz / 3, 600, 0, 600, 400, 0, 400)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181) / 3, 600, 0, 600, 400, 0, 400)
MCFG_SCREEN_UPDATE_DEVICE("crtc", h46505_device, screen_update)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp
index 523c9e5e460..7e9c8ec30ac 100644
--- a/src/mame/drivers/mycom.cpp
+++ b/src/mame/drivers/mycom.cpp
@@ -500,7 +500,7 @@ DRIVER_INIT_MEMBER(mycom_state,mycom)
MACHINE_CONFIG_START(mycom_state::mycom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_10MHz / 4)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(10'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(mycom_map)
MCFG_CPU_IO_MAP(mycom_io)
@@ -541,13 +541,13 @@ MACHINE_CONFIG_START(mycom_state::mycom)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
- MCFG_SOUND_ADD("sn1", SN76489, XTAL_10MHz / 4)
+ MCFG_SOUND_ADD("sn1", SN76489, XTAL(10'000'000) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.50)
/* Devices */
- MCFG_MSM5832_ADD("rtc", XTAL_32_768kHz)
+ MCFG_MSM5832_ADD("rtc", XTAL(32'768))
MCFG_CASSETTE_ADD( "cassette" )
- MCFG_FD1771_ADD("fdc", XTAL_16MHz / 16)
+ MCFG_FD1771_ADD("fdc", XTAL(16'000'000) / 16)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", mycom_floppies, "525sd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", mycom_floppies, "525sd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp
index 028706f2f5f..38a6e87a2d0 100644
--- a/src/mame/drivers/mystwarr.cpp
+++ b/src/mame/drivers/mystwarr.cpp
@@ -968,13 +968,13 @@ MACHINE_CONFIG_START(mystwarr_state::mystwarr)
MCFG_K054321_ADD("k054321", ":lspeaker", ":rspeaker")
- MCFG_DEVICE_ADD("k054539_1", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_K054539_TIMER_HANDLER(WRITELINE(mystwarr_state, k054539_nmi_gen))
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
- MCFG_DEVICE_ADD("k054539_2", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
diff --git a/src/mame/drivers/myvision.cpp b/src/mame/drivers/myvision.cpp
index 70bd79cc767..eff03f0c0cc 100644
--- a/src/mame/drivers/myvision.cpp
+++ b/src/mame/drivers/myvision.cpp
@@ -210,12 +210,12 @@ WRITE8_MEMBER( myvision_state::ay_port_b_w )
MACHINE_CONFIG_START(myvision_state::myvision)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_10_738635MHz/3) /* Not verified */
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(10'738'635)/3) /* Not verified */
MCFG_CPU_PROGRAM_MAP(myvision_mem)
MCFG_CPU_IO_MAP(myvision_io)
/* video hardware */
- MCFG_DEVICE_ADD( "tms9918", TMS9918A, XTAL_10_738635MHz / 2 ) /* Exact model not verified */
+ MCFG_DEVICE_ADD( "tms9918", TMS9918A, XTAL(10'738'635) / 2 ) /* Exact model not verified */
MCFG_TMS9928A_VRAM_SIZE(0x4000) /* Not verified */
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
@@ -223,7 +223,7 @@ MACHINE_CONFIG_START(myvision_state::myvision)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL_10_738635MHz/3/2) /* Exact model and clock not verified */
+ MCFG_SOUND_ADD("ay8910", AY8910, XTAL(10'738'635)/3/2) /* Exact model and clock not verified */
MCFG_AY8910_PORT_A_READ_CB(READ8(myvision_state, ay_port_a_r))
MCFG_AY8910_PORT_B_READ_CB(READ8(myvision_state, ay_port_b_r))
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(myvision_state, ay_port_a_w))
diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp
index ad2972fccf6..e0e748a65d4 100644
--- a/src/mame/drivers/mz2000.cpp
+++ b/src/mame/drivers/mz2000.cpp
@@ -38,7 +38,7 @@
#include "formats/mz_cas.h"
-#define MASTER_CLOCK XTAL_17_73447MHz/5 /* TODO: was 4 MHz, but otherwise cassette won't work due of a bug with MZF support ... */
+#define MASTER_CLOCK XTAL(17'734'470)/5 /* TODO: was 4 MHz, but otherwise cassette won't work due of a bug with MZF support ... */
#define UTF8_POUND "\xc2\xa3"
#define UTF8_YEN "\xc2\xa5"
@@ -888,7 +888,7 @@ MACHINE_CONFIG_START(mz2000_state::mz2000)
MCFG_PIT8253_CLK1(31250) /* needed by "Art Magic" to boot */
MCFG_PIT8253_CLK2(31250)
- MCFG_MB8877_ADD("mb8877a", XTAL_1MHz)
+ MCFG_MB8877_ADD("mb8877a", XTAL(1'000'000))
MCFG_FLOPPY_DRIVE_ADD("mb8877a:0", mz2000_floppies, "dd", mz2000_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("mb8877a:1", mz2000_floppies, "dd", mz2000_state::floppy_formats)
diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp
index ed3ce76aa8f..7ba32891e53 100644
--- a/src/mame/drivers/mz2500.cpp
+++ b/src/mame/drivers/mz2500.cpp
@@ -2100,7 +2100,7 @@ MACHINE_CONFIG_START(mz2500_state::mz2500)
MCFG_DEVICE_ADD("z80sio", Z80SIO, 6000000)
- MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL(32'768))
MCFG_RP5C15_OUT_ALARM_CB(WRITELINE(mz2500_state, mz2500_rtc_alarm_irq))
MCFG_DEVICE_ADD("pit", PIT8253, 0)
@@ -2111,7 +2111,7 @@ MACHINE_CONFIG_START(mz2500_state::mz2500)
MCFG_PIT8253_CLK2(16) //CH2, used by Super MZ demo / The Black Onyx and a few others (TODO: timing of this)
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pit", pit8253_device, write_clk1))
- MCFG_MB8877_ADD("mb8877a", XTAL_1MHz)
+ MCFG_MB8877_ADD("mb8877a", XTAL(1'000'000))
MCFG_FLOPPY_DRIVE_ADD("mb8877a:0", mz2500_floppies, "dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("mb8877a:1", mz2500_floppies, "dd", floppy_image_device::default_floppy_formats)
@@ -2122,7 +2122,7 @@ MACHINE_CONFIG_START(mz2500_state::mz2500)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_21_4772MHz, 640+108, 0, 640, 480, 0, 200) //unknown clock / divider
+ MCFG_SCREEN_RAW_PARAMS(XTAL(21'477'272), 640+108, 0, 640, 480, 0, 200) //unknown clock / divider
MCFG_SCREEN_UPDATE_DRIVER(mz2500_state, screen_update_mz2500)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp
index 1e30dbbb234..8aef739fd0c 100644
--- a/src/mame/drivers/mz3500.cpp
+++ b/src/mame/drivers/mz3500.cpp
@@ -38,7 +38,7 @@
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_8MHz
+#define MAIN_CLOCK XTAL(8'000'000)
class mz3500_state : public driver_device
{
diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp
index 87ac8144c1e..00fe811996a 100644
--- a/src/mame/drivers/mz700.cpp
+++ b/src/mame/drivers/mz700.cpp
@@ -370,7 +370,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(mz_state::mz700)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_17_73447MHz/5)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(17'734'470)/5)
MCFG_CPU_PROGRAM_MAP(mz700_mem)
MCFG_CPU_IO_MAP(mz700_io)
MCFG_DEVICE_ADD("banke", ADDRESS_MAP_BANK, 0)
@@ -384,7 +384,7 @@ MACHINE_CONFIG_START(mz_state::mz700)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_17_73447MHz/2, 568, 0, 40*8, 312, 0, 25*8)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(17'734'470)/2, 568, 0, 40*8, 312, 0, 25*8)
MCFG_SCREEN_UPDATE_DRIVER(mz_state, screen_update_mz700)
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD_3BIT_RGB("palette")
@@ -404,7 +404,7 @@ MACHINE_CONFIG_START(mz_state::mz700)
/* devices */
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_17_73447MHz/20)
+ MCFG_PIT8253_CLK0(XTAL(17'734'470)/20)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(mz_state, pit_out0_changed))
MCFG_PIT8253_CLK1(15611.0)
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pit8253", pit8253_device, write_clk2))
@@ -452,7 +452,7 @@ MACHINE_CONFIG_DERIVED(mz_state::mz800, mz700)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(mz_state, screen_update_mz800)
- MCFG_SOUND_ADD("sn76489n", SN76489, XTAL_17_73447MHz/5)
+ MCFG_SOUND_ADD("sn76489n", SN76489, XTAL(17'734'470)/5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_REMOVE("cass_list")
@@ -460,9 +460,9 @@ MACHINE_CONFIG_DERIVED(mz_state::mz800, mz700)
/* devices */
MCFG_DEVICE_MODIFY("pit8253")
- MCFG_PIT8253_CLK0(XTAL_17_73447MHz/16)
+ MCFG_PIT8253_CLK0(XTAL(17'734'470)/16)
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_17_73447MHz/5)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(17'734'470)/5)
MCFG_Z80PIO_OUT_INT_CB(WRITELINE(mz_state, mz800_z80pio_irq))
MCFG_Z80PIO_IN_PA_CB(READ8(mz_state, mz800_z80pio_port_a_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(mz_state, mz800_z80pio_port_a_w))
diff --git a/src/mame/drivers/mz80.cpp b/src/mame/drivers/mz80.cpp
index 7ca064ef90e..f414d6bed60 100644
--- a/src/mame/drivers/mz80.cpp
+++ b/src/mame/drivers/mz80.cpp
@@ -278,7 +278,7 @@ MACHINE_CONFIG_START(mz80_state::mz80k)
/* basic machine hardware */
/* main CPU */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 4) /* 2 MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 4) /* 2 MHz */
MCFG_CPU_PROGRAM_MAP(mz80k_mem)
MCFG_CPU_IO_MAP(mz80k_io)
@@ -309,9 +309,9 @@ MACHINE_CONFIG_START(mz80_state::mz80k)
MCFG_I8255_OUT_PORTC_CB(WRITE8(mz80_state, mz80k_8255_portc_w))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_8MHz/4)
+ MCFG_PIT8253_CLK0(XTAL(8'000'000)/4)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(mz80_state, pit_out0_changed))
- MCFG_PIT8253_CLK1(XTAL_8MHz/256)
+ MCFG_PIT8253_CLK1(XTAL(8'000'000)/256)
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pit8253", pit8253_device, write_clk2))
MCFG_PIT8253_CLK2(0)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(mz80_state, pit_out2_changed))
diff --git a/src/mame/drivers/mzr8105.cpp b/src/mame/drivers/mzr8105.cpp
index da7e3e25ee1..55b7898b7d1 100644
--- a/src/mame/drivers/mzr8105.cpp
+++ b/src/mame/drivers/mzr8105.cpp
@@ -205,7 +205,7 @@ SLOT_INTERFACE_END
* Machine configuration
*/
MACHINE_CONFIG_START(mzr8105_state::mzr8105)
- MCFG_CPU_ADD ("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD ("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP (mzr8105_mem)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_BUS_OWNER_SPACES()
diff --git a/src/mame/drivers/n8080.cpp b/src/mame/drivers/n8080.cpp
index 6adbefebb1d..e96d994b8da 100644
--- a/src/mame/drivers/n8080.cpp
+++ b/src/mame/drivers/n8080.cpp
@@ -16,7 +16,7 @@
#include "cpu/i8085/i8085.h"
#include "includes/n8080.h"
-#define MASTER_CLOCK XTAL_20_16MHz
+#define MASTER_CLOCK XTAL(20'160'000)
WRITE8_MEMBER(n8080_state::n8080_shift_bits_w)
@@ -565,7 +565,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(n8080_state::westgun2, sheriff)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", I8080, XTAL_19_968MHz / 10)
+ MCFG_CPU_REPLACE("maincpu", I8080, XTAL(19'968'000) / 10)
MCFG_I8085A_STATUS(WRITE8(n8080_state,n8080_status_callback))
MCFG_I8085A_INTE(WRITELINE(n8080_state,n8080_inte_callback))
MCFG_CPU_PROGRAM_MAP(main_cpu_map)
diff --git a/src/mame/drivers/nakajies.cpp b/src/mame/drivers/nakajies.cpp
index 5c263cfaa9b..5cb46218bc6 100644
--- a/src/mame/drivers/nakajies.cpp
+++ b/src/mame/drivers/nakajies.cpp
@@ -764,7 +764,7 @@ MACHINE_CONFIG_START(nakajies_state::nakajies210)
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
/* rtc */
- MCFG_DEVICE_ADD("rtc", RP5C01, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768))
MCFG_TIMER_DRIVER_ADD_PERIODIC("kb_timer", nakajies_state, kb_timer, attotime::from_hz(250))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/namcona1.cpp b/src/mame/drivers/namcona1.cpp
index 6ca638e0492..bf3a5573139 100644
--- a/src/mame/drivers/namcona1.cpp
+++ b/src/mame/drivers/namcona1.cpp
@@ -171,7 +171,7 @@ Notes:
#include "machine/namcomcu.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_50_113MHz
+#define MASTER_CLOCK XTAL(50'113'000)
/*************************************************************************/
diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp
index cdb11f6428e..6047a766f6f 100644
--- a/src/mame/drivers/namconb1.cpp
+++ b/src/mame/drivers/namconb1.cpp
@@ -281,7 +281,7 @@ GFX: Custom 145 ( 80 pin PQFP)
#include "speaker.h"
-#define MASTER_CLOCK XTAL_48_384MHz
+#define MASTER_CLOCK XTAL(48'384'000)
#define ENABLE_LOGGING (0)
diff --git a/src/mame/drivers/namcond1.cpp b/src/mame/drivers/namcond1.cpp
index d7152d6e0b9..9667e2a3cc8 100644
--- a/src/mame/drivers/namcond1.cpp
+++ b/src/mame/drivers/namcond1.cpp
@@ -346,11 +346,11 @@ WRITE_LINE_MEMBER( namcond1_state::raster_irq_w )
MACHINE_CONFIG_START(namcond1_state::namcond1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_49_152MHz/4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(49'152'000)/4)
MCFG_CPU_PROGRAM_MAP(namcond1_map)
// MCFG_CPU_VBLANK_INT_DRIVER("screen", namcond1_state, irq1_line_hold)
- MCFG_CPU_ADD("mcu", H83002, XTAL_49_152MHz/3 )
+ MCFG_CPU_ADD("mcu", H83002, XTAL(49'152'000)/3 )
MCFG_CPU_PROGRAM_MAP( nd1h8rwmap)
MCFG_CPU_IO_MAP( nd1h8iomap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", namcond1_state, mcu_interrupt)
@@ -369,7 +369,7 @@ MACHINE_CONFIG_START(namcond1_state::namcond1)
H 804 108 576 48 32
V 261 26 224 3 0
*/
- MCFG_SCREEN_RAW_PARAMS( XTAL_49_152MHz/8, 804/2, 108/2, (108+576)/2, 261, 26, 26+224)
+ MCFG_SCREEN_RAW_PARAMS( XTAL(49'152'000)/8, 804/2, 108/2, (108+576)/2, 261, 26, 26+224)
MCFG_SCREEN_UPDATE_DEVICE("ygv608", ygv608_device, update_screen)
MCFG_SCREEN_PALETTE("palette")
@@ -378,7 +378,7 @@ MACHINE_CONFIG_START(namcond1_state::namcond1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_C352_ADD("c352", XTAL_49_152MHz/2, 288)
+ MCFG_C352_ADD("c352", XTAL(49'152'000)/2, 288)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
//MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) // Second DAC not present.
@@ -390,7 +390,7 @@ MACHINE_CONFIG_START(namcond1_state::namcond1)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(namcond1_state::abcheck, namcond1)
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL_49_152MHz/4)
+ MCFG_CPU_REPLACE("maincpu", M68000, XTAL(49'152'000)/4)
MCFG_CPU_PROGRAM_MAP(abcheck_map)
// MCFG_CPU_VBLANK_INT_DRIVER("screen", namcond1_state, irq1_line_hold)
diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp
index d530d7b71c6..198119e4037 100644
--- a/src/mame/drivers/namcos1.cpp
+++ b/src/mame/drivers/namcos1.cpp
@@ -1020,19 +1020,19 @@ GFXDECODE_END
MACHINE_CONFIG_START(namcos1_state::ns1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_49_152MHz/32)
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(49'152'000)/32)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos1_state, irq0_line_assert)
- MCFG_CPU_ADD("subcpu", MC6809E, XTAL_49_152MHz/32)
+ MCFG_CPU_ADD("subcpu", MC6809E, XTAL(49'152'000)/32)
MCFG_CPU_PROGRAM_MAP(sub_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos1_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL_49_152MHz/32)
+ MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(49'152'000)/32)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos1_state, irq0_line_assert)
- MCFG_CPU_ADD("mcu", HD63701, XTAL_49_152MHz/8)
+ MCFG_CPU_ADD("mcu", HD63701, XTAL(49'152'000)/8)
MCFG_CPU_PROGRAM_MAP(mcu_map)
MCFG_CPU_IO_MAP(mcu_port_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos1_state, irq0_line_assert)
@@ -1049,7 +1049,7 @@ MACHINE_CONFIG_START(namcos1_state::ns1)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_49_152MHz/8, 384, 9+8*8, 9+44*8, 264, 2*8, 30*8)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(49'152'000)/8, 384, 9+8*8, 9+44*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(namcos1_state, screen_update)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(namcos1_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
@@ -1070,7 +1070,7 @@ MACHINE_CONFIG_START(namcos1_state::ns1)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL_49_152MHz/2048/2)
+ MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2048/2)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_NAMCO_AUDIO_STEREO(1)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
diff --git a/src/mame/drivers/namcos10.cpp b/src/mame/drivers/namcos10.cpp
index 7b091891614..c093feb28b1 100644
--- a/src/mame/drivers/namcos10.cpp
+++ b/src/mame/drivers/namcos10.cpp
@@ -910,7 +910,7 @@ MACHINE_RESET_MEMBER(namcos10_state,namcos10)
MACHINE_CONFIG_START(namcos10_state::namcos10_memm)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8606BQ, XTAL_101_4912MHz )
+ MCFG_CPU_ADD( "maincpu", CXD8606BQ, XTAL(101'491'200) )
MCFG_CPU_PROGRAM_MAP( namcos10_memm_map )
// The bios first configures the rom window as 80000-big, then
@@ -926,7 +926,7 @@ MACHINE_CONFIG_START(namcos10_state::namcos10_memm)
MCFG_MACHINE_RESET_OVERRIDE(namcos10_state, namcos10 )
/* video hardware */
- MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561CQ, 0x200000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561CQ, 0x200000, XTAL(53'693'175) )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -934,7 +934,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos10_state::namcos10_memn)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8606BQ, XTAL_101_4912MHz )
+ MCFG_CPU_ADD( "maincpu", CXD8606BQ, XTAL(101'491'200) )
MCFG_CPU_PROGRAM_MAP( namcos10_memn_map )
// The bios first configures the rom window as 80000-big, then
@@ -950,7 +950,7 @@ MACHINE_CONFIG_START(namcos10_state::namcos10_memn)
MCFG_MACHINE_RESET_OVERRIDE(namcos10_state, namcos10 )
/* video hardware */
- MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561CQ, 0x200000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561CQ, 0x200000, XTAL(53'693'175) )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp
index efa4eb1ff03..c661566ade2 100644
--- a/src/mame/drivers/namcos11.cpp
+++ b/src/mame/drivers/namcos11.cpp
@@ -593,7 +593,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos11_state::mcu_adc_cb)
}
MACHINE_CONFIG_START(namcos11_state::coh110)
- MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz )
+ MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) )
MCFG_CPU_PROGRAM_MAP( namcos11_map )
MCFG_RAM_MODIFY("maincpu:ram")
@@ -608,7 +608,7 @@ MACHINE_CONFIG_START(namcos11_state::coh110)
MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_irq2", namcos11_state, mcu_irq2_cb, attotime::from_hz(60))
MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_adc", namcos11_state, mcu_adc_cb, attotime::from_hz(60))
- MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL(53'693'175) )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -622,13 +622,13 @@ MACHINE_CONFIG_START(namcos11_state::coh110)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(namcos11_state::coh100, coh110)
- MCFG_CPU_REPLACE( "maincpu", CXD8530AQ, XTAL_67_7376MHz )
+ MCFG_CPU_REPLACE( "maincpu", CXD8530AQ, XTAL(67'737'600) )
MCFG_CPU_PROGRAM_MAP( namcos11_map )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
- MCFG_PSXGPU_REPLACE( "maincpu", "gpu", CXD8538Q, 0x200000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_REPLACE( "maincpu", "gpu", CXD8538Q, 0x200000, XTAL(53'693'175) )
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(namcos11_state::tekken, coh100)
diff --git a/src/mame/drivers/namcos12.cpp b/src/mame/drivers/namcos12.cpp
index b1ce95b716f..e70b54523cf 100644
--- a/src/mame/drivers/namcos12.cpp
+++ b/src/mame/drivers/namcos12.cpp
@@ -1674,7 +1674,7 @@ DRIVER_INIT_MEMBER(namcos12_state,technodr)
MACHINE_CONFIG_START(namcos12_state::coh700)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", CXD8661R, XTAL_100MHz)
+ MCFG_CPU_ADD("maincpu", CXD8661R, XTAL(100'000'000))
MCFG_CPU_PROGRAM_MAP( namcos12_map)
MCFG_RAM_MODIFY("maincpu:ram")
@@ -1688,7 +1688,7 @@ MACHINE_CONFIG_START(namcos12_state::coh700)
MCFG_NAMCO_SETTINGS_ADD("namco_settings")
- MCFG_RTC4543_ADD("rtc", XTAL_32_768kHz)
+ MCFG_RTC4543_ADD("rtc", XTAL(32'768))
MCFG_RTC4543_DATA_CALLBACK(DEVWRITELINE("sub:sci1", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("sub:sci1")
@@ -1699,7 +1699,7 @@ MACHINE_CONFIG_START(namcos12_state::coh700)
MCFG_AT28C16_ADD("at28c16", nullptr)
/* video hardware */
- MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8654Q, 0x200000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8654Q, 0x200000, XTAL(53'693'175) )
MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate(&namcos12_state::namcos12_sub_irq, this ) )
/* sound hardware */
@@ -1733,7 +1733,7 @@ MACHINE_CONFIG_DERIVED(namcos12_boothack_state::golgo13, coh700)
MCFG_CPU_IO_MAP(golgo13_h8iomap)
MACHINE_CONFIG_END
-#define JVSCLOCK (XTAL_14_7456MHz)
+#define JVSCLOCK (XTAL(14'745'600))
static ADDRESS_MAP_START( jvsmap, AS_PROGRAM, 16, namcos12_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM AM_REGION("iocpu", 0)
AM_RANGE(0xc000, 0xffff) AM_RAM
diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp
index d21851ac08e..74b7503abc8 100644
--- a/src/mame/drivers/namcos2.cpp
+++ b/src/mame/drivers/namcos2.cpp
@@ -461,12 +461,12 @@ $a00000 checks have been seen on the Final Lap boards.
/* Define clocks based on actual OSC on the PCB */
-#define MAIN_OSC_CLOCK XTAL_49_152MHz
+#define MAIN_OSC_CLOCK XTAL(49'152'000)
#define M68K_CPU_CLOCK (MAIN_OSC_CLOCK / 4) /* 12.288MHz clock for 68000 (Master & Slave) */
#define M68B09_CPU_CLOCK (MAIN_OSC_CLOCK / 24) /* 2.048MHz clock for 68B09 sound CPU */
#define C65_CPU_CLOCK (MAIN_OSC_CLOCK / 24) /* 2.048MHz clock for 63705 (or 63B05) I/O CPU */
#define C68_CPU_CLOCK (MAIN_OSC_CLOCK / 6) /* 8.192MHz clock for 37450 I/O CPU */
-#define YM2151_SOUND_CLOCK XTAL_3_579545MHz /* 3.579545MHz FM clock */
+#define YM2151_SOUND_CLOCK XTAL(3'579'545) /* 3.579545MHz FM clock */
#define C140_SOUND_CLOCK (MAIN_OSC_CLOCK / 384 / 6) /* 21.333kHz C140 clock (was 8000000/374 or 21.390kHz) */
diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp
index f113e0cca4d..5fe0a814984 100644
--- a/src/mame/drivers/namcos22.cpp
+++ b/src/mame/drivers/namcos22.cpp
@@ -1166,7 +1166,7 @@
#include "speaker.h"
-#define SS22_MASTER_CLOCK (XTAL_49_152MHz) /* info from Guru */
+#define SS22_MASTER_CLOCK (XTAL(49'152'000)) /* info from Guru */
#define PIXEL_CLOCK (SS22_MASTER_CLOCK/2)
@@ -3765,7 +3765,7 @@ MACHINE_CONFIG_START(namcos22_state::namcos22)
MCFG_CPU_PROGRAM_MAP( mcu_s22_program)
MCFG_CPU_IO_MAP( mcu_s22_io)
- MCFG_CPU_ADD("iomcu", NAMCO_C74, XTAL_6_144MHz) // 6.144MHz XTAL on I/O board, not sure if it has a divider
+ MCFG_CPU_ADD("iomcu", NAMCO_C74, XTAL(6'144'000)) // 6.144MHz XTAL on I/O board, not sure if it has a divider
MCFG_CPU_PROGRAM_MAP( iomcu_s22_program)
MCFG_CPU_IO_MAP( iomcu_s22_io)
diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp
index 85ab3a0bdf0..d25c41ad89f 100644
--- a/src/mame/drivers/namcos23.cpp
+++ b/src/mame/drivers/namcos23.cpp
@@ -1269,7 +1269,7 @@ Notes:
#include <float.h>
-#define JVSCLOCK (XTAL_14_7456MHz)
+#define JVSCLOCK (XTAL(14'745'600))
//#define H8CLOCK (16737350) /* from 2061 */
//#define BUSCLOCK (16737350*2) /* 33MHz CPU bus clock / input */
@@ -3573,7 +3573,7 @@ MACHINE_CONFIG_START(namcos23_state::gorgon)
MCFG_NAMCO_SETTINGS_ADD("namco_settings")
- MCFG_RTC4543_ADD("rtc", XTAL_32_768kHz)
+ MCFG_RTC4543_ADD("rtc", XTAL(32'768))
MCFG_RTC4543_DATA_CALLBACK(DEVWRITELINE("subcpu:sci1", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("subcpu:sci1")
@@ -3639,7 +3639,7 @@ MACHINE_CONFIG_START(namcos23_state::s23)
MCFG_NAMCO_SETTINGS_ADD("namco_settings")
- MCFG_RTC4543_ADD("rtc", XTAL_32_768kHz)
+ MCFG_RTC4543_ADD("rtc", XTAL(32'768))
MCFG_RTC4543_DATA_CALLBACK(DEVWRITELINE("subcpu:sci1", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("subcpu:sci1")
@@ -3688,7 +3688,7 @@ MACHINE_CONFIG_DERIVED(namcos23_state::gmen, s23)
MCFG_CPU_CLOCK(BUSCLOCK*5)
MCFG_CPU_PROGRAM_MAP(gmen_mips_map)
- MCFG_CPU_ADD("gmen_sh2", SH2, XTAL_28_7MHz)
+ MCFG_CPU_ADD("gmen_sh2", SH2, XTAL(28'700'000))
MCFG_CPU_PROGRAM_MAP(gmen_sh2_map)
MCFG_MACHINE_RESET_OVERRIDE(namcos23_state,gmen)
@@ -3716,7 +3716,7 @@ MACHINE_CONFIG_START(namcos23_state::ss23)
MCFG_NAMCO_SETTINGS_ADD("namco_settings")
- MCFG_RTC4543_ADD("rtc", XTAL_32_768kHz)
+ MCFG_RTC4543_ADD("rtc", XTAL(32'768))
MCFG_RTC4543_DATA_CALLBACK(DEVWRITELINE("subcpu:sci1", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("subcpu:sci1")
diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp
index fb7c6d0d197..5b275f79ba2 100644
--- a/src/mame/drivers/namcos86.cpp
+++ b/src/mame/drivers/namcos86.cpp
@@ -1050,15 +1050,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(namcos86_state::hopmappy)
/* basic machine hardware */
- MCFG_CPU_ADD("cpu1", MC6809E, XTAL_49_152MHz/32)
+ MCFG_CPU_ADD("cpu1", MC6809E, XTAL(49'152'000)/32)
MCFG_CPU_PROGRAM_MAP(cpu1_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos86_state, irq0_line_assert)
- MCFG_CPU_ADD("cpu2", MC6809E, XTAL_49_152MHz/32)
+ MCFG_CPU_ADD("cpu2", MC6809E, XTAL(49'152'000)/32)
MCFG_CPU_PROGRAM_MAP(hopmappy_cpu2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos86_state, irq0_line_assert)
- MCFG_CPU_ADD("mcu", HD63701, XTAL_49_152MHz/8) /* or compatible 6808 with extra instructions */
+ MCFG_CPU_ADD("mcu", HD63701, XTAL(49'152'000)/8) /* or compatible 6808 with extra instructions */
MCFG_CPU_PROGRAM_MAP(hopmappy_mcu_map)
MCFG_CPU_IO_MAP(mcu_port_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos86_state, irq0_line_hold) /* ??? */
@@ -1069,7 +1069,7 @@ MACHINE_CONFIG_START(namcos86_state::hopmappy)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_49_152MHz/8, 384, 3+8*8, 3+44*8, 264, 2*8, 30*8)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(49'152'000)/8, 384, 3+8*8, 3+44*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(namcos86_state, screen_update)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(namcos86_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
@@ -1085,7 +1085,7 @@ MACHINE_CONFIG_START(namcos86_state::hopmappy)
MCFG_SOUND_ROUTE(0, "mono", 0.0)
MCFG_SOUND_ROUTE(1, "mono", 0.60) /* only right channel is connected */
- MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL_49_152MHz/2048)
+ MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2048)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp
index 4b22669b3c6..754b47332ca 100644
--- a/src/mame/drivers/nanos.cpp
+++ b/src/mame/drivers/nanos.cpp
@@ -457,7 +457,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(nanos_state::nanos)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(nanos_mem)
MCFG_CPU_IO_MAP(nanos_io)
MCFG_Z80_DAISY_CHAIN(nanos_daisy_chain)
@@ -475,31 +475,31 @@ MACHINE_CONFIG_START(nanos_state::nanos)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* devices */
- MCFG_DEVICE_ADD("z80ctc_0", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("z80ctc_0", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(nanos_state, ctc_z0_w))
MCFG_Z80CTC_ZC1_CB(WRITELINE(nanos_state, ctc_z1_w))
MCFG_Z80CTC_ZC2_CB(WRITELINE(nanos_state, ctc_z2_w))
- MCFG_DEVICE_ADD("z80ctc_1", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("z80ctc_1", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(nanos_state, ctc_z0_w))
MCFG_Z80CTC_ZC1_CB(WRITELINE(nanos_state, ctc_z1_w))
MCFG_Z80CTC_ZC2_CB(WRITELINE(nanos_state, ctc_z2_w))
- MCFG_DEVICE_ADD("z80pio_0", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("z80pio_0", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("z80pio_1", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("z80pio_1", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("z80sio_0", Z80SIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("z80sio_0", Z80SIO, XTAL(4'000'000))
MCFG_Z80SIO_OUT_INT_CB(WRITELINE(nanos_state, z80daisy_interrupt))
- MCFG_DEVICE_ADD("z80sio_1", Z80SIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("z80sio_1", Z80SIO, XTAL(4'000'000))
MCFG_Z80SIO_OUT_INT_CB(WRITELINE(nanos_state, z80daisy_interrupt))
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_IN_PA_CB(READ8(nanos_state, nanos_port_a_r))
MCFG_Z80PIO_IN_PB_CB(READ8(nanos_state, nanos_port_b_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(nanos_state, nanos_port_b_w))
diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp
index 0393cc038cc..32670ce8b70 100644
--- a/src/mame/drivers/naomi.cpp
+++ b/src/mame/drivers/naomi.cpp
@@ -2704,7 +2704,7 @@ MACHINE_CONFIG_START(dc_state::naomi_aw_base)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dc_state, dc_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("soundcpu", ARM7, ((XTAL_33_8688MHz*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8.
+ MCFG_CPU_ADD("soundcpu", ARM7, ((XTAL(33'868'800)*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8.
MCFG_CPU_PROGRAM_MAP(dc_audio_map)
MCFG_MAPLE_DC_ADD( "maple_dc", "maincpu", dc_maple_irq )
@@ -2725,7 +2725,7 @@ MACHINE_CONFIG_START(dc_state::naomi_aw_base)
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 2.0)
- MCFG_AICARTC_ADD("aicartc", XTAL_32_768kHz )
+ MCFG_AICARTC_ADD("aicartc", XTAL(32'768) )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(naomi_state::naomi_base)
diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp
index 2699e30dc91..4d8229ba101 100644
--- a/src/mame/drivers/nascom1.cpp
+++ b/src/mame/drivers/nascom1.cpp
@@ -648,7 +648,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(nascom_state::nascom1)
// main cpu
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 8)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 8)
MCFG_CPU_PROGRAM_MAP(nascom1_mem)
MCFG_CPU_IO_MAP(nascom1_io)
@@ -666,8 +666,8 @@ MACHINE_CONFIG_START(nascom_state::nascom1)
// uart
MCFG_DEVICE_ADD( "hd6402", AY31015, 0 )
- MCFG_AY31015_TX_CLOCK(( XTAL_16MHz / 16 ) / 256)
- MCFG_AY31015_RX_CLOCK(( XTAL_16MHz / 16 ) / 256)
+ MCFG_AY31015_TX_CLOCK(( XTAL(16'000'000) / 16 ) / 256)
+ MCFG_AY31015_RX_CLOCK(( XTAL(16'000'000) / 16 ) / 256)
MCFG_AY51013_READ_SI_CB(READ8(nascom_state, nascom1_hd6402_si))
MCFG_AY51013_WRITE_SO_CB(WRITE8(nascom_state, nascom1_hd6402_so))
@@ -675,7 +675,7 @@ MACHINE_CONFIG_START(nascom_state::nascom1)
MCFG_CASSETTE_ADD("cassette")
// pio
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_16MHz/8)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(16'000'000)/8)
// internal extra ram
MCFG_RAM_ADD(RAM_TAG)
@@ -687,7 +687,7 @@ MACHINE_CONFIG_START(nascom_state::nascom1)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(nascom2_state::nascom2, nascom1)
- MCFG_CPU_REPLACE("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_REPLACE("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(nascom2_mem)
MCFG_CPU_IO_MAP(nascom2_io)
diff --git a/src/mame/drivers/nc.cpp b/src/mame/drivers/nc.cpp
index a897e14c92b..509644b78e0 100644
--- a/src/mame/drivers/nc.cpp
+++ b/src/mame/drivers/nc.cpp
@@ -1440,7 +1440,7 @@ MACHINE_CONFIG_START(nc_state::nc100)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(nc_state, write_uart_clock))
/* rtc */
- MCFG_DEVICE_ADD("rtc", TC8521, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", TC8521, XTAL(32'768))
MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(nc_state, nc100_tc8521_alarm_callback))
/* cartridge */
@@ -1501,7 +1501,7 @@ MACHINE_CONFIG_DERIVED(nc_state::nc200, nc100)
MCFG_FLOPPY_DRIVE_ADD("upd765:0", ibmpc_floppies, "525dd", ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", ibmpc_floppies, "525dd", ibmpc_floppy_formats)
- MCFG_MC146818_ADD( "mc", XTAL_4_194304Mhz )
+ MCFG_MC146818_ADD( "mc", XTAL(4'194'304) )
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp
index bb714edf32f..1059888c638 100644
--- a/src/mame/drivers/neogeo.cpp
+++ b/src/mame/drivers/neogeo.cpp
@@ -1662,7 +1662,7 @@ MACHINE_CONFIG_DERIVED(neogeo_state::neogeo_arcade, neogeo_base)
MCFG_WATCHDOG_MODIFY("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_ticks(3244030, NEOGEO_MASTER_CLOCK))
- MCFG_UPD4990A_ADD("upd4990a", XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD4990A_ADD("upd4990a", XTAL(32'768), NOOP, NOOP)
MCFG_NVRAM_ADD_0FILL("saveram")
MCFG_NEOGEO_MEMCARD_ADD("memcard")
diff --git a/src/mame/drivers/neoprint.cpp b/src/mame/drivers/neoprint.cpp
index dd90d1b0ae0..9ef1112f51b 100644
--- a/src/mame/drivers/neoprint.cpp
+++ b/src/mame/drivers/neoprint.cpp
@@ -496,7 +496,7 @@ MACHINE_CONFIG_START(neoprint_state::neoprint)
MCFG_CPU_PROGRAM_MAP(neoprint_audio_map)
MCFG_CPU_IO_MAP(neoprint_audio_io_map)
- MCFG_UPD4990A_ADD("upd4990a", XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD4990A_ADD("upd4990a", XTAL(32'768), NOOP, NOOP)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", neoprint)
@@ -539,7 +539,7 @@ MACHINE_CONFIG_START(neoprint_state::nprsp)
MCFG_CPU_PROGRAM_MAP(neoprint_audio_map)
MCFG_CPU_IO_MAP(neoprint_audio_io_map)
- MCFG_UPD4990A_ADD("upd4990a", XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD4990A_ADD("upd4990a", XTAL(32'768), NOOP, NOOP)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", neoprint)
diff --git a/src/mame/drivers/nes.cpp b/src/mame/drivers/nes.cpp
index d780f9c822c..96e69b8c2a9 100644
--- a/src/mame/drivers/nes.cpp
+++ b/src/mame/drivers/nes.cpp
@@ -65,7 +65,7 @@ MACHINE_CONFIG_START(nes_state::nes)
// the number of cycles in each scanline for the PPU scanline timer. Since the PPU has 20 vblank scanlines + 2
// non-rendering scanlines, we compensate. This ends up being 2500 cycles for the non-rendering portion, 2273
// cycles for the actual vblank period.
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((113.66/(NTSC_APU_CLOCK/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_NTSC-ppu2c0x_device::VBLANK_FIRST_SCANLINE+1+2)))
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((113.66/(NTSC_APU_CLOCK.dvalue()/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_NTSC-ppu2c0x_device::VBLANK_FIRST_SCANLINE+1+2)))
MCFG_SCREEN_SIZE(32*8, 262)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(nes_state, screen_update_nes)
@@ -110,7 +110,7 @@ MACHINE_CONFIG_DERIVED(nes_state::nespal, nes)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(50.0070)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((106.53/(PAL_APU_CLOCK/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_PAL-ppu2c0x_device::VBLANK_FIRST_SCANLINE+1+2)))
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((106.53/(PAL_APU_CLOCK.dvalue()/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_PAL-ppu2c0x_device::VBLANK_FIRST_SCANLINE+1+2)))
MCFG_SCREEN_SIZE(32*8, 312)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
MACHINE_CONFIG_END
@@ -141,7 +141,7 @@ MACHINE_CONFIG_DERIVED(nes_state::nespalc, nespal)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(50.0070)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((113.66/(PALC_APU_CLOCK/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_PAL-ppu2c0x_device::VBLANK_FIRST_SCANLINE_PALC+1+2)))
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((113.66/(PALC_APU_CLOCK.dvalue()/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_PAL-ppu2c0x_device::VBLANK_FIRST_SCANLINE_PALC+1+2)))
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(nes_state::famipalc, nespalc)
diff --git a/src/mame/drivers/nes_vt.cpp b/src/mame/drivers/nes_vt.cpp
index 303a19843bf..201027c101f 100644
--- a/src/mame/drivers/nes_vt.cpp
+++ b/src/mame/drivers/nes_vt.cpp
@@ -1000,7 +1000,7 @@ MACHINE_CONFIG_START(nes_vt_state::nes_vt)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60.0988)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((113.66/(NTSC_APU_CLOCK/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_NTSC-ppu2c0x_device::VBLANK_FIRST_SCANLINE+1+2)))
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((113.66/(NTSC_APU_CLOCK.dvalue()/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_NTSC-ppu2c0x_device::VBLANK_FIRST_SCANLINE+1+2)))
MCFG_SCREEN_SIZE(32*8, 262)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(nes_vt_state, screen_update_vt)
@@ -1089,7 +1089,7 @@ MACHINE_CONFIG_DERIVED(nes_vt_state::nes_vt_hh, nes_vt_xx)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(50.0070)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((106.53/(PAL_APU_CLOCK/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_PAL-ppu2c0x_device::VBLANK_FIRST_SCANLINE+1+2)))
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((106.53/(PAL_APU_CLOCK.dvalue()/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_PAL-ppu2c0x_device::VBLANK_FIRST_SCANLINE+1+2)))
MCFG_SCREEN_SIZE(32*8, 312)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp
index 1d98f76f49c..5981a97f840 100644
--- a/src/mame/drivers/newbrain.cpp
+++ b/src/mame/drivers/newbrain.cpp
@@ -807,11 +807,11 @@ void newbrain_state::device_timer(emu_timer &timer, device_timer_id id, int para
MACHINE_CONFIG_START(newbrain_state::newbrain)
// basic system hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
MCFG_CPU_PROGRAM_MAP(newbrain_mreq)
MCFG_CPU_IO_MAP(newbrain_iorq)
- MCFG_CPU_ADD(COP420_TAG, COP420, XTAL_16MHz/4)
+ MCFG_CPU_ADD(COP420_TAG, COP420, XTAL(16'000'000)/4)
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, true)
MCFG_COP400_READ_G_CB(READ8(newbrain_state, cop_g_r))
MCFG_COP400_WRITE_G_CB(WRITE8(newbrain_state, cop_g_w))
@@ -825,7 +825,7 @@ MACHINE_CONFIG_START(newbrain_state::newbrain)
MCFG_FRAGMENT_ADD(newbrain_video)
// devices
- MCFG_NEWBRAIN_EXPANSION_SLOT_ADD(NEWBRAIN_EXPANSION_SLOT_TAG, XTAL_16MHz/4, newbrain_expansion_cards, "eim")
+ MCFG_NEWBRAIN_EXPANSION_SLOT_ADD(NEWBRAIN_EXPANSION_SLOT_TAG, XTAL(16'000'000)/4, newbrain_expansion_cards, "eim")
MCFG_CASSETTE_ADD(CASSETTE_TAG)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp
index ed98789378e..c42181b9910 100644
--- a/src/mame/drivers/next.cpp
+++ b/src/mame/drivers/next.cpp
@@ -1012,8 +1012,8 @@ MACHINE_CONFIG_START(next_state::next_base)
// devices
MCFG_NSCSI_BUS_ADD("scsibus")
- MCFG_DEVICE_ADD("rtc", MCCS1850, XTAL_32_768kHz)
- MCFG_DEVICE_ADD("scc", SCC8530, XTAL_25MHz)
+ MCFG_DEVICE_ADD("rtc", MCCS1850, XTAL(32'768))
+ MCFG_DEVICE_ADD("scc", SCC8530, XTAL(25'000'000))
MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(next_state, scc_irq))
MCFG_DEVICE_ADD("keyboard", NEXTKBD, 0)
MCFG_NEXTKBD_INT_CHANGE_CALLBACK(WRITELINE(next_state, keyboard_irq))
@@ -1041,7 +1041,7 @@ MACHINE_CONFIG_START(next_state::next_base)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(next_state::next, next_base)
- MCFG_CPU_ADD("maincpu", M68030, XTAL_25MHz)
+ MCFG_CPU_ADD("maincpu", M68030, XTAL(25'000'000))
MCFG_CPU_PROGRAM_MAP(next_0b_m_nofdc_mem)
MACHINE_CONFIG_END
@@ -1056,39 +1056,39 @@ MACHINE_CONFIG_DERIVED(next_state::next_fdc_base, next_base)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(next_state::nexts, next_fdc_base)
- MCFG_CPU_ADD("maincpu", M68040, XTAL_25MHz)
+ MCFG_CPU_ADD("maincpu", M68040, XTAL(25'000'000))
MCFG_CPU_PROGRAM_MAP(next_0b_m_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(next_state::nexts2, next_fdc_base)
- MCFG_CPU_ADD("maincpu", M68040, XTAL_25MHz)
+ MCFG_CPU_ADD("maincpu", M68040, XTAL(25'000'000))
MCFG_CPU_PROGRAM_MAP(next_0b_m_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(next_state::nextsc, next_fdc_base)
- MCFG_CPU_ADD("maincpu", M68040, XTAL_25MHz)
+ MCFG_CPU_ADD("maincpu", M68040, XTAL(25'000'000))
MCFG_CPU_PROGRAM_MAP(next_2c_c_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(next_state::nextst, next_fdc_base)
- MCFG_CPU_ADD("maincpu", M68040, XTAL_33MHz)
+ MCFG_CPU_ADD("maincpu", M68040, XTAL(33'000'000))
MCFG_CPU_PROGRAM_MAP(next_0b_m_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(next_state::nextstc, next_fdc_base)
- MCFG_CPU_ADD("maincpu", M68040, XTAL_33MHz)
+ MCFG_CPU_ADD("maincpu", M68040, XTAL(33'000'000))
MCFG_CPU_PROGRAM_MAP(next_0c_c_mem)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 832-1, 0, 624-1)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(next_state::nextct, next_fdc_base)
- MCFG_CPU_ADD("maincpu", M68040, XTAL_33MHz)
+ MCFG_CPU_ADD("maincpu", M68040, XTAL(33'000'000))
MCFG_CPU_PROGRAM_MAP(next_0c_m_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(next_state::nextctc, next_fdc_base)
- MCFG_CPU_ADD("maincpu", M68040, XTAL_33MHz)
+ MCFG_CPU_ADD("maincpu", M68040, XTAL(33'000'000))
MCFG_CPU_PROGRAM_MAP(next_0c_c_mem)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 832-1, 0, 624-1)
diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp
index b7cfa10f961..b4f880383af 100644
--- a/src/mame/drivers/ngen.cpp
+++ b/src/mame/drivers/ngen.cpp
@@ -916,7 +916,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(ngen_state::ngen)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu", I80186, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(ngen_mem)
MCFG_CPU_IO_MAP(ngen_io)
MCFG_80186_CHIP_SELECT_CB(WRITE16(ngen_state, cpu_peripheral_cb))
@@ -929,12 +929,12 @@ MACHINE_CONFIG_START(ngen_state::ngen)
MCFG_DEVICE_ADD("pit", PIT8254, 0)
MCFG_PIT8253_CLK0(78120/4) // 19.53kHz, /4 of the CPU timer output?
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(ngen_state, pit_out0_w)) // RS232 channel B baud rate
- MCFG_PIT8253_CLK1(XTAL_14_7456MHz/12) // correct? - based on patent
+ MCFG_PIT8253_CLK1(XTAL(14'745'600)/12) // correct? - based on patent
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(ngen_state, pit_out1_w)) // RS232 channel A baud rate
- MCFG_PIT8253_CLK2(XTAL_14_7456MHz/12)
+ MCFG_PIT8253_CLK2(XTAL(14'745'600)/12)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(ngen_state, pit_out2_w))
- MCFG_DEVICE_ADD("dmac", AM9517A, XTAL_14_7456MHz / 3) // NEC D8237A, divisor unknown
+ MCFG_DEVICE_ADD("dmac", AM9517A, XTAL(14'745'600) / 3) // NEC D8237A, divisor unknown
MCFG_I8237_OUT_HREQ_CB(WRITELINE(ngen_state, dma_hrq_changed))
MCFG_I8237_OUT_EOP_CB(WRITELINE(ngen_state, dma_eop_changed))
MCFG_I8237_IN_MEMR_CB(READ8(ngen_state, dma_read_word)) // DMA is always 16-bit
@@ -999,20 +999,20 @@ MACHINE_CONFIG_START(ngen_state::ngen)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(ngen_state,timer_clk_out))
// floppy disk / hard disk module (WD2797 FDC, WD1010 HDC, plus an 8253 timer for each)
- MCFG_WD2797_ADD("fdc", XTAL_20MHz / 20)
+ MCFG_WD2797_ADD("fdc", XTAL(20'000'000) / 20)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ngen_state,fdc_irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu",i80186_cpu_device,drq1_w))
MCFG_WD_FDC_FORCE_READY
MCFG_DEVICE_ADD("fdc_timer", PIT8253, 0)
MCFG_PIT8253_CLK0(0)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // clocked on FDC data register access
- MCFG_PIT8253_CLK1(XTAL_20MHz / 20)
+ MCFG_PIT8253_CLK1(XTAL(20'000'000) / 20)
// MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // 1MHz
- MCFG_PIT8253_CLK2(XTAL_20MHz / 20)
+ MCFG_PIT8253_CLK2(XTAL(20'000'000) / 20)
// MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w))
// TODO: WD1010 HDC (not implemented), use WD2010 for now
- MCFG_DEVICE_ADD("hdc", WD2010, XTAL_20MHz / 4)
+ MCFG_DEVICE_ADD("hdc", WD2010, XTAL(20'000'000) / 4)
MCFG_WD2010_OUT_INTRQ_CB(DEVWRITELINE("pic",pic8259_device,ir2_w))
MCFG_WD2010_IN_BCS_CB(READ8(ngen_state,hd_buffer_r))
MCFG_WD2010_OUT_BCS_CB(WRITE8(ngen_state,hd_buffer_w))
@@ -1022,14 +1022,14 @@ MACHINE_CONFIG_START(ngen_state::ngen)
MCFG_WD2010_IN_TK000_CB(VCC)
MCFG_WD2010_IN_SC_CB(VCC)
MCFG_DEVICE_ADD("hdc_timer", PIT8253, 0)
- MCFG_PIT8253_CLK2(XTAL_20MHz / 10) // 2MHz
+ MCFG_PIT8253_CLK2(XTAL(20'000'000) / 10) // 2MHz
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ngen_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_HARDDISK_ADD("hard0")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ngen386_state::ngen386)
- MCFG_CPU_ADD("i386cpu", I386, XTAL_50MHz / 2)
+ MCFG_CPU_ADD("i386cpu", I386, XTAL(50'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(ngen386_mem)
MCFG_CPU_IO_MAP(ngen386_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic", pic8259_device, inta_cb)
@@ -1040,12 +1040,12 @@ MACHINE_CONFIG_START(ngen386_state::ngen386)
MCFG_DEVICE_ADD("pit", PIT8254, 0)
MCFG_PIT8253_CLK0(78120/4) // 19.53kHz, /4 of the CPU timer output?
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(ngen_state, pit_out0_w)) // RS232 channel B baud rate
- MCFG_PIT8253_CLK1(XTAL_14_7456MHz/12) // correct? - based on patent
+ MCFG_PIT8253_CLK1(XTAL(14'745'600)/12) // correct? - based on patent
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(ngen_state, pit_out1_w)) // RS232 channel A baud rate
- MCFG_PIT8253_CLK2(XTAL_14_7456MHz/12)
+ MCFG_PIT8253_CLK2(XTAL(14'745'600)/12)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(ngen_state, pit_out2_w))
- MCFG_DEVICE_ADD("dmac", AM9517A, XTAL_14_7456MHz / 3) // NEC D8237A, divisor unknown
+ MCFG_DEVICE_ADD("dmac", AM9517A, XTAL(14'745'600) / 3) // NEC D8237A, divisor unknown
MCFG_I8237_OUT_HREQ_CB(WRITELINE(ngen_state, dma_hrq_changed))
MCFG_I8237_OUT_EOP_CB(WRITELINE(ngen_state, dma_eop_changed))
MCFG_I8237_IN_MEMR_CB(READ8(ngen_state, dma_read_word)) // DMA is always 16-bit
@@ -1110,20 +1110,20 @@ MACHINE_CONFIG_START(ngen386_state::ngen386)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(ngen_state,timer_clk_out))
// floppy disk / hard disk module (WD2797 FDC, WD1010 HDC, plus an 8253 timer for each)
- MCFG_WD2797_ADD("fdc", XTAL_20MHz / 20)
+ MCFG_WD2797_ADD("fdc", XTAL(20'000'000) / 20)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ngen_state,fdc_irq_w))
// MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("i386cpu",i80186_cpu_device,drq1_w))
MCFG_WD_FDC_FORCE_READY
MCFG_DEVICE_ADD("fdc_timer", PIT8253, 0)
MCFG_PIT8253_CLK0(0)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // clocked on FDC data register access
- MCFG_PIT8253_CLK1(XTAL_20MHz / 20)
+ MCFG_PIT8253_CLK1(XTAL(20'000'000) / 20)
// MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // 1MHz
- MCFG_PIT8253_CLK2(XTAL_20MHz / 20)
+ MCFG_PIT8253_CLK2(XTAL(20'000'000) / 20)
// MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w))
// TODO: WD1010 HDC (not implemented), use WD2010 for now
- MCFG_DEVICE_ADD("hdc", WD2010, XTAL_20MHz / 4)
+ MCFG_DEVICE_ADD("hdc", WD2010, XTAL(20'000'000) / 4)
MCFG_WD2010_OUT_INTRQ_CB(DEVWRITELINE("pic",pic8259_device,ir2_w))
MCFG_WD2010_IN_BCS_CB(READ8(ngen_state,hd_buffer_r))
MCFG_WD2010_OUT_BCS_CB(WRITE8(ngen_state,hd_buffer_w))
@@ -1133,7 +1133,7 @@ MACHINE_CONFIG_START(ngen386_state::ngen386)
MCFG_WD2010_IN_TK000_CB(VCC)
MCFG_WD2010_IN_SC_CB(VCC)
MCFG_DEVICE_ADD("hdc_timer", PIT8253, 0)
- MCFG_PIT8253_CLK2(XTAL_20MHz / 10) // 2MHz
+ MCFG_PIT8253_CLK2(XTAL(20'000'000) / 10) // 2MHz
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ngen_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_HARDDISK_ADD("hard0")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ngp.cpp b/src/mame/drivers/ngp.cpp
index e1036bdd25b..c48aefb6a4c 100644
--- a/src/mame/drivers/ngp.cpp
+++ b/src/mame/drivers/ngp.cpp
@@ -821,17 +821,17 @@ void ngp_state::nvram_write(emu_file &file)
MACHINE_CONFIG_START(ngp_state::ngp_common)
- MCFG_CPU_ADD( "maincpu", TMP95C061, XTAL_6_144MHz )
+ MCFG_CPU_ADD( "maincpu", TMP95C061, XTAL(6'144'000) )
MCFG_TLCS900H_AM8_16(1)
MCFG_CPU_PROGRAM_MAP( ngp_mem)
MCFG_TMP95C061_PORTA_WRITE(WRITE8(ngp_state,ngp_tlcs900_porta))
- MCFG_CPU_ADD( "soundcpu", Z80, XTAL_6_144MHz/2 )
+ MCFG_CPU_ADD( "soundcpu", Z80, XTAL(6'144'000)/2 )
MCFG_CPU_PROGRAM_MAP( z80_mem)
MCFG_CPU_IO_MAP( z80_io)
MCFG_SCREEN_ADD( "screen", LCD )
- MCFG_SCREEN_RAW_PARAMS( XTAL_6_144MHz, 515, 0, 160 /*480*/, 199, 0, 152 )
+ MCFG_SCREEN_RAW_PARAMS( XTAL(6'144'000), 515, 0, 160 /*480*/, 199, 0, 152 )
MCFG_SCREEN_UPDATE_DRIVER(ngp_state, screen_update_ngp)
MCFG_DEFAULT_LAYOUT(layout_lcd)
@@ -839,7 +839,7 @@ MACHINE_CONFIG_START(ngp_state::ngp_common)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO( "lspeaker","rspeaker" )
- MCFG_SOUND_ADD( "t6w28", T6W28, XTAL_6_144MHz/2 )
+ MCFG_SOUND_ADD( "t6w28", T6W28, XTAL(6'144'000)/2 )
MCFG_SOUND_ROUTE( 0, "lspeaker", 0.50 )
MCFG_SOUND_ROUTE( 1, "rspeaker", 0.50 )
@@ -853,7 +853,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(ngp_state::ngp, ngp_common)
- MCFG_K1GE_ADD( "k1ge", XTAL_6_144MHz, "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) )
+ MCFG_K1GE_ADD( "k1ge", XTAL(6'144'000), "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_PALETTE("k1ge:palette")
@@ -870,7 +870,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(ngp_state::ngpc, ngp_common)
- MCFG_K2GE_ADD( "k1ge", XTAL_6_144MHz, "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) )
+ MCFG_K2GE_ADD( "k1ge", XTAL(6'144'000), "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_PALETTE("k1ge:palette")
diff --git a/src/mame/drivers/nibble.cpp b/src/mame/drivers/nibble.cpp
index 37d0fd958df..2ee33ef7dff 100644
--- a/src/mame/drivers/nibble.cpp
+++ b/src/mame/drivers/nibble.cpp
@@ -54,7 +54,7 @@
#include "screen.h"
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
class nibble_state : public driver_device
diff --git a/src/mame/drivers/nightgal.cpp b/src/mame/drivers/nightgal.cpp
index db470669781..c4087c472b7 100644
--- a/src/mame/drivers/nightgal.cpp
+++ b/src/mame/drivers/nightgal.cpp
@@ -35,7 +35,7 @@ TODO:
#include "speaker.h"
-#define MASTER_CLOCK XTAL_19_968MHz
+#define MASTER_CLOCK XTAL(19'968'000)
class nightgal_state : public driver_device
{
diff --git a/src/mame/drivers/ninjakd2.cpp b/src/mame/drivers/ninjakd2.cpp
index 9e24f73585a..1bf1b2a5bd8 100644
--- a/src/mame/drivers/ninjakd2.cpp
+++ b/src/mame/drivers/ninjakd2.cpp
@@ -160,8 +160,8 @@ TODO:
#include "speaker.h"
-#define MAIN_CLOCK_12 XTAL_12MHz
-#define MAIN_CLOCK_5 XTAL_5MHz
+#define MAIN_CLOCK_12 XTAL(12'000'000)
+#define MAIN_CLOCK_5 XTAL(5'000'000)
/*************************************
diff --git a/src/mame/drivers/nitedrvr.cpp b/src/mame/drivers/nitedrvr.cpp
index 0398d135456..d69540ae481 100644
--- a/src/mame/drivers/nitedrvr.cpp
+++ b/src/mame/drivers/nitedrvr.cpp
@@ -142,7 +142,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(nitedrvr_state::nitedrvr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz/12) // 1 MHz
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(12'096'000)/12) // 1 MHz
MCFG_CPU_PROGRAM_MAP(nitedrvr_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", nitedrvr_state, irq0_line_hold)
diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp
index 978f1a408c4..114b6e6e398 100644
--- a/src/mame/drivers/nmk16.cpp
+++ b/src/mame/drivers/nmk16.cpp
@@ -4045,7 +4045,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::vandyke)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 68000p12 running at 10Mhz, verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* 68000p12 running at 10Mhz, verified on pcb */
MCFG_CPU_PROGRAM_MAP(vandyke_map)
NMK_HACKY_INTERRUPT_TIMING
@@ -4066,18 +4066,18 @@ MACHINE_CONFIG_START(nmk16_state::vandyke)
MCFG_NMK004_ADD("nmk004", 8000000)
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", XTAL_12MHz/3, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL(12'000'000)/3, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", XTAL_12MHz/3, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki2", XTAL(12'000'000)/3, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -4192,7 +4192,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::tdragon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(tdragon_map)
NMK_HACKY_INTERRUPT_TIMING
@@ -4213,18 +4213,18 @@ MACHINE_CONFIG_START(nmk16_state::tdragon)
MCFG_NMK004_ADD("nmk004", 8000000)
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", XTAL_8MHz/2, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL(8'000'000)/2, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", XTAL_8MHz/2, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki2", XTAL(8'000'000)/2, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -4390,7 +4390,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::blkheart)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(macross_map)
NMK_HACKY_INTERRUPT_TIMING
@@ -4411,18 +4411,18 @@ MACHINE_CONFIG_START(nmk16_state::blkheart)
MCFG_NMK004_ADD("nmk004", 8000000)
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8 ) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8 ) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", XTAL_8MHz/2, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL(8'000'000)/2, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", XTAL_8MHz/2, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki2", XTAL(8'000'000)/2, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -4430,7 +4430,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::gunnail)
/* 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(gunnail_map)
NMK_HACKY_INTERRUPT_TIMING
@@ -4447,21 +4447,21 @@ MACHINE_CONFIG_START(nmk16_state::gunnail)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_NMK004_ADD("nmk004", XTAL_16MHz/2) /* verified on pcb */
+ MCFG_NMK004_ADD("nmk004", XTAL(16'000'000)/2) /* verified on pcb */
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/4, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL(16'000'000)/4, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/4, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki2", XTAL(16'000'000)/4, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -5211,11 +5211,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(nmk16_state::stagger1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL_12MHz) /* 68000p10 running at 12mhz, verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000,XTAL(12'000'000)) /* 68000p10 running at 12mhz, verified on pcb */
MCFG_CPU_PROGRAM_MAP(afega)
NMK_HACKY_INTERRUPT_TIMING
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_4MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(afega_sound_cpu)
/* video hardware */
@@ -5234,12 +5234,12 @@ MACHINE_CONFIG_START(nmk16_state::stagger1)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_4MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(4'000'000)) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
- MCFG_OKIM6295_ADD("oki1", XTAL_4MHz/4, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL(4'000'000)/4, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.70)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.70)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/norautp.cpp b/src/mame/drivers/norautp.cpp
index 5db5a847408..0e95e1acd5d 100644
--- a/src/mame/drivers/norautp.cpp
+++ b/src/mame/drivers/norautp.cpp
@@ -557,8 +557,8 @@
#include "noraut12.lh"
-#define NORAUT_MASTER_CLOCK XTAL_18_432MHz
-#define DPHL_MASTER_CLOCK XTAL_18MHz
+#define NORAUT_MASTER_CLOCK XTAL(18'432'000)
+#define DPHL_MASTER_CLOCK XTAL(18'000'000)
#define NORAUT_CPU_CLOCK NORAUT_MASTER_CLOCK / 8 /* 2.30275 MHz - Measured: 2.305 MHz */
#define DPHL_CPU_CLOCK DPHL_MASTER_CLOCK / 9 /* 2 MHz (from 8224) */
diff --git a/src/mame/drivers/notechan.cpp b/src/mame/drivers/notechan.cpp
index 77bea9ef612..84b9fda303c 100644
--- a/src/mame/drivers/notechan.cpp
+++ b/src/mame/drivers/notechan.cpp
@@ -294,7 +294,7 @@
#include "notechan.lh"
-#define MASTER_CLOCK XTAL_8_448MHz
+#define MASTER_CLOCK XTAL(8'448'000)
#define CPU_CLOCK MASTER_CLOCK / 2 // guess... not verified
#define SND_CLOCK MASTER_CLOCK / 8 // guess... not verified
diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp
index 5a0e8897ddf..f512657656d 100644
--- a/src/mame/drivers/notetaker.cpp
+++ b/src/mame/drivers/notetaker.cpp
@@ -256,7 +256,7 @@ TIMER_CALLBACK_MEMBER(notetaker_state::timer_fifoclk)
}
m_outfifo_tail_ptr&=0xF;
m_dac->write(data);
- m_FIFO_timer->adjust(attotime::from_hz(((XTAL_960kHz/10)/4)/((m_FrSel0<<3)+(m_FrSel1<<2)+(m_FrSel2<<1)+1)));
+ m_FIFO_timer->adjust(attotime::from_hz(((XTAL(960'000)/10)/4)/((m_FrSel0<<3)+(m_FrSel1<<2)+(m_FrSel2<<1)+1)));
}
uint32_t notetaker_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
@@ -364,8 +364,8 @@ WRITE16_MEMBER(notetaker_state::FIFOReg_w)
m_FrSel2 = (data&0x0400)?1:0;
m_TabletXOn = (data&0x0200)?1:0;
m_TabletYOn = (data&0x0100)?1:0;
- m_FIFO_timer->adjust(attotime::from_hz(((XTAL_960kHz/10)/4)/((m_FrSel0<<3)+(m_FrSel1<<2)+(m_FrSel2<<1)+1)));
- logerror("Write to 0x60 FIFOReg_w of %04x; fifo timer set to %d hz\n", data, (((XTAL_960kHz/10)/4)/((m_FrSel0<<3)+(m_FrSel1<<2)+(m_FrSel2<<1)+1)));
+ m_FIFO_timer->adjust(attotime::from_hz(((XTAL(960'000)/10)/4)/((m_FrSel0<<3)+(m_FrSel1<<2)+(m_FrSel2<<1)+1)));
+ logerror("Write to 0x60 FIFOReg_w of %04x; fifo timer set to %d hz\n", data, (((XTAL(960'000)/10)/4).value()/((m_FrSel0<<3)+(m_FrSel1<<2)+(m_FrSel2<<1)+1)));
}
WRITE16_MEMBER(notetaker_state::FIFOBus_w)
@@ -800,7 +800,7 @@ void notetaker_state::ip_reset()
m_SHConA = 0;
m_SetSH = 0;
// handle consequences of above
- m_FIFO_timer->adjust(attotime::from_hz(((XTAL_960kHz/10)/4)/((m_FrSel0<<3)+(m_FrSel1<<2)+(m_FrSel2<<1)+1))); // See below
+ m_FIFO_timer->adjust(attotime::from_hz(((XTAL(960'000)/10)/4)/((m_FrSel0<<3)+(m_FrSel1<<2)+(m_FrSel2<<1)+1))); // See below
/* FIFO timer is clocked by 960khz divided by 10 (74ls162 decade counter),
divided by 4 (mc14568B with divider 1 pins set to 4), divided by
1,3,5,7,9,11,13,15 (or 0,2,4,6,8,10,12,14?) */
@@ -847,7 +847,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(notetaker_state::notetakr)
/* basic machine hardware */
/* IO CPU: 8086@8MHz */
- MCFG_CPU_ADD("iocpu", I8086, XTAL_24MHz/3) /* iD8086-2 @ E4A; 24Mhz crystal divided down to 8Mhz by i8284 clock generator */
+ MCFG_CPU_ADD("iocpu", I8086, XTAL(24'000'000)/3) /* iD8086-2 @ E4A; 24Mhz crystal divided down to 8Mhz by i8284 clock generator */
MCFG_CPU_PROGRAM_MAP(notetaker_iocpu_mem)
MCFG_CPU_IO_MAP(notetaker_iocpu_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("iopic8259", pic8259_device, inta_cb)
@@ -856,7 +856,7 @@ MACHINE_CONFIG_START(notetaker_state::notetakr)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("iocpu", 0))
/* Emulator CPU: 8086@5MHz */
- /*MCFG_CPU_ADD("emulatorcpu", I8086, XTAL_15MHz/3)
+ /*MCFG_CPU_ADD("emulatorcpu", I8086, XTAL(15'000'000)/3)
MCFG_CPU_PROGRAM_MAP(notetaker_emulatorcpu_mem)
MCFG_CPU_IO_MAP(notetaker_emulatorcpu_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("emulatorpic8259", pic8259_device, inta_cb)
@@ -877,7 +877,7 @@ MACHINE_CONFIG_START(notetaker_state::notetakr)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* Devices */
- MCFG_DEVICE_ADD( "crt5027", CRT5027, (XTAL_36MHz/4)/8) // See below
+ MCFG_DEVICE_ADD( "crt5027", CRT5027, (XTAL(36'000'000)/4)/8) // See below
/* the clock for the crt5027 is configurable rate; 36MHz xtal divided by 1*,
2, 3, 4, 5, 6, 7, or 8 (* because this is a 74s163 this setting probably
means divide by 1; documentation at
@@ -893,15 +893,15 @@ MACHINE_CONFIG_START(notetaker_state::notetakr)
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_DEVICE_ADD( "kbduart", AY31015, 0 ) // HD6402, == AY-3-1015D
- MCFG_AY31015_RX_CLOCK(XTAL_960kHz) // hard-wired to 960KHz xtal #f11 (60000 baud, 16 clocks per baud)
- MCFG_AY31015_TX_CLOCK(XTAL_960kHz) // hard-wired to 960KHz xtal #f11 (60000 baud, 16 clocks per baud)
+ MCFG_AY31015_RX_CLOCK(XTAL(960'000)) // hard-wired to 960KHz xtal #f11 (60000 baud, 16 clocks per baud)
+ MCFG_AY31015_TX_CLOCK(XTAL(960'000)) // hard-wired to 960KHz xtal #f11 (60000 baud, 16 clocks per baud)
MCFG_DEVICE_ADD( "eiauart", AY31015, 0 ) // HD6402, == AY-3-1015D
- MCFG_AY31015_RX_CLOCK(((XTAL_960kHz/10)/4)/5) // hard-wired through an mc14568b divider set to divide by 4, the result set to divide by 5; this resulting 4800hz signal being 300 baud (16 clocks per baud)
- MCFG_AY31015_TX_CLOCK(((XTAL_960kHz/10)/4)/5) // hard-wired through an mc14568b divider set to divide by 4, the result set to divide by 5; this resulting 4800hz signal being 300 baud (16 clocks per baud)
+ MCFG_AY31015_RX_CLOCK(((XTAL(960'000)/10)/4)/5) // hard-wired through an mc14568b divider set to divide by 4, the result set to divide by 5; this resulting 4800hz signal being 300 baud (16 clocks per baud)
+ MCFG_AY31015_TX_CLOCK(((XTAL(960'000)/10)/4)/5) // hard-wired through an mc14568b divider set to divide by 4, the result set to divide by 5; this resulting 4800hz signal being 300 baud (16 clocks per baud)
/* Floppy */
- MCFG_FD1791_ADD("wd1791", (((XTAL_24MHz/3)/2)/2)) // 2mhz, from 24mhz ip clock divided by 6 via 8284, an additional 2 by LS161 at #e1 on display/floppy board
+ MCFG_FD1791_ADD("wd1791", (((XTAL(24'000'000)/3)/2)/2)) // 2mhz, from 24mhz ip clock divided by 6 via 8284, an additional 2 by LS161 at #e1 on display/floppy board
MCFG_FLOPPY_DRIVE_ADD("wd1791:0", notetaker_floppies, "525dd", floppy_image_device::default_floppy_formats)
/* sound hardware */
diff --git a/src/mame/drivers/nova2001.cpp b/src/mame/drivers/nova2001.cpp
index 54f12498eca..97d883f0f00 100644
--- a/src/mame/drivers/nova2001.cpp
+++ b/src/mame/drivers/nova2001.cpp
@@ -131,7 +131,7 @@ e000 - e7ff R/W Work RAM
#include "speaker.h"
-#define MAIN_CLOCK XTAL_12MHz
+#define MAIN_CLOCK XTAL(12'000'000)
/*************************************
diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp
index 61739d204a0..7349379bbbd 100644
--- a/src/mame/drivers/novag6502.cpp
+++ b/src/mame/drivers/novag6502.cpp
@@ -443,7 +443,7 @@ READ8_MEMBER(novag6502_state::sexpert_input2_r)
void novag6502_state::sexpert_set_cpu_freq()
{
// machines were released with either 5MHz or 6MHz CPU
- m_maincpu->set_unscaled_clock((ioport("FAKE")->read() & 1) ? (XTAL_12MHz/2) : (XTAL_10MHz/2));
+ m_maincpu->set_unscaled_clock((ioport("FAKE")->read() & 1) ? (XTAL(12'000'000)/2) : (XTAL(10'000'000)/2));
}
MACHINE_RESET_MEMBER(novag6502_state, sexpert)
@@ -857,7 +857,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(novag6502_state::supercon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_8MHz/2)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(8'000'000)/2)
MCFG_CPU_PERIODIC_INT_DRIVER(novag6502_state, irq0_line_hold, 600) // guessed
MCFG_CPU_PROGRAM_MAP(supercon_map)
@@ -875,11 +875,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(novag6502_state::cforte)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R65C02, XTAL_10MHz/2)
+ MCFG_CPU_ADD("maincpu", R65C02, XTAL(10'000'000)/2)
MCFG_CPU_PROGRAM_MAP(cforte_map)
- MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", novag6502_state, irq_on, attotime::from_hz(XTAL_32_768kHz/128)) // 256Hz
- MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL_32_768kHz/128) - attotime::from_usec(11)) // active for 11us
- MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", novag6502_state, irq_off, attotime::from_hz(XTAL_32_768kHz/128))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", novag6502_state, irq_on, attotime::from_hz(XTAL(32'768)/128)) // 256Hz
+ MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL(32'768)/128) - attotime::from_usec(11)) // active for 11us
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", novag6502_state, irq_off, attotime::from_hz(XTAL(32'768)/128))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -892,21 +892,21 @@ MACHINE_CONFIG_START(novag6502_state::cforte)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, XTAL_32_768kHz/32) // 1024Hz
+ MCFG_SOUND_ADD("beeper", BEEP, XTAL(32'768)/32) // 1024Hz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(novag6502_state::sexpert)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65C02, XTAL_10MHz/2) // or XTAL_12MHz/2
+ MCFG_CPU_ADD("maincpu", M65C02, XTAL(10'000'000)/2) // or XTAL(12'000'000)/2
MCFG_CPU_PROGRAM_MAP(sexpert_map)
- MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", novag6502_state, irq_on, attotime::from_hz(XTAL_32_768kHz/128)) // 256Hz
- MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL_32_768kHz/128) - attotime::from_nsec(21500)) // active for 21.5us
- MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", novag6502_state, irq_off, attotime::from_hz(XTAL_32_768kHz/128))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", novag6502_state, irq_on, attotime::from_hz(XTAL(32'768)/128)) // 256Hz
+ MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL(32'768)/128) - attotime::from_nsec(21500)) // active for 21.5us
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", novag6502_state, irq_off, attotime::from_hz(XTAL(32'768)/128))
MCFG_DEVICE_ADD("acia", MOS6551, 0) // R65C51P2 - RTS to CTS, DCD to GND
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(INPUTLINE("maincpu", M6502_NMI_LINE))
MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("acia", mos6551_device, write_cts))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
@@ -939,7 +939,7 @@ MACHINE_CONFIG_START(novag6502_state::sexpert)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, XTAL_32_768kHz/32) // 1024Hz
+ MCFG_SOUND_ADD("beeper", BEEP, XTAL(32'768)/32) // 1024Hz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -949,7 +949,7 @@ MACHINE_CONFIG_DERIVED(novag6502_state::sforte, sexpert)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(sforte_map)
MCFG_TIMER_MODIFY("irq_on")
- MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL_32_768kHz/128) - attotime::from_usec(11)) // active for ?us (assume same as cforte)
+ MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL(32'768)/128) - attotime::from_usec(11)) // active for ?us (assume same as cforte)
MCFG_DEFAULT_LAYOUT(layout_novag_sforte)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/novag68k.cpp b/src/mame/drivers/novag68k.cpp
index f04ee1e9e24..ea96f0da7f5 100644
--- a/src/mame/drivers/novag68k.cpp
+++ b/src/mame/drivers/novag68k.cpp
@@ -182,12 +182,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(novag68k_state::diablo68k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PERIODIC_INT_DRIVER(novag68k_state, irq2_line_hold, 256) // guessed
MCFG_CPU_PROGRAM_MAP(diablo68k_map)
MCFG_DEVICE_ADD("acia", MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/nsg6809.cpp b/src/mame/drivers/nsg6809.cpp
index 3c449d793df..b5a740a3197 100644
--- a/src/mame/drivers/nsg6809.cpp
+++ b/src/mame/drivers/nsg6809.cpp
@@ -65,14 +65,14 @@ static INPUT_PORTS_START( pitchhit )
INPUT_PORTS_END
MACHINE_CONFIG_START(nsg6809_state::pitchhit)
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz) // clock buffered through 74HC4060
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000)) // clock buffered through 74HC4060
MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_DEVICE_ADD("via", VIA6522, XTAL_4MHz / 4)
+ MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 4)
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD("acia", MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<1>))
MCFG_WATCHDOG_ADD("deadman")
diff --git a/src/mame/drivers/nsmpoker.cpp b/src/mame/drivers/nsmpoker.cpp
index be4c12822e2..66f520b9ac5 100644
--- a/src/mame/drivers/nsmpoker.cpp
+++ b/src/mame/drivers/nsmpoker.cpp
@@ -64,7 +64,7 @@
#include "screen.h"
-#define MASTER_CLOCK XTAL_22_1184MHz
+#define MASTER_CLOCK XTAL(22'118'400)
class nsmpoker_state : public driver_device
diff --git a/src/mame/drivers/nss.cpp b/src/mame/drivers/nss.cpp
index c0a7d061421..a10011b4d15 100644
--- a/src/mame/drivers/nss.cpp
+++ b/src/mame/drivers/nss.cpp
@@ -825,7 +825,7 @@ MACHINE_CONFIG_START(nss_state::nss)
MCFG_CPU_PROGRAM_MAP(snes_map)
// runs at 24.576 MHz / 12 = 2.048 MHz
- MCFG_CPU_ADD("soundcpu", SPC700, XTAL_24_576MHz / 12)
+ MCFG_CPU_ADD("soundcpu", SPC700, XTAL(24'576'000) / 12)
MCFG_CPU_PROGRAM_MAP(spc_mem)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
diff --git a/src/mame/drivers/nwk-tr.cpp b/src/mame/drivers/nwk-tr.cpp
index e8b91121774..457fde43322 100644
--- a/src/mame/drivers/nwk-tr.cpp
+++ b/src/mame/drivers/nwk-tr.cpp
@@ -817,17 +817,17 @@ void nwktr_state::machine_reset()
MACHINE_CONFIG_START(nwktr_state::nwktr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */
+ MCFG_CPU_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
MCFG_CPU_PROGRAM_MAP(nwktr_map)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL_64MHz/4) /* 16MHz */
+ MCFG_CPU_ADD("audiocpu", M68000, XTAL(64'000'000)/4) /* 16MHz */
MCFG_CPU_PROGRAM_MAP(sound_memmap)
- MCFG_CPU_ADD("dsp", ADSP21062, XTAL_36MHz)
+ MCFG_CPU_ADD("dsp", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
MCFG_CPU_DATA_MAP(sharc0_map)
- MCFG_CPU_ADD("dsp2", ADSP21062, XTAL_36MHz)
+ MCFG_CPU_ADD("dsp2", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
MCFG_CPU_DATA_MAP(sharc1_map)
@@ -882,10 +882,10 @@ MACHINE_CONFIG_START(nwktr_state::nwktr)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_K056800_ADD("k056800", XTAL_16_9344MHz)
+ MCFG_K056800_ADD("k056800", XTAL(16'934'400))
MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_2))
- MCFG_RF5C400_ADD("rfsnd", XTAL_16_9344MHz) // as per Guru readme above
+ MCFG_RF5C400_ADD("rfsnd", XTAL(16'934'400)) // as per Guru readme above
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp
index c509ec68e38..69e8fc0d2a7 100644
--- a/src/mame/drivers/nyny.cpp
+++ b/src/mame/drivers/nyny.cpp
@@ -83,12 +83,12 @@
#include "speaker.h"
-#define MAIN_CPU_MASTER_CLOCK XTAL_11_2MHz
+#define MAIN_CPU_MASTER_CLOCK XTAL(11'200'000)
#define PIXEL_CLOCK (MAIN_CPU_MASTER_CLOCK / 2)
#define CRTC_CLOCK (MAIN_CPU_MASTER_CLOCK / 16)
-#define AUDIO_1_MASTER_CLOCK XTAL_4MHz
+#define AUDIO_1_MASTER_CLOCK XTAL(4'000'000)
#define AUDIO_CPU_1_CLOCK AUDIO_1_MASTER_CLOCK
-#define AUDIO_2_MASTER_CLOCK XTAL_4MHz
+#define AUDIO_2_MASTER_CLOCK XTAL(4'000'000)
#define AUDIO_CPU_2_CLOCK AUDIO_2_MASTER_CLOCK
diff --git a/src/mame/drivers/ob68k1a.cpp b/src/mame/drivers/ob68k1a.cpp
index 535c8469db3..2e7fc15f172 100644
--- a/src/mame/drivers/ob68k1a.cpp
+++ b/src/mame/drivers/ob68k1a.cpp
@@ -194,13 +194,13 @@ void ob68k1a_state::machine_reset()
MACHINE_CONFIG_START(ob68k1a_state::ob68k1a)
// basic machine hardware
- MCFG_CPU_ADD(MC68000L10_TAG, M68000, XTAL_10MHz)
+ MCFG_CPU_ADD(MC68000L10_TAG, M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(ob68k1a_mem)
// devices
MCFG_DEVICE_ADD(MC6821_0_TAG, PIA6821, 0)
MCFG_DEVICE_ADD(MC6821_1_TAG, PIA6821, 0)
- MCFG_DEVICE_ADD(MC6840_TAG, PTM6840, XTAL_10MHz/10)
+ MCFG_DEVICE_ADD(MC6840_TAG, PTM6840, XTAL(10'000'000)/10)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
MCFG_DEVICE_ADD(MC6850_0_TAG, ACIA6850, 0)
@@ -221,7 +221,7 @@ MACHINE_CONFIG_START(ob68k1a_state::ob68k1a)
MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MC6850_1_TAG, acia6850_device, write_dcd))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MC6850_1_TAG, acia6850_device, write_cts))
- MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(DEVWRITELINE(MC6850_0_TAG, acia6850_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(MC6850_0_TAG, acia6850_device, write_rxc))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE(MC6850_1_TAG, acia6850_device, write_txc))
diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp
index 9118e742969..a5d2e1eafe5 100644
--- a/src/mame/drivers/octopus.cpp
+++ b/src/mame/drivers/octopus.cpp
@@ -611,7 +611,7 @@ WRITE8_MEMBER(octopus_state::vidcontrol_w)
{
m_vidctrl = data;
m_fdc->dden_w(data & 0x04);
- m_fdc->set_unscaled_clock((data & 0x08) ? XTAL_16MHz / 16 : XTAL_16MHz / 8);
+ m_fdc->set_unscaled_clock((data & 0x08) ? XTAL(16'000'000) / 16 : XTAL(16'000'000) / 8);
}
// Sound hardware
@@ -868,16 +868,16 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(octopus_state::octopus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8088, XTAL_24MHz / 3) // 8MHz
+ MCFG_CPU_ADD("maincpu",I8088, XTAL(24'000'000) / 3) // 8MHz
MCFG_CPU_PROGRAM_MAP(octopus_mem)
MCFG_CPU_IO_MAP(octopus_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(octopus_state, x86_irq_cb)
- MCFG_CPU_ADD("subcpu",Z80, XTAL_24MHz / 4) // 6MHz
+ MCFG_CPU_ADD("subcpu",Z80, XTAL(24'000'000) / 4) // 6MHz
MCFG_CPU_PROGRAM_MAP(octopus_sub_mem)
MCFG_CPU_IO_MAP(octopus_sub_io)
- MCFG_DEVICE_ADD("dma1", AM9517A, XTAL_24MHz / 6) // 4MHz
+ MCFG_DEVICE_ADD("dma1", AM9517A, XTAL(24'000'000) / 6) // 4MHz
MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma2", am9517a_device, dreq0_w))
MCFG_I8237_IN_MEMR_CB(READ8(octopus_state,dma_read))
MCFG_I8237_OUT_MEMW_CB(WRITE8(octopus_state,dma_write))
@@ -893,7 +893,7 @@ MACHINE_CONFIG_START(octopus_state::octopus)
MCFG_I8237_OUT_DACK_1_CB(WRITELINE(octopus_state, dack1_w))
MCFG_I8237_OUT_DACK_2_CB(WRITELINE(octopus_state, dack2_w))
MCFG_I8237_OUT_DACK_3_CB(WRITELINE(octopus_state, dack3_w))
- MCFG_DEVICE_ADD("dma2", AM9517A, XTAL_24MHz / 6) // 4MHz
+ MCFG_DEVICE_ADD("dma2", AM9517A, XTAL(24'000'000) / 6) // 4MHz
MCFG_I8237_OUT_HREQ_CB(WRITELINE(octopus_state, dma_hrq_changed))
MCFG_I8237_IN_MEMR_CB(READ8(octopus_state,dma_read))
MCFG_I8237_OUT_MEMW_CB(WRITE8(octopus_state,dma_write))
@@ -927,7 +927,7 @@ MACHINE_CONFIG_START(octopus_state::octopus)
MCFG_I8255_OUT_PORTA_CB(WRITE8(octopus_state,rtc_w))
MCFG_I8255_OUT_PORTB_CB(WRITE8(octopus_state,cntl_w))
MCFG_I8255_OUT_PORTC_CB(WRITE8(octopus_state,gpo_w))
- MCFG_MC146818_ADD("rtc", XTAL_32_768kHz)
+ MCFG_MC146818_ADD("rtc", XTAL(32'768))
MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic_slave",pic8259_device, ir2_w)) MCFG_DEVCB_INVERT
// Keyboard UART
@@ -942,7 +942,7 @@ MACHINE_CONFIG_START(octopus_state::octopus)
MCFG_DEVICE_ADD("keyboard_clock_tx", CLOCK, 1200 * 64)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("keyboard",i8251_device,write_txc))
- MCFG_FD1793_ADD("fdc",XTAL_16MHz / 8)
+ MCFG_FD1793_ADD("fdc",XTAL(16'000'000) / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pic_master",pic8259_device, ir5_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma2",am9517a_device, dreq1_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", octopus_floppies, "525dd", floppy_image_device::default_floppy_formats)
@@ -961,7 +961,7 @@ MACHINE_CONFIG_START(octopus_state::octopus)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_DEVICE_ADD("serial", Z80SIO, XTAL_16MHz / 4) // clock rate not mentioned in tech manual
+ MCFG_DEVICE_ADD("serial", Z80SIO, XTAL(16'000'000) / 4) // clock rate not mentioned in tech manual
MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("pic_master",pic8259_device, ir1_w))
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("serial_a",rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("serial_b",rs232_port_device, write_txd))
diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp
index a3bfe14f621..455424bb47f 100644
--- a/src/mame/drivers/odyssey2.cpp
+++ b/src/mame/drivers/odyssey2.cpp
@@ -664,7 +664,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(odyssey2_state::odyssey2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8048, ( ( XTAL_7_15909MHz * 3 ) / 4 ) )
+ MCFG_CPU_ADD("maincpu", I8048, ( ( XTAL(7'159'090) * 3 ) / 4 ) )
MCFG_CPU_PROGRAM_MAP(odyssey2_mem)
MCFG_CPU_IO_MAP(odyssey2_io)
MCFG_MCS48_PORT_P1_IN_CB(READ8(odyssey2_state, p1_read))
@@ -679,7 +679,7 @@ MACHINE_CONFIG_START(odyssey2_state::odyssey2)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( XTAL_7_15909MHz/2 * 2, i8244_device::LINE_CLOCKS, i8244_device::START_ACTIVE_SCAN, i8244_device::END_ACTIVE_SCAN, i8244_device::LINES, i8244_device::START_Y, i8244_device::START_Y + i8244_device::SCREEN_HEIGHT )
+ MCFG_SCREEN_RAW_PARAMS( XTAL(7'159'090)/2 * 2, i8244_device::LINE_CLOCKS, i8244_device::START_ACTIVE_SCAN, i8244_device::END_ACTIVE_SCAN, i8244_device::LINES, i8244_device::START_Y, i8244_device::START_Y + i8244_device::SCREEN_HEIGHT )
MCFG_SCREEN_UPDATE_DRIVER(odyssey2_state, screen_update_odyssey2)
MCFG_SCREEN_PALETTE("palette")
@@ -689,7 +689,7 @@ MACHINE_CONFIG_START(odyssey2_state::odyssey2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_I8244_ADD( "i8244", XTAL_7_15909MHz/2 * 2, "screen", INPUTLINE( "maincpu", 0 ), WRITE16( odyssey2_state, scanline_postprocess ) )
+ MCFG_I8244_ADD( "i8244", XTAL(7'159'090)/2 * 2, "screen", INPUTLINE( "maincpu", 0 ), WRITE16( odyssey2_state, scanline_postprocess ) )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_FRAGMENT_ADD(odyssey2_cartslot)
@@ -698,14 +698,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(odyssey2_state::videopac)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8048, ( XTAL_17_73447MHz / 3 ) )
+ MCFG_CPU_ADD("maincpu", I8048, ( XTAL(17'734'470) / 3 ) )
MCFG_CPU_PROGRAM_MAP(odyssey2_mem)
MCFG_CPU_IO_MAP(odyssey2_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( XTAL_17_73447MHz/5 * 2, i8244_device::LINE_CLOCKS, i8244_device::START_ACTIVE_SCAN, i8244_device::END_ACTIVE_SCAN, i8245_device::LINES, i8244_device::START_Y, i8244_device::START_Y + i8244_device::SCREEN_HEIGHT )
+ MCFG_SCREEN_RAW_PARAMS( XTAL(17'734'470)/5 * 2, i8244_device::LINE_CLOCKS, i8244_device::START_ACTIVE_SCAN, i8244_device::END_ACTIVE_SCAN, i8245_device::LINES, i8244_device::START_Y, i8244_device::START_Y + i8244_device::SCREEN_HEIGHT )
MCFG_SCREEN_UPDATE_DRIVER(odyssey2_state, screen_update_odyssey2)
MCFG_SCREEN_PALETTE("palette")
@@ -715,7 +715,7 @@ MACHINE_CONFIG_START(odyssey2_state::videopac)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_I8245_ADD( "i8244", XTAL_17_73447MHz/5 * 2, "screen", INPUTLINE( "maincpu", 0 ), WRITE16( odyssey2_state, scanline_postprocess ) )
+ MCFG_I8245_ADD( "i8244", XTAL(17'734'470)/5 * 2, "screen", INPUTLINE( "maincpu", 0 ), WRITE16( odyssey2_state, scanline_postprocess ) )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_FRAGMENT_ADD(odyssey2_cartslot)
@@ -724,7 +724,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(g7400_state::g7400)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8048, XTAL_5_911MHz )
+ MCFG_CPU_ADD("maincpu", I8048, XTAL(5'911'000) )
MCFG_CPU_PROGRAM_MAP(odyssey2_mem)
MCFG_CPU_IO_MAP(g7400_io)
MCFG_MCS48_PORT_P1_IN_CB(READ8(g7400_state, p1_read))
@@ -765,7 +765,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(g7400_state::odyssey3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8048, XTAL_5_911MHz )
+ MCFG_CPU_ADD("maincpu", I8048, XTAL(5'911'000) )
MCFG_CPU_PROGRAM_MAP(odyssey2_mem)
MCFG_CPU_IO_MAP(g7400_io)
MCFG_MCS48_PORT_P1_IN_CB(READ8(g7400_state, p1_read))
diff --git a/src/mame/drivers/ojankohs.cpp b/src/mame/drivers/ojankohs.cpp
index 2d226cdb45d..7dd199abe5a 100644
--- a/src/mame/drivers/ojankohs.cpp
+++ b/src/mame/drivers/ojankohs.cpp
@@ -729,7 +729,7 @@ MACHINE_CONFIG_START(ojankohs_state::ojankohs)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ojankohs)
MCFG_PALETTE_ADD("palette", 1024)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_13_333MHz/2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(13'333'000)/2) // divider not verified
MCFG_VIDEO_START_OVERRIDE(ojankohs_state,ojankohs)
@@ -810,7 +810,7 @@ MACHINE_CONFIG_START(ojankohs_state::ccasino)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ojankohs)
MCFG_PALETTE_ADD("palette", 1024)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_13_333MHz/2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(13'333'000)/2) // divider not verified
MCFG_VIDEO_START_OVERRIDE(ojankohs_state,ojankoy)
diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp
index df393160759..a87be668cc2 100644
--- a/src/mame/drivers/okean240.cpp
+++ b/src/mame/drivers/okean240.cpp
@@ -497,7 +497,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(okean240_state::okean240t)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL_12MHz / 6)
+ MCFG_CPU_ADD("maincpu",I8080, XTAL(12'000'000) / 6)
MCFG_CPU_PROGRAM_MAP(okean240_mem)
MCFG_CPU_IO_MAP(okean240t_io)
diff --git a/src/mame/drivers/omegrace.cpp b/src/mame/drivers/omegrace.cpp
index 837fa616bfc..108878f91d8 100644
--- a/src/mame/drivers/omegrace.cpp
+++ b/src/mame/drivers/omegrace.cpp
@@ -504,7 +504,7 @@ MACHINE_CONFIG_START(omegrace_state::omegrace)
/* main CPU */
/* XTAL101 Crystal @ 12mhz */
/* through 74LS161, Pin 13 = divide by 4 */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(port_map)
MCFG_CPU_PERIODIC_INT_DRIVER(omegrace_state, irq0_line_hold, 250)
@@ -513,7 +513,7 @@ MACHINE_CONFIG_START(omegrace_state::omegrace)
/* XTAL101 Crystal @ 12mhz */
/* through 74LS161, Pin 12 = divide by 8 */
/* Fed to CPU as 1.5mhz though line J4-D */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/8)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_port)
MCFG_CPU_PERIODIC_INT_DRIVER(omegrace_state, nmi_line_pulse, 250)
@@ -540,10 +540,10 @@ MACHINE_CONFIG_START(omegrace_state::omegrace)
/* XTAL101 Crystal @ 12mhz */
/* through 74LS92, Pin 8 = divide by 12 */
- MCFG_SOUND_ADD("ay1", AY8912, XTAL_12MHz/12)
+ MCFG_SOUND_ADD("ay1", AY8912, XTAL(12'000'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8912, XTAL_12MHz/12)
+ MCFG_SOUND_ADD("ay2", AY8912, XTAL(12'000'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/onetwo.cpp b/src/mame/drivers/onetwo.cpp
index 5bb39ae35df..b037f1f41af 100644
--- a/src/mame/drivers/onetwo.cpp
+++ b/src/mame/drivers/onetwo.cpp
@@ -50,7 +50,7 @@ Note: this is quite clearly a 'Korean bootleg' of Shisensho - Joshiryo-Hen / Mat
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_4MHz
+#define MASTER_CLOCK XTAL(4'000'000)
class onetwo_state : public driver_device
{
diff --git a/src/mame/drivers/onyx.cpp b/src/mame/drivers/onyx.cpp
index 8e301042ae5..158a0809054 100644
--- a/src/mame/drivers/onyx.cpp
+++ b/src/mame/drivers/onyx.cpp
@@ -116,13 +116,13 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(onyx_state::c8002)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z8002, XTAL_4MHz )
+ MCFG_CPU_ADD("maincpu", Z8002, XTAL(4'000'000) )
//MCFG_Z80_DAISY_CHAIN(main_daisy_chain)
MCFG_CPU_PROGRAM_MAP(c8002_mem)
//MCFG_CPU_DATA_MAP(c8002_data)
MCFG_CPU_IO_MAP(c8002_io)
- MCFG_CPU_ADD("subcpu", Z80, XTAL_4MHz )
+ MCFG_CPU_ADD("subcpu", Z80, XTAL(4'000'000) )
//MCFG_Z80_DAISY_CHAIN(sub_daisy_chain)
MCFG_CPU_PROGRAM_MAP(submem)
MCFG_CPU_IO_MAP(subio)
@@ -133,35 +133,35 @@ MACHINE_CONFIG_START(onyx_state::c8002)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1" ,z80sio_device, txca_w))
/* peripheral hardware */
- MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(16'000'000)/4)
//MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL(16'000'000)/4)
//MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL_16MHz /4)
- MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL_16MHz /4)
- MCFG_DEVICE_ADD("ctc3", Z80CTC, XTAL_16MHz /4)
- MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL_16MHz /4)
+ MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(16'000'000) /4)
+ MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL(16'000'000) /4)
+ MCFG_DEVICE_ADD("ctc3", Z80CTC, XTAL(16'000'000) /4)
+ MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(16'000'000) /4)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL_16MHz /4)
- MCFG_DEVICE_ADD("sio3", Z80SIO, XTAL_16MHz /4)
- MCFG_DEVICE_ADD("sio4", Z80SIO, XTAL_16MHz /4)
- MCFG_DEVICE_ADD("sio5", Z80SIO, XTAL_16MHz /4)
+ MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL(16'000'000) /4)
+ MCFG_DEVICE_ADD("sio3", Z80SIO, XTAL(16'000'000) /4)
+ MCFG_DEVICE_ADD("sio4", Z80SIO, XTAL(16'000'000) /4)
+ MCFG_DEVICE_ADD("sio5", Z80SIO, XTAL(16'000'000) /4)
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio1", z80sio_device, rxa_w))
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio1", z80sio_device, dcda_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio1", z80sio_device, ctsa_w))
- MCFG_DEVICE_ADD("pio1s", Z80PIO, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD("pio1s", Z80PIO, XTAL(16'000'000)/4)
//MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("subcpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("sio1s_clock", CLOCK, 614400)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("sio1s", z80sio_device, rxtxcb_w))
//MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1s" ,z80sio_device, txca_w))
- MCFG_DEVICE_ADD("sio1s", Z80SIO, XTAL_16MHz /4)
+ MCFG_DEVICE_ADD("sio1s", Z80SIO, XTAL(16'000'000) /4)
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232s", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232s", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232s", rs232_port_device, write_rts))
@@ -226,7 +226,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(onyx_state::c5000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4 )
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4 )
//MCFG_Z80_DAISY_CHAIN(sub_daisy_chain)
MCFG_CPU_PROGRAM_MAP(c5000_mem)
MCFG_CPU_IO_MAP(c5000_io)
@@ -237,14 +237,14 @@ MACHINE_CONFIG_START(onyx_state::c5000)
//MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1" ,z80sio_device, txca_w))
/* peripheral hardware */
- //MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL_16MHz/4)
+ //MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(16'000'000)/4)
//MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- //MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL_16MHz/4)
+ //MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL(16'000'000)/4)
//MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- //MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL_16MHz /4)
- //MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL_16MHz /4)
- //MCFG_DEVICE_ADD("ctc3", Z80CTC, XTAL_16MHz /4)
- MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL_16MHz /4)
+ //MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(16'000'000) /4)
+ //MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL(16'000'000) /4)
+ //MCFG_DEVICE_ADD("ctc3", Z80CTC, XTAL(16'000'000) /4)
+ MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(16'000'000) /4)
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -254,7 +254,7 @@ MACHINE_CONFIG_START(onyx_state::c5000)
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio1", z80sio_device, dcdb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio1", z80sio_device, ctsb_w))
- //MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL_16MHz /4)
+ //MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL(16'000'000) /4)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp
index 6f922a60efc..3022a9053d7 100644
--- a/src/mame/drivers/opwolf.cpp
+++ b/src/mame/drivers/opwolf.cpp
@@ -270,8 +270,8 @@ register. So what is controlling priority.
/* Define clocks based on actual OSC on the PCB */
-#define CPU_CLOCK (XTAL_16MHz / 2) /* clock for 68000 */
-#define SOUND_CPU_CLOCK (XTAL_8MHz / 2) /* clock for Z80 sound CPU */
+#define CPU_CLOCK (XTAL(16'000'000) / 2) /* clock for 68000 */
+#define SOUND_CPU_CLOCK (XTAL(8'000'000) / 2) /* clock for Z80 sound CPU */
#include "emu.h"
#include "includes/opwolf.h"
@@ -784,7 +784,7 @@ MACHINE_CONFIG_START(opwolf_state::opwolf)
MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK ) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(opwolf_sound_z80_map)
- MCFG_TAITO_CCHIP_ADD("cchip", XTAL_12MHz / 2) /* ? MHz */
+ MCFG_TAITO_CCHIP_ADD("cchip", XTAL(12'000'000) / 2) /* ? MHz */
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
diff --git a/src/mame/drivers/orbit.cpp b/src/mame/drivers/orbit.cpp
index 49872439242..89d4a72f83c 100644
--- a/src/mame/drivers/orbit.cpp
+++ b/src/mame/drivers/orbit.cpp
@@ -28,7 +28,7 @@ Atari Orbit Driver
#include "speaker.h"
-#define MASTER_CLOCK XTAL_12_096MHz
+#define MASTER_CLOCK XTAL(12'096'000)
/*************************************
*
diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp
index 2c7a53dfe83..aa2a68a3f25 100644
--- a/src/mame/drivers/oric.cpp
+++ b/src/mame/drivers/oric.cpp
@@ -772,13 +772,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(oric_state::oric)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/12)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(12'000'000)/12)
MCFG_CPU_PROGRAM_MAP(oric_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2, 64*6, 0, 40*6, 312, 0, 28*8) // 260 lines in 60 Hz mode
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2, 64*6, 0, 40*6, 312, 0, 28*8) // 260 lines in 60 Hz mode
MCFG_SCREEN_UPDATE_DRIVER(oric_state, screen_update_oric)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(oric_state, vblank_w))
@@ -788,7 +788,7 @@ MACHINE_CONFIG_START(oric_state::oric)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay8912", AY8912, XTAL_12MHz/12)
+ MCFG_SOUND_ADD("ay8912", AY8912, XTAL(12'000'000)/12)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(4700, 4700, 4700)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(oric_state, psg_a_w))
@@ -807,7 +807,7 @@ MACHINE_CONFIG_START(oric_state::oric)
MCFG_TIMER_DRIVER_ADD_PERIODIC("tape_timer", oric_state, update_tape, attotime::from_hz(4800))
/* via */
- MCFG_DEVICE_ADD( "via6522", VIA6522, XTAL_12MHz/12 )
+ MCFG_DEVICE_ADD( "via6522", VIA6522, XTAL(12'000'000)/12 )
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(oric_state, via_a_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(oric_state, via_b_w))
MCFG_VIA6522_CA2_HANDLER(WRITELINE(oric_state, via_ca2_w))
@@ -835,11 +835,11 @@ MACHINE_CONFIG_DERIVED(telestrat_state::telstrat, oric)
/* acia */
MCFG_DEVICE_ADD("acia", MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(telestrat_state, acia_irq_w))
/* via */
- MCFG_DEVICE_ADD( "via6522_2", VIA6522, XTAL_12MHz/12 )
+ MCFG_DEVICE_ADD( "via6522_2", VIA6522, XTAL(12'000'000)/12 )
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(telestrat_state, via2_a_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(telestrat_state, via2_b_w))
MCFG_VIA6522_CA2_HANDLER(WRITELINE(telestrat_state, via2_ca2_w))
@@ -847,7 +847,7 @@ MACHINE_CONFIG_DERIVED(telestrat_state::telstrat, oric)
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(telestrat_state, via2_irq_w))
/* microdisc */
- MCFG_FD1793_ADD("fdc", XTAL_8MHz/8)
+ MCFG_FD1793_ADD("fdc", XTAL(8'000'000)/8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(telestrat_state, fdc_irq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(telestrat_state, fdc_drq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(telestrat_state, fdc_hld_w))
diff --git a/src/mame/drivers/orion.cpp b/src/mame/drivers/orion.cpp
index 76b19764966..f38bd338192 100644
--- a/src/mame/drivers/orion.cpp
+++ b/src/mame/drivers/orion.cpp
@@ -129,7 +129,7 @@ MACHINE_CONFIG_START(orion_state::orion128)
MCFG_SOFTWARE_LIST_ADD("cass_list", "orion_cass")
- MCFG_FD1793_ADD("fd1793", XTAL_8MHz / 8)
+ MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8)
MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", orion_state::orion_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", orion_state::orion_floppy_formats)
@@ -191,7 +191,7 @@ MACHINE_CONFIG_START(orion_state::orionz80)
MCFG_VIDEO_START_OVERRIDE(orion_state,orion128)
- MCFG_MC146818_ADD( "rtc", XTAL_4_194304Mhz )
+ MCFG_MC146818_ADD( "rtc", XTAL(4'194'304) )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
@@ -208,7 +208,7 @@ MACHINE_CONFIG_START(orion_state::orionz80)
MCFG_SOFTWARE_LIST_ADD("cass_list", "orion_cass")
- MCFG_FD1793_ADD("fd1793", XTAL_8MHz / 8)
+ MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8)
MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", orion_state::orion_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", orion_state::orion_floppy_formats)
@@ -283,7 +283,7 @@ MACHINE_CONFIG_START(orion_state::orionpro)
MCFG_SOFTWARE_LIST_ADD("cass_list", "orion_cass")
- MCFG_FD1793_ADD("fd1793", XTAL_8MHz / 8)
+ MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8)
MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", orion_state::orion_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", orion_state::orion_floppy_formats)
diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp
index 7a4f358450b..b142649085c 100644
--- a/src/mame/drivers/osbexec.cpp
+++ b/src/mame/drivers/osbexec.cpp
@@ -24,7 +24,7 @@
#include "speaker.h"
-#define MAIN_CLOCK XTAL_23_9616MHz
+#define MAIN_CLOCK XTAL(23'961'600)
#define MODEM_PORT_TAG "modem"
#define PRINTER_PORT_TAG "printer"
diff --git a/src/mame/drivers/osborne1.cpp b/src/mame/drivers/osborne1.cpp
index 8b4e6321b19..af193acedee 100644
--- a/src/mame/drivers/osborne1.cpp
+++ b/src/mame/drivers/osborne1.cpp
@@ -98,7 +98,7 @@ TODO:
#include "softlist.h"
-#define MAIN_CLOCK XTAL_15_9744MHz
+#define MAIN_CLOCK XTAL(15'974'400)
static ADDRESS_MAP_START( osborne1_mem, AS_PROGRAM, 8, osborne1_state )
@@ -346,7 +346,7 @@ MACHINE_CONFIG_DERIVED(osborne1nv_state::osborne1nv, osborne1)
MCFG_SCREEN_NO_PALETTE
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
- MCFG_MC6845_ADD("crtc", SY6545_1, "screen", XTAL_12_288MHz/8)
+ MCFG_MC6845_ADD("crtc", SY6545_1, "screen", XTAL(12'288'000)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(osborne1nv_state, crtc_update_row)
diff --git a/src/mame/drivers/osi.cpp b/src/mame/drivers/osi.cpp
index 649a4366c08..a832c1bd314 100644
--- a/src/mame/drivers/osi.cpp
+++ b/src/mame/drivers/osi.cpp
@@ -812,7 +812,7 @@ MACHINE_CONFIG_DERIVED(c1pmf_state::c1pmf, c1p)
/* floppy ACIA */
MCFG_DEVICE_ADD("acia_1", ACIA6850, 0)
- MCFG_DEVICE_ADD("floppy_clock", CLOCK, XTAL_4MHz/8) // 250 kHz
+ MCFG_DEVICE_ADD("floppy_clock", CLOCK, XTAL(4'000'000)/8) // 250 kHz
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia_1", acia6850_device, write_txc))
MCFG_FLOPPY_DRIVE_ADD("floppy0", osi_floppies, "ssdd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/othello.cpp b/src/mame/drivers/othello.cpp
index 371fb70ad09..cd275823915 100644
--- a/src/mame/drivers/othello.cpp
+++ b/src/mame/drivers/othello.cpp
@@ -393,16 +393,16 @@ void othello_state::machine_reset()
MACHINE_CONFIG_START(othello_state::othello)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz/2)
+ MCFG_CPU_ADD("maincpu",Z80,XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", othello_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu",Z80,XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(audio_map)
MCFG_CPU_IO_MAP(audio_portmap)
- MCFG_CPU_ADD("n7751", N7751, XTAL_6MHz)
+ MCFG_CPU_ADD("n7751", N7751, XTAL(6'000'000))
MCFG_MCS48_PORT_T1_IN_CB(GND) // labelled as "TEST", connected to ground
MCFG_MCS48_PORT_P2_IN_CB(READ8(othello_state, n7751_command_r))
MCFG_MCS48_PORT_BUS_IN_CB(READ8(othello_state, n7751_rom_r))
diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp
index bf8f48cac0b..515b0d0538e 100644
--- a/src/mame/drivers/overdriv.cpp
+++ b/src/mame/drivers/overdriv.cpp
@@ -322,17 +322,17 @@ void overdriv_state::machine_reset()
MACHINE_CONFIG_START(overdriv_state::overdriv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(overdriv_master_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", overdriv_state, overdriv_cpuA_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("sub", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("sub", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(overdriv_slave_map)
//MCFG_CPU_VBLANK_INT_DRIVER("screen", overdriv_state, cpuB_interrupt)
/* IRQ 5 and 6 are generated by the main CPU. */
/* IRQ 5 is used only in test mode, to request the checksums of the gfx ROMs. */
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL_3_579545MHz) /* 1.789 MHz?? This might be the right speed, but ROM testing */
+ MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(3'579'545)) /* 1.789 MHz?? This might be the right speed, but ROM testing */
MCFG_CPU_PROGRAM_MAP(overdriv_sound_map) /* takes a little too much (the counter wraps from 0000 to 9999). */
/* This might just mean that the video refresh rate is less than */
/* 60 fps, that's how I fixed it for now. */
@@ -344,7 +344,7 @@ MACHINE_CONFIG_START(overdriv_state::overdriv)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4,384,0,305,264,0,224)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4,384,0,305,264,0,224)
MCFG_SCREEN_UPDATE_DRIVER(overdriv_state, screen_update_overdriv)
MCFG_SCREEN_PALETTE("palette")
@@ -372,22 +372,22 @@ MACHINE_CONFIG_START(overdriv_state::overdriv)
MCFG_K053250_ADD("k053250_1", "palette", "screen", 0, 0)
MCFG_K053250_ADD("k053250_2", "palette", "screen", 0, 0)
- MCFG_DEVICE_ADD("k053252", K053252, XTAL_24MHz/4)
+ MCFG_DEVICE_ADD("k053252", K053252, XTAL(24'000'000)/4)
MCFG_K053252_OFFSETS(13*8, 2*8)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
- MCFG_K053260_ADD("k053260_1", XTAL_3_579545MHz)
+ MCFG_K053260_ADD("k053260_1", XTAL(3'579'545))
MCFG_DEVICE_ADDRESS_MAP(0, overdriv_k053260_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
- MCFG_K053260_ADD("k053260_2", XTAL_3_579545MHz)
+ MCFG_K053260_ADD("k053260_2", XTAL(3'579'545))
MCFG_DEVICE_ADDRESS_MAP(0, overdriv_k053260_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
diff --git a/src/mame/drivers/p112.cpp b/src/mame/drivers/p112.cpp
index 909cb01a007..113c6a7b42f 100644
--- a/src/mame/drivers/p112.cpp
+++ b/src/mame/drivers/p112.cpp
@@ -84,7 +84,7 @@ uint32_t p112_state::screen_update_p112(screen_device &screen, bitmap_ind16 &bit
MACHINE_CONFIG_START(p112_state::p112)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z180, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu",Z180, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(p112_mem)
MCFG_CPU_IO_MAP(p112_io)
diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp
index d7611c16236..deeb85989c2 100644
--- a/src/mame/drivers/p8k.cpp
+++ b/src/mame/drivers/p8k.cpp
@@ -403,14 +403,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(p8k_state::p8k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz )
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000) )
MCFG_Z80_DAISY_CHAIN(p8k_daisy_chain)
MCFG_CPU_PROGRAM_MAP(p8k_memmap)
MCFG_CPU_IO_MAP(p8k_iomap)
MCFG_MACHINE_RESET_OVERRIDE(p8k_state,p8k)
/* peripheral hardware */
- MCFG_DEVICE_ADD("dma", Z80DMA, XTAL_4MHz)
+ MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(4'000'000))
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(p8k_state, p8k_dma_irq_w))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80DMA_IN_MREQ_CB(READ8(p8k_state, memory_read_byte))
@@ -434,7 +434,7 @@ MACHINE_CONFIG_START(p8k_state::p8k)
// Baud Gen 0, Baud Gen 1, Baud Gen 2,
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'000'000))
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -444,7 +444,7 @@ MACHINE_CONFIG_START(p8k_state::p8k)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
- MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(4'000'000))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("pio0", Z80PIO, 1229000)
@@ -471,7 +471,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(p8k_state::p8k_16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z8001, XTAL_4MHz )
+ MCFG_CPU_ADD("maincpu", Z8001, XTAL(4'000'000) )
MCFG_CPU_PROGRAM_MAP(p8k_16_memmap)
MCFG_CPU_DATA_MAP(p8k_16_datamap)
MCFG_CPU_IO_MAP(p8k_16_iomap)
@@ -485,13 +485,13 @@ MACHINE_CONFIG_START(p8k_state::p8k_16)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxcb_w))
/* peripheral hardware */
- MCFG_DEVICE_ADD("ctc0", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("ctc0", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(WRITELINE(p8k_state, p8k_16_daisy_interrupt))
- MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(WRITELINE(p8k_state, p8k_16_daisy_interrupt))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'000'000))
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -501,16 +501,16 @@ MACHINE_CONFIG_START(p8k_state::p8k_16)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
- MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(4'000'000))
MCFG_Z80SIO_OUT_INT_CB(WRITELINE(p8k_state, p8k_16_daisy_interrupt))
- MCFG_DEVICE_ADD("pio0", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("pio0", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(WRITELINE(p8k_state, p8k_16_daisy_interrupt))
- MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(WRITELINE(p8k_state, p8k_16_daisy_interrupt))
- MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(WRITELINE(p8k_state, p8k_16_daisy_interrupt))
/* sound hardware */
diff --git a/src/mame/drivers/pachifev.cpp b/src/mame/drivers/pachifev.cpp
index f9f719358d5..ae800788873 100644
--- a/src/mame/drivers/pachifev.cpp
+++ b/src/mame/drivers/pachifev.cpp
@@ -345,11 +345,11 @@ void pachifev_state::machine_start()
MACHINE_CONFIG_START(pachifev_state::pachifev)
// CPU TMS9995, standard variant; no line connections
- MCFG_TMS99xx_ADD("maincpu", TMS9995, XTAL_12MHz, pachifev_map, pachifev_cru)
+ MCFG_TMS99xx_ADD("maincpu", TMS9995, XTAL(12'000'000), pachifev_map, pachifev_cru)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pachifev_state, pachifev_vblank_irq)
/* video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update )
@@ -357,14 +357,14 @@ MACHINE_CONFIG_START(pachifev_state::pachifev)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
#if USE_MSM
- MCFG_SOUND_ADD("adpcm", MSM5205, XTAL_384kHz) /* guess */
+ MCFG_SOUND_ADD("adpcm", MSM5205, XTAL(384'000)) /* guess */
MCFG_MSM5205_VCLK_CB(WRITELINE(pachifev_state,pf_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
#endif
- MCFG_SOUND_ADD("y2404_1", Y2404, XTAL_10_738635MHz/3) /* guess */
+ MCFG_SOUND_ADD("y2404_1", Y2404, XTAL(10'738'635)/3) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("y2404_2", Y2404, XTAL_10_738635MHz/3) /* guess */
+ MCFG_SOUND_ADD("y2404_2", Y2404, XTAL(10'738'635)/3) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pacland.cpp b/src/mame/drivers/pacland.cpp
index b94b545d170..914faa7e7ec 100644
--- a/src/mame/drivers/pacland.cpp
+++ b/src/mame/drivers/pacland.cpp
@@ -429,11 +429,11 @@ INTERRUPT_GEN_MEMBER(pacland_state::mcu_vblank_irq)
MACHINE_CONFIG_START(pacland_state::pacland)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_49_152MHz/32) /* 1.536 MHz */
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(49'152'000)/32) /* 1.536 MHz */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pacland_state, main_vblank_irq)
- MCFG_CPU_ADD("mcu", HD63701, XTAL_49_152MHz/8) /* 6.144 MHz? */
+ MCFG_CPU_ADD("mcu", HD63701, XTAL(49'152'000)/8) /* 6.144 MHz? */
MCFG_CPU_PROGRAM_MAP(mcu_map)
MCFG_CPU_IO_MAP(mcu_port_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pacland_state, mcu_vblank_irq)
@@ -444,7 +444,7 @@ MACHINE_CONFIG_START(pacland_state::pacland)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_49_152MHz/8, 384, 3*8, 39*8, 264, 2*8, 30*8)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(49'152'000)/8, 384, 3*8, 39*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(pacland_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -456,7 +456,7 @@ MACHINE_CONFIG_START(pacland_state::pacland)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL_49_152MHz/2/1024)
+ MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2/1024)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp
index d0c1a61af2c..56b57af749f 100644
--- a/src/mame/drivers/pacman.cpp
+++ b/src/mame/drivers/pacman.cpp
@@ -358,7 +358,7 @@ Boards:
*
*************************************/
-#define MASTER_CLOCK (XTAL_18_432MHz)
+#define MASTER_CLOCK (XTAL(18'432'000))
#define PIXEL_CLOCK (MASTER_CLOCK/3)
diff --git a/src/mame/drivers/pandoras.cpp b/src/mame/drivers/pandoras.cpp
index 397d70d2870..ee8a0e01682 100644
--- a/src/mame/drivers/pandoras.cpp
+++ b/src/mame/drivers/pandoras.cpp
@@ -40,8 +40,8 @@ Boards:
#include "speaker.h"
-#define MASTER_CLOCK XTAL_18_432MHz
-#define SOUND_CLOCK XTAL_14_31818MHz
+#define MASTER_CLOCK XTAL(18'432'000)
+#define SOUND_CLOCK XTAL(14'318'181)
INTERRUPT_GEN_MEMBER(pandoras_state::pandoras_master_interrupt)
diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp
index 9cf24043cba..bb7a04ae87a 100644
--- a/src/mame/drivers/panicr.cpp
+++ b/src/mame/drivers/panicr.cpp
@@ -128,9 +128,9 @@ public:
};
-#define MASTER_CLOCK XTAL_16MHz
-#define SOUND_CLOCK XTAL_14_31818MHz
-#define TC15_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(16'000'000)
+#define SOUND_CLOCK XTAL(14'318'181)
+#define TC15_CLOCK XTAL(12'000'000)
/***************************************************************************
diff --git a/src/mame/drivers/paradise.cpp b/src/mame/drivers/paradise.cpp
index 656abd92de2..7cbd18e41ba 100644
--- a/src/mame/drivers/paradise.cpp
+++ b/src/mame/drivers/paradise.cpp
@@ -729,7 +729,7 @@ INTERRUPT_GEN_MEMBER(paradise_state::irq)
MACHINE_CONFIG_START(paradise_state::paradise)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Z8400B - 6mhz Verified */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* Z8400B - 6mhz Verified */
MCFG_CPU_PROGRAM_MAP(paradise_map)
MCFG_CPU_IO_MAP(paradise_io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(paradise_state, irq, 4*54) /* No nmi routine, timing is confirmed (i.e. three timing irqs for each vblank irq */
@@ -751,10 +751,10 @@ MACHINE_CONFIG_START(paradise_state::paradise)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_12MHz/12, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL(12'000'000)/12, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki2", XTAL_12MHz/12, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki2", XTAL(12'000'000)/12, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/partner.cpp b/src/mame/drivers/partner.cpp
index 5e33d34f39f..3fda5d860b9 100644
--- a/src/mame/drivers/partner.cpp
+++ b/src/mame/drivers/partner.cpp
@@ -169,7 +169,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(partner_state::partner)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_16MHz / 9)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
MCFG_CPU_PROGRAM_MAP(partner_mem)
MCFG_MACHINE_RESET_OVERRIDE(partner_state, partner )
@@ -180,7 +180,7 @@ MACHINE_CONFIG_START(partner_state::partner)
MCFG_I8255_IN_PORTC_CB(READ8(radio86_state, radio86_8255_portc_r2))
MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
- MCFG_DEVICE_ADD("i8275", I8275, XTAL_16MHz / 12)
+ MCFG_DEVICE_ADD("i8275", I8275, XTAL(16'000'000) / 12)
MCFG_I8275_CHARACTER_WIDTH(6)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(partner_state, display_pixels)
MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma8257",i8257_device, dreq2_w))
@@ -200,7 +200,7 @@ MACHINE_CONFIG_START(partner_state::partner)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_DEVICE_ADD("dma8257", I8257, XTAL_16MHz / 9)
+ MCFG_DEVICE_ADD("dma8257", I8257, XTAL(16'000'000) / 9)
MCFG_I8257_OUT_HRQ_CB(WRITELINE(partner_state, hrq_w))
MCFG_I8257_IN_MEMR_CB(READ8(radio86_state, memory_read_byte))
MCFG_I8257_OUT_MEMW_CB(WRITE8(radio86_state, memory_write_byte))
@@ -216,7 +216,7 @@ MACHINE_CONFIG_START(partner_state::partner)
MCFG_SOFTWARE_LIST_ADD("cass_list","partner_cass")
- MCFG_FD1793_ADD("wd1793", XTAL_16MHz / 16)
+ MCFG_FD1793_ADD("wd1793", XTAL(16'000'000) / 16)
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma8257", i8257_device, dreq0_w))
MCFG_FLOPPY_DRIVE_ADD("wd1793:0", partner_floppies, "525qd", partner_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1793:1", partner_floppies, "525qd", partner_state::floppy_formats)
diff --git a/src/mame/drivers/pasogo.cpp b/src/mame/drivers/pasogo.cpp
index e923ed1967e..cd8363b52f1 100644
--- a/src/mame/drivers/pasogo.cpp
+++ b/src/mame/drivers/pasogo.cpp
@@ -536,7 +536,7 @@ void pasogo_state::machine_reset()
MACHINE_CONFIG_START(pasogo_state::pasogo)
- MCFG_CPU_ADD("maincpu", V30, XTAL_32_22MHz/2)
+ MCFG_CPU_ADD("maincpu", V30, XTAL(32'220'000)/2)
MCFG_CPU_PROGRAM_MAP(pasogo_mem)
MCFG_CPU_IO_MAP(pasogo_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pasogo_state, pasogo_interrupt)
diff --git a/src/mame/drivers/pasopia.cpp b/src/mame/drivers/pasopia.cpp
index 892ebd9b749..170a5284e86 100644
--- a/src/mame/drivers/pasopia.cpp
+++ b/src/mame/drivers/pasopia.cpp
@@ -296,7 +296,7 @@ MACHINE_CONFIG_START(pasopia_state::pasopia)
MCFG_PALETTE_ADD("palette", 8)
/* Devices */
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_4MHz/4) /* unknown clock, hand tuned to get ~60 fps */
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(4'000'000)/4) /* unknown clock, hand tuned to get ~60 fps */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(pasopia_state, crtc_update_row)
@@ -314,13 +314,13 @@ MACHINE_CONFIG_START(pasopia_state::pasopia)
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
MCFG_I8255_IN_PORTC_CB(READ8(pasopia_state, rombank_r))
- MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg2))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3))
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(pasopia_state, mux_w))
MCFG_Z80PIO_IN_PB_CB(READ8(pasopia_state, keyb_r))
diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp
index 689f596dd9b..b71d303c732 100644
--- a/src/mame/drivers/pasopia7.cpp
+++ b/src/mame/drivers/pasopia7.cpp
@@ -139,7 +139,7 @@ private:
required_ioport_array<12> m_keyboard;
};
-#define VDP_CLOCK XTAL_3_579545MHz/4
+#define VDP_CLOCK XTAL(3'579'545)/4
#define LCD_CLOCK VDP_CLOCK/10
// needed to scan the keyboard, as the pio emulation doesn't do it.
@@ -913,7 +913,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(pasopia7_state::p7_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(pasopia7_mem)
MCFG_CPU_IO_MAP(pasopia7_io)
MCFG_Z80_DAISY_CHAIN(p7_daisy)
@@ -929,13 +929,13 @@ MACHINE_CONFIG_START(pasopia7_state::p7_base)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
- MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg2)) // beep interface
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3))
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(pasopia7_state, mux_w))
MCFG_Z80PIO_IN_PB_CB(READ8(pasopia7_state, keyb_r))
diff --git a/src/mame/drivers/patapata.cpp b/src/mame/drivers/patapata.cpp
index 676682ef193..40393e0ad4d 100644
--- a/src/mame/drivers/patapata.cpp
+++ b/src/mame/drivers/patapata.cpp
@@ -283,7 +283,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(patapata_state::scanline)
MACHINE_CONFIG_START(patapata_state::patapata)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // 16 MHz XTAL, 16 MHz CPU
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) // 16 MHz XTAL, 16 MHz CPU
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", patapata_state, irq4_line_hold) // 1 + 4 valid? (4 main VBL)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", patapata_state, scanline, "screen", 0, 1)
@@ -303,10 +303,10 @@ MACHINE_CONFIG_START(patapata_state::patapata)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_16MHz / 4, PIN7_LOW) // not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL(16'000'000) / 4, PIN7_LOW) // not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki2", XTAL_16MHz / 4, PIN7_LOW) // not verified
+ MCFG_OKIM6295_ADD("oki2", XTAL(16'000'000) / 4, PIN7_LOW) // not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("nmk112", NMK112, 0) // or 212? difficult to read (maybe 212 is 2* 112?)
diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp
index 1f6b2d822ef..9efded5370e 100644
--- a/src/mame/drivers/pc.cpp
+++ b/src/mame/drivers/pc.cpp
@@ -641,7 +641,7 @@ MACHINE_CONFIG_END
// Zenith SuperSport
MACHINE_CONFIG_START(pc_state::zenith)
/* basic machine hardware */
- MCFG_CPU_PC(zenith, pc8, I8088, XTAL_14_31818MHz/3) /* 4,77 MHz */
+ MCFG_CPU_PC(zenith, pc8, I8088, XTAL(14'318'181)/3) /* 4,77 MHz */
MCFG_IBM5150_MOTHERBOARD_ADD("mb", "maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(pccga)
@@ -683,7 +683,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(pc_state::siemens)
/* basic machine hardware */
- MCFG_CPU_PC(pc8, pc8, I8088, XTAL_14_31818MHz/3) /* 4,77 MHz */
+ MCFG_CPU_PC(pc8, pc8, I8088, XTAL(14'318'181)/3) /* 4,77 MHz */
MCFG_IBM5150_MOTHERBOARD_ADD("mb", "maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(siemens)
@@ -761,7 +761,7 @@ MACHINE_CONFIG_END
//Laser XT/3
MACHINE_CONFIG_START(pc_state::laser_xt3)
- MCFG_CPU_PC(pc8, pc8, I8088, XTAL_14_31818MHz/3) /* 4,77 MHz */
+ MCFG_CPU_PC(pc8, pc8, I8088, XTAL(14'318'181)/3) /* 4,77 MHz */
MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(pccga)
@@ -790,7 +790,7 @@ MACHINE_CONFIG_END
//Laser Turbo XT
MACHINE_CONFIG_START(pc_state::laser_turbo_xt)
- MCFG_CPU_PC(pc8, pc8, I8088, XTAL_14_31818MHz/3) /* 4,77 MHz */
+ MCFG_CPU_PC(pc8, pc8, I8088, XTAL(14'318'181)/3) /* 4,77 MHz */
MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(pccga)
@@ -819,7 +819,7 @@ MACHINE_CONFIG_END
//Olytext 30
MACHINE_CONFIG_DERIVED(pc_state::olytext30, pccga)
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_PC(pc8, pc8, V20, XTAL_14_31818MHz/3) /* 4,77 MHz */
+ MCFG_CPU_PC(pc8, pc8, V20, XTAL(14'318'181)/3) /* 4,77 MHz */
MCFG_DEVICE_MODIFY("isa2")
MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc_xt", cfg_single_720K)
MCFG_DEVICE_MODIFY("isa3")
diff --git a/src/mame/drivers/pc100.cpp b/src/mame/drivers/pc100.cpp
index 1edddd6eea2..3b08d877897 100644
--- a/src/mame/drivers/pc100.cpp
+++ b/src/mame/drivers/pc100.cpp
@@ -529,7 +529,7 @@ MACHINE_CONFIG_START(pc100_state::pc100)
MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pc100_state, irqnmi_w))
MCFG_UPD765_DRQ_CALLBACK(WRITELINE(pc100_state, drqnmi_w))
- MCFG_DEVICE_ADD("rtc", MSM58321, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM58321, XTAL(32'768))
MCFG_MSM58321_D0_HANDLER(WRITELINE(pc100_state, rtc_portc_0_w))
MCFG_MSM58321_D1_HANDLER(WRITELINE(pc100_state, rtc_portc_1_w))
MCFG_MSM58321_D2_HANDLER(WRITELINE(pc100_state, rtc_portc_2_w))
diff --git a/src/mame/drivers/pc1500.cpp b/src/mame/drivers/pc1500.cpp
index 7f84f913559..9c6a5310e14 100644
--- a/src/mame/drivers/pc1500.cpp
+++ b/src/mame/drivers/pc1500.cpp
@@ -288,7 +288,7 @@ MACHINE_CONFIG_START(pc1500_state::pc1500)
MCFG_LH5810_PORTC_W_CB(WRITE8(pc1500_state, port_c_w))
MCFG_LH5810_OUT_INT_CB(INPUTLINE("maincpu", LH5801_LINE_MI))
- MCFG_UPD1990A_ADD("upd1990a", XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD1990A_ADD("upd1990a", XTAL(32'768), NOOP, NOOP)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pc1512.cpp b/src/mame/drivers/pc1512.cpp
index 867dce405e1..671d125b9b3 100644
--- a/src/mame/drivers/pc1512.cpp
+++ b/src/mame/drivers/pc1512.cpp
@@ -1182,7 +1182,7 @@ void pc1640_state::machine_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(pc1512_state::pc1512)
- MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_24MHz/3)
+ MCFG_CPU_ADD(I8086_TAG, I8086, XTAL(24'000'000)/3)
MCFG_CPU_PROGRAM_MAP(pc1512_mem)
MCFG_CPU_IO_MAP(pc1512_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(I8259A2_TAG, pic8259_device, inta_cb)
@@ -1206,7 +1206,7 @@ MACHINE_CONFIG_START(pc1512_state::pc1512)
MCFG_PC1512_MOUSE_PORT_M1_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m1_w))
MCFG_PC1512_MOUSE_PORT_M2_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m2_w))
- MCFG_DEVICE_ADD(I8237A5_TAG, AM9517A, XTAL_24MHz/6)
+ MCFG_DEVICE_ADD(I8237A5_TAG, AM9517A, XTAL(24'000'000)/6)
MCFG_I8237_OUT_HREQ_CB(WRITELINE(pc1512_state, hrq_w))
MCFG_I8237_OUT_EOP_CB(WRITELINE(pc1512_state, eop_w))
MCFG_I8237_IN_MEMR_CB(READ8(pc1512_state, memr_r))
@@ -1227,14 +1227,14 @@ MACHINE_CONFIG_START(pc1512_state::pc1512)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(I8086_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_28_63636MHz/24)
+ MCFG_PIT8253_CLK0(XTAL(28'636'363)/24)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_28_63636MHz/24)
+ MCFG_PIT8253_CLK1(XTAL(28'636'363)/24)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(pc1512_state, pit1_w))
- MCFG_PIT8253_CLK2(XTAL_28_63636MHz/24)
+ MCFG_PIT8253_CLK2(XTAL(28'636'363)/24)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(pc1512_state, pit2_w))
- MCFG_MC146818_ADD(MC146818_TAG, XTAL_32_768kHz)
+ MCFG_MC146818_ADD(MC146818_TAG, XTAL(32'768))
MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir2_w))
MCFG_PC_FDC_XT_ADD(PC_FDC_XT_TAG)
@@ -1243,7 +1243,7 @@ MACHINE_CONFIG_START(pc1512_state::pc1512)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":0", pc1512_floppies, "525dd", pc1512_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", pc1512_floppies, nullptr, pc1512_state::floppy_formats)
- MCFG_DEVICE_ADD(INS8250_TAG, INS8250, XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD(INS8250_TAG, INS8250, XTAL(1'843'200))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
@@ -1317,7 +1317,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
MACHINE_CONFIG_START(pc1640_state::pc1640)
- MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_24MHz/3)
+ MCFG_CPU_ADD(I8086_TAG, I8086, XTAL(24'000'000)/3)
MCFG_CPU_PROGRAM_MAP(pc1640_mem)
MCFG_CPU_IO_MAP(pc1640_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(I8259A2_TAG, pic8259_device, inta_cb)
@@ -1338,7 +1338,7 @@ MACHINE_CONFIG_START(pc1640_state::pc1640)
MCFG_PC1512_MOUSE_PORT_M1_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m1_w))
MCFG_PC1512_MOUSE_PORT_M2_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m2_w))
- MCFG_DEVICE_ADD(I8237A5_TAG, AM9517A, XTAL_24MHz/6)
+ MCFG_DEVICE_ADD(I8237A5_TAG, AM9517A, XTAL(24'000'000)/6)
MCFG_I8237_OUT_HREQ_CB(WRITELINE(pc1512_state, hrq_w))
MCFG_I8237_OUT_EOP_CB(WRITELINE(pc1512_state, eop_w))
MCFG_I8237_IN_MEMR_CB(READ8(pc1512_state, memr_r))
@@ -1359,14 +1359,14 @@ MACHINE_CONFIG_START(pc1640_state::pc1640)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(I8086_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_28_63636MHz/24)
+ MCFG_PIT8253_CLK0(XTAL(28'636'363)/24)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_28_63636MHz/24)
+ MCFG_PIT8253_CLK1(XTAL(28'636'363)/24)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(pc1512_state, pit1_w))
- MCFG_PIT8253_CLK2(XTAL_28_63636MHz/24)
+ MCFG_PIT8253_CLK2(XTAL(28'636'363)/24)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(pc1512_state, pit2_w))
- MCFG_MC146818_ADD(MC146818_TAG, XTAL_32_768kHz)
+ MCFG_MC146818_ADD(MC146818_TAG, XTAL(32'768))
MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir2_w))
MCFG_PC_FDC_XT_ADD(PC_FDC_XT_TAG)
@@ -1375,7 +1375,7 @@ MACHINE_CONFIG_START(pc1640_state::pc1640)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":0", pc1512_floppies, "525dd", pc1512_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", pc1512_floppies, nullptr, pc1512_state::floppy_formats)
- MCFG_DEVICE_ADD(INS8250_TAG, INS8250, XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD(INS8250_TAG, INS8250, XTAL(1'843'200))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
diff --git a/src/mame/drivers/pc2000.cpp b/src/mame/drivers/pc2000.cpp
index 6b822b2db1f..74a14b087a8 100644
--- a/src/mame/drivers/pc2000.cpp
+++ b/src/mame/drivers/pc2000.cpp
@@ -837,7 +837,7 @@ DEVICE_IMAGE_LOAD_MEMBER( pc2000_state, pc2000_cart )
MACHINE_CONFIG_START(pc2000_state::pc2000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) /* probably not accurate */
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000)) /* probably not accurate */
MCFG_CPU_PROGRAM_MAP(pc2000_mem)
MCFG_CPU_IO_MAP(pc2000_io)
MCFG_CPU_PERIODIC_INT_DRIVER(pc2000_state, irq0_line_hold, 50)
diff --git a/src/mame/drivers/pc4.cpp b/src/mame/drivers/pc4.cpp
index 337a6151d3b..3593aac7967 100644
--- a/src/mame/drivers/pc4.cpp
+++ b/src/mame/drivers/pc4.cpp
@@ -218,7 +218,7 @@ void pc4_state::machine_start()
MACHINE_CONFIG_START(pc4_state::pc4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(pc4_mem)
MCFG_CPU_IO_MAP(pc4_io)
@@ -240,7 +240,7 @@ MACHINE_CONFIG_START(pc4_state::pc4)
MCFG_SOUND_ADD( "beeper", BEEP, 3250 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
- MCFG_DEVICE_ADD("rtc", RP5C01, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768))
MACHINE_CONFIG_END
ROM_START( pc4 )
diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp
index 615bf78d91d..8b746331e1b 100644
--- a/src/mame/drivers/pc6001.cpp
+++ b/src/mame/drivers/pc6001.cpp
@@ -2372,7 +2372,7 @@ MACHINE_CONFIG_DERIVED(pc6001_state::pc6001sr, pc6001m2)
MCFG_SCREEN_UPDATE_DRIVER(pc6001_state, screen_update_pc6001sr)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", Z80, XTAL_3_579545MHz) //*Yes*, PC-6001 SR Z80 CPU is actually slower than older models
+ MCFG_CPU_REPLACE("maincpu", Z80, XTAL(3'579'545)) //*Yes*, PC-6001 SR Z80 CPU is actually slower than older models
MCFG_CPU_PROGRAM_MAP(pc6001sr_map)
MCFG_CPU_IO_MAP(pc6001sr_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pc6001_state, pc6001sr_interrupt)
diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp
index 40fa972135c..a184fe6cfba 100644
--- a/src/mame/drivers/pc8001.cpp
+++ b/src/mame/drivers/pc8001.cpp
@@ -478,7 +478,7 @@ void pc8001_state::machine_start()
MACHINE_CONFIG_START(pc8001_state::pc8001)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(pc8001_mem)
MCFG_CPU_IO_MAP(pc8001_io)
@@ -499,14 +499,14 @@ MACHINE_CONFIG_START(pc8001_state::pc8001)
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_DEVICE_ADD(I8257_TAG, I8257, XTAL_4MHz)
+ MCFG_DEVICE_ADD(I8257_TAG, I8257, XTAL(4'000'000))
MCFG_I8257_OUT_HRQ_CB(WRITELINE(pc8001_state, hrq_w))
MCFG_I8257_IN_MEMR_CB(READ8(pc8001_state, dma_mem_r))
MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8(UPD3301_TAG, upd3301_device, dack_w))
- MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, NOOP)
- MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, XTAL_14_31818MHz)
+ MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, XTAL(14'318'181))
MCFG_UPD3301_CHARACTER_WIDTH(8)
MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(pc8001_state, pc8001_display_pixels)
MCFG_UPD3301_VRTC_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq2_w))
@@ -528,7 +528,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc8001mk2_state::pc8001mk2)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(pc8001mk2_mem)
MCFG_CPU_IO_MAP(pc8001mk2_io)
@@ -549,14 +549,14 @@ MACHINE_CONFIG_START(pc8001mk2_state::pc8001mk2)
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_DEVICE_ADD(I8257_TAG, I8257, XTAL_4MHz)
+ MCFG_DEVICE_ADD(I8257_TAG, I8257, XTAL(4'000'000))
MCFG_I8257_OUT_HRQ_CB(WRITELINE(pc8001_state, hrq_w))
MCFG_I8257_IN_MEMR_CB(READ8(pc8001_state, dma_mem_r))
MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8(UPD3301_TAG, upd3301_device, dack_w))
- MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, NOOP)
- MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, XTAL_14_31818MHz)
+ MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, XTAL(14'318'181))
MCFG_UPD3301_CHARACTER_WIDTH(8)
MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(pc8001_state, pc8001_display_pixels)
MCFG_UPD3301_VRTC_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq2_w))
diff --git a/src/mame/drivers/pc8401a.cpp b/src/mame/drivers/pc8401a.cpp
index faeb0370b43..0a5464c11fa 100644
--- a/src/mame/drivers/pc8401a.cpp
+++ b/src/mame/drivers/pc8401a.cpp
@@ -578,7 +578,7 @@ MACHINE_CONFIG_START(pc8401a_state::pc8401a)
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", pc8401a_state, pc8401a_keyboard_tick, attotime::from_hz(64))
/* devices */
- MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, NOOP)
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
MCFG_I8255_IN_PORTC_CB(READ8(pc8401a_state, ppi_pc_r))
@@ -620,7 +620,7 @@ MACHINE_CONFIG_START(pc8500_state::pc8500)
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", pc8401a_state, pc8401a_keyboard_tick, attotime::from_hz(64))
/* devices */
- MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, NOOP)
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
MCFG_I8255_IN_PORTC_CB(READ8(pc8401a_state, ppi_pc_r))
diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp
index 53f157c22ce..850beb151b0 100644
--- a/src/mame/drivers/pc8801.cpp
+++ b/src/mame/drivers/pc8801.cpp
@@ -277,10 +277,10 @@
#define IRQ_DEBUG (0)
#define IRQ_LOG(x) do { if (IRQ_DEBUG) printf x; } while (0)
-#define MASTER_CLOCK XTAL_4MHz
+#define MASTER_CLOCK XTAL(4'000'000)
/* TODO: clocks of this */
-#define PIXEL_CLOCK_15KHz XTAL_14_31818MHz
-#define PIXEL_CLOCK_24KHz XTAL_21_4772MHz
+#define PIXEL_CLOCK_15KHz XTAL(14'318'181)
+#define PIXEL_CLOCK_24KHz XTAL(21'477'272)
#define I8214_TAG "i8214"
#define UPD1990A_TAG "upd1990a"
@@ -2505,8 +2505,8 @@ MACHINE_RESET_MEMBER(pc8801_state,pc8801_clock_speed)
m_has_clock_speed = 1;
m_clock_setting = ioport("CFG")->read() & 0x80;
- m_maincpu->set_unscaled_clock(m_clock_setting ? XTAL_4MHz : XTAL_8MHz);
- m_fdccpu->set_unscaled_clock(m_clock_setting ? XTAL_4MHz : XTAL_8MHz); // correct?
+ m_maincpu->set_unscaled_clock(m_clock_setting ? XTAL(4'000'000) : XTAL(8'000'000));
+ m_fdccpu->set_unscaled_clock(m_clock_setting ? XTAL(4'000'000) : XTAL(8'000'000)); // correct?
m_baudrate_val = 0;
}
@@ -2604,7 +2604,7 @@ MACHINE_CONFIG_START(pc8801_state::pc8801)
#ifdef USE_PROPER_I8214
MCFG_I8214_ADD(I8214_TAG, MASTER_CLOCK, pic_intf)
#endif
- MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, NOOP)
//MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp
index d051b25cbfd..0c53dddf414 100644
--- a/src/mame/drivers/pc9801.cpp
+++ b/src/mame/drivers/pc9801.cpp
@@ -1800,8 +1800,8 @@ READ8_MEMBER(pc9801_state::get_slave_ack)
PC-9801RS needs X1 for the pit, otherwise Uchiyama Aki no Chou Bangai has sound pitch bugs
PC-9821 definitely needs X2, otherwise there's a timer error at POST. Unless it needs a different clock anyway ...
*/
-#define MAIN_CLOCK_X1 XTAL_1_9968MHz
-#define MAIN_CLOCK_X2 XTAL_2_4576MHz
+#define MAIN_CLOCK_X1 XTAL(1'996'800)
+#define MAIN_CLOCK_X2 XTAL(2'457'600)
/****************************************
*
@@ -2373,7 +2373,7 @@ MACHINE_CONFIG_START(pc9801_state::pc9801)
MCFG_FLOPPY_DRIVE_ADD("upd765_2dd:1", pc9801_floppies, "525dd", pc9801_state::floppy_formats)
MCFG_FRAGMENT_ADD(pc9801_sasi)
- MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, NOOP)
MCFG_DEVICE_MODIFY("i8237")
MCFG_I8237_IN_IOR_3_CB(DEVREAD8("upd765_2dd", upd765a_device, mdma_r))
@@ -2407,7 +2407,7 @@ MACHINE_CONFIG_START(pc9801_state::pc9801rs)
MCFG_DEVICE_CLOCK(MAIN_CLOCK_X1*8); // unknown clock
MCFG_FRAGMENT_ADD(pc9801_ide)
- MCFG_UPD4990A_ADD("upd1990a", XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD4990A_ADD("upd1990a", XTAL(32'768), NOOP, NOOP)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("1664K")
diff --git a/src/mame/drivers/pcat_dyn.cpp b/src/mame/drivers/pcat_dyn.cpp
index 31046a39ae6..5935e828ebf 100644
--- a/src/mame/drivers/pcat_dyn.cpp
+++ b/src/mame/drivers/pcat_dyn.cpp
@@ -185,7 +185,7 @@ MACHINE_CONFIG_START(pcat_dyn_state::pcat_dyn)
MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram", pcat_dyn_state, nvram_init)
- MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport", rs232_port_device, write_rts))
diff --git a/src/mame/drivers/pcat_nit.cpp b/src/mame/drivers/pcat_nit.cpp
index e64170f5742..fa184308011 100644
--- a/src/mame/drivers/pcat_nit.cpp
+++ b/src/mame/drivers/pcat_nit.cpp
@@ -231,7 +231,7 @@ MACHINE_CONFIG_START(pcat_nit_state::pcat_nit)
MCFG_FRAGMENT_ADD( pcvideo_vga )
MCFG_FRAGMENT_ADD( pcat_common )
- MCFG_DEVICE_ADD( "ns16450_0", NS16450, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "ns16450_0", NS16450, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir4_w))
MCFG_MICROTOUCH_ADD( "microtouch", 9600, DEVWRITELINE("ns16450_0", ins8250_uart_device, rx_w) ) // rate?
@@ -250,7 +250,7 @@ MACHINE_CONFIG_START(pcat_nit_state::bonanza)
MCFG_FRAGMENT_ADD( pcvideo_cirrus_gd5428 )
MCFG_FRAGMENT_ADD( pcat_common )
- MCFG_DEVICE_ADD( "ns16450_0", NS16450, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "ns16450_0", NS16450, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir4_w))
MCFG_MICROTOUCH_ADD( "microtouch", 9600, DEVWRITELINE("ns16450_0", ins8250_uart_device, rx_w) ) // rate?
diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp
index 3bea28e01bc..cd97cc49779 100644
--- a/src/mame/drivers/pcd.cpp
+++ b/src/mame/drivers/pcd.cpp
@@ -490,13 +490,13 @@ static INPUT_PORTS_START(pcx)
INPUT_PORTS_END
MACHINE_CONFIG_START(pcd_state::pcd)
- MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", I80186, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(pcd_map)
MCFG_CPU_IO_MAP(pcd_io)
MCFG_80186_TMROUT1_HANDLER(WRITELINE(pcd_state, i186_timer1_w))
MCFG_80186_IRQ_SLAVE_ACK(READ8(pcd_state, irq_callback))
- MCFG_TIMER_DRIVER_ADD_PERIODIC("timer0_tick", pcd_state, timer0_tick, attotime::from_hz(XTAL_16MHz / 24)) // adjusted to pass post
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("timer0_tick", pcd_state, timer0_tick, attotime::from_hz(XTAL(16'000'000) / 24)) // adjusted to pass post
MCFG_DEVICE_ADD("pic1", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("maincpu", i80186_cpu_device, int0_w))
@@ -513,7 +513,7 @@ MACHINE_CONFIG_START(pcd_state::pcd)
MCFG_NVRAM_ADD_1FILL("nvram")
// floppy disk controller
- MCFG_WD2793_ADD("fdc", XTAL_16MHz / 8)
+ MCFG_WD2793_ADD("fdc", XTAL(16'000'000) / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pic1", pic8259_device, ir6_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq1_w))
MCFG_WD_FDC_ENMF_CALLBACK(GND)
@@ -523,15 +523,15 @@ MACHINE_CONFIG_START(pcd_state::pcd)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pcd_floppies, "55f", pcd_state::floppy_formats)
// usart
- MCFG_DEVICE_ADD("usart1", MC2661, XTAL_4_9152MHz)
+ MCFG_DEVICE_ADD("usart1", MC2661, XTAL(4'915'200))
MCFG_MC2661_RXRDY_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir3_w))
MCFG_MC2661_TXRDY_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir3_w))
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("rs232_1", rs232_port_device, write_txd))
- MCFG_DEVICE_ADD("usart2", MC2661, XTAL_4_9152MHz)
+ MCFG_DEVICE_ADD("usart2", MC2661, XTAL(4'915'200))
MCFG_MC2661_RXRDY_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir2_w))
//MCFG_MC2661_TXRDY_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir2_w)) // this gets stuck high causing the keyboard to not work
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("keyboard", pcd_keyboard_device, t0_w))
- MCFG_DEVICE_ADD("usart3", MC2661, XTAL_4_9152MHz)
+ MCFG_DEVICE_ADD("usart3", MC2661, XTAL(4'915'200))
MCFG_MC2661_RXRDY_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir4_w))
MCFG_MC2661_TXRDY_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir4_w))
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("rs232_2", rs232_port_device, write_txd))
@@ -547,7 +547,7 @@ MACHINE_CONFIG_START(pcd_state::pcd)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
// rtc
- MCFG_MC146818_ADD("rtc", XTAL_32_768kHz)
+ MCFG_MC146818_ADD("rtc", XTAL(32'768))
MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir7_w))
MCFG_MC146818_BINARY(true)
MCFG_MC146818_BINARY_YEAR(true)
diff --git a/src/mame/drivers/pce220.cpp b/src/mame/drivers/pce220.cpp
index 4d2cdbc829b..a262d4f4006 100644
--- a/src/mame/drivers/pce220.cpp
+++ b/src/mame/drivers/pce220.cpp
@@ -967,7 +967,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcg850v_state::pcg815)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz ) // 3.54MHz
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000) ) // 3.54MHz
MCFG_CPU_PROGRAM_MAP(pce220_mem)
MCFG_CPU_IO_MAP(pcg850v_io)
@@ -1003,7 +1003,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcg850v_state::pcg850v)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz ) // CMOS-SC7852
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(8'000'000) ) // CMOS-SC7852
MCFG_CPU_PROGRAM_MAP(pce220_mem)
MCFG_CPU_IO_MAP(pcg850v_io)
diff --git a/src/mame/drivers/pcfx.cpp b/src/mame/drivers/pcfx.cpp
index 8e2fb8d63dd..c03cd219c1a 100644
--- a/src/mame/drivers/pcfx.cpp
+++ b/src/mame/drivers/pcfx.cpp
@@ -412,13 +412,13 @@ uint32_t pcfx_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
MACHINE_CONFIG_START(pcfx_state::pcfx)
- MCFG_CPU_ADD( "maincpu", V810, XTAL_21_4772MHz )
+ MCFG_CPU_ADD( "maincpu", V810, XTAL(21'477'272) )
MCFG_CPU_PROGRAM_MAP( pcfx_mem)
MCFG_CPU_IO_MAP( pcfx_io)
MCFG_SCREEN_ADD( "screen", RASTER )
MCFG_SCREEN_UPDATE_DRIVER(pcfx_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_21_4772MHz, huc6261_device::WPF, 64, 64 + 1024 + 64, huc6261_device::LPF, 18, 18 + 242)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(21'477'272), huc6261_device::WPF, 64, 64 + 1024 + 64, huc6261_device::LPF, 18, 18 + 242)
MCFG_DEVICE_ADD( "huc6270_a", HUC6270, 0 )
MCFG_HUC6270_VRAM_SIZE(0x20000)
@@ -428,16 +428,16 @@ MACHINE_CONFIG_START(pcfx_state::pcfx)
MCFG_HUC6270_VRAM_SIZE(0x20000)
MCFG_HUC6270_IRQ_CHANGED_CB(WRITELINE(pcfx_state, irq14_w))
- MCFG_DEVICE_ADD("huc6261", HUC6261, XTAL_21_4772MHz)
+ MCFG_DEVICE_ADD("huc6261", HUC6261, XTAL(21'477'272))
MCFG_HUC6261_VDC1("huc6270_a")
MCFG_HUC6261_VDC2("huc6270_b")
MCFG_HUC6261_KING("huc6272")
- MCFG_HUC6272_ADD( "huc6272", XTAL_21_4772MHz )
+ MCFG_HUC6272_ADD( "huc6272", XTAL(21'477'272) )
MCFG_HUC6272_IRQ_CHANGED_CB(WRITELINE(pcfx_state, irq13_w))
MCFG_HUC6272_RAINBOW("huc6271")
- MCFG_HUC6271_ADD( "huc6271", XTAL_21_4772MHz )
+ MCFG_HUC6271_ADD( "huc6271", XTAL(21'477'272) )
MCFG_SOFTWARE_LIST_ADD("cd_list", "pcfx")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp
index 08a41c911b7..8f93b1bd8d5 100644
--- a/src/mame/drivers/pcm.cpp
+++ b/src/mame/drivers/pcm.cpp
@@ -251,7 +251,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(pcm_state::pcm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_10MHz /4)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(10'000'000) /4)
MCFG_CPU_PROGRAM_MAP(pcm_mem)
MCFG_CPU_IO_MAP(pcm_io)
MCFG_Z80_DAISY_CHAIN(pcm_daisy_chain)
@@ -279,21 +279,21 @@ MACHINE_CONFIG_START(pcm_state::pcm)
MCFG_K7659_KEYBOARD_ADD()
MCFG_CASSETTE_ADD("cassette")
- MCFG_DEVICE_ADD("pio_u", Z80PIO, XTAL_10MHz/4)
+ MCFG_DEVICE_ADD("pio_u", Z80PIO, XTAL(10'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("pio_s", Z80PIO, XTAL_10MHz/4)
+ MCFG_DEVICE_ADD("pio_s", Z80PIO, XTAL(10'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(DEVREAD8(K7659_KEYBOARD_TAG, k7659_keyboard_device, read))
MCFG_Z80PIO_IN_PB_CB(READ8(pcm_state, pcm_85_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(pcm_state, pcm_85_w))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_10MHz /4)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(10'000'000) /4)
- MCFG_DEVICE_ADD("ctc_u", Z80CTC, XTAL_10MHz /4)
+ MCFG_DEVICE_ADD("ctc_u", Z80CTC, XTAL(10'000'000) /4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("ctc_s", Z80CTC, XTAL_10MHz /4)
+ MCFG_DEVICE_ADD("ctc_s", Z80CTC, XTAL(10'000'000) /4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxca_w))
diff --git a/src/mame/drivers/pcw16.cpp b/src/mame/drivers/pcw16.cpp
index 0cd6df67e1a..86f31444aff 100644
--- a/src/mame/drivers/pcw16.cpp
+++ b/src/mame/drivers/pcw16.cpp
@@ -1014,7 +1014,7 @@ MACHINE_CONFIG_START(pcw16_state::pcw16)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_DEVICE_ADD( "ns16550_1", NS16550, XTAL_1_8432MHz ) /* TODO: Verify uart model */
+ MCFG_DEVICE_ADD( "ns16550_1", NS16550, XTAL(1'843'200) ) /* TODO: Verify uart model */
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport1", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport1", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport1", rs232_port_device, write_rts))
@@ -1026,7 +1026,7 @@ MACHINE_CONFIG_START(pcw16_state::pcw16)
MCFG_RS232_RI_HANDLER(DEVWRITELINE("ns16550_1", ins8250_uart_device, ri_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ns16550_1", ins8250_uart_device, cts_w))
- MCFG_DEVICE_ADD( "ns16550_2", NS16550, XTAL_1_8432MHz ) /* TODO: Verify uart model */
+ MCFG_DEVICE_ADD( "ns16550_2", NS16550, XTAL(1'843'200) ) /* TODO: Verify uart model */
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport2", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport2", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport2", rs232_port_device, write_rts))
diff --git a/src/mame/drivers/pcxt.cpp b/src/mame/drivers/pcxt.cpp
index d03ebef3746..14243c7b5ac 100644
--- a/src/mame/drivers/pcxt.cpp
+++ b/src/mame/drivers/pcxt.cpp
@@ -483,7 +483,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(pcxt_state::filetto)
- MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3)
MCFG_CPU_PROGRAM_MAP(filetto_map)
MCFG_CPU_IO_MAP(filetto_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
@@ -504,7 +504,7 @@ MACHINE_CONFIG_START(pcxt_state::filetto)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcxt_state::tetriskr)
- MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3)
MCFG_CPU_PROGRAM_MAP(tetriskr_map)
MCFG_CPU_IO_MAP(tetriskr_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
diff --git a/src/mame/drivers/pda600.cpp b/src/mame/drivers/pda600.cpp
index bc8157271cf..5ab845b2aaa 100644
--- a/src/mame/drivers/pda600.cpp
+++ b/src/mame/drivers/pda600.cpp
@@ -199,7 +199,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(pda600_state::pda600)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z180, XTAL_14_31818MHz)
+ MCFG_CPU_ADD("maincpu",Z180, XTAL(14'318'181))
MCFG_CPU_PROGRAM_MAP(pda600_mem)
MCFG_CPU_IO_MAP(pda600_io)
@@ -219,7 +219,7 @@ MACHINE_CONFIG_START(pda600_state::pda600)
// NVRAM needs to be filled with random data to fail the checksum and be initialized correctly
MCFG_NVRAM_ADD_RANDOM_FILL("nvram")
- MCFG_DEVICE_ADD("rtc", HD64610, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", HD64610, XTAL(32'768))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/pdp11.cpp b/src/mame/drivers/pdp11.cpp
index c4dfcbe7c30..17e57143aa5 100644
--- a/src/mame/drivers/pdp11.cpp
+++ b/src/mame/drivers/pdp11.cpp
@@ -351,7 +351,7 @@ void pdp11_state::kbd_put(u8 data)
MACHINE_CONFIG_START(pdp11_state::pdp11)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",T11, XTAL_4MHz) // Need proper CPU here
+ MCFG_CPU_ADD("maincpu",T11, XTAL(4'000'000)) // Need proper CPU here
MCFG_T11_INITIAL_MODE(6 << 13)
MCFG_CPU_PROGRAM_MAP(pdp11_mem)
diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp
index d51506eee3b..6e5d72232aa 100644
--- a/src/mame/drivers/pegasus.cpp
+++ b/src/mame/drivers/pegasus.cpp
@@ -482,7 +482,7 @@ DRIVER_INIT_MEMBER(pegasus_state, pegasus)
MACHINE_CONFIG_START(pegasus_state::pegasus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz) // actually a 6809C - 4MHZ clock coming in, 1MHZ internally
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000)) // actually a 6809C - 4MHZ clock coming in, 1MHZ internally
MCFG_CPU_PROGRAM_MAP(pegasus_mem)
MCFG_TIMER_DRIVER_ADD_PERIODIC("pegasus_firq", pegasus_state, pegasus_firq, attotime::from_hz(400))
diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp
index 731e693cf41..0beaf56b627 100644
--- a/src/mame/drivers/pencil2.cpp
+++ b/src/mame/drivers/pencil2.cpp
@@ -306,19 +306,19 @@ void pencil2_state::machine_start()
MACHINE_CONFIG_START(pencil2_state::pencil2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635)/3)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
/* video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489a", SN76489A, XTAL_10_738635MHz/3) // guess
+ MCFG_SOUND_ADD("sn76489a", SN76489A, XTAL(10'738'635)/3) // guess
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/pengadvb.cpp b/src/mame/drivers/pengadvb.cpp
index bac42a90908..5a5b6079894 100644
--- a/src/mame/drivers/pengadvb.cpp
+++ b/src/mame/drivers/pengadvb.cpp
@@ -207,7 +207,7 @@ WRITE8_MEMBER(pengadvb_state::pengadvb_ppi_port_c_w)
MACHINE_CONFIG_START(pengadvb_state::pengadvb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635)/3)
MCFG_CPU_PROGRAM_MAP(program_mem)
MCFG_CPU_IO_MAP(io_mem)
@@ -247,7 +247,7 @@ MACHINE_CONFIG_START(pengadvb_state::pengadvb)
MCFG_I8255_OUT_PORTC_CB(WRITE8(pengadvb_state, pengadvb_ppi_port_c_w))
/* video hardware */
- MCFG_DEVICE_ADD("tms9128", TMS9128, XTAL_10_738635MHz/2)
+ MCFG_DEVICE_ADD("tms9128", TMS9128, XTAL(10'738'635)/2)
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
@@ -255,7 +255,7 @@ MACHINE_CONFIG_START(pengadvb_state::pengadvb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_10_738635MHz/6)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(10'738'635)/6)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(pengadvb_state, pengadvb_psg_port_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/pentagon.cpp b/src/mame/drivers/pentagon.cpp
index 37d23866f4e..111106625b8 100644
--- a/src/mame/drivers/pentagon.cpp
+++ b/src/mame/drivers/pentagon.cpp
@@ -137,7 +137,7 @@ void pentagon_state::device_timer(emu_timer &timer, device_timer_id id, int para
TIMER_CALLBACK_MEMBER(pentagon_state::irq_on)
{
m_maincpu->set_input_line(0, HOLD_LINE);
- timer_set(attotime::from_ticks(32, XTAL_14MHz / 4), TIMER_IRQ_OFF, 0);
+ timer_set(attotime::from_ticks(32, XTAL(14'000'000) / 4), TIMER_IRQ_OFF, 0);
}
TIMER_CALLBACK_MEMBER(pentagon_state::irq_off)
@@ -147,7 +147,7 @@ TIMER_CALLBACK_MEMBER(pentagon_state::irq_off)
INTERRUPT_GEN_MEMBER(pentagon_state::pentagon_interrupt)
{
- timer_set(attotime::from_ticks(179, XTAL_14MHz / 4), TIMER_IRQ_ON, 0);
+ timer_set(attotime::from_ticks(179, XTAL(14'000'000) / 4), TIMER_IRQ_ON, 0);
}
READ8_MEMBER(pentagon_state::beta_neutral_r)
@@ -252,7 +252,7 @@ GFXDECODE_END
MACHINE_CONFIG_DERIVED(pentagon_state::pentagon, spectrum_128)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_14MHz / 4)
+ MCFG_CPU_CLOCK(XTAL(14'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(pentagon_mem)
MCFG_CPU_IO_MAP(pentagon_io)
MCFG_CPU_DECRYPTED_OPCODES_MAP(pentagon_switch)
@@ -260,15 +260,15 @@ MACHINE_CONFIG_DERIVED(pentagon_state::pentagon, spectrum_128)
MCFG_MACHINE_RESET_OVERRIDE(pentagon_state, pentagon )
MCFG_SCREEN_MODIFY("screen")
- //MCFG_SCREEN_RAW_PARAMS(XTAL_14MHz / 2, 448, 0, 352, 320, 0, 304)
- MCFG_SCREEN_RAW_PARAMS(XTAL_14MHz / 2, 448, 0, 352, 320, 0, 287)
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(14'000'000) / 2, 448, 0, 352, 320, 0, 304)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(14'000'000) / 2, 448, 0, 352, 320, 0, 287)
MCFG_BETA_DISK_ADD(BETA_DISK_TAG)
MCFG_GFXDECODE_MODIFY("gfxdecode", pentagon)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_REPLACE("ay8912", AY8912, XTAL_14MHz / 8)
+ MCFG_SOUND_REPLACE("ay8912", AY8912, XTAL(14'000'000) / 8)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp
index 58b88303ef0..e9e5497cfdf 100644
--- a/src/mame/drivers/peoplepc.cpp
+++ b/src/mame/drivers/peoplepc.cpp
@@ -236,17 +236,17 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(peoplepc_state::olypeopl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL_14_7456MHz/3)
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(14'745'600)/3)
MCFG_CPU_PROGRAM_MAP(peoplepc_map)
MCFG_CPU_IO_MAP(peoplepc_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_0", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_14_7456MHz/6)
+ MCFG_PIT8253_CLK0(XTAL(14'745'600)/6)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(peoplepc_state, kbd_clock_tick_w))
- MCFG_PIT8253_CLK1(XTAL_14_7456MHz/6)
+ MCFG_PIT8253_CLK1(XTAL(14'745'600)/6)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(peoplepc_state, tty_clock_tick_w))
- MCFG_PIT8253_CLK2(XTAL_14_7456MHz/6)
+ MCFG_PIT8253_CLK2(XTAL(14'745'600)/6)
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic8259_0", pic8259_device, ir0_w))
MCFG_DEVICE_ADD("pic8259_0", PIC8259, 0)
@@ -261,18 +261,18 @@ MACHINE_CONFIG_START(peoplepc_state::olypeopl)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS(XTAL_22MHz,640,0,640,475,0,475)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(22'000'000),640,0,640,475,0,475)
MCFG_SCREEN_UPDATE_DEVICE( "h46505", mc6845_device, screen_update )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD("h46505", H46505, "screen", XTAL_22MHz/8)
+ MCFG_MC6845_ADD("h46505", H46505, "screen", XTAL(22'000'000)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(peoplepc_state, update_row)
- MCFG_DEVICE_ADD("i8257", I8257, XTAL_14_7456MHz/3)
+ MCFG_DEVICE_ADD("i8257", I8257, XTAL(14'745'600)/3)
MCFG_I8257_OUT_HRQ_CB(WRITELINE(peoplepc_state, hrq_w))
MCFG_I8257_OUT_TC_CB(WRITELINE(peoplepc_state, tc_w))
MCFG_I8257_IN_MEMR_CB(READ8(peoplepc_state, memory_read_byte))
diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp
index 6205be46af3..1771aa6e1d6 100644
--- a/src/mame/drivers/peplus.cpp
+++ b/src/mame/drivers/peplus.cpp
@@ -1328,7 +1328,7 @@ void peplus_state::machine_reset()
MACHINE_CONFIG_START(peplus_state::peplus)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I80C32, XTAL_20MHz/2) /* 10MHz */
+ MCFG_CPU_ADD("maincpu", I80C32, XTAL(20'000'000)/2) /* 10MHz */
MCFG_CPU_PROGRAM_MAP(peplus_map)
MCFG_CPU_IO_MAP(peplus_iomap)
@@ -1346,7 +1346,7 @@ MACHINE_CONFIG_START(peplus_state::peplus)
MCFG_PALETTE_ADD("palette", 16*16*2)
MCFG_PALETTE_INIT_OWNER(peplus_state, peplus)
- MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL_20MHz/8/3)
+ MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL(20'000'000)/8/3)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_ADDR_CHANGED_CB(peplus_state, crtc_addr)
@@ -1357,7 +1357,7 @@ MACHINE_CONFIG_START(peplus_state::peplus)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, XTAL_20MHz/12)
+ MCFG_SOUND_ADD("aysnd", AY8912, XTAL(20'000'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pes.cpp b/src/mame/drivers/pes.cpp
index 1cba0719ba5..3c9acb9d244 100644
--- a/src/mame/drivers/pes.cpp
+++ b/src/mame/drivers/pes.cpp
@@ -61,7 +61,7 @@ Address map:
#include "speaker.h"
-#define CPU_CLOCK XTAL_10_245MHz
+#define CPU_CLOCK XTAL(10'245'000)
#undef DEBUG_FIFO
#undef DEBUG_SERIAL_CB
diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp
index 5363c192e8f..f53a3af6f62 100644
--- a/src/mame/drivers/pet.cpp
+++ b/src/mame/drivers/pet.cpp
@@ -1777,7 +1777,7 @@ MACHINE_CONFIG_START(pet_state::pet)
MCFG_MACHINE_RESET_OVERRIDE(pet_state, pet)
// basic machine hardware
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_8MHz/8)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(8'000'000)/8)
MCFG_CPU_PROGRAM_MAP(pet2001_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
@@ -1793,7 +1793,7 @@ MACHINE_CONFIG_START(pet_state::pet)
MCFG_PALETTE_ADD_MONOCHROME("palette")
// devices
- MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_8MHz/8)
+ MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(8'000'000)/8)
MCFG_VIA6522_READPB_HANDLER(READ8(pet_state, via_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(pet_state, via_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(pet_state, via_pb_w))
@@ -1824,7 +1824,7 @@ MACHINE_CONFIG_START(pet_state::pet)
MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, ca1_w))
MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w))
MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, nullptr, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
- MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_8MHz/8, pet_expansion_cards, nullptr)
+ MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(8'000'000)/8, pet_expansion_cards, nullptr)
MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write))
MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, pet_user_port_cards, nullptr)
@@ -2060,7 +2060,7 @@ MACHINE_CONFIG_DERIVED(pet2001b_state::pet4032f, pet4000)
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
MCFG_DEVICE_REMOVE("sync_timer")
- MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/16)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(16'000'000)/16)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_BEGIN_UPDATE_CB(pet_state, pet_begin_update)
@@ -2132,7 +2132,7 @@ MACHINE_CONFIG_DERIVED(pet_state::cbm4032f, cbm4000)
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
MCFG_DEVICE_REMOVE("sync_timer")
- MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/16)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(16'000'000)/16)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_BEGIN_UPDATE_CB(pet_state, pet_begin_update)
@@ -2203,7 +2203,7 @@ MACHINE_CONFIG_START(pet80_state::pet80)
MCFG_MACHINE_RESET_OVERRIDE(pet80_state, pet80)
// basic machine hardware
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
MCFG_CPU_PROGRAM_MAP(pet2001_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
@@ -2215,7 +2215,7 @@ MACHINE_CONFIG_START(pet80_state::pet80)
MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 250 - 1)
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
- MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/16)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(16'000'000)/16)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(2*8)
MCFG_MC6845_BEGIN_UPDATE_CB(pet_state, pet_begin_update)
@@ -2230,7 +2230,7 @@ MACHINE_CONFIG_START(pet80_state::pet80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
- MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16)
+ MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16)
MCFG_VIA6522_READPB_HANDLER(READ8(pet_state, via_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(pet_state, via_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(pet_state, via_pb_w))
@@ -2261,7 +2261,7 @@ MACHINE_CONFIG_START(pet80_state::pet80)
MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, ca1_w))
MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w))
MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, nullptr, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
- MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, nullptr)
+ MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(16'000'000)/16, pet_expansion_cards, nullptr)
MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write))
MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, pet_user_port_cards, nullptr)
@@ -2309,7 +2309,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(superpet_state::superpet, pet8032)
MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG)
- MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, "superpet")
+ MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(16'000'000)/16, pet_expansion_cards, "superpet")
MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write))
MCFG_SOFTWARE_LIST_ADD("flop_list2", "superpet_flop")
@@ -2322,7 +2322,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(cbm8096_state::cbm8096, pet80)
MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG)
- MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, "64k")
+ MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(16'000'000)/16, pet_expansion_cards, "64k")
MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write))
MCFG_RAM_ADD(RAM_TAG)
@@ -2347,7 +2347,7 @@ MACHINE_CONFIG_DERIVED(cbm8296_state::cbm8296, pet80)
MCFG_PLS100_ADD(PLA2_TAG)
MCFG_DEVICE_REMOVE(MC6845_TAG)
- MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/16)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(16'000'000)/16)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(2*8)
MCFG_MC6845_UPDATE_ROW_CB(pet80_state, cbm8296_update_row)
diff --git a/src/mame/drivers/pg685.cpp b/src/mame/drivers/pg685.cpp
index 7f310dbcb30..72df00a456c 100644
--- a/src/mame/drivers/pg685.cpp
+++ b/src/mame/drivers/pg685.cpp
@@ -391,25 +391,25 @@ MACHINE_CONFIG_START(pg685_state::pg685_backplane)
MCFG_DEVICE_ADD("bppic", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(NOOP) // ???
- MCFG_DEVICE_ADD("bpuart", MC2661, XTAL_4_9152MHz) // internal clock
+ MCFG_DEVICE_ADD("bpuart", MC2661, XTAL(4'915'200)) // internal clock
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pg685_state::pg685_module)
- MCFG_DEVICE_ADD("fdc", FD1797, XTAL_4MHz / 2) // divider guessed
+ MCFG_DEVICE_ADD("fdc", FD1797, XTAL(4'000'000) / 2) // divider guessed
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("mainpic", pic8259_device, ir4_w))
MCFG_DEVICE_ADD("modppi1", I8255, 0)
MCFG_DEVICE_ADD("modppi2", I8255, 0)
- MCFG_DEVICE_ADD("moduart", I8251, XTAL_4MHz / 2) // divider guessed
+ MCFG_DEVICE_ADD("moduart", I8251, XTAL(4'000'000) / 2) // divider guessed
- MCFG_DEVICE_ADD("rtc", MM58167, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pg685_state::pg675)
// main cpu
- MCFG_CPU_ADD("maincpu", I8088, XTAL_15MHz / 3)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(15'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(pg675_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainpic", pic8259_device, inta_cb)
@@ -436,12 +436,12 @@ MACHINE_CONFIG_START(pg685_state::pg675)
// devices
MCFG_FRAGMENT_ADD(pg685_module)
- MCFG_DEVICE_ADD("mainuart", I8251, XTAL_12_288MHz / 6) // divider guessed
+ MCFG_DEVICE_ADD("mainuart", I8251, XTAL(12'288'000) / 6) // divider guessed
// rs232 port
// keyboard
- MCFG_DEVICE_ADD("kbdc", I8279, XTAL_12_288MHz / 6) // divider guessed
+ MCFG_DEVICE_ADD("kbdc", I8279, XTAL(12'288'000) / 6) // divider guessed
MCFG_I8279_OUT_IRQ_CB(DEVWRITELINE("mainpic", pic8259_device, ir0_w))
// printer
@@ -458,7 +458,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pg685_state::pg685)
// main cpu
- MCFG_CPU_ADD("maincpu", V20, XTAL_15MHz / 3)
+ MCFG_CPU_ADD("maincpu", V20, XTAL(15'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(pg685_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainpic", pic8259_device, inta_cb)
@@ -486,12 +486,12 @@ MACHINE_CONFIG_START(pg685_state::pg685)
MCFG_FRAGMENT_ADD(pg685_backplane)
MCFG_FRAGMENT_ADD(pg685_module)
- MCFG_DEVICE_ADD("mainuart", I8251, XTAL_12_288MHz / 6) // divider guessed
+ MCFG_DEVICE_ADD("mainuart", I8251, XTAL(12'288'000) / 6) // divider guessed
// rs232 port
// keyboard
- MCFG_DEVICE_ADD("kbdc", I8279, XTAL_12_288MHz / 6) // divider guessed
+ MCFG_DEVICE_ADD("kbdc", I8279, XTAL(12'288'000) / 6) // divider guessed
MCFG_I8279_OUT_IRQ_CB(DEVWRITELINE("mainpic", pic8259_device, ir0_w))
// printer
@@ -503,13 +503,13 @@ MACHINE_CONFIG_START(pg685_state::pg685)
MCFG_FLOPPY_DRIVE_SOUND(true)
// harddisk
- MCFG_DEVICE_ADD("hdc", WD2010, XTAL_10MHz / 2) // divider guessed
+ MCFG_DEVICE_ADD("hdc", WD2010, XTAL(10'000'000) / 2) // divider guessed
MCFG_WD2010_OUT_INTRQ_CB(DEVWRITELINE("mainpic", pic8259_device, ir3_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pg685_state::pg685oua12)
// main cpu
- MCFG_CPU_ADD("maincpu", I80286, XTAL_20MHz / 2)
+ MCFG_CPU_ADD("maincpu", I80286, XTAL(20'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(pg685oua12_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainpic", pic8259_device, inta_cb)
@@ -554,7 +554,7 @@ MACHINE_CONFIG_START(pg685_state::pg685oua12)
MCFG_FLOPPY_DRIVE_SOUND(true)
// harddisk
- MCFG_DEVICE_ADD("hdc", WD2010, XTAL_10MHz / 2) // divider guessed
+ MCFG_DEVICE_ADD("hdc", WD2010, XTAL(10'000'000) / 2) // divider guessed
MCFG_WD2010_OUT_INTRQ_CB(DEVWRITELINE("mainpic", pic8259_device, ir3_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/phc25.cpp b/src/mame/drivers/phc25.cpp
index bd036737906..ad8010d173f 100644
--- a/src/mame/drivers/phc25.cpp
+++ b/src/mame/drivers/phc25.cpp
@@ -308,7 +308,7 @@ void phc25_state::video_start()
MACHINE_CONFIG_START(phc25_state::phc25)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(phc25_mem)
MCFG_CPU_IO_MAP(phc25_io)
@@ -344,7 +344,7 @@ MACHINE_CONFIG_DERIVED(phc25_state::pal, phc25)
/* video hardware */
MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, MC6847_TAG)
- MCFG_DEVICE_ADD(MC6847_TAG, MC6847_PAL, XTAL_4_433619MHz)
+ MCFG_DEVICE_ADD(MC6847_TAG, MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(phc25_state, irq_w))
MCFG_MC6847_INPUT_CALLBACK(READ8(phc25_state, video_ram_r))
MCFG_MC6847_CHARROM_CALLBACK(phc25_state, pal_char_rom_r)
@@ -356,7 +356,7 @@ MACHINE_CONFIG_DERIVED(phc25_state::ntsc, phc25)
/* video hardware */
MCFG_SCREEN_MC6847_NTSC_ADD(SCREEN_TAG, MC6847_TAG)
- MCFG_DEVICE_ADD(MC6847_TAG, MC6847_NTSC, XTAL_3_579545MHz)
+ MCFG_DEVICE_ADD(MC6847_TAG, MC6847_NTSC, XTAL(3'579'545))
MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(phc25_state, irq_w))
MCFG_MC6847_INPUT_CALLBACK(READ8(phc25_state, video_ram_r))
MCFG_MC6847_CHARROM_CALLBACK(phc25_state, ntsc_char_rom_r)
diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp
index 13bd3842dac..db4b65720f1 100644
--- a/src/mame/drivers/phunsy.cpp
+++ b/src/mame/drivers/phunsy.cpp
@@ -333,7 +333,7 @@ DRIVER_INIT_MEMBER( phunsy_state, phunsy )
MACHINE_CONFIG_START(phunsy_state::phunsy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz)
+ MCFG_CPU_ADD("maincpu",S2650, XTAL(1'000'000))
MCFG_CPU_PROGRAM_MAP(phunsy_mem)
MCFG_CPU_IO_MAP(phunsy_io)
MCFG_CPU_DATA_MAP(phunsy_data)
@@ -348,7 +348,7 @@ MACHINE_CONFIG_START(phunsy_state::phunsy)
- 16us not active, 48us active: ( 64 * 6 ) * 60 / 48 => 480 pixels wide
- 313 line display of which 256 are displayed.
*/
- MCFG_SCREEN_RAW_PARAMS(XTAL_8MHz, 480, 0, 64*6, 313, 0, 256)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(8'000'000), 480, 0, 64*6, 313, 0, 256)
MCFG_SCREEN_UPDATE_DRIVER(phunsy_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/picno.cpp b/src/mame/drivers/picno.cpp
index 984b12b25f1..895b51a603f 100644
--- a/src/mame/drivers/picno.cpp
+++ b/src/mame/drivers/picno.cpp
@@ -62,7 +62,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(picno_state::picno)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83002, XTAL_20MHz) /* TODO: correct CPU type (H8/532), crystal is a guess, divided by 2 in the cpu */
+ MCFG_CPU_ADD("maincpu", H83002, XTAL(20'000'000)) /* TODO: correct CPU type (H8/532), crystal is a guess, divided by 2 in the cpu */
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/piggypas.cpp b/src/mame/drivers/piggypas.cpp
index 422a7cff08e..c30e3882b69 100644
--- a/src/mame/drivers/piggypas.cpp
+++ b/src/mame/drivers/piggypas.cpp
@@ -128,7 +128,7 @@ HD44780_PIXEL_UPDATE(piggypas_state::piggypas_pixel_update)
MACHINE_CONFIG_START(piggypas_state::piggypas)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL_8_448MHz) // OKI M80C31F or M80C154S
+ MCFG_CPU_ADD("maincpu", I80C31, XTAL(8'448'000)) // OKI M80C31F or M80C154S
MCFG_CPU_PROGRAM_MAP(piggypas_map)
MCFG_CPU_IO_MAP(piggypas_io)
MCFG_MCS51_SERIAL_TX_CB(WRITE8(piggypas_state, mcs51_tx_callback))
@@ -153,7 +153,7 @@ MACHINE_CONFIG_START(piggypas_state::piggypas)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8_448MHz / 8, PIN7_HIGH) // clock and pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(8'448'000) / 8, PIN7_HIGH) // clock and pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("ppi", I8255A, 0) // OKI M82C55A-2
diff --git a/src/mame/drivers/pimps.cpp b/src/mame/drivers/pimps.cpp
index 4b0c462e066..9c69ad02982 100644
--- a/src/mame/drivers/pimps.cpp
+++ b/src/mame/drivers/pimps.cpp
@@ -125,7 +125,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(pimps_state::pimps)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL_2MHz)
+ MCFG_CPU_ADD("maincpu",I8085A, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/pinkiri8.cpp b/src/mame/drivers/pinkiri8.cpp
index da23717e630..c04a5c608a3 100644
--- a/src/mame/drivers/pinkiri8.cpp
+++ b/src/mame/drivers/pinkiri8.cpp
@@ -1089,7 +1089,7 @@ static GFXDECODE_START( pinkiri8 )
GFXDECODE_END
MACHINE_CONFIG_START(pinkiri8_state::pinkiri8)
- MCFG_CPU_ADD("maincpu",Z180,XTAL_32MHz/2)
+ MCFG_CPU_ADD("maincpu",Z180,XTAL(32'000'000)/2)
MCFG_CPU_PROGRAM_MAP(pinkiri8_map)
MCFG_CPU_IO_MAP(pinkiri8_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pinkiri8_state, nmi_line_assert)
diff --git a/src/mame/drivers/pipbug.cpp b/src/mame/drivers/pipbug.cpp
index 8602fa6518f..955fc3066c2 100644
--- a/src/mame/drivers/pipbug.cpp
+++ b/src/mame/drivers/pipbug.cpp
@@ -156,7 +156,7 @@ QUICKLOAD_LOAD_MEMBER( pipbug_state, pipbug )
MACHINE_CONFIG_START(pipbug_state::pipbug)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, XTAL_1MHz)
+ MCFG_CPU_ADD("maincpu", S2650, XTAL(1'000'000))
MCFG_CPU_PROGRAM_MAP(pipbug_mem)
MCFG_CPU_DATA_MAP(pipbug_data)
MCFG_S2650_FLAG_OUTPUT(DEVWRITELINE("rs232", rs232_port_device, write_txd))
diff --git a/src/mame/drivers/pipedrm.cpp b/src/mame/drivers/pipedrm.cpp
index 41f272527e1..e9cc6d4a07b 100644
--- a/src/mame/drivers/pipedrm.cpp
+++ b/src/mame/drivers/pipedrm.cpp
@@ -594,7 +594,7 @@ MACHINE_CONFIG_START(pipedrm_state::pipedrm)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(fromance_state, fromance_gga_data_w))
@@ -649,7 +649,7 @@ MACHINE_CONFIG_START(pipedrm_state::hatris)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(fromance_state, fromance_gga_data_w))
diff --git a/src/mame/drivers/piratesh.cpp b/src/mame/drivers/piratesh.cpp
index 99a76409eef..65f992908f5 100644
--- a/src/mame/drivers/piratesh.cpp
+++ b/src/mame/drivers/piratesh.cpp
@@ -584,13 +584,13 @@ MACHINE_RESET_MEMBER(piratesh_state,piratesh)
MACHINE_CONFIG_START(piratesh_state::piratesh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2)
MCFG_CPU_PROGRAM_MAP(piratesh_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", piratesh_state, piratesh_interrupt, "screen", 0, 1)
MCFG_NVRAM_ADD_0FILL("nvram")
- MCFG_DEVICE_ADD("k053252", K053252, XTAL_32MHz/4)
+ MCFG_DEVICE_ADD("k053252", K053252, XTAL(32'000'000)/4)
MCFG_K053252_OFFSETS(40, 16) // TODO
MCFG_MACHINE_START_OVERRIDE(piratesh_state, piratesh)
@@ -643,7 +643,7 @@ MACHINE_CONFIG_START(piratesh_state::piratesh)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_DEVICE_ADD("k054539", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
MCFG_K054539_TIMER_HANDLER(WRITELINE(piratesh_state, k054539_nmi_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.2)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.2)
diff --git a/src/mame/drivers/pitagjr.cpp b/src/mame/drivers/pitagjr.cpp
index 3a67725ccde..11035dad9f8 100644
--- a/src/mame/drivers/pitagjr.cpp
+++ b/src/mame/drivers/pitagjr.cpp
@@ -205,7 +205,7 @@ uint32_t pitagjr_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
MACHINE_CONFIG_START(pitagjr_state::pitajr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD63705, XTAL_2MHz) // probably a m6805-based MCU with internal boot ROM
+ MCFG_CPU_ADD("maincpu", HD63705, XTAL(2'000'000)) // probably a m6805-based MCU with internal boot ROM
MCFG_CPU_PROGRAM_MAP(pitajr_mem)
/* video hardware */
diff --git a/src/mame/drivers/pitnrun.cpp b/src/mame/drivers/pitnrun.cpp
index 941f76ee391..7eb626748ca 100644
--- a/src/mame/drivers/pitnrun.cpp
+++ b/src/mame/drivers/pitnrun.cpp
@@ -275,7 +275,7 @@ static GFXDECODE_START( pitnrun )
GFXDECODE_END
MACHINE_CONFIG_START(pitnrun_state::pitnrun)
- MCFG_CPU_ADD("maincpu", Z80,XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80,XTAL(18'432'000)/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(pitnrun_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pitnrun_state, nmi_source)
@@ -287,7 +287,7 @@ MACHINE_CONFIG_START(pitnrun_state::pitnrun)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(pitnrun_state, hflip_w)) // HFLIP
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(pitnrun_state, vflip_w)) // VFLIP
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_5MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(5'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(pitnrun_sound_map)
MCFG_CPU_IO_MAP(pitnrun_sound_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pitnrun_state, irq0_line_hold)
@@ -314,12 +314,12 @@ MACHINE_CONFIG_START(pitnrun_state::pitnrun)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -331,7 +331,7 @@ MACHINE_CONFIG_DERIVED(pitnrun_state::pitnrun_mcu, pitnrun)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(pitnrun_map_mcu)
- MCFG_CPU_ADD("mcu", M68705P5, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_ADD("mcu", M68705P5, XTAL(18'432'000)/6) /* verified on pcb */
MCFG_M68705_PORTA_R_CB(READ8(pitnrun_state, m68705_portA_r))
MCFG_M68705_PORTB_R_CB(READ8(pitnrun_state, m68705_portB_r))
MCFG_M68705_PORTC_R_CB(READ8(pitnrun_state, m68705_portC_r))
diff --git a/src/mame/drivers/pk8020.cpp b/src/mame/drivers/pk8020.cpp
index 4f4de13f8ce..8e9938642a1 100644
--- a/src/mame/drivers/pk8020.cpp
+++ b/src/mame/drivers/pk8020.cpp
@@ -177,7 +177,7 @@ SLOT_INTERFACE_END
/* Machine driver */
MACHINE_CONFIG_START(pk8020_state::pk8020)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_20MHz / 8)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(20'000'000) / 8)
MCFG_CPU_PROGRAM_MAP(pk8020_mem)
MCFG_CPU_IO_MAP(pk8020_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pk8020_state, pk8020_interrupt)
@@ -208,11 +208,11 @@ MACHINE_CONFIG_START(pk8020_state::pk8020)
MCFG_DEVICE_ADD("ppi8255_3", I8255, 0)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_20MHz / 10)
+ MCFG_PIT8253_CLK0(XTAL(20'000'000) / 10)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(pk8020_state,pk8020_pit_out0))
- MCFG_PIT8253_CLK1(XTAL_20MHz / 10)
+ MCFG_PIT8253_CLK1(XTAL(20'000'000) / 10)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(pk8020_state,pk8020_pit_out1))
- MCFG_PIT8253_CLK2((XTAL_20MHz / 8) / 164)
+ MCFG_PIT8253_CLK2((XTAL(20'000'000) / 8) / 164)
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir5_w))
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
@@ -221,7 +221,7 @@ MACHINE_CONFIG_START(pk8020_state::pk8020)
MCFG_DEVICE_ADD("rs232", I8251, 0)
MCFG_DEVICE_ADD("lan", I8251, 0)
- MCFG_FD1793_ADD("wd1793", XTAL_20MHz / 20)
+ MCFG_FD1793_ADD("wd1793", XTAL(20'000'000) / 20)
MCFG_FLOPPY_DRIVE_ADD("wd1793:0", pk8020_floppies, "qd", pk8020_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1793:1", pk8020_floppies, "qd", pk8020_state::floppy_formats)
diff --git a/src/mame/drivers/play_2.cpp b/src/mame/drivers/play_2.cpp
index dc7cbb270c7..b7d29dfad0a 100644
--- a/src/mame/drivers/play_2.cpp
+++ b/src/mame/drivers/play_2.cpp
@@ -355,7 +355,7 @@ WRITE8_MEMBER( play_2_state::psg_w )
// **************** Machine *****************************
MACHINE_CONFIG_START(play_2_state::play_2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", CDP1802, XTAL_2_95MHz)
+ MCFG_CPU_ADD("maincpu", CDP1802, XTAL(2'950'000))
MCFG_CPU_PROGRAM_MAP(play_2_map)
MCFG_CPU_IO_MAP(play_2_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
@@ -369,7 +369,7 @@ MACHINE_CONFIG_START(play_2_state::play_2)
/* Video */
MCFG_DEFAULT_LAYOUT(layout_play_2)
- MCFG_DEVICE_ADD("tpb_clock", CLOCK, XTAL_2_95MHz / 8) // TPB line from CPU
+ MCFG_DEVICE_ADD("tpb_clock", CLOCK, XTAL(2'950'000) / 8) // TPB line from CPU
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(play_2_state, clock_w))
MCFG_DEVICE_ADD("xpoint", CLOCK, 60) // crossing-point detector
@@ -388,12 +388,12 @@ MACHINE_CONFIG_START(play_2_state::play_2)
MCFG_FRAGMENT_ADD( genpin_audio )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_CDP1863_ADD("1863", 0, XTAL_2_95MHz / 8)
+ MCFG_CDP1863_ADD("1863", 0, XTAL(2'950'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(play_2_state::zira, play_2)
- MCFG_CPU_ADD("cop402", COP402, XTAL_2MHz)
+ MCFG_CPU_ADD("cop402", COP402, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(zira_sound_map)
MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false )
MCFG_COP400_WRITE_D_CB(WRITE8(play_2_state, sound_d_w))
@@ -402,7 +402,7 @@ MACHINE_CONFIG_DERIVED(play_2_state::zira, play_2)
MCFG_COP400_WRITE_L_CB(WRITE8(play_2_state, psg_w))
MCFG_COP400_READ_IN_CB(READ8(play_2_state, sound_in_r))
- MCFG_SOUND_ADD("aysnd1", AY8910, XTAL_2MHz)
+ MCFG_SOUND_ADD("aysnd1", AY8910, XTAL(2'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/play_3.cpp b/src/mame/drivers/play_3.cpp
index 7136e8ca853..a935bcd1738 100644
--- a/src/mame/drivers/play_3.cpp
+++ b/src/mame/drivers/play_3.cpp
@@ -460,7 +460,7 @@ WRITE_LINE_MEMBER( play_3_state::q4013a_w )
MACHINE_CONFIG_START(play_3_state::play_3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", CDP1802, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("maincpu", CDP1802, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(play_3_map)
MCFG_CPU_IO_MAP(play_3_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
@@ -475,7 +475,7 @@ MACHINE_CONFIG_START(play_3_state::play_3)
MCFG_DEFAULT_LAYOUT(layout_play_3)
// Devices
- MCFG_DEVICE_ADD("tpb_clock", CLOCK, XTAL_3_579545MHz / 8) // TPB line from CPU
+ MCFG_DEVICE_ADD("tpb_clock", CLOCK, XTAL(3'579'545) / 8) // TPB line from CPU
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(play_3_state, clock_w))
MCFG_DEVICE_ADD("xpoint", CLOCK, 60) // crossing-point detector
@@ -493,26 +493,26 @@ MACHINE_CONFIG_START(play_3_state::play_3)
/* Sound */
MCFG_FRAGMENT_ADD( genpin_audio )
- MCFG_CPU_ADD("audiocpu", CDP1802, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", CDP1802, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(play_3_audio_map)
MCFG_CPU_IO_MAP(play_3_audio_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
MCFG_COSMAC_CLEAR_CALLBACK(READLINE(play_3_state, clear_a_r))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("aysnd1", AY8910, XTAL_3_579545MHz / 2)
+ MCFG_SOUND_ADD("aysnd1", AY8910, XTAL(3'579'545) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MCFG_SOUND_ADD("aysnd2", AY8910, XTAL_3_579545MHz / 2)
+ MCFG_SOUND_ADD("aysnd2", AY8910, XTAL(3'579'545) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(play_3_state::megaaton, play_3)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_2_95MHz)
+ MCFG_CPU_CLOCK(XTAL(2'950'000))
MCFG_CPU_IO_MAP(megaaton_io)
MCFG_DEVICE_MODIFY("tpb_clock")
- MCFG_DEVICE_CLOCK(XTAL_2_95MHz / 8) // TPB line from CPU
+ MCFG_DEVICE_CLOCK(XTAL(2'950'000) / 8) // TPB line from CPU
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(play_3_state::sklflite, play_3)
diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp
index b7b01150cef..79534e85651 100644
--- a/src/mame/drivers/playmark.cpp
+++ b/src/mame/drivers/playmark.cpp
@@ -1076,11 +1076,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(playmark_state::bigtwinb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
MCFG_CPU_PROGRAM_MAP(bigtwinb_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2)
+ MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2)
MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w))
MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
@@ -1120,7 +1120,7 @@ MACHINE_CONFIG_START(playmark_state::wbeachvl)
MCFG_CPU_PROGRAM_MAP(wbeachvl_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* 12MHz with internal 4x divisor */
+ MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* 12MHz with internal 4x divisor */
MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // wrong?
MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
@@ -1160,11 +1160,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(playmark_state::excelsr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(excelsr_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* 12MHz with internal 4x divisor */
+ MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* 12MHz with internal 4x divisor */
MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w))
MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
@@ -1192,7 +1192,7 @@ MACHINE_CONFIG_START(playmark_state::excelsr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* 1MHz resonator */
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) /* 1MHz resonator */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
@@ -1200,11 +1200,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(playmark_state::hrdtimes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(hrdtimes_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* verified on pcb */
// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
@@ -1233,7 +1233,7 @@ MACHINE_CONFIG_START(playmark_state::hrdtimes)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
@@ -1241,11 +1241,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(playmark_state::hotmind)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(hotmind_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq6_line_hold) // irq 2 and 6 point to the same location on hotmind
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* verified on pcb */
// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
@@ -1279,7 +1279,7 @@ MACHINE_CONFIG_START(playmark_state::hotmind)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
@@ -1287,11 +1287,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(playmark_state::luckboomh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(luckboomh_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* verified on pcb */
// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
@@ -1324,7 +1324,7 @@ MACHINE_CONFIG_START(playmark_state::luckboomh)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/plus4.cpp b/src/mame/drivers/plus4.cpp
index 81d7fcd2224..13ff0af84ce 100644
--- a/src/mame/drivers/plus4.cpp
+++ b/src/mame/drivers/plus4.cpp
@@ -924,7 +924,7 @@ MACHINE_CONFIG_START(plus4_state::plus4)
MCFG_PET_USER_PORT_L_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_dsr)) MCFG_DEVCB_XOR(1) // TODO: add missing pull up before inverter
MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_RXC_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_8))
MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_d)) MCFG_DEVCB_XOR(1)
MCFG_MOS6551_DTR_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_e)) MCFG_DEVCB_XOR(1)
@@ -958,7 +958,7 @@ MACHINE_CONFIG_START(plus4_state::plus4)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
- MCFG_PLUS4_EXPANSION_SLOT_ADD(PLUS4_EXPANSION_SLOT_TAG, XTAL_14_31818MHz/16, plus4_expansion_cards, nullptr)
+ MCFG_PLUS4_EXPANSION_SLOT_ADD(PLUS4_EXPANSION_SLOT_TAG, XTAL(14'318'181)/16, plus4_expansion_cards, nullptr)
MCFG_PLUS4_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(plus4_state, exp_irq_w))
MCFG_PLUS4_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(plus4_state, read))
MCFG_PLUS4_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(plus4_state, write))
@@ -978,10 +978,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(c16_state::plus4p, plus4)
MCFG_DEVICE_MODIFY(MOS7501_TAG)
- MCFG_DEVICE_CLOCK(XTAL_17_73447MHz/20)
+ MCFG_DEVICE_CLOCK(XTAL(17'734'470)/20)
MCFG_DEVICE_MODIFY(MOS7360_TAG)
- MCFG_DEVICE_CLOCK(XTAL_17_73447MHz/5)
+ MCFG_DEVICE_CLOCK(XTAL(17'734'470)/5)
// software list
MCFG_SOFTWARE_LIST_ADD("cart_list", "plus4_cart")
@@ -999,10 +999,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(c16_state::plus4n, plus4)
MCFG_DEVICE_MODIFY(MOS7501_TAG)
- MCFG_DEVICE_CLOCK(XTAL_14_31818MHz/16)
+ MCFG_DEVICE_CLOCK(XTAL(14'318'181)/16)
MCFG_DEVICE_MODIFY(MOS7360_TAG)
- MCFG_DEVICE_CLOCK(XTAL_14_31818MHz/4)
+ MCFG_DEVICE_CLOCK(XTAL(14'318'181)/4)
// software list
MCFG_SOFTWARE_LIST_ADD("cart_list", "plus4_cart")
@@ -1073,10 +1073,10 @@ MACHINE_CONFIG_END
//-------------------------------------------------
MACHINE_CONFIG_DERIVED(c16_state::v364, plus4n)
- MCFG_SOUND_ADD(T6721A_TAG, T6721A, XTAL_640kHz)
+ MCFG_SOUND_ADD(T6721A_TAG, T6721A, XTAL(640'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_MOS8706_ADD(MOS8706_TAG, XTAL_14_31818MHz/16)
+ MCFG_MOS8706_ADD(MOS8706_TAG, XTAL(14'318'181)/16)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/plygonet.cpp b/src/mame/drivers/plygonet.cpp
index 6c242f1790b..0f2cac4a106 100644
--- a/src/mame/drivers/plygonet.cpp
+++ b/src/mame/drivers/plygonet.cpp
@@ -605,11 +605,11 @@ WRITE_LINE_MEMBER(polygonet_state::k054539_nmi_gen)
MACHINE_CONFIG_START(polygonet_state::plygonet)
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2)
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(32'000'000)/2)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", polygonet_state, polygonet_interrupt)
- MCFG_CPU_ADD("dsp", DSP56156, XTAL_40MHz)
+ MCFG_CPU_ADD("dsp", DSP56156, XTAL(40'000'000))
MCFG_CPU_PROGRAM_MAP(dsp_program_map)
MCFG_CPU_DATA_MAP(dsp_data_map)
@@ -645,7 +645,7 @@ MACHINE_CONFIG_START(polygonet_state::plygonet)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_GENERIC_LATCH_8_ADD("soundlatch3")
- MCFG_DEVICE_ADD("k054539_1", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_K054539_TIMER_HANDLER(WRITELINE(polygonet_state, k054539_nmi_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
diff --git a/src/mame/drivers/pmi80.cpp b/src/mame/drivers/pmi80.cpp
index 3b0cf8f9f37..2c96a843622 100644
--- a/src/mame/drivers/pmi80.cpp
+++ b/src/mame/drivers/pmi80.cpp
@@ -155,7 +155,7 @@ void pmi80_state::machine_reset()
MACHINE_CONFIG_START(pmi80_state::pmi80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL_1MHz)
+ MCFG_CPU_ADD("maincpu",I8080, XTAL(1'000'000))
MCFG_CPU_PROGRAM_MAP(pmi80_mem)
MCFG_CPU_IO_MAP(pmi80_io)
diff --git a/src/mame/drivers/pntnpuzl.cpp b/src/mame/drivers/pntnpuzl.cpp
index 769a3b99c50..79595703dd0 100644
--- a/src/mame/drivers/pntnpuzl.cpp
+++ b/src/mame/drivers/pntnpuzl.cpp
@@ -346,12 +346,12 @@ static INPUT_PORTS_START( pntnpuzl )
INPUT_PORTS_END
MACHINE_CONFIG_START(pntnpuzl_state::pntnpuzl)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(pntnpuzl_map)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
- MCFG_DEVICE_ADD("via", VIA6522, XTAL_12MHz / 10)
+ MCFG_DEVICE_ADD("via", VIA6522, XTAL(12'000'000) / 10)
MCFG_VIA6522_READPA_HANDLER(IOPORT("IN2"))
MCFG_VIA6522_READPB_HANDLER(IOPORT("IN1"))
MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(4)
@@ -359,12 +359,12 @@ MACHINE_CONFIG_START(pntnpuzl_state::pntnpuzl)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
// CB2 used for serial communication with 8798
- MCFG_CPU_ADD("mcu", P8098, XTAL_12MHz)
+ MCFG_CPU_ADD("mcu", P8098, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(mcu_map) // FIXME: this is all internal
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp
index 3ab9f24d727..373aa71267a 100644
--- a/src/mame/drivers/pofo.cpp
+++ b/src/mame/drivers/pofo.cpp
@@ -1008,7 +1008,7 @@ void portfolio_state::machine_reset()
MACHINE_CONFIG_START(portfolio_state::portfolio)
// basic machine hardware
- MCFG_CPU_ADD(M80C88A_TAG, I8088, XTAL_4_9152MHz)
+ MCFG_CPU_ADD(M80C88A_TAG, I8088, XTAL(4'915'200))
MCFG_CPU_PROGRAM_MAP(portfolio_mem)
MCFG_CPU_IO_MAP(portfolio_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(portfolio_state,portfolio_int_ack)
@@ -1028,26 +1028,26 @@ MACHINE_CONFIG_START(portfolio_state::portfolio)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", portfolio)
- MCFG_DEVICE_ADD(HD61830_TAG, HD61830, XTAL_4_9152MHz/2/2)
+ MCFG_DEVICE_ADD(HD61830_TAG, HD61830, XTAL(4'915'200)/2/2)
MCFG_DEVICE_ADDRESS_MAP(0, portfolio_lcdc)
MCFG_HD61830_RD_CALLBACK(READ8(portfolio_state, hd61830_rd_r))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(PCD3311T_TAG, PCD3311, XTAL_3_57864MHz)
+ MCFG_SOUND_ADD(PCD3311T_TAG, PCD3311, XTAL(3'578'640))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
MCFG_PORTFOLIO_MEMORY_CARD_SLOT_ADD(PORTFOLIO_MEMORY_CARD_SLOT_A_TAG, portfolio_memory_cards, nullptr)
- MCFG_PORTFOLIO_EXPANSION_SLOT_ADD(PORTFOLIO_EXPANSION_SLOT_TAG, XTAL_4_9152MHz, portfolio_expansion_cards, nullptr)
+ MCFG_PORTFOLIO_EXPANSION_SLOT_ADD(PORTFOLIO_EXPANSION_SLOT_TAG, XTAL(4'915'200), portfolio_expansion_cards, nullptr)
MCFG_PORTFOLIO_EXPANSION_SLOT_EINT_CALLBACK(WRITELINE(portfolio_state, eint_w))
MCFG_PORTFOLIO_EXPANSION_SLOT_NMIO_CALLBACK(INPUTLINE(M80C88A_TAG, INPUT_LINE_NMI))
MCFG_PORTFOLIO_EXPANSION_SLOT_WAKE_CALLBACK(WRITELINE(portfolio_state, wake_w))
- MCFG_TIMER_DRIVER_ADD_PERIODIC("counter", portfolio_state, counter_tick, attotime::from_hz(XTAL_32_768kHz/16384))
- MCFG_TIMER_DRIVER_ADD_PERIODIC(TIMER_TICK_TAG, portfolio_state, system_tick, attotime::from_hz(XTAL_32_768kHz/32768))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("counter", portfolio_state, counter_tick, attotime::from_hz(XTAL(32'768)/16384))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC(TIMER_TICK_TAG, portfolio_state, system_tick, attotime::from_hz(XTAL(32'768)/32768))
// fake keyboard
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", portfolio_state, keyboard_tick, attotime::from_usec(2500))
diff --git a/src/mame/drivers/poisk1.cpp b/src/mame/drivers/poisk1.cpp
index 7ddebbc2cb2..910e3903cf1 100644
--- a/src/mame/drivers/poisk1.cpp
+++ b/src/mame/drivers/poisk1.cpp
@@ -643,11 +643,11 @@ MACHINE_CONFIG_START(p1_state::poisk1)
MCFG_MACHINE_RESET_OVERRIDE( p1_state, poisk1 )
MCFG_DEVICE_ADD( "pit8253", PIT8253 ,0)
- MCFG_PIT8253_CLK0(XTAL_15MHz/12) /* heartbeat IRQ */
+ MCFG_PIT8253_CLK0(XTAL(15'000'000)/12) /* heartbeat IRQ */
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_15MHz/12) /* keyboard poll -- XXX edge or level triggered? */
+ MCFG_PIT8253_CLK1(XTAL(15'000'000)/12) /* keyboard poll -- XXX edge or level triggered? */
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir6_w))
- MCFG_PIT8253_CLK2(XTAL_15MHz/12) /* pio port c pin 4, and speaker polling enough */
+ MCFG_PIT8253_CLK2(XTAL(15'000'000)/12) /* pio port c pin 4, and speaker polling enough */
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(p1_state, p1_pit8253_out2_changed))
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
@@ -688,7 +688,7 @@ MACHINE_CONFIG_START(p1_state::poisk1)
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_SCREEN_ADD( "screen", RASTER )
- MCFG_SCREEN_RAW_PARAMS( XTAL_15MHz, 912,0,640, 262,0,200 )
+ MCFG_SCREEN_RAW_PARAMS( XTAL(15'000'000), 912,0,640, 262,0,200 )
MCFG_SCREEN_UPDATE_DRIVER( p1_state, screen_update )
/* XXX verify palette */
diff --git a/src/mame/drivers/pokechmp.cpp b/src/mame/drivers/pokechmp.cpp
index 7477c49b382..5b560c37883 100644
--- a/src/mame/drivers/pokechmp.cpp
+++ b/src/mame/drivers/pokechmp.cpp
@@ -219,11 +219,11 @@ OKI M6295 (an AD65 on this board, note pin 7 is low): 1.5mhz
MACHINE_CONFIG_START(pokechmp_state::pokechmp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_4MHz/4)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(4'000'000)/4)
MCFG_CPU_PROGRAM_MAP(pokechmp_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pokechmp_state, nmi_line_pulse)
- MCFG_CPU_ADD("audiocpu", M6502, XTAL_4MHz/4)
+ MCFG_CPU_ADD("audiocpu", M6502, XTAL(4'000'000)/4)
MCFG_CPU_PROGRAM_MAP(pokechmp_sound_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pokechmp_state, irq0_line_hold)
@@ -245,13 +245,13 @@ MACHINE_CONFIG_START(pokechmp_state::pokechmp)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_4MHz/4)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(4'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL_24MHz/16)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL(24'000'000)/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/16, PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000)/16, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* sound fx */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADDRESS_MAP(0, pokechmp_oki_map)
diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp
index f752100d180..c12d1fa2b1c 100644
--- a/src/mame/drivers/polepos.cpp
+++ b/src/mame/drivers/polepos.cpp
@@ -240,7 +240,7 @@ Todo:
#include "topracer.lh"
-#define MASTER_CLOCK XTAL_24_576MHz
+#define MASTER_CLOCK XTAL(24'576'000)
#define POLEPOS_TOGGLE PORT_TOGGLE
diff --git a/src/mame/drivers/polgar.cpp b/src/mame/drivers/polgar.cpp
index c63fa5263b7..32b0f33940c 100644
--- a/src/mame/drivers/polgar.cpp
+++ b/src/mame/drivers/polgar.cpp
@@ -467,9 +467,9 @@ void mephisto_academy_state::machine_reset()
}
MACHINE_CONFIG_START(mephisto_polgar_state::polgar)
- MCFG_CPU_ADD("maincpu", M65C02, XTAL_4_9152MHz)
+ MCFG_CPU_ADD("maincpu", M65C02, XTAL(4'915'200))
MCFG_CPU_PROGRAM_MAP(polgar_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_polgar_state, nmi_line_pulse, XTAL_4_9152MHz / (1 << 13))
+ MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_polgar_state, nmi_line_pulse, XTAL(4'915'200) / (1 << 13))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -480,15 +480,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(mephisto_polgar_state::polgar10, polgar)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL_10MHz )
+ MCFG_CPU_CLOCK( XTAL(10'000'000) )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_risc_state::mrisc)
- MCFG_CPU_ADD("maincpu", M65C02, XTAL_10MHz / 4) // G65SC02
+ MCFG_CPU_ADD("maincpu", M65C02, XTAL(10'000'000) / 4) // G65SC02
MCFG_CPU_PROGRAM_MAP(mrisc_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_risc_state, irq0_line_hold, (double)XTAL_10MHz / (1 << 14))
+ MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_risc_state, irq0_line_hold, XTAL(10'000'000) / (1 << 14))
- MCFG_CPU_ADD("subcpu", ARM, XTAL_14MHz) // VY86C010
+ MCFG_CPU_ADD("subcpu", ARM, XTAL(14'000'000)) // VY86C010
MCFG_CPU_PROGRAM_MAP(mrisc_arm_mem)
MCFG_ARM_COPRO(VL86C020)
@@ -523,12 +523,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(mephisto_modena_state::modena, polgar)
MCFG_CPU_MODIFY("maincpu") // W65C02SP
- MCFG_CPU_CLOCK(XTAL_4_194304Mhz)
+ MCFG_CPU_CLOCK(XTAL(4'194'304))
MCFG_CPU_PROGRAM_MAP(modena_mem)
MCFG_CPU_PERIODIC_INT_REMOVE()
- MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_on", mephisto_modena_state, nmi_on, attotime::from_hz((double)XTAL_4_194304Mhz / (1 << 13)))
- MCFG_TIMER_START_DELAY(attotime::from_hz((double)XTAL_4_194304Mhz / (1 << 13)) - attotime::from_usec(975)) // active for 975us
- MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_off", mephisto_modena_state, nmi_off, attotime::from_hz((double)XTAL_4_194304Mhz / (1 << 13)))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_on", mephisto_modena_state, nmi_on, attotime::from_hz(XTAL(4'194'304) / (1 << 13)))
+ MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL(4'194'304) / (1 << 13)) - attotime::from_usec(975)) // active for 975us
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_off", mephisto_modena_state, nmi_off, attotime::from_hz(XTAL(4'194'304) / (1 << 13)))
MCFG_DEVICE_REMOVE("board")
MCFG_DEVICE_REMOVE("display")
diff --git a/src/mame/drivers/poly.cpp b/src/mame/drivers/poly.cpp
index d852ccea6dd..2849ac3526d 100644
--- a/src/mame/drivers/poly.cpp
+++ b/src/mame/drivers/poly.cpp
@@ -153,7 +153,7 @@ WRITE8_MEMBER(poly_state::baud_rate_w)
MACHINE_CONFIG_START(poly_state::poly)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_12_0576MHz / 3) // nominally 4 MHz
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(12'057'600) / 3) // nominally 4 MHz
MCFG_CPU_PROGRAM_MAP(poly_mem)
/* video hardware */
@@ -170,7 +170,7 @@ MACHINE_CONFIG_START(poly_state::poly)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
- MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL_12_0576MHz / 2)
+ MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL(12'057'600) / 2)
MCFG_SAA5050_D_CALLBACK(READ8(poly_state, videoram_r))
MCFG_SAA5050_SCREEN_SIZE(40, 24, 40)
@@ -184,7 +184,7 @@ MACHINE_CONFIG_START(poly_state::poly)
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
- MCFG_DEVICE_ADD("ptm", PTM6840, XTAL_12_0576MHz / 3)
+ MCFG_DEVICE_ADD("ptm", PTM6840, XTAL(12'057'600) / 3)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
MCFG_PTM6840_OUT1_CB(WRITELINE(poly_state, ptm_o2_callback))
MCFG_PTM6840_OUT2_CB(WRITELINE(poly_state, ptm_o3_callback))
diff --git a/src/mame/drivers/poly88.cpp b/src/mame/drivers/poly88.cpp
index d53f023eb1c..d378c0434e5 100644
--- a/src/mame/drivers/poly88.cpp
+++ b/src/mame/drivers/poly88.cpp
@@ -193,7 +193,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(poly88_state::poly88)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL_16_5888MHz / 9) // uses 8224 clock generator
+ MCFG_CPU_ADD("maincpu", I8080A, XTAL(16'588'800) / 9) // uses 8224 clock generator
MCFG_CPU_PROGRAM_MAP(poly88_mem)
MCFG_CPU_IO_MAP(poly88_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", poly88_state, poly88_interrupt)
@@ -223,7 +223,7 @@ MACHINE_CONFIG_START(poly88_state::poly88)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED)
/* uart */
- MCFG_DEVICE_ADD("uart", I8251, XTAL_16_5888MHz / 9)
+ MCFG_DEVICE_ADD("uart", I8251, XTAL(16'588'800) / 9)
MCFG_I8251_TXD_HANDLER(WRITELINE(poly88_state,write_cas_tx))
MCFG_I8251_RXRDY_HANDLER(WRITELINE(poly88_state,poly88_usart_rxready))
diff --git a/src/mame/drivers/poly880.cpp b/src/mame/drivers/poly880.cpp
index 24e5330cb88..ef4ec4692a1 100644
--- a/src/mame/drivers/poly880.cpp
+++ b/src/mame/drivers/poly880.cpp
@@ -244,7 +244,7 @@ void poly880_state::machine_start()
MACHINE_CONFIG_START(poly880_state::poly880)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_7_3728MHz/8)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(7'372'800)/8)
MCFG_CPU_PROGRAM_MAP(poly880_mem)
MCFG_CPU_IO_MAP(poly880_io)
@@ -252,19 +252,19 @@ MACHINE_CONFIG_START(poly880_state::poly880)
MCFG_DEFAULT_LAYOUT( layout_poly880 )
/* devices */
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_7_3728MHz/16)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(7'372'800)/16)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(poly880_state, ctc_z0_w))
MCFG_Z80CTC_ZC1_CB(WRITELINE(poly880_state, ctc_z1_w))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
- MCFG_DEVICE_ADD(Z80PIO1_TAG, Z80PIO, XTAL_7_3728MHz/16)
+ MCFG_DEVICE_ADD(Z80PIO1_TAG, Z80PIO, XTAL(7'372'800)/16)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(poly880_state, pio1_pa_w))
MCFG_Z80PIO_IN_PB_CB(READ8(poly880_state, pio1_pb_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(poly880_state, pio1_pb_w))
- MCFG_DEVICE_ADD(Z80PIO2_TAG, Z80PIO, XTAL_7_3728MHz/16)
+ MCFG_DEVICE_ADD(Z80PIO2_TAG, Z80PIO, XTAL(7'372'800)/16)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_CASSETTE_ADD("cassette")
diff --git a/src/mame/drivers/pooyan.cpp b/src/mame/drivers/pooyan.cpp
index 2920cd4a302..0aaf17d8750 100644
--- a/src/mame/drivers/pooyan.cpp
+++ b/src/mame/drivers/pooyan.cpp
@@ -23,7 +23,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
/*************************************
diff --git a/src/mame/drivers/popeye.cpp b/src/mame/drivers/popeye.cpp
index 8908c821295..c3af33ae48a 100644
--- a/src/mame/drivers/popeye.cpp
+++ b/src/mame/drivers/popeye.cpp
@@ -447,7 +447,7 @@ WRITE8_MEMBER(popeye_state::popeye_portB_w)
MACHINE_CONFIG_START(popeye_state::tnx1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* 4 MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(tnx1_map)
MCFG_CPU_IO_MAP(popeye_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", popeye_state, popeye_interrupt)
@@ -468,7 +468,7 @@ MACHINE_CONFIG_START(popeye_state::tnx1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_8MHz/4)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(8'000'000)/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW0"))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(popeye_state, popeye_portB_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
diff --git a/src/mame/drivers/popobear.cpp b/src/mame/drivers/popobear.cpp
index 33e5d325bee..ee6cf408f95 100644
--- a/src/mame/drivers/popobear.cpp
+++ b/src/mame/drivers/popobear.cpp
@@ -637,7 +637,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(popobear_state::irq)
}
MACHINE_CONFIG_START(popobear_state::popobear)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_42MHz/4) // XTAL CORRECT, DIVISOR GUESSED
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(42'000'000)/4) // XTAL CORRECT, DIVISOR GUESSED
MCFG_CPU_PROGRAM_MAP(popobear_mem)
// levels 2,3,5 look interesting
//MCFG_CPU_VBLANK_INT_DRIVER("screen", popobear_state, irq5_line_assert)
@@ -660,10 +660,10 @@ MACHINE_CONFIG_START(popobear_state::popobear)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", popobear)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_42MHz/16) // XTAL CORRECT, DIVISOR GUESSED
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(42'000'000)/16) // XTAL CORRECT, DIVISOR GUESSED
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_42MHz/32, PIN7_LOW) // XTAL CORRECT, DIVISOR GUESSED
+ MCFG_OKIM6295_ADD("oki", XTAL(42'000'000)/32, PIN7_LOW) // XTAL CORRECT, DIVISOR GUESSED
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/popper.cpp b/src/mame/drivers/popper.cpp
index edf3edfaf10..ed7efb68e79 100644
--- a/src/mame/drivers/popper.cpp
+++ b/src/mame/drivers/popper.cpp
@@ -528,17 +528,17 @@ void popper_state::machine_reset()
//**************************************************************************
MACHINE_CONFIG_START(popper_state::popper)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/3/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/3/2)
MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("subcpu", Z80, XTAL_18_432MHz/3/2)
+ MCFG_CPU_ADD("subcpu", Z80, XTAL(18'432'000)/3/2)
MCFG_CPU_PROGRAM_MAP(sub_map)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_18_432MHz/3, 384, 48, 328, 264, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(18'432'000)/3, 384, 48, 328, 264, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(popper_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -550,10 +550,10 @@ MACHINE_CONFIG_START(popper_state::popper)
// audio hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/3/2/2)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/3/2/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/3/2/2)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'432'000)/3/2/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/potgoldu.cpp b/src/mame/drivers/potgoldu.cpp
index e324bf5efcb..4319e2a6ce2 100644
--- a/src/mame/drivers/potgoldu.cpp
+++ b/src/mame/drivers/potgoldu.cpp
@@ -41,7 +41,7 @@ public:
};
-#define CPU_CLOCK XTAL_40MHz
+#define CPU_CLOCK XTAL(40'000'000)
#define VIDEO_CLOCK (22118400) // ?
#define SOUND_CLOCK (3579645)
@@ -75,7 +75,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(potgold_state::potgold)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
+ MCFG_CPU_ADD("maincpu", TMS34010, XTAL(40'000'000))
MCFG_CPU_PROGRAM_MAP(potgold_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(VIDEO_CLOCK/2) /* pixel clock */
diff --git a/src/mame/drivers/prehisle.cpp b/src/mame/drivers/prehisle.cpp
index b3213740d2e..86be52d8100 100644
--- a/src/mame/drivers/prehisle.cpp
+++ b/src/mame/drivers/prehisle.cpp
@@ -199,11 +199,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(prehisle_state::prehisle)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_18MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(18'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(prehisle_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", prehisle_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_4MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(prehisle_sound_map)
MCFG_CPU_IO_MAP(prehisle_sound_io_map)
@@ -212,7 +212,7 @@ MACHINE_CONFIG_START(prehisle_state::prehisle)
// the screen parameters are guessed but should be accurate. They
// give a theoretical refresh rate of 59.1856Hz while the measured
// rate on a snk68.c with very similar hardware board is 59.16Hz.
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 384, 0, 256, 264, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4, 384, 0, 256, 264, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(prehisle_state, screen_update_prehisle)
MCFG_SCREEN_PALETTE("palette")
@@ -226,7 +226,7 @@ MACHINE_CONFIG_START(prehisle_state::prehisle)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(4'000'000)) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/prestige.cpp b/src/mame/drivers/prestige.cpp
index cd232915a82..ee5d900f2b0 100644
--- a/src/mame/drivers/prestige.cpp
+++ b/src/mame/drivers/prestige.cpp
@@ -734,7 +734,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(prestige_state::irq_timer)
MACHINE_CONFIG_START(prestige_state::prestige_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz) // Z84C008
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(8'000'000)) // Z84C008
MCFG_CPU_PROGRAM_MAP(prestige_mem)
MCFG_CPU_IO_MAP(prestige_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(prestige_state,prestige_int_ack)
diff --git a/src/mame/drivers/pro80.cpp b/src/mame/drivers/pro80.cpp
index 36250e9a82b..d2ca812c57f 100644
--- a/src/mame/drivers/pro80.cpp
+++ b/src/mame/drivers/pro80.cpp
@@ -168,7 +168,7 @@ void pro80_state::machine_reset()
MACHINE_CONFIG_START(pro80_state::pro80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(pro80_mem)
MCFG_CPU_IO_MAP(pro80_io)
@@ -182,7 +182,7 @@ MACHINE_CONFIG_START(pro80_state::pro80)
/* Devices */
MCFG_CASSETTE_ADD( "cassette" )
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_4MHz / 2)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(4'000'000) / 2)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_p", pro80_state, timer_p, attotime::from_hz(40000)) // cass read
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/prodigy.cpp b/src/mame/drivers/prodigy.cpp
index 230becb4a89..3d4dadf1684 100644
--- a/src/mame/drivers/prodigy.cpp
+++ b/src/mame/drivers/prodigy.cpp
@@ -632,13 +632,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(prodigy_state::prodigy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_2MHz)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(maincpu_map)
MCFG_DEFAULT_LAYOUT(layout_prodigy)
MCFG_DEVICE_ADD("io_74145", TTL74145, 0)
- MCFG_DEVICE_ADD("via", VIA6522, XTAL_2MHz)
+ MCFG_DEVICE_ADD("via", VIA6522, XTAL(2'000'000))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(prodigy_state, irq_handler));
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(prodigy_state, via_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(prodigy_state, via_pb_w))
@@ -647,7 +647,7 @@ MACHINE_CONFIG_START(prodigy_state::prodigy)
MCFG_VIA6522_CB1_HANDLER(WRITELINE(prodigy_state, via_cb1_w))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(prodigy_state, via_cb2_w))
- MCFG_DEVICE_ADD(NETLIST_TAG, NETLIST_CPU, XTAL_2MHz * 30)
+ MCFG_DEVICE_ADD(NETLIST_TAG, NETLIST_CPU, XTAL(2'000'000) * 30)
MCFG_NETLIST_SETUP(prodigy)
MCFG_NETLIST_LOGIC_INPUT(NETLIST_TAG, "cb1", "cb1.IN", 0)
diff --git a/src/mame/drivers/prof180x.cpp b/src/mame/drivers/prof180x.cpp
index 053f7020895..f15a3bbb676 100644
--- a/src/mame/drivers/prof180x.cpp
+++ b/src/mame/drivers/prof180x.cpp
@@ -236,7 +236,7 @@ void prof180x_state::machine_reset()
MACHINE_CONFIG_START(prof180x_state::prof180x)
/* basic machine hardware */
- MCFG_CPU_ADD(HD64180_TAG, Z80, XTAL_9_216MHz)
+ MCFG_CPU_ADD(HD64180_TAG, Z80, XTAL(9'216'000))
MCFG_CPU_PROGRAM_MAP(prof180x_mem)
MCFG_CPU_IO_MAP(prof180x_io)
diff --git a/src/mame/drivers/prof80.cpp b/src/mame/drivers/prof80.cpp
index d856aee5f88..175b0dd4cdb 100644
--- a/src/mame/drivers/prof80.cpp
+++ b/src/mame/drivers/prof80.cpp
@@ -445,7 +445,7 @@ void prof80_state::machine_start()
MACHINE_CONFIG_START(prof80_state::prof80)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_6MHz)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(prof80_mem)
MCFG_CPU_IO_MAP(prof80_io)
@@ -453,7 +453,7 @@ MACHINE_CONFIG_START(prof80_state::prof80)
MCFG_PROF80_MMU_ADD(MMU_TAG, prof80_mmu)
// RTC
- MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, NOOP)
// FDC
MCFG_UPD765A_ADD(UPD765_TAG, true, true)
diff --git a/src/mame/drivers/prophet600.cpp b/src/mame/drivers/prophet600.cpp
index e5c9b031a6d..7b54cfec28e 100644
--- a/src/mame/drivers/prophet600.cpp
+++ b/src/mame/drivers/prophet600.cpp
@@ -262,16 +262,16 @@ DRIVER_INIT_MEMBER(prophet600_state, prophet600)
// master crystal is 8 MHz, all clocks derived from there
MACHINE_CONFIG_START(prophet600_state::prophet600)
- MCFG_CPU_ADD(MAINCPU_TAG, Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD(MAINCPU_TAG, Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(cpu_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_DEFAULT_LAYOUT( layout_prophet600 )
- MCFG_DEVICE_ADD(PIT_TAG, PIT8253, XTAL_8MHz/4)
- MCFG_PIT8253_CLK0(XTAL_8MHz/4)
- MCFG_PIT8253_CLK1(XTAL_8MHz/4)
- MCFG_PIT8253_CLK2(XTAL_8MHz/4)
+ MCFG_DEVICE_ADD(PIT_TAG, PIT8253, XTAL(8'000'000)/4)
+ MCFG_PIT8253_CLK0(XTAL(8'000'000)/4)
+ MCFG_PIT8253_CLK1(XTAL(8'000'000)/4)
+ MCFG_PIT8253_CLK2(XTAL(8'000'000)/4)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(prophet600_state, pit_ch0_tick_w))
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(prophet600_state, pit_ch2_tick_w))
@@ -284,7 +284,7 @@ MACHINE_CONFIG_START(prophet600_state::prophet600)
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
- MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL_8MHz/16) // 500kHz = 16 times the MIDI rate
+ MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(8'000'000)/16) // 500kHz = 16 times the MIDI rate
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(prophet600_state, acia_clock_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp
index e94b7d4d897..742572327f8 100644
--- a/src/mame/drivers/proteus3.cpp
+++ b/src/mame/drivers/proteus3.cpp
@@ -377,7 +377,7 @@ void proteus3_state::machine_reset()
MACHINE_CONFIG_START(proteus3_state::proteus3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_3_579545MHz) /* Divided by 4 internally */
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(3'579'545)) /* Divided by 4 internally */
MCFG_CPU_PROGRAM_MAP(proteus3_mem)
/* video hardware */
@@ -419,7 +419,7 @@ MACHINE_CONFIG_START(proteus3_state::proteus3)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia2", acia6850_device, write_cts))
/* Bit Rate Generator */
- MCFG_MC14411_ADD ("brg", XTAL_1_8432MHz) // crystal needs verification but is the likely one
+ MCFG_MC14411_ADD ("brg", XTAL(1'843'200)) // crystal needs verification but is the likely one
MCFG_MC14411_F1_CB(WRITELINE (proteus3_state, write_f1_clock))
MCFG_MC14411_F2_CB(WRITELINE (proteus3_state, write_f2_clock))
MCFG_MC14411_F3_CB(WRITELINE (proteus3_state, write_f3_clock))
diff --git a/src/mame/drivers/psikyo.cpp b/src/mame/drivers/psikyo.cpp
index ad92429edc4..cafd006fc94 100644
--- a/src/mame/drivers/psikyo.cpp
+++ b/src/mame/drivers/psikyo.cpp
@@ -1002,11 +1002,11 @@ void psikyo_state::machine_reset()
MACHINE_CONFIG_START(psikyo_state::sngkace)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(32'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sngkace_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", psikyo_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sngkace_sound_map)
MCFG_CPU_IO_MAP(sngkace_sound_io_map)
@@ -1030,7 +1030,7 @@ MACHINE_CONFIG_START(psikyo_state::sngkace)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_32MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(32'000'000)/4) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1118,7 +1118,7 @@ MACHINE_CONFIG_START(psikyo_state::s1945bl) /* Bootleg hardware based on the unp
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_LOW) // ?? clock
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_LOW) // ?? clock
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, s1945bl_oki_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/psx.cpp b/src/mame/drivers/psx.cpp
index f099e593144..567c5d8399d 100644
--- a/src/mame/drivers/psx.cpp
+++ b/src/mame/drivers/psx.cpp
@@ -493,7 +493,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(psx1_state::psj)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz )
+ MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) )
MCFG_CPU_PROGRAM_MAP( psx_map )
MCFG_RAM_MODIFY("maincpu:ram")
@@ -511,11 +511,11 @@ MACHINE_CONFIG_START(psx1_state::psj)
MCFG_PSX_SIO_TXD_HANDLER(DEVWRITELINE("^controllers", psxcontrollerports_device, write_txd))
/* video hardware */
- MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x100000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x100000, XTAL(53'693'175) )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SPU_ADD( "spu", XTAL_67_7376MHz/2 )
+ MCFG_SPU_ADD( "spu", XTAL(67'737'600)/2 )
MCFG_SOUND_ROUTE( 0, "lspeaker", 1.00 )
MCFG_SOUND_ROUTE( 1, "rspeaker", 1.00 )
@@ -540,7 +540,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(psx1_state::pse)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8530AQ, XTAL_67_7376MHz )
+ MCFG_CPU_ADD( "maincpu", CXD8530AQ, XTAL(67'737'600) )
MCFG_CPU_PROGRAM_MAP( psx_map)
MCFG_RAM_MODIFY("maincpu:ram")
@@ -559,11 +559,11 @@ MACHINE_CONFIG_START(psx1_state::pse)
/* video hardware */
/* TODO: visible area and refresh rate */
- MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x100000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x100000, XTAL(53'693'175) )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SPU_ADD( "spu", XTAL_67_7376MHz/2 )
+ MCFG_SPU_ADD( "spu", XTAL(67'737'600)/2 )
MCFG_SOUND_ROUTE( 0, "lspeaker", 1.00 )
MCFG_SOUND_ROUTE( 1, "rspeaker", 1.00 )
diff --git a/src/mame/drivers/psychic5.cpp b/src/mame/drivers/psychic5.cpp
index d7dcf017c52..89cc3e53b08 100644
--- a/src/mame/drivers/psychic5.cpp
+++ b/src/mame/drivers/psychic5.cpp
@@ -715,7 +715,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(psychic5_state::psychic5)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2)
MCFG_CPU_PROGRAM_MAP(psychic5_main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", psychic5_state, scanline, "screen", 0, 1)
@@ -726,7 +726,7 @@ MACHINE_CONFIG_START(psychic5_state::psychic5)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(14)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x2000)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_5MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(psychic5_sound_map)
MCFG_CPU_IO_MAP(psychic5_soundport_map)
@@ -736,7 +736,7 @@ MACHINE_CONFIG_START(psychic5_state::psychic5)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2,394, 0, 256, 282, 16, 240) // was 53.8 Hz before, assume same as Bombs Away
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2,394, 0, 256, 282, 16, 240) // was 53.8 Hz before, assume same as Bombs Away
MCFG_SCREEN_UPDATE_DRIVER(psychic5_state, screen_update_psychic5)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", psychic5)
@@ -752,14 +752,14 @@ MACHINE_CONFIG_START(psychic5_state::psychic5)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@@ -769,7 +769,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(psychic5_state::bombsa)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2 ) /* 6 MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2 ) /* 6 MHz */
MCFG_CPU_PROGRAM_MAP(bombsa_main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", psychic5_state, scanline, "screen", 0, 1)
@@ -780,7 +780,7 @@ MACHINE_CONFIG_START(psychic5_state::bombsa)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(14)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x2000)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_5MHz )
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(5'000'000) )
MCFG_CPU_PROGRAM_MAP(bombsa_sound_map)
MCFG_CPU_IO_MAP(bombsa_soundport_map)
@@ -790,7 +790,7 @@ MACHINE_CONFIG_START(psychic5_state::bombsa)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2,394, 0, 256, 282, 16, 240) /* Guru says : VSync - 54Hz . HSync - 15.25kHz */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2,394, 0, 256, 282, 16, 240) /* Guru says : VSync - 54Hz . HSync - 15.25kHz */
MCFG_SCREEN_UPDATE_DRIVER(psychic5_state, screen_update_bombsa)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bombsa)
@@ -804,14 +804,14 @@ MACHINE_CONFIG_START(psychic5_state::bombsa)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.30)
MCFG_SOUND_ROUTE(2, "mono", 0.30)
MCFG_SOUND_ROUTE(3, "mono", 1.0)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.30)
MCFG_SOUND_ROUTE(2, "mono", 0.30)
diff --git a/src/mame/drivers/pt68k4.cpp b/src/mame/drivers/pt68k4.cpp
index ce8b2ae3d61..7f409292bf2 100644
--- a/src/mame/drivers/pt68k4.cpp
+++ b/src/mame/drivers/pt68k4.cpp
@@ -398,14 +398,14 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(pt68k4_state::pt68k2)
/* basic machine hardware */
- MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_16MHz/2) // 68k2 came in 8, 10, and 12 MHz versions
+ MCFG_CPU_ADD(M68K_TAG, M68000, XTAL(16'000'000)/2) // 68k2 came in 8, 10, and 12 MHz versions
MCFG_CPU_PROGRAM_MAP(pt68k2_mem)
- MCFG_DEVICE_ADD("duart1", MC68681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart1", MC68681, XTAL(3'686'400))
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(pt68k4_state, duart1_irq))
MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(pt68k4_state, duart1_out))
- MCFG_DEVICE_ADD("duart2", MC68681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart2", MC68681, XTAL(3'686'400))
MCFG_DEVICE_ADD(KBDC_TAG, PC_KBDC, 0)
MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(pt68k4_state, keyboard_clock_w))
@@ -414,7 +414,7 @@ MACHINE_CONFIG_START(pt68k4_state::pt68k2)
MCFG_M48T02_ADD(TIMEKEEPER_TAG)
- MCFG_WD1772_ADD(WDFDC_TAG, XTAL_16MHz / 2)
+ MCFG_WD1772_ADD(WDFDC_TAG, XTAL(16'000'000) / 2)
MCFG_FLOPPY_DRIVE_ADD(WDFDC_TAG":0", pt68k_floppies, "525dd", pt68k4_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WDFDC_TAG":1", pt68k_floppies, "525dd", pt68k4_state::floppy_formats)
@@ -438,15 +438,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pt68k4_state::pt68k4)
/* basic machine hardware */
- MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_16MHz)
+ MCFG_CPU_ADD(M68K_TAG, M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(pt68k4_mem)
// add the DUARTS. first one has the console on channel A at 19200.
- MCFG_DEVICE_ADD("duart1", MC68681, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("duart1", MC68681, XTAL(16'000'000) / 4)
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(pt68k4_state, duart1_irq))
MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(pt68k4_state, duart1_out))
- MCFG_DEVICE_ADD("duart2", MC68681, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("duart2", MC68681, XTAL(16'000'000) / 4)
MCFG_DEVICE_ADD(KBDC_TAG, PC_KBDC, 0)
MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(pt68k4_state, keyboard_clock_w))
diff --git a/src/mame/drivers/ptcsol.cpp b/src/mame/drivers/ptcsol.cpp
index 4b732614bf5..02c21e23fd1 100644
--- a/src/mame/drivers/ptcsol.cpp
+++ b/src/mame/drivers/ptcsol.cpp
@@ -735,7 +735,7 @@ void sol20_state::kbd_put(u8 data)
MACHINE_CONFIG_START(sol20_state::sol20)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL_14_31818MHz / 7) // divider selectable as 5, 6 or 7 through jumpers
+ MCFG_CPU_ADD("maincpu",I8080, XTAL(14'318'181) / 7) // divider selectable as 5, 6 or 7 through jumpers
MCFG_CPU_PROGRAM_MAP(sol20_mem)
MCFG_CPU_IO_MAP(sol20_io)
MCFG_I8085A_INTE(DEVWRITELINE("speaker", speaker_sound_device, level_w))
diff --git a/src/mame/drivers/puckpkmn.cpp b/src/mame/drivers/puckpkmn.cpp
index 09e7cffa5f7..3e1de67307f 100644
--- a/src/mame/drivers/puckpkmn.cpp
+++ b/src/mame/drivers/puckpkmn.cpp
@@ -285,7 +285,7 @@ MACHINE_CONFIG_START(md_boot_state::puckpkmn)
MCFG_DEVICE_REMOVE("genesis_snd_z80")
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz / 4, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(4'000'000) / 4, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp
index 55957f90222..c684fb9e5dd 100644
--- a/src/mame/drivers/pulsar.cpp
+++ b/src/mame/drivers/pulsar.cpp
@@ -208,7 +208,7 @@ DRIVER_INIT_MEMBER( pulsar_state, pulsar )
MACHINE_CONFIG_START(pulsar_state::pulsar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(pulsar_mem)
MCFG_CPU_IO_MAP(pulsar_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
@@ -221,9 +221,9 @@ MACHINE_CONFIG_START(pulsar_state::pulsar)
MCFG_I8255_IN_PORTC_CB(READ8(pulsar_state, ppi_pc_r))
MCFG_I8255_OUT_PORTC_CB(WRITE8(pulsar_state, ppi_pc_w))
- MCFG_MSM5832_ADD("rtc", XTAL_32_768kHz)
+ MCFG_MSM5832_ADD("rtc", XTAL(32'768))
- MCFG_DEVICE_ADD("dart", Z80DART, XTAL_4MHz)
+ MCFG_DEVICE_ADD("dart", Z80DART, XTAL(4'000'000))
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -234,14 +234,14 @@ MACHINE_CONFIG_START(pulsar_state::pulsar)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("dart", z80dart_device, ctsa_w))
MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal)
- MCFG_DEVICE_ADD("brg", COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD("brg", COM8116, XTAL(5'068'800))
// Schematic has the labels for FT and FR the wrong way around, but the pin numbers are correct.
MCFG_COM8116_FR_HANDLER(DEVWRITELINE("dart", z80dart_device, txca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxca_w))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE("dart", z80dart_device, txcb_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxcb_w))
- MCFG_FD1797_ADD("fdc", XTAL_4MHz / 2)
+ MCFG_FD1797_ADD("fdc", XTAL(4'000'000) / 2)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pulsar_floppies, "525hd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pulsar_floppies, "525hd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp
index 845cb972a60..c07043c0467 100644
--- a/src/mame/drivers/punchout.cpp
+++ b/src/mame/drivers/punchout.cpp
@@ -617,7 +617,7 @@ MACHINE_RESET_MEMBER(punchout_state, spnchout)
MACHINE_CONFIG_START(punchout_state::punchout)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(punchout_map)
MCFG_CPU_IO_MAP(punchout_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("top", punchout_state, vblank_irq)
diff --git a/src/mame/drivers/pv2000.cpp b/src/mame/drivers/pv2000.cpp
index ca9502548a9..875979575fa 100644
--- a/src/mame/drivers/pv2000.cpp
+++ b/src/mame/drivers/pv2000.cpp
@@ -383,12 +383,12 @@ DEVICE_IMAGE_LOAD_MEMBER( pv2000_state, pv2000_cart )
MACHINE_CONFIG_START(pv2000_state::pv2000)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL_7_15909MHz/2) // 3.579545 MHz
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(7'159'090)/2) // 3.579545 MHz
MCFG_CPU_PROGRAM_MAP(pv2000_map)
MCFG_CPU_IO_MAP(pv2000_io_map)
// video hardware
- MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(pv2000_state, pv2000_vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
@@ -397,7 +397,7 @@ MACHINE_CONFIG_START(pv2000_state::pv2000)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489a", SN76489A, XTAL_7_15909MHz/2) /* 3.579545 MHz */
+ MCFG_SOUND_ADD("sn76489a", SN76489A, XTAL(7'159'090)/2) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
diff --git a/src/mame/drivers/pve500.cpp b/src/mame/drivers/pve500.cpp
index 820a3e9b075..72ec514792a 100644
--- a/src/mame/drivers/pve500.cpp
+++ b/src/mame/drivers/pve500.cpp
@@ -333,7 +333,7 @@ WRITE8_MEMBER(pve500_state::io_sel_w)
MACHINE_CONFIG_START(pve500_state::pve500)
/* Main CPU */
- MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL_12MHz / 2) /* TMPZ84C015BF-6 */
+ MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL(12'000'000) / 2) /* TMPZ84C015BF-6 */
MCFG_CPU_PROGRAM_MAP(maincpu_prg)
MCFG_CPU_IO_MAP(maincpu_io)
MCFG_Z80_DAISY_CHAIN(maincpu_daisy_chain)
@@ -342,16 +342,16 @@ MACHINE_CONFIG_START(pve500_state::pve500)
MCFG_TMPZ84C015_OUT_TXDA_CB(DEVWRITELINE("recorder", rs232_port_device, write_txd))
MCFG_TMPZ84C015_OUT_TXDB_CB(DEVWRITELINE("player1", rs232_port_device, write_txd))
- MCFG_DEVICE_ADD("external_ctc", Z80CTC, XTAL_12MHz / 2)
+ MCFG_DEVICE_ADD("external_ctc", Z80CTC, XTAL(12'000'000) / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("external_sio", Z80SIO0, XTAL_12MHz / 2)
+ MCFG_DEVICE_ADD("external_sio", Z80SIO0, XTAL(12'000'000) / 2)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("player2", rs232_port_device, write_txd))
MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE("edl_inout", rs232_port_device, write_txd))
/* Secondary CPU */
- MCFG_CPU_ADD("subcpu", TMPZ84C015, XTAL_12MHz / 2) /* TMPZ84C015BF-6 */
+ MCFG_CPU_ADD("subcpu", TMPZ84C015, XTAL(12'000'000) / 2) /* TMPZ84C015BF-6 */
MCFG_CPU_PROGRAM_MAP(subcpu_prg)
MCFG_CPU_IO_MAP(subcpu_io)
MCFG_TMPZ84C015_OUT_DTRB_CB(WRITELINE(pve500_state, external_monitor_w))
@@ -371,8 +371,8 @@ MACHINE_CONFIG_START(pve500_state::pve500)
MCFG_CXD1095_OUT_PORTE_CB(WRITE8(pve500_state, io_sel_w))
/* Search Dial MCUs */
- MCFG_CPU_ADD("dial_mcu_left", MB88201, XTAL_4MHz) /* PLAYER DIAL MCU */
- MCFG_CPU_ADD("dial_mcu_right", MB88201, XTAL_4MHz) /* RECORDER DIAL MCU */
+ MCFG_CPU_ADD("dial_mcu_left", MB88201, XTAL(4'000'000)) /* PLAYER DIAL MCU */
+ MCFG_CPU_ADD("dial_mcu_right", MB88201, XTAL(4'000'000)) /* RECORDER DIAL MCU */
/* Serial EEPROM (128 bytes, 8-bit data organization) */
/* The EEPROM stores the setup data */
diff --git a/src/mame/drivers/pwrview.cpp b/src/mame/drivers/pwrview.cpp
index f20bebead87..2419f7bef72 100644
--- a/src/mame/drivers/pwrview.cpp
+++ b/src/mame/drivers/pwrview.cpp
@@ -349,19 +349,19 @@ static SLOT_INTERFACE_START(pwrview_floppies)
SLOT_INTERFACE_END
MACHINE_CONFIG_START(pwrview_state::pwrview)
- MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", I80186, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(pwrview_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(pwrview_fetch_map)
MCFG_CPU_IO_MAP(pwrview_io)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_64MHz/8, 480, 0, 384, 1040, 0, 960) // clock unknown
+ MCFG_SCREEN_RAW_PARAMS(XTAL(64'000'000)/8, 480, 0, 384, 1040, 0, 960) // clock unknown
MCFG_SCREEN_UPDATE_DEVICE("crtc", hd6845_device, screen_update)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_16MHz/16) // clocks unknown, fix above when found
- MCFG_PIT8253_CLK1(XTAL_16MHz/16)
- MCFG_PIT8253_CLK2(XTAL_16MHz/16)
+ MCFG_PIT8253_CLK0(XTAL(16'000'000)/16) // clocks unknown, fix above when found
+ MCFG_PIT8253_CLK1(XTAL(16'000'000)/16)
+ MCFG_PIT8253_CLK2(XTAL(16'000'000)/16)
// floppy disk controller
MCFG_UPD765A_ADD("fdc", true, true) // Rockwell R7675P
@@ -374,7 +374,7 @@ MACHINE_CONFIG_START(pwrview_state::pwrview)
MCFG_DEVICE_ADD("sio", Z80SIO2, 4000000)
- MCFG_DEVICE_ADD("crtc", HD6845, XTAL_64MHz/64) // clock unknown
+ MCFG_DEVICE_ADD("crtc", HD6845, XTAL(64'000'000)/64) // clock unknown
MCFG_MC6845_CHAR_WIDTH(32) // ??
MCFG_MC6845_UPDATE_ROW_CB(pwrview_state, update_row)
diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp
index c9607da0484..ca336924e97 100644
--- a/src/mame/drivers/px4.cpp
+++ b/src/mame/drivers/px4.cpp
@@ -1476,7 +1476,7 @@ PALETTE_INIT_MEMBER( px4p_state, px4p )
MACHINE_CONFIG_START(px4_state::px4)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL_7_3728MHz / 2) // uPD70008
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(7'372'800) / 2) // uPD70008
MCFG_CPU_PROGRAM_MAP(px4_mem)
MCFG_CPU_IO_MAP(px4_io)
@@ -1499,7 +1499,7 @@ MACHINE_CONFIG_START(px4_state::px4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_TIMER_DRIVER_ADD_PERIODIC("one_sec", px4_state, upd7508_1sec_callback, attotime::from_seconds(1))
- MCFG_TIMER_DRIVER_ADD_PERIODIC("frc", px4_state, frc_tick, attotime::from_hz(XTAL_7_3728MHz / 2 / 6))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("frc", px4_state, frc_tick, attotime::from_hz(XTAL(7'372'800) / 2 / 6))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp
index 056d816cdf8..8cc7cf43a75 100644
--- a/src/mame/drivers/px8.cpp
+++ b/src/mame/drivers/px8.cpp
@@ -43,8 +43,8 @@
CONSTANTS
***************************************************************************/
-#define XTAL_CR1 XTAL_9_8304MHz
-#define XTAL_CR2 XTAL_32_768kHz
+#define XTAL_CR1 XTAL(9'830'400)
+#define XTAL_CR2 XTAL(32'768)
/* interrupt sources */
#define INT0_7508 0x01
diff --git a/src/mame/drivers/pyl601.cpp b/src/mame/drivers/pyl601.cpp
index ee0092b49f1..72c962cd93c 100644
--- a/src/mame/drivers/pyl601.cpp
+++ b/src/mame/drivers/pyl601.cpp
@@ -533,7 +533,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(pyl601_state::pyl601)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6800, XTAL_1MHz)
+ MCFG_CPU_ADD("maincpu",M6800, XTAL(1'000'000))
MCFG_CPU_PROGRAM_MAP(pyl601_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pyl601_state, pyl601_interrupt)
@@ -553,7 +553,7 @@ MACHINE_CONFIG_START(pyl601_state::pyl601)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_2MHz)
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(2'000'000))
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8) /* ? */
MCFG_MC6845_UPDATE_ROW_CB(pyl601_state, pyl601_update_row)
@@ -570,12 +570,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(pyl601_state::pyl601a, pyl601)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL_2MHz)
+ MCFG_CPU_CLOCK( XTAL(2'000'000))
MCFG_GFXDECODE_MODIFY("gfxdecode", pyl601a)
MCFG_DEVICE_REMOVE("crtc")
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_2MHz)
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(2'000'000))
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8) /* ? */
MCFG_MC6845_UPDATE_ROW_CB(pyl601_state, pyl601a_update_row)
diff --git a/src/mame/drivers/qdrmfgp.cpp b/src/mame/drivers/qdrmfgp.cpp
index 3e01656788d..1f279163ab9 100644
--- a/src/mame/drivers/qdrmfgp.cpp
+++ b/src/mame/drivers/qdrmfgp.cpp
@@ -555,7 +555,7 @@ MACHINE_START_MEMBER(qdrmfgp_state,qdrmfgp2)
{
/* sound irq (CCU? 240Hz) */
m_gp2_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(qdrmfgp_state::gp2_timer_callback), this));
- m_gp2_timer->adjust(attotime::from_hz(XTAL_18_432MHz/76800), 0, attotime::from_hz(XTAL_18_432MHz/76800));
+ m_gp2_timer->adjust(attotime::from_hz(XTAL(18'432'000)/76800), 0, attotime::from_hz(XTAL(18'432'000)/76800));
MACHINE_START_CALL_MEMBER( qdrmfgp );
}
@@ -577,7 +577,7 @@ void qdrmfgp_state::machine_reset()
MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16.000 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16.000 MHz */
MCFG_CPU_PROGRAM_MAP(qdrmfgp_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", qdrmfgp_state, qdrmfgp_interrupt, "screen", 0, 1)
@@ -606,13 +606,13 @@ MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp)
MCFG_K056832_CONFIG("gfx1", K056832_BPP_4dj, 1, 0, "none")
MCFG_K056832_PALETTE("palette")
- MCFG_DEVICE_ADD("k053252", K053252, XTAL_32MHz/4)
+ MCFG_DEVICE_ADD("k053252", K053252, XTAL(32'000'000)/4)
MCFG_K053252_OFFSETS(40, 16)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_DEVICE_ADD("k054539", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
MCFG_K054539_TIMER_HANDLER(WRITELINE(qdrmfgp_state, k054539_irq1_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -621,7 +621,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16.000 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16.000 MHz */
MCFG_CPU_PROGRAM_MAP(qdrmfgp2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", qdrmfgp_state, qdrmfgp2_interrupt)
@@ -650,13 +650,13 @@ MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp2)
MCFG_K056832_CONFIG("gfx1", K056832_BPP_4dj, 1, 0, "none")
MCFG_K056832_PALETTE("palette")
- MCFG_DEVICE_ADD("k053252", K053252, XTAL_32MHz/4)
+ MCFG_DEVICE_ADD("k053252", K053252, XTAL(32'000'000)/4)
MCFG_K053252_OFFSETS(40, 16)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_DEVICE_ADD("k054539", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ql.cpp b/src/mame/drivers/ql.cpp
index afa5c3c42e3..c4a693822a0 100644
--- a/src/mame/drivers/ql.cpp
+++ b/src/mame/drivers/ql.cpp
@@ -103,10 +103,10 @@
#define RS232_B_TAG "ser2"
#define QIMI_TAG "qimi"
-#define X1 XTAL_15MHz
-#define X2 XTAL_32_768kHz
+#define X1 XTAL(15'000'000)
+#define X2 XTAL(32'768)
#define X3 XTAL_4_436MHz
-#define X4 XTAL_11MHz
+#define X4 XTAL(11'000'000)
class ql_state : public driver_device
{
diff --git a/src/mame/drivers/qtsbc.cpp b/src/mame/drivers/qtsbc.cpp
index 85213a6e3a2..07ce68c5dfa 100644
--- a/src/mame/drivers/qtsbc.cpp
+++ b/src/mame/drivers/qtsbc.cpp
@@ -101,13 +101,13 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(qtsbc_state::qtsbc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) // Mostek MK3880
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000)) // Mostek MK3880
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
/* video hardware */
MCFG_DEVICE_ADD("pit", PIT8253, 0) // U9
- MCFG_PIT8253_CLK0(XTAL_4MHz / 2) /* Timer 0: baud rate gen for 8251 */
+ MCFG_PIT8253_CLK0(XTAL(4'000'000) / 2) /* Timer 0: baud rate gen for 8251 */
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
diff --git a/src/mame/drivers/quantum.cpp b/src/mame/drivers/quantum.cpp
index bf618ef3c6b..a0171cc0132 100644
--- a/src/mame/drivers/quantum.cpp
+++ b/src/mame/drivers/quantum.cpp
@@ -78,8 +78,8 @@ public:
};
-#define MASTER_CLOCK (XTAL_12_096MHz)
-#define CLOCK_3KHZ ((double)MASTER_CLOCK / 4096)
+#define MASTER_CLOCK (XTAL(12'096'000))
+#define CLOCK_3KHZ (MASTER_CLOCK / 4096)
/*************************************
diff --git a/src/mame/drivers/quickpick5.cpp b/src/mame/drivers/quickpick5.cpp
index 48fd0427eae..94d5c0ffb09 100644
--- a/src/mame/drivers/quickpick5.cpp
+++ b/src/mame/drivers/quickpick5.cpp
@@ -398,11 +398,11 @@ void quickpick5_state::machine_reset()
MACHINE_CONFIG_START(quickpick5_state::quickpick5)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_32MHz/4) // z84c0008pec 8mhz part, 32Mhz xtal verified on PCB, divisor unknown
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(32'000'000)/4) // z84c0008pec 8mhz part, 32Mhz xtal verified on PCB, divisor unknown
MCFG_CPU_PROGRAM_MAP(quickpick5_main)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", quickpick5_state, scanline, "screen", 0, 1)
- MCFG_DEVICE_ADD("k053252", K053252, XTAL_32MHz/4) /* K053252, xtal verified, divider not verified */
+ MCFG_DEVICE_ADD("k053252", K053252, XTAL(32'000'000)/4) /* K053252, xtal verified, divider not verified */
MCFG_K053252_INT1_ACK_CB(WRITELINE(quickpick5_state, vbl_ack_w))
MCFG_K053252_INT2_ACK_CB(WRITELINE(quickpick5_state, nmi_ack_w))
MCFG_K053252_INT_TIME_CB(WRITE8(quickpick5_state, ccu_int_time_w))
@@ -431,10 +431,10 @@ MACHINE_CONFIG_START(quickpick5_state::quickpick5)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_K051649_ADD("k051649", XTAL_32MHz/18) // xtal is verified, divider is not
+ MCFG_K051649_ADD("k051649", XTAL(32'000'000)/18) // xtal is verified, divider is not
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/18, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/18, PIN7_HIGH)
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp
index 60120d5c171..5591ba03765 100644
--- a/src/mame/drivers/quizpun2.cpp
+++ b/src/mame/drivers/quizpun2.cpp
@@ -562,18 +562,18 @@ GFXDECODE_END
MACHINE_CONFIG_START(quizpun2_state::quizpun2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) // 4 MHz
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2) // 4 MHz
MCFG_CPU_PROGRAM_MAP(quizpun2_map)
MCFG_CPU_IO_MAP(quizpun2_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", quizpun2_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz / 2) // 4 MHz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000) / 2) // 4 MHz
MCFG_CPU_PROGRAM_MAP(quizpun2_sound_map)
MCFG_CPU_IO_MAP(quizpun2_sound_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", quizpun2_state, irq0_line_hold)
// NMI generated by main CPU
- MCFG_CPU_ADD("cop", COP402, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("cop", COP402, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(quizpun2_cop_map)
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false)
MCFG_COP400_WRITE_D_CB(WRITE8(quizpun2_state, cop_d_w))
@@ -605,14 +605,14 @@ MACHINE_CONFIG_START(quizpun2_state::quizpun2)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_8MHz / 2) // 4 MHz
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(8'000'000) / 2) // 4 MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(quizpun2_state::quizpun, quizpun2)
MCFG_DEVICE_REMOVE("cop")
- MCFG_CPU_ADD("mcu", M68705P5, XTAL_4MHz) // xtal is 4MHz, divided by 4 internally
+ MCFG_CPU_ADD("mcu", M68705P5, XTAL(4'000'000)) // xtal is 4MHz, divided by 4 internally
MCFG_M68705_PORTA_R_CB(READ8(quizpun2_state, quizpun_68705_port_a_r))
MCFG_M68705_PORTB_R_CB(READ8(quizpun2_state, quizpun_68705_port_b_r))
MCFG_M68705_PORTC_R_CB(READ8(quizpun2_state, quizpun_68705_port_c_r))
diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp
index 133a82358e2..69aa47d2701 100644
--- a/src/mame/drivers/quizshow.cpp
+++ b/src/mame/drivers/quizshow.cpp
@@ -24,7 +24,7 @@ TODO:
#include "quizshow.lh"
-#define MASTER_CLOCK XTAL_12_096MHz
+#define MASTER_CLOCK XTAL(12'096'000)
#define PIXEL_CLOCK (MASTER_CLOCK/2)
#define HTOTAL ((32+8+4+1) * 8)
diff --git a/src/mame/drivers/qvt103.cpp b/src/mame/drivers/qvt103.cpp
index 42f6d2d521a..3472a599a7c 100644
--- a/src/mame/drivers/qvt103.cpp
+++ b/src/mame/drivers/qvt103.cpp
@@ -62,23 +62,23 @@ static const z80_daisy_config daisy_chain[] =
};
MACHINE_CONFIG_START(qvt103_state::qvt103)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_29_376MHz / 9) // divider guessed
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(29'376'000) / 9) // divider guessed
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_29_376MHz / 9)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(29'376'000) / 9)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("dart", Z80DART, XTAL_29_376MHz / 9)
+ MCFG_DEVICE_ADD("dart", Z80DART, XTAL(29'376'000) / 9)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_29_376MHz * 2 / 3, 102 * 10, 0, 80 * 10, 320, 0, 300)
- //MCFG_SCREEN_RAW_PARAMS(XTAL_29_376MHz, 170 * 9, 0, 132 * 9, 320, 0, 300)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(29'376'000) * 2 / 3, 102 * 10, 0, 80 * 10, 320, 0, 300)
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(29'376'000), 170 * 9, 0, 132 * 9, 320, 0, 300)
MCFG_SCREEN_UPDATE_DRIVER(qvt103_state, screen_update)
- MCFG_CPU_ADD("kbdmcu", I8741, XTAL_6MHz)
+ MCFG_CPU_ADD("kbdmcu", I8741, XTAL(6'000'000))
MACHINE_CONFIG_END
/**************************************************************************************************************
diff --git a/src/mame/drivers/qvt201.cpp b/src/mame/drivers/qvt201.cpp
index 4b12e236a9d..ecd3a1a27d4 100644
--- a/src/mame/drivers/qvt201.cpp
+++ b/src/mame/drivers/qvt201.cpp
@@ -55,16 +55,16 @@ static INPUT_PORTS_START( qvt201 )
INPUT_PORTS_END
MACHINE_CONFIG_START(qvt201_state::qvt201)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_6864MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'686'400))
MCFG_CPU_PROGRAM_MAP(mem_map) // IORQ is not used at all
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_3_6864MHz) // XTAL not directly connected
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400)) // XTAL not directly connected
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_48_654MHz / 3, 102 * 10, 0, 80 * 10, 265, 0, 250)
- //MCFG_SCREEN_RAW_PARAMS(XTAL_48_654MHz / 2, 170 * 9, 0, 132 * 9, 265, 0, 250)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(48'654'000) / 3, 102 * 10, 0, 80 * 10, 265, 0, 250)
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(48'654'000) / 2, 170 * 9, 0, 132 * 9, 265, 0, 250)
MCFG_SCREEN_UPDATE_DRIVER(qvt201_state, screen_update)
//MCFG_DEVICE_ADD("crtc", SCN2672, CHAR_CLOCK)
diff --git a/src/mame/drivers/qvt6800.cpp b/src/mame/drivers/qvt6800.cpp
index b4cd241ded6..be52c759d3c 100644
--- a/src/mame/drivers/qvt6800.cpp
+++ b/src/mame/drivers/qvt6800.cpp
@@ -64,37 +64,37 @@ static INPUT_PORTS_START( qvt6800 )
INPUT_PORTS_END
MACHINE_CONFIG_START(qvt6800_state::qvt102)
- MCFG_CPU_ADD("maincpu", M6800, XTAL_16_6698MHz / 18)
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(16'669'800) / 18)
MCFG_CPU_PROGRAM_MAP(qvt102_mem_map)
MCFG_NVRAM_ADD_0FILL("nvram") // 2x TC5514-APL + 3V battery
- //MCFG_DEVICE_ADD("crtc", MC6845, XTAL_16_6698MHz / 9)
+ //MCFG_DEVICE_ADD("crtc", MC6845, XTAL(16'669'800) / 9)
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_16_6698MHz / 9)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'669'800) / 9)
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("acia", acia6850_device, write_txc))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("acia", acia6850_device, write_rxc))
- MCFG_DEVICE_ADD("ctcclk", CLOCK, XTAL_16_6698MHz / 18) // OR of CRTC CLK and Ï•1
+ MCFG_DEVICE_ADD("ctcclk", CLOCK, XTAL(16'669'800) / 18) // OR of CRTC CLK and Ï•1
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16_6698MHz, 882, 0, 720, 315, 0, 300)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'669'800), 882, 0, 720, 315, 0, 300)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
- MCFG_DEVICE_ADD("crtc", MC6845, XTAL_16_6698MHz / 9)
+ MCFG_DEVICE_ADD("crtc", MC6845, XTAL(16'669'800) / 9)
MCFG_MC6845_CHAR_WIDTH(9)
MCFG_MC6845_UPDATE_ROW_CB(qvt6800_state, update_row)
MCFG_VIDEO_SET_SCREEN("screen")
- MCFG_CPU_ADD("kbdmcu", I8748, XTAL_6MHz)
+ MCFG_CPU_ADD("kbdmcu", I8748, XTAL(6'000'000))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(qvt6800_state::qvt190)
- MCFG_CPU_ADD("maincpu", M6800, XTAL_16_6698MHz / 9)
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(16'669'800) / 9)
MCFG_CPU_PROGRAM_MAP(qvt190_mem_map)
MCFG_NVRAM_ADD_0FILL("nvram") // V61C16P55L + battery
@@ -104,10 +104,10 @@ MACHINE_CONFIG_START(qvt6800_state::qvt190)
MCFG_DEVICE_ADD("acia2", ACIA6850, 0)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16_6698MHz, 882, 0, 720, 315, 0, 300)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'669'800), 882, 0, 720, 315, 0, 300)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
- MCFG_DEVICE_ADD("crtc", MC6845, XTAL_16_6698MHz / 9)
+ MCFG_DEVICE_ADD("crtc", MC6845, XTAL(16'669'800) / 9)
MCFG_MC6845_CHAR_WIDTH(9)
MCFG_MC6845_UPDATE_ROW_CB(qvt6800_state, update_row)
MCFG_VIDEO_SET_SCREEN("screen")
diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp
index 5843eb1c1fa..b35966c1bc0 100644
--- a/src/mame/drivers/qx10.cpp
+++ b/src/mame/drivers/qx10.cpp
@@ -752,7 +752,7 @@ MACHINE_CONFIG_START(qx10_state::qx10)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(qx10_state, hgdc_draw_text)
MCFG_VIDEO_SET_SCREEN("screen")
- MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz )
+ MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic8259_slave", pic8259_device, ir2_w))
MCFG_UPD765A_ADD("upd765", true, true)
MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(qx10_state, qx10_upd765_interrupt))
diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp
index 64f03e4ebba..5def6015cbb 100644
--- a/src/mame/drivers/r2dx_v33.cpp
+++ b/src/mame/drivers/r2dx_v33.cpp
@@ -800,7 +800,7 @@ MACHINE_CONFIG_START(r2dx_v33_state::rdx_v33)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz/28, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(28'636'363)/28, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_DEVICE_ADDRESS_MAP(0, r2dx_oki_map)
MACHINE_CONFIG_END
@@ -808,7 +808,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(r2dx_v33_state::nzerotea)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V33,XTAL_32MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", V33,XTAL(32'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(nzerotea_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", r2dx_v33_state, rdx_v33_interrupt)
diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp
index 32022aea879..f56eceb345a 100644
--- a/src/mame/drivers/rabbit.cpp
+++ b/src/mame/drivers/rabbit.cpp
@@ -900,7 +900,7 @@ INTERRUPT_GEN_MEMBER(rabbit_state::vblank_interrupt)
}
MACHINE_CONFIG_START(rabbit_state::rabbit)
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_24MHz)
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(24'000'000))
MCFG_CPU_PROGRAM_MAP(rabbit_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", rabbit_state, vblank_interrupt)
@@ -924,7 +924,7 @@ MACHINE_CONFIG_START(rabbit_state::rabbit)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_I5000_SND_ADD("i5000snd", XTAL_40MHz)
+ MCFG_I5000_SND_ADD("i5000snd", XTAL(40'000'000))
MCFG_SOUND_ROUTE(0, "rspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "lspeaker", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/radicasi.cpp b/src/mame/drivers/radicasi.cpp
index 287fa8e99b3..a821e5759d4 100644
--- a/src/mame/drivers/radicasi.cpp
+++ b/src/mame/drivers/radicasi.cpp
@@ -1584,7 +1584,7 @@ INTERRUPT_GEN_MEMBER(radica_6502_state::interrupt)
MACHINE_CONFIG_START(radica_6502_state::radicasi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6502,XTAL_21_28137MHz/2) // Tetris has a XTAL_21_28137MHz, not confirmed on Space Invaders, actual CPU clock unknown.
+ MCFG_CPU_ADD("maincpu",M6502,XTAL(21'281'370)/2) // Tetris has a XTAL(21'281'370), not confirmed on Space Invaders, actual CPU clock unknown.
MCFG_CPU_PROGRAM_MAP(radicasi_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", radica_6502_state, interrupt)
diff --git a/src/mame/drivers/radio86.cpp b/src/mame/drivers/radio86.cpp
index 68dadb327e5..59d0d13375c 100644
--- a/src/mame/drivers/radio86.cpp
+++ b/src/mame/drivers/radio86.cpp
@@ -345,7 +345,7 @@ GFXDECODE_END
/* Machine driver */
MACHINE_CONFIG_START(radio86_state::radio86)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL_16MHz / 9)
+ MCFG_CPU_ADD("maincpu",I8080, XTAL(16'000'000) / 9)
MCFG_CPU_PROGRAM_MAP(radio86_mem)
MCFG_CPU_IO_MAP(radio86_io)
MCFG_MACHINE_RESET_OVERRIDE(radio86_state, radio86 )
@@ -356,7 +356,7 @@ MACHINE_CONFIG_START(radio86_state::radio86)
MCFG_I8255_IN_PORTC_CB(READ8(radio86_state, radio86_8255_portc_r2))
MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
- MCFG_DEVICE_ADD("i8275", I8275, XTAL_16MHz / 12)
+ MCFG_DEVICE_ADD("i8275", I8275, XTAL(16'000'000) / 12)
MCFG_I8275_CHARACTER_WIDTH(6)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(radio86_state, display_pixels)
MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma8257",i8257_device, dreq2_w))
@@ -375,7 +375,7 @@ MACHINE_CONFIG_START(radio86_state::radio86)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_DEVICE_ADD("dma8257", I8257, XTAL_16MHz / 9)
+ MCFG_DEVICE_ADD("dma8257", I8257, XTAL(16'000'000) / 9)
MCFG_I8257_OUT_HRQ_CB(WRITELINE(radio86_state, hrq_w))
MCFG_I8257_IN_MEMR_CB(READ8(radio86_state, memory_read_byte))
MCFG_I8257_OUT_MEMW_CB(WRITE8(radio86_state, memory_write_byte))
diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp
index f834a523171..db6b802f93b 100644
--- a/src/mame/drivers/raiden.cpp
+++ b/src/mame/drivers/raiden.cpp
@@ -321,15 +321,15 @@ INTERRUPT_GEN_MEMBER(raiden_state::raiden_interrupt)
MACHINE_CONFIG_START(raiden_state::raiden)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
+ MCFG_CPU_ADD("maincpu", V30,XTAL(20'000'000)/2) /* NEC V30 CPU, 20MHz verified on pcb */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", raiden_state, raiden_interrupt)
- MCFG_CPU_ADD("sub", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
+ MCFG_CPU_ADD("sub", V30,XTAL(20'000'000)/2) /* NEC V30 CPU, 20MHz verified on pcb */
MCFG_CPU_PROGRAM_MAP(sub_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", raiden_state, raiden_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -353,11 +353,11 @@ MACHINE_CONFIG_START(raiden_state::raiden)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_14_31818MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'318'181)/4)
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH) // frequency and pin 7 verified
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/12, PIN7_HIGH) // frequency and pin 7 verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp
index 971bfe80df7..439360fdd85 100644
--- a/src/mame/drivers/raiden2.cpp
+++ b/src/mame/drivers/raiden2.cpp
@@ -1409,19 +1409,19 @@ GFXDECODE_END
MACHINE_CONFIG_START(raiden2_state::raiden2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30,XTAL_32MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", V30,XTAL(32'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(raiden2_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt)
MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,raiden2)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_28_63636MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'636'363)/8)
MCFG_CPU_PROGRAM_MAP(raiden2_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_32MHz/4,512,0,40*8,282,0,30*8) /* hand-tuned to match ~55.47 */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(32'000'000)/4,512,0,40*8,282,0,30*8) /* hand-tuned to match ~55.47 */
MCFG_SCREEN_UPDATE_DRIVER(raiden2_state, screen_update_raiden2)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", raiden2)
@@ -1440,15 +1440,15 @@ MACHINE_CONFIG_START(raiden2_state::raiden2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_28_63636MHz/8)
+ MCFG_YM2151_ADD("ymsnd", XTAL(28'636'363)/8)
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki1", XTAL_28_63636MHz/28, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL(28'636'363)/28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki2", XTAL_28_63636MHz/28, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL(28'636'363)/28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -1480,20 +1480,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(raiden2_state::zeroteam)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30,XTAL_32MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", V30,XTAL(32'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(zeroteam_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt)
MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,zeroteam)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_28_63636MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'636'363)/8)
MCFG_CPU_PROGRAM_MAP(zeroteam_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
// MCFG_SCREEN_REFRESH_RATE(55.47) /* verified on pcb */
- MCFG_SCREEN_RAW_PARAMS(XTAL_32MHz/4,512,0,40*8,282,0,32*8) /* hand-tuned to match ~55.47 */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(32'000'000)/4,512,0,40*8,282,0,32*8) /* hand-tuned to match ~55.47 */
MCFG_SCREEN_UPDATE_DRIVER(raiden2_state, screen_update_raiden2)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", raiden2)
@@ -1512,7 +1512,7 @@ MACHINE_CONFIG_START(raiden2_state::zeroteam)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28_63636MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'636'363)/8)
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp
index 6cda8d8e8b6..ea97e065bbe 100644
--- a/src/mame/drivers/rainbow.cpp
+++ b/src/mame/drivers/rainbow.cpp
@@ -3187,24 +3187,24 @@ MACHINE_CONFIG_START(rainbow_state::rainbow)
MCFG_DEFAULT_LAYOUT(layout_rainbow)
/* basic machine hardware */
-MCFG_CPU_ADD("maincpu", I8088, XTAL_24_0734MHz / 5)
+MCFG_CPU_ADD("maincpu", I8088, XTAL(24'073'400) / 5)
MCFG_CPU_PROGRAM_MAP(rainbow8088_map)
MCFG_CPU_IO_MAP(rainbow8088_io)
-MCFG_CPU_ADD("subcpu", Z80, XTAL_24_0734MHz / 6)
+MCFG_CPU_ADD("subcpu", Z80, XTAL(24'073'400) / 6)
MCFG_CPU_PROGRAM_MAP(rainbowz80_mem)
MCFG_CPU_IO_MAP(rainbowz80_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", rainbow_state, vblank_irq)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-MCFG_SCREEN_RAW_PARAMS(XTAL_24_0734MHz / 6, 442, 0, 400, 264, 0, 240) // ~NTSC compatible video timing (?)
+MCFG_SCREEN_RAW_PARAMS(XTAL(24'073'400) / 6, 442, 0, 400, 264, 0, 240) // ~NTSC compatible video timing (?)
MCFG_SCREEN_UPDATE_DRIVER(rainbow_state, screen_update_rainbow)
MCFG_SCREEN_PALETTE("vt100_video:palette")
MCFG_GFXDECODE_ADD("gfxdecode", "vt100_video:palette", rainbow)
-MCFG_DEVICE_ADD("vt100_video", RAINBOW_VIDEO, XTAL_24_0734MHz)
+MCFG_DEVICE_ADD("vt100_video", RAINBOW_VIDEO, XTAL(24'073'400))
MCFG_VT_SET_SCREEN("screen")
MCFG_VT_CHARGEN("chargen")
@@ -3233,7 +3233,7 @@ MCFG_SCREEN_RAW_PARAMS(31188000 / 4 , 496, 0, 400, 262, 0, 240)
MCFG_SCREEN_UPDATE_DEVICE("upd7220", upd7220_device, screen_update)
-MCFG_FD1793_ADD(FD1793_TAG, XTAL_24_0734MHz / 24) // no separate 1 Mhz quartz
+MCFG_FD1793_ADD(FD1793_TAG, XTAL(24'073'400) / 24) // no separate 1 Mhz quartz
MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":0", rainbow_floppies, "525qd", rainbow_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":1", rainbow_floppies, "525qd", rainbow_state::floppy_formats)
//MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":2", rainbow_floppies, "525qd", rainbow_state::floppy_formats)
@@ -3278,15 +3278,15 @@ MCFG_HARDDISK_INTERFACE("corvus_hdd")
MCFG_DS1315_ADD("rtc") // DS1315 (ClikClok for DEC-100 B) * OPTIONAL *
-MCFG_DEVICE_ADD("com8116_a", COM8116, XTAL_5_0688MHz) // Baud rate generator A
+MCFG_DEVICE_ADD("com8116_a", COM8116, XTAL(5'068'800)) // Baud rate generator A
MCFG_COM8116_FR_HANDLER(WRITELINE(rainbow_state, com8116_a_fr_w))
MCFG_COM8116_FT_HANDLER(WRITELINE(rainbow_state, com8116_a_ft_w))
-MCFG_DEVICE_ADD("com8116_b", COM8116, XTAL_5_0688MHz) // Baud rate generator B
+MCFG_DEVICE_ADD("com8116_b", COM8116, XTAL(5'068'800)) // Baud rate generator B
MCFG_COM8116_FR_HANDLER(WRITELINE(rainbow_state, com8116_b_fr_w))
MCFG_COM8116_FT_HANDLER(WRITELINE(rainbow_state, com8116_b_ft_w))
-MCFG_DEVICE_ADD("upd7201", UPD7201_NEW, XTAL_2_5MHz) // 2.5 Mhz from schematics
+MCFG_DEVICE_ADD("upd7201", UPD7201_NEW, XTAL(2'500'000)) // 2.5 Mhz from schematics
MCFG_Z80SIO_OUT_INT_CB(WRITELINE(rainbow_state, mpsc_irq))
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232_a", rs232_port_device, write_txd))
diff --git a/src/mame/drivers/rallyx.cpp b/src/mame/drivers/rallyx.cpp
index 2966971ab1a..8add7f6302c 100644
--- a/src/mame/drivers/rallyx.cpp
+++ b/src/mame/drivers/rallyx.cpp
@@ -201,7 +201,7 @@ TODO:
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
/*************************************
diff --git a/src/mame/drivers/rampart.cpp b/src/mame/drivers/rampart.cpp
index b8d0f41805a..31b393a440b 100644
--- a/src/mame/drivers/rampart.cpp
+++ b/src/mame/drivers/rampart.cpp
@@ -35,7 +35,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_14_31818MHz
+#define MASTER_CLOCK XTAL(14'318'181)
/*************************************
diff --git a/src/mame/drivers/rastan.cpp b/src/mame/drivers/rastan.cpp
index e71be6c0931..b4057fd80dc 100644
--- a/src/mame/drivers/rastan.cpp
+++ b/src/mame/drivers/rastan.cpp
@@ -365,11 +365,11 @@ void rastan_state::machine_reset()
MACHINE_CONFIG_START(rastan_state::rastan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(rastan_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", rastan_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(rastan_s_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -400,13 +400,13 @@ MACHINE_CONFIG_START(rastan_state::rastan)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_16MHz/4) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(rastan_state,rastan_bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_VCLK_CB(WRITELINE(rastan_state, rastan_msm5205_vck)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp
index f8376d67865..3b8003e444a 100644
--- a/src/mame/drivers/rastersp.cpp
+++ b/src/mame/drivers/rastersp.cpp
@@ -34,8 +34,8 @@
*
*************************************/
-#define SOUND_CLOCK XTAL_12_288MHz
-#define PLL_CLOCK XTAL_14_31818MHz
+#define SOUND_CLOCK XTAL(12'288'000)
+#define PLL_CLOCK XTAL(14'318'181)
#define NVRAM_SIZE 0x8000
#define USE_SPEEDUP_HACK 1
@@ -867,7 +867,7 @@ MACHINE_CONFIG_START(rastersp_state::rastersp)
/* Devices */
MCFG_TIMER_DRIVER_ADD("tms_timer1", rastersp_state, tms_timer1)
MCFG_TIMER_DRIVER_ADD("tms_tx_timer", rastersp_state, tms_tx_timer)
- MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz )
+ MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_NSCSI_BUS_ADD("scsibus")
diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp
index 07e6130c66c..c5d0299674d 100644
--- a/src/mame/drivers/ravens.cpp
+++ b/src/mame/drivers/ravens.cpp
@@ -329,7 +329,7 @@ QUICKLOAD_LOAD_MEMBER( ravens_state, ravens )
MACHINE_CONFIG_START(ravens_state::ravens)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz) // frequency is unknown
+ MCFG_CPU_ADD("maincpu",S2650, XTAL(1'000'000)) // frequency is unknown
MCFG_CPU_PROGRAM_MAP(ravens_mem)
MCFG_CPU_IO_MAP(ravens_io)
MCFG_S2650_SENSE_INPUT(READLINE(ravens_state, cass_r))
@@ -350,7 +350,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ravens_state::ravens2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz) // frequency is unknown
+ MCFG_CPU_ADD("maincpu",S2650, XTAL(1'000'000)) // frequency is unknown
MCFG_CPU_PROGRAM_MAP(ravens_mem)
MCFG_CPU_IO_MAP(ravens2_io)
MCFG_S2650_SENSE_INPUT(READLINE(ravens_state, cass_r))
diff --git a/src/mame/drivers/rbisland.cpp b/src/mame/drivers/rbisland.cpp
index a09b261b4df..34f62b38211 100644
--- a/src/mame/drivers/rbisland.cpp
+++ b/src/mame/drivers/rbisland.cpp
@@ -630,14 +630,14 @@ void rbisland_state::machine_start()
MACHINE_CONFIG_START(rbisland_state::rbisland)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(rbisland_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", rbisland_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(rbisland_sound_map)
- MCFG_TAITO_CCHIP_ADD("cchip", XTAL_12MHz/2) /* ? MHz */
+ MCFG_TAITO_CCHIP_ADD("cchip", XTAL(12'000'000)/2) /* ? MHz */
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -666,7 +666,7 @@ MACHINE_CONFIG_START(rbisland_state::rbisland)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_16MHz/4) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(rbisland_state,bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
@@ -682,11 +682,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(rbisland_state::jumping)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_18_432MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(18'432'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(jumping_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", rbisland_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(jumping_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough unless otherwise */
@@ -715,16 +715,16 @@ MACHINE_CONFIG_START(rbisland_state::jumping)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_24MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(24'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_24MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(24'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/* Imnoe PCB uses 16MHz CPU crystal instead of 18.432 for CPU */
MACHINE_CONFIG_DERIVED(rbisland_state::jumpingi, jumping)
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_REPLACE("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(jumping_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", rbisland_state, irq4_line_hold)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp
index de90c6244c0..5608090ed4e 100644
--- a/src/mame/drivers/rc702.cpp
+++ b/src/mame/drivers/rc702.cpp
@@ -324,7 +324,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(rc702_state::rc702)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(rc702_mem)
MCFG_CPU_IO_MAP(rc702_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
@@ -334,20 +334,20 @@ MACHINE_CONFIG_START(rc702_state::rc702)
MCFG_DEVICE_ADD("ctc_clock", CLOCK, 614000)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(rc702_state, clock_w))
- MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(8'000'000) / 2)
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio1", z80dart_device, txca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1", z80dart_device, rxca_w))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio1", z80dart_device, rxtxcb_w))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("sio1", Z80DART, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("sio1", Z80DART, XTAL(8'000'000) / 2)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(8'000'000) / 2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
// MCFG_Z80PIO_OUT_PB_CB(WRITE8(rc702_state, portxx_w)) // parallel port
- MCFG_DEVICE_ADD("dma", AM9517A, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("dma", AM9517A, XTAL(8'000'000) / 2)
MCFG_I8237_OUT_HREQ_CB(WRITELINE(rc702_state, busreq_w))
MCFG_I8237_OUT_EOP_CB(WRITELINE(rc702_state, tc_w)) // inverted
MCFG_I8237_IN_MEMR_CB(READ8(rc702_state, memory_read_byte))
diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp
index 405449cecdb..c47eed08875 100644
--- a/src/mame/drivers/rc759.cpp
+++ b/src/mame/drivers/rc759.cpp
@@ -547,7 +547,7 @@ MACHINE_CONFIG_START(rc759_state::rc759)
MCFG_I8255_OUT_PORTC_CB(WRITE8(rc759_state, ppi_portc_w))
// rtc
- MCFG_DEVICE_ADD("rtc", MM58167, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768))
MCFG_MM58167_IRQ_CALLBACK(DEVWRITELINE("pic", pic8259_device, ir3_w))
// video
@@ -572,7 +572,7 @@ MACHINE_CONFIG_START(rc759_state::rc759)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("snd", SN76489A, XTAL_20MHz / 10)
+ MCFG_SOUND_ADD("snd", SN76489A, XTAL(20'000'000) / 10)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
// internal centronics
diff --git a/src/mame/drivers/rd100.cpp b/src/mame/drivers/rd100.cpp
index a3405eb0a02..a9924bfc18a 100644
--- a/src/mame/drivers/rd100.cpp
+++ b/src/mame/drivers/rd100.cpp
@@ -97,7 +97,7 @@ MACHINE_RESET_MEMBER( rd100_state, rd100 )
MACHINE_CONFIG_START(rd100_state::rd100)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz) // MC6809P???
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000)) // MC6809P???
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_MACHINE_RESET_OVERRIDE(rd100_state, rd100)
diff --git a/src/mame/drivers/rd110.cpp b/src/mame/drivers/rd110.cpp
index 20add8cd046..2fe748477ab 100644
--- a/src/mame/drivers/rd110.cpp
+++ b/src/mame/drivers/rd110.cpp
@@ -232,7 +232,7 @@ static ADDRESS_MAP_START( d110_io, AS_IO, 16, d110_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(d110_state::d110)
- MCFG_CPU_ADD( "maincpu", P8098, XTAL_12MHz )
+ MCFG_CPU_ADD( "maincpu", P8098, XTAL(12'000'000) )
MCFG_CPU_PROGRAM_MAP( d110_map )
MCFG_CPU_IO_MAP( d110_io )
diff --git a/src/mame/drivers/re900.cpp b/src/mame/drivers/re900.cpp
index 7827cef5bd9..0ab1e0c7880 100644
--- a/src/mame/drivers/re900.cpp
+++ b/src/mame/drivers/re900.cpp
@@ -83,8 +83,8 @@
#include "re900.lh"
-#define MAIN_CLOCK XTAL_11_0592MHz
-#define VDP_CLOCK XTAL_10_730MHz
+#define MAIN_CLOCK XTAL(11'059'200)
+#define VDP_CLOCK XTAL(10'730'000)
#define TMS_CLOCK VDP_CLOCK / 24
@@ -387,7 +387,7 @@ MACHINE_CONFIG_START(re900_state::re900)
MCFG_CPU_IO_MAP(mem_io)
/* video hardware */
- MCFG_DEVICE_ADD( "tms9128", TMS9128, XTAL_10_738635MHz / 2 ) /* TMS9128NL on the board */
+ MCFG_DEVICE_ADD( "tms9128", TMS9128, XTAL(10'738'635) / 2 ) /* TMS9128NL on the board */
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
diff --git a/src/mame/drivers/realbrk.cpp b/src/mame/drivers/realbrk.cpp
index 27a512b2b79..32461c5c945 100644
--- a/src/mame/drivers/realbrk.cpp
+++ b/src/mame/drivers/realbrk.cpp
@@ -757,7 +757,7 @@ INTERRUPT_GEN_MEMBER(realbrk_state::interrupt)
MACHINE_CONFIG_START(realbrk_state::realbrk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL_32MHz / 2) /* !! TMP68301 !! */
+ MCFG_CPU_ADD("maincpu",M68000, XTAL(32'000'000) / 2) /* !! TMP68301 !! */
MCFG_CPU_PROGRAM_MAP(realbrk_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", realbrk_state, interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
@@ -782,11 +782,11 @@ MACHINE_CONFIG_START(realbrk_state::realbrk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_33_8688MHz / 2)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(33'868'800) / 2)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/redalert.cpp b/src/mame/drivers/redalert.cpp
index 54b01be5bfa..90174c4727c 100644
--- a/src/mame/drivers/redalert.cpp
+++ b/src/mame/drivers/redalert.cpp
@@ -98,7 +98,7 @@
#include "includes/redalert.h"
-#define MAIN_PCB_CLOCK (XTAL_12_5MHz)
+#define MAIN_PCB_CLOCK (XTAL(12'500'000))
#define MAIN_CPU_CLOCK (MAIN_PCB_CLOCK / 16)
diff --git a/src/mame/drivers/retofinv.cpp b/src/mame/drivers/retofinv.cpp
index 0eb47bd8b42..48176fc95be 100644
--- a/src/mame/drivers/retofinv.cpp
+++ b/src/mame/drivers/retofinv.cpp
@@ -412,19 +412,19 @@ INTERRUPT_GEN_MEMBER(retofinv_state::sub_vblank_irq)
MACHINE_CONFIG_START(retofinv_state::retofinv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* XTAL and divider verified, 3.072 MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* XTAL and divider verified, 3.072 MHz */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", retofinv_state, main_vblank_irq)
- MCFG_CPU_ADD("sub", Z80, XTAL_18_432MHz/6) /* XTAL and divider verified, 3.072 MHz */
+ MCFG_CPU_ADD("sub", Z80, XTAL(18'432'000)/6) /* XTAL and divider verified, 3.072 MHz */
MCFG_CPU_PROGRAM_MAP(sub_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", retofinv_state, sub_vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6) /* XTAL and divider verified, 3.072 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* XTAL and divider verified, 3.072 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(retofinv_state, nmi_line_pulse, 2*60) // wrong, should be ~128-132 per frame, not 120.
- MCFG_CPU_ADD("68705", TAITO68705_MCU, XTAL_18_432MHz/6) /* XTAL and divider verified, 3.072 MHz */
+ MCFG_CPU_ADD("68705", TAITO68705_MCU, XTAL(18'432'000)/6) /* XTAL and divider verified, 3.072 MHz */
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -457,10 +457,10 @@ MACHINE_CONFIG_START(retofinv_state::retofinv)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("sn1", SN76489A, XTAL_18_432MHz/6) /* @IC5?; XTAL, chip type, and divider verified, 3.072 MHz */
+ MCFG_SOUND_ADD("sn1", SN76489A, XTAL(18'432'000)/6) /* @IC5?; XTAL, chip type, and divider verified, 3.072 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("sn2", SN76489A, XTAL_18_432MHz/6) /* @IC6?; XTAL, chip type, and divider verified, 3.072 MHz */
+ MCFG_SOUND_ADD("sn2", SN76489A, XTAL(18'432'000)/6) /* @IC6?; XTAL, chip type, and divider verified, 3.072 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp
index 031097cdd8b..0ee0bd471c8 100644
--- a/src/mame/drivers/rex6000.cpp
+++ b/src/mame/drivers/rex6000.cpp
@@ -875,7 +875,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(rex6000_state::rex6000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) //Toshiba microprocessor Z80 compatible at 4.3MHz
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000)) //Toshiba microprocessor Z80 compatible at 4.3MHz
MCFG_CPU_PROGRAM_MAP(rex6000_mem)
MCFG_CPU_IO_MAP(rex6000_io)
@@ -909,7 +909,7 @@ MACHINE_CONFIG_START(rex6000_state::rex6000)
MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(8)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x2000)
- MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport", rs232_port_device, write_rts))
@@ -925,7 +925,7 @@ MACHINE_CONFIG_START(rex6000_state::rex6000)
/* quickload */
MCFG_QUICKLOAD_ADD("quickload", rex6000_state, rex6000, "rex,ds2", 0)
- MCFG_DEVICE_ADD(TC8521_TAG, TC8521, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(TC8521_TAG, TC8521, XTAL(32'768))
MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(rex6000_state, alarm_irq))
/*
@@ -952,7 +952,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(oz750_state::oz750)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_9_8304MHz) //Toshiba microprocessor Z80 compatible at 9.8MHz
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(9'830'400)) //Toshiba microprocessor Z80 compatible at 9.8MHz
MCFG_CPU_PROGRAM_MAP(rex6000_mem)
MCFG_CPU_IO_MAP(oz750_io)
@@ -960,7 +960,7 @@ MACHINE_CONFIG_START(oz750_state::oz750)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer1", rex6000_state, irq_timer1, attotime::from_hz(64))
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer2", rex6000_state, irq_timer2, attotime::from_hz(8192))
- MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL_9_8304MHz / 4 )
+ MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL(9'830'400) / 4 )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport", rs232_port_device, write_rts))
@@ -1001,7 +1001,7 @@ MACHINE_CONFIG_START(oz750_state::oz750)
/* quickload */
MCFG_QUICKLOAD_ADD("quickload", oz750_state, oz750, "wzd", 0)
- MCFG_DEVICE_ADD(TC8521_TAG, TC8521, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(TC8521_TAG, TC8521, XTAL(32'768))
MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(rex6000_state, alarm_irq))
MCFG_SHARP_LH28F016S_ADD("flash0a")
diff --git a/src/mame/drivers/risc2500.cpp b/src/mame/drivers/risc2500.cpp
index d764d319a10..1a1915915ba 100644
--- a/src/mame/drivers/risc2500.cpp
+++ b/src/mame/drivers/risc2500.cpp
@@ -296,7 +296,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(risc2500_state::risc2500)
- MCFG_CPU_ADD("maincpu", ARM, XTAL_28_322MHz / 2) // VY86C010
+ MCFG_CPU_ADD("maincpu", ARM, XTAL(28'322'000) / 2) // VY86C010
MCFG_CPU_PROGRAM_MAP(risc2500_mem)
MCFG_ARM_COPRO(VL86C020)
MCFG_CPU_PERIODIC_INT_DRIVER(risc2500_state, irq1_line_hold, 250)
diff --git a/src/mame/drivers/riscpc.cpp b/src/mame/drivers/riscpc.cpp
index 0e67ac0811a..0f690ddd150 100644
--- a/src/mame/drivers/riscpc.cpp
+++ b/src/mame/drivers/riscpc.cpp
@@ -807,7 +807,7 @@ void riscpc_state::machine_reset()
MACHINE_CONFIG_START(riscpc_state::rpc600)
/* Basic machine hardware */
- MCFG_CPU_ADD( "maincpu", ARM7, XTAL_30MHz ) // ARM610
+ MCFG_CPU_ADD( "maincpu", ARM7, XTAL(30'000'000) ) // ARM610
MCFG_CPU_PROGRAM_MAP(a7000_mem)
/* video hardware */
@@ -822,7 +822,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(riscpc_state::rpc700)
/* Basic machine hardware */
- MCFG_CPU_ADD( "maincpu", ARM7, XTAL_40MHz ) // ARM710
+ MCFG_CPU_ADD( "maincpu", ARM7, XTAL(40'000'000) ) // ARM710
MCFG_CPU_PROGRAM_MAP(a7000_mem)
/* video hardware */
@@ -837,7 +837,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(riscpc_state::a7000)
/* Basic machine hardware */
- MCFG_CPU_ADD( "maincpu", ARM7, XTAL_32MHz ) // ARM7500
+ MCFG_CPU_ADD( "maincpu", ARM7, XTAL(32'000'000) ) // ARM7500
MCFG_CPU_PROGRAM_MAP(a7000_mem)
/* video hardware */
@@ -852,7 +852,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(riscpc_state::a7000p, a7000)
MCFG_CPU_MODIFY("maincpu") // ARM7500FE
- MCFG_CPU_CLOCK(XTAL_48MHz)
+ MCFG_CPU_CLOCK(XTAL(48'000'000))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(riscpc_state::sarpc)
diff --git a/src/mame/drivers/rltennis.cpp b/src/mame/drivers/rltennis.cpp
index 1fcacdec410..efc61c347ab 100644
--- a/src/mame/drivers/rltennis.cpp
+++ b/src/mame/drivers/rltennis.cpp
@@ -74,7 +74,7 @@ player - when there's nothing to play - first, empty 2k of ROMs are selected.
#define RLT_REFRESH_RATE 60
#define RLT_TIMER_FREQ (RLT_REFRESH_RATE*256)
-#define RLT_XTAL XTAL_12MHz
+#define RLT_XTAL XTAL(12'000'000)
READ16_MEMBER(rltennis_state::io_r)
{
diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp
index 967fd8d91cc..aca5b6b1fc9 100644
--- a/src/mame/drivers/rm380z.cpp
+++ b/src/mame/drivers/rm380z.cpp
@@ -230,7 +230,7 @@ uint32_t rm380z_state::screen_update_rm380z(screen_device &screen, bitmap_ind16
MACHINE_CONFIG_START(rm380z_state::rm380z)
/* basic machine hardware */
- MCFG_CPU_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(rm380z_mem)
MCFG_CPU_IO_MAP(rm380z_io)
@@ -258,7 +258,7 @@ MACHINE_CONFIG_START(rm380z_state::rm380z)
MCFG_RAM_DEFAULT_SIZE("56K")
/* floppy disk */
- MCFG_FD1771_ADD("wd1771", XTAL_1MHz)
+ MCFG_FD1771_ADD("wd1771", XTAL(1'000'000))
MCFG_FLOPPY_DRIVE_ADD("wd1771:0", rm380z_floppies, "sssd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1771:1", rm380z_floppies, "sssd", floppy_image_device::default_floppy_formats)
@@ -270,7 +270,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(rm380z_state::rm480z)
/* basic machine hardware */
- MCFG_CPU_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(rm480z_mem)
MCFG_CPU_IO_MAP(rm480z_io)
diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp
index 81488b8d0cd..2bbd5249183 100644
--- a/src/mame/drivers/rmnimbus.cpp
+++ b/src/mame/drivers/rmnimbus.cpp
@@ -115,7 +115,7 @@ MACHINE_CONFIG_START(rmnimbus_state::nimbus)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( XTAL_4_433619MHz*2,650,0,640,260,0,250)
+ MCFG_SCREEN_RAW_PARAMS( XTAL(4'433'619)*2,650,0,640,260,0,250)
MCFG_SCREEN_UPDATE_DRIVER(rmnimbus_state, screen_update_nimbus)
//MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/rmt32.cpp b/src/mame/drivers/rmt32.cpp
index bb865e07ef6..e01770b979f 100644
--- a/src/mame/drivers/rmt32.cpp
+++ b/src/mame/drivers/rmt32.cpp
@@ -351,7 +351,7 @@ static ADDRESS_MAP_START( mt32_io, AS_IO, 16, mt32_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(mt32_state::mt32)
- MCFG_CPU_ADD( "maincpu", P8098, XTAL_12MHz )
+ MCFG_CPU_ADD( "maincpu", P8098, XTAL(12'000'000) )
MCFG_CPU_PROGRAM_MAP( mt32_map )
MCFG_CPU_IO_MAP( mt32_io )
diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp
index f5d18476fc4..14471ce5019 100644
--- a/src/mame/drivers/rockrage.cpp
+++ b/src/mame/drivers/rockrage.cpp
@@ -248,11 +248,11 @@ void rockrage_state::machine_reset()
MACHINE_CONFIG_START(rockrage_state::rockrage)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, XTAL_24MHz / 8)
+ MCFG_CPU_ADD("maincpu", HD6309E, XTAL(24'000'000) / 8)
MCFG_CPU_PROGRAM_MAP(rockrage_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", rockrage_state, rockrage_interrupt)
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL_24MHz / 16)
+ MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(24'000'000) / 16)
MCFG_CPU_PROGRAM_MAP(rockrage_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
diff --git a/src/mame/drivers/rocnrope.cpp b/src/mame/drivers/rocnrope.cpp
index 7e115a79296..5180de4ead6 100644
--- a/src/mame/drivers/rocnrope.cpp
+++ b/src/mame/drivers/rocnrope.cpp
@@ -21,7 +21,7 @@
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
/*************************************
diff --git a/src/mame/drivers/rollrace.cpp b/src/mame/drivers/rollrace.cpp
index 3a1809c8c57..49db3efb2dd 100644
--- a/src/mame/drivers/rollrace.cpp
+++ b/src/mame/drivers/rollrace.cpp
@@ -248,11 +248,11 @@ INTERRUPT_GEN_MEMBER(rollrace_state::sound_timer_irq)
MACHINE_CONFIG_START(rollrace_state::rollrace)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL_24MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80,XTAL(24'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(rollrace_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", rollrace_state, vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL_24MHz/16) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL(24'000'000)/16) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(rollrace_sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(rollrace_state, sound_timer_irq, 4*60)
@@ -283,13 +283,13 @@ MACHINE_CONFIG_START(rollrace_state::rollrace)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910,XTAL_24MHz/16) /* verified on pcb */
+ MCFG_SOUND_ADD("ay1", AY8910,XTAL(24'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MCFG_SOUND_ADD("ay2", AY8910,XTAL_24MHz/16) /* verified on pcb */
+ MCFG_SOUND_ADD("ay2", AY8910,XTAL(24'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MCFG_SOUND_ADD("ay3", AY8910,XTAL_24MHz/16) /* verified on pcb */
+ MCFG_SOUND_ADD("ay3", AY8910,XTAL(24'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ron.cpp b/src/mame/drivers/ron.cpp
index 793ce4495a0..c8542580198 100644
--- a/src/mame/drivers/ron.cpp
+++ b/src/mame/drivers/ron.cpp
@@ -26,9 +26,9 @@ Debug cheats:
#include "debugger.h"
// TBD
-#define MAIN_CLOCK (XTAL_15_468MHz / 4)
-#define VIDEO_CLOCK (XTAL_15_468MHz / 3)
-#define SOUND_CLOCK XTAL_3_579545MHz
+#define MAIN_CLOCK (XTAL(15'468'480) / 4)
+#define VIDEO_CLOCK (XTAL(15'468'480) / 3)
+#define SOUND_CLOCK XTAL(3'579'545)
class ron_state : public driver_device
{
diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp
index ff48865ac8a..ec12052990a 100644
--- a/src/mame/drivers/royalmah.cpp
+++ b/src/mame/drivers/royalmah.cpp
@@ -3506,10 +3506,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(royalmah_state::janyoup2, ippatsu)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_18_432MHz/4) // unknown divider
+ MCFG_CPU_CLOCK(XTAL(18'432'000)/4) // unknown divider
MCFG_CPU_IO_MAP(janyoup2_iomap)
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_18_432MHz/12) // unknown divider
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(18'432'000)/12) // unknown divider
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MACHINE_CONFIG_END
@@ -3566,7 +3566,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(royalmah_state::janptr96, mjderngr)
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL_16MHz/2) /* 8 MHz? */
+ MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL(16'000'000)/2) /* 8 MHz? */
MCFG_CPU_PROGRAM_MAP(janptr96_map)
MCFG_CPU_IO_MAP(janptr96_iomap)
MCFG_TMPZ84C015_IN_PA_CB(READ8(royalmah_state, janptr96_dsw_r))
@@ -3578,7 +3578,7 @@ MACHINE_CONFIG_DERIVED(royalmah_state::janptr96, mjderngr)
MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, trg1)) MCFG_DEVCB_INVERT
MACHINE_CONFIG_END
@@ -3630,7 +3630,7 @@ MACHINE_CONFIG_DERIVED(royalmah_state::mjtensin, mjderngr)
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ1))
MACHINE_CONFIG_END
@@ -3645,12 +3645,12 @@ MACHINE_CONFIG_DERIVED(royalmah_state::cafetime, mjderngr)
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ1))
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(royalmah_state::mjvegasa, mjderngr)
- MCFG_CPU_REPLACE("maincpu",TMP90841, XTAL_8MHz) /* ? */
+ MCFG_CPU_REPLACE("maincpu",TMP90841, XTAL(8'000'000)) /* ? */
MCFG_CPU_PROGRAM_MAP(mjvegasa_map)
MCFG_TLCS90_PORT_P3_READ_CB(READ8(royalmah_state, mjtensin_p3_r))
MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(royalmah_state, mjvegasa_p3_w))
@@ -3661,7 +3661,7 @@ MACHINE_CONFIG_DERIVED(royalmah_state::mjvegasa, mjderngr)
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ1))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rpunch.cpp b/src/mame/drivers/rpunch.cpp
index b242fc88b51..749746aa93f 100644
--- a/src/mame/drivers/rpunch.cpp
+++ b/src/mame/drivers/rpunch.cpp
@@ -117,8 +117,8 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_16MHz
-#define VIDEO_CLOCK XTAL_13_333MHz
+#define MASTER_CLOCK XTAL(16'000'000)
+#define VIDEO_CLOCK XTAL(13'333'000)
/*************************************
diff --git a/src/mame/drivers/rsc55.cpp b/src/mame/drivers/rsc55.cpp
index a486bdec7fb..4794c2ef581 100644
--- a/src/mame/drivers/rsc55.cpp
+++ b/src/mame/drivers/rsc55.cpp
@@ -66,7 +66,7 @@ static ADDRESS_MAP_START( sc55_io, AS_IO, 16, sc55_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(sc55_state::sc55)
- MCFG_CPU_ADD( "maincpu", P8098, XTAL_20MHz ) // probably not?
+ MCFG_CPU_ADD( "maincpu", P8098, XTAL(20'000'000) ) // probably not?
MCFG_CPU_PROGRAM_MAP( sc55_map )
MCFG_CPU_IO_MAP( sc55_io )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rt1715.cpp b/src/mame/drivers/rt1715.cpp
index f79333d0d7d..033191be35d 100644
--- a/src/mame/drivers/rt1715.cpp
+++ b/src/mame/drivers/rt1715.cpp
@@ -276,7 +276,7 @@ static const z80_daisy_config rt1715_daisy_chain[] =
MACHINE_CONFIG_START(rt1715_state::rt1715)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_2_4576MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(2'457'600))
MCFG_CPU_PROGRAM_MAP(rt1715_mem)
MCFG_CPU_IO_MAP(rt1715_io)
MCFG_Z80_DAISY_CHAIN(rt1715_daisy_chain)
@@ -299,17 +299,17 @@ MACHINE_CONFIG_START(rt1715_state::rt1715)
MCFG_PALETTE_ADD("palette", 3)
MCFG_PALETTE_INIT_OWNER(rt1715_state, rt1715)
- MCFG_DEVICE_ADD("a26", I8275, XTAL_2_4576MHz)
+ MCFG_DEVICE_ADD("a26", I8275, XTAL(2'457'600))
MCFG_I8275_CHARACTER_WIDTH(8)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(rt1715_state, crtc_display_pixels)
- MCFG_DEVICE_ADD("a30", Z80CTC, XTAL_10MHz/4 /* ? */)
+ MCFG_DEVICE_ADD("a30", Z80CTC, XTAL(10'000'000)/4 /* ? */)
- MCFG_DEVICE_ADD("a29", Z80SIO, XTAL_10MHz/4 /* ? */)
+ MCFG_DEVICE_ADD("a29", Z80SIO, XTAL(10'000'000)/4 /* ? */)
/* floppy */
- MCFG_DEVICE_ADD("a71", Z80PIO, XTAL_10MHz/4 /* ? */)
- MCFG_DEVICE_ADD("a72", Z80PIO, XTAL_10MHz/4 /* ? */)
+ MCFG_DEVICE_ADD("a71", Z80PIO, XTAL(10'000'000)/4 /* ? */)
+ MCFG_DEVICE_ADD("a72", Z80PIO, XTAL(10'000'000)/4 /* ? */)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/rungun.cpp b/src/mame/drivers/rungun.cpp
index 86970bfe628..6c9afbae219 100644
--- a/src/mame/drivers/rungun.cpp
+++ b/src/mame/drivers/rungun.cpp
@@ -439,13 +439,13 @@ MACHINE_CONFIG_START(rungun_state::rng)
MCFG_K054321_ADD("k054321", ":lspeaker", ":rspeaker")
- MCFG_DEVICE_ADD("k054539_1", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_K054539_TIMER_HANDLER(WRITELINE(rungun_state, k054539_nmi_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_DEVICE_ADD("k054539_2", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/rvoice.cpp b/src/mame/drivers/rvoice.cpp
index 8ca56759d36..3fb434b9d00 100644
--- a/src/mame/drivers/rvoice.cpp
+++ b/src/mame/drivers/rvoice.cpp
@@ -361,17 +361,17 @@ void rvoice_state::null_kbd_put(u8 data)
MACHINE_CONFIG_START(rvoice_state::rvoicepc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD63701, XTAL_7_3728MHz)
+ MCFG_CPU_ADD("maincpu", HD63701, XTAL(7'372'800))
MCFG_CPU_PROGRAM_MAP(hd63701_main_mem)
MCFG_CPU_IO_MAP(hd63701_main_io)
- //MCFG_CPU_ADD("playercpu", HD63701, XTAL_7_3728MHz) // not dumped yet
+ //MCFG_CPU_ADD("playercpu", HD63701, XTAL(7'372'800)) // not dumped yet
//MCFG_CPU_PROGRAM_MAP(hd63701_slave_mem)
//MCFG_CPU_IO_MAP(hd63701_slave_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD("acia65c51", MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
/* video hardware */
//MCFG_DEFAULT_LAYOUT(layout_dectalk) // hack to avoid screenless system crash
diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp
index 43f623b729d..a2c26f232df 100644
--- a/src/mame/drivers/rx78.cpp
+++ b/src/mame/drivers/rx78.cpp
@@ -115,7 +115,7 @@ private:
};
-#define MASTER_CLOCK XTAL_28_63636MHz
+#define MASTER_CLOCK XTAL(28'636'363)
WRITE8_MEMBER( rx78_state::cass_w )
@@ -500,7 +500,7 @@ MACHINE_CONFIG_START(rx78_state::rx78)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("sn1", SN76489A, XTAL_28_63636MHz/8) // unknown divider
+ MCFG_SOUND_ADD("sn1", SN76489A, XTAL(28'636'363)/8) // unknown divider
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Software lists */
diff --git a/src/mame/drivers/rzone.cpp b/src/mame/drivers/rzone.cpp
index c7bc6a01310..dbeddc2c33a 100644
--- a/src/mame/drivers/rzone.cpp
+++ b/src/mame/drivers/rzone.cpp
@@ -244,7 +244,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(rzone_state::rzindy500)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) // no external XTAL
+ MCFG_CPU_ADD("maincpu", SM510, XTAL(32'768)) // no external XTAL
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // confirmed
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(rzone_state, input_r))
@@ -270,7 +270,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(rzone_state::rzbatfor)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM512, XTAL_32_768kHz) // no external XTAL
+ MCFG_CPU_ADD("maincpu", SM512, XTAL(32'768)) // no external XTAL
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(rzone_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(rzone_state, t2_write_s))
diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp
index 31e632050bc..7be1b6bc71d 100644
--- a/src/mame/drivers/s11.cpp
+++ b/src/mame/drivers/s11.cpp
@@ -381,7 +381,7 @@ DRIVER_INIT_MEMBER( s11_state, s11 )
MACHINE_CONFIG_START(s11_state::s11)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", M6802, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(s11_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s11_state, s11)
@@ -440,7 +440,7 @@ MACHINE_CONFIG_START(s11_state::s11)
MCFG_NVRAM_ADD_0FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6808, XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu", M6808, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(s11_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp
index db25b29d2c2..03e827b81f9 100644
--- a/src/mame/drivers/s11a.cpp
+++ b/src/mame/drivers/s11a.cpp
@@ -173,7 +173,7 @@ DRIVER_INIT_MEMBER( s11a_state, s11a )
MACHINE_CONFIG_START(s11a_state::s11a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", M6808, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(s11a_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s11a_state, s11a)
@@ -232,7 +232,7 @@ MACHINE_CONFIG_START(s11a_state::s11a)
MCFG_NVRAM_ADD_1FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6802, XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu", M6802, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(s11a_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
@@ -254,11 +254,11 @@ MACHINE_CONFIG_START(s11a_state::s11a)
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
/* Add the background music card */
- MCFG_CPU_ADD("bgcpu", MC6809E, XTAL_8MHz / 4) // MC68B09E
+ MCFG_CPU_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
MCFG_CPU_PROGRAM_MAP(s11a_bg_map)
MCFG_SPEAKER_STANDARD_MONO("bg")
- MCFG_YM2151_ADD("ym2151", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ym2151", XTAL(3'579'545))
MCFG_YM2151_IRQ_HANDLER(WRITELINE(s11a_state, ym2151_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp
index cb92189a93a..74f1c0e292e 100644
--- a/src/mame/drivers/s11b.cpp
+++ b/src/mame/drivers/s11b.cpp
@@ -247,7 +247,7 @@ DRIVER_INIT_MEMBER( s11b_state, s11b_invert )
MACHINE_CONFIG_START(s11b_state::s11b)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", M6808, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(s11b_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s11b_state, s11b)
@@ -306,7 +306,7 @@ MACHINE_CONFIG_START(s11b_state::s11b)
MCFG_NVRAM_ADD_1FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6802, XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu", M6802, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(s11b_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
@@ -329,7 +329,7 @@ MACHINE_CONFIG_START(s11b_state::s11b)
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
/* Add the background music card */
- MCFG_CPU_ADD("bgcpu", MC6809E, XTAL_8MHz / 4) // MC68B09E
+ MCFG_CPU_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
MCFG_CPU_PROGRAM_MAP(s11b_bg_map)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp
index 4ea95a10c65..a9caa21ba71 100644
--- a/src/mame/drivers/s11c.cpp
+++ b/src/mame/drivers/s11c.cpp
@@ -152,7 +152,7 @@ DRIVER_INIT_MEMBER(s11c_state,s11c)
MACHINE_CONFIG_START(s11c_state::s11c)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", M6808, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(s11c_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s11c_state, s11c)
diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp
index 68f8d697959..d12196cc6af 100644
--- a/src/mame/drivers/s8.cpp
+++ b/src/mame/drivers/s8.cpp
@@ -307,7 +307,7 @@ DRIVER_INIT_MEMBER( s8_state, s8 )
MACHINE_CONFIG_START(s8_state::s8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", M6802, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(s8_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s8_state, s8)
@@ -352,7 +352,7 @@ MACHINE_CONFIG_START(s8_state::s8)
MCFG_NVRAM_ADD_0FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6808, XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu", M6808, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(s8_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp
index 957fa70d69e..f75bcf083f4 100644
--- a/src/mame/drivers/s8a.cpp
+++ b/src/mame/drivers/s8a.cpp
@@ -279,7 +279,7 @@ DRIVER_INIT_MEMBER( s8a_state, s8a )
MACHINE_CONFIG_START(s8a_state::s8a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", M6802, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(s8a_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s8a_state, s8a)
@@ -324,7 +324,7 @@ MACHINE_CONFIG_START(s8a_state::s8a)
MCFG_NVRAM_ADD_0FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6808, XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu", M6808, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(s8a_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp
index 5931509a22c..9c372879a19 100644
--- a/src/mame/drivers/s9.cpp
+++ b/src/mame/drivers/s9.cpp
@@ -313,7 +313,7 @@ DRIVER_INIT_MEMBER( s9_state, s9 )
MACHINE_CONFIG_START(s9_state::s9)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", M6808, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(s9_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s9_state, s9)
@@ -358,7 +358,7 @@ MACHINE_CONFIG_START(s9_state::s9)
MCFG_NVRAM_ADD_0FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6808, XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu", M6808, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(s9_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp
index 7268db8d4e8..22da3117459 100644
--- a/src/mame/drivers/safarir.cpp
+++ b/src/mame/drivers/safarir.cpp
@@ -404,7 +404,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(safarir_state::safarir)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL_18MHz/12) /* 1.5 MHz ? */
+ MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'000'000)/12) /* 1.5 MHz ? */
MCFG_CPU_PROGRAM_MAP(main_map)
/* video hardware */
diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp
index cc6be2193c5..72f8ee64e00 100644
--- a/src/mame/drivers/sage2.cpp
+++ b/src/mame/drivers/sage2.cpp
@@ -409,7 +409,7 @@ READ16_MEMBER(sage2_state::rom_r)
MACHINE_CONFIG_START(sage2_state::sage2)
// basic machine hardware
- MCFG_CPU_ADD(M68000_TAG, M68000, XTAL_16MHz/2)
+ MCFG_CPU_ADD(M68000_TAG, M68000, XTAL(16'000'000)/2)
MCFG_CPU_PROGRAM_MAP(sage2_mem)
// devices
@@ -429,17 +429,17 @@ MACHINE_CONFIG_START(sage2_state::sage2)
MCFG_DEVICE_ADD(I8253_0_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(0) // from U75 OUT0
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8259_TAG, pic8259_device, ir6_w))
- MCFG_PIT8253_CLK1(XTAL_16MHz/2/125)
+ MCFG_PIT8253_CLK1(XTAL(16'000'000)/2/125)
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE(I8253_0_TAG, pit8253_device, write_clk2))
MCFG_PIT8253_CLK2(0) // from OUT2
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE(I8259_TAG, pic8259_device, ir0_w))
MCFG_DEVICE_ADD(I8253_1_TAG, PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_16MHz/2/125)
+ MCFG_PIT8253_CLK0(XTAL(16'000'000)/2/125)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8253_0_TAG, pit8253_device, write_clk0))
- MCFG_PIT8253_CLK1(XTAL_16MHz/2/13)
+ MCFG_PIT8253_CLK1(XTAL(16'000'000)/2/13)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(sage2_state, br1_w))
- MCFG_PIT8253_CLK2(XTAL_16MHz/2/13)
+ MCFG_PIT8253_CLK2(XTAL(16'000'000)/2/13)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(sage2_state, br2_w))
MCFG_DEVICE_ADD(I8251_0_TAG, I8251, 0)
diff --git a/src/mame/drivers/sam.cpp b/src/mame/drivers/sam.cpp
index c6510d8cb6f..dae7e84a8ab 100644
--- a/src/mame/drivers/sam.cpp
+++ b/src/mame/drivers/sam.cpp
@@ -22,7 +22,7 @@ static INPUT_PORTS_START( sam )
INPUT_PORTS_END
MACHINE_CONFIG_START(sam_state::sam)
- MCFG_CPU_ADD("maincpu", ARM7, XTAL_40MHz) // AT91R40008
+ MCFG_CPU_ADD("maincpu", ARM7, XTAL(40'000'000)) // AT91R40008
MCFG_CPU_PROGRAM_MAP(sam_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp
index ea4aba7f7f6..471cbce3808 100644
--- a/src/mame/drivers/samcoupe.cpp
+++ b/src/mame/drivers/samcoupe.cpp
@@ -43,8 +43,8 @@
CONSTANTS
***************************************************************************/
-#define SAMCOUPE_XTAL_X1 XTAL_24MHz
-#define SAMCOUPE_XTAL_X2 XTAL_4_433619MHz
+#define SAMCOUPE_XTAL_X1 XTAL(24'000'000)
+#define SAMCOUPE_XTAL_X2 XTAL(4'433'619)
/***************************************************************************
@@ -545,7 +545,7 @@ MACHINE_CONFIG_START(samcoupe_state::samcoupe)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("lpt2_data_out", "lpt2")
- MCFG_DEVICE_ADD("sambus_clock", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("sambus_clock", MSM6242, XTAL(32'768))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_FORMATS(tzx_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
diff --git a/src/mame/drivers/sangho.cpp b/src/mame/drivers/sangho.cpp
index 840d8e198e4..52bce7b25cd 100644
--- a/src/mame/drivers/sangho.cpp
+++ b/src/mame/drivers/sangho.cpp
@@ -456,18 +456,18 @@ MACHINE_RESET_MEMBER(sangho_state,sexyboom)
MACHINE_CONFIG_START(sangho_state::pzlestar)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) // ?
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272)/6) // ?
MCFG_CPU_PROGRAM_MAP(sangho_map)
MCFG_CPU_IO_MAP(pzlestar_io_map)
- MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL_21_4772MHz) // typical 9958 clock, not verified
+ MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL(21'477'272)) // typical 9958 clock, not verified
MCFG_V99X8_INTERRUPT_CALLBACK(INPUTLINE("maincpu", 0))
- MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", XTAL_21_4772MHz)
+ MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", XTAL(21'477'272))
MCFG_MACHINE_RESET_OVERRIDE(sangho_state,pzlestar)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_21_4772MHz/6)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(21'477'272)/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -475,20 +475,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sangho_state::sexyboom)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272)/6)
MCFG_CPU_PROGRAM_MAP(sangho_map)
MCFG_CPU_IO_MAP(sexyboom_io_map)
- MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL_21_4772MHz)
+ MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL(21'477'272))
MCFG_V99X8_INTERRUPT_CALLBACK(INPUTLINE("maincpu", 0))
- MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", XTAL_21_4772MHz)
+ MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", XTAL(21'477'272))
MCFG_MACHINE_RESET_OVERRIDE(sangho_state,sexyboom)
MCFG_PALETTE_ADD("palette", 19780)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_21_4772MHz/6)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(21'477'272)/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sanremo.cpp b/src/mame/drivers/sanremo.cpp
index c7dd0ccdf3b..09b066daddb 100644
--- a/src/mame/drivers/sanremo.cpp
+++ b/src/mame/drivers/sanremo.cpp
@@ -101,7 +101,7 @@
#include "sanremo.lh"
-#define MASTER_CLOCK XTAL_18MHz
+#define MASTER_CLOCK XTAL(18'000'000)
#define CPU_CLOCK MASTER_CLOCK/3
#define SND_CLOCK MASTER_CLOCK/12
diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp
index 75c825f4aae..9c445f9264c 100644
--- a/src/mame/drivers/sapi1.cpp
+++ b/src/mame/drivers/sapi1.cpp
@@ -616,7 +616,7 @@ DRIVER_INIT_MEMBER( sapi1_state, sapizps3b )
/* Machine driver */
MACHINE_CONFIG_START(sapi1_state::sapi1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL_18MHz / 9) // Tesla MHB8080A + MHB8224 + MHB8228
+ MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'000'000) / 9) // Tesla MHB8080A + MHB8224 + MHB8228
MCFG_CPU_PROGRAM_MAP(sapi1_mem)
MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapi1)
@@ -683,15 +683,15 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(sapi1_state::sapi3a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL_18MHz / 9) // Tesla MHB8080A + MHB8224 + MHB8228
+ MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'000'000) / 9) // Tesla MHB8080A + MHB8224 + MHB8228
MCFG_CPU_PROGRAM_MAP(sapi3a_mem)
MCFG_CPU_IO_MAP(sapi3a_io)
MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapizps3 )
/* video hardware */
MCFG_DEVICE_ADD("uart", AY51013, 0) // Tesla MHB1012
- MCFG_AY51013_TX_CLOCK(XTAL_12_288MHz / 80) // not actual rate?
- MCFG_AY51013_RX_CLOCK(XTAL_12_288MHz / 80) // not actual rate?
+ MCFG_AY51013_TX_CLOCK(XTAL(12'288'000) / 80) // not actual rate?
+ MCFG_AY51013_RX_CLOCK(XTAL(12'288'000) / 80) // not actual rate?
MCFG_AY51013_READ_SI_CB(DEVREADLINE("v24", rs232_port_device, rxd_r))
MCFG_AY51013_WRITE_SO_CB(DEVWRITELINE("v24", rs232_port_device, write_txd))
diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp
index 3e28d93f287..1619823d96e 100644
--- a/src/mame/drivers/saturn.cpp
+++ b/src/mame/drivers/saturn.cpp
@@ -804,7 +804,7 @@ MACHINE_CONFIG_START(sat_console_state::saturn)
// SH-1
// SMPC MCU, running at 4 MHz (+ custom RTC device that runs at 32.768 KHz)
- MCFG_SMPC_HLE_ADD("smpc", XTAL_4MHz)
+ MCFG_SMPC_HLE_ADD("smpc", XTAL(4'000'000))
smpc_hle_device::static_set_control_port_tags(*device, "ctrl1", "ctrl2");
MCFG_SMPC_HLE_PDR1_IN_CB(READ8(sat_console_state, saturn_pdr1_direct_r))
MCFG_SMPC_HLE_PDR2_IN_CB(READ8(sat_console_state, saturn_pdr2_direct_r))
diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp
index ea2affedadc..c646e87917c 100644
--- a/src/mame/drivers/sauro.cpp
+++ b/src/mame/drivers/sauro.cpp
@@ -445,7 +445,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(sauro_state::tecfri)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(20'000'000)/4) /* verified on pcb */
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(sauro_state, irq_reset_w))
@@ -468,7 +468,7 @@ MACHINE_CONFIG_START(sauro_state::tecfri)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_20MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(20'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/savia84.cpp b/src/mame/drivers/savia84.cpp
index fc9840369fa..e8843ffe316 100644
--- a/src/mame/drivers/savia84.cpp
+++ b/src/mame/drivers/savia84.cpp
@@ -173,7 +173,7 @@ READ8_MEMBER( savia84_state::savia84_8255_portc_r ) // IN FA - read keyboard
MACHINE_CONFIG_START(savia84_state::savia84)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz / 2)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/sbasketb.cpp b/src/mame/drivers/sbasketb.cpp
index 340f60073b4..46f9d7c1641 100644
--- a/src/mame/drivers/sbasketb.cpp
+++ b/src/mame/drivers/sbasketb.cpp
@@ -199,7 +199,7 @@ MACHINE_CONFIG_START(sbasketb_state::sbasketb)
MCFG_CPU_PROGRAM_MAP(sbasketb_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sbasketb_state, vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz / 4) /* 3.5795 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181) / 4) /* 3.5795 MHz */
MCFG_CPU_PROGRAM_MAP(sbasketb_sound_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // B3
@@ -238,10 +238,10 @@ MACHINE_CONFIG_START(sbasketb_state::sbasketb)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("snsnd", SN76489, XTAL_14_31818MHz / 8)
+ MCFG_SOUND_ADD("snsnd", SN76489, XTAL(14'318'181) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* Schematics say 3.58MHz, but board uses 3.579545MHz xtal */
+ MCFG_SOUND_ADD("vlm", VLM5030, XTAL(3'579'545)) /* Schematics say 3.58MHz, but board uses 3.579545MHz xtal */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sbc6510.cpp b/src/mame/drivers/sbc6510.cpp
index be115f2187e..0eee789999d 100644
--- a/src/mame/drivers/sbc6510.cpp
+++ b/src/mame/drivers/sbc6510.cpp
@@ -267,10 +267,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(sbc6510_state::sbc6510)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6510, XTAL_1MHz)
+ MCFG_CPU_ADD("maincpu",M6510, XTAL(1'000'000))
MCFG_CPU_PROGRAM_MAP(sbc6510_mem)
- MCFG_CPU_ADD("videocpu",ATMEGA88, XTAL_16MHz)
+ MCFG_CPU_ADD("videocpu",ATMEGA88, XTAL(16'000'000))
// MCFG_DEVICE_DISABLE() // trips SLEEP opcode, needs to be emulated
MCFG_CPU_PROGRAM_MAP(sbc6510_video_mem)
MCFG_CPU_DATA_MAP(sbc6510_video_data)
@@ -285,13 +285,13 @@ MACHINE_CONFIG_START(sbc6510_state::sbc6510)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL_1MHz)
+ MCFG_SOUND_ADD("ay8910", AY8910, XTAL(1'000'000))
// Ports A and B connect to the IDE socket
MCFG_AY8910_PORT_A_READ_CB(READ8(sbc6510_state, psg_a_r)) // port A read
MCFG_AY8910_PORT_B_READ_CB(READ8(sbc6510_state, psg_b_r)) // port B read
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_DEVICE_ADD("cia6526", MOS6526, XTAL_1MHz)
+ MCFG_DEVICE_ADD("cia6526", MOS6526, XTAL(1'000'000))
MCFG_MOS6526_TOD(50)
MCFG_MOS6526_IRQ_CALLBACK(INPUTLINE("maincpu", M6510_IRQ_LINE))
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(sbc6510_state, key_w))
diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp
index 5c31883e29b..c7ad40f32d6 100644
--- a/src/mame/drivers/sbowling.cpp
+++ b/src/mame/drivers/sbowling.cpp
@@ -404,7 +404,7 @@ PALETTE_INIT_MEMBER(sbowling_state, sbowling)
}
MACHINE_CONFIG_START(sbowling_state::sbowling)
- MCFG_CPU_ADD("maincpu", I8080, XTAL_19_968MHz/10) /* ? */
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(19'968'000)/10) /* ? */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(port_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", sbowling_state, interrupt, "screen", 0, 1)
@@ -427,7 +427,7 @@ MACHINE_CONFIG_START(sbowling_state::sbowling)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_19_968MHz/16) /* ? */
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(19'968'000)/16) /* ? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp
index 86e72aa52ca..698cb5617fb 100644
--- a/src/mame/drivers/sbrain.cpp
+++ b/src/mame/drivers/sbrain.cpp
@@ -529,12 +529,12 @@ u32 sbrain_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, con
MACHINE_CONFIG_START(sbrain_state::sbrain)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(sbrain_mem)
MCFG_CPU_IO_MAP(sbrain_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sbrain_state, irq0_line_hold)
- MCFG_CPU_ADD("subcpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("subcpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(sbrain_submem)
MCFG_CPU_IO_MAP(sbrain_subio)
@@ -569,13 +569,13 @@ MACHINE_CONFIG_START(sbrain_state::sbrain)
MCFG_DEVICE_ADD("uart1", I8251, 0)
- MCFG_DEVICE_ADD("brg", COM8116, XTAL_5_0688MHz) // BR1941L
+ MCFG_DEVICE_ADD("brg", COM8116, XTAL(5'068'800)) // BR1941L
MCFG_COM8116_FR_HANDLER(DEVWRITELINE("uart0", i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart0", i8251_device, write_rxc))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE("uart1", i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart1", i8251_device, write_rxc))
- MCFG_FD1791_ADD("fdc", XTAL_16MHz / 16)
+ MCFG_FD1791_ADD("fdc", XTAL(16'000'000) / 16)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", sbrain_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", sbrain_floppies, "525dd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp
index 4e1f52ae1ca..ef9854bf966 100644
--- a/src/mame/drivers/sbrkout.cpp
+++ b/src/mame/drivers/sbrkout.cpp
@@ -105,7 +105,7 @@ public:
*
*************************************/
-#define MAIN_CLOCK XTAL_12_096MHz
+#define MAIN_CLOCK XTAL(12'096'000)
#define TIME_4V attotime::from_hz(MAIN_CLOCK/2/256/2/4)
diff --git a/src/mame/drivers/sc1.cpp b/src/mame/drivers/sc1.cpp
index 8a63f6ba4bc..0f292a90a79 100644
--- a/src/mame/drivers/sc1.cpp
+++ b/src/mame/drivers/sc1.cpp
@@ -173,7 +173,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(sc1_state::sc1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(sc1_mem)
MCFG_CPU_IO_MAP(sc1_io)
@@ -181,7 +181,7 @@ MACHINE_CONFIG_START(sc1_state::sc1)
MCFG_DEFAULT_LAYOUT(layout_sc1)
/* devices */
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(sc1_state, pio_port_a_w))
MCFG_Z80PIO_IN_PB_CB(READ8(sc1_state, pio_port_b_r))
diff --git a/src/mame/drivers/sc2.cpp b/src/mame/drivers/sc2.cpp
index 32bded96d5d..cb0611bc329 100644
--- a/src/mame/drivers/sc2.cpp
+++ b/src/mame/drivers/sc2.cpp
@@ -200,7 +200,7 @@ WRITE8_MEMBER( sc2_state::pio_port_b_w )
MACHINE_CONFIG_START(sc2_state::sc2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(sc2_mem)
MCFG_CPU_IO_MAP(sc2_io)
@@ -209,7 +209,7 @@ MACHINE_CONFIG_START(sc2_state::sc2)
MCFG_DEFAULT_LAYOUT(layout_sc2)
/* devices */
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_IN_PA_CB(READ8(sc2_state, pio_port_a_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(sc2_state, pio_port_a_w))
MCFG_Z80PIO_IN_PB_CB(READ8(sc2_state, pio_port_b_r))
diff --git a/src/mame/drivers/scopus.cpp b/src/mame/drivers/scopus.cpp
index 6263bf206ef..07b1570c3e0 100644
--- a/src/mame/drivers/scopus.cpp
+++ b/src/mame/drivers/scopus.cpp
@@ -169,12 +169,12 @@ READ8_MEMBER(sagitta180_state::memory_read_byte)
MACHINE_CONFIG_START(sagitta180_state::sagitta180)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_10MHz) /* guessed ! */
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(10'000'000)) /* guessed ! */
MCFG_CPU_PROGRAM_MAP(maincpu_map)
MCFG_CPU_IO_MAP(maincpu_io_map)
// MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("intlatch", i8212_device, inta_cb)
- MCFG_DEVICE_ADD("dma", I8257, XTAL_14_7456MHz) /* guessed xtal */
+ MCFG_DEVICE_ADD("dma", I8257, XTAL(14'745'600)) /* guessed xtal */
MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("crtc", i8275_device, dack_w))
MCFG_I8257_OUT_HRQ_CB(WRITELINE(sagitta180_state, hrq_w))
MCFG_I8257_IN_MEMR_CB(READ8(sagitta180_state, memory_read_byte))
diff --git a/src/mame/drivers/scregg.cpp b/src/mame/drivers/scregg.cpp
index 0ce22f498e0..ee22c8e3156 100644
--- a/src/mame/drivers/scregg.cpp
+++ b/src/mame/drivers/scregg.cpp
@@ -263,7 +263,7 @@ MACHINE_RESET_MEMBER(scregg_state,scregg)
MACHINE_CONFIG_START(scregg_state::dommy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/8)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(12'000'000)/8)
MCFG_CPU_PROGRAM_MAP(dommy_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("irq", scregg_state, scregg_interrupt, "screen", 0, 8)
@@ -272,7 +272,7 @@ MACHINE_CONFIG_START(scregg_state::dommy)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2, 384, 8, 248, 272, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2, 384, 8, 248, 272, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(scregg_state, screen_update_eggs)
MCFG_SCREEN_PALETTE("palette")
@@ -284,10 +284,10 @@ MACHINE_CONFIG_START(scregg_state::dommy)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_CONFIG_END
@@ -295,7 +295,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(scregg_state::scregg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/8)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(12'000'000)/8)
MCFG_CPU_PROGRAM_MAP(eggs_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("irq", scregg_state, scregg_interrupt, "screen", 0, 8)
@@ -304,7 +304,7 @@ MACHINE_CONFIG_START(scregg_state::scregg)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2, 384, 8, 248, 272, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2, 384, 8, 248, 272, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(scregg_state, screen_update_eggs)
MCFG_SCREEN_PALETTE("palette")
@@ -316,10 +316,10 @@ MACHINE_CONFIG_START(scregg_state::scregg)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/scv.cpp b/src/mame/drivers/scv.cpp
index 063470f5fba..7b37ec97988 100644
--- a/src/mame/drivers/scv.cpp
+++ b/src/mame/drivers/scv.cpp
@@ -655,7 +655,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(scv_state::scv)
- MCFG_CPU_ADD( "maincpu", UPD7801, XTAL_4MHz )
+ MCFG_CPU_ADD( "maincpu", UPD7801, XTAL(4'000'000) )
MCFG_CPU_PROGRAM_MAP( scv_mem )
MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(scv_state, porta_w))
MCFG_UPD7810_PORTB_READ_CB(READ8(scv_state, portb_r))
@@ -664,7 +664,7 @@ MACHINE_CONFIG_START(scv_state::scv)
/* Video chip is EPOCH TV-1 */
MCFG_SCREEN_ADD( "screen", RASTER )
- MCFG_SCREEN_RAW_PARAMS( XTAL_14_31818MHz/2, 456, 24, 24+192, 262, 23, 23+222 ) /* TODO: Verify */
+ MCFG_SCREEN_RAW_PARAMS( XTAL(14'318'181)/2, 456, 24, 24+192, 262, 23, 23+222 ) /* TODO: Verify */
MCFG_SCREEN_UPDATE_DRIVER(scv_state, screen_update_scv)
MCFG_SCREEN_PALETTE("palette")
@@ -672,9 +672,9 @@ MACHINE_CONFIG_START(scv_state::scv)
MCFG_PALETTE_ADD( "palette", 16 )
MCFG_PALETTE_INIT_OWNER(scv_state, scv)
- /* Sound is generated by UPD1771C clocked at XTAL_6MHz */
+ /* Sound is generated by UPD1771C clocked at XTAL(6'000'000) */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD( "upd1771c", UPD1771C, XTAL_6MHz )
+ MCFG_SOUND_ADD( "upd1771c", UPD1771C, XTAL(6'000'000) )
MCFG_UPD1771_ACK_HANDLER(WRITELINE(scv_state, upd1771_ack_w))
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
@@ -691,7 +691,7 @@ MACHINE_CONFIG_DERIVED(scv_state::scv_pal, scv)
/* Video chip is EPOCH TV-1A */
MCFG_SCREEN_MODIFY( "screen" )
- MCFG_SCREEN_RAW_PARAMS( XTAL_13_4MHz/2, 456, 24, 24+192, 342, 23, 23+222 ) /* TODO: Verify */
+ MCFG_SCREEN_RAW_PARAMS( XTAL(13'400'000)/2, 456, 24, 24+192, 342, 23, 23+222 ) /* TODO: Verify */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp
index 90217e32b2d..53bcd35032b 100644
--- a/src/mame/drivers/sderby.cpp
+++ b/src/mame/drivers/sderby.cpp
@@ -695,7 +695,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sderby_state::shinygld)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) // verified
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) // verified
MCFG_CPU_PROGRAM_MAP(shinygld_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sderby_state, irq4_line_hold)
@@ -714,7 +714,7 @@ MACHINE_CONFIG_START(sderby_state::shinygld)
MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) /* clock frequency & pin 7 verified */
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) /* clock frequency & pin 7 verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sderby2.cpp b/src/mame/drivers/sderby2.cpp
index 81fcb1d0d6e..c2cbb5d1d3b 100644
--- a/src/mame/drivers/sderby2.cpp
+++ b/src/mame/drivers/sderby2.cpp
@@ -286,12 +286,12 @@ void sderby2_state::machine_reset()
}
MACHINE_CONFIG_START(sderby2_state::sderby2)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(main_program_map)
MCFG_CPU_IO_MAP(main_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sderby2_state, irq0_line_hold)
- MCFG_CPU_ADD("subcpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("subcpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(sub_program_map)
MCFG_CPU_IO_MAP(sub_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sderby2_state, irq0_line_hold)
diff --git a/src/mame/drivers/sdk80.cpp b/src/mame/drivers/sdk80.cpp
index fdc474c3414..261d51b5344 100644
--- a/src/mame/drivers/sdk80.cpp
+++ b/src/mame/drivers/sdk80.cpp
@@ -118,7 +118,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(sdk80_state::sdk80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL_18_432MHz/9)
+ MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'432'000)/9)
MCFG_CPU_PROGRAM_MAP(sdk80_mem)
MCFG_CPU_IO_MAP(sdk80_io)
@@ -136,7 +136,7 @@ MACHINE_CONFIG_START(sdk80_state::sdk80)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_cts))
MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal)
- MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL_18_432MHz/60)
+ MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL(18'432'000)/60)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(sdk80_state, usart_clock_tick))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sdk85.cpp b/src/mame/drivers/sdk85.cpp
index 8ea81ab3d12..fb774272355 100644
--- a/src/mame/drivers/sdk85.cpp
+++ b/src/mame/drivers/sdk85.cpp
@@ -144,24 +144,24 @@ READ8_MEMBER( sdk85_state::kbd_r )
MACHINE_CONFIG_START(sdk85_state::sdk85)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'144'000))
MCFG_CPU_PROGRAM_MAP(sdk85_mem)
MCFG_CPU_IO_MAP(sdk85_io)
- MCFG_DEVICE_ADD("romio", I8355, XTAL_6_144MHz / 2) // Monitor ROM (A14)
+ MCFG_DEVICE_ADD("romio", I8355, XTAL(6'144'000) / 2) // Monitor ROM (A14)
- MCFG_DEVICE_ADD("expromio", I8355, XTAL_6_144MHz / 2) // Expansion ROM (A15)
+ MCFG_DEVICE_ADD("expromio", I8355, XTAL(6'144'000) / 2) // Expansion ROM (A15)
- MCFG_DEVICE_ADD("ramio", I8155, XTAL_6_144MHz / 2) // Basic RAM (A16)
+ MCFG_DEVICE_ADD("ramio", I8155, XTAL(6'144'000) / 2) // Basic RAM (A16)
MCFG_I8155_OUT_TIMEROUT_CB(INPUTLINE("maincpu", I8085_TRAP_LINE))
- MCFG_DEVICE_ADD("expramio", I8155, XTAL_6_144MHz / 2) // Expansion RAM (A17)
+ MCFG_DEVICE_ADD("expramio", I8155, XTAL(6'144'000) / 2) // Expansion RAM (A17)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_sdk85)
/* Devices */
- MCFG_DEVICE_ADD("kdc", I8279, XTAL_6_144MHz / 2) // Keyboard/Display Controller (A13)
+ MCFG_DEVICE_ADD("kdc", I8279, XTAL(6'144'000) / 2) // Keyboard/Display Controller (A13)
MCFG_I8279_OUT_IRQ_CB(INPUTLINE("maincpu", I8085_RST55_LINE)) // irq
MCFG_I8279_OUT_SL_CB(WRITE8(sdk85_state, scanlines_w)) // scan SL lines
MCFG_I8279_OUT_DISP_CB(WRITE8(sdk85_state, digit_w)) // display A&B
diff --git a/src/mame/drivers/sdk86.cpp b/src/mame/drivers/sdk86.cpp
index dd129214ada..96cde51f5f2 100644
--- a/src/mame/drivers/sdk86.cpp
+++ b/src/mame/drivers/sdk86.cpp
@@ -139,7 +139,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(sdk86_state::sdk86)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL_14_7456MHz/3) /* divided down by i8284 clock generator; jumper selection allows it to be slowed to 2.5MHz, hence changing divider from 3 to 6 */
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(14'745'600)/3) /* divided down by i8284 clock generator; jumper selection allows it to be slowed to 2.5MHz, hence changing divider from 3 to 6 */
MCFG_CPU_PROGRAM_MAP(sdk86_mem)
MCFG_CPU_IO_MAP(sdk86_io)
@@ -157,7 +157,7 @@ MACHINE_CONFIG_START(sdk86_state::sdk86)
MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr))
MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal)
- MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL_14_7456MHz/3/16)
+ MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL(14'745'600)/3/16)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(I8251_TAG, i8251_device, write_rxc))
diff --git a/src/mame/drivers/seattlecmp.cpp b/src/mame/drivers/seattlecmp.cpp
index 10fd62db039..f6f5d4f6537 100644
--- a/src/mame/drivers/seattlecmp.cpp
+++ b/src/mame/drivers/seattlecmp.cpp
@@ -100,7 +100,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(seattle_comp_state::seattle)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL_24MHz / 3) // 8 MHz or 4 MHz selectable
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(24'000'000) / 3) // 8 MHz or 4 MHz selectable
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic1", pic8259_device, inta_cb)
@@ -112,7 +112,7 @@ MACHINE_CONFIG_START(seattle_comp_state::seattle)
MCFG_DEVICE_ADD("pic2", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic1", pic8259_device, ir1_w))
- MCFG_DEVICE_ADD("stc", AM9513, XTAL_4MHz) // dedicated XTAL
+ MCFG_DEVICE_ADD("stc", AM9513, XTAL(4'000'000)) // dedicated XTAL
MCFG_AM9513_OUT2_CALLBACK(DEVWRITELINE("pic2", pic8259_device, ir0_w))
MCFG_AM9513_OUT3_CALLBACK(DEVWRITELINE("pic2", pic8259_device, ir4_w))
MCFG_AM9513_OUT4_CALLBACK(DEVWRITELINE("pic2", pic8259_device, ir7_w))
@@ -121,7 +121,7 @@ MACHINE_CONFIG_START(seattle_comp_state::seattle)
MCFG_AM9513_FOUT_CALLBACK(DEVWRITELINE("stc", am9513_device, source1_w))
// FOUT not shown on schematics, which inexplicably have Source 1 tied to Gate 5
- MCFG_DEVICE_ADD("uart", I8251, XTAL_24MHz / 12) // CLOCK on line 49
+ MCFG_DEVICE_ADD("uart", I8251, XTAL(24'000'000) / 12) // CLOCK on line 49
MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp
index 408acd055a7..bc3c5d17c4b 100644
--- a/src/mame/drivers/segac2.cpp
+++ b/src/mame/drivers/segac2.cpp
@@ -87,8 +87,8 @@
#include "speaker.h"
-#define XL1_CLOCK XTAL_640kHz
-#define XL2_CLOCK XTAL_53_693175MHz
+#define XL1_CLOCK XTAL(640'000)
+#define XL2_CLOCK XTAL(53'693'175)
#define LOG_PROTECTION 1
diff --git a/src/mame/drivers/segae.cpp b/src/mame/drivers/segae.cpp
index 06c87049faf..a3271606e6f 100644
--- a/src/mame/drivers/segae.cpp
+++ b/src/mame/drivers/segae.cpp
@@ -867,7 +867,7 @@ uint32_t systeme_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma
}
MACHINE_CONFIG_START(systeme_state::systeme)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/2) /* Z80B @ 5.3693Mhz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
MCFG_CPU_PROGRAM_MAP(systeme_map)
MCFG_CPU_IO_MAP(io_map)
@@ -876,7 +876,7 @@ MACHINE_CONFIG_START(systeme_state::systeme)
MCFG_I8255_TRISTATE_PORTB_CB(CONSTANT(0))
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_10_738635MHz/2, \
+ MCFG_SCREEN_RAW_PARAMS(XTAL(10'738'635)/2, \
sega315_5124_device::WIDTH , sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH, sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256, \
sega315_5124_device::HEIGHT_NTSC, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_192_TBORDER_HEIGHT, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_192_TBORDER_HEIGHT + 192)
MCFG_SCREEN_UPDATE_DRIVER(systeme_state, screen_update)
@@ -893,10 +893,10 @@ MACHINE_CONFIG_START(systeme_state::systeme)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SEGAPSG, XTAL_10_738635MHz/3)
+ MCFG_SOUND_ADD("sn1", SEGAPSG, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SEGAPSG, XTAL_10_738635MHz/3)
+ MCFG_SOUND_ADD("sn2", SEGAPSG, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -922,14 +922,14 @@ MACHINE_CONFIG_DERIVED(systeme_state::ridleofp, systeme)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(systeme_state::systemex, systeme)
- MCFG_CPU_REPLACE("maincpu", MC8123, XTAL_10_738635MHz/2) /* Z80B @ 5.3693Mhz */
+ MCFG_CPU_REPLACE("maincpu", MC8123, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
MCFG_CPU_PROGRAM_MAP(systeme_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(systeme_state::systemex_315_5177, systeme)
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5177, XTAL_10_738635MHz/2) /* Z80B @ 5.3693Mhz */
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5177, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
MCFG_CPU_PROGRAM_MAP(systeme_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
@@ -937,7 +937,7 @@ MACHINE_CONFIG_DERIVED(systeme_state::systemex_315_5177, systeme)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(systeme_state::systemeb, systeme)
- MCFG_CPU_REPLACE("maincpu", MC8123, XTAL_10_738635MHz/2) /* Z80B @ 5.3693Mhz */
+ MCFG_CPU_REPLACE("maincpu", MC8123, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
MCFG_CPU_PROGRAM_MAP(systeme_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(banked_decrypted_opcodes_map)
diff --git a/src/mame/drivers/segam1.cpp b/src/mame/drivers/segam1.cpp
index 49354fa25b4..38c0635e384 100644
--- a/src/mame/drivers/segam1.cpp
+++ b/src/mame/drivers/segam1.cpp
@@ -338,7 +338,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(segam1_state::segam1)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2)
MCFG_CPU_PROGRAM_MAP(segam1_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", segam1_state, irq4_line_hold)
diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp
index 7298b9c99f9..daa11c8c850 100644
--- a/src/mame/drivers/segaorun.cpp
+++ b/src/mame/drivers/segaorun.cpp
@@ -287,9 +287,9 @@ Notes:
// CONSTANTS
//**************************************************************************
-const uint32_t MASTER_CLOCK = XTAL_40MHz;
-const uint32_t SOUND_CLOCK = XTAL_16MHz;
-const uint32_t MASTER_CLOCK_25MHz = XTAL_25_1748MHz;
+const auto MASTER_CLOCK = XTAL(40'000'000);
+const auto SOUND_CLOCK = XTAL(16'000'000);
+const auto MASTER_CLOCK_25MHz = XTAL(25'174'800);
//**************************************************************************
// PPI READ/WRITE CALLBACKS
diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp
index e56893d7a78..d1135182ca0 100644
--- a/src/mame/drivers/segas16b.cpp
+++ b/src/mame/drivers/segas16b.cpp
@@ -881,9 +881,9 @@ S11 S13 S15 S17 |EPR12194 - - - EPR12195 - -
// CONSTANTS
//**************************************************************************
-#define MASTER_CLOCK_10MHz XTAL_10MHz
-#define MASTER_CLOCK_8MHz XTAL_8MHz
-#define MASTER_CLOCK_25MHz XTAL_25_1748MHz
+#define MASTER_CLOCK_10MHz XTAL(10'000'000)
+#define MASTER_CLOCK_8MHz XTAL(8'000'000)
+#define MASTER_CLOCK_25MHz XTAL(25'174'800)
@@ -3878,11 +3878,11 @@ MACHINE_CONFIG_DERIVED(segas16b_state::fpointbla, fpointbl)
MACHINE_CONFIG_START(segas16b_state::lockonph)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // ?
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // ?
MCFG_CPU_PROGRAM_MAP(lockonph_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_16MHz/4) // ?
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(16'000'000)/4) // ?
MCFG_CPU_PROGRAM_MAP(lockonph_sound_map)
MCFG_CPU_IO_MAP(lockonph_sound_iomap)
@@ -3909,12 +3909,12 @@ MACHINE_CONFIG_START(segas16b_state::lockonph)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_16MHz/4) // ??
+ MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) // ??
// MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) // does set up the timer, but end up with no sound?
MCFG_SOUND_ROUTE(0, "mono", 0.5)
MCFG_SOUND_ROUTE(1, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_LOW) // clock / pin not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_LOW) // clock / pin not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
@@ -3935,7 +3935,7 @@ MACHINE_CONFIG_DERIVED(segas16b_state::atomicp, system16b) // 10MHz CPU Clock ve
// sound hardware
MCFG_DEVICE_REMOVE("soundlatch")
MCFG_DEVICE_REMOVE("ym2151")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_20MHz/4) // 20MHz OSC divided by 4 (verified)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(20'000'000)/4) // 20MHz OSC divided by 4 (verified)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_REMOVE("upd")
diff --git a/src/mame/drivers/segas24.cpp b/src/mame/drivers/segas24.cpp
index 617d51c5e32..cbc3aa906da 100644
--- a/src/mame/drivers/segas24.cpp
+++ b/src/mame/drivers/segas24.cpp
@@ -352,8 +352,8 @@ Notes:
#include "speaker.h"
-#define MASTER_CLOCK XTAL_20MHz
-#define VIDEO_CLOCK XTAL_32MHz
+#define MASTER_CLOCK XTAL(20'000'000)
+#define VIDEO_CLOCK XTAL(32'000'000)
#define TIMER_CLOCK (VIDEO_CLOCK/4)
#define HSYNC_CLOCK (VIDEO_CLOCK/2/656.0)
/* TODO: understand why divisors doesn't match at all with the reference */
@@ -692,7 +692,7 @@ WRITE8_MEMBER( segas24_state::frc_mode_w )
READ8_MEMBER( segas24_state::frc_r )
{
- int32_t result = (frc_cnt_timer->time_elapsed() * (frc_mode ? FRC_CLOCK_MODE1 : FRC_CLOCK_MODE0)).as_double();
+ int32_t result = (frc_cnt_timer->time_elapsed() * (frc_mode ? FRC_CLOCK_MODE1 : FRC_CLOCK_MODE0).dvalue()).as_double();
result %= ((frc_mode) ? 0x67 : 0x100);
@@ -760,8 +760,8 @@ void segas24_state::irq_timer_sync()
break;
case 1: {
// Don't remove the floor(), the value may be slightly negative
- int ppos = floor((irq_synctime - irq_vsynctime).as_double() * HSYNC_CLOCK);
- int cpos = floor((ctime - irq_vsynctime).as_double() * HSYNC_CLOCK);
+ int ppos = floor((irq_synctime - irq_vsynctime).as_double() * HSYNC_CLOCK.dvalue());
+ int cpos = floor((ctime - irq_vsynctime).as_double() * HSYNC_CLOCK.dvalue());
irq_tval += cpos-ppos;
break;
}
@@ -769,8 +769,8 @@ void segas24_state::irq_timer_sync()
fatalerror("segas24_state::irq_timer_sync - case 2\n");
}
case 3: {
- int ppos = floor((irq_synctime - irq_vsynctime).as_double() * TIMER_CLOCK);
- int cpos = floor((ctime - irq_vsynctime).as_double() * TIMER_CLOCK);
+ int ppos = floor((irq_synctime - irq_vsynctime).as_double() * TIMER_CLOCK.dvalue());
+ int cpos = floor((ctime - irq_vsynctime).as_double() * TIMER_CLOCK.dvalue());
irq_tval += cpos-ppos;
break;
}
diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp
index 83fe2b8ab6f..6c88d4b720b 100644
--- a/src/mame/drivers/segas32.cpp
+++ b/src/mame/drivers/segas32.cpp
@@ -589,8 +589,8 @@ segas32_state::segas32_state(const machine_config &mconfig, device_type type, co
*************************************/
#define MASTER_CLOCK 32215900
-#define RFC_CLOCK XTAL_50MHz
-#define MULTI32_CLOCK XTAL_40MHz
+#define RFC_CLOCK XTAL(50'000'000)
+#define MULTI32_CLOCK XTAL(40'000'000)
#define TIMER_0_CLOCK ((MASTER_CLOCK/2)/2048) /* confirmed */
#define TIMER_1_CLOCK ((RFC_CLOCK/16)/256) /* confirmed */
diff --git a/src/mame/drivers/segaufo.cpp b/src/mame/drivers/segaufo.cpp
index 624f4c8fcbf..5906197f2de 100644
--- a/src/mame/drivers/segaufo.cpp
+++ b/src/mame/drivers/segaufo.cpp
@@ -755,14 +755,14 @@ void ufo_state::machine_start()
MACHINE_CONFIG_START(ufo_state::newufo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2)
MCFG_CPU_PROGRAM_MAP(ufo_map)
MCFG_CPU_IO_MAP(ufo_portmap)
MCFG_TIMER_DRIVER_ADD_PERIODIC("motor_timer", ufo_state, simulate_xyz, attotime::from_hz(MOTOR_SPEED))
MCFG_TIMER_DRIVER_ADD_PERIODIC("update_timer", ufo_state, update_info, attotime::from_hz(60))
- MCFG_DEVICE_ADD("io1", SEGA_315_5296, XTAL_16MHz)
+ MCFG_DEVICE_ADD("io1", SEGA_315_5296, XTAL(16'000'000))
// all ports set to input
MCFG_315_5296_IN_PORTA_CB(READ8(ufo_state, crane_limits_r))
MCFG_315_5296_IN_PORTB_CB(READ8(ufo_state, crane_limits_r))
@@ -771,7 +771,7 @@ MACHINE_CONFIG_START(ufo_state::newufo)
MCFG_315_5296_IN_PORTG_CB(IOPORT("DSW2"))
MCFG_315_5296_IN_PORTH_CB(IOPORT("IN2"))
- MCFG_DEVICE_ADD("io2", SEGA_315_5296, XTAL_16MHz)
+ MCFG_DEVICE_ADD("io2", SEGA_315_5296, XTAL(16'000'000))
// all ports set to output
MCFG_315_5296_OUT_PORTA_CB(WRITE8(ufo_state, stepper_w))
MCFG_315_5296_OUT_PORTB_CB(WRITE8(ufo_state, cp_lamps_w))
@@ -781,12 +781,12 @@ MACHINE_CONFIG_START(ufo_state::newufo)
MCFG_315_5296_OUT_PORTF_CB(WRITE8(ufo_state, crane_xyz_w))
MCFG_315_5296_OUT_PORTG_CB(WRITE8(ufo_state, ufo_lamps_w))
- MCFG_DEVICE_ADD("pit", PIT8254, XTAL_16MHz/2) // uPD71054C, configuration is unknown
- MCFG_PIT8253_CLK0(XTAL_16MHz/2/256)
+ MCFG_DEVICE_ADD("pit", PIT8254, XTAL(16'000'000)/2) // uPD71054C, configuration is unknown
+ MCFG_PIT8253_CLK0(XTAL(16'000'000)/2/256)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(ufo_state, pit_out0))
- MCFG_PIT8253_CLK1(XTAL_16MHz/2/256)
+ MCFG_PIT8253_CLK1(XTAL(16'000'000)/2/256)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(ufo_state, pit_out1))
- MCFG_PIT8253_CLK2(XTAL_16MHz/2/256)
+ MCFG_PIT8253_CLK2(XTAL(16'000'000)/2/256)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(ufo_state, pit_out2))
/* no video! */
@@ -794,7 +794,7 @@ MACHINE_CONFIG_START(ufo_state::newufo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym", YM3438, XTAL_16MHz/2)
+ MCFG_SOUND_ADD("ym", YM3438, XTAL(16'000'000)/2)
MCFG_YM2612_IRQ_HANDLER(INPUTLINE("maincpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp
index a86354e3a6d..538751e8522 100644
--- a/src/mame/drivers/segaxbd.cpp
+++ b/src/mame/drivers/segaxbd.cpp
@@ -440,8 +440,8 @@ public:
// CONSTANTS
//**************************************************************************
-const uint32_t MASTER_CLOCK = XTAL_50MHz;
-const uint32_t SOUND_CLOCK = XTAL_16MHz;
+const auto MASTER_CLOCK = XTAL(50'000'000);
+const auto SOUND_CLOCK = XTAL(16'000'000);
@@ -1921,11 +1921,11 @@ MACHINE_CONFIG_START(segaxbd_smgp_fd1094_state::device_add_mconfig)
MCFG_CPU_PROGRAM_MAP(smgp_sound2_map)
MCFG_CPU_IO_MAP(smgp_sound2_portmap)
- MCFG_CPU_ADD("commcpu", Z80, XTAL_16MHz/2) // Z80E
+ MCFG_CPU_ADD("commcpu", Z80, XTAL(16'000'000)/2) // Z80E
MCFG_CPU_PROGRAM_MAP(smgp_comm_map)
MCFG_CPU_IO_MAP(smgp_comm_portmap)
- MCFG_CPU_ADD("motorcpu", Z80, XTAL_16MHz/2) // not verified
+ MCFG_CPU_ADD("motorcpu", Z80, XTAL(16'000'000)/2) // not verified
MCFG_CPU_PROGRAM_MAP(smgp_airdrive_map)
MCFG_CPU_IO_MAP(smgp_airdrive_portmap)
@@ -1962,11 +1962,11 @@ MACHINE_CONFIG_START(segaxbd_smgp_state::device_add_mconfig)
MCFG_CPU_PROGRAM_MAP(smgp_sound2_map)
MCFG_CPU_IO_MAP(smgp_sound2_portmap)
- MCFG_CPU_ADD("commcpu", Z80, XTAL_16MHz/2) // Z80E
+ MCFG_CPU_ADD("commcpu", Z80, XTAL(16'000'000)/2) // Z80E
MCFG_CPU_PROGRAM_MAP(smgp_comm_map)
MCFG_CPU_IO_MAP(smgp_comm_portmap)
- MCFG_CPU_ADD("motorcpu", Z80, XTAL_16MHz/2) // not verified
+ MCFG_CPU_ADD("motorcpu", Z80, XTAL(16'000'000)/2) // not verified
MCFG_CPU_PROGRAM_MAP(smgp_airdrive_map)
MCFG_CPU_IO_MAP(smgp_airdrive_portmap)
diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp
index 20840aee79a..fc1ae0dea6b 100644
--- a/src/mame/drivers/segaybd.cpp
+++ b/src/mame/drivers/segaybd.cpp
@@ -1389,7 +1389,7 @@ MACHINE_CONFIG_DERIVED(segaybd_state::yboard_link, yboard)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(main_map_link)
- MCFG_CPU_ADD("linkcpu", Z80, XTAL_16MHz/2 ) // 8 Mhz
+ MCFG_CPU_ADD("linkcpu", Z80, XTAL(16'000'000)/2 ) // 8 Mhz
MCFG_CPU_PROGRAM_MAP(link_map)
MCFG_CPU_IO_MAP(link_portmap)
@@ -1401,7 +1401,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(segaybd_state::yboard_deluxe, yboard)
// basic machine hardware
- MCFG_CPU_ADD("motorcpu", Z80, XTAL_16MHz/2 ) // 8 Mhz(guessed)
+ MCFG_CPU_ADD("motorcpu", Z80, XTAL(16'000'000)/2 ) // 8 Mhz(guessed)
MCFG_CPU_PROGRAM_MAP(motor_map)
// MCFG_CPU_IO_MAP(motor_portmap)
diff --git a/src/mame/drivers/seibucats.cpp b/src/mame/drivers/seibucats.cpp
index 0ed63c48c5d..47e90aa6c24 100644
--- a/src/mame/drivers/seibucats.cpp
+++ b/src/mame/drivers/seibucats.cpp
@@ -84,8 +84,8 @@
#include "speaker.h"
// TBD, assume same as Seibu SPI
-#define MAIN_CLOCK (XTAL_50MHz/2)
-#define PIXEL_CLOCK (XTAL_28_63636MHz/4)
+#define MAIN_CLOCK (XTAL(50'000'000)/2)
+#define PIXEL_CLOCK (XTAL(28'636'363)/4)
#define SPI_HTOTAL (448)
#define SPI_HBEND (0)
@@ -301,7 +301,7 @@ MACHINE_CONFIG_START(seibucats_state::seibucats)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
- //MCFG_JRC6355E_ADD("rtc", XTAL_32_768kHz)
+ //MCFG_JRC6355E_ADD("rtc", XTAL(32'768))
MCFG_DEVICE_ADD("usart1", I8251, 0)
MCFG_DEVICE_ADD("usart2", I8251, 0)
@@ -321,7 +321,7 @@ MACHINE_CONFIG_START(seibucats_state::seibucats)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_384MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'384'000))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp
index 7d19f798ce8..3f24a44085b 100644
--- a/src/mame/drivers/seibuspi.cpp
+++ b/src/mame/drivers/seibuspi.cpp
@@ -893,7 +893,7 @@ Notes:
// default values written to CRTC (note: SYS386F does not have this chip)
-#define PIXEL_CLOCK (XTAL_28_63636MHz/4)
+#define PIXEL_CLOCK (XTAL(28'636'363)/4)
#define SPI_HTOTAL (448)
#define SPI_HBEND (0)
@@ -1866,12 +1866,12 @@ MACHINE_RESET_MEMBER(seibuspi_state,spi)
MACHINE_CONFIG_START(seibuspi_state::spi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I386, XTAL_50MHz/2) // AMD or Intel 386DX, 25MHz
+ MCFG_CPU_ADD("maincpu", I386, XTAL(50'000'000)/2) // AMD or Intel 386DX, 25MHz
MCFG_CPU_PROGRAM_MAP(spi_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", seibuspi_state, spi_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(seibuspi_state,spi_irq_callback)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_28_63636MHz/4) // Z84C0008PEC, 7.159MHz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'636'363)/4) // Z84C0008PEC, 7.159MHz
MCFG_CPU_PROGRAM_MAP(spi_soundmap)
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -1904,7 +1904,7 @@ MACHINE_CONFIG_START(seibuspi_state::spi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymf", YMF271, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymf", YMF271, XTAL(16'934'400))
MCFG_YMF271_IRQ_HANDLER(WRITELINE(seibuspi_state, ymf_irqhandler))
MCFG_YMF271_EXT_READ_HANDLER(READ8(seibuspi_state, flashrom_read))
MCFG_YMF271_EXT_WRITE_HANDLER(WRITE8(seibuspi_state, flashrom_write))
@@ -1951,7 +1951,7 @@ MACHINE_CONFIG_DERIVED(seibuspi_state::sxx2e, spi)
MCFG_DEVICE_REMOVE("soundfifo2")
/* sound hardware */
- MCFG_SOUND_REPLACE("ymf", YMF271, XTAL_16_9344MHz)
+ MCFG_SOUND_REPLACE("ymf", YMF271, XTAL(16'934'400))
MCFG_YMF271_IRQ_HANDLER(WRITELINE(seibuspi_state, ymf_irqhandler))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
@@ -1976,13 +1976,13 @@ MACHINE_CONFIG_DERIVED(seibuspi_state::sxx2g, sxx2f) // clocks differ, but other
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu") // AMD AM386DX/DX-40, 28.63636MHz
- MCFG_CPU_CLOCK(XTAL_28_63636MHz)
+ MCFG_CPU_CLOCK(XTAL(28'636'363))
MCFG_CPU_MODIFY("audiocpu") // Z84C0004PCS, 4.9152MHz
- MCFG_CPU_CLOCK(XTAL_4_9152MHz)
+ MCFG_CPU_CLOCK(XTAL(4'915'200))
/* sound hardware */
- MCFG_SOUND_REPLACE("ymf", YMF271, XTAL_16_384MHz) // 16.384MHz(!)
+ MCFG_SOUND_REPLACE("ymf", YMF271, XTAL(16'384'000)) // 16.384MHz(!)
MCFG_YMF271_IRQ_HANDLER(WRITELINE(seibuspi_state, ymf_irqhandler))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
@@ -1995,7 +1995,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seibuspi_state::sys386i)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I386, XTAL_40MHz) // AMD 386DX, 40MHz
+ MCFG_CPU_ADD("maincpu", I386, XTAL(40'000'000)) // AMD 386DX, 40MHz
MCFG_CPU_PROGRAM_MAP(sys386i_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", seibuspi_state, spi_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(seibuspi_state,spi_irq_callback)
@@ -2020,10 +2020,10 @@ MACHINE_CONFIG_START(seibuspi_state::sys386i)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_28_63636MHz/20, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL(28'636'363)/20, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki2", XTAL_28_63636MHz/20, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL(28'636'363)/20, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -2052,7 +2052,7 @@ DRIVER_INIT_MEMBER(seibuspi_state,sys386f)
MACHINE_CONFIG_START(seibuspi_state::sys386f)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I386, XTAL_50MHz/2) // Intel i386DX, 25MHz
+ MCFG_CPU_ADD("maincpu", I386, XTAL(50'000'000)/2) // Intel i386DX, 25MHz
MCFG_CPU_PROGRAM_MAP(sys386f_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", seibuspi_state, spi_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(seibuspi_state,spi_irq_callback)
@@ -2076,7 +2076,7 @@ MACHINE_CONFIG_START(seibuspi_state::sys386f)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_384MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'384'000))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/seicross.cpp b/src/mame/drivers/seicross.cpp
index 5e24bbe7a1c..ad3bd1ad4e1 100644
--- a/src/mame/drivers/seicross.cpp
+++ b/src/mame/drivers/seicross.cpp
@@ -393,12 +393,12 @@ INTERRUPT_GEN_MEMBER(seicross_state::vblank_irq)
MACHINE_CONFIG_START(seicross_state::no_nvram)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz / 6) /* D780C, 3.072 MHz? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000) / 6) /* D780C, 3.072 MHz? */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", seicross_state, vblank_irq)
- MCFG_CPU_ADD("mcu", NSC8105, XTAL_18_432MHz / 6) /* ??? */
+ MCFG_CPU_ADD("mcu", NSC8105, XTAL(18'432'000) / 6) /* ??? */
MCFG_CPU_PROGRAM_MAP(mcu_no_nvram_map)
MCFG_QUANTUM_TIME(attotime::from_hz(1200)) /* 20 CPU slices per frame - an high value to ensure proper */
@@ -422,7 +422,7 @@ MACHINE_CONFIG_START(seicross_state::no_nvram)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz / 12)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(18'432'000) / 12)
MCFG_AY8910_PORT_B_READ_CB(READ8(seicross_state, portB_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(seicross_state, portB_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp
index cb8a29d507a..06de38e6526 100644
--- a/src/mame/drivers/seicupbl.cpp
+++ b/src/mame/drivers/seicupbl.cpp
@@ -24,7 +24,7 @@
#include "speaker.h"
-#define MAIN_CLOCK XTAL_8MHz
+#define MAIN_CLOCK XTAL(8'000'000)
class seicupbl_state : public driver_device
{
diff --git a/src/mame/drivers/selz80.cpp b/src/mame/drivers/selz80.cpp
index 9a2858b6644..c3edd619aeb 100644
--- a/src/mame/drivers/selz80.cpp
+++ b/src/mame/drivers/selz80.cpp
@@ -202,7 +202,7 @@ READ8_MEMBER( selz80_state::kbd_r )
MACHINE_CONFIG_START(selz80_state::selz80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) // it's actually a 5MHz XTAL with a NEC uPD780C-1 cpu
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000)) // it's actually a 5MHz XTAL with a NEC uPD780C-1 cpu
MCFG_CPU_PROGRAM_MAP(selz80_mem)
MCFG_CPU_IO_MAP(selz80_io)
MCFG_MACHINE_RESET_OVERRIDE(selz80_state, selz80 )
diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp
index 71f1ba7ec6a..d46267303af 100644
--- a/src/mame/drivers/seta.cpp
+++ b/src/mame/drivers/seta.cpp
@@ -7853,11 +7853,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::downtown)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(downtown_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("m_scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
- MCFG_CPU_ADD("sub", M65C02, XTAL_16MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("sub", M65C02, XTAL(16'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(downtown_sub_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("s_scantimer", seta_state, seta_sub_interrupt, "screen", 0, 1)
@@ -7988,12 +7988,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::calibr50)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(calibr50_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, calibr50_interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_CPU_ADD("sub", M65C02, XTAL_16MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("sub", M65C02, XTAL(16'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(calibr50_sub_map)
MCFG_CPU_PERIODIC_INT_DRIVER(seta_state, irq0_line_assert, 4*60) // IRQ: 4/frame
@@ -8282,7 +8282,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::daioh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16 MHz, MC68000-16, Verified from PCB */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16 MHz, MC68000-16, Verified from PCB */
MCFG_CPU_PROGRAM_MAP(daioh_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
@@ -8307,7 +8307,7 @@ MACHINE_CONFIG_START(seta_state::daioh)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, XTAL_16MHz) /* 16 MHz, Verified from PCB audio */
+ MCFG_SOUND_ADD("x1snd", X1_010, XTAL(16'000'000)) /* 16 MHz, Verified from PCB audio */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8319,7 +8319,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::daiohp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16 MHz, MC68000-16, Verified from PCB */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16 MHz, MC68000-16, Verified from PCB */
MCFG_CPU_PROGRAM_MAP(daiohp_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
@@ -8344,7 +8344,7 @@ MACHINE_CONFIG_START(seta_state::daiohp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, XTAL_16MHz) /* 16 MHz, Verified from PCB audio */
+ MCFG_SOUND_ADD("x1snd", X1_010, XTAL(16'000'000)) /* 16 MHz, Verified from PCB audio */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8448,7 +8448,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(setaroul_state::interrupt)
MACHINE_CONFIG_START(setaroul_state::setaroul)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* 8 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_CPU_PROGRAM_MAP(setaroul_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", setaroul_state, interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -8462,7 +8462,7 @@ MACHINE_CONFIG_START(setaroul_state::setaroul)
MCFG_NVRAM_ADD_RANDOM_FILL("nvram")
/* devices */
- MCFG_DEVICE_ADD("rtc", UPD4992, XTAL_32_768kHz) // ! Actually D4911C !
+ MCFG_DEVICE_ADD("rtc", UPD4992, XTAL(32'768)) // ! Actually D4911C !
MCFG_DEVICE_ADD ("acia0", ACIA6850, 0)
MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(150), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
@@ -8486,7 +8486,7 @@ MACHINE_CONFIG_START(setaroul_state::setaroul)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("x1snd", X1_010, XTAL_16MHz) /* 16 MHz */
+ MCFG_SOUND_ADD("x1snd", X1_010, XTAL(16'000'000)) /* 16 MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -9675,7 +9675,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(jockeyc_state::interrupt)
MACHINE_CONFIG_START(jockeyc_state::jockeyc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // TMP68000N-8
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // TMP68000N-8
MCFG_CPU_PROGRAM_MAP(jockeyc_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", jockeyc_state, interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -9688,7 +9688,7 @@ MACHINE_CONFIG_START(jockeyc_state::jockeyc)
MCFG_NVRAM_ADD_RANDOM_FILL("nvram")
/* devices */
- MCFG_DEVICE_ADD("rtc", UPD4992, XTAL_32_768kHz) // ! Actually D4911C !
+ MCFG_DEVICE_ADD("rtc", UPD4992, XTAL(32'768)) // ! Actually D4911C !
MCFG_DEVICE_ADD ("acia0", ACIA6850, 0)
MCFG_TICKET_DISPENSER_ADD("hopper1", attotime::from_msec(150), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
MCFG_TICKET_DISPENSER_ADD("hopper2", attotime::from_msec(150), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
@@ -9727,7 +9727,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(jockeyc_state::inttoote, jockeyc)
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // TMP68HC000N-16
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) // TMP68HC000N-16
MCFG_CPU_PROGRAM_MAP(inttoote_map)
// I/O board (not hooked up yet)
diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp
index 2acdfe5d8ff..d6337e0aec9 100644
--- a/src/mame/drivers/seta2.cpp
+++ b/src/mame/drivers/seta2.cpp
@@ -930,7 +930,7 @@ ADDRESS_MAP_END
// Simulate coin drop through two sensors
-#define FUNCUBE_SUB_CPU_CLOCK (XTAL_14_7456MHz)
+#define FUNCUBE_SUB_CPU_CLOCK (XTAL(14'745'600))
READ16_MEMBER(seta2_state::funcube_coins_r)
{
@@ -940,7 +940,7 @@ READ16_MEMBER(seta2_state::funcube_coins_r)
uint8_t hopper_bit = (m_funcube_hopper_motor && !(m_screen->frame_number()%20)) ? 1 : 0;
- const uint64_t coin_total_cycles = FUNCUBE_SUB_CPU_CLOCK / (1000/20);
+ const uint64_t coin_total_cycles = FUNCUBE_SUB_CPU_CLOCK.value() / (1000/20);
if ( m_funcube_coin_start_cycles )
{
@@ -2504,7 +2504,7 @@ INTERRUPT_GEN_MEMBER(seta2_state::samshoot_interrupt)
}
MACHINE_CONFIG_START(seta2_state::seta2)
- MCFG_CPU_ADD("maincpu", M68301, XTAL_50MHz/3) // !! TMP68301 !!
+ MCFG_CPU_ADD("maincpu", M68301, XTAL(50'000'000)/3) // !! TMP68301 !!
MCFG_CPU_PROGRAM_MAP(mj4simai_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", seta2_state, seta2_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
@@ -2531,7 +2531,7 @@ MACHINE_CONFIG_START(seta2_state::seta2)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, XTAL_50MHz/3) // clock?
+ MCFG_SOUND_ADD("x1snd", X1_010, XTAL(50'000'000)/3) // clock?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2612,7 +2612,7 @@ MACHINE_CONFIG_DERIVED(seta2_state::penbros, seta2)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(seta2_state::ablastb, penbros)
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL_16MHz) // TMP68HC000P-16
+ MCFG_CPU_REPLACE("maincpu", M68000, XTAL(16'000'000)) // TMP68HC000P-16
MCFG_CPU_PROGRAM_MAP(ablastb_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", seta2_state, irq2_line_hold)
@@ -2717,7 +2717,7 @@ MACHINE_RESET_MEMBER(seta2_state, funcube)
MACHINE_CONFIG_START(seta2_state::funcube)
- MCFG_CPU_ADD("maincpu", MCF5206E, XTAL_25_447MHz)
+ MCFG_CPU_ADD("maincpu", MCF5206E, XTAL(25'447'000))
MCFG_CPU_PROGRAM_MAP(funcube_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta2_state, funcube_interrupt, "screen", 0, 1)
@@ -2754,7 +2754,7 @@ MACHINE_CONFIG_START(seta2_state::funcube)
// sound hardware
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM9810_ADD("oki", XTAL_4_096MHz)
+ MCFG_OKIM9810_ADD("oki", XTAL(4'096'000))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -2781,7 +2781,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta2_state::namcostr)
- MCFG_CPU_ADD("maincpu", M68301, XTAL_50MHz/3) // !! TMP68301 !!
+ MCFG_CPU_ADD("maincpu", M68301, XTAL(50'000'000)/3) // !! TMP68301 !!
MCFG_CPU_PROGRAM_MAP(namcostr_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", seta2_state, seta2_interrupt)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
@@ -2806,7 +2806,7 @@ MACHINE_CONFIG_START(seta2_state::namcostr)
// sound hardware
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM9810_ADD("oki", XTAL_4_096MHz)
+ MCFG_OKIM9810_ADD("oki", XTAL(4'096'000))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp
index 0055382a2ac..32a2e346785 100644
--- a/src/mame/drivers/sf.cpp
+++ b/src/mame/drivers/sf.cpp
@@ -537,14 +537,14 @@ void sf_state::machine_reset()
MACHINE_CONFIG_START(sf_state::sfan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(sfan_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sf_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* ? xtal is 3.579545MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* ? xtal is 3.579545MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_ADD("audio2", Z80, XTAL_3_579545MHz) /* ? xtal is 3.579545MHz */
+ MCFG_CPU_ADD("audio2", Z80, XTAL(3'579'545)) /* ? xtal is 3.579545MHz */
MCFG_CPU_PROGRAM_MAP(sound2_map)
MCFG_CPU_IO_MAP(sound2_io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(sf_state, irq0_line_hold, 8000) // ?
@@ -568,7 +568,7 @@ MACHINE_CONFIG_START(sf_state::sfan)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
diff --git a/src/mame/drivers/sfcbox.cpp b/src/mame/drivers/sfcbox.cpp
index dd74e09009c..d2ac9c7dc76 100644
--- a/src/mame/drivers/sfcbox.cpp
+++ b/src/mame/drivers/sfcbox.cpp
@@ -453,17 +453,17 @@ MACHINE_CONFIG_START(sfcbox_state::sfcbox)
MCFG_CPU_PROGRAM_MAP(snes_map)
// runs at 24.576 MHz / 12 = 2.048 MHz
- MCFG_CPU_ADD("soundcpu", SPC700, XTAL_24_576MHz / 12)
+ MCFG_CPU_ADD("soundcpu", SPC700, XTAL(24'576'000) / 12)
MCFG_CPU_PROGRAM_MAP(spc_mem)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
/* sfcbox hardware */
- MCFG_CPU_ADD("bios", Z180, XTAL_12MHz / 2) /* HD64180RF6X */
+ MCFG_CPU_ADD("bios", Z180, XTAL(12'000'000) / 2) /* HD64180RF6X */
MCFG_CPU_PROGRAM_MAP(sfcbox_map)
MCFG_CPU_IO_MAP(sfcbox_io)
- MCFG_MB90082_ADD("mb90082",XTAL_12MHz / 2) /* TODO: correct clock */
+ MCFG_MB90082_ADD("mb90082",XTAL(12'000'000) / 2) /* TODO: correct clock */
MCFG_S3520CF_ADD("s3520cf") /* RTC */
/* sound hardware */
diff --git a/src/mame/drivers/sfkick.cpp b/src/mame/drivers/sfkick.cpp
index c454e526cae..35a9ed43644 100644
--- a/src/mame/drivers/sfkick.cpp
+++ b/src/mame/drivers/sfkick.cpp
@@ -229,7 +229,7 @@ public:
};
-#define MASTER_CLOCK XTAL_21_4772MHz
+#define MASTER_CLOCK XTAL(21'477'272)
READ8_MEMBER(sfkick_state::ppi_port_b_r)
diff --git a/src/mame/drivers/sg1000.cpp b/src/mame/drivers/sg1000.cpp
index 0ad913115dd..428d9e4ca89 100644
--- a/src/mame/drivers/sg1000.cpp
+++ b/src/mame/drivers/sg1000.cpp
@@ -519,12 +519,12 @@ void sf7000_state::machine_reset()
MACHINE_CONFIG_START(sg1000_state::sg1000)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10_738635MHz/3)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(10'738'635)/3)
MCFG_CPU_PROGRAM_MAP(sg1000_map)
MCFG_CPU_IO_MAP(sg1000_io_map)
/* video hardware */
- MCFG_DEVICE_ADD( TMS9918A_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( TMS9918A_TAG, TMS9918A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
@@ -533,7 +533,7 @@ MACHINE_CONFIG_START(sg1000_state::sg1000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL_10_738635MHz/3)
+ MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* expansion slot */
@@ -572,12 +572,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sc3000_state::sc3000)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10_738635MHz/3) // LH0080A
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(10'738'635)/3) // LH0080A
MCFG_CPU_PROGRAM_MAP(sc3000_map)
MCFG_CPU_IO_MAP(sc3000_io_map)
/* video hardware */
- MCFG_DEVICE_ADD( TMS9918A_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( TMS9918A_TAG, TMS9918A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
@@ -586,7 +586,7 @@ MACHINE_CONFIG_START(sc3000_state::sc3000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL_10_738635MHz/3)
+ MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* sc3000 has all sk1100 features built-in, so add it as a fixed slot */
@@ -610,12 +610,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sf7000_state::sf7000)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10_738635MHz/3)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(10'738'635)/3)
MCFG_CPU_PROGRAM_MAP(sf7000_map)
MCFG_CPU_IO_MAP(sf7000_io_map)
/* video hardware */
- MCFG_DEVICE_ADD( TMS9918A_TAG, TMS9918A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( TMS9918A_TAG, TMS9918A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
@@ -624,7 +624,7 @@ MACHINE_CONFIG_START(sf7000_state::sf7000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL_10_738635MHz/3)
+ MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
diff --git a/src/mame/drivers/sg1000a.cpp b/src/mame/drivers/sg1000a.cpp
index 70404c5106a..de0384df255 100644
--- a/src/mame/drivers/sg1000a.cpp
+++ b/src/mame/drivers/sg1000a.cpp
@@ -459,7 +459,7 @@ WRITE8_MEMBER(sg1000a_state::sg1000a_coin_counter_w)
MACHINE_CONFIG_START(sg1000a_state::sg1000a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(program_map)
MCFG_CPU_IO_MAP(io_map)
@@ -470,7 +470,7 @@ MACHINE_CONFIG_START(sg1000a_state::sg1000a)
MCFG_I8255_OUT_PORTC_CB(WRITE8(sg1000a_state, sg1000a_coin_counter_w))
/* video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -480,12 +480,12 @@ MACHINE_CONFIG_START(sg1000a_state::sg1000a)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489A, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("snsnd", SN76489A, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(sg1000a_state::sg1000ax, sg1000a)
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5033, XTAL_3_579545MHz)
+ MCFG_CPU_REPLACE("maincpu", SEGA_315_5033, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(program_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
@@ -494,7 +494,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(sg1000a_state::sderby2s, sg1000a)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_10_738635MHz / 3)
+ MCFG_CPU_CLOCK(XTAL(10'738'635) / 3)
MCFG_CPU_IO_MAP(sderby2_io_map)
// Actually uses a Sega 315-5066 chip, which is a TMS9918 and SN76489 in the same package but with RGB output
diff --git a/src/mame/drivers/shadfrce.cpp b/src/mame/drivers/shadfrce.cpp
index 3db9eb458e3..9880c8ced46 100644
--- a/src/mame/drivers/shadfrce.cpp
+++ b/src/mame/drivers/shadfrce.cpp
@@ -534,17 +534,17 @@ GFXDECODE_END
MACHINE_CONFIG_START(shadfrce_state::shadfrce)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(shadfrce_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", shadfrce_state, scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(shadfrce_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
MCFG_SCREEN_UPDATE_DRIVER(shadfrce_state, screen_update)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(shadfrce_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
@@ -559,12 +559,12 @@ MACHINE_CONFIG_START(shadfrce_state::shadfrce)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_13_4952MHz/8, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(13'495'200)/8, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shangha3.cpp b/src/mame/drivers/shangha3.cpp
index 2fe595f2669..bdd042740ff 100644
--- a/src/mame/drivers/shangha3.cpp
+++ b/src/mame/drivers/shangha3.cpp
@@ -446,7 +446,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(shangha3_state::shangha3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_48MHz/3) // TMP68HC000N-16
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(48'000'000)/3) // TMP68HC000N-16
MCFG_CPU_PROGRAM_MAP(shangha3_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", shangha3_state, irq4_line_assert)
@@ -456,7 +456,7 @@ MACHINE_CONFIG_START(shangha3_state::shangha3)
// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
// MCFG_SCREEN_SIZE(24*16, 16*16)
// MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1)
- MCFG_SCREEN_RAW_PARAMS(XTAL_48MHz/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(48'000'000)/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */
MCFG_SCREEN_UPDATE_DRIVER(shangha3_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -470,12 +470,12 @@ MACHINE_CONFIG_START(shangha3_state::shangha3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL_48MHz/32) // 1.5MHz
+ MCFG_SOUND_ADD("aysnd", YM2149, XTAL(48'000'000)/32) // 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.30)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -483,11 +483,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(shangha3_state::heberpop)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_48MHz/3) // TMP68HC000N-16 like the others??
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(48'000'000)/3) // TMP68HC000N-16 like the others??
MCFG_CPU_PROGRAM_MAP(heberpop_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", shangha3_state, irq4_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_48MHz/8) /* 6 MHz ??? */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(48'000'000)/8) /* 6 MHz ??? */
MCFG_CPU_PROGRAM_MAP(heberpop_sound_map)
MCFG_CPU_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */
@@ -497,7 +497,7 @@ MACHINE_CONFIG_START(shangha3_state::heberpop)
// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
// MCFG_SCREEN_SIZE(24*16, 16*16)
// MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1)
- MCFG_SCREEN_RAW_PARAMS(XTAL_48MHz/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(48'000'000)/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */
MCFG_SCREEN_UPDATE_DRIVER(shangha3_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -514,12 +514,12 @@ MACHINE_CONFIG_START(shangha3_state::heberpop)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ymsnd", YM3438, XTAL_48MHz/6) /* 8 MHz? */
+ MCFG_SOUND_ADD("ymsnd", YM3438, XTAL(48'000'000)/6) /* 8 MHz? */
MCFG_YM2612_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -527,11 +527,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(shangha3_state::blocken)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_48MHz/3) // TMP68HC000N-16
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(48'000'000)/3) // TMP68HC000N-16
MCFG_CPU_PROGRAM_MAP(blocken_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", shangha3_state, irq4_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_48MHz/8) /* 6 MHz? */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(48'000'000)/8) /* 6 MHz? */
MCFG_CPU_PROGRAM_MAP(heberpop_sound_map)
MCFG_CPU_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */
@@ -541,7 +541,7 @@ MACHINE_CONFIG_START(shangha3_state::blocken)
// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
// MCFG_SCREEN_SIZE(24*16, 16*16)
// MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1)
- MCFG_SCREEN_RAW_PARAMS(XTAL_48MHz/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(48'000'000)/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */
MCFG_SCREEN_UPDATE_DRIVER(shangha3_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -558,12 +558,12 @@ MACHINE_CONFIG_START(shangha3_state::blocken)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ymsnd", YM3438, XTAL_48MHz/6) /* 8 MHz? */
+ MCFG_SOUND_ADD("ymsnd", YM3438, XTAL(48'000'000)/6) /* 8 MHz? */
MCFG_YM2612_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shanghai.cpp b/src/mame/drivers/shanghai.cpp
index f932bcfdf82..2306b29c458 100644
--- a/src/mame/drivers/shanghai.cpp
+++ b/src/mame/drivers/shanghai.cpp
@@ -384,7 +384,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(shanghai_state::shanghai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz/2) /* NEC D70116C-8 */
+ MCFG_CPU_ADD("maincpu", V30, XTAL(16'000'000)/2) /* NEC D70116C-8 */
MCFG_CPU_PROGRAM_MAP(shanghai_map)
MCFG_CPU_IO_MAP(shanghai_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", shanghai_state, half_vblank_irq)
@@ -407,7 +407,7 @@ MACHINE_CONFIG_START(shanghai_state::shanghai)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_16MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(16'000'000)/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
@@ -420,7 +420,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(shanghai_state::shangha2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz/2) /* ? */
+ MCFG_CPU_ADD("maincpu", V30, XTAL(16'000'000)/2) /* ? */
MCFG_CPU_PROGRAM_MAP(shangha2_map)
MCFG_CPU_IO_MAP(shangha2_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", shanghai_state, half_vblank_irq)
@@ -442,7 +442,7 @@ MACHINE_CONFIG_START(shanghai_state::shangha2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_16MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(16'000'000)/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
@@ -455,11 +455,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(shanghai_state::kothello)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", V30, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(kothello_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", shanghai_state, half_vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4)
MCFG_CPU_PROGRAM_MAP(kothello_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -482,7 +482,7 @@ MACHINE_CONFIG_START(shanghai_state::kothello)
MCFG_SPEAKER_STANDARD_MONO("mono")
/* same as standard seibu ym2203, but also reads "DSW" */
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_16MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(16'000'000)/4)
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp
index 9c0b1fbfbc0..d6a9d83a4e7 100644
--- a/src/mame/drivers/shangkid.cpp
+++ b/src/mame/drivers/shangkid.cpp
@@ -369,14 +369,14 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(shangkid_state::chinhero)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(chinhero_main_map)
- MCFG_CPU_ADD("bbx", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_ADD("bbx", Z80, XTAL(18'432'000)/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(chinhero_bbx_map)
MCFG_CPU_IO_MAP(chinhero_bbx_portmap)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(chinhero_sound_map)
MCFG_CPU_IO_MAP(sound_portmap)
@@ -415,7 +415,7 @@ MACHINE_CONFIG_START(shangkid_state::chinhero)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(shangkid_state, chinhero_ay8910_porta_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(shangkid_state, ay8910_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
diff --git a/src/mame/drivers/shaolins.cpp b/src/mame/drivers/shaolins.cpp
index b0bb076a8dc..cc181492913 100644
--- a/src/mame/drivers/shaolins.cpp
+++ b/src/mame/drivers/shaolins.cpp
@@ -18,7 +18,7 @@ driver by Allard van der Bas
#include "speaker.h"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
TIMER_DEVICE_CALLBACK_MEMBER(shaolins_state::interrupt)
{
diff --git a/src/mame/drivers/shootaway2.cpp b/src/mame/drivers/shootaway2.cpp
index 12335f54b13..ba30b85e636 100644
--- a/src/mame/drivers/shootaway2.cpp
+++ b/src/mame/drivers/shootaway2.cpp
@@ -77,10 +77,10 @@ static INPUT_PORTS_START( m74 )
INPUT_PORTS_END
MACHINE_CONFIG_START(m74_state::m74)
- MCFG_CPU_ADD("maincpu", M37450, XTAL_8MHz) /* C68 @ 8.0MHz - main CPU */
+ MCFG_CPU_ADD("maincpu", M37450, XTAL(8'000'000)) /* C68 @ 8.0MHz - main CPU */
MCFG_CPU_PROGRAM_MAP(c68_map)
- MCFG_CPU_ADD("subcpu", TMPZ84C011, XTAL_12MHz / 3) /* Z84C011 @ 4 MHz - sub CPU */
+ MCFG_CPU_ADD("subcpu", TMPZ84C011, XTAL(12'000'000) / 3) /* Z84C011 @ 4 MHz - sub CPU */
MCFG_CPU_PROGRAM_MAP(sub_map)
MCFG_SCREEN_ADD("screen", RASTER)
@@ -91,7 +91,7 @@ MACHINE_CONFIG_START(m74_state::m74)
MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shootout.cpp b/src/mame/drivers/shootout.cpp
index 0306db19002..621acb75eb9 100644
--- a/src/mame/drivers/shootout.cpp
+++ b/src/mame/drivers/shootout.cpp
@@ -276,17 +276,17 @@ void shootout_state::machine_reset ()
MACHINE_CONFIG_START(shootout_state::shootout)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", DECO_222, XTAL_12MHz / 6) // 2 MHz?
+ MCFG_CPU_ADD("maincpu", DECO_222, XTAL(12'000'000) / 6) // 2 MHz?
MCFG_CPU_PROGRAM_MAP(shootout_map)
- MCFG_CPU_ADD("audiocpu", M6502, XTAL_12MHz / 8) // 1.5 MHz
+ MCFG_CPU_ADD("audiocpu", M6502, XTAL(12'000'000) / 8) // 1.5 MHz
MCFG_CPU_PROGRAM_MAP(shootout_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
// Guessed parameters based on the 12 MHz XTAL, but they seem resonable (TODO: Real PCB measurements)
- MCFG_SCREEN_RAW_PARAMS (XTAL_12MHz / 2, 384, 0, 256, 262, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS (XTAL(12'000'000) / 2, 384, 0, 256, 262, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(shootout_state, screen_update_shootout)
MCFG_SCREEN_PALETTE("palette")
@@ -300,7 +300,7 @@ MACHINE_CONFIG_START(shootout_state::shootout)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz / 8) // 1.5 MHz
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000) / 8) // 1.5 MHz
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -309,14 +309,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(shootout_state::shootouj)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz / 6) // 2 MHz? (Assuming the same XTAL as DE-0219 pcb)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(12'000'000) / 6) // 2 MHz? (Assuming the same XTAL as DE-0219 pcb)
MCFG_CPU_PROGRAM_MAP(shootouj_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
// Guessed parameters based on the 12 MHz XTAL, but they seem resonable (TODO: Real PCB measurements)
- MCFG_SCREEN_RAW_PARAMS (XTAL_12MHz / 2, 384, 0, 256, 262, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS (XTAL(12'000'000) / 2, 384, 0, 256, 262, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(shootout_state, screen_update_shootouj)
MCFG_SCREEN_PALETTE("palette")
@@ -330,7 +330,7 @@ MACHINE_CONFIG_START(shootout_state::shootouj)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz / 8) // 1.5 MHz (Assuming the same XTAL as DE-0219 pcb)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000) / 8) // 1.5 MHz (Assuming the same XTAL as DE-0219 pcb)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(shootout_state, bankswitch_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(shootout_state, flipscreen_w))
@@ -340,7 +340,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(shootout_state::shootouk, shootouj)
/* the Korean 'bootleg' has the usual DECO222 style encryption */
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", DECO_222, XTAL_12MHz / 6) // 2 MHz? (Assuming the same XTAL as DE-0219 pcb)
+ MCFG_CPU_ADD("maincpu", DECO_222, XTAL(12'000'000) / 6) // 2 MHz? (Assuming the same XTAL as DE-0219 pcb)
MCFG_CPU_PROGRAM_MAP(shootouj_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shougi.cpp b/src/mame/drivers/shougi.cpp
index af9e082721e..3bc4cd21c21 100644
--- a/src/mame/drivers/shougi.cpp
+++ b/src/mame/drivers/shougi.cpp
@@ -364,15 +364,15 @@ INTERRUPT_GEN_MEMBER(shougi_state::vblank_nmi)
MACHINE_CONFIG_START(shougi_state::shougi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'000'000)/4)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", shougi_state, vblank_nmi)
- MCFG_CPU_ADD("sub", Z80, XTAL_10MHz/4)
+ MCFG_CPU_ADD("sub", Z80, XTAL(10'000'000)/4)
MCFG_CPU_PROGRAM_MAP(sub_map)
MCFG_CPU_IO_MAP(readport_sub)
- MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL_10MHz/4/8)
+ MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL(10'000'000)/4/8)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP) // 0: sharedram = sub, 1: sharedram = main (TODO!)
@@ -402,7 +402,7 @@ MACHINE_CONFIG_START(shougi_state::shougi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_10MHz/8)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(10'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sigmab52.cpp b/src/mame/drivers/sigmab52.cpp
index a73305d9916..7ff3c23d5c1 100644
--- a/src/mame/drivers/sigmab52.cpp
+++ b/src/mame/drivers/sigmab52.cpp
@@ -576,16 +576,16 @@ void sigmab52_state::machine_reset()
MACHINE_CONFIG_START(sigmab52_state::jwildb52)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(jwildb52_map)
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL_8MHz)
+ MCFG_CPU_ADD("audiocpu", MC6809, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(sound_prog_map)
- MCFG_DEVICE_ADD("6840ptm_1", PTM6840, XTAL_8MHz/4) // FIXME
+ MCFG_DEVICE_ADD("6840ptm_1", PTM6840, XTAL(8'000'000)/4) // FIXME
MCFG_PTM6840_IRQ_CB(INPUTLINE("maincpu", M6809_IRQ_LINE))
- MCFG_DEVICE_ADD("6840ptm_2", PTM6840, XTAL_8MHz/8) // FIXME
+ MCFG_DEVICE_ADD("6840ptm_2", PTM6840, XTAL(8'000'000)/8) // FIXME
MCFG_PTM6840_IRQ_CB(WRITELINE(sigmab52_state, ptm2_irq))
MCFG_NVRAM_ADD_NO_FILL("nvram")
@@ -598,7 +598,7 @@ MACHINE_CONFIG_START(sigmab52_state::jwildb52)
MCFG_SCREEN_UPDATE_DEVICE("hd63484", hd63484_device, update_screen)
MCFG_SCREEN_PALETTE("palette")
- MCFG_HD63484_ADD("hd63484", XTAL_8MHz, jwildb52_hd63484_map)
+ MCFG_HD63484_ADD("hd63484", XTAL(8'000'000), jwildb52_hd63484_map)
MCFG_PALETTE_ADD("palette", 16)
@@ -607,7 +607,7 @@ MACHINE_CONFIG_START(sigmab52_state::jwildb52)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp
index 9e1a8d983fe..6c612aec3c2 100644
--- a/src/mame/drivers/sigmab98.cpp
+++ b/src/mame/drivers/sigmab98.cpp
@@ -2947,7 +2947,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(sigmab98_state::sammymdl_irq)
}
MACHINE_CONFIG_START(sigmab98_state::sammymdl)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz / 2) // !! KL5C80A120FP @ 10MHz? (actually 4 times faster than Z80) !!
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(20'000'000) / 2) // !! KL5C80A120FP @ 10MHz? (actually 4 times faster than Z80) !!
MCFG_CPU_PROGRAM_MAP( animalc_map )
MCFG_CPU_IO_MAP( animalc_io )
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", sigmab98_state, sammymdl_irq, "screen", 0, 1)
@@ -2981,7 +2981,7 @@ MACHINE_CONFIG_START(sigmab98_state::sammymdl)
// sound hardware
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM9810_ADD("oki", XTAL_4_096MHz)
+ MCFG_OKIM9810_ADD("oki", XTAL(4'096'000))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/silkroad.cpp b/src/mame/drivers/silkroad.cpp
index 6926d43fe1c..eb5b88531c2 100644
--- a/src/mame/drivers/silkroad.cpp
+++ b/src/mame/drivers/silkroad.cpp
@@ -276,7 +276,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(silkroad_state::silkroad)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* 16MHz */
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(32'000'000)/2) /* 16MHz */
MCFG_CPU_PROGRAM_MAP(cpu_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", silkroad_state, irq4_line_hold)
@@ -296,15 +296,15 @@ MACHINE_CONFIG_START(silkroad_state::silkroad)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki1", XTAL_32MHz/32, PIN7_HIGH) // clock frequency & pin 7 not verified (was 1056000)
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'000'000)/32, PIN7_HIGH) // clock frequency & pin 7 not verified (was 1056000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki2", XTAL_32MHz/16, PIN7_HIGH) // clock frequency & pin 7 not verified (was 2112000)
+ MCFG_OKIM6295_ADD("oki2", XTAL(32'000'000)/16, PIN7_HIGH) // clock frequency & pin 7 not verified (was 2112000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.45)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp
index 3f383e33826..5ed0db1e94b 100644
--- a/src/mame/drivers/silvmil.cpp
+++ b/src/mame/drivers/silvmil.cpp
@@ -401,11 +401,11 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(silvmil_state::silvmil)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* Verified */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* Verified */
MCFG_CPU_PROGRAM_MAP(silvmil_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", silvmil_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_4_096MHz) /* Verified */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'096'000)) /* Verified */
MCFG_CPU_PROGRAM_MAP(silvmil_sound_map)
@@ -433,30 +433,30 @@ MACHINE_CONFIG_START(silvmil_state::silvmil)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* Verified */
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* Verified */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_OKIM6295_ADD("oki", XTAL_4_096MHz/4, PIN7_HIGH) /* Verified */
+ MCFG_OKIM6295_ADD("oki", XTAL(4'096'000)/4, PIN7_HIGH) /* Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(silvmil_state::puzzlove, silvmil)
MCFG_DEVICE_REMOVE("audiocpu")
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_4MHz) /* Verified */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000)) /* Verified */
MCFG_CPU_PROGRAM_MAP(silvmil_sound_map)
MCFG_DEVICE_MODIFY("spritegen")
MCFG_DECO_SPRITE_BOOTLEG_TYPE(1)
MCFG_DEVICE_REMOVE("oki")
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, PIN7_HIGH) /* Verified */
+ MCFG_OKIM6295_ADD("oki", XTAL(4'000'000)/4, PIN7_HIGH) /* Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(silvmil_state::puzzlovek, puzzlove)
MCFG_DEVICE_REMOVE("ymsnd")
- MCFG_YM2151_ADD("ymsnd", XTAL_15MHz/4) /* Verified */
+ MCFG_YM2151_ADD("ymsnd", XTAL(15'000'000)/4) /* Verified */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/simpsons.cpp b/src/mame/drivers/simpsons.cpp
index edf5f3aee16..fafbad0b7ad 100644
--- a/src/mame/drivers/simpsons.cpp
+++ b/src/mame/drivers/simpsons.cpp
@@ -320,12 +320,12 @@ INTERRUPT_GEN_MEMBER(simpsons_state::simpsons_irq)
MACHINE_CONFIG_START(simpsons_state::simpsons)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 053248, the clock input is 12MHz, and internal CPU divider of 4 */
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 053248, the clock input is 12MHz, and internal CPU divider of 4 */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", simpsons_state, simpsons_irq) /* IRQ triggered by the 052109, FIRQ by the sprite hardware */
MCFG_KONAMICPU_LINE_CB(WRITE8(simpsons_state, banking_callback))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(z80_map) /* NMIs are generated by the 053260 */
MCFG_DEVICE_ADD("bank0000", ADDRESS_MAP_BANK, 0)
@@ -348,9 +348,9 @@ MACHINE_CONFIG_START(simpsons_state::simpsons)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/3, 528, 112, 400, 256, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/3, 528, 112, 400, 256, 16, 240)
// 6MHz dotclock is more realistic, however needs drawing updates. replace when ready
-// MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 396, hbend, hbstart, 256, 16, 240)
+// MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4, 396, hbend, hbstart, 256, 16, 240)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
MCFG_SCREEN_UPDATE_DRIVER(simpsons_state, screen_update_simpsons)
MCFG_SCREEN_PALETTE("palette")
@@ -374,13 +374,13 @@ MACHINE_CONFIG_START(simpsons_state::simpsons)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) /* only left channel is connected */
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.0)
- MCFG_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("k053260", K053260, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sitcom.cpp b/src/mame/drivers/sitcom.cpp
index 62b40779f72..6941d73a214 100644
--- a/src/mame/drivers/sitcom.cpp
+++ b/src/mame/drivers/sitcom.cpp
@@ -333,7 +333,7 @@ void sitcom_timer_state::update_dac(uint8_t value)
MACHINE_CONFIG_START(sitcom_state::sitcom)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz) // 3.072MHz can be used for an old slow 8085
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'144'000)) // 3.072MHz can be used for an old slow 8085
MCFG_CPU_PROGRAM_MAP(sitcom_mem)
MCFG_CPU_IO_MAP(sitcom_io)
MCFG_I8085A_SID(READLINE(sitcom_state, sid_line))
diff --git a/src/mame/drivers/skimaxx.cpp b/src/mame/drivers/skimaxx.cpp
index 9ac2c5a768f..c875db0173a 100644
--- a/src/mame/drivers/skimaxx.cpp
+++ b/src/mame/drivers/skimaxx.cpp
@@ -495,16 +495,16 @@ void skimaxx_state::machine_reset()
*************************************/
MACHINE_CONFIG_START(skimaxx_state::skimaxx)
- MCFG_CPU_ADD("maincpu", M68EC030, XTAL_40MHz)
+ MCFG_CPU_ADD("maincpu", M68EC030, XTAL(40'000'000))
MCFG_CPU_PROGRAM_MAP(68030_1_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", skimaxx_state, irq3_line_hold) // 1,3,7 are identical, rest is RTE
- MCFG_CPU_ADD("subcpu", M68EC030, XTAL_40MHz)
+ MCFG_CPU_ADD("subcpu", M68EC030, XTAL(40'000'000))
MCFG_CPU_PROGRAM_MAP(68030_2_map)
/* video hardware */
- MCFG_CPU_ADD("tms", TMS34010, XTAL_50MHz)
+ MCFG_CPU_ADD("tms", TMS34010, XTAL(50'000'000))
MCFG_CPU_PROGRAM_MAP(tms_program_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(50000000/8) /* pixel clock */
@@ -530,16 +530,16 @@ MACHINE_CONFIG_START(skimaxx_state::skimaxx)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", XTAL_4MHz, PIN7_LOW) // ?
+ MCFG_OKIM6295_ADD("oki1", XTAL(4'000'000), PIN7_LOW) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_4MHz/2, PIN7_HIGH) // ?
+ MCFG_OKIM6295_ADD("oki2", XTAL(4'000'000)/2, PIN7_HIGH) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki3", XTAL_4MHz, PIN7_LOW) // ?
+ MCFG_OKIM6295_ADD("oki3", XTAL(4'000'000), PIN7_LOW) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki4", XTAL_4MHz/2, PIN7_HIGH) // ?
+ MCFG_OKIM6295_ADD("oki4", XTAL(4'000'000)/2, PIN7_HIGH) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skydiver.cpp b/src/mame/drivers/skydiver.cpp
index f94be2be40a..9f8c957c16b 100644
--- a/src/mame/drivers/skydiver.cpp
+++ b/src/mame/drivers/skydiver.cpp
@@ -98,7 +98,7 @@
#include "skydiver.lh"
-#define MASTER_CLOCK (XTAL_12_096MHz)
+#define MASTER_CLOCK (XTAL(12'096'000))
diff --git a/src/mame/drivers/skyfox.cpp b/src/mame/drivers/skyfox.cpp
index 6083bd8f652..745c8d80618 100644
--- a/src/mame/drivers/skyfox.cpp
+++ b/src/mame/drivers/skyfox.cpp
@@ -223,11 +223,11 @@ void skyfox_state::machine_reset()
MACHINE_CONFIG_START(skyfox_state::skyfox)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* Verified at 4MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* Verified at 4MHz */
MCFG_CPU_PROGRAM_MAP(skyfox_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", skyfox_state, skyfox_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/8) /* Verified at 1.789772MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/8) /* Verified at 1.789772MHz */
MCFG_CPU_PROGRAM_MAP(skyfox_sound_map)
/* video hardware */
@@ -248,10 +248,10 @@ MACHINE_CONFIG_START(skyfox_state::skyfox)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_14_31818MHz/8) /* Verified at 1.789772MHz */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(14'318'181)/8) /* Verified at 1.789772MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_14_31818MHz/8) /* Verified at 1.789772MHz */
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(14'318'181)/8) /* Verified at 1.789772MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skykid.cpp b/src/mame/drivers/skykid.cpp
index 30b9ac8b179..cfee009117c 100644
--- a/src/mame/drivers/skykid.cpp
+++ b/src/mame/drivers/skykid.cpp
@@ -438,11 +438,11 @@ INTERRUPT_GEN_MEMBER(skykid_state::mcu_vblank_irq)
MACHINE_CONFIG_START(skykid_state::skykid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_49_152MHz/32)
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(49'152'000)/32)
MCFG_CPU_PROGRAM_MAP(skykid_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", skykid_state, main_vblank_irq)
- MCFG_CPU_ADD("mcu", HD63701, XTAL_49_152MHz/8) /* or compatible 6808 with extra instructions */
+ MCFG_CPU_ADD("mcu", HD63701, XTAL(49'152'000)/8) /* or compatible 6808 with extra instructions */
MCFG_CPU_PROGRAM_MAP(mcu_map)
MCFG_CPU_IO_MAP(mcu_port_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", skykid_state, mcu_vblank_irq)
diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp
index 0c4e638cd51..c44aadfd1ce 100644
--- a/src/mame/drivers/skylncr.cpp
+++ b/src/mame/drivers/skylncr.cpp
@@ -130,7 +130,7 @@
#include <algorithm>
-#define MASTER_CLOCK XTAL_12MHz /* confirmed */
+#define MASTER_CLOCK XTAL(12'000'000) /* confirmed */
#define HOPPER_PULSE 50 // guessed
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)
diff --git a/src/mame/drivers/slicer.cpp b/src/mame/drivers/slicer.cpp
index 1fe518d461f..c0418e04fca 100644
--- a/src/mame/drivers/slicer.cpp
+++ b/src/mame/drivers/slicer.cpp
@@ -85,11 +85,11 @@ static SLOT_INTERFACE_START( slicer_floppies )
SLOT_INTERFACE_END
MACHINE_CONFIG_START(slicer_state::slicer)
- MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu", I80186, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(slicer_map)
MCFG_CPU_IO_MAP(slicer_io)
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400))
MCFG_MC68681_IRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, int0_w))
MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("rs232_1", rs232_port_device, write_txd))
MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("rs232_2", rs232_port_device, write_txd))
@@ -100,7 +100,7 @@ MACHINE_CONFIG_START(slicer_state::slicer)
MCFG_RS232_PORT_ADD("rs232_2", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart", scn2681_device, rx_b_w))
- MCFG_FD1797_ADD("fdc", XTAL_16MHz/2/8)
+ MCFG_FD1797_ADD("fdc", XTAL(16'000'000)/2/8)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, int1_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq0_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", slicer_floppies, "525dd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/slotcarn.cpp b/src/mame/drivers/slotcarn.cpp
index 68b2907cc2a..947201e1e13 100644
--- a/src/mame/drivers/slotcarn.cpp
+++ b/src/mame/drivers/slotcarn.cpp
@@ -25,7 +25,7 @@
#include "speaker.h"
-#define MASTER_CLOCK (XTAL_10MHz)
+#define MASTER_CLOCK (XTAL(10'000'000))
#define CPU_CLOCK (MASTER_CLOCK / 4)
#define PIXEL_CLOCK (MASTER_CLOCK / 1)
#define CRTC_CLOCK (MASTER_CLOCK / 8)
diff --git a/src/mame/drivers/sm1800.cpp b/src/mame/drivers/sm1800.cpp
index 529bc08e539..cbe2f8901f8 100644
--- a/src/mame/drivers/sm1800.cpp
+++ b/src/mame/drivers/sm1800.cpp
@@ -156,7 +156,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(sm1800_state::sm1800)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL_2MHz)
+ MCFG_CPU_ADD("maincpu",I8080, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(sm1800_mem)
MCFG_CPU_IO_MAP(sm1800_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sm1800_state, sm1800_vblank_interrupt)
diff --git a/src/mame/drivers/sm7238.cpp b/src/mame/drivers/sm7238.cpp
index ef51dfa9f41..809825bbf6a 100644
--- a/src/mame/drivers/sm7238.cpp
+++ b/src/mame/drivers/sm7238.cpp
@@ -220,11 +220,11 @@ void sm7238_state::recompute_parameters()
if (m_video.stride == 80)
{
- refresh = HZ_TO_ATTOSECONDS(XTAL_12_5MHz) * m_video.stride * 10 * KSM_TOTAL_VERT;
+ refresh = HZ_TO_ATTOSECONDS(XTAL(12'500'000)) * m_video.stride * 10 * KSM_TOTAL_VERT;
}
else
{
- refresh = HZ_TO_ATTOSECONDS(XTAL_20_625MHz) * m_video.stride * 10 * KSM_TOTAL_VERT;
+ refresh = HZ_TO_ATTOSECONDS(XTAL(20'625'000)) * m_video.stride * 10 * KSM_TOTAL_VERT;
}
machine().first_screen()->configure(m_video.stride * 10, KSM_TOTAL_VERT, visarea, refresh);
@@ -355,7 +355,7 @@ PALETTE_INIT_MEMBER(sm7238_state, sm7238)
}
MACHINE_CONFIG_START(sm7238_state::sm7238)
- MCFG_CPU_ADD("maincpu", I8080, XTAL_16_5888MHz/9)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(16'588'800)/9)
MCFG_CPU_PROGRAM_MAP(sm7238_mem)
MCFG_CPU_IO_MAP(sm7238_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
@@ -369,7 +369,7 @@ MACHINE_CONFIG_START(sm7238_state::sm7238)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_20_625MHz, KSM_TOTAL_HORZ, 0, KSM_DISP_HORZ, KSM_TOTAL_VERT, 0, KSM_DISP_VERT);
+ MCFG_SCREEN_RAW_PARAMS(XTAL(20'625'000), KSM_TOTAL_HORZ, 0, KSM_DISP_HORZ, KSM_TOTAL_VERT, 0, KSM_DISP_VERT);
MCFG_SCREEN_UPDATE_DRIVER(sm7238_state, screen_update)
MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
MCFG_SCREEN_PALETTE("palette")
@@ -382,19 +382,19 @@ MACHINE_CONFIG_START(sm7238_state::sm7238)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("t_hblank", PIT8253, 0)
- MCFG_PIT8253_CLK1(XTAL_16_384MHz/9) // XXX workaround -- keyboard is slower and doesn't sync otherwise
+ MCFG_PIT8253_CLK1(XTAL(16'384'000)/9) // XXX workaround -- keyboard is slower and doesn't sync otherwise
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(sm7238_state, write_keyboard_clock))
MCFG_DEVICE_ADD("t_vblank", PIT8253, 0)
- MCFG_PIT8253_CLK2(XTAL_16_5888MHz/9)
+ MCFG_PIT8253_CLK2(XTAL(16'588'800)/9)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(sm7238_state, write_printer_clock))
MCFG_DEVICE_ADD("t_color", PIT8253, 0)
MCFG_DEVICE_ADD("t_iface", PIT8253, 0)
- MCFG_PIT8253_CLK1(XTAL_16_5888MHz/9)
+ MCFG_PIT8253_CLK1(XTAL(16'588'800)/9)
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_txc))
- MCFG_PIT8253_CLK2(XTAL_16_5888MHz/9)
+ MCFG_PIT8253_CLK2(XTAL(16'588'800)/9)
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_rxc))
// serial connection to host
diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp
index 9b81251a4f7..38d9a7c2727 100644
--- a/src/mame/drivers/smc777.cpp
+++ b/src/mame/drivers/smc777.cpp
@@ -32,7 +32,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_4_028MHz
+#define MASTER_CLOCK XTAL(4'028'000)
#define mc6845_h_char_total (m_crtc_vreg[0]+1)
#define mc6845_h_display (m_crtc_vreg[1])
@@ -991,7 +991,7 @@ MACHINE_CONFIG_START(smc777_state::smc777)
MCFG_MC6845_CHAR_WIDTH(8)
// floppy controller
- MCFG_MB8876_ADD("fdc", XTAL_1MHz)
+ MCFG_MB8876_ADD("fdc", XTAL(1'000'000))
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(smc777_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(smc777_state, fdc_drq_w))
diff --git a/src/mame/drivers/sms.cpp b/src/mame/drivers/sms.cpp
index 0606e0cbf78..5a4951767be 100644
--- a/src/mame/drivers/sms.cpp
+++ b/src/mame/drivers/sms.cpp
@@ -253,15 +253,15 @@ DC00 - Selection buttons #2, 9-16 (R)
#include "sms1.lh"
-#define MASTER_CLOCK_GG 32215905
-#define MASTER_CLOCK_PALN 10746168
+#define MASTER_CLOCK_GG 32215905.0
+#define MASTER_CLOCK_PALN 10746168.0
// The clocks for PAL and PAL-M used here differ from their nominal values,
// because with the latter errors will occur on Flubba's VDPTest, probably
// due to rounding issues in the core.
// Nominal XTAL value for SMS PAL-M (Brazil) is 10726834.
-#define MASTER_CLOCK_PALM 10726833
+#define MASTER_CLOCK_PALM 10726833.0
// Nominal XTAL value for SMS PAL is 53203424.
-#define MASTER_CLOCK_PAL 53203425 /* 12 * subcarrier freq. (4.43361875MHz) */
+#define MASTER_CLOCK_PAL 53203425.0 /* 12 * subcarrier freq. (4.43361875MHz) */
static ADDRESS_MAP_START( sms1_mem, AS_PROGRAM, 8, sms_state )
@@ -507,14 +507,14 @@ MACHINE_CONFIG_START(sms_state::sms_base)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(sms_state::sms_ntsc_base, sms_base)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635)/3)
MCFG_CPU_PROGRAM_MAP(sms_mem)
MCFG_CPU_IO_MAP(sms_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* actually, PSG is embedded in the VDP chip */
- MCFG_SOUND_ADD("segapsg", SEGAPSG, XTAL_10_738635MHz/3)
+ MCFG_SOUND_ADD("segapsg", SEGAPSG, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -543,7 +543,7 @@ MACHINE_CONFIG_END
sega315_5124_device::HEIGHT_PAL, \
sega315_5124_device::TBORDER_START + sega315_5124_device::PAL_240_TBORDER_HEIGHT, \
sega315_5124_device::TBORDER_START + sega315_5124_device::PAL_240_TBORDER_HEIGHT + 240) \
- MCFG_SCREEN_REFRESH_RATE((double) _pixelclock / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_PAL))
+ MCFG_SCREEN_REFRESH_RATE(_pixelclock / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_PAL))
#define MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(_pixelclock) \
MCFG_SCREEN_RAW_PARAMS(_pixelclock, \
@@ -553,7 +553,7 @@ MACHINE_CONFIG_END
sega315_5124_device::HEIGHT_NTSC, \
sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT, \
sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT + 224) \
- MCFG_SCREEN_REFRESH_RATE((double) _pixelclock / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_NTSC))
+ MCFG_SCREEN_REFRESH_RATE(_pixelclock / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_NTSC))
#define MCFG_SCREEN_GG_RAW_PARAMS(_pixelclock) \
MCFG_SCREEN_RAW_PARAMS(_pixelclock, \
@@ -563,13 +563,13 @@ MACHINE_CONFIG_END
sega315_5124_device::HEIGHT_NTSC, \
sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_192_TBORDER_HEIGHT + 3*8, \
sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_192_TBORDER_HEIGHT + 21*8 ) \
- MCFG_SCREEN_REFRESH_RATE((double) _pixelclock / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_NTSC))
+ MCFG_SCREEN_REFRESH_RATE(_pixelclock / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_NTSC))
MACHINE_CONFIG_DERIVED(sms_state::sms2_ntsc, sms_ntsc_base)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(XTAL_10_738635MHz/2)
+ MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(XTAL(10'738'635)/2)
MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms)
MCFG_DEVICE_ADD("sms_vdp", SEGA315_5246, 0)
@@ -587,15 +587,15 @@ MACHINE_CONFIG_DERIVED(sms_state::sms1_ntsc, sms_ntsc_base)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(XTAL_10_738635MHz/2)
+ MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(XTAL(10'738'635)/2)
MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms1)
MCFG_SCREEN_ADD("left_lcd", LCD) // This is needed for SegaScope Left LCD
- MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(XTAL_10_738635MHz/2)
+ MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(XTAL(10'738'635)/2)
MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms1)
MCFG_SCREEN_ADD("right_lcd", LCD) // This is needed for SegaScope Right LCD
- MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(XTAL_10_738635MHz/2)
+ MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(XTAL(10'738'635)/2)
MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms1)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sms_state, screen_vblank_sms1))
@@ -621,7 +621,7 @@ MACHINE_CONFIG_DERIVED(smssdisp_state::sms_sdisp, sms1_ntsc)
MCFG_DEVICE_MODIFY("sms_vdp")
MCFG_SEGA315_5124_INT_CB(WRITELINE(smssdisp_state, sms_store_int_callback))
- MCFG_CPU_ADD("control", Z80, XTAL_10_738635MHz/3)
+ MCFG_CPU_ADD("control", Z80, XTAL(10'738'635)/3)
MCFG_CPU_PROGRAM_MAP(sms_store_mem)
/* Both CPUs seem to communicate with the VDP etc? */
MCFG_CPU_IO_MAP(sms_io)
@@ -889,7 +889,7 @@ MACHINE_CONFIG_DERIVED(sms_state::smsj, sms1_kr)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(smsj_io)
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL_10_738635MHz/3)
+ MCFG_SOUND_ADD("ym2413", YM2413, XTAL(10'738'635)/3)
// if this output gain is changed, the gain set when unmute the output need
// to be changed too, probably along the gain set for the Mark III FM Unit.
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/mame/drivers/sms_bootleg.cpp b/src/mame/drivers/sms_bootleg.cpp
index e81790fc1fb..1c1f107726f 100644
--- a/src/mame/drivers/sms_bootleg.cpp
+++ b/src/mame/drivers/sms_bootleg.cpp
@@ -273,7 +273,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(smsbootleg_state::sms_supergame)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635)/3)
MCFG_CPU_PROGRAM_MAP(sms_supergame_map)
MCFG_CPU_IO_MAP(sms_supergame_io)
@@ -285,14 +285,14 @@ MACHINE_CONFIG_START(smsbootleg_state::sms_supergame)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("segapsg", SEGAPSG, XTAL_10_738635MHz/3)
+ MCFG_SOUND_ADD("segapsg", SEGAPSG, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_10_738635MHz/2, \
+ MCFG_SCREEN_RAW_PARAMS(XTAL(10'738'635)/2, \
sega315_5124_device::WIDTH , sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH - 2, sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256 + 10, \
sega315_5124_device::HEIGHT_NTSC, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT + 224)
- MCFG_SCREEN_REFRESH_RATE((double) XTAL_10_738635MHz/2 / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_NTSC))
+ MCFG_SCREEN_REFRESH_RATE(XTAL(10'738'635)/2 / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_NTSC))
MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms)
MCFG_DEVICE_ADD("sms_vdp", SEGA315_5246, 0)
diff --git a/src/mame/drivers/smsmcorp.cpp b/src/mame/drivers/smsmcorp.cpp
index 150538acc92..5680b4a6c7b 100644
--- a/src/mame/drivers/smsmcorp.cpp
+++ b/src/mame/drivers/smsmcorp.cpp
@@ -536,10 +536,10 @@ void smsmfg_state::machine_reset()
}
MACHINE_CONFIG_START(smsmfg_state::sms)
- MCFG_CPU_ADD("maincpu", I8088, XTAL_24MHz/8)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(24'000'000)/8)
MCFG_CPU_PROGRAM_MAP(sms_map)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_16MHz/8)
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(16'000'000)/8)
MCFG_CPU_PROGRAM_MAP(sub_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -570,7 +570,7 @@ MACHINE_CONFIG_START(smsmfg_state::sms)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_16MHz/8)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(16'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/snes.cpp b/src/mame/drivers/snes.cpp
index aef86d23364..e6808fde670 100644
--- a/src/mame/drivers/snes.cpp
+++ b/src/mame/drivers/snes.cpp
@@ -1334,7 +1334,7 @@ MACHINE_CONFIG_START(snes_console_state::snes)
MCFG_CPU_PROGRAM_MAP(snes_map)
// runs at 24.576 MHz / 12 = 2.048 MHz
- MCFG_CPU_ADD("soundcpu", SPC700, XTAL_24_576MHz / 12)
+ MCFG_CPU_ADD("soundcpu", SPC700, XTAL(24'576'000) / 12)
MCFG_CPU_PROGRAM_MAP(spc_map)
//MCFG_QUANTUM_TIME(attotime::from_hz(48000))
diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp
index cf2d1bbadc3..9a7845abe68 100644
--- a/src/mame/drivers/snesb.cpp
+++ b/src/mame/drivers/snesb.cpp
@@ -697,7 +697,7 @@ MACHINE_CONFIG_START(snesb_state::kinstb)
/* audio CPU */
// runs at 24.576 MHz / 12 = 2.048 MHz
- MCFG_CPU_ADD("soundcpu", SPC700, XTAL_24_576MHz / 12)
+ MCFG_CPU_ADD("soundcpu", SPC700, XTAL(24'576'000) / 12)
MCFG_CPU_PROGRAM_MAP(spc_mem)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -724,7 +724,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_DERIVED(snesb_state::mk3snes, kinstb)
- MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz)
+ MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
MCFG_CPU_IO_MAP(mcu_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp
index 0410f21880a..40fc565c1ff 100644
--- a/src/mame/drivers/snk.cpp
+++ b/src/mame/drivers/snk.cpp
@@ -3766,15 +3766,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snk_state::tnk3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_13_4MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(13'400'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(tnk3_cpuA_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL_13_4MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("sub", Z80, XTAL(13'400'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(tnk3_cpuB_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(tnk3_YM3526_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -3800,7 +3800,7 @@ MACHINE_CONFIG_START(snk_state::tnk3)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_YM3526_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_1))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -3830,7 +3830,7 @@ MACHINE_CONFIG_DERIVED(snk_state::athena, tnk3)
MCFG_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map)
/* sound hardware */
- MCFG_SOUND_ADD("ym2", YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_YM3526_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -3844,7 +3844,7 @@ MACHINE_CONFIG_DERIVED(snk_state::fitegolf, tnk3)
MCFG_CPU_PROGRAM_MAP(YM3812_sound_map)
/* sound hardware */
- MCFG_SOUND_REPLACE("ym1", YM3812, XTAL_4MHz) /* verified on pcb */
+ MCFG_SOUND_REPLACE("ym1", YM3812, XTAL(4'000'000)) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_1))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -3858,15 +3858,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snk_state::ikari)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_13_4MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(13'400'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(ikari_cpuA_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL_13_4MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("sub", Z80, XTAL(13'400'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(ikari_cpuB_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -3891,11 +3891,11 @@ MACHINE_CONFIG_START(snk_state::ikari)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_YM3526_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_1))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
- MCFG_SOUND_ADD("ym2", YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_YM3526_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -3908,7 +3908,7 @@ MACHINE_CONFIG_DERIVED(snk_state::victroad, ikari)
MCFG_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
/* sound hardware */
- MCFG_SOUND_REPLACE("ym2", Y8950, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_REPLACE("ym2", Y8950, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_Y8950_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -3917,15 +3917,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snk_state::bermudat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(bermudat_cpuA_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("sub", Z80, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(bermudat_cpuB_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(24000))
@@ -3948,11 +3948,11 @@ MACHINE_CONFIG_START(snk_state::bermudat)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_YM3526_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_1))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
- MCFG_SOUND_ADD("ym2", Y8950, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", Y8950, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_Y8950_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/snk6502.cpp b/src/mame/drivers/snk6502.cpp
index 1fc4bd8e1ee..44ba340176f 100644
--- a/src/mame/drivers/snk6502.cpp
+++ b/src/mame/drivers/snk6502.cpp
@@ -291,7 +291,7 @@ Stephh's notes (based on the games M6502 code and some tests) :
#include "speaker.h"
-#define MASTER_CLOCK XTAL_11_289MHz
+#define MASTER_CLOCK XTAL(11'289'000)
/* Change to 1 to allow fake debug buttons */
#define NIBBLER_HACK 0
diff --git a/src/mame/drivers/snk68.cpp b/src/mame/drivers/snk68.cpp
index ae3bab383f3..87eb1995577 100644
--- a/src/mame/drivers/snk68.cpp
+++ b/src/mame/drivers/snk68.cpp
@@ -591,11 +591,11 @@ void snk68_state::tile_callback_notpow(int &tile, int& fx, int& fy, int& region)
MACHINE_CONFIG_START(snk68_state::pow)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_18MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(18'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(pow_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", snk68_state, irq1_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
@@ -604,7 +604,7 @@ MACHINE_CONFIG_START(snk68_state::pow)
// the screen parameters are guessed but should be accurate. They
// give a theoretical refresh rate of 59.1856Hz while the measured
// rate on a SAR board is 59.16Hz.
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 384, 0, 256, 264, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4, 384, 0, 256, 264, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(snk68_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -622,7 +622,7 @@ MACHINE_CONFIG_START(snk68_state::pow)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp
index 1b4bc087770..a887fbe250d 100644
--- a/src/mame/drivers/snookr10.cpp
+++ b/src/mame/drivers/snookr10.cpp
@@ -626,7 +626,7 @@
#include "snookr10.lh"
-#define MASTER_CLOCK XTAL_16MHz
+#define MASTER_CLOCK XTAL(16'000'000)
/**********************
* Read/Write Handlers *
diff --git a/src/mame/drivers/snowbros.cpp b/src/mame/drivers/snowbros.cpp
index 34bd606a683..74542a02420 100644
--- a/src/mame/drivers/snowbros.cpp
+++ b/src/mame/drivers/snowbros.cpp
@@ -1741,12 +1741,12 @@ MACHINE_RESET_MEMBER(snowbros_state,finalttr)
MACHINE_CONFIG_START(snowbros_state::snowbros)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* 8 Mhz - confirmed */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* 8 Mhz - confirmed */
MCFG_CPU_PROGRAM_MAP(snowbros_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros_irq, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_12MHz/2) /* 6 MHz - confirmed */
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(12'000'000)/2) /* 6 MHz - confirmed */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
@@ -1775,7 +1775,7 @@ MACHINE_CONFIG_START(snowbros_state::snowbros)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_12MHz/4) /* 3 MHz - confirmed */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(12'000'000)/4) /* 3 MHz - confirmed */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1802,11 +1802,11 @@ MACHINE_CONFIG_DERIVED(snowbros_state::semicom, snowbros)
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_12MHz) /* 12MHz - Confirmed */
+ MCFG_CPU_CLOCK(XTAL(12'000'000)) /* 12MHz - Confirmed */
MCFG_CPU_PROGRAM_MAP(hyperpac_map)
MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_CLOCK(XTAL_16MHz/4) /* 4MHz - Confirmed */
+ MCFG_CPU_CLOCK(XTAL(16'000'000)/4) /* 4MHz - Confirmed */
MCFG_CPU_PROGRAM_MAP(hyperpac_sound_map)
MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_IO)
@@ -1818,12 +1818,12 @@ MACHINE_CONFIG_DERIVED(snowbros_state::semicom, snowbros)
MCFG_DEVICE_REMOVE("soundlatch2")
/* sound hardware */
- MCFG_SOUND_REPLACE("ymsnd", YM2151, XTAL_16MHz/4) /* 4MHz - Confirmed */
+ MCFG_SOUND_REPLACE("ymsnd", YM2151, XTAL(16'000'000)/4) /* 4MHz - Confirmed */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* 1MHz & pin 7 High - Confirmed */
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* 1MHz & pin 7 High - Confirmed */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1832,7 +1832,7 @@ MACHINE_CONFIG_DERIVED(snowbros_state::semicom_mcu, semicom)
/* basic machine hardware */
- MCFG_CPU_ADD("protection", I8052, XTAL_16MHz) // AT89C52
+ MCFG_CPU_ADD("protection", I8052, XTAL(16'000'000)) // AT89C52
MCFG_CPU_PROGRAM_MAP(protection_map)
MCFG_CPU_IO_MAP(protection_iomap)
MACHINE_CONFIG_END
@@ -1846,11 +1846,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snowbros_state::honeydol)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* MC68000P12 @ 12MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* MC68000P12 @ 12MHz */
MCFG_CPU_PROGRAM_MAP(honeydol_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros_irq, "screen", 0, 1)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_16MHz/4) /* 4Mhz (16MHz/4) like SemiCom or 6MHz (12MHz/2) like snowbros??? */
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(16'000'000)/4) /* 4Mhz (16MHz/4) like SemiCom or 6MHz (12MHz/2) like snowbros??? */
MCFG_CPU_PROGRAM_MAP(honeydol_sound_map)
MCFG_CPU_IO_MAP(honeydol_sound_io_map)
@@ -1873,24 +1873,24 @@ MACHINE_CONFIG_START(snowbros_state::honeydol)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_12MHz/4) /* 3Mhz */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(12'000'000)/4) /* 3Mhz */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* freq? */
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* freq? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(snowbros_state::twinadv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* 12MHz like Honey Dolls ? */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* 12MHz like Honey Dolls ? */
MCFG_CPU_PROGRAM_MAP(twinadv_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros_irq, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_16MHz/4) /* 4Mhz (16MHz/4) like SemiCom or 6MHz (12MHz/2) like snowbros??? */
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(16'000'000)/4) /* 4Mhz (16MHz/4) like SemiCom or 6MHz (12MHz/2) like snowbros??? */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(twinadv_sound_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", snowbros_state, irq0_line_hold)
@@ -1917,7 +1917,7 @@ MACHINE_CONFIG_START(snowbros_state::twinadv)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
/* sound hardware */
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* freq? */
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* freq? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1943,15 +1943,15 @@ Intel P8752 (mcu)
MACHINE_CONFIG_DERIVED(snowbros_state::finalttr, semicom)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_12MHz)
+ MCFG_CPU_CLOCK(XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(finalttr_map)
MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_CLOCK(XTAL_3_579545MHz)
+ MCFG_CPU_CLOCK(XTAL(3'579'545))
MCFG_MACHINE_RESET_OVERRIDE (snowbros_state, finalttr )
- MCFG_SOUND_REPLACE("ymsnd", YM2151, XTAL_3_579545MHz) /* possible but less likely 4MHz (12MHz/3) */
+ MCFG_SOUND_REPLACE("ymsnd", YM2151, XTAL(3'579'545)) /* possible but less likely 4MHz (12MHz/3) */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.08)
MCFG_SOUND_ROUTE(1, "mono", 0.08)
@@ -1970,7 +1970,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snowbros_state::snowbro3) /* PCB has 16MHz & 12MHz OSCs */
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* MC68000P10 CPU @ 12mhz or 8MHz (16MHz/2) ? */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* MC68000P10 CPU @ 12mhz or 8MHz (16MHz/2) ? */
MCFG_CPU_PROGRAM_MAP(snowbros3_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros3_irq, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1991,7 +1991,7 @@ MACHINE_CONFIG_START(snowbros_state::snowbro3) /* PCB has 16MHz & 12MHz OSCs */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2000,7 +2000,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snowbros_state::yutnori)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2)
MCFG_CPU_PROGRAM_MAP(yutnori_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros_irq, "screen", 0, 1)
@@ -2026,10 +2026,10 @@ MACHINE_CONFIG_START(snowbros_state::yutnori)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/16, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL(16'000'000)/16, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/16, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", XTAL(16'000'000)/16, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/socrates.cpp b/src/mame/drivers/socrates.cpp
index 3450487fa1f..d3fbb77aa62 100644
--- a/src/mame/drivers/socrates.cpp
+++ b/src/mame/drivers/socrates.cpp
@@ -317,7 +317,7 @@ void socrates_state::kbmcu_sim_fifo_head_clear()
void socrates_state::machine_start()
{
m_kbmcu_sim_timer = timer_alloc(TIMER_KBMCU_SIM);
- m_kbmcu_sim_timer->adjust(attotime::from_hz((XTAL_21_4772MHz/6)/3000)); // timer rate is a massive guess, depends on instructions per loop of mcu
+ m_kbmcu_sim_timer->adjust(attotime::from_hz((XTAL(21'477'272)/6)/3000)); // timer rate is a massive guess, depends on instructions per loop of mcu
m_clear_speech_timer = timer_alloc(TIMER_CLEAR_SPEECH);
m_clear_irq_timer = timer_alloc(TIMER_CLEAR_IRQ);
save_item(NAME(m_rom_bank));
@@ -995,7 +995,7 @@ static ADDRESS_MAP_START(z80_io, AS_IO, 8, socrates_state )
AM_RANGE(0x00, 0x00) AM_READWRITE(common_rom_bank_r, common_rom_bank_w) AM_MIRROR(0x7) /* rom bank select - RW - 8 bits */
AM_RANGE(0x08, 0x08) AM_READWRITE(common_ram_bank_r, common_ram_bank_w) AM_MIRROR(0x7) /* ram banks select - RW - 4 low bits; Format: 0b****HHLL where LL controls whether window 0 points at ram area: 0b00: 0x0000-0x3fff; 0b01: 0x4000-0x7fff; 0b10: 0x8000-0xbfff; 0b11: 0xc000-0xffff. HH controls the same thing for window 1 */
AM_RANGE(0x10, 0x17) AM_READWRITE(read_f3, socrates_sound_w) AM_MIRROR (0x8) /* sound section:
- 0x10 - W - frequency control for channel 1 (louder channel) - 01=high pitch, ff=low; time between 1->0/0->1 transitions = (XTAL_21_4772MHz/(512+256) / (freq_reg+1)) (note that this is double the actual frequency since each full low and high squarewave pulse is two transitions)
+ 0x10 - W - frequency control for channel 1 (louder channel) - 01=high pitch, ff=low; time between 1->0/0->1 transitions = (XTAL(21'477'272)/(512+256) / (freq_reg+1)) (note that this is double the actual frequency since each full low and high squarewave pulse is two transitions)
0x11 - W - frequency control for channel 2 (softer channel) - 01=high pitch, ff=low; same equation as above
0x12 - W - 0b***EVVVV enable, volume control for channel 1
0x13 - W - 0b***EVVVV enable, volume control for channel 2
@@ -1448,7 +1448,7 @@ TIMER_CALLBACK_MEMBER(socrates_state::kbmcu_sim_cb)
MACHINE_CONFIG_START(socrates_state::socrates)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) /* Toshiba TMPZ84C00AP @ 3.579545 MHz, verified, xtal is divided by 6 */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272)/6) /* Toshiba TMPZ84C00AP @ 3.579545 MHz, verified, xtal is divided by 6 */
MCFG_CPU_PROGRAM_MAP(z80_mem)
MCFG_CPU_IO_MAP(z80_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1486,7 +1486,7 @@ MACHINE_CONFIG_START(socrates_state::socrates)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("soc_snd", SOCRATES_SOUND, XTAL_21_4772MHz/(512+256)) // this is correct, as strange as it sounds.
+ MCFG_SOUND_ADD("soc_snd", SOCRATES_SOUND, XTAL(21'477'272)/(512+256)) // this is correct, as strange as it sounds.
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "socrates_cart")
@@ -1496,7 +1496,7 @@ MACHINE_CONFIG_START(socrates_state::socrates)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(socrates_state::socrates_pal, socrates)
- MCFG_CPU_REPLACE("maincpu", Z80, XTAL_26_601712MHz/8)
+ MCFG_CPU_REPLACE("maincpu", Z80, XTAL(26'601'712)/8)
MCFG_CPU_PROGRAM_MAP(z80_mem)
MCFG_CPU_IO_MAP(z80_io)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
@@ -1509,13 +1509,13 @@ MACHINE_CONFIG_DERIVED(socrates_state::socrates_pal, socrates)
MCFG_SCREEN_VISIBLE_AREA(0, 263, 0, 229) // the last few rows are usually cut off by the screen bottom but are indeed displayed if you mess with v-hold
MCFG_SCREEN_UPDATE_DRIVER(socrates_state, screen_update_socrates)
- MCFG_SOUND_REPLACE("soc_snd", SOCRATES_SOUND, XTAL_26_601712MHz/(512+256)) // this is correct, as strange as it sounds.
+ MCFG_SOUND_REPLACE("soc_snd", SOCRATES_SOUND, XTAL(26'601'712)/(512+256)) // this is correct, as strange as it sounds.
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(iqunlim_state::iqunlimz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) /* not accurate */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000)) /* not accurate */
MCFG_CPU_PROGRAM_MAP(iqunlimz_mem)
MCFG_CPU_IO_MAP(iqunlimz_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", iqunlim_state, assert_irq)
@@ -1558,7 +1558,7 @@ MACHINE_CONFIG_START(iqunlim_state::iqunlimz)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("soc_snd", SOCRATES_SOUND, XTAL_21_4772MHz/(512+256))
+ MCFG_SOUND_ADD("soc_snd", SOCRATES_SOUND, XTAL(21'477'272)/(512+256))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, nullptr)
diff --git a/src/mame/drivers/softbox.cpp b/src/mame/drivers/softbox.cpp
index f0076c7125a..011ade084cf 100644
--- a/src/mame/drivers/softbox.cpp
+++ b/src/mame/drivers/softbox.cpp
@@ -370,7 +370,7 @@ void softbox_state::ieee488_ifc(int state)
MACHINE_CONFIG_START(softbox_state::softbox)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(softbox_mem)
MCFG_CPU_IO_MAP(softbox_io)
@@ -397,7 +397,7 @@ MACHINE_CONFIG_START(softbox_state::softbox)
MCFG_I8255_IN_PORTC_CB(READ8(softbox_state, ppi1_pc_r))
MCFG_I8255_OUT_PORTC_CB(WRITE8(softbox_state, ppi1_pc_w))
- MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxc))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_txc))
diff --git a/src/mame/drivers/sonson.cpp b/src/mame/drivers/sonson.cpp
index 925d18881a3..38d7f084fce 100644
--- a/src/mame/drivers/sonson.cpp
+++ b/src/mame/drivers/sonson.cpp
@@ -226,11 +226,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(sonson_state::sonson)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_12MHz/2) // HD68B09P (/4 internally)
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(12'000'000)/2) // HD68B09P (/4 internally)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sonson_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL_12MHz/2) // HD68B09P (/4 internally)
+ MCFG_CPU_ADD("audiocpu", MC6809, XTAL(12'000'000)/2) // HD68B09P (/4 internally)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(sonson_state, irq0_line_hold, 4*60) /* FIRQs are triggered by the main CPU */
@@ -259,10 +259,10 @@ MACHINE_CONFIG_START(sonson_state::sonson)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8) /* 1.5 MHz */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* 1.5 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8) /* 1.5 MHz */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* 1.5 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sothello.cpp b/src/mame/drivers/sothello.cpp
index fa9ef85f977..5166a2ddd81 100644
--- a/src/mame/drivers/sothello.cpp
+++ b/src/mame/drivers/sothello.cpp
@@ -348,30 +348,30 @@ void sothello_state::machine_reset()
MACHINE_CONFIG_START(sothello_state::sothello)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz / 6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272) / 6)
MCFG_CPU_PROGRAM_MAP(maincpu_mem_map)
MCFG_CPU_IO_MAP(maincpu_io_map)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_21_4772MHz / 6)
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(21'477'272) / 6)
MCFG_CPU_PROGRAM_MAP(soundcpu_mem_map)
MCFG_CPU_IO_MAP(soundcpu_io_map)
- MCFG_CPU_ADD("subcpu", MC6809, XTAL_8MHz) // divided by 4 internally
+ MCFG_CPU_ADD("subcpu", MC6809, XTAL(8'000'000)) // divided by 4 internally
MCFG_CPU_PROGRAM_MAP(subcpu_mem_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
/* video hardware */
- MCFG_V9938_ADD("v9938", "screen", VDP_MEM, XTAL_21_4772MHz)
+ MCFG_V9938_ADD("v9938", "screen", VDP_MEM, XTAL(21'477'272))
MCFG_V99X8_INTERRUPT_CALLBACK(INPUTLINE("maincpu", 0))
- MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9938", XTAL_21_4772MHz)
+ MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9938", XTAL(21'477'272))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_21_4772MHz / 12)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(21'477'272) / 12)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("subcpu", 0))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
@@ -382,7 +382,7 @@ MACHINE_CONFIG_START(sothello_state::sothello)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(sothello_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* changed on the fly */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/spbactn.cpp b/src/mame/drivers/spbactn.cpp
index f0685f97c7d..aea93d3f505 100644
--- a/src/mame/drivers/spbactn.cpp
+++ b/src/mame/drivers/spbactn.cpp
@@ -405,18 +405,18 @@ GFXDECODE_END
MACHINE_CONFIG_START(spbactn_state::spbactn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(spbactn_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", spbactn_state, irq3_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(spbactn_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
#if 0
// actual blanking frequencies unknown, but should be close to NTSC
- MCFG_SCREEN_RAW_PARAMS(XTAL_22_656MHz / 2, 720, 0, 512, 262, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(22'656'000) / 2, 720, 0, 512, 262, 16, 240)
#else
// MCFG_SCREEN_RAW_PARAMS breaks sprites; keeping this in for now
MCFG_SCREEN_REFRESH_RATE(60)
@@ -446,11 +446,11 @@ MACHINE_CONFIG_START(spbactn_state::spbactn)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* Was 3.579545MHz, a common clock, but no way to generate via on PCB OSCs */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(4'000'000)) /* Was 3.579545MHz, a common clock, but no way to generate via on PCB OSCs */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, PIN7_HIGH) /* Was 1.056MHz, a common clock, but no way to generate via on PCB OSCs. clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", XTAL(4'000'000)/4, PIN7_HIGH) /* Was 1.056MHz, a common clock, but no way to generate via on PCB OSCs. clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -458,15 +458,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(spbactn_state::spbactnp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(spbactnp_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", spbactn_state, irq3_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(spbactn_sound_map)
// yes another cpu..
- MCFG_CPU_ADD("extracpu", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("extracpu", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(spbactnp_extra_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", spbactn_state, irq0_line_hold)
// MCFG_CPU_VBLANK_INT_DRIVER("screen", spbactn_state, nmi_line_pulse)
@@ -500,11 +500,11 @@ MACHINE_CONFIG_START(spbactn_state::spbactnp)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(4'000'000))
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(4'000'000)/4, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp
index f68a8de3440..083017534f1 100644
--- a/src/mame/drivers/spc1000.cpp
+++ b/src/mame/drivers/spc1000.cpp
@@ -18,7 +18,7 @@ NOTE: 2014-09-13: added code from someone's modified MESS driver for floppy
author is Miso Kim.
Hardware details of the fdc: Intelligent device, Z80 CPU,
- XTAL_8MHz, PPI 8255, FDC uPD765C, 2 RAM chips, 28 other
+ XTAL(8'000'000), PPI 8255, FDC uPD765C, 2 RAM chips, 28 other
small ics. And of course, no schematic.
@@ -461,14 +461,14 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(spc1000_state::spc1000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(spc1000_mem)
MCFG_CPU_IO_MAP(spc1000_io)
/* video hardware */
MCFG_SCREEN_MC6847_NTSC_ADD("screen", "mc6847")
- MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, XTAL_3_579545MHz)
+ MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, XTAL(3'579'545))
MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(spc1000_state, irq_w))
MCFG_MC6847_INPUT_CALLBACK(READ8(spc1000_state, mc6847_videoram_r))
MCFG_MC6847_CHARROM_CALLBACK(spc1000_state, get_char_rom)
@@ -477,7 +477,7 @@ MACHINE_CONFIG_START(spc1000_state::spc1000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL_4MHz / 1)
+ MCFG_SOUND_ADD("ay8910", AY8910, XTAL(4'000'000) / 1)
MCFG_AY8910_PORT_A_READ_CB(READ8(spc1000_state, porta_r))
MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp
index ff5d5884b8a..ee1fe618848 100644
--- a/src/mame/drivers/spc1500.cpp
+++ b/src/mame/drivers/spc1500.cpp
@@ -239,7 +239,7 @@ TODO:
#include "formats/spc1000_cas.h"
-#define VDP_CLOCK XTAL_42_9545MHz
+#define VDP_CLOCK XTAL(42'954'545)
class spc1500_state : public driver_device
{
@@ -870,7 +870,7 @@ READ8_MEMBER( spc1500_state::porta_r )
MACHINE_CONFIG_START(spc1500_state::spc1500)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(spc1500_mem)
//MCFG_CPU_IO_MAP(spc1500_io)
MCFG_CPU_IO_MAP(spc1500_double_io)
@@ -903,7 +903,7 @@ MACHINE_CONFIG_START(spc1500_state::spc1500)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL_4MHz / 2)
+ MCFG_SOUND_ADD("ay8910", AY8910, XTAL(4'000'000) / 2)
MCFG_AY8910_PORT_A_READ_CB(READ8(spc1500_state, psga_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(spc1500_state, psgb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/mame/drivers/spdodgeb.cpp b/src/mame/drivers/spdodgeb.cpp
index d8aba46e42c..d1af2e92106 100644
--- a/src/mame/drivers/spdodgeb.cpp
+++ b/src/mame/drivers/spdodgeb.cpp
@@ -406,16 +406,16 @@ void spdodgeb_state::machine_reset()
MACHINE_CONFIG_START(spdodgeb_state::spdodgeb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/6) /* 2MHz ? */
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(12'000'000)/6) /* 2MHz ? */
MCFG_CPU_PROGRAM_MAP(spdodgeb_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", spdodgeb_state, interrupt, "screen", 0, 1) /* 1 IRQ every 8 visible scanlines, plus NMI for vblank */
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL_12MHz/2) // HD68A09P (1.5MHz internally)
+ MCFG_CPU_ADD("audiocpu", MC6809, XTAL(12'000'000)/2) // HD68A09P (1.5MHz internally)
MCFG_CPU_PROGRAM_MAP(spdodgeb_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2, 384, 0, 256, 272, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2, 384, 0, 256, 272, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(spdodgeb_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -429,7 +429,7 @@ MACHINE_CONFIG_START(spdodgeb_state::spdodgeb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", M6809_IRQ_LINE))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_12MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(12'000'000)/4)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp
index 004cbf8f226..de6509a33d0 100644
--- a/src/mame/drivers/special.cpp
+++ b/src/mame/drivers/special.cpp
@@ -463,7 +463,7 @@ MACHINE_CONFIG_DERIVED(special_state::specimx, special)
MCFG_I8255_IN_PORTC_CB(READ8(special_state, specialist_8255_portc_r))
MCFG_I8255_OUT_PORTC_CB(WRITE8(special_state, specialist_8255_portc_w))
- MCFG_FD1793_ADD("fd1793", XTAL_8MHz / 8)
+ MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(special_state, fdc_drq))
MCFG_FLOPPY_DRIVE_ADD("fd0", specimx_floppies, "525qd", special_state::specimx_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", special_state::specimx_floppy_formats)
@@ -518,7 +518,7 @@ MACHINE_CONFIG_START(special_state::erik)
MCFG_I8255_IN_PORTC_CB(READ8(special_state, specialist_8255_portc_r))
MCFG_I8255_OUT_PORTC_CB(WRITE8(special_state, specialist_8255_portc_w))
- MCFG_FD1793_ADD("fd1793", XTAL_8MHz / 8)
+ MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(special_state, fdc_drq))
MCFG_FLOPPY_DRIVE_ADD("fd0", specimx_floppies, "525qd", special_state::specimx_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", special_state::specimx_floppy_formats)
diff --git a/src/mame/drivers/spectra.cpp b/src/mame/drivers/spectra.cpp
index 02d1797478b..a2fd0d8179b 100644
--- a/src/mame/drivers/spectra.cpp
+++ b/src/mame/drivers/spectra.cpp
@@ -224,10 +224,10 @@ TIMER_DEVICE_CALLBACK_MEMBER( spectra_state::outtimer)
MACHINE_CONFIG_START(spectra_state::spectra)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_3_579545MHz/4) // actually a M6503
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(3'579'545)/4) // actually a M6503
MCFG_CPU_PROGRAM_MAP(spectra_map)
- MCFG_DEVICE_ADD("riot", RIOT6532, XTAL_3_579545MHz/4)
+ MCFG_DEVICE_ADD("riot", RIOT6532, XTAL(3'579'545)/4)
MCFG_RIOT6532_IN_PA_CB(READ8(spectra_state, porta_r))
MCFG_RIOT6532_OUT_PA_CB(WRITE8(spectra_state, porta_w))
MCFG_RIOT6532_IN_PB_CB(READ8(spectra_state, portb_r))
diff --git a/src/mame/drivers/speedatk.cpp b/src/mame/drivers/speedatk.cpp
index 58b6948154d..ef814f9f401 100644
--- a/src/mame/drivers/speedatk.cpp
+++ b/src/mame/drivers/speedatk.cpp
@@ -85,7 +85,7 @@ PS / PD : key matrix
#include "speaker.h"
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
void speedatk_state::machine_start()
{
diff --git a/src/mame/drivers/speedbal.cpp b/src/mame/drivers/speedbal.cpp
index d810cc82c2b..881471817ea 100644
--- a/src/mame/drivers/speedbal.cpp
+++ b/src/mame/drivers/speedbal.cpp
@@ -261,12 +261,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(speedbal_state::speedbal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) // 4 MHz
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000)) // 4 MHz
MCFG_CPU_PROGRAM_MAP(main_cpu_map)
MCFG_CPU_IO_MAP(main_cpu_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", speedbal_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_4MHz) // 4 MHz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000)) // 4 MHz
MCFG_CPU_PROGRAM_MAP(sound_cpu_map)
MCFG_CPU_IO_MAP(sound_cpu_io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(speedbal_state, irq0_line_hold, 1000/2) // approximate?
@@ -288,7 +288,7 @@ MACHINE_CONFIG_START(speedbal_state::speedbal)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) // 4 MHz(?)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(4'000'000)) // 4 MHz(?)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spinb.cpp b/src/mame/drivers/spinb.cpp
index 6ab54ee7ac6..923b12c6805 100644
--- a/src/mame/drivers/spinb.cpp
+++ b/src/mame/drivers/spinb.cpp
@@ -626,14 +626,14 @@ uint32_t spinb_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
MACHINE_CONFIG_START(spinb_state::spinb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(spinb_map)
MCFG_CPU_PERIODIC_INT_DRIVER(spinb_state, irq0_line_hold, 160) // NE556 adjustable (if faster, then jolypark has a stack problem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_5MHz / 2)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(5'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(spinb_audio_map)
- MCFG_CPU_ADD("musiccpu", Z80, XTAL_5MHz / 2)
+ MCFG_CPU_ADD("musiccpu", Z80, XTAL(5'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(spinb_music_map)
- MCFG_CPU_ADD("dmdcpu",I8031, XTAL_16MHz)
+ MCFG_CPU_ADD("dmdcpu",I8031, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(dmd_mem)
MCFG_CPU_IO_MAP(dmd_io)
@@ -653,12 +653,12 @@ MACHINE_CONFIG_START(spinb_state::spinb)
/* Sound */
MCFG_FRAGMENT_ADD( genpin_audio )
MCFG_SPEAKER_STANDARD_MONO("msmavol")
- MCFG_SOUND_ADD("msm_a", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("msm_a", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCK_CALLBACK(DEVWRITELINE("ic5a", ttl7474_device, clock_w))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmavol", 1.0)
MCFG_SPEAKER_STANDARD_MONO("msmmvol")
- MCFG_SOUND_ADD("msm_m", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("msm_m", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCK_CALLBACK(DEVWRITELINE("ic5m", ttl7474_device, clock_w))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmmvol", 1.0)
@@ -722,11 +722,11 @@ MACHINE_CONFIG_START(spinb_state::spinb)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(spinb_state::jolypark, spinb)
- MCFG_SOUND_REPLACE("msm_a", MSM6585, XTAL_640kHz)
+ MCFG_SOUND_REPLACE("msm_a", MSM6585, XTAL(640'000))
MCFG_MSM6585_VCK_CALLBACK(DEVWRITELINE("ic5a", ttl7474_device, clock_w))
MCFG_MSM6585_PRESCALER_SELECTOR(S40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmavol", 1.0)
- MCFG_SOUND_REPLACE("msm_m", MSM6585, XTAL_640kHz)
+ MCFG_SOUND_REPLACE("msm_m", MSM6585, XTAL(640'000))
MCFG_MSM6585_VCK_CALLBACK(DEVWRITELINE("ic5m", ttl7474_device, clock_w))
MCFG_MSM6585_PRESCALER_SELECTOR(S40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmmvol", 1.0)
diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp
index 3e194b08983..f56003817b1 100644
--- a/src/mame/drivers/splash.cpp
+++ b/src/mame/drivers/splash.cpp
@@ -474,11 +474,11 @@ MACHINE_RESET_MEMBER(splash_state,splash)
MACHINE_CONFIG_START(splash_state::splash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12MHz (24/2) */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz (24/2) */
MCFG_CPU_PROGRAM_MAP(splash_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", splash_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_30MHz/8) /* 3.75MHz (30/8) */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(30'000'000)/8) /* 3.75MHz (30/8) */
MCFG_CPU_PROGRAM_MAP(splash_sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(splash_state, nmi_line_pulse, 60*64) /* needed for the msm5205 to play the samples */
@@ -510,10 +510,10 @@ MACHINE_CONFIG_START(splash_state::splash)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_30MHz/8) /* 3.75MHz (30/8) */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(30'000'000)/8) /* 3.75MHz (30/8) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(splash_state, splash_msm5205_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */ /* Sample rate = 384kHz/48 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -536,11 +536,11 @@ INTERRUPT_GEN_MEMBER(splash_state::roldfrog_interrupt)
MACHINE_CONFIG_START(splash_state::roldfrog)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz - verified */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz - verified */
MCFG_CPU_PROGRAM_MAP(roldfrog_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", splash_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/8) /* 3 MHz - verified */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/8) /* 3 MHz - verified */
MCFG_CPU_PROGRAM_MAP(roldfrog_sound_map)
MCFG_CPU_IO_MAP(roldfrog_sound_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", splash_state, roldfrog_interrupt)
@@ -574,7 +574,7 @@ MACHINE_CONFIG_START(splash_state::roldfrog)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_24MHz / 8)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000) / 8)
MCFG_YM2203_IRQ_HANDLER(WRITELINE(splash_state, ym_irq))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
@@ -630,11 +630,11 @@ void funystrp_state::machine_start()
MACHINE_CONFIG_START(funystrp_state::funystrp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz (24/2) */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz (24/2) */
MCFG_CPU_PROGRAM_MAP(funystrp_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", funystrp_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/4) /* 6MHz (24/4) */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6MHz (24/4) */
MCFG_CPU_PROGRAM_MAP(funystrp_sound_map)
MCFG_CPU_IO_MAP(funystrp_sound_io_map)
@@ -659,12 +659,12 @@ MACHINE_CONFIG_START(funystrp_state::funystrp)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL_400kHz)
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL(400'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(funystrp_state, adpcm_int1)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 1 / 48 */ /* Sample rate = 400kHz/64 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("msm2", MSM5205, XTAL_400kHz)
+ MCFG_SOUND_ADD("msm2", MSM5205, XTAL(400'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(funystrp_state, adpcm_int2)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 1 / 96 */ /* Sample rate = 400kHz/96 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
diff --git a/src/mame/drivers/splus.cpp b/src/mame/drivers/splus.cpp
index b9eb30b3bd4..e0857eb7c2d 100644
--- a/src/mame/drivers/splus.cpp
+++ b/src/mame/drivers/splus.cpp
@@ -140,7 +140,7 @@ static const uint8_t optics[200] = {
0x07, 0x07, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0x07, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07 };
-#define MASTER_CLOCK XTAL_20MHz
+#define MASTER_CLOCK XTAL(20'000'000)
#define CPU_CLOCK ((MASTER_CLOCK)/2) /* divided by 2 - 7474 */
#define SOUND_CLOCK ((MASTER_CLOCK)/12)
diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp
index a7be3aa3c4f..4e78d2a51e7 100644
--- a/src/mame/drivers/spoker.cpp
+++ b/src/mame/drivers/spoker.cpp
@@ -594,7 +594,7 @@ void spoker_state::machine_reset()
MACHINE_CONFIG_START(spoker_state::spoker)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 2) /* HD64180RP8, 8 MHz? */
MCFG_CPU_PROGRAM_MAP(spoker_map)
MCFG_CPU_IO_MAP(spoker_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", spoker_state, nmi_line_assert)
@@ -626,17 +626,17 @@ MACHINE_CONFIG_START(spoker_state::spoker)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz / 12, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000) / 12, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(spoker_state::_3super8, spoker)
- MCFG_CPU_REPLACE("maincpu", Z80, XTAL_24MHz / 4) /* z840006, 24/4 MHz? */
+ MCFG_CPU_REPLACE("maincpu", Z80, XTAL(24'000'000) / 4) /* z840006, 24/4 MHz? */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(spoker_map)
MCFG_CPU_IO_MAP(3super8_portmap)
diff --git a/src/mame/drivers/sprcros2.cpp b/src/mame/drivers/sprcros2.cpp
index c174fe16724..f2935404056 100644
--- a/src/mame/drivers/sprcros2.cpp
+++ b/src/mame/drivers/sprcros2.cpp
@@ -59,7 +59,7 @@ SC-61.5A
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_10MHz
+#define MAIN_CLOCK XTAL(10'000'000)
class sprcros2_state : public driver_device
{
diff --git a/src/mame/drivers/sprint2.cpp b/src/mame/drivers/sprint2.cpp
index 883e6171069..35908666df0 100644
--- a/src/mame/drivers/sprint2.cpp
+++ b/src/mame/drivers/sprint2.cpp
@@ -512,7 +512,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(sprint2_state::sprint2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz / 16)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(12'096'000) / 16)
MCFG_CPU_PROGRAM_MAP(sprint2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sprint2_state, sprint2)
diff --git a/src/mame/drivers/spy.cpp b/src/mame/drivers/spy.cpp
index b2ef9812eda..9f4d2ac0130 100644
--- a/src/mame/drivers/spy.cpp
+++ b/src/mame/drivers/spy.cpp
@@ -495,11 +495,11 @@ void spy_state::machine_reset()
MACHINE_CONFIG_START(spy_state::spy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_24MHz / 8) // 3 MHz? (divided by 051961)
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(24'000'000) / 8) // 3 MHz? (divided by 051961)
MCFG_CPU_PROGRAM_MAP(spy_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", spy_state, spy_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(spy_sound_map) /* nmi by the sound chip */
MCFG_WATCHDOG_ADD("watchdog")
diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp
index bea032ace40..27e8a628e27 100644
--- a/src/mame/drivers/squale.cpp
+++ b/src/mame/drivers/squale.cpp
@@ -71,7 +71,7 @@
#include "speaker.h"
-#define MAIN_CLOCK XTAL_14MHz
+#define MAIN_CLOCK XTAL(14'000'000)
#define AY_CLOCK MAIN_CLOCK / 8 /* 1.75 Mhz */
#define VIDEO_CLOCK MAIN_CLOCK / 8 /* 1.75 Mhz */
#define CPU_CLOCK MAIN_CLOCK / 4 /* 3.50 Mhz */
@@ -830,7 +830,7 @@ MACHINE_CONFIG_START(squale_state::squale)
MCFG_TIMER_DRIVER_ADD_SCANLINE("squale_sl", squale_state, squale_scanline, "screen", 0, 10)
/* Floppy */
- MCFG_WD1770_ADD("wd1770", XTAL_8MHz )
+ MCFG_WD1770_ADD("wd1770", XTAL(8'000'000) )
MCFG_FLOPPY_DRIVE_ADD("wd1770:0", squale_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1770:1", squale_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop525_list", "squale")
diff --git a/src/mame/drivers/sshot.cpp b/src/mame/drivers/sshot.cpp
index acd2bd42b24..de72ae918f8 100644
--- a/src/mame/drivers/sshot.cpp
+++ b/src/mame/drivers/sshot.cpp
@@ -341,7 +341,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(supershot_state::supershot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SCMP, XTAL_11_289MHz/4)
+ MCFG_CPU_ADD("maincpu", SCMP, XTAL(11'289'000)/4)
MCFG_CPU_PROGRAM_MAP(supershot_map)
/* video hardware */
diff --git a/src/mame/drivers/ssozumo.cpp b/src/mame/drivers/ssozumo.cpp
index bbec61e6eac..3d031887c7d 100644
--- a/src/mame/drivers/ssozumo.cpp
+++ b/src/mame/drivers/ssozumo.cpp
@@ -215,7 +215,7 @@ MACHINE_CONFIG_START(ssozumo_state::ssozumo)
// MCFG_SCREEN_SIZE(32*8, 32*8)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8 - 1, 1*8, 31*8 - 1)
// DECO video CRTC, unverified
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2,384,0,256,272,8,248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2,384,0,256,272,8,248)
MCFG_SCREEN_UPDATE_DRIVER(ssozumo_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/sspeedr.cpp b/src/mame/drivers/sspeedr.cpp
index b03508c8ee6..de66d318e70 100644
--- a/src/mame/drivers/sspeedr.cpp
+++ b/src/mame/drivers/sspeedr.cpp
@@ -193,7 +193,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(sspeedr_state::sspeedr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_19_968MHz/8)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(19'968'000)/8)
MCFG_CPU_PROGRAM_MAP(sspeedr_map)
MCFG_CPU_IO_MAP(sspeedr_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sspeedr_state, irq0_line_assert)
diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp
index 62d8fac4d43..4ced73cabd9 100644
--- a/src/mame/drivers/ssv.cpp
+++ b/src/mame/drivers/ssv.cpp
@@ -2543,9 +2543,9 @@ DRIVER_INIT_MEMBER(ssv_state,ultrax) { init(1); }
DRIVER_INIT_MEMBER(ssv_state,vasara) { init(0); }
DRIVER_INIT_MEMBER(ssv_state,jsk) { init(0); save_item(NAME(m_latches)); }
-#define SSV_MASTER_CLOCK XTAL_48MHz/3
+#define SSV_MASTER_CLOCK XTAL(48'000'000)/3
-#define SSV_PIXEL_CLOCK XTAL_42_9545MHz/6
+#define SSV_PIXEL_CLOCK XTAL(42'954'545)/6
#define SSV_HTOTAL 0x1c6
#define SSV_HBEND 0
#define SSV_HBSTART 0x150
diff --git a/src/mame/drivers/stadhero.cpp b/src/mame/drivers/stadhero.cpp
index 216e9ed2382..0952f14d5b4 100644
--- a/src/mame/drivers/stadhero.cpp
+++ b/src/mame/drivers/stadhero.cpp
@@ -202,11 +202,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(stadhero_state::stadhero)
/* 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(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", stadhero_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", M6502, XTAL_24MHz/16)
+ MCFG_CPU_ADD("audiocpu", M6502, XTAL(24'000'000)/16)
MCFG_CPU_PROGRAM_MAP(audio_map)
/* video hardware */
@@ -236,17 +236,17 @@ MACHINE_CONFIG_START(stadhero_state::stadhero)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_24MHz/16)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(24'000'000)/16)
MCFG_SOUND_ROUTE(0, "mono", 0.95)
MCFG_SOUND_ROUTE(1, "mono", 0.95)
MCFG_SOUND_ROUTE(2, "mono", 0.95)
MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL_24MHz/8)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL(24'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/starwars.cpp b/src/mame/drivers/starwars.cpp
index 914fd07731b..98bacd514d7 100644
--- a/src/mame/drivers/starwars.cpp
+++ b/src/mame/drivers/starwars.cpp
@@ -40,8 +40,8 @@
#include "speaker.h"
-#define MASTER_CLOCK (XTAL_12_096MHz)
-#define CLOCK_3KHZ ((double)MASTER_CLOCK / 4096)
+#define MASTER_CLOCK (XTAL(12'096'000))
+#define CLOCK_3KHZ (MASTER_CLOCK / 4096)
WRITE8_MEMBER(starwars_state::quad_pokeyn_w)
diff --git a/src/mame/drivers/stfight.cpp b/src/mame/drivers/stfight.cpp
index 676dae1fdaa..243492b300e 100644
--- a/src/mame/drivers/stfight.cpp
+++ b/src/mame/drivers/stfight.cpp
@@ -451,15 +451,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(stfight_state::stfight_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(cpu1_map)
MCFG_CPU_VBLANK_INT_DRIVER("stfight_vid:screen", stfight_state, stfight_vb_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz / 4)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(cpu2_map)
MCFG_CPU_PERIODIC_INT_DRIVER(stfight_state, irq0_line_hold, 120)
- MCFG_CPU_ADD("mcu", M68705P5, XTAL_12MHz / 4)
+ MCFG_CPU_ADD("mcu", M68705P5, XTAL(12'000'000) / 4)
MCFG_M68705_PORTB_R_CB(READ8(stfight_state, stfight_68705_port_b_r));
MCFG_M68705_PORTA_W_CB(WRITE8(stfight_state, stfight_68705_port_a_w));
MCFG_M68705_PORTB_W_CB(WRITE8(stfight_state, stfight_68705_port_b_w));
@@ -474,19 +474,19 @@ MACHINE_CONFIG_START(stfight_state::stfight_base)
MCFG_SPEAKER_STANDARD_MONO("mono")
// YM2203_PITCH_HACK - These should be clocked at 1.5Mhz (see TODO list)
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz / 8 * 3)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000) / 8 * 3)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.10)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_12MHz / 8 * 3)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(12'000'000) / 8 * 3)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.10)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(stfight_state, stfight_adpcm_int)) // Interrupt function
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) // 8KHz, 4-bit
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/stlforce.cpp b/src/mame/drivers/stlforce.cpp
index 5e5d6645ac3..0df7c593bc7 100644
--- a/src/mame/drivers/stlforce.cpp
+++ b/src/mame/drivers/stlforce.cpp
@@ -216,7 +216,7 @@ MACHINE_CONFIG_START(stlforce_state::stlforce)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- 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
@@ -224,13 +224,13 @@ MACHINE_CONFIG_DERIVED(stlforce_state::twinbrat, stlforce)
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_14_7456MHz)
+ MCFG_CPU_CLOCK(XTAL(14'745'600))
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(3*8, 45*8-1, 0*8, 30*8-1)
MCFG_DEVICE_MODIFY("oki")
- MCFG_DEVICE_CLOCK(XTAL_30MHz / 32) // verified on 2 PCBs
+ MCFG_DEVICE_CLOCK(XTAL(30'000'000) / 32) // verified on 2 PCBs
MCFG_DEVICE_ADDRESS_MAP(0, twinbrat_oki_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp
index a8c0e77f2fc..ae954485c68 100644
--- a/src/mame/drivers/studio2.cpp
+++ b/src/mame/drivers/studio2.cpp
@@ -655,7 +655,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(visicom_state::visicom)
/* basic machine hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_3_579545MHz/2)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(3'579'545)/2)
MCFG_CPU_PROGRAM_MAP(visicom_map)
MCFG_CPU_IO_MAP(visicom_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
@@ -666,11 +666,11 @@ MACHINE_CONFIG_START(visicom_state::visicom)
MCFG_COSMAC_DMAW_CALLBACK(WRITE8(visicom_state, dma_w))
/* video hardware */
- MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL_3_579545MHz/2)
+ MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL(3'579'545)/2)
MCFG_CDP1861_IRQ_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT))
MCFG_CDP1861_DMA_OUT_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT))
MCFG_CDP1861_EFX_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1))
- MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL_3_579545MHz/2)
+ MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL(3'579'545)/2)
MCFG_SCREEN_UPDATE_DRIVER(visicom_state, screen_update)
/* sound hardware */
diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp
index 3fe68361575..4645cb2550f 100644
--- a/src/mame/drivers/stuntair.cpp
+++ b/src/mame/drivers/stuntair.cpp
@@ -510,11 +510,11 @@ void stuntair_state::machine_reset()
MACHINE_CONFIG_START(stuntair_state::stuntair)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* 3 MHz? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* 3 MHz? */
MCFG_CPU_PROGRAM_MAP(stuntair_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", stuntair_state, stuntair_irq)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6) /* 3 MHz? */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* 3 MHz? */
MCFG_CPU_PROGRAM_MAP(stuntair_sound_map)
MCFG_CPU_IO_MAP(stuntair_sound_portmap)
MCFG_CPU_PERIODIC_INT_DRIVER(stuntair_state, irq0_line_hold, 420) // drives music tempo, timing is approximate based on PCB audio recording.. and where is irq ack?
@@ -552,12 +552,12 @@ MACHINE_CONFIG_START(stuntair_state::stuntair)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/12)
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(stuntair_state, ay8910_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/12)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'432'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp
index ab6a6b59e84..c60d9ce7733 100644
--- a/src/mame/drivers/stv.cpp
+++ b/src/mame/drivers/stv.cpp
@@ -1077,7 +1077,7 @@ MACHINE_CONFIG_START(stv_state::stv)
MCFG_SEGA_SCU_ADD("scu")
sega_scu_device::static_set_hostcpu(*device, "maincpu");
- MCFG_SMPC_HLE_ADD("smpc", XTAL_4MHz)
+ MCFG_SMPC_HLE_ADD("smpc", XTAL(4'000'000))
smpc_hle_device::static_set_region_code(*device, 0);
MCFG_SMPC_HLE_PDR1_IN_CB(READ8(stv_state, pdr1_input_r))
MCFG_SMPC_HLE_PDR2_IN_CB(READ8(stv_state, pdr2_input_r))
diff --git a/src/mame/drivers/su2000.cpp b/src/mame/drivers/su2000.cpp
index a1c0f0534e0..daadfd11bf9 100644
--- a/src/mame/drivers/su2000.cpp
+++ b/src/mame/drivers/su2000.cpp
@@ -48,9 +48,9 @@
*************************************/
#define I486_CLOCK 33000000
-#define MC68000_CLOCK XTAL_10MHz
-#define TMS320C1_CLOCK XTAL_33_833MHz
-#define MC88110_CLOCK XTAL_40MHz
+#define MC68000_CLOCK XTAL(10'000'000)
+#define TMS320C1_CLOCK XTAL(33'833'000)
+#define MC88110_CLOCK XTAL(40'000'000)
/*************************************
@@ -137,7 +137,7 @@ MACHINE_CONFIG_START(su2000_state::su2000)
MCFG_CPU_ADD("pix_cpu2", MC88110, MC88110_CLOCK)
MCFG_CPU_PROGRAM_MAP(pix_cpu_b)
- MCFG_CPU_ADD("format_c", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("format_c", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(formatc_map)
#endif
diff --git a/src/mame/drivers/sub.cpp b/src/mame/drivers/sub.cpp
index 4383df8c90d..c2aaf07f178 100644
--- a/src/mame/drivers/sub.cpp
+++ b/src/mame/drivers/sub.cpp
@@ -117,7 +117,7 @@ PCB2 (Top board, CPU board)
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
class sub_state : public driver_device
{
diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp
index 0740a2ab9b5..b45a1bf25a8 100644
--- a/src/mame/drivers/subsino.cpp
+++ b/src/mame/drivers/subsino.cpp
@@ -2758,7 +2758,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(subsino_state::victor21)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown clock */
MCFG_CPU_PROGRAM_MAP(victor21_map)
MCFG_CPU_IO_MAP(subsino_iomap)
@@ -2790,10 +2790,10 @@ MACHINE_CONFIG_START(subsino_state::victor21)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_4_433619MHz / 4, PIN7_HIGH) /* Clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", XTAL(4'433'619) / 4, PIN7_HIGH) /* Clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2808,7 +2808,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(subsino_state::crsbingo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown CPU and clock */
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown CPU and clock */
MCFG_CPU_PROGRAM_MAP(crsbingo_map)
MCFG_CPU_IO_MAP(subsino_iomap)
@@ -2833,14 +2833,14 @@ MACHINE_CONFIG_START(subsino_state::crsbingo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) /* Unknown clock */
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545)) /* Unknown clock */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(subsino_state::srider)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown clock */
MCFG_CPU_PROGRAM_MAP(srider_map)
MCFG_CPU_IO_MAP(subsino_iomap)
@@ -2875,10 +2875,10 @@ MACHINE_CONFIG_START(subsino_state::srider)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_4_433619MHz / 4, PIN7_HIGH) /* Clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", XTAL(4'433'619) / 4, PIN7_HIGH) /* Clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2892,7 +2892,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(subsino_state::tisub)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown CPU and clock */
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown CPU and clock */
MCFG_CPU_PROGRAM_MAP(tisub_map)
MCFG_CPU_IO_MAP(subsino_iomap)
@@ -2927,13 +2927,13 @@ MACHINE_CONFIG_START(subsino_state::tisub)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz) /* Unknown clock */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(3'579'545)) /* Unknown clock */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(subsino_state::stbsub)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown clock */
MCFG_CPU_PROGRAM_MAP(stbsub_map)
MCFG_CPU_IO_MAP(subsino_iomap)
@@ -2970,7 +2970,7 @@ MACHINE_CONFIG_START(subsino_state::stbsub)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp
index 1a128e27402..51200c347d8 100644
--- a/src/mame/drivers/subsino2.cpp
+++ b/src/mame/drivers/subsino2.cpp
@@ -2341,7 +2341,7 @@ INPUT_PORTS_END
***************************************************************************/
MACHINE_CONFIG_START(subsino2_state::bishjan)
- MCFG_CPU_ADD("maincpu", H83044, XTAL_44_1MHz / 3)
+ MCFG_CPU_ADD("maincpu", H83044, XTAL(44'100'000) / 3)
MCFG_CPU_PROGRAM_MAP( bishjan_map )
MCFG_CPU_VBLANK_INT_DRIVER("screen", subsino2_state, irq0_line_hold)
@@ -2377,7 +2377,7 @@ MACHINE_CONFIG_DERIVED(subsino2_state::new2001, bishjan)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(subsino2_state::humlan, bishjan)
- MCFG_CPU_REPLACE("maincpu", H83044, XTAL_48MHz / 3)
+ MCFG_CPU_REPLACE("maincpu", H83044, XTAL(48'000'000) / 3)
MCFG_CPU_PROGRAM_MAP( humlan_map )
MCFG_CPU_VBLANK_INT_DRIVER("screen", subsino2_state, irq0_line_hold)
@@ -2390,7 +2390,7 @@ MACHINE_CONFIG_END
***************************************************************************/
MACHINE_CONFIG_START(subsino2_state::mtrain)
- MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
+ MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown clock */
MCFG_CPU_PROGRAM_MAP( mtrain_map )
MCFG_CPU_IO_MAP( mtrain_io )
@@ -2415,7 +2415,7 @@ MACHINE_CONFIG_START(subsino2_state::mtrain)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8_4672MHz / 8, PIN7_HIGH) // probably
+ MCFG_OKIM6295_ADD("oki", XTAL(8'467'200) / 8, PIN7_HIGH) // probably
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2424,7 +2424,7 @@ MACHINE_CONFIG_END
***************************************************************************/
MACHINE_CONFIG_START(subsino2_state::saklove)
- MCFG_CPU_ADD("maincpu", I80188, XTAL_20MHz*2 ) // !! AMD AM188-EM !!
+ MCFG_CPU_ADD("maincpu", I80188, XTAL(20'000'000)*2 ) // !! AMD AM188-EM !!
MCFG_CPU_PROGRAM_MAP( saklove_map )
MCFG_CPU_IO_MAP( saklove_io )
@@ -2449,10 +2449,10 @@ MACHINE_CONFIG_START(subsino2_state::saklove)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8_4672MHz / 8, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(8'467'200) / 8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_12MHz / 4) // ? chip and clock unknown
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(12'000'000) / 4) // ? chip and clock unknown
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -2461,7 +2461,7 @@ MACHINE_CONFIG_END
***************************************************************************/
MACHINE_CONFIG_START(subsino2_state::xplan)
- MCFG_CPU_ADD("maincpu", I80188, XTAL_20MHz*2 ) // !! AMD AM188-EM !!
+ MCFG_CPU_ADD("maincpu", I80188, XTAL(20'000'000)*2 ) // !! AMD AM188-EM !!
MCFG_CPU_PROGRAM_MAP( xplan_map )
MCFG_CPU_IO_MAP( xplan_io )
MCFG_CPU_VBLANK_INT_DRIVER("screen", subsino2_state, am188em_int0_irq)
@@ -2487,7 +2487,7 @@ MACHINE_CONFIG_START(subsino2_state::xplan)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8_4672MHz / 8, PIN7_HIGH) // probably
+ MCFG_OKIM6295_ADD("oki", XTAL(8'467'200) / 8, PIN7_HIGH) // probably
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sun1.cpp b/src/mame/drivers/sun1.cpp
index 790d36d094a..bfec5435f91 100644
--- a/src/mame/drivers/sun1.cpp
+++ b/src/mame/drivers/sun1.cpp
@@ -113,10 +113,10 @@ void sun1_state::machine_reset()
MACHINE_CONFIG_START(sun1_state::sun1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(sun1_mem)
- MCFG_DEVICE_ADD("timer", AM9513, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("timer", AM9513, XTAL(16'000'000) / 4)
MCFG_AM9513_FOUT_CALLBACK(DEVWRITELINE("timer", am9513_device, gate1_w))
MCFG_AM9513_OUT1_CALLBACK(NOOP) // Watchdog; generates BERR/Reset
MCFG_AM9513_OUT2_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_6)) // User timer
@@ -126,7 +126,7 @@ MACHINE_CONFIG_START(sun1_state::sun1)
MCFG_AM9513_OUT5_CALLBACK(DEVWRITELINE("iouart", upd7201_new_device, rxcb_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("iouart", upd7201_new_device, txcb_w))
- MCFG_DEVICE_ADD("iouart", UPD7201_NEW, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("iouart", UPD7201_NEW, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
diff --git a/src/mame/drivers/sun2.cpp b/src/mame/drivers/sun2.cpp
index 9c86bcdfa36..17f6c369102 100644
--- a/src/mame/drivers/sun2.cpp
+++ b/src/mame/drivers/sun2.cpp
@@ -591,7 +591,7 @@ void sun2_state::machine_reset()
MACHINE_CONFIG_START(sun2_state::sun2vme)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68010, XTAL_19_6608MHz / 2) // or XTAL_24MHz / 2 by jumper setting
+ MCFG_CPU_ADD("maincpu", M68010, XTAL(19'660'800) / 2) // or XTAL(24'000'000) / 2 by jumper setting
MCFG_CPU_PROGRAM_MAP(sun2_mem)
MCFG_RAM_ADD(RAM_TAG)
@@ -633,7 +633,7 @@ MACHINE_CONFIG_START(sun2_state::sun2vme)
MCFG_SCREEN_VISIBLE_AREA(0, 1152-1, 0, 900-1)
MCFG_SCREEN_REFRESH_RATE(72)
- MCFG_DEVICE_ADD("timer", AM9513A, XTAL_19_6608MHz / 4)
+ MCFG_DEVICE_ADD("timer", AM9513A, XTAL(19'660'800) / 4)
MCFG_AM9513_FOUT_CALLBACK(DEVWRITELINE("timer", am9513_device, gate1_w))
MCFG_AM9513_OUT1_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_7))
MCFG_AM9513_OUT2_CALLBACK(DEVWRITELINE("irq5", input_merger_device, in_w<0>))
@@ -644,8 +644,8 @@ MACHINE_CONFIG_START(sun2_state::sun2vme)
MCFG_INPUT_MERGER_ANY_HIGH("irq5") // 74LS05 open collectors
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", M68K_IRQ_5))
- MCFG_SCC8530_ADD(SCC1_TAG, XTAL_19_6608MHz / 4, 0, 0, 0, 0)
- MCFG_SCC8530_ADD(SCC2_TAG, XTAL_19_6608MHz / 4, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC1_TAG, XTAL(19'660'800) / 4, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC2_TAG, XTAL(19'660'800) / 4, 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_INT_CB(INPUTLINE("maincpu", M68K_IRQ_6))
@@ -663,7 +663,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sun2_state::sun2mbus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68010, XTAL_39_3216MHz / 4)
+ MCFG_CPU_ADD("maincpu", M68010, XTAL(39'321'600) / 4)
MCFG_CPU_PROGRAM_MAP(sun2_mem)
MCFG_RAM_ADD(RAM_TAG)
@@ -705,7 +705,7 @@ MACHINE_CONFIG_START(sun2_state::sun2mbus)
MCFG_SCREEN_VISIBLE_AREA(0, 1152-1, 0, 900-1)
MCFG_SCREEN_REFRESH_RATE(72)
- MCFG_DEVICE_ADD("timer", AM9513, XTAL_39_3216MHz / 8)
+ MCFG_DEVICE_ADD("timer", AM9513, XTAL(39'321'600) / 8)
MCFG_AM9513_FOUT_CALLBACK(DEVWRITELINE("timer", am9513_device, gate1_w))
MCFG_AM9513_OUT1_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_7))
MCFG_AM9513_OUT2_CALLBACK(DEVWRITELINE("irq5", input_merger_device, in_w<0>))
@@ -716,8 +716,8 @@ MACHINE_CONFIG_START(sun2_state::sun2mbus)
MCFG_INPUT_MERGER_ANY_HIGH("irq5") // 74LS05 open collectors
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", M68K_IRQ_5))
- MCFG_SCC8530_ADD(SCC1_TAG, XTAL_39_3216MHz / 8, 0, 0, 0, 0)
- MCFG_SCC8530_ADD(SCC2_TAG, XTAL_39_3216MHz / 8, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC1_TAG, XTAL(39'321'600) / 8, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC2_TAG, XTAL(39'321'600) / 8, 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_INT_CB(INPUTLINE("maincpu", M68K_IRQ_6))
diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp
index 55b2140798b..b77ccfd1011 100644
--- a/src/mame/drivers/sun3.cpp
+++ b/src/mame/drivers/sun3.cpp
@@ -1004,13 +1004,13 @@ MACHINE_CONFIG_START(sun3_state::sun3)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer", sun3_state, sun3_timer, attotime::from_hz(100))
- MCFG_SCC8530_ADD(SCC1_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
MCFG_SUNKBD_PORT_ADD(KEYBOARD_TAG, default_sun_keyboard_devices, "type3hle")
MCFG_SUNKBD_RXD_HANDLER(DEVWRITELINE(SCC1_TAG, z80scc_device, rxa_w))
- MCFG_SCC8530_ADD(SCC2_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
@@ -1106,13 +1106,13 @@ MACHINE_CONFIG_START(sun3_state::sun3_50)
MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(32)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x80000000)
- MCFG_SCC8530_ADD(SCC1_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
MCFG_SUNKBD_PORT_ADD(KEYBOARD_TAG, default_sun_keyboard_devices, "type3hle")
MCFG_SUNKBD_RXD_HANDLER(DEVWRITELINE(SCC1_TAG, z80scc_device, rxa_w))
- MCFG_SCC8530_ADD(SCC2_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
diff --git a/src/mame/drivers/sun3x.cpp b/src/mame/drivers/sun3x.cpp
index 67c0d474dfd..ce1df76f478 100644
--- a/src/mame/drivers/sun3x.cpp
+++ b/src/mame/drivers/sun3x.cpp
@@ -584,13 +584,13 @@ MACHINE_CONFIG_START(sun3x_state::sun3_80)
MCFG_M48T02_ADD(TIMEKEEPER_TAG)
- MCFG_SCC8530_ADD(SCC1_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
MCFG_SUNKBD_PORT_ADD(KEYBOARD_TAG, default_sun_keyboard_devices, "type3hle")
MCFG_SUNKBD_RXD_HANDLER(DEVWRITELINE(SCC1_TAG, z80scc_device, rxa_w))
- MCFG_SCC8530_ADD(SCC2_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
@@ -631,8 +631,8 @@ MACHINE_CONFIG_START(sun3x_state::sun3_460)
MCFG_M48T02_ADD(TIMEKEEPER_TAG)
- MCFG_SCC8530_ADD(SCC1_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
- MCFG_SCC8530_ADD(SCC2_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp
index e862872eb56..71ed48b5b71 100644
--- a/src/mame/drivers/sun4.cpp
+++ b/src/mame/drivers/sun4.cpp
@@ -486,7 +486,7 @@
#define DMA_CTRL (0)
#define DMA_ADDR (1)
#define DMA_BYTE_COUNT (2)
-#define DMA_XTAL (XTAL_25MHz)
+#define DMA_XTAL (XTAL(25'000'000))
namespace
{
@@ -1926,7 +1926,7 @@ MACHINE_CONFIG_START(sun4_state::sun4)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x80000000)
// Keyboard/mouse
- MCFG_SCC8530_ADD(SCC1_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_INT_CB(WRITELINE(sun4_state, scc1_int))
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
@@ -1934,7 +1934,7 @@ MACHINE_CONFIG_START(sun4_state::sun4)
MCFG_SUNKBD_RXD_HANDLER(DEVWRITELINE(SCC1_TAG, z80scc_device, rxa_w))
// RS232 serial ports
- MCFG_SCC8530_ADD(SCC2_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_INT_CB(WRITELINE(sun4_state, scc2_int))
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
@@ -1991,7 +1991,7 @@ MACHINE_CONFIG_START(sun4_state::sun4c)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x80000000)
// Keyboard/mouse
- MCFG_SCC8530_ADD(SCC1_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_INT_CB(WRITELINE(sun4_state, scc1_int))
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
@@ -1999,7 +1999,7 @@ MACHINE_CONFIG_START(sun4_state::sun4c)
MCFG_SUNKBD_RXD_HANDLER(DEVWRITELINE(SCC1_TAG, z80scc_device, rxa_w))
// RS232 serial ports
- MCFG_SCC8530_ADD(SCC2_TAG, XTAL_4_9152MHz, 0, 0, 0, 0)
+ MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_Z80SCC_OUT_INT_CB(WRITELINE(sun4_state, scc2_int))
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp
index 512910df2eb..d0688313bba 100644
--- a/src/mame/drivers/suna16.cpp
+++ b/src/mame/drivers/suna16.cpp
@@ -799,18 +799,18 @@ TIMER_DEVICE_CALLBACK_MEMBER(suna16_state::bssoccer_interrupt)
MACHINE_CONFIG_START(suna16_state::bssoccer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/4) /* 8MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/4) /* 8MHz */
MCFG_CPU_PROGRAM_MAP(bssoccer_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", suna16_state, bssoccer_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4) /* Z80B at 3.579545MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* Z80B at 3.579545MHz */
MCFG_CPU_PROGRAM_MAP(bssoccer_sound_map)
- MCFG_CPU_ADD("pcm1", Z80, XTAL_32MHz/6) /* Z80B at 5.333MHz */
+ MCFG_CPU_ADD("pcm1", Z80, XTAL(32'000'000)/6) /* Z80B at 5.333MHz */
MCFG_CPU_PROGRAM_MAP(bssoccer_pcm_1_map)
MCFG_CPU_IO_MAP(bssoccer_pcm_1_io_map)
- MCFG_CPU_ADD("pcm2", Z80, XTAL_32MHz/6) /* Z80B at 5.333MHz */
+ MCFG_CPU_ADD("pcm2", Z80, XTAL(32'000'000)/6) /* Z80B at 5.333MHz */
MCFG_CPU_PROGRAM_MAP(bssoccer_pcm_2_map)
MCFG_CPU_IO_MAP(bssoccer_pcm_2_io_map)
@@ -838,7 +838,7 @@ MACHINE_CONFIG_START(suna16_state::bssoccer)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_GENERIC_LATCH_8_ADD("soundlatch3")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545MHz */
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.2)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.2)
@@ -862,14 +862,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(suna16_state::uballoon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/4) /* 8MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/4) /* 8MHz */
MCFG_CPU_PROGRAM_MAP(uballoon_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", suna16_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4) /* Z80B at 3.579545MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* Z80B at 3.579545MHz */
MCFG_CPU_PROGRAM_MAP(uballoon_sound_map)
- MCFG_CPU_ADD("pcm1", Z80, XTAL_32MHz/6) /* Z80B at 5.333MHz */
+ MCFG_CPU_ADD("pcm1", Z80, XTAL(32'000'000)/6) /* Z80B at 5.333MHz */
MCFG_CPU_PROGRAM_MAP(uballoon_pcm_1_map)
MCFG_CPU_IO_MAP(uballoon_pcm_1_io_map)
@@ -899,7 +899,7 @@ MACHINE_CONFIG_START(suna16_state::uballoon)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545MHz */
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -917,14 +917,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(suna16_state::sunaq)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 6MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* 6MHz */
MCFG_CPU_PROGRAM_MAP(sunaq_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", suna16_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4) /* Z80B at 3.579545MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* Z80B at 3.579545MHz */
MCFG_CPU_PROGRAM_MAP(sunaq_sound_map)
- MCFG_CPU_ADD("pcm1", Z80, XTAL_24MHz/4) /* Z80B at 6MHz */
+ MCFG_CPU_ADD("pcm1", Z80, XTAL(24'000'000)/4) /* Z80B at 6MHz */
MCFG_CPU_PROGRAM_MAP(bssoccer_pcm_1_map)
MCFG_CPU_IO_MAP(bssoccer_pcm_1_io_map)
@@ -955,7 +955,7 @@ MACHINE_CONFIG_START(suna16_state::sunaq)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545MHz */
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -978,14 +978,14 @@ WRITE8_MEMBER(suna16_state::bestbest_ay8910_port_a_w)
MACHINE_CONFIG_START(suna16_state::bestbest)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 6MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* 6MHz */
MCFG_CPU_PROGRAM_MAP(bestbest_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", suna16_state, bssoccer_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/4) /* 6MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6MHz */
MCFG_CPU_PROGRAM_MAP(bestbest_sound_map)
- MCFG_CPU_ADD("pcm1", Z80, XTAL_24MHz/4) /* 6MHz */
+ MCFG_CPU_ADD("pcm1", Z80, XTAL(24'000'000)/4) /* 6MHz */
MCFG_CPU_PROGRAM_MAP(bestbest_pcm_1_map)
MCFG_CPU_IO_MAP(bestbest_pcm_1_iomap)
@@ -1014,12 +1014,12 @@ MACHINE_CONFIG_START(suna16_state::bestbest)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_24MHz/16) /* 1.5MHz */
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(24'000'000)/16) /* 1.5MHz */
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(suna16_state, bestbest_ay8910_port_a_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL_24MHz/8) /* 3MHz */
+ MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(24'000'000)/8) /* 3MHz */
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp
index a222c77c018..7d94f03c7cf 100644
--- a/src/mame/drivers/suna8.cpp
+++ b/src/mame/drivers/suna8.cpp
@@ -48,7 +48,7 @@ Notes:
#include "speaker.h"
-#define SUNA8_MASTER_CLOCK XTAL_24MHz
+#define SUNA8_MASTER_CLOCK XTAL(24'000'000)
/***************************************************************************
diff --git a/src/mame/drivers/supbtime.cpp b/src/mame/drivers/supbtime.cpp
index 9349fd66f02..5d4e828bf81 100644
--- a/src/mame/drivers/supbtime.cpp
+++ b/src/mame/drivers/supbtime.cpp
@@ -431,15 +431,15 @@ GFXDECODE_END
//**************************************************************************
MACHINE_CONFIG_START(supbtime_state::supbtime)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(supbtime_map)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz / 8)
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
MCFG_CPU_PROGRAM_MAP(sound_map)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz / 4, 442, 0, 320, 274, 8, 248)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(supbtime_state, vblank_w))
MCFG_SCREEN_UPDATE_DRIVER(supbtime_state, screen_update_supbtime)
MCFG_SCREEN_PALETTE("palette")
@@ -471,12 +471,12 @@ MACHINE_CONFIG_START(supbtime_state::supbtime)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_YM2151_ADD("ymsnd", XTAL_32_22MHz / 9)
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000) / 9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ 2
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki", XTAL_21_4772MHz / 20, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(21'477'272) / 20, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/supdrapo.cpp b/src/mame/drivers/supdrapo.cpp
index cda8f1278ec..e9d44f0ca5d 100644
--- a/src/mame/drivers/supdrapo.cpp
+++ b/src/mame/drivers/supdrapo.cpp
@@ -66,7 +66,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
#define CPU_CLOCK MASTER_CLOCK/4 /* guess */
#define SND_CLOCK MASTER_CLOCK/8 /* guess */
diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp
index add713d2735..66426bfb9c8 100644
--- a/src/mame/drivers/supduck.cpp
+++ b/src/mame/drivers/supduck.cpp
@@ -437,11 +437,11 @@ void supduck_state::machine_reset()
MACHINE_CONFIG_START(supduck_state::supduck)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* Verified on PCB */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000)) /* Verified on PCB */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", supduck_state, irq2_line_hold) // 2 & 4?
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/4) /* 2MHz - verified on PCB */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/4) /* 2MHz - verified on PCB */
MCFG_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
@@ -468,7 +468,7 @@ MACHINE_CONFIG_START(supduck_state::supduck)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_8MHz/8, PIN7_HIGH) // 1MHz - Verified on PCB, pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(8'000'000)/8, PIN7_HIGH) // 1MHz - Verified on PCB, pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
diff --git a/src/mame/drivers/super6.cpp b/src/mame/drivers/super6.cpp
index 00e6ac729c9..51711c9c4de 100644
--- a/src/mame/drivers/super6.cpp
+++ b/src/mame/drivers/super6.cpp
@@ -477,18 +477,18 @@ void super6_state::machine_reset()
MACHINE_CONFIG_START(super6_state::super6)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_24MHz/4)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(24'000'000)/4)
MCFG_CPU_PROGRAM_MAP(super6_mem)
MCFG_CPU_IO_MAP(super6_io)
MCFG_Z80_DAISY_CHAIN(super6_daisy_chain)
// devices
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_24MHz/4)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(24'000'000)/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", super6_state, ctc_tick, attotime::from_hz(XTAL_24MHz/16))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", super6_state, ctc_tick, attotime::from_hz(XTAL(24'000'000)/16))
- MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL_24MHz/6)
+ MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(24'000'000)/6)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg2))
MCFG_Z80DMA_IN_MREQ_CB(READ8(super6_state, memory_read_byte))
@@ -496,7 +496,7 @@ MACHINE_CONFIG_START(super6_state::super6)
MCFG_Z80DMA_IN_IORQ_CB(READ8(super6_state, io_read_byte))
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(super6_state, io_write_byte))
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_24MHz/4)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(24'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_WD2793_ADD(WD2793_TAG, 1000000)
@@ -506,7 +506,7 @@ MACHINE_CONFIG_START(super6_state::super6)
MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", super6_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":1", super6_floppies, nullptr, floppy_image_device::default_floppy_formats)
- MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL_24MHz/4)
+ MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(24'000'000)/4)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
@@ -522,7 +522,7 @@ MACHINE_CONFIG_START(super6_state::super6)
MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
- MCFG_DEVICE_ADD(BR1945_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(BR1945_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, txca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg1))
diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp
index b1368fc8f04..3c9acd8985c 100644
--- a/src/mame/drivers/super80.cpp
+++ b/src/mame/drivers/super80.cpp
@@ -226,7 +226,7 @@ ToDo:
#include "super80.lh"
-#define MASTER_CLOCK (XTAL_12MHz)
+#define MASTER_CLOCK (XTAL(12'000'000))
#define PIXEL_CLOCK (MASTER_CLOCK/2)
#define HTOTAL (384)
#define HBEND (0)
@@ -852,7 +852,7 @@ MACHINE_CONFIG_DERIVED(super80_state::super80r, super80v)
MCFG_Z80DMA_IN_IORQ_CB(READ8(super80_state, io_read_byte))
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(super80_state, io_write_byte))
- MCFG_WD2793_ADD("fdc", XTAL_2MHz)
+ MCFG_WD2793_ADD("fdc", XTAL(2'000'000))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", super80_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
diff --git a/src/mame/drivers/superchs.cpp b/src/mame/drivers/superchs.cpp
index b36477f516d..1f00265b10e 100644
--- a/src/mame/drivers/superchs.cpp
+++ b/src/mame/drivers/superchs.cpp
@@ -240,11 +240,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(superchs_state::superchs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_40MHz/2) /* 20MHz - verified */
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(40'000'000)/2) /* 20MHz - verified */
MCFG_CPU_PROGRAM_MAP(superchs_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", superchs_state, irq2_line_hold)
- MCFG_CPU_ADD("sub", M68000, XTAL_32MHz/2) /* 16MHz - verified */
+ MCFG_CPU_ADD("sub", M68000, XTAL(32'000'000)/2) /* 16MHz - verified */
MCFG_CPU_PROGRAM_MAP(superchs_cpub_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", superchs_state, irq4_line_hold)
diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp
index 6e695fb5d4b..646d9b94bb6 100644
--- a/src/mame/drivers/supercrd.cpp
+++ b/src/mame/drivers/supercrd.cpp
@@ -170,7 +170,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_16MHz
+#define MASTER_CLOCK XTAL(16'000'000)
class supercrd_state : public driver_device
diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp
index 1c15dbccfe0..fb838ba443f 100644
--- a/src/mame/drivers/superqix.cpp
+++ b/src/mame/drivers/superqix.cpp
@@ -197,7 +197,7 @@ WRITE8_MEMBER(hotsmash_state::pbillian_sample_trigger_w)
while ((end < m_samples_region.length()) && (m_samples_region[end] != 0xff))
end++;
- m_samples->start_raw(0, m_samplebuf.get() + start, end - start, XTAL_12MHz/3072); // needs verification, could be 2048 and 4096 alternating every sample
+ m_samples->start_raw(0, m_samplebuf.get() + start, end - start, (XTAL(12'000'000)/3072).value()); // needs verification, could be 2048 and 4096 alternating every sample
}
/**************************************************************************
@@ -1359,12 +1359,12 @@ INTERRUPT_GEN_MEMBER(superqix_state::sqix_timer_irq)
MACHINE_CONFIG_START(hotsmash_state::pbillian)
- MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* 6 MHz, ROHM Z80B */
+ MCFG_CPU_ADD("maincpu", Z80,XTAL(12'000'000)/2) /* 6 MHz, ROHM Z80B */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(pbillian_port_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", hotsmash_state, vblank_irq)
- MCFG_CPU_ADD("mcu", M68705P5, XTAL_12MHz/4) /* 3mhz???? */
+ MCFG_CPU_ADD("mcu", M68705P5, XTAL(12'000'000)/4) /* 3mhz???? */
MCFG_M68705_PORTA_R_CB(READ8(hotsmash_state, hotsmash_68705_portA_r))
MCFG_M68705_PORTB_W_CB(WRITE8(hotsmash_state, hotsmash_68705_portB_w))
MCFG_M68705_PORTC_W_CB(WRITE8(hotsmash_state, hotsmash_68705_portC_w))
@@ -1389,7 +1389,7 @@ MACHINE_CONFIG_START(hotsmash_state::pbillian)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8) // AY-3-8910A
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8) // AY-3-8910A
MCFG_AY8910_PORT_A_READ_CB(IOPORT("BUTTONS"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("SYSTEM"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
@@ -1403,12 +1403,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(superqix_state::sqix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Z80B, 12 MHz / 2 (6 MHz), verified from pcb tracing */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* Z80B, 12 MHz / 2 (6 MHz), verified from pcb tracing */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(sqix_port_map)
MCFG_CPU_PERIODIC_INT_DRIVER(superqix_state, sqix_timer_irq, 4*60) /* ??? */
- MCFG_CPU_ADD("mcu", I8751, XTAL_12MHz/2) /* i8751-88, 12 MHz / 2 (6 MHz), verified from pcb tracing */
+ MCFG_CPU_ADD("mcu", I8751, XTAL(12'000'000)/2) /* i8751-88, 12 MHz / 2 (6 MHz), verified from pcb tracing */
MCFG_CPU_IO_MAP(sqix_mcu_io_map)
MCFG_MACHINE_START_OVERRIDE(superqix_state,superqix)
@@ -1431,13 +1431,13 @@ MACHINE_CONFIG_START(superqix_state::sqix)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8) // AY-3-8910A @3P, analog outputs directly tied together
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8) // AY-3-8910A @3P, analog outputs directly tied together
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2")) /* port Bread */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8) // AY-3-8910A @3M, analog outputs directly tied together
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8) // AY-3-8910A @3M, analog outputs directly tied together
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(READ8(superqix_state, z80_ay2_iob_r)) /* port Bread */
diff --git a/src/mame/drivers/superslave.cpp b/src/mame/drivers/superslave.cpp
index 57828c250b6..07222c25f0a 100644
--- a/src/mame/drivers/superslave.cpp
+++ b/src/mame/drivers/superslave.cpp
@@ -374,7 +374,7 @@ void superslave_state::machine_reset()
MACHINE_CONFIG_START(superslave_state::superslave)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(superslave_mem)
MCFG_CPU_IO_MAP(superslave_io)
MCFG_Z80_DAISY_CHAIN(superslave_daisy_chain)
@@ -383,10 +383,10 @@ MACHINE_CONFIG_START(superslave_state::superslave)
MCFG_DEVICE_ADD(AM9519_TAG, PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(8'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(Z80DART_0_TAG, Z80DART, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80DART_0_TAG, Z80DART, XTAL(8'000'000)/2)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
@@ -406,7 +406,7 @@ MACHINE_CONFIG_START(superslave_state::superslave)
MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, dcdb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, ctsb_w))
- MCFG_DEVICE_ADD(Z80DART_1_TAG, Z80DART, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80DART_1_TAG, Z80DART, XTAL(8'000'000)/2)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_rts))
@@ -425,7 +425,7 @@ MACHINE_CONFIG_START(superslave_state::superslave)
MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, dcdb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, ctsb_w))
- MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, txca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, txca_w))
diff --git a/src/mame/drivers/superwng.cpp b/src/mame/drivers/superwng.cpp
index 92918947de0..5bd27677708 100644
--- a/src/mame/drivers/superwng.cpp
+++ b/src/mame/drivers/superwng.cpp
@@ -39,7 +39,7 @@ TODO:
#include "speaker.h"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
class superwng_state : public driver_device
{
diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp
index 761a012ce88..6459c367a68 100644
--- a/src/mame/drivers/supracan.cpp
+++ b/src/mame/drivers/supracan.cpp
@@ -1887,11 +1887,11 @@ INTERRUPT_GEN_MEMBER(supracan_state::supracan_sound_irq)
MACHINE_CONFIG_START(supracan_state::supracan)
- MCFG_CPU_ADD( "maincpu", M68000, XTAL_10_738635MHz ) /* Correct frequency unknown */
+ MCFG_CPU_ADD( "maincpu", M68000, XTAL(10'738'635) ) /* Correct frequency unknown */
MCFG_CPU_PROGRAM_MAP( supracan_mem )
MCFG_CPU_VBLANK_INT_DRIVER("screen", supracan_state, supracan_irq)
- MCFG_CPU_ADD( "soundcpu", M6502, XTAL_3_579545MHz ) /* TODO: Verify actual clock */
+ MCFG_CPU_ADD( "soundcpu", M6502, XTAL(3'579'545) ) /* TODO: Verify actual clock */
MCFG_CPU_PROGRAM_MAP( supracan_sound_mem )
MCFG_CPU_VBLANK_INT_DRIVER("screen", supracan_state, supracan_sound_irq)
@@ -1901,7 +1901,7 @@ MACHINE_CONFIG_START(supracan_state::supracan)
#endif
MCFG_SCREEN_ADD( "screen", RASTER )
- MCFG_SCREEN_RAW_PARAMS(XTAL_10_738635MHz/2, 348, 0, 256, 256, 0, 240 ) /* No idea if this is correct */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(10'738'635)/2, 348, 0, 256, 256, 0, 240 ) /* No idea if this is correct */
MCFG_SCREEN_UPDATE_DRIVER(supracan_state, screen_update_supracan)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp
index 07a3f818c4e..533c103215c 100644
--- a/src/mame/drivers/suprgolf.cpp
+++ b/src/mame/drivers/suprgolf.cpp
@@ -485,7 +485,7 @@ void suprgolf_state::machine_reset()
m_msm_nmi_mask = 0;
}
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
MACHINE_CONFIG_START(suprgolf_state::suprgolf)
@@ -530,7 +530,7 @@ MACHINE_CONFIG_START(suprgolf_state::suprgolf)
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(suprgolf_state, writeB))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* guess */
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) /* guess */
MCFG_MSM5205_VCLK_CB(WRITELINE(suprgolf_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp
index c3cbd460882..bb878365e3d 100644
--- a/src/mame/drivers/suprnova.cpp
+++ b/src/mame/drivers/suprnova.cpp
@@ -791,7 +791,7 @@ MACHINE_CONFIG_START(skns_state::skns)
MCFG_CPU_PROGRAM_MAP(skns_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", skns_state, irq, "screen", 0, 1)
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_NVRAM_ADD_1FILL("nvram")
diff --git a/src/mame/drivers/suprridr.cpp b/src/mame/drivers/suprridr.cpp
index 8324e92c13b..e25d8607ba3 100644
--- a/src/mame/drivers/suprridr.cpp
+++ b/src/mame/drivers/suprridr.cpp
@@ -320,7 +320,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(suprridr_state::suprridr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_49_152MHz/16) /* 3 MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(49'152'000)/16) /* 3 MHz */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", suprridr_state, main_nmi_gen)
@@ -347,10 +347,10 @@ MACHINE_CONFIG_START(suprridr_state::suprridr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_49_152MHz/32)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(49'152'000)/32)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_49_152MHz/32)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(49'152'000)/32)
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/supstarf.cpp b/src/mame/drivers/supstarf.cpp
index fc598cee171..fd0e617b7da 100644
--- a/src/mame/drivers/supstarf.cpp
+++ b/src/mame/drivers/supstarf.cpp
@@ -165,13 +165,13 @@ void supstarf_state::machine_start()
}
MACHINE_CONFIG_START(supstarf_state::supstarf)
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_5_0688MHz)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(5'068'800))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_io_map)
MCFG_I8085A_SID(READLINE(supstarf_state, contacts_r))
MCFG_I8085A_SOD(WRITELINE(supstarf_state, displays_w))
- MCFG_CPU_ADD("soundcpu", I8035, XTAL_5_0688MHz / 2) // from 8085 pin 37 (CLK OUT)
+ MCFG_CPU_ADD("soundcpu", I8035, XTAL(5'068'800) / 2) // from 8085 pin 37 (CLK OUT)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(supstarf_state, port1_w))
@@ -189,12 +189,12 @@ MACHINE_CONFIG_START(supstarf_state::supstarf)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("psg1", AY8910, XTAL_5_0688MHz / 6) // from 8035 pin 1 (T0)
+ MCFG_SOUND_ADD("psg1", AY8910, XTAL(5'068'800) / 6) // from 8035 pin 1 (T0)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(supstarf_state, lights_a_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(supstarf_state, lights_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("psg2", AY8910, XTAL_5_0688MHz / 6) // from 8035 pin 1 (T0)
+ MCFG_SOUND_ADD("psg2", AY8910, XTAL(5'068'800) / 6) // from 8035 pin 1 (T0)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("JO"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("I1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/surpratk.cpp b/src/mame/drivers/surpratk.cpp
index c94a88a46d3..cb58aed85d1 100644
--- a/src/mame/drivers/surpratk.cpp
+++ b/src/mame/drivers/surpratk.cpp
@@ -169,7 +169,7 @@ WRITE8_MEMBER( surpratk_state::banking_callback )
MACHINE_CONFIG_START(surpratk_state::surpratk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 053248, the clock input is 12MHz, and internal CPU divider of 4 */
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 053248, the clock input is 12MHz, and internal CPU divider of 4 */
MCFG_CPU_PROGRAM_MAP(surpratk_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", surpratk_state, surpratk_interrupt)
MCFG_KONAMICPU_LINE_CB(WRITE8(surpratk_state, banking_callback))
@@ -210,7 +210,7 @@ MACHINE_CONFIG_START(surpratk_state::surpratk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("maincpu", KONAMI_FIRQ_LINE))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/sv8000.cpp b/src/mame/drivers/sv8000.cpp
index 908d1135730..d1b4cc5d4a4 100644
--- a/src/mame/drivers/sv8000.cpp
+++ b/src/mame/drivers/sv8000.cpp
@@ -371,7 +371,7 @@ READ8_MEMBER( sv8000_state::mc6847_videoram_r )
MACHINE_CONFIG_START(sv8000_state::sv8000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_10_738635MHz/3) /* Not verified */
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(10'738'635)/3) /* Not verified */
MCFG_CPU_PROGRAM_MAP(sv8000_mem)
MCFG_CPU_IO_MAP(sv8000_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sv8000_state, irq0_line_hold)
@@ -386,14 +386,14 @@ MACHINE_CONFIG_START(sv8000_state::sv8000)
/* video hardware */
// S68047P - Unknown whether the internal or an external character rom is used
- MCFG_DEVICE_ADD("s68047p", S68047, XTAL_10_738635MHz/3 ) // Clock not verified
+ MCFG_DEVICE_ADD("s68047p", S68047, XTAL(10'738'635)/3 ) // Clock not verified
MCFG_MC6847_INPUT_CALLBACK(READ8(sv8000_state, mc6847_videoram_r))
MCFG_SCREEN_MC6847_NTSC_ADD("screen", "s68047p")
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL_10_738635MHz/3/2) /* Exact model and clock not verified */
+ MCFG_SOUND_ADD("ay8910", AY8910, XTAL(10'738'635)/3/2) /* Exact model and clock not verified */
MCFG_AY8910_PORT_A_READ_CB(READ8(sv8000_state, ay_port_a_r))
MCFG_AY8910_PORT_B_READ_CB(READ8(sv8000_state, ay_port_b_r))
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(sv8000_state, ay_port_a_w))
diff --git a/src/mame/drivers/svi318.cpp b/src/mame/drivers/svi318.cpp
index 8c1e56f354b..4003549f9da 100644
--- a/src/mame/drivers/svi318.cpp
+++ b/src/mame/drivers/svi318.cpp
@@ -524,7 +524,7 @@ DEVICE_IMAGE_LOAD_MEMBER( svi3x8_state, cartridge )
MACHINE_CONFIG_START(svi3x8_state::svi318)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz / 3)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635) / 3)
MCFG_CPU_PROGRAM_MAP(svi3x8_mem)
MCFG_CPU_IO_MAP(svi3x8_io)
@@ -543,7 +543,7 @@ MACHINE_CONFIG_START(svi3x8_state::svi318)
MCFG_I8255_OUT_PORTC_CB(WRITE8(svi3x8_state, ppi_port_c_w))
// video hardware
- MCFG_DEVICE_ADD("vdp", TMS9929A, XTAL_10_738635MHz / 2)
+ MCFG_DEVICE_ADD("vdp", TMS9929A, XTAL(10'738'635) / 2)
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(svi3x8_state, intvdp_w))
MCFG_TMS9928A_SCREEN_ADD_PAL("screen")
@@ -555,7 +555,7 @@ MACHINE_CONFIG_START(svi3x8_state::svi318)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("psg", AY8910, XTAL_10_738635MHz / 6)
+ MCFG_SOUND_ADD("psg", AY8910, XTAL(10'738'635) / 6)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("JOY"))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(svi3x8_state, bank_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
@@ -586,7 +586,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(svi3x8_state::svi318n, svi318)
MCFG_DEVICE_REMOVE("vdp")
MCFG_DEVICE_REMOVE("screen")
- MCFG_DEVICE_ADD("vdp", TMS9928A, XTAL_10_738635MHz / 2)
+ MCFG_DEVICE_ADD("vdp", TMS9928A, XTAL(10'738'635) / 2)
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(svi3x8_state, intvdp_w))
MCFG_TMS9928A_SCREEN_ADD_NTSC("screen")
diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp
index f55a0e6ba76..21c0b195835 100644
--- a/src/mame/drivers/svmu.cpp
+++ b/src/mame/drivers/svmu.cpp
@@ -303,12 +303,12 @@ QUICKLOAD_LOAD_MEMBER( svmu_state, svmu )
MACHINE_CONFIG_START(svmu_state::svmu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", LC8670, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", LC8670, XTAL(32'768))
MCFG_CPU_PROGRAM_MAP(svmu_mem)
MCFG_CPU_IO_MAP(svmu_io_mem)
/* specific LC8670 configurations */
- MCFG_LC8670_SET_CLOCK_SOURCES(XTAL_32_768kHz, 600000, XTAL_6MHz) // tolerance range of the RC oscillator is 600kHz to 1200kHz
+ MCFG_LC8670_SET_CLOCK_SOURCES(XTAL(32'768), 600000, XTAL(6'000'000)) // tolerance range of the RC oscillator is 600kHz to 1200kHz
MCFG_LC8670_BANKSWITCH_CB(WRITE8(svmu_state, page_w))
MCFG_LC8670_LCD_UPDATE_CB(svmu_lcd_update)
diff --git a/src/mame/drivers/swtpc.cpp b/src/mame/drivers/swtpc.cpp
index 6343835d496..d118785f773 100644
--- a/src/mame/drivers/swtpc.cpp
+++ b/src/mame/drivers/swtpc.cpp
@@ -95,10 +95,10 @@ void swtpc_state::machine_start()
MACHINE_CONFIG_START(swtpc_state::swtpc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_1_8432MHz / 2)
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(1'843'200) / 2)
MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_DEVICE_ADD("brg", MC14411, XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("brg", MC14411, XTAL(1'843'200))
MCFG_MC14411_F7_CB(DEVWRITELINE("io0", ss50_interface_port_device, f600_1200_w)) // 1200b
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io1", ss50_interface_port_device, f600_1200_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io2", ss50_interface_port_device, f600_1200_w))
@@ -177,10 +177,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(swtpc_state::swtpcm, swtpc)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_1_7971MHz / 2)
+ MCFG_CPU_CLOCK(XTAL(1'797'100) / 2)
MCFG_DEVICE_MODIFY("brg")
- MCFG_DEVICE_CLOCK(XTAL_1_7971MHz)
+ MCFG_DEVICE_CLOCK(XTAL(1'797'100))
MCFG_DEVICE_MODIFY("io1")
MCFG_SLOT_DEFAULT_OPTION("mpc")
diff --git a/src/mame/drivers/swtpc09.cpp b/src/mame/drivers/swtpc09.cpp
index 824422d0e05..3233fd5c078 100644
--- a/src/mame/drivers/swtpc09.cpp
+++ b/src/mame/drivers/swtpc09.cpp
@@ -161,7 +161,7 @@ SLOT_INTERFACE_END
/* MPU09, MPID, MPS2 DMF2 */
MACHINE_CONFIG_START(swtpc09_state::swtpc09_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(mp09_mem)
MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0)
@@ -190,11 +190,11 @@ MACHINE_CONFIG_START(swtpc09_state::swtpc09_base)
MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(swtpc09_state, acia_interrupt))
- MCFG_DEVICE_ADD("brg", MC14411, XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("brg", MC14411, XTAL(1'843'200))
MCFG_MC14411_F1_CB(DEVWRITELINE("acia", acia6850_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia", acia6850_device, write_rxc))
- MCFG_FD1793_ADD("fdc", XTAL_1MHz)
+ MCFG_FD1793_ADD("fdc", XTAL(1'000'000))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", swtpc09_floppies, "dd", swtpc09_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", swtpc09_floppies, "dd", swtpc09_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:2", swtpc09_floppies, "dd", swtpc09_state::floppy_formats)
@@ -232,7 +232,7 @@ MACHINE_CONFIG_END
/* MPU09, MPID, MPS2 DMF3 */
MACHINE_CONFIG_DERIVED(swtpc09_state::swtpc09d3, swtpc09_base)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_8MHz)
+ MCFG_CPU_CLOCK(XTAL(8'000'000))
MCFG_DEVICE_MODIFY("pia")
MCFG_DEVICE_CLOCK(2000000)
@@ -244,7 +244,7 @@ MACHINE_CONFIG_DERIVED(swtpc09_state::swtpc09d3, swtpc09_base)
MCFG_DEVICE_MODIFY("acia")
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
- MCFG_DEVICE_ADD("via", VIA6522, XTAL_4MHz / 4)
+ MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 4)
MCFG_VIA6522_READPA_HANDLER(READ8(swtpc09_state, dmf3_via_read_porta))
MCFG_VIA6522_READPB_HANDLER(READ8(swtpc09_state, dmf3_via_read_portb))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(swtpc09_state, dmf3_via_write_porta))
diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp
index 8bcd3da7b8f..ec9888a20ab 100644
--- a/src/mame/drivers/swyft.cpp
+++ b/src/mame/drivers/swyft.cpp
@@ -772,7 +772,7 @@ WRITE_LINE_MEMBER( swyft_state::write_acia_clock )
MACHINE_CONFIG_START(swyft_state::swyft)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68008, XTAL_15_8976MHz/2) //MC68008P8, Y1=15.8976Mhz, clock GUESSED at Y1 / 2
+ MCFG_CPU_ADD("maincpu",M68008, XTAL(15'897'600)/2) //MC68008P8, Y1=15.8976Mhz, clock GUESSED at Y1 / 2
MCFG_CPU_PROGRAM_MAP(swyft_mem)
MCFG_MACHINE_START_OVERRIDE(swyft_state,swyft)
@@ -793,10 +793,10 @@ MACHINE_CONFIG_START(swyft_state::swyft)
MCFG_DEVICE_ADD("acia6850", ACIA6850, 0)
// acia rx and tx clocks come from one of the VIA pins and are tied together, fix this below? acia e clock comes from 68008
- MCFG_DEVICE_ADD("acia_clock", CLOCK, (XTAL_15_8976MHz/2)/5) // out e clock from 68008, ~ 10in clocks per out clock
+ MCFG_DEVICE_ADD("acia_clock", CLOCK, (XTAL(15'897'600)/2)/5) // out e clock from 68008, ~ 10in clocks per out clock
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(swyft_state, write_acia_clock))
- MCFG_DEVICE_ADD("via6522_0", VIA6522, (XTAL_15_8976MHz/2)/5) // out e clock from 68008
+ MCFG_DEVICE_ADD("via6522_0", VIA6522, (XTAL(15'897'600)/2)/5) // out e clock from 68008
MCFG_VIA6522_READPA_HANDLER(READ8(swyft_state, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(swyft_state, via0_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(swyft_state, via0_pa_w))
@@ -806,7 +806,7 @@ MACHINE_CONFIG_START(swyft_state::swyft)
MCFG_VIA6522_CB2_HANDLER(WRITELINE(swyft_state, via0_cb2_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(swyft_state, via0_int_w))
- MCFG_DEVICE_ADD("via6522_1", VIA6522, (XTAL_15_8976MHz/2)/5) // out e clock from 68008
+ MCFG_DEVICE_ADD("via6522_1", VIA6522, (XTAL(15'897'600)/2)/5) // out e clock from 68008
MCFG_VIA6522_READPA_HANDLER(READ8(swyft_state, via1_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(swyft_state, via1_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(swyft_state, via1_pa_w))
diff --git a/src/mame/drivers/sym1.cpp b/src/mame/drivers/sym1.cpp
index 05538b9a907..d1207d3893a 100644
--- a/src/mame/drivers/sym1.cpp
+++ b/src/mame/drivers/sym1.cpp
@@ -27,7 +27,7 @@
//**************************************************************************
// SYM-1 main (and only) oscillator Y1
-#define SYM1_CLOCK XTAL_1MHz
+#define SYM1_CLOCK XTAL(1'000'000)
#define LED_REFRESH_DELAY attotime::from_usec(70)
diff --git a/src/mame/drivers/symbolics.cpp b/src/mame/drivers/symbolics.cpp
index 98e665b3d2d..852dd8d8436 100644
--- a/src/mame/drivers/symbolics.cpp
+++ b/src/mame/drivers/symbolics.cpp
@@ -321,7 +321,7 @@ MACHINE_CONFIG_START(symbolics_state::symbolics)
//XTALS: 16MHz @H11 (68k CPU clock)
// 4.9152MHz @J5 (driving the two MPSCs serial clocks)
// 66.67MHz @J10 (main lispcpu/system clock)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* MC68000L8 @A27; clock is derived from the 16Mhz xtal @ H11, verified from patent */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* MC68000L8 @A27; clock is derived from the 16Mhz xtal @ H11, verified from patent */
MCFG_CPU_PROGRAM_MAP(m68k_mem)
MCFG_CPU_IO_MAP(m68k_io)
diff --git a/src/mame/drivers/sys2900.cpp b/src/mame/drivers/sys2900.cpp
index ccd7351e419..43471de1431 100644
--- a/src/mame/drivers/sys2900.cpp
+++ b/src/mame/drivers/sys2900.cpp
@@ -136,7 +136,7 @@ uint32_t sys2900_state::screen_update_sys2900(screen_device &screen, bitmap_ind1
MACHINE_CONFIG_START(sys2900_state::sys2900)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/sys9002.cpp b/src/mame/drivers/sys9002.cpp
index e89b373e273..abe3d721812 100644
--- a/src/mame/drivers/sys9002.cpp
+++ b/src/mame/drivers/sys9002.cpp
@@ -118,7 +118,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(sys9002_state::sys9002)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL_2MHz) // XTAL not visible on images
+ MCFG_CPU_ADD("maincpu",I8085A, XTAL(2'000'000)) // XTAL not visible on images
MCFG_CPU_PROGRAM_MAP(sys9002_mem)
MCFG_CPU_IO_MAP(sys9002_io)
@@ -133,7 +133,7 @@ MACHINE_CONFIG_START(sys9002_state::sys9002)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* Devices */
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_2MHz) // clk unknown
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(2'000'000)) // clk unknown
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(sys9002_state, crtc_update_row)
diff --git a/src/mame/drivers/systec.cpp b/src/mame/drivers/systec.cpp
index 3aa5cc42d62..dad27f48089 100644
--- a/src/mame/drivers/systec.cpp
+++ b/src/mame/drivers/systec.cpp
@@ -80,7 +80,7 @@ void systec_state::machine_reset()
MACHINE_CONFIG_START(systec_state::systec)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(systec_mem)
MCFG_CPU_IO_MAP(systec_io)
@@ -89,7 +89,7 @@ MACHINE_CONFIG_START(systec_state::systec)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxca_w))
/* Devices */
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'000'000))
//MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // no evidence of a daisy chain because IM2 is not set
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp
index 2c6c3482db4..19d1995ad98 100644
--- a/src/mame/drivers/system1.cpp
+++ b/src/mame/drivers/system1.cpp
@@ -228,8 +228,8 @@ seem to have access to.
#include "speaker.h"
-#define MASTER_CLOCK XTAL_20MHz
-#define SOUND_CLOCK XTAL_8MHz
+#define MASTER_CLOCK XTAL(20'000'000)
+#define SOUND_CLOCK XTAL(8'000'000)
/*************************************
diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp
index 381b618ef8c..b5780cfe01b 100644
--- a/src/mame/drivers/system16.cpp
+++ b/src/mame/drivers/system16.cpp
@@ -2456,11 +2456,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas1x_bootleg_state::astormb2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz */
MCFG_CPU_PROGRAM_MAP(astormbl_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_8MHz/2) /* 4MHz */
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(8'000'000)/2) /* 4MHz */
MCFG_CPU_PROGRAM_MAP(sys18bl_sound_map)
/* video hardware */
@@ -2486,7 +2486,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::astormb2)
// 1 OKI M6295 instead of original sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8MHz/8, PIN7_HIGH) // 1MHz clock and pin verified
+ MCFG_OKIM6295_ADD("oki", XTAL(8'000'000)/8, PIN7_HIGH) // 1MHz clock and pin verified
MCFG_DEVICE_ADDRESS_MAP(0, sys18bl_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tagteam.cpp b/src/mame/drivers/tagteam.cpp
index bcea6a720ed..90274ad8f33 100644
--- a/src/mame/drivers/tagteam.cpp
+++ b/src/mame/drivers/tagteam.cpp
@@ -210,11 +210,11 @@ INTERRUPT_GEN_MEMBER(tagteam_state::sound_timer_irq)
MACHINE_CONFIG_START(tagteam_state::tagteam)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/8)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(12'000'000)/8)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_PERIODIC_INT_DRIVER(tagteam_state, irq0_line_assert, 272/16*57) // connected to bit 4 of vcount (basically once every 16 scanlines)
- MCFG_CPU_ADD("audiocpu", M6502, XTAL_12MHz/2/6) // daughterboard gets 12mhz/2 from mainboard, but how it's divided further is a guess
+ MCFG_CPU_ADD("audiocpu", M6502, XTAL(12'000'000)/2/6) // daughterboard gets 12mhz/2 from mainboard, but how it's divided further is a guess
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(tagteam_state, sound_timer_irq, 272/16*57) // same source as maincpu irq
@@ -237,10 +237,10 @@ MACHINE_CONFIG_START(tagteam_state::tagteam)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", M6502_IRQ_LINE))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
diff --git a/src/mame/drivers/tail2nos.cpp b/src/mame/drivers/tail2nos.cpp
index 9402c3e9c56..8ad19cfa1cb 100644
--- a/src/mame/drivers/tail2nos.cpp
+++ b/src/mame/drivers/tail2nos.cpp
@@ -231,11 +231,11 @@ void tail2nos_state::machine_reset()
MACHINE_CONFIG_START(tail2nos_state::tail2nos)
/* 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(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tail2nos_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL_20MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL(20'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_port_map)
/* IRQs are triggered by the YM2608 */
@@ -265,7 +265,7 @@ MACHINE_CONFIG_START(tail2nos_state::tail2nos)
MCFG_K051316_WRAP(1)
MCFG_K051316_CB(tail2nos_state, zoom_callback)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -274,7 +274,7 @@ MACHINE_CONFIG_START(tail2nos_state::tail2nos)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2608, XTAL_8MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2608, XTAL(8'000'000)) /* verified on pcb */
MCFG_YM2608_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(tail2nos_state, sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp
index 1cabcd3c4bb..610186a4033 100644
--- a/src/mame/drivers/taito.cpp
+++ b/src/mame/drivers/taito.cpp
@@ -392,9 +392,9 @@ MACHINE_CONFIG_START(taito_state::taito_ay_audio)
MCFG_CPU_PROGRAM_MAP(taito_sub_map5)
MCFG_SPEAKER_STANDARD_MONO("aysnd")
- MCFG_SOUND_ADD("aysnd_0", AY8910, XTAL_3_579545MHz/2) /* guess */
+ MCFG_SOUND_ADD("aysnd_0", AY8910, XTAL(3'579'545)/2) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "aysnd", 0.8)
- MCFG_SOUND_ADD("aysnd_1", AY8910, XTAL_3_579545MHz/2) /* guess */
+ MCFG_SOUND_ADD("aysnd_1", AY8910, XTAL(3'579'545)/2) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "aysnd", 0.8)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp
index a822ebed452..262c6bd9aa6 100644
--- a/src/mame/drivers/taito_b.cpp
+++ b/src/mame/drivers/taito_b.cpp
@@ -1907,11 +1907,11 @@ void taitob_state::machine_reset()
MACHINE_CONFIG_START(taitob_state::rastsag2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(rastsag2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, rastansaga2_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -1949,7 +1949,7 @@ MACHINE_CONFIG_START(taitob_state::rastsag2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* 8 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -1964,11 +1964,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::masterw)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(masterw_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, masterw_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/4) /* 6 MHz Z80B */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz Z80B */
MCFG_CPU_PROGRAM_MAP(masterw_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2006,7 +2006,7 @@ MACHINE_CONFIG_START(taitob_state::masterw)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_24MHz/8) /* 3 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(taitob_state, bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
@@ -2040,11 +2040,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::ashura)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(rastsag2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, rastansaga2_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2082,7 +2082,7 @@ MACHINE_CONFIG_START(taitob_state::ashura)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* 8 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2097,11 +2097,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::crimec)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(crimec_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, crimec_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2139,7 +2139,7 @@ MACHINE_CONFIG_START(taitob_state::crimec)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* 8 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
@@ -2155,11 +2155,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::hitice)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(hitice_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, hitice_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/4) /* 6 MHz Z80B */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz Z80B */
MCFG_CPU_PROGRAM_MAP(viofight_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2198,7 +2198,7 @@ MACHINE_CONFIG_START(taitob_state::hitice)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_24MHz/8) /* 3 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(taitob_state, bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
@@ -2218,11 +2218,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::rambo3p)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(rambo3_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, rambo3_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2260,7 +2260,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3p)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
@@ -2276,11 +2276,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::rambo3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12MHz verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz verified on pcb */
MCFG_CPU_PROGRAM_MAP(rambo3_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, rambo3_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4MHz verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4MHz verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2318,7 +2318,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* 8 MHz verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2333,11 +2333,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::pbobble)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(pbobble_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/2) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/2) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
@@ -2381,7 +2381,7 @@ MACHINE_CONFIG_START(taitob_state::pbobble)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610B, XTAL_16MHz/2) /* 8 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2396,11 +2396,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::spacedx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(spacedx_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2444,7 +2444,7 @@ MACHINE_CONFIG_START(taitob_state::spacedx)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* 8 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2459,11 +2459,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::spacedxo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(spacedxo_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2501,7 +2501,7 @@ MACHINE_CONFIG_START(taitob_state::spacedxo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* 8 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2579,11 +2579,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::viofight)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(viofight_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, viofight_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/4) /* 6 MHz verified */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz verified */
MCFG_CPU_PROGRAM_MAP(viofight_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2621,7 +2621,7 @@ MACHINE_CONFIG_START(taitob_state::viofight)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_24MHz/8) /* 3 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(taitob_state, bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
@@ -2629,7 +2629,7 @@ MACHINE_CONFIG_START(taitob_state::viofight)
MCFG_SOUND_ROUTE(2, "mono", 0.25)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_4_224MHz/4, PIN7_HIGH) // 1.056MHz clock frequency, but pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(4'224'000)/4, PIN7_HIGH) // 1.056MHz clock frequency, but pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("ciu", PC060HA, 0)
@@ -2641,11 +2641,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::silentd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(silentd_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, silentd_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2683,7 +2683,7 @@ MACHINE_CONFIG_START(taitob_state::silentd)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* 8 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2698,11 +2698,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::selfeena)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(selfeena_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2740,7 +2740,7 @@ MACHINE_CONFIG_START(taitob_state::selfeena)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* 8 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2764,11 +2764,11 @@ void taitob_state::ryujin_patch(void)
MACHINE_CONFIG_START(taitob_state::ryujin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(selfeena_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2806,7 +2806,7 @@ MACHINE_CONFIG_START(taitob_state::ryujin)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* 8 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp
index 97efaa00604..e5a3e6987d4 100644
--- a/src/mame/drivers/taito_f2.cpp
+++ b/src/mame/drivers/taito_f2.cpp
@@ -2947,7 +2947,7 @@ MACHINE_CONFIG_DERIVED(taitof2_state::megab, taito_f2_tc0220ioc)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(megab_map)
- MCFG_TAITO_CCHIP_ADD("cchip", XTAL_12MHz/2) /* ? MHz */
+ MCFG_TAITO_CCHIP_ADD("cchip", XTAL(12'000'000)/2) /* ? MHz */
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_megab)
@@ -3463,7 +3463,7 @@ MACHINE_CONFIG_DERIVED(taitof2_state::yesnoj, taito_f2)
MCFG_TC0100SCN_GFXDECODE("gfxdecode")
MCFG_TC0100SCN_PALETTE("palette")
- MCFG_DEVICE_ADD("rtc", TC8521, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", TC8521, XTAL(32'768))
MACHINE_CONFIG_END
@@ -3702,7 +3702,7 @@ MACHINE_CONFIG_START(taitof2_state::cameltrya)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
MCFG_SOUND_ROUTE(3, "mono", 0.60)
- MCFG_OKIM6295_ADD("oki", XTAL_4_224MHz/4, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(4'224'000)/4, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_DEVICE_ADD("ciu", PC060HA, 0)
diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp
index 82f77df9123..25012fc155b 100644
--- a/src/mame/drivers/taito_f3.cpp
+++ b/src/mame/drivers/taito_f3.cpp
@@ -460,7 +460,7 @@ MACHINE_RESET_MEMBER(taito_f3_state,f3)
MACHINE_CONFIG_START(taito_f3_state::f3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(f3_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taito_f3_state, f3_interrupt2)
@@ -555,7 +555,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(taito_f3_state::bubsympb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(bubsympb_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taito_f3_state, f3_interrupt2)
diff --git a/src/mame/drivers/taito_h.cpp b/src/mame/drivers/taito_h.cpp
index de0302dc0b9..5237d5bff96 100644
--- a/src/mame/drivers/taito_h.cpp
+++ b/src/mame/drivers/taito_h.cpp
@@ -638,11 +638,11 @@ void taitoh_state::machine_start()
MACHINE_CONFIG_START(taitoh_state::syvalion)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(syvalion_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoh_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz / 2) /* 4 MHz ??? */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000) / 2) /* 4 MHz ??? */
MCFG_CPU_PROGRAM_MAP(sound_map)
@@ -679,7 +679,7 @@ MACHINE_CONFIG_START(taitoh_state::syvalion)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000))
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -694,11 +694,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoh_state::recordbr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(recordbr_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoh_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz / 2) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000) / 2) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
@@ -735,7 +735,7 @@ MACHINE_CONFIG_START(taitoh_state::recordbr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000))
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -758,11 +758,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoh_state::dleague)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(dleague_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoh_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz / 2) /* 4 MHz ??? */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000) / 2) /* 4 MHz ??? */
MCFG_CPU_PROGRAM_MAP(sound_map)
@@ -799,7 +799,7 @@ MACHINE_CONFIG_START(taitoh_state::dleague)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000))
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp
index d53c6345ab0..31b7758ee1f 100644
--- a/src/mame/drivers/taito_l.cpp
+++ b/src/mame/drivers/taito_l.cpp
@@ -1542,14 +1542,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fhawk_state::fhawk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */
MCFG_CPU_PROGRAM_MAP(fhawk_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/3) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/3) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(fhawk_3_map)
- MCFG_CPU_ADD("slave", Z80, XTAL_12MHz/3) /* verified on pcb */
+ MCFG_CPU_ADD("slave", Z80, XTAL(12'000'000)/3) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(fhawk_2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold)
@@ -1572,7 +1572,7 @@ MACHINE_CONFIG_START(fhawk_state::fhawk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(fhawk_state, portA_w))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
@@ -1604,7 +1604,7 @@ MACHINE_CONFIG_DERIVED(champwr_state::champwr, fhawk)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(champwr_state, portA_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(champwr_state, msm5205_volume_w))
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(champwr_state, msm5205_vck)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -1646,7 +1646,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::raimais)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -1661,11 +1661,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitol_2cpu_state::kurikint)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */
MCFG_CPU_PROGRAM_MAP(kurikint_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/3) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/3) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(kurikint_2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold)
@@ -1690,7 +1690,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::kurikint)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
@@ -1701,7 +1701,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitol_1cpu_state::plotting)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */
MCFG_CPU_PROGRAM_MAP(plotting_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
@@ -1714,7 +1714,7 @@ MACHINE_CONFIG_START(taitol_1cpu_state::plotting)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_13_33056MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(13'330'560)/4) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("dswmux", ls157_x2_device, output_r))
MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("inmux", ls157_x2_device, output_r))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
@@ -1738,7 +1738,7 @@ MACHINE_CONFIG_DERIVED(taitol_1cpu_state::puzznic, plotting)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(puzznic_map)
- MCFG_DEVICE_ADD("mcu", ARKANOID_68705P3, XTAL_3MHz)
+ MCFG_DEVICE_ADD("mcu", ARKANOID_68705P3, XTAL(3'000'000))
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(taitol_1cpu_state::puzznici, plotting)
@@ -1803,11 +1803,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitol_2cpu_state::evilston)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* not verified */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* not verified */
MCFG_CPU_PROGRAM_MAP(evilston_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/3) /* not verified */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/3) /* not verified */
MCFG_CPU_PROGRAM_MAP(evilston_2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold)
@@ -1833,7 +1833,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::evilston)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* not verified */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* not verified */
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
MCFG_SOUND_ROUTE(2, "mono", 0.25)
diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp
index dceb07abfa6..716a03c86e5 100644
--- a/src/mame/drivers/taito_x.cpp
+++ b/src/mame/drivers/taito_x.cpp
@@ -920,14 +920,14 @@ MACHINE_START_MEMBER(taitox_state,superman)
MACHINE_CONFIG_START(taitox_state::superman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(superman_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitox_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_TAITO_CCHIP_ADD("cchip", XTAL_12MHz/2) /* ? MHz */
+ MCFG_TAITO_CCHIP_ADD("cchip", XTAL(12'000'000)/2) /* ? MHz */
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -954,7 +954,7 @@ MACHINE_CONFIG_START(taitox_state::superman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -969,11 +969,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitox_state::daisenpu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(daisenpu_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitox_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(daisenpu_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -1001,7 +1001,7 @@ MACHINE_CONFIG_START(taitox_state::daisenpu)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_16MHz/4) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp
index 4c202e25ff5..b891eb3296e 100644
--- a/src/mame/drivers/taito_z.cpp
+++ b/src/mame/drivers/taito_z.cpp
@@ -3576,14 +3576,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoz_state::dblaxle)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2)
MCFG_CPU_PROGRAM_MAP(dblaxle_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8)
MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_ADD("sub", M68000, XTAL_32MHz/2)
+ MCFG_CPU_ADD("sub", M68000, XTAL(32'000'000)/2)
MCFG_CPU_PROGRAM_MAP(dblaxle_cpub_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
@@ -3591,7 +3591,7 @@ MACHINE_CONFIG_START(taitoz_state::dblaxle)
MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz)
// make quantum time to be a multiple of the xtal (fixes road layer stuck on continue)
- MCFG_QUANTUM_TIME(attotime::from_hz(XTAL_32MHz/1024))
+ MCFG_QUANTUM_TIME(attotime::from_hz(XTAL(32'000'000)/1024))
MCFG_DEVICE_ADD("tc0510nio", TC0510NIO, 0)
MCFG_TC0510NIO_READ_0_CB(IOPORT("DSWA"))
@@ -3627,7 +3627,7 @@ MACHINE_CONFIG_START(taitoz_state::dblaxle)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_32MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(32'000'000)/4)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -3654,14 +3654,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoz_state::racingb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2)
MCFG_CPU_PROGRAM_MAP(racingb_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, sci_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8)
MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_ADD("sub", M68000, XTAL_32MHz/2)
+ MCFG_CPU_ADD("sub", M68000, XTAL(32'000'000)/2)
MCFG_CPU_PROGRAM_MAP(racingb_cpub_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
@@ -3703,7 +3703,7 @@ MACHINE_CONFIG_START(taitoz_state::racingb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_32MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(32'000'000)/4)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
diff --git a/src/mame/drivers/taitoair.cpp b/src/mame/drivers/taitoair.cpp
index 9acf88f733e..17c583ee3d3 100644
--- a/src/mame/drivers/taitoair.cpp
+++ b/src/mame/drivers/taitoair.cpp
@@ -700,14 +700,14 @@ void taitoair_state::machine_reset()
MACHINE_CONFIG_START(taitoair_state::airsys)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) // MC68000P12
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) // MC68000P12
MCFG_CPU_PROGRAM_MAP(airsys_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoair_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz / 4) // Z8400AB1
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000) / 4) // Z8400AB1
MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_ADD("dsp", TMS32025, XTAL_36MHz) // Unverified
+ MCFG_CPU_ADD("dsp", TMS32025, XTAL(36'000'000)) // Unverified
MCFG_CPU_PROGRAM_MAP(DSP_map_program)
MCFG_CPU_DATA_MAP(DSP_map_data)
MCFG_TMS32025_HOLD_IN_CB(READ16(taitoair_state, dsp_HOLD_signal_r))
@@ -750,7 +750,7 @@ MACHINE_CONFIG_START(taitoair_state::airsys)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz / 2)
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000) / 2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
diff --git a/src/mame/drivers/taitogn.cpp b/src/mame/drivers/taitogn.cpp
index 10b5a45dfe5..b66b8642d11 100644
--- a/src/mame/drivers/taitogn.cpp
+++ b/src/mame/drivers/taitogn.cpp
@@ -695,7 +695,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(taitogn_state::coh3002t)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8661R, XTAL_100MHz )
+ MCFG_CPU_ADD( "maincpu", CXD8661R, XTAL(100'000'000) )
MCFG_CPU_PROGRAM_MAP(taitogn_map)
MCFG_RAM_MODIFY("maincpu:ram")
@@ -743,12 +743,12 @@ MACHINE_CONFIG_START(taitogn_state::coh3002t)
// we don't have a 78K0 emulation core yet..
/* video hardware */
- MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8654Q, 0x200000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8654Q, 0x200000, XTAL(53'693'175) )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SPU_ADD("spu", XTAL_67_7376MHz/2)
+ MCFG_SPU_ADD("spu", XTAL(67'737'600)/2)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
diff --git a/src/mame/drivers/taitojc.cpp b/src/mame/drivers/taitojc.cpp
index f9ccc9ced09..259871e9d0e 100644
--- a/src/mame/drivers/taitojc.cpp
+++ b/src/mame/drivers/taitojc.cpp
@@ -1071,16 +1071,16 @@ void taitojc_state::machine_start()
MACHINE_CONFIG_START(taitojc_state::taitojc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68040, XTAL_10MHz*2) // 20MHz, clock source = CY7C991
+ MCFG_CPU_ADD("maincpu", M68040, XTAL(10'000'000)*2) // 20MHz, clock source = CY7C991
MCFG_CPU_PROGRAM_MAP(taitojc_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitojc_state, taitojc_vblank)
- MCFG_CPU_ADD("sub", MC68HC11, XTAL_16MHz/2) // 8MHz, MC68HC11M0
+ MCFG_CPU_ADD("sub", MC68HC11, XTAL(16'000'000)/2) // 8MHz, MC68HC11M0
MCFG_CPU_PROGRAM_MAP(hc11_pgm_map)
MCFG_CPU_IO_MAP(hc11_io_map)
MCFG_MC68HC11_CONFIG( 1, 1280, 0x00 )
- MCFG_CPU_ADD("dsp", TMS32051, XTAL_10MHz*4) // 40MHz, clock source = CY7C991
+ MCFG_CPU_ADD("dsp", TMS32051, XTAL(10'000'000)*4) // 40MHz, clock source = CY7C991
MCFG_CPU_PROGRAM_MAP(tms_program_map)
MCFG_CPU_DATA_MAP(tms_data_map)
diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp
index 46fa3a83a05..01a27a5c04f 100644
--- a/src/mame/drivers/taitopjc.cpp
+++ b/src/mame/drivers/taitopjc.cpp
@@ -755,7 +755,7 @@ INTERRUPT_GEN_MEMBER(taitopjc_state::taitopjc_vbi)
MACHINE_CONFIG_START(taitopjc_state::taitopjc)
MCFG_CPU_ADD("maincpu", PPC603E, 100000000)
- MCFG_PPC_BUS_FREQUENCY(XTAL_66_6667MHz) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
+ MCFG_PPC_BUS_FREQUENCY(XTAL(66'666'700)) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
MCFG_CPU_PROGRAM_MAP(ppc603e_mem)
/* TMP95C063F I/O CPU */
diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp
index d921d0923c2..43c5c2ab47e 100644
--- a/src/mame/drivers/taitosj.cpp
+++ b/src/mame/drivers/taitosj.cpp
@@ -1755,17 +1755,17 @@ WRITE8_MEMBER(taitosj_state::taitosj_dacvol_w)
MACHINE_CONFIG_START(taitosj_state::nomcu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz/2) /* 8 MHz / 2, on CPU board */
+ MCFG_CPU_ADD("maincpu",Z80,XTAL(8'000'000)/2) /* 8 MHz / 2, on CPU board */
MCFG_CPU_PROGRAM_MAP(taitosj_main_nomcu_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taitosj_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL_6MHz/2) /* 6 MHz / 2, on GAME board */
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL(6'000'000)/2) /* 6 MHz / 2, on GAME board */
MCFG_CPU_PROGRAM_MAP(taitosj_audio_map)
/* interrupts: */
/* - no interrupts synced with vblank */
/* - NMI triggered by the main CPU */
/* - periodic IRQ, with frequency 6000000/(4*16*16*10*16) = 36.621 Hz, */
- MCFG_CPU_PERIODIC_INT_DRIVER(taitosj_state, irq0_line_hold, (double)XTAL_6MHz/(4*16*16*10*16))
+ MCFG_CPU_PERIODIC_INT_DRIVER(taitosj_state, irq0_line_hold, XTAL(6'000'000)/(4*16*16*10*16))
/* video hardware */
@@ -1790,23 +1790,23 @@ MACHINE_CONFIG_START(taitosj_state::nomcu)
MCFG_INPUT_MERGER_ANY_HIGH("soundnmi2")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_6MHz/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC53 (this is the only AY which uses proper mixing resistors, the 3 below have outputs tied together)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC53 (this is the only AY which uses proper mixing resistors, the 3 below have outputs tied together)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_6MHz/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC51
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC51
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("dac", dac_byte_interface, write))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(taitosj_state, taitosj_dacvol_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("ay3", AY8910, XTAL_6MHz/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC49
+ MCFG_SOUND_ADD("ay3", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC49
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(taitosj_state, input_port_4_f0_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("ay4", AY8910, XTAL_6MHz/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC50
+ MCFG_SOUND_ADD("ay4", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC50
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
/* TODO: Implement ay4 Port A bits 0 and 1 which connect to a 7416 open
collector inverter, to selectively tie none, either or both of two
@@ -1833,7 +1833,7 @@ MACHINE_CONFIG_DERIVED(taitosj_state::mcu, nomcu)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(taitosj_main_mcu_map)
- MCFG_CPU_ADD("bmcu", TAITO_SJ_SECURITY_MCU, XTAL_3MHz) /* xtal is 3MHz, divided by 4 internally */
+ MCFG_CPU_ADD("bmcu", TAITO_SJ_SECURITY_MCU, XTAL(3'000'000)) /* xtal is 3MHz, divided by 4 internally */
MCFG_TAITO_SJ_SECURITY_MCU_INT_MODE(LATCH)
MCFG_TAITO_SJ_SECURITY_MCU_68READ_CB(READ8(taitosj_state, mcu_mem_r))
MCFG_TAITO_SJ_SECURITY_MCU_68WRITE_CB(WRITE8(taitosj_state, mcu_mem_w))
diff --git a/src/mame/drivers/taitotz.cpp b/src/mame/drivers/taitotz.cpp
index 9017564c1e0..6c3f8a4a8b7 100644
--- a/src/mame/drivers/taitotz.cpp
+++ b/src/mame/drivers/taitotz.cpp
@@ -2562,7 +2562,7 @@ WRITE_LINE_MEMBER(taitotz_state::ide_interrupt)
MACHINE_CONFIG_START(taitotz_state::taitotz)
/* IBM EMPPC603eBG-100 */
MCFG_CPU_ADD("maincpu", PPC603E, 100000000)
- MCFG_PPC_BUS_FREQUENCY(XTAL_66_6667MHz) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
+ MCFG_PPC_BUS_FREQUENCY(XTAL(66'666'700)) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
MCFG_CPU_PROGRAM_MAP(ppc603e_mem)
/* TMP95C063F I/O CPU */
diff --git a/src/mame/drivers/tamag1.cpp b/src/mame/drivers/tamag1.cpp
index 2a38ee5eb91..c477b473244 100644
--- a/src/mame/drivers/tamag1.cpp
+++ b/src/mame/drivers/tamag1.cpp
@@ -135,13 +135,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tamag1_state::tama)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", E0C6S46, XTAL_32_768kHz)
+ MCFG_CPU_ADD("maincpu", E0C6S46, XTAL(32'768))
MCFG_E0C6S46_PIXEL_UPDATE_CB(tamag1_state, pixel_update)
MCFG_E0C6S46_WRITE_R_CB(4, WRITE8(tamag1_state, speaker_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
- MCFG_SCREEN_REFRESH_RATE(XTAL_32_768kHz/1024)
+ MCFG_SCREEN_REFRESH_RATE(XTAL(32'768)/1024)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(40, 16)
MCFG_SCREEN_VISIBLE_AREA(0, 32-1, 0, 16-1)
diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp
index 4cb5207efd3..f3deee9d74b 100644
--- a/src/mame/drivers/tandy1t.cpp
+++ b/src/mame/drivers/tandy1t.cpp
@@ -640,7 +640,7 @@ MACHINE_CONFIG_START(tandy1000_state::tandy1000_common)
MCFG_GFXDECODE_ADD("gfxdecode", "pcvideo_t1000:palette", t1000)
/* sound hardware */
- MCFG_SOUND_ADD("sn76496", NCR7496, XTAL_14_31818MHz/4)
+ MCFG_SOUND_ADD("sn76496", NCR7496, XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mb:mono", 0.80)
MCFG_NVRAM_ADD_0FILL("nvram");
@@ -700,7 +700,7 @@ MACHINE_CONFIG_DERIVED(tandy1000_state::t1000sx, t1000hx)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tandy1000_state::t1000rl)
- MCFG_CPU_ADD("maincpu", I8086, XTAL_28_63636MHz / 3)
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(28'636'363) / 3)
MCFG_CPU_PROGRAM_MAP(tandy1000_bank_map)
MCFG_CPU_IO_MAP(tandy1000_bank_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
@@ -723,7 +723,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(tandy1000_state::t1000sl2, t1000rl)
MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_CLOCK( XTAL_24MHz / 3 )
+ MCFG_CPU_CLOCK( XTAL(24'000'000) / 3 )
MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, nullptr, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, nullptr, false)
@@ -732,7 +732,7 @@ MACHINE_CONFIG_DERIVED(tandy1000_state::t1000sl2, t1000rl)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tandy1000_state::t1000tl)
- MCFG_CPU_ADD("maincpu", I80286, XTAL_28_63636MHz / 2)
+ MCFG_CPU_ADD("maincpu", I80286, XTAL(28'636'363) / 2)
MCFG_CPU_PROGRAM_MAP(tandy1000_286_map)
MCFG_CPU_IO_MAP(tandy1000_16_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp
index f6a38fefee9..d07df00cb87 100644
--- a/src/mame/drivers/tandy2k.cpp
+++ b/src/mame/drivers/tandy2k.cpp
@@ -287,8 +287,8 @@ WRITE8_MEMBER( tandy2k_state::addr_ctrl_w )
if (m_clkspd != clkspd || m_clkcnt != clkcnt)
{
- float busdotclk = XTAL_16MHz*28 / (clkspd ? 16 : 20);
- float vidcclk = busdotclk / (clkcnt ? 8 : 10);
+ const XTAL busdotclk = XTAL(16'000'000)*28 / (clkspd ? 16 : 20);
+ const XTAL vidcclk = busdotclk / (clkcnt ? 8 : 10);
m_vpac->set_character_width(clkcnt ? 8 : 10);
m_vpac->set_unscaled_clock(vidcclk);
@@ -766,7 +766,7 @@ void tandy2k_state::device_reset_after_children()
MACHINE_CONFIG_START(tandy2k_state::tandy2k)
// basic machine hardware
- MCFG_CPU_ADD(I80186_TAG, I80186, XTAL_16MHz)
+ MCFG_CPU_ADD(I80186_TAG, I80186, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(tandy2k_mem)
MCFG_CPU_IO_MAP(tandy2k_io)
MCFG_80186_IRQ_SLAVE_ACK(DEVREAD8(DEVICE_SELF, tandy2k_state, irq_callback))
@@ -782,7 +782,7 @@ MACHINE_CONFIG_START(tandy2k_state::tandy2k)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD(CRT9007_TAG, CRT9007, XTAL_16MHz*28/20/8)
+ MCFG_DEVICE_ADD(CRT9007_TAG, CRT9007, XTAL(16'000'000)*28/20/8)
MCFG_DEVICE_ADDRESS_MAP(0, vpac_mem)
MCFG_CRT9007_CHARACTER_WIDTH(8)
MCFG_CRT9007_INT_CALLBACK(DEVWRITELINE(I8259A_1_TAG, pic8259_device, ir1_w))
@@ -804,7 +804,7 @@ MACHINE_CONFIG_START(tandy2k_state::tandy2k)
MCFG_CRT9212_WEN2_VCC()
MCFG_CRT9212_DOUT_CALLBACK(WRITE8(tandy2k_state, drb_attr_w))
- MCFG_DEVICE_ADD(CRT9021B_TAG, CRT9021, XTAL_16MHz*28/20)
+ MCFG_DEVICE_ADD(CRT9021B_TAG, CRT9021, XTAL(16'000'000)*28/20)
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_TIMER_DRIVER_ADD("vidldsh", tandy2k_state, vidldsh_tick)
@@ -834,11 +834,11 @@ MACHINE_CONFIG_START(tandy2k_state::tandy2k)
// TODO pin 17 external receiver clock
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_16MHz/16)
+ MCFG_PIT8253_CLK0(XTAL(16'000'000)/16)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(tandy2k_state, outspkr_w))
- MCFG_PIT8253_CLK1(XTAL_16MHz/8)
+ MCFG_PIT8253_CLK1(XTAL(16'000'000)/8)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(tandy2k_state, intbrclk_w))
- //MCFG_PIT8253_CLK2(XTAL_16MHz/8)
+ //MCFG_PIT8253_CLK2(XTAL(16'000'000)/8)
//MCFG_PIT8253_OUT2_HANDLER(WRITELINE(tandy2k_state, rfrqpulse_w))
MCFG_DEVICE_ADD(I8259A_0_TAG, PIC8259, 0)
diff --git a/src/mame/drivers/tankbust.cpp b/src/mame/drivers/tankbust.cpp
index a482bbdf151..b0cdee5db8e 100644
--- a/src/mame/drivers/tankbust.cpp
+++ b/src/mame/drivers/tankbust.cpp
@@ -333,12 +333,12 @@ INTERRUPT_GEN_MEMBER(tankbust_state::vblank_irq)
MACHINE_CONFIG_START(tankbust_state::tankbust)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_14_31818MHz/2) /* Verified on PCB */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(14'318'181)/2) /* Verified on PCB */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tankbust_state, vblank_irq)
- MCFG_CPU_ADD("sub", Z80, XTAL_14_31818MHz/4) /* Verified on PCB */
-// MCFG_CPU_ADD("sub", Z80, XTAL_14_31818MHz/3) /* Accurate to audio recording, but apparently incorrect clock */
+ MCFG_CPU_ADD("sub", Z80, XTAL(14'318'181)/4) /* Verified on PCB */
+// MCFG_CPU_ADD("sub", Z80, XTAL(14'318'181)/3) /* Accurate to audio recording, but apparently incorrect clock */
MCFG_CPU_PROGRAM_MAP(map_cpu2)
MCFG_CPU_IO_MAP(port_map_cpu2)
@@ -363,12 +363,12 @@ MACHINE_CONFIG_START(tankbust_state::tankbust)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_14_31818MHz/16) /* Verified on PCB */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(14'318'181)/16) /* Verified on PCB */
MCFG_AY8910_PORT_A_READ_CB(READ8(tankbust_state, soundlatch_r))
MCFG_AY8910_PORT_B_READ_CB(READ8(tankbust_state, soundtimer_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_14_31818MHz/16) /* Verified on PCB */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(14'318'181)/16) /* Verified on PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tapatune.cpp b/src/mame/drivers/tapatune.cpp
index 553042b1ff2..4fef345318e 100644
--- a/src/mame/drivers/tapatune.cpp
+++ b/src/mame/drivers/tapatune.cpp
@@ -513,10 +513,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tapatune_state::tapatune_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(maincpu_map)
MCFG_CPU_IO_MAP(maincpu_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(tapatune_state, irq0_line_assert, XTAL_24MHz / 4 / 4 / 4096)
+ MCFG_CPU_PERIODIC_INT_DRIVER(tapatune_state, irq0_line_assert, XTAL(24'000'000) / 4 / 4 / 4096)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -525,18 +525,18 @@ MACHINE_CONFIG_START(tapatune_state::tapatune_base)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("bsmt", BSMT2000, XTAL_24MHz)
+ MCFG_SOUND_ADD("bsmt", BSMT2000, XTAL(24'000'000))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(tapatune_state::tapatune, tapatune_base)
- MCFG_CPU_ADD("videocpu", M68000, XTAL_24MHz / 2)
+ MCFG_CPU_ADD("videocpu", M68000, XTAL(24'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(video_map)
MCFG_QUANTUM_PERFECT_CPU("videocpu")
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_24MHz / 16)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(24'000'000) / 16)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(5)
MCFG_MC6845_BEGIN_UPDATE_CB(tapatune_state, crtc_begin_update)
@@ -545,7 +545,7 @@ MACHINE_CONFIG_DERIVED(tapatune_state::tapatune, tapatune_base)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz / 16 * 5, 500, 0, 320, 250, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000) / 16 * 5, 500, 0, 320, 250, 0, 240)
MCFG_SCREEN_UPDATE_DEVICE("crtc", h46505_device, screen_update)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/targeth.cpp b/src/mame/drivers/targeth.cpp
index af3834c41b9..ee971efc58b 100644
--- a/src/mame/drivers/targeth.cpp
+++ b/src/mame/drivers/targeth.cpp
@@ -271,11 +271,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(targeth_state::targeth)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", targeth_state, irq2_line_hold)
- MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2)
+ MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(24'000'000) / 2)
MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
@@ -298,7 +298,7 @@ MACHINE_CONFIG_START(targeth_state::targeth)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) // 1MHz resonator - pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) // 1MHz resonator - pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp
index bd130065afd..1454fbd42ae 100644
--- a/src/mame/drivers/tatsumi.cpp
+++ b/src/mame/drivers/tatsumi.cpp
@@ -153,8 +153,8 @@
#include "roundup5.lh"
-#define CLOCK_1 XTAL_16MHz
-#define CLOCK_2 XTAL_50MHz
+#define CLOCK_1 XTAL(16'000'000)
+#define CLOCK_2 XTAL(50'000'000)
/***************************************************************************/
diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp
index 00bc322a94a..368b6199a33 100644
--- a/src/mame/drivers/tavernie.cpp
+++ b/src/mame/drivers/tavernie.cpp
@@ -290,7 +290,7 @@ void tavernie_state::kbd_put(u8 data)
MACHINE_CONFIG_START(tavernie_state::cpu09)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(cpu09_mem)
MCFG_MACHINE_RESET_OVERRIDE(tavernie_state, cpu09)
@@ -310,7 +310,7 @@ MACHINE_CONFIG_START(tavernie_state::cpu09)
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
- MCFG_DEVICE_ADD("ptm", PTM6840, XTAL_4MHz / 4)
+ MCFG_DEVICE_ADD("ptm", PTM6840, XTAL(4'000'000) / 4)
// all i/o lines connect to the 40-pin expansion connector
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
MCFG_PTM6840_OUT1_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
@@ -363,7 +363,7 @@ MACHINE_CONFIG_DERIVED(tavernie_state::ivg09, cpu09)
MCFG_PIA_WRITEPA_HANDLER(WRITE8(tavernie_state, pa_ivg_w))
MCFG_PIA_CB2_HANDLER(DEVWRITELINE("beeper", beep_device, set_state))
- MCFG_FD1795_ADD("fdc", XTAL_8MHz / 8)
+ MCFG_FD1795_ADD("fdc", XTAL(8'000'000) / 8)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ifd09_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tceptor.cpp b/src/mame/drivers/tceptor.cpp
index e4b073e9b9d..be6d9aefe21 100644
--- a/src/mame/drivers/tceptor.cpp
+++ b/src/mame/drivers/tceptor.cpp
@@ -342,21 +342,21 @@ void tceptor_state::machine_reset()
MACHINE_CONFIG_START(tceptor_state::tceptor)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, XTAL_49_152MHz/32)
+ MCFG_CPU_ADD("maincpu", M6809, XTAL(49'152'000)/32)
MCFG_CPU_PROGRAM_MAP(m6809_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tceptor_state, m6809_vb_interrupt)
- MCFG_CPU_ADD("audiocpu", M65C02, XTAL_49_152MHz/24)
+ MCFG_CPU_ADD("audiocpu", M65C02, XTAL(49'152'000)/24)
MCFG_CPU_PROGRAM_MAP(m6502_a_map)
- MCFG_CPU_ADD("audio2", M65C02, XTAL_49_152MHz/24)
+ MCFG_CPU_ADD("audio2", M65C02, XTAL(49'152'000)/24)
MCFG_CPU_PROGRAM_MAP(m6502_b_map)
- MCFG_CPU_ADD("sub", M68000, XTAL_49_152MHz/4)
+ MCFG_CPU_ADD("sub", M68000, XTAL(49'152'000)/4)
MCFG_CPU_PROGRAM_MAP(m68k_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tceptor_state, m68k_vb_interrupt)
- MCFG_CPU_ADD("mcu", HD63701, XTAL_49_152MHz/8) // or compatible 6808 with extra instructions
+ MCFG_CPU_ADD("mcu", HD63701, XTAL(49'152'000)/8) // or compatible 6808 with extra instructions
MCFG_CPU_PROGRAM_MAP(mcu_map)
MCFG_CPU_IO_MAP(mcu_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tceptor_state, mcu_vb_interrupt)
@@ -386,11 +386,11 @@ MACHINE_CONFIG_START(tceptor_state::tceptor)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL_49_152MHz/2048)
+ MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2048)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_NAMCO_AUDIO_STEREO(1)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
diff --git a/src/mame/drivers/tdv2324.cpp b/src/mame/drivers/tdv2324.cpp
index 366217a528d..fbb2ae09f5a 100644
--- a/src/mame/drivers/tdv2324.cpp
+++ b/src/mame/drivers/tdv2324.cpp
@@ -279,7 +279,7 @@ MACHINE_CONFIG_START(tdv2324_state::tdv2324)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD(TMS9937NL_TAG, TMS9927, XTAL_25_39836MHz)
+ MCFG_DEVICE_ADD(TMS9937NL_TAG, TMS9927, XTAL(25'398'360))
MCFG_TMS9927_CHAR_WIDTH(8)
// devices
diff --git a/src/mame/drivers/tec1.cpp b/src/mame/drivers/tec1.cpp
index 90dfb58054f..b5c66b64aaf 100644
--- a/src/mame/drivers/tec1.cpp
+++ b/src/mame/drivers/tec1.cpp
@@ -421,7 +421,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tec1_state::tecjmon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545) / 2)
MCFG_CPU_PROGRAM_MAP(tecjmon_map)
MCFG_CPU_IO_MAP(tecjmon_io)
diff --git a/src/mame/drivers/techno.cpp b/src/mame/drivers/techno.cpp
index a16b5d27bf6..d880efe7311 100644
--- a/src/mame/drivers/techno.cpp
+++ b/src/mame/drivers/techno.cpp
@@ -257,7 +257,7 @@ void techno_state::device_timer(emu_timer &timer, device_timer_id id, int param,
else if (id == IRQ_SET_TIMER)
{
m_maincpu->set_input_line_and_vector(M68K_IRQ_1, ASSERT_LINE, m_vector);
- m_irq_advance_timer->adjust(attotime::from_hz(XTAL_8MHz / 32));
+ m_irq_advance_timer->adjust(attotime::from_hz(XTAL(8'000'000) / 32));
}
}
@@ -272,18 +272,18 @@ void techno_state::machine_reset()
m_vector = 0x88;
m_digit = 0;
- attotime freq = attotime::from_hz(XTAL_8MHz / 256); // 31250Hz
+ attotime freq = attotime::from_hz(XTAL(8'000'000) / 256); // 31250Hz
m_irq_set_timer->adjust(freq, 0, freq);
m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE);
}
MACHINE_CONFIG_START(techno_state::techno)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(techno_map)
MCFG_NVRAM_ADD_0FILL("nvram")
- //MCFG_CPU_ADD("cpu2", TMS7000, XTAL_4MHz)
+ //MCFG_CPU_ADD("cpu2", TMS7000, XTAL(4'000'000))
//MCFG_CPU_PROGRAM_MAP(techno_sub_map)
/* Video */
diff --git a/src/mame/drivers/tecmo.cpp b/src/mame/drivers/tecmo.cpp
index 7270a81f468..809934bf7c5 100644
--- a/src/mame/drivers/tecmo.cpp
+++ b/src/mame/drivers/tecmo.cpp
@@ -626,18 +626,18 @@ void tecmo_state::machine_reset()
MACHINE_CONFIG_START(tecmo_state::rygar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(rygar_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tecmo_state, irq0_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL_4MHz) /* verified on pcb */
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL(4'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(rygar_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 384,0,256,264,16,240) // 59.18 Hz
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4, 384,0,256,264,16,240) // 59.18 Hz
MCFG_SCREEN_UPDATE_DRIVER(tecmo_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -655,11 +655,11 @@ MACHINE_CONFIG_START(tecmo_state::rygar)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL_4MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(4'000'000)) /* verified on pcb */
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb, even if schematics shows a 384khz resonator */
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(400'000)) /* verified on pcb, even if schematics shows a 384khz resonator */
MCFG_MSM5205_VCLK_CB(WRITELINE(tecmo_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -671,13 +671,13 @@ MACHINE_CONFIG_DERIVED(tecmo_state::gemini, rygar)
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
// xtal found on bootleg, to be confirmed on a real board
- MCFG_CPU_CLOCK(XTAL_8MHz)
+ MCFG_CPU_CLOCK(XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(gemini_map)
MCFG_CPU_MODIFY("soundcpu")
MCFG_CPU_PROGRAM_MAP(tecmo_sound_map)
- MCFG_SOUND_REPLACE("ymsnd", YM3812, XTAL_4MHz)
+ MCFG_SOUND_REPLACE("ymsnd", YM3812, XTAL(4'000'000))
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tecmo16.cpp b/src/mame/drivers/tecmo16.cpp
index 18432349650..c15dd736ab4 100644
--- a/src/mame/drivers/tecmo16.cpp
+++ b/src/mame/drivers/tecmo16.cpp
@@ -356,8 +356,8 @@ GFXDECODE_END
/******************************************************************************/
-#define MASTER_CLOCK XTAL_24MHz
-#define OKI_CLOCK XTAL_8MHz
+#define MASTER_CLOCK XTAL(24'000'000)
+#define OKI_CLOCK XTAL(8'000'000)
MACHINE_CONFIG_START(tecmo16_state::fstarfrc)
diff --git a/src/mame/drivers/tecmosys.cpp b/src/mame/drivers/tecmosys.cpp
index a5a0ac84c6b..ba8c394e955 100644
--- a/src/mame/drivers/tecmosys.cpp
+++ b/src/mame/drivers/tecmosys.cpp
@@ -433,14 +433,14 @@ void tecmosys_state::machine_start()
}
MACHINE_CONFIG_START(tecmosys_state::deroon)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tecmosys_state, irq1_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 400) // guess
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/2 )
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/2 )
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(io_map)
@@ -471,18 +471,18 @@ MACHINE_CONFIG_START(tecmosys_state::deroon)
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymf", YMF262, XTAL_14_31818MHz)
+ MCFG_SOUND_ADD("ymf", YMF262, XTAL(14'318'181))
MCFG_YMF262_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MCFG_SOUND_ROUTE(2, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(3, "rspeaker", 1.00)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/8, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tecnbras.cpp b/src/mame/drivers/tecnbras.cpp
index 422dc071ec3..00cfd9bd2ea 100644
--- a/src/mame/drivers/tecnbras.cpp
+++ b/src/mame/drivers/tecnbras.cpp
@@ -102,7 +102,7 @@ void tecnbras_state::machine_reset()
MACHINE_CONFIG_START(tecnbras_state::tecnbras)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL_12MHz) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", I80C31, XTAL(12'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(i80c31_prg)
MCFG_CPU_IO_MAP(i80c31_io)
diff --git a/src/mame/drivers/tek405x.cpp b/src/mame/drivers/tek405x.cpp
index 13af7ddd4ec..966814cb904 100644
--- a/src/mame/drivers/tek405x.cpp
+++ b/src/mame/drivers/tek405x.cpp
@@ -998,7 +998,7 @@ void tek4052_state::machine_start()
MACHINE_CONFIG_START(tek4051_state::tek4051)
// basic machine hardware
- MCFG_CPU_ADD(MC6800_TAG, M6800, XTAL_12_5MHz/15)
+ MCFG_CPU_ADD(MC6800_TAG, M6800, XTAL(12'500'000)/15)
MCFG_CPU_PROGRAM_MAP(tek4051_mem)
// video hardware
@@ -1018,7 +1018,7 @@ MACHINE_CONFIG_START(tek4051_state::tek4051)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
- MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", tek4051_state, keyboard_tick, attotime::from_hz(XTAL_12_5MHz/15/4))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", tek4051_state, keyboard_tick, attotime::from_hz(XTAL(12'500'000)/15/4))
MCFG_DEVICE_ADD(MC6820_X_TAG, PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(tek4051_state, x_pia_pa_r))
diff --git a/src/mame/drivers/tek440x.cpp b/src/mame/drivers/tek440x.cpp
index 90ad3c42a8a..238762e02bc 100644
--- a/src/mame/drivers/tek440x.cpp
+++ b/src/mame/drivers/tek440x.cpp
@@ -53,7 +53,7 @@
#include "speaker.h"
-#define VIDEO_CLOCK XTAL_25_2MHz
+#define VIDEO_CLOCK XTAL(25'200'000)
class tek440x_state : public driver_device
{
@@ -189,7 +189,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tek440x_state::tek4404)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68010, XTAL_40MHz / 4) // MC68010L10
+ MCFG_CPU_ADD("maincpu", M68010, XTAL(40'000'000) / 4) // MC68010L10
MCFG_CPU_PROGRAM_MAP(maincpu_map)
MCFG_CPU_ADD("fdccpu", M6502, 1000000)
@@ -207,10 +207,10 @@ MACHINE_CONFIG_START(tek440x_state::tek4404)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("aica", MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_DEVICE_ADD("timer", AM9513, XTAL_40MHz / 4 / 10) // from CPU E output
+ MCFG_DEVICE_ADD("timer", AM9513, XTAL(40'000'000) / 4 / 10) // from CPU E output
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("aica", mos6551_device, write_rxd))
diff --git a/src/mame/drivers/tekxp33x.cpp b/src/mame/drivers/tekxp33x.cpp
index 23a14b46f5e..566dea97d37 100644
--- a/src/mame/drivers/tekxp33x.cpp
+++ b/src/mame/drivers/tekxp33x.cpp
@@ -92,11 +92,11 @@ void tekxp330_state::machine_start()
MACHINE_CONFIG_START(tekxp330_state::tekxp330)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R3052, XTAL_20MHz) /* IDT 79R3052E, clock unknown */
+ MCFG_CPU_ADD("maincpu", R3052, XTAL(20'000'000)) /* IDT 79R3052E, clock unknown */
MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG)
MCFG_CPU_PROGRAM_MAP(cpu_map)
- MCFG_CPU_ADD("tms", TMS34010, XTAL_40MHz) /* clock unknown */
+ MCFG_CPU_ADD("tms", TMS34010, XTAL(40'000'000)) /* clock unknown */
MCFG_CPU_PROGRAM_MAP(tms_map)
/* video hardware */
diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp
index d19c24c1a47..e6787d4d244 100644
--- a/src/mame/drivers/tempest.cpp
+++ b/src/mame/drivers/tempest.cpp
@@ -287,8 +287,8 @@ Note: Roms for Tempest Analog Vector-Generator PCB Assembly A037383-03 or A03738
#include "speaker.h"
-#define MASTER_CLOCK (XTAL_12_096MHz)
-#define CLOCK_3KHZ ((double)MASTER_CLOCK / 4096)
+#define MASTER_CLOCK (XTAL(12'096'000))
+#define CLOCK_3KHZ (MASTER_CLOCK / 4096)
#define TEMPEST_KNOB_P1_TAG "KNOBP1"
#define TEMPEST_KNOB_P2_TAG "KNOBP2"
diff --git a/src/mame/drivers/terak.cpp b/src/mame/drivers/terak.cpp
index bc58c7e28c9..bbbe73b4988 100644
--- a/src/mame/drivers/terak.cpp
+++ b/src/mame/drivers/terak.cpp
@@ -99,7 +99,7 @@ uint32_t terak_state::screen_update_terak(screen_device &screen, bitmap_ind16 &b
MACHINE_CONFIG_START(terak_state::terak)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",T11, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",T11, XTAL(4'000'000))
MCFG_T11_INITIAL_MODE(6 << 13)
MCFG_CPU_PROGRAM_MAP(mem_map)
diff --git a/src/mame/drivers/terco.cpp b/src/mame/drivers/terco.cpp
index 68ee3c690ce..9113c44e86f 100644
--- a/src/mame/drivers/terco.cpp
+++ b/src/mame/drivers/terco.cpp
@@ -292,7 +292,7 @@ static INPUT_PORTS_START( t4490 )
INPUT_PORTS_END
MACHINE_CONFIG_START(t4490_state::t4490)
- MCFG_CPU_ADD("maincpu", M6800, XTAL_8MHz/4) // divided by a MC6875
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(8'000'000)/4) // divided by a MC6875
MCFG_CPU_PROGRAM_MAP(t4490_map)
/* devices */
diff --git a/src/mame/drivers/terracre.cpp b/src/mame/drivers/terracre.cpp
index 96cf5e64d50..c2405eb7ba3 100644
--- a/src/mame/drivers/terracre.cpp
+++ b/src/mame/drivers/terracre.cpp
@@ -574,14 +574,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(terracre_state::ym3526)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(terracre_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", terracre_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) // 4.0mhz when compared to sound recordings, should be derived from XTAL_22MHz? how?
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) // 4.0mhz when compared to sound recordings, should be derived from XTAL(22'000'000)? how?
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_3526_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(terracre_state, irq0_line_hold, XTAL_16MHz/4/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(terracre_state, irq0_line_hold, XTAL(16'000'000)/4/512) // ?
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -603,7 +603,7 @@ MACHINE_CONFIG_START(terracre_state::ym3526)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL_16MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
@@ -619,7 +619,7 @@ MACHINE_CONFIG_DERIVED(terracre_state::ym2203, ym3526)
MCFG_DEVICE_REMOVE("ymsnd")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_16MHz/4)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(0, "speaker", 0.2)
MCFG_SOUND_ROUTE(1, "speaker", 0.2)
MCFG_SOUND_ROUTE(2, "speaker", 0.2)
diff --git a/src/mame/drivers/testconsole.cpp b/src/mame/drivers/testconsole.cpp
index 050bf4551cb..aad59a89ebc 100644
--- a/src/mame/drivers/testconsole.cpp
+++ b/src/mame/drivers/testconsole.cpp
@@ -167,11 +167,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(whouse_testcons_state::whousetc)
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'144'000))
MCFG_CPU_PROGRAM_MAP(program_map)
MCFG_CPU_IO_MAP(io_map)
- MCFG_DEVICE_ADD("i8155", I8155, XTAL_6_144MHz)
+ MCFG_DEVICE_ADD("i8155", I8155, XTAL(6'144'000))
MCFG_DEVICE_ADD("i8255", I8255, 0)
diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp
index bb696a03d7b..651ea8cb473 100644
--- a/src/mame/drivers/tetrisp2.cpp
+++ b/src/mame/drivers/tetrisp2.cpp
@@ -1367,7 +1367,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tetrisp2_state::nndmseal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(nndmseal_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tetrisp2_state, irq2_line_hold)
@@ -1392,7 +1392,7 @@ MACHINE_CONFIG_START(tetrisp2_state::nndmseal)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_2MHz, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(2'000'000), PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tg100.cpp b/src/mame/drivers/tg100.cpp
index 88187e1b2a5..595f8487c03 100644
--- a/src/mame/drivers/tg100.cpp
+++ b/src/mame/drivers/tg100.cpp
@@ -67,7 +67,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(tg100_state::tg100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83002, XTAL_20MHz) /* TODO: correct CPU type (H8/520) */
+ MCFG_CPU_ADD("maincpu", H83002, XTAL(20'000'000)) /* TODO: correct CPU type (H8/520) */
MCFG_CPU_PROGRAM_MAP( tg100_map )
MCFG_CPU_IO_MAP( tg100_io_map )
diff --git a/src/mame/drivers/tgtpanic.cpp b/src/mame/drivers/tgtpanic.cpp
index 4eabed38aca..a459bf1e2dd 100644
--- a/src/mame/drivers/tgtpanic.cpp
+++ b/src/mame/drivers/tgtpanic.cpp
@@ -150,7 +150,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tgtpanic_state::tgtpanic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(prg_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(tgtpanic_state, irq0_line_hold, 20) /* Unverified */
diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp
index 95d96c30132..28113bad297 100644
--- a/src/mame/drivers/thayers.cpp
+++ b/src/mame/drivers/thayers.cpp
@@ -495,7 +495,7 @@ WRITE8_MEMBER(thayers_state::den2_w)
*/
-#define SSI263_CLOCK (XTAL_4MHz/2)
+#define SSI263_CLOCK (XTAL(4'000'000)/2)
static const char SSI263_PHONEMES[0x40][5] =
{
@@ -790,11 +790,11 @@ void thayers_state::machine_reset()
MACHINE_CONFIG_START(thayers_state::thayers)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(thayers_map)
MCFG_CPU_IO_MAP(thayers_io_map)
- MCFG_CPU_ADD("mcu", COP421, XTAL_4MHz/2) // COP421L-PCA/N
+ MCFG_CPU_ADD("mcu", COP421, XTAL(4'000'000)/2) // COP421L-PCA/N
MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false )
MCFG_COP400_READ_L_CB(READ8(thayers_state, cop_l_r))
MCFG_COP400_WRITE_L_CB(WRITE8(thayers_state, cop_l_w))
diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp
index 54a18b9be07..c3c9a105adc 100644
--- a/src/mame/drivers/thedealr.cpp
+++ b/src/mame/drivers/thedealr.cpp
@@ -528,11 +528,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(thedealr_state::thedealr_interrupt)
MACHINE_CONFIG_START(thedealr_state::thedealr)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", R65C02, XTAL_16MHz/8) // 2 MHz?
+ MCFG_CPU_ADD("maincpu", R65C02, XTAL(16'000'000)/8) // 2 MHz?
MCFG_CPU_PROGRAM_MAP(thedealr)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", thedealr_state, thedealr_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("subcpu", R65C02, XTAL_16MHz/8) // 2 MHz?
+ MCFG_CPU_ADD("subcpu", R65C02, XTAL(16'000'000)/8) // 2 MHz?
MCFG_CPU_PROGRAM_MAP(thedealr_sub)
MCFG_CPU_VBLANK_INT_DRIVER("screen", thedealr_state, nmi_line_pulse)
@@ -562,7 +562,7 @@ MACHINE_CONFIG_START(thedealr_state::thedealr)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL_16MHz/8) // 2 MHz?
+ MCFG_SOUND_ADD("aysnd", YM2149, XTAL(16'000'000)/8) // 2 MHz?
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/thedeep.cpp b/src/mame/drivers/thedeep.cpp
index 7fbcc37763d..37e7e006eb4 100644
--- a/src/mame/drivers/thedeep.cpp
+++ b/src/mame/drivers/thedeep.cpp
@@ -407,16 +407,16 @@ INTERRUPT_GEN_MEMBER(thedeep_state::mcu_irq)
MACHINE_CONFIG_START(thedeep_state::thedeep)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", thedeep_state, interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", M65C02, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", M65C02, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(audio_map)
/* IRQ by YM2203, NMI by when sound latch written by main cpu */
/* MCU is a i8751 running at 8Mhz (8mhz xtal)*/
- MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz)
+ MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
MCFG_CPU_IO_MAP(mcu_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", thedeep_state, mcu_irq) // unknown source, but presumably vblank
MCFG_DEVICE_DISABLE()
@@ -446,7 +446,7 @@ MACHINE_CONFIG_START(thedeep_state::thedeep)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/thief.cpp b/src/mame/drivers/thief.cpp
index d28c33960e6..ea8692436f7 100644
--- a/src/mame/drivers/thief.cpp
+++ b/src/mame/drivers/thief.cpp
@@ -391,7 +391,7 @@ static const char *const natodef_sample_names[] =
MACHINE_CONFIG_START(thief_state::thief)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(thief_main_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(thief_state, iack)
@@ -403,11 +403,11 @@ MACHINE_CONFIG_START(thief_state::thief)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_20MHz/4, 320, 0, 256, 272, 0, 256)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(20'000'000)/4, 320, 0, 256, 272, 0, 256)
MCFG_SCREEN_UPDATE_DRIVER(thief_state, screen_update_thief)
MCFG_SCREEN_PALETTE("palette")
- MCFG_DEVICE_ADD("tms", TMS9927, XTAL_20MHz/4)
+ MCFG_DEVICE_ADD("tms", TMS9927, XTAL(20'000'000)/4)
MCFG_TMS9927_CHAR_WIDTH(8)
MCFG_TMS9927_VSYN_CALLBACK(ASSERTLINE("maincpu", 0))
MCFG_PALETTE_ADD("palette", 16)
@@ -415,10 +415,10 @@ MACHINE_CONFIG_START(thief_state::thief)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_8MHz/2/4)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(8'000'000)/2/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_8MHz/2/4)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(8'000'000)/2/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD("samples", SAMPLES, 0)
diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp
index 07f5a71f5c2..c3e1e70b2a5 100644
--- a/src/mame/drivers/thomson.cpp
+++ b/src/mame/drivers/thomson.cpp
@@ -688,7 +688,7 @@ MACHINE_CONFIG_START(thomson_state::to7)
MCFG_LEGACY_FLOPPY_CONFIG(thomson_floppy_interface)
MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(thomson_state, fdc_index_3_w))
- MCFG_WD2793_ADD("wd2793", XTAL_1MHz)
+ MCFG_WD2793_ADD("wd2793", XTAL(1'000'000))
MCFG_FLOPPY_DRIVE_ADD("wd2793:0", cd90_640_floppies, "dd", thomson_state::cd90_640_formats)
MCFG_FLOPPY_DRIVE_ADD("wd2793:1", cd90_640_floppies, "dd", thomson_state::cd90_640_formats)
@@ -718,7 +718,7 @@ MACHINE_CONFIG_START(thomson_state::to7)
/* TODO: CONVERT THIS TO A SLOT DEVICE (RF 57-932) */
MCFG_DEVICE_ADD("acia", MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
/// 2400 7N2
diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp
index 04e947ab0cf..654e54232e9 100644
--- a/src/mame/drivers/thoop2.cpp
+++ b/src/mame/drivers/thoop2.cpp
@@ -262,11 +262,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(thoop2_state::thoop2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL_24MHz / 2) // 12MHz verified
+ MCFG_CPU_ADD("maincpu", M68000,XTAL(24'000'000) / 2) // 12MHz verified
MCFG_CPU_PROGRAM_MAP(thoop2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", thoop2_state, irq6_line_hold)
- MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) // 12MHz verified
+ MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(24'000'000) / 2) // 12MHz verified
MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
@@ -295,7 +295,7 @@ MACHINE_CONFIG_START(thoop2_state::thoop2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) // 1MHz resonator - pin 7 not connected
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) // 1MHz resonator - pin 7 not connected
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/thunderx.cpp b/src/mame/drivers/thunderx.cpp
index d6f7f09bd9b..b25f9b30d0c 100644
--- a/src/mame/drivers/thunderx.cpp
+++ b/src/mame/drivers/thunderx.cpp
@@ -633,11 +633,11 @@ void thunderx_state::machine_reset()
MACHINE_CONFIG_START(thunderx_state::scontra)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 (verified on pcb) */
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 (verified on pcb) */
MCFG_CPU_PROGRAM_MAP(scontra_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", thunderx_state, vblank_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(scontra_sound_map)
MCFG_DEVICE_ADD("bank5800", ADDRESS_MAP_BANK, 0)
@@ -676,11 +676,11 @@ MACHINE_CONFIG_START(thunderx_state::scontra)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545)) /* verified on pcb */
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(thunderx_state, volume_callback))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
diff --git a/src/mame/drivers/ti630.cpp b/src/mame/drivers/ti630.cpp
index 09ba74f4fb7..069935a37a7 100644
--- a/src/mame/drivers/ti630.cpp
+++ b/src/mame/drivers/ti630.cpp
@@ -184,7 +184,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(ti630_state::ti630)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", I80C31, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(i80c31_prg)
MCFG_CPU_IO_MAP(i80c31_io)
diff --git a/src/mame/drivers/ti74.cpp b/src/mame/drivers/ti74.cpp
index 241c6b8f34d..cfd8e21dd51 100644
--- a/src/mame/drivers/ti74.cpp
+++ b/src/mame/drivers/ti74.cpp
@@ -508,7 +508,7 @@ void ti74_state::machine_start()
MACHINE_CONFIG_START(ti74_state::ti74)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS70C46, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", TMS70C46, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_TMS7000_IN_PORTA_CB(READ8(ti74_state, keyboard_r))
MCFG_TMS7000_OUT_PORTB_CB(WRITE8(ti74_state, bankswitch_w))
@@ -544,7 +544,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ti74_state::ti95)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS70C46, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", TMS70C46, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_TMS7000_IN_PORTA_CB(READ8(ti74_state, keyboard_r))
MCFG_TMS7000_OUT_PORTB_CB(WRITE8(ti74_state, bankswitch_w))
diff --git a/src/mame/drivers/ti89.cpp b/src/mame/drivers/ti89.cpp
index 898bc224869..9da6c3f51fc 100644
--- a/src/mame/drivers/ti89.cpp
+++ b/src/mame/drivers/ti89.cpp
@@ -517,7 +517,7 @@ PALETTE_INIT_MEMBER(ti68k_state, ti68k)
MACHINE_CONFIG_START(ti68k_state::ti89)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(ti89_mem)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -552,19 +552,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(ti68k_state::ti92p, ti92)
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_REPLACE("maincpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(ti92p_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(ti68k_state::v200, ti92)
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_REPLACE("maincpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(v200_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(ti68k_state::ti89t, ti89)
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_REPLACE("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(ti89t_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp
index 07ed6284b9a..4d477dff73d 100644
--- a/src/mame/drivers/ti99_4x.cpp
+++ b/src/mame/drivers/ti99_4x.cpp
@@ -913,7 +913,7 @@ MACHINE_CONFIG_END
US version: 60 Hz, NTSC
*/
MACHINE_CONFIG_DERIVED(ti99_4x_state::ti99_4_60hz, ti99_4)
- MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9918, XTAL_10_738635MHz / 2 ) \
+ MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9918, XTAL(10'738'635) / 2 ) \
MCFG_TMS9928A_VRAM_SIZE(0x4000) \
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in)) \
MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in)) \
@@ -925,7 +925,7 @@ MACHINE_CONFIG_END
European version: 50 Hz, PAL
*/
MACHINE_CONFIG_DERIVED(ti99_4x_state::ti99_4_50hz, ti99_4)
- MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9929, XTAL_10_738635MHz / 2 ) \
+ MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9929, XTAL(10'738'635) / 2 ) \
MCFG_TMS9928A_VRAM_SIZE(0x4000) \
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in)) \
MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in)) \
@@ -1029,7 +1029,7 @@ MACHINE_CONFIG_END
US version: 60 Hz, NTSC
*/
MACHINE_CONFIG_DERIVED(ti99_4x_state::ti99_4a_60hz, ti99_4a)
- MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9918A, XTAL_10_738635MHz / 2 ) \
+ MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9918A, XTAL(10'738'635) / 2 ) \
MCFG_TMS9928A_VRAM_SIZE(0x4000) \
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in)) \
MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in)) \
@@ -1041,7 +1041,7 @@ MACHINE_CONFIG_END
European version: 50 Hz, PAL
*/
MACHINE_CONFIG_DERIVED(ti99_4x_state::ti99_4a_50hz, ti99_4a)
- MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9929A, XTAL_10_738635MHz / 2 ) \
+ MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9929A, XTAL(10'738'635) / 2 ) \
MCFG_TMS9928A_VRAM_SIZE(0x4000) \
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in)) \
MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in)) \
@@ -1074,7 +1074,7 @@ MACHINE_CONFIG_END
There were no European versions.
*/
MACHINE_CONFIG_DERIVED(ti99_4x_state::ti99_4qi_60hz, ti99_4qi)
- MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9918A, XTAL_10_738635MHz / 2 ) \
+ MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9918A, XTAL(10'738'635) / 2 ) \
MCFG_TMS9928A_VRAM_SIZE(0x4000) \
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in)) \
MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in)) \
@@ -1107,7 +1107,7 @@ MACHINE_RESET_MEMBER(ti99_4x_state, ti99_4ev)
m_int1 = CLEAR_LINE;
m_int2 = CLEAR_LINE;
m_int12 = CLEAR_LINE;
- m_gromclk_timer->adjust(attotime::zero, 0, attotime::from_hz(XTAL_10_738635MHz/24));
+ m_gromclk_timer->adjust(attotime::zero, 0, attotime::from_hz(XTAL(10'738'635)/24));
}
MACHINE_CONFIG_START(ti99_4x_state::ti99_4ev_60hz)
diff --git a/src/mame/drivers/ti99_8.cpp b/src/mame/drivers/ti99_8.cpp
index 1e737abf396..3869d9daa04 100644
--- a/src/mame/drivers/ti99_8.cpp
+++ b/src/mame/drivers/ti99_8.cpp
@@ -720,7 +720,7 @@ MACHINE_CONFIG_START(ti99_8_state::ti99_8)
// basic machine hardware */
// TMS9995-MP9537 CPU @ 10.7 MHz
// MP9537 mask: This variant of the TMS9995 does not contain on-chip RAM
- MCFG_TMS99xx_ADD("maincpu", TMS9995_MP9537, XTAL_10_738635MHz, memmap, crumap)
+ MCFG_TMS99xx_ADD("maincpu", TMS9995_MP9537, XTAL(10'738'635), memmap, crumap)
MCFG_TMS9995_EXTOP_HANDLER( WRITE8(ti99_8_state, external_operation) )
MCFG_TMS9995_CLKOUT_HANDLER( WRITELINE(ti99_8_state, clock_out) )
MCFG_TMS9995_DBIN_HANDLER( WRITELINE(ti99_8_state, dbin_line) )
@@ -730,7 +730,7 @@ MACHINE_CONFIG_START(ti99_8_state::ti99_8)
MCFG_MACHINE_RESET_OVERRIDE(ti99_8_state, ti99_8 )
// 9901 configuration
- MCFG_DEVICE_ADD(TI_TMS9901_TAG, TMS9901, XTAL_10_738635MHz/4.0)
+ MCFG_DEVICE_ADD(TI_TMS9901_TAG, TMS9901, XTAL(10'738'635)/4.0)
MCFG_TMS9901_READBLOCK_HANDLER( READ8(ti99_8_state, read_by_9901) )
MCFG_TMS9901_P0_HANDLER( WRITELINE( ti99_8_state, keyC0) )
MCFG_TMS9901_P1_HANDLER( WRITELINE( ti99_8_state, keyC1) )
@@ -829,7 +829,7 @@ MACHINE_CONFIG_END
*/
MACHINE_CONFIG_DERIVED(ti99_8_state::ti99_8_60hz, ti99_8)
// Video hardware
- MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9118, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9118, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_8_state, video_interrupt))
MCFG_TMS9928A_SCREEN_ADD_NTSC( TI_SCREEN_TAG )
@@ -841,7 +841,7 @@ MACHINE_CONFIG_END
*/
MACHINE_CONFIG_DERIVED(ti99_8_state::ti99_8_50hz, ti99_8)
// Video hardware
- MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9129, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9129, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_8_state,video_interrupt))
MCFG_TMS9928A_SCREEN_ADD_PAL( TI_SCREEN_TAG )
diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp
index 6223c58d7a9..2cc96c48651 100644
--- a/src/mame/drivers/tickee.cpp
+++ b/src/mame/drivers/tickee.cpp
@@ -100,9 +100,9 @@ protected:
};
-#define CPU_CLOCK XTAL_40MHz
-#define VIDEO_CLOCK XTAL_14_31818MHz
-#define OKI_CLOCK XTAL_1MHz
+#define CPU_CLOCK XTAL(40'000'000)
+#define VIDEO_CLOCK XTAL(14'318'181)
+#define OKI_CLOCK XTAL(1'000'000)
/*************************************
@@ -751,7 +751,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tickee_state::tickee)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
+ MCFG_CPU_ADD("maincpu", TMS34010, XTAL(40'000'000))
MCFG_CPU_PROGRAM_MAP(tickee_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(VIDEO_CLOCK/2) /* pixel clock */
@@ -799,7 +799,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tickee_state::rapidfir)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, XTAL_50MHz)
+ MCFG_CPU_ADD("maincpu", TMS34010, XTAL(50'000'000))
MCFG_CPU_PROGRAM_MAP(rapidfir_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(VIDEO_CLOCK/2) /* pixel clock */
@@ -833,7 +833,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tickee_state::mouseatk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
+ MCFG_CPU_ADD("maincpu", TMS34010, XTAL(40'000'000))
MCFG_CPU_PROGRAM_MAP(mouseatk_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(VIDEO_CLOCK/2) /* pixel clock */
diff --git a/src/mame/drivers/tigeroad.cpp b/src/mame/drivers/tigeroad.cpp
index 9e52f6d3ca0..ea3238542c8 100644
--- a/src/mame/drivers/tigeroad.cpp
+++ b/src/mame/drivers/tigeroad.cpp
@@ -577,11 +577,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(tigeroad_state::tigeroad)
/* 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(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tigeroad_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_port_map)
@@ -612,11 +612,11 @@ MACHINE_CONFIG_START(tigeroad_state::tigeroad)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp
index e3cde4a8a52..361696ca30c 100644
--- a/src/mame/drivers/tiki100.cpp
+++ b/src/mame/drivers/tiki100.cpp
@@ -697,14 +697,14 @@ void tiki100_state::machine_reset()
MACHINE_CONFIG_START(tiki100_state::tiki100)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(tiki100_mem)
MCFG_CPU_IO_MAP(tiki100_io)
MCFG_Z80_DAISY_CHAIN(tiki100_daisy_chain)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_20MHz, 1280, 0, 1024, 312, 0, 256)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(20'000'000), 1280, 0, 1024, 312, 0, 256)
MCFG_SCREEN_UPDATE_DRIVER(tiki100_state, screen_update)
MCFG_PALETTE_ADD("palette", 16)
@@ -719,7 +719,7 @@ MACHINE_CONFIG_START(tiki100_state::tiki100)
MCFG_TIKI100_BUS_SLOT_ADD("slot3", nullptr)
/* devices */
- MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL_8MHz/4)
+ MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(8'000'000)/4)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
@@ -728,22 +728,22 @@ MACHINE_CONFIG_START(tiki100_state::tiki100)
MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_8MHz/4)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(8'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(DEVREAD8("cent_data_in", input_buffer_device, read))
MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_Z80PIO_IN_PB_CB(READ8(tiki100_state, pio_pb_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(tiki100_state, pio_pb_w))
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_8MHz/4)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(tiki100_state, bar0_w))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
MCFG_Z80CTC_ZC2_CB(WRITELINE(tiki100_state, bar2_w))
- MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", tiki100_state, ctc_tick, attotime::from_hz(XTAL_8MHz/4))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", tiki100_state, ctc_tick, attotime::from_hz(XTAL(8'000'000)/4))
- MCFG_FD1797_ADD(FD1797_TAG, XTAL_8MHz/8) // FD1767PL-02 or FD1797-PL
+ MCFG_FD1797_ADD(FD1797_TAG, XTAL(8'000'000)/8) // FD1767PL-02 or FD1797-PL
MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", tiki100_floppies, "525qd", tiki100_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", tiki100_floppies, "525qd", tiki100_state::floppy_formats)
@@ -769,7 +769,7 @@ MACHINE_CONFIG_START(tiki100_state::tiki100)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(AY8912_TAG, AY8912, XTAL_8MHz/4)
+ MCFG_SOUND_ADD(AY8912_TAG, AY8912, XTAL(8'000'000)/4)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(tiki100_state, video_scroll_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/tim011.cpp b/src/mame/drivers/tim011.cpp
index 7df492be7a3..e3617c94271 100644
--- a/src/mame/drivers/tim011.cpp
+++ b/src/mame/drivers/tim011.cpp
@@ -124,14 +124,14 @@ static const floppy_format_type tim011_floppy_formats[] = {
MACHINE_CONFIG_START(tim011_state::tim011)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z180, XTAL_12_288MHz / 2) // location U17 HD64180
+ MCFG_CPU_ADD("maincpu",Z180, XTAL(12'288'000) / 2) // location U17 HD64180
MCFG_CPU_PROGRAM_MAP(tim011_mem)
MCFG_CPU_IO_MAP(tim011_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tim011_state, irq0_line_hold)
-// MCFG_CPU_ADD("keyboard",CDP1802, XTAL_1_75MHz) // CDP1802, unknown clock
+// MCFG_CPU_ADD("keyboard",CDP1802, XTAL(1'750'000)) // CDP1802, unknown clock
- // FDC9266 location U43 XTAL_8MHz
+ // FDC9266 location U43 XTAL(8'000'000)
MCFG_UPD765A_ADD(FDC9266_TAG, true, true)
MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ2))
diff --git a/src/mame/drivers/tim100.cpp b/src/mame/drivers/tim100.cpp
index 68a0047312a..eee5715b55e 100644
--- a/src/mame/drivers/tim100.cpp
+++ b/src/mame/drivers/tim100.cpp
@@ -157,7 +157,7 @@ WRITE_LINE_MEMBER( tim100_state::irq_w )
MACHINE_CONFIG_START(tim100_state::tim100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL_4_9152MHz) // divider unknown
+ MCFG_CPU_ADD("maincpu",I8085A, XTAL(4'915'200)) // divider unknown
MCFG_CPU_PROGRAM_MAP(tim100_mem)
MCFG_CPU_IO_MAP(tim100_io)
@@ -171,7 +171,7 @@ MACHINE_CONFIG_START(tim100_state::tim100)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", tim100 )
- MCFG_DEVICE_ADD("crtc", I8275, XTAL_4_9152MHz)
+ MCFG_DEVICE_ADD("crtc", I8275, XTAL(4'915'200))
MCFG_I8275_CHARACTER_WIDTH(12)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(tim100_state, crtc_display_pixels)
MCFG_I8275_DRQ_CALLBACK(WRITELINE(tim100_state, drq_w))
diff --git a/src/mame/drivers/timeplt.cpp b/src/mame/drivers/timeplt.cpp
index 1131bb51008..ad00b089299 100644
--- a/src/mame/drivers/timeplt.cpp
+++ b/src/mame/drivers/timeplt.cpp
@@ -58,7 +58,7 @@
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
/*************************************
*
@@ -497,7 +497,7 @@ MACHINE_CONFIG_DERIVED(timeplt_state::chkun, bikkuric)
MCFG_SOUND_MODIFY("timeplt_audio:ay2")
MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("^", timeplt_state, chkun_sound_w))
- MCFG_TC8830F_ADD("tc8830f", XTAL_512kHz)
+ MCFG_TC8830F_ADD("tc8830f", XTAL(512'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "timeplt_audio:mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/timex.cpp b/src/mame/drivers/timex.cpp
index 989181e043b..06cc0020f0e 100644
--- a/src/mame/drivers/timex.cpp
+++ b/src/mame/drivers/timex.cpp
@@ -683,7 +683,7 @@ static GFXDECODE_START( ts2068 )
GFXDECODE_END
MACHINE_CONFIG_DERIVED(spectrum_state::ts2068, spectrum_128)
- MCFG_CPU_REPLACE("maincpu", Z80, XTAL_14_112MHz/4) /* From Schematic; 3.528 MHz */
+ MCFG_CPU_REPLACE("maincpu", Z80, XTAL(14'112'000)/4) /* From Schematic; 3.528 MHz */
MCFG_CPU_PROGRAM_MAP(ts2068_mem)
MCFG_CPU_IO_MAP(ts2068_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", spectrum_state, spec_interrupt)
@@ -704,7 +704,7 @@ MACHINE_CONFIG_DERIVED(spectrum_state::ts2068, spectrum_128)
MCFG_VIDEO_START_OVERRIDE(spectrum_state, ts2068 )
/* sound */
- MCFG_SOUND_REPLACE("ay8912", AY8912, XTAL_14_112MHz/8) /* From Schematic; 1.764 MHz */
+ MCFG_SOUND_REPLACE("ay8912", AY8912, XTAL(14'112'000)/8) /* From Schematic; 1.764 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* cartridge */
diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp
index 74ceb50b19b..4cc821eade8 100644
--- a/src/mame/drivers/tispeak.cpp
+++ b/src/mame/drivers/tispeak.cpp
@@ -423,7 +423,7 @@ K28 modules:
// The typical osc freq curve for TMS5100 is unknown. Let's assume it is set to the default frequency,
// which is 640kHz for 8KHz according to the TMS5100 documentation.
-#define MASTER_CLOCK (XTAL_640kHz)
+#define MASTER_CLOCK (XTAL(640'000))
class tispeak_state : public hh_tms1k_state
diff --git a/src/mame/drivers/tk2000.cpp b/src/mame/drivers/tk2000.cpp
index bcd23490e72..d0dfdfa8522 100644
--- a/src/mame/drivers/tk2000.cpp
+++ b/src/mame/drivers/tk2000.cpp
@@ -570,7 +570,7 @@ MACHINE_CONFIG_START(tk2000_state::tk2000)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", tk2000_state, apple2_interrupt, "screen", 0, 1)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_DEVICE_ADD(A2_VIDEO_TAG, APPLE2_VIDEO, XTAL_14_31818MHz)
+ MCFG_DEVICE_ADD(A2_VIDEO_TAG, APPLE2_VIDEO, XTAL(14'318'181))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/tk80.cpp b/src/mame/drivers/tk80.cpp
index c4bc1ebb4a8..3f1f940deb0 100644
--- a/src/mame/drivers/tk80.cpp
+++ b/src/mame/drivers/tk80.cpp
@@ -255,7 +255,7 @@ WRITE8_MEMBER( tk80_state::mikrolab_serial_w )
MACHINE_CONFIG_START(tk80_state::tk80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL_18_432MHz / 9)
+ MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'432'000) / 9)
MCFG_CPU_PROGRAM_MAP(tk80_mem)
MCFG_CPU_IO_MAP(tk80_io)
@@ -283,7 +283,7 @@ MACHINE_CONFIG_DERIVED(tk80_state::mikrolab, tk80)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tk80_state::nd80z)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_1MHz) // Sharp LH0080A, can't see writing on xtal
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(1'000'000)) // Sharp LH0080A, can't see writing on xtal
MCFG_CPU_PROGRAM_MAP(tk85_mem)
MCFG_CPU_IO_MAP(nd80z_io)
@@ -298,7 +298,7 @@ MACHINE_CONFIG_START(tk80_state::nd80z)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(tk80_state::tk85, tk80)
- MCFG_CPU_REPLACE("maincpu", I8085A, XTAL_4_9152MHz)
+ MCFG_CPU_REPLACE("maincpu", I8085A, XTAL(4'915'200))
MCFG_CPU_PROGRAM_MAP(tk85_mem)
MCFG_CPU_IO_MAP(tk80_io)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tk80bs.cpp b/src/mame/drivers/tk80bs.cpp
index ebc7c0d2825..03a42114231 100644
--- a/src/mame/drivers/tk80bs.cpp
+++ b/src/mame/drivers/tk80bs.cpp
@@ -169,7 +169,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(tk80bs_state::tk80bs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL_1MHz) //unknown clock
+ MCFG_CPU_ADD("maincpu",I8080, XTAL(1'000'000)) //unknown clock
MCFG_CPU_PROGRAM_MAP(tk80bs_mem)
/* video hardware */
diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp
index eea16a6c43d..6ad694eb8b4 100644
--- a/src/mame/drivers/tm990189.cpp
+++ b/src/mame/drivers/tm990189.cpp
@@ -872,7 +872,7 @@ MACHINE_CONFIG_START(tm990189_state::tm990_189_v)
MCFG_MACHINE_RESET_OVERRIDE(tm990189_state, tm990_189_v )
/* video hardware */
- MCFG_DEVICE_ADD( "tms9918", TMS9918, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9918", TMS9918, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9918", tms9918_device, screen_update )
diff --git a/src/mame/drivers/tmaster.cpp b/src/mame/drivers/tmaster.cpp
index f029e300dbd..239bab12ec1 100644
--- a/src/mame/drivers/tmaster.cpp
+++ b/src/mame/drivers/tmaster.cpp
@@ -362,11 +362,11 @@ int tmaster_compute_addr(uint16_t reg_low, uint16_t reg_mid, uint16_t reg_high)
}
MACHINE_CONFIG_START(tmaster_state::tm)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12MHz */
MCFG_CPU_PROGRAM_MAP(tmaster_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", tmaster_state, scanline_interrupt, "screen", 0, 1)
- MCFG_DEVICE_ADD( "duart68681", MC68681, XTAL_8_664MHz / 2 /*??*/)
+ MCFG_DEVICE_ADD( "duart68681", MC68681, XTAL(8'664'000) / 2 /*??*/)
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(tmaster_state, duart_irq_handler))
MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_device, rx))
@@ -386,14 +386,14 @@ MACHINE_CONFIG_START(tmaster_state::tm)
MCFG_PALETTE_ADD("palette", 0x1000)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_CESBLIT_ADD("blitter", "screen", XTAL_32MHz)
+ MCFG_CESBLIT_ADD("blitter", "screen", XTAL(32'000'000))
MCFG_CESBLIT_COMPUTE_ADDR(tmaster_compute_addr)
MCFG_CESBLIT_IRQ_CB(WRITELINE(tmaster_state, blitter_irq_callback))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz / 16, PIN7_HIGH) /* 1.5Mhz? clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000) / 16, PIN7_HIGH) /* 1.5Mhz? clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp
index a4c0cecc035..ec583614e1f 100644
--- a/src/mame/drivers/tmc1800.cpp
+++ b/src/mame/drivers/tmc1800.cpp
@@ -706,7 +706,7 @@ QUICKLOAD_LOAD_MEMBER( tmc1800_base_state, tmc1800 )
MACHINE_CONFIG_START(tmc1800_state::tmc1800)
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
MCFG_CPU_PROGRAM_MAP(tmc1800_map)
MCFG_CPU_IO_MAP(tmc1800_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
@@ -738,7 +738,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(osc1000b_state::osc1000b)
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
MCFG_CPU_PROGRAM_MAP(osc1000b_map)
MCFG_CPU_IO_MAP(osc1000b_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
@@ -769,7 +769,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmc2000_state::tmc2000)
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
MCFG_CPU_PROGRAM_MAP(tmc2000_map)
MCFG_CPU_IO_MAP(tmc2000_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
@@ -795,7 +795,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nano_state::nano)
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
MCFG_CPU_PROGRAM_MAP(nano_map)
MCFG_CPU_IO_MAP(nano_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
diff --git a/src/mame/drivers/tmc2000e.cpp b/src/mame/drivers/tmc2000e.cpp
index 604db663078..c093b77f6b1 100644
--- a/src/mame/drivers/tmc2000e.cpp
+++ b/src/mame/drivers/tmc2000e.cpp
@@ -278,7 +278,7 @@ void tmc2000e_state::machine_reset()
MACHINE_CONFIG_START(tmc2000e_state::tmc2000e)
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
MCFG_CPU_PROGRAM_MAP(tmc2000e_map)
MCFG_CPU_IO_MAP(tmc2000e_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
@@ -289,12 +289,12 @@ MACHINE_CONFIG_START(tmc2000e_state::tmc2000e)
MCFG_COSMAC_DMAW_CALLBACK(WRITE8(tmc2000e_state, dma_w))
// video hardware
- MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL_1_75MHz)
+ MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL(1'750'000))
MCFG_SCREEN_UPDATE_DEVICE(CDP1864_TAG, cdp1864_device, screen_update)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL_1_75MHz, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(tmc2000e_state, rdata_r), READLINE(tmc2000e_state, bdata_r), READLINE(tmc2000e_state, gdata_r))
+ MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(1'750'000), GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(tmc2000e_state, rdata_r), READLINE(tmc2000e_state, bdata_r), READLINE(tmc2000e_state, gdata_r))
MCFG_CDP1864_CHROMINANCE(RES_K(2.2), RES_K(1), RES_K(5.1), RES_K(4.7)) // unverified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/tmc600.cpp b/src/mame/drivers/tmc600.cpp
index c5d60a38a6c..a8f1a9bc982 100644
--- a/src/mame/drivers/tmc600.cpp
+++ b/src/mame/drivers/tmc600.cpp
@@ -253,7 +253,7 @@ WRITE8_MEMBER( tmc600_state::sc_w )
MACHINE_CONFIG_START(tmc600_state::tmc600)
// CPU
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_3_57MHz)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(3'570'000))
MCFG_CPU_PROGRAM_MAP(tmc600_map)
MCFG_CPU_IO_MAP(tmc600_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
@@ -266,7 +266,7 @@ MACHINE_CONFIG_START(tmc600_state::tmc600)
MCFG_FRAGMENT_ADD(tmc600_video)
// keyboard output latch
- MCFG_DEVICE_ADD(CDP1852_KB_TAG, CDP1852, XTAL_3_57MHz/8) // clock is CDP1802 TPB
+ MCFG_DEVICE_ADD(CDP1852_KB_TAG, CDP1852, XTAL(3'570'000)/8) // clock is CDP1802 TPB
MCFG_CDP1852_MODE_CALLBACK(VCC)
// address bus demux for expansion bus
@@ -274,7 +274,7 @@ MACHINE_CONFIG_START(tmc600_state::tmc600)
MCFG_CDP1852_MODE_CALLBACK(GND)
// printer output latch
- MCFG_DEVICE_ADD(CDP1852_TMC700_TAG, CDP1852, XTAL_3_57MHz/8) // clock is CDP1802 TPB
+ MCFG_DEVICE_ADD(CDP1852_TMC700_TAG, CDP1852, XTAL(3'570'000)/8) // clock is CDP1802 TPB
MCFG_CDP1852_MODE_CALLBACK(VCC)
MCFG_CDP1852_DO_CALLBACK(WRITE8(tmc600_state, printer_w))
diff --git a/src/mame/drivers/tmmjprd.cpp b/src/mame/drivers/tmmjprd.cpp
index 80a6a935a55..1578039661c 100644
--- a/src/mame/drivers/tmmjprd.cpp
+++ b/src/mame/drivers/tmmjprd.cpp
@@ -810,7 +810,7 @@ MACHINE_CONFIG_START(tmmjprd_state::tmmjprd)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_I5000_SND_ADD("i5000snd", XTAL_40MHz)
+ MCFG_I5000_SND_ADD("i5000snd", XTAL(40'000'000))
MCFG_SOUND_ROUTE(0, "rspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "lspeaker", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp
index d2d7905e8c8..0779b4a7cc4 100644
--- a/src/mame/drivers/tmnt.cpp
+++ b/src/mame/drivers/tmnt.cpp
@@ -1937,7 +1937,7 @@ MACHINE_CONFIG_START(tmnt_state::cuebrick)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_6))
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -1947,11 +1947,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::mia)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/3)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/3)
MCFG_CPU_PROGRAM_MAP(mia_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, tmnt_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(mia_audio_map)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
@@ -1991,11 +1991,11 @@ MACHINE_CONFIG_START(tmnt_state::mia)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545))
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(tmnt_state, volume_callback))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
@@ -2012,11 +2012,11 @@ MACHINE_RESET_MEMBER(tmnt_state,tmnt)
MACHINE_CONFIG_START(tmnt_state::tmnt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/3)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/3)
MCFG_CPU_PROGRAM_MAP(tmnt_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, tmnt_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(tmnt_audio_map)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
@@ -2057,16 +2057,16 @@ MACHINE_CONFIG_START(tmnt_state::tmnt)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545))
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(tmnt_state, volume_callback))
MCFG_SOUND_ROUTE(0, "mono", 0.33)
MCFG_SOUND_ROUTE(1, "mono", 0.33)
- MCFG_SOUND_ADD("upd", UPD7759, XTAL_640kHz)
+ MCFG_SOUND_ADD("upd", UPD7759, XTAL(640'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_SOUND_ADD("samples", SAMPLES, 0)
@@ -2079,11 +2079,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::punkshot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
MCFG_CPU_PROGRAM_MAP(punkshot_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(punkshot_audio_map)
/* NMIs are generated by the 053260 */
@@ -2121,11 +2121,11 @@ MACHINE_CONFIG_START(tmnt_state::punkshot)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
- MCFG_K053260_ADD("k053260", XTAL_3_579545MHz)
+ MCFG_K053260_ADD("k053260", XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -2133,11 +2133,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::lgtnfght)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
MCFG_CPU_PROGRAM_MAP(lgtnfght_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, lgtnfght_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(lgtnfght_audio_map)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
@@ -2176,11 +2176,11 @@ MACHINE_CONFIG_START(tmnt_state::lgtnfght)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_K053260_ADD("k053260", XTAL_3_579545MHz)
+ MCFG_K053260_ADD("k053260", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.70)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.70)
MACHINE_CONFIG_END
@@ -2189,11 +2189,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::blswhstl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* Confirmed */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* Confirmed */
MCFG_CPU_PROGRAM_MAP(blswhstl_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(ssriders_audio_map)
/* NMIs are generated by the 053260 */
@@ -2237,11 +2237,11 @@ MACHINE_CONFIG_START(tmnt_state::blswhstl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.70)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.70)
- MCFG_K053260_ADD("k053260", XTAL_3_579545MHz)
+ MCFG_K053260_ADD("k053260", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "rspeaker", 0.50) /* fixed inverted stereo channels */
MCFG_SOUND_ROUTE(1, "lspeaker", 0.50)
MACHINE_CONFIG_END
@@ -2267,11 +2267,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(tmnt_state::glfgreat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* Confirmed */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* Confirmed */
MCFG_CPU_PROGRAM_MAP(glfgreat_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, lgtnfght_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(glfgreat_audio_map)
/* NMIs are generated by the 053260 */
@@ -2317,7 +2317,7 @@ MACHINE_CONFIG_START(tmnt_state::glfgreat)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_K053260_ADD("k053260", XTAL_3_579545MHz)
+ MCFG_K053260_ADD("k053260", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -2333,7 +2333,7 @@ MACHINE_START_MEMBER(tmnt_state,prmrsocr)
MACHINE_CONFIG_START(tmnt_state::prmrsocr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* Confirmed */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* Confirmed */
MCFG_CPU_PROGRAM_MAP(prmrsocr_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, lgtnfght_interrupt)
@@ -2388,7 +2388,7 @@ MACHINE_CONFIG_START(tmnt_state::prmrsocr)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_GENERIC_LATCH_8_ADD("soundlatch3")
- MCFG_DEVICE_ADD("k054539", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
MCFG_K054539_TIMER_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -2398,7 +2398,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::tmnt2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2)
MCFG_CPU_PROGRAM_MAP(tmnt2_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
@@ -2448,11 +2448,11 @@ MACHINE_CONFIG_START(tmnt_state::tmnt2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_K053260_ADD("k053260", XTAL_3_579545MHz)
+ MCFG_K053260_ADD("k053260", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
@@ -2461,7 +2461,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::ssriders)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2)
MCFG_CPU_PROGRAM_MAP(ssriders_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
@@ -2507,11 +2507,11 @@ MACHINE_CONFIG_START(tmnt_state::ssriders)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_K053260_ADD("k053260", XTAL_3_579545MHz)
+ MCFG_K053260_ADD("k053260", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.70)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.70)
MACHINE_CONFIG_END
@@ -2570,7 +2570,7 @@ MACHINE_CONFIG_START(tmnt_state::thndrx2)
MCFG_CPU_PROGRAM_MAP(thndrx2_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(thndrx2_audio_map)
/* NMIs are generated by the 053260 */
@@ -2609,11 +2609,11 @@ MACHINE_CONFIG_START(tmnt_state::thndrx2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_K053260_ADD("k053260", XTAL_3_579545MHz)
+ MCFG_K053260_ADD("k053260", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tmspoker.cpp b/src/mame/drivers/tmspoker.cpp
index b0a952e7795..f516e50bdc2 100644
--- a/src/mame/drivers/tmspoker.cpp
+++ b/src/mame/drivers/tmspoker.cpp
@@ -212,7 +212,7 @@
#include "screen.h"
-#define MASTER_CLOCK XTAL_6MHz /* confirmed */
+#define MASTER_CLOCK XTAL(6'000'000) /* confirmed */
class tmspoker_state : public driver_device
diff --git a/src/mame/drivers/tnzs.cpp b/src/mame/drivers/tnzs.cpp
index 7829a267598..e93da79a60e 100644
--- a/src/mame/drivers/tnzs.cpp
+++ b/src/mame/drivers/tnzs.cpp
@@ -1519,11 +1519,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(tnzs_base_state::tnzs_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz, verified on insectx, kageki, tnzsb */
+ MCFG_CPU_ADD("maincpu", Z80,XTAL(12'000'000)/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz, verified on insectx, kageki, tnzsb */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tnzs_base_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz, verified on insectx, kageki, tnzsb */
+ MCFG_CPU_ADD("sub", Z80,XTAL(12'000'000)/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz, verified on insectx, kageki, tnzsb */
MCFG_CPU_PROGRAM_MAP(base_sub_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tnzs_base_state, irq0_line_hold)
@@ -1569,7 +1569,7 @@ MACHINE_CONFIG_DERIVED(tnzs_base_state::tnzs, tnzs_base)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
/* sound hardware */
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
@@ -1616,7 +1616,7 @@ MACHINE_CONFIG_DERIVED(insectx_state::insectx, tnzs_base)
MCFG_GFXDECODE_MODIFY("gfxdecode", insectx)
/* sound hardware */
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
@@ -1629,7 +1629,7 @@ MACHINE_CONFIG_DERIVED(kageki_state::kageki, tnzs_base)
MCFG_CPU_PROGRAM_MAP(kageki_sub_map)
/* sound hardware */
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(READ8(kageki_state, csport_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(kageki_state, csport_w))
MCFG_SOUND_ROUTE(0, "speaker", 0.15)
@@ -1651,7 +1651,7 @@ MACHINE_CONFIG_DERIVED(tnzsb_state::tnzsb, tnzs_base)
MCFG_CPU_MODIFY("sub") /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(tnzsb_sub_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(tnzsb_cpu2_map)
MCFG_CPU_IO_MAP(tnzsb_io_map)
@@ -1662,7 +1662,7 @@ MACHINE_CONFIG_DERIVED(tnzsb_state::tnzsb, tnzs_base)
/* sound hardware */
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(WRITELINE(tnzsb_state, ym2203_irqhandler))
MCFG_SOUND_ROUTE(0, "speaker", 1.0)
MCFG_SOUND_ROUTE(1, "speaker", 1.0)
@@ -1710,7 +1710,7 @@ MACHINE_CONFIG_DERIVED(jpopnics_state::jpopnics, tnzs_base)
MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG)
/* sound hardware */
- MCFG_YM2151_ADD("ymsnd", XTAL_12MHz/4) /* Not verified - Main board Crystal is 12MHz */
+ MCFG_YM2151_ADD("ymsnd", XTAL(12'000'000)/4) /* Not verified - Main board Crystal is 12MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/toaplan1.cpp b/src/mame/drivers/toaplan1.cpp
index f3f48ce50af..77f3456721f 100644
--- a/src/mame/drivers/toaplan1.cpp
+++ b/src/mame/drivers/toaplan1.cpp
@@ -1871,7 +1871,7 @@ static GFXDECODE_START( rallybik )
GFXDECODE_END
-#define PIXEL_CLOCK (XTAL_28MHz/4)
+#define PIXEL_CLOCK (XTAL(28'000'000)/4)
// HTOTAL and VTOTAL taken from CRTC registers (toaplan1_bcu_control_w)
// rallybik, demonwld and outzone program a larger VTOTAL than the other
@@ -1890,11 +1890,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(toaplan1_rallybik_state::rallybik)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(rallybik_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
MCFG_CPU_IO_MAP(rallybik_sound_io_map)
@@ -1927,7 +1927,7 @@ MACHINE_CONFIG_START(toaplan1_rallybik_state::rallybik)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1936,11 +1936,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::truxton)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(truxton_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
MCFG_CPU_IO_MAP(truxton_sound_io_map)
@@ -1965,7 +1965,7 @@ MACHINE_CONFIG_START(toaplan1_state::truxton)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1974,11 +1974,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::hellfire)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(hellfire_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
MCFG_CPU_IO_MAP(hellfire_sound_io_map)
@@ -2003,7 +2003,7 @@ MACHINE_CONFIG_START(toaplan1_state::hellfire)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2012,11 +2012,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::zerowing)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(zerowing_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
MCFG_CPU_IO_MAP(zerowing_sound_io_map)
@@ -2041,7 +2041,7 @@ MACHINE_CONFIG_START(toaplan1_state::zerowing)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2050,15 +2050,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::demonwld)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(demonwld_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
MCFG_CPU_IO_MAP(demonwld_sound_io_map)
- MCFG_CPU_ADD("dsp", TMS32010, XTAL_28MHz/2)
+ MCFG_CPU_ADD("dsp", TMS32010, XTAL(28'000'000)/2)
MCFG_CPU_PROGRAM_MAP(DSP_program_map)
MCFG_CPU_IO_MAP(DSP_io_map)
MCFG_TMS32010_BIO_IN_CB(READLINE(toaplan1_state, demonwld_BIO_r))
@@ -2084,7 +2084,7 @@ MACHINE_CONFIG_START(toaplan1_state::demonwld)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2093,11 +2093,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::samesame)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(samesame_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt)
- MCFG_CPU_ADD("audiocpu", Z180, XTAL_28MHz/8) /* HD647180XOFS6 CPU */
+ MCFG_CPU_ADD("audiocpu", Z180, XTAL(28'000'000)/8) /* HD647180XOFS6 CPU */
MCFG_CPU_PROGRAM_MAP(samesame_hd647180_mem_map)
MCFG_CPU_IO_MAP(samesame_hd647180_io_map)
@@ -2122,7 +2122,7 @@ MACHINE_CONFIG_START(toaplan1_state::samesame)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2131,11 +2131,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::outzone)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(outzone_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
MCFG_CPU_IO_MAP(outzone_sound_io_map)
@@ -2160,7 +2160,7 @@ MACHINE_CONFIG_START(toaplan1_state::outzone)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2169,11 +2169,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::outzonecv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(outzonecv_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
MCFG_CPU_IO_MAP(zerowing_sound_io_map)
@@ -2198,7 +2198,7 @@ MACHINE_CONFIG_START(toaplan1_state::outzonecv)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2207,11 +2207,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::vimana)
/* 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(vimana_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt)
- MCFG_CPU_ADD("audiocpu", Z180, XTAL_28MHz/8) /* HD647180XOFS6 CPU */
+ MCFG_CPU_ADD("audiocpu", Z180, XTAL(28'000'000)/8) /* HD647180XOFS6 CPU */
MCFG_CPU_PROGRAM_MAP(vimana_hd647180_mem_map)
MCFG_CPU_IO_MAP(vimana_hd647180_io_map)
@@ -2236,7 +2236,7 @@ MACHINE_CONFIG_START(toaplan1_state::vimana)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
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
diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp
index 20dbbe004f3..c97a307106c 100644
--- a/src/mame/drivers/toki.cpp
+++ b/src/mame/drivers/toki.cpp
@@ -488,11 +488,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(toki_state::toki) /* KOYO 20.000MHz near the cpu */
/* 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(toki_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", toki_state, irq1_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4) // verified on pcb
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) // verified on pcb
MCFG_CPU_PROGRAM_MAP(toki_audio_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(toki_audio_opcodes_map)
@@ -517,11 +517,11 @@ MACHINE_CONFIG_START(toki_state::toki) /* KOYO 20.000MHz near the cpu */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_14_31818MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'318'181)/4)
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH) // verified on pcb
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/12, PIN7_HIGH) // verified on pcb
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp
index 66e75507a28..630c09c49dd 100644
--- a/src/mame/drivers/tomcat.cpp
+++ b/src/mame/drivers/tomcat.cpp
@@ -321,20 +321,20 @@ void tomcat_state::machine_start()
}
MACHINE_CONFIG_START(tomcat_state::tomcat)
- MCFG_CPU_ADD("maincpu", M68010, XTAL_12MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68010, XTAL(12'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(tomcat_map)
MCFG_CPU_PERIODIC_INT_DRIVER(tomcat_state, irq1_line_assert, 5*60)
- //MCFG_CPU_PERIODIC_INT_DRIVER(tomcat_state, irq1_line_assert, (double)XTAL_12MHz / 16 / 16 / 16 / 12)
+ //MCFG_CPU_PERIODIC_INT_DRIVER(tomcat_state, irq1_line_assert, (double)XTAL(12'000'000) / 16 / 16 / 16 / 12)
- MCFG_CPU_ADD("dsp", TMS32010, XTAL_16MHz)
+ MCFG_CPU_ADD("dsp", TMS32010, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP( dsp_map)
MCFG_TMS32010_BIO_IN_CB(READLINE(tomcat_state, dsp_BIO_r))
- MCFG_CPU_ADD("soundcpu", M6502, XTAL_14_31818MHz / 8 )
+ MCFG_CPU_ADD("soundcpu", M6502, XTAL(14'318'181) / 8 )
MCFG_DEVICE_DISABLE()
MCFG_CPU_PROGRAM_MAP( sound_map)
- MCFG_DEVICE_ADD("riot", RIOT6532, XTAL_14_31818MHz / 8)
+ MCFG_DEVICE_ADD("riot", RIOT6532, XTAL(14'318'181) / 8)
/*
PA0 = /WS OUTPUT (TMS-5220 WRITE STROBE)
PA1 = /RS OUTPUT (TMS-5220 READ STROBE)
@@ -371,7 +371,7 @@ MACHINE_CONFIG_START(tomcat_state::tomcat)
MCFG_VECTOR_ADD("vector")
MCFG_SCREEN_ADD("screen", VECTOR)
MCFG_SCREEN_REFRESH_RATE(40)
- //MCFG_SCREEN_REFRESH_RATE((double)XTAL_12MHz / 16 / 16 / 16 / 12 / 5 )
+ //MCFG_SCREEN_REFRESH_RATE((double)XTAL(12'000'000) / 16 / 16 / 16 / 12 / 5 )
MCFG_SCREEN_SIZE(400, 300)
MCFG_SCREEN_VISIBLE_AREA(0, 280, 0, 250)
MCFG_SCREEN_UPDATE_DEVICE("vector", vector_device, screen_update)
@@ -380,17 +380,17 @@ MACHINE_CONFIG_START(tomcat_state::tomcat)
MCFG_AVGDVG_VECTOR("vector")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("pokey1", POKEY, XTAL_14_31818MHz / 8)
+ MCFG_SOUND_ADD("pokey1", POKEY, XTAL(14'318'181) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20)
- MCFG_SOUND_ADD("pokey2", POKEY, XTAL_14_31818MHz / 8)
+ MCFG_SOUND_ADD("pokey2", POKEY, XTAL(14'318'181) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
MCFG_SOUND_ADD("tms", TMS5220, 325000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz / 4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181) / 4)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tonton.cpp b/src/mame/drivers/tonton.cpp
index bccd4ae0981..fdcc0c93015 100644
--- a/src/mame/drivers/tonton.cpp
+++ b/src/mame/drivers/tonton.cpp
@@ -53,7 +53,7 @@ public:
void tonton(machine_config &config);
};
-#define MAIN_CLOCK XTAL_21_4772MHz
+#define MAIN_CLOCK XTAL(21'477'272)
#define CPU_CLOCK MAIN_CLOCK/6
#define YM2149_CLOCK MAIN_CLOCK/6/2 // '/SEL' pin tied to GND, so internal divisor x2 is active
diff --git a/src/mame/drivers/toobin.cpp b/src/mame/drivers/toobin.cpp
index 2f59e228ded..49a5610f86d 100644
--- a/src/mame/drivers/toobin.cpp
+++ b/src/mame/drivers/toobin.cpp
@@ -27,7 +27,7 @@
#include "machine/watchdog.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_32MHz
+#define MASTER_CLOCK XTAL(32'000'000)
diff --git a/src/mame/drivers/topspeed.cpp b/src/mame/drivers/topspeed.cpp
index b5ed8bdcef3..7f7cccc9f0c 100644
--- a/src/mame/drivers/topspeed.cpp
+++ b/src/mame/drivers/topspeed.cpp
@@ -571,19 +571,19 @@ void topspeed_state::machine_reset()
MACHINE_CONFIG_START(topspeed_state::topspeed)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(cpua_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", topspeed_state, irq6_line_hold)
- MCFG_CPU_ADD("subcpu", M68000, XTAL_16MHz / 2)
+ MCFG_CPU_ADD("subcpu", M68000, XTAL(16'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(cpub_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", topspeed_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(z80_prg)
MCFG_CPU_IO_MAP(z80_io)
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_ZC0_CB(WRITELINE(topspeed_state, z80ctc_to0))
MCFG_DEVICE_ADD("pc080sn_1", PC080SN, 0)
@@ -624,18 +624,18 @@ MACHINE_CONFIG_START(topspeed_state::topspeed)
// sound hardware
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_16MHz / 4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000) / 4)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(topspeed_state, sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "filter1l", 1.0)
MCFG_SOUND_ROUTE(1, "filter1r", 1.0)
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL(384'000))
MCFG_MSM5205_VCLK_CB(WRITELINE(topspeed_state, msm5205_1_vck)) // VCK function
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) // 8 kHz, 4-bit
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter2", 1.0)
- MCFG_SOUND_ADD("msm2", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_ADD("msm2", MSM5205, XTAL(384'000))
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) // Slave mode, 4-bit
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter3", 1.0)
diff --git a/src/mame/drivers/tosh1000.cpp b/src/mame/drivers/tosh1000.cpp
index 063b333d5c0..59661bf00c4 100644
--- a/src/mame/drivers/tosh1000.cpp
+++ b/src/mame/drivers/tosh1000.cpp
@@ -247,7 +247,7 @@ void tosh1000_state::cfg_fdc_35(device_t *device)
}
MACHINE_CONFIG_START(tosh1000_state::tosh1000)
- MCFG_CPU_ADD("maincpu", I8088, XTAL_5MHz)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(tosh1000_map)
MCFG_CPU_IO_MAP(tosh1000_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
@@ -263,7 +263,7 @@ MACHINE_CONFIG_START(tosh1000_state::tosh1000)
MCFG_IBM5160_MOTHERBOARD_ADD("mb", "maincpu")
- MCFG_DEVICE_ADD("rtc", TC8521, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", TC8521, XTAL(32'768))
MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga", false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "fdc_xt", false)
diff --git a/src/mame/drivers/tourtabl.cpp b/src/mame/drivers/tourtabl.cpp
index 284df7959e9..06a380dcd48 100644
--- a/src/mame/drivers/tourtabl.cpp
+++ b/src/mame/drivers/tourtabl.cpp
@@ -34,7 +34,7 @@ public:
};
-#define MASTER_CLOCK XTAL_3_579545MHz
+#define MASTER_CLOCK XTAL(3'579'545)
WRITE8_MEMBER(tourtabl_state::tourtabl_led_w)
diff --git a/src/mame/drivers/toypop.cpp b/src/mame/drivers/toypop.cpp
index ddc9528628a..617462c0b40 100644
--- a/src/mame/drivers/toypop.cpp
+++ b/src/mame/drivers/toypop.cpp
@@ -37,7 +37,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_6_144MHz
+#define MASTER_CLOCK XTAL(6'144'000)
class namcos16_state : public driver_device
{
diff --git a/src/mame/drivers/tp84.cpp b/src/mame/drivers/tp84.cpp
index 3d1a5affa0f..fda15d1999b 100644
--- a/src/mame/drivers/tp84.cpp
+++ b/src/mame/drivers/tp84.cpp
@@ -331,15 +331,15 @@ INTERRUPT_GEN_MEMBER(tp84_state::sub_vblank_irq)
MACHINE_CONFIG_START(tp84_state::tp84)
/* basic machine hardware */
- MCFG_CPU_ADD("cpu1", MC6809E, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_ADD("cpu1", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(tp84_cpu1_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tp84_state, main_vblank_irq)
- MCFG_CPU_ADD("sub", MC6809E, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_ADD("sub", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cpu2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tp84_state, sub_vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL(14'318'181)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(audio_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
@@ -373,13 +373,13 @@ MACHINE_CONFIG_START(tp84_state::tp84)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("y2404_1", Y2404, XTAL_14_31818MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("y2404_1", Y2404, XTAL(14'318'181)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 0.75)
- MCFG_SOUND_ADD("y2404_2", Y2404, XTAL_14_31818MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("y2404_2", Y2404, XTAL(14'318'181)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter2", 0.75)
- MCFG_SOUND_ADD("y2404_3", Y2404, XTAL_14_31818MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("y2404_3", Y2404, XTAL(14'318'181)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter3", 0.75)
MCFG_FILTER_RC_ADD("filter1", 0)
diff --git a/src/mame/drivers/tr175.cpp b/src/mame/drivers/tr175.cpp
index c4859579fcd..2c27eb8c8b8 100644
--- a/src/mame/drivers/tr175.cpp
+++ b/src/mame/drivers/tr175.cpp
@@ -94,7 +94,7 @@ MACHINE_CONFIG_START(tr175_state::tr175)
MCFG_DEVICE_ADDRESS_MAP(0, vram_map)
MCFG_VIDEO_SET_SCREEN("screen")
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_11_0592MHz / 3) // is this the right clock?
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(11'059'200) / 3) // is this the right clock?
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_1))
MCFG_PALETTE_ADD("palette", 0x100)
diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp
index e9ec7b54103..dea325c6b77 100644
--- a/src/mame/drivers/trackfld.cpp
+++ b/src/mame/drivers/trackfld.cpp
@@ -199,9 +199,9 @@ MAIN BOARD:
#include "speaker.h"
-#define MASTER_CLOCK XTAL_18_432MHz
-#define SOUND_CLOCK XTAL_14_31818MHz
-#define VLM_CLOCK XTAL_3_579545MHz
+#define MASTER_CLOCK XTAL(18'432'000)
+#define SOUND_CLOCK XTAL(14'318'181)
+#define VLM_CLOCK XTAL(3'579'545)
WRITE_LINE_MEMBER(trackfld_state::coin_counter_1_w)
@@ -1057,7 +1057,7 @@ MACHINE_CONFIG_DERIVED(trackfld_state::hyprolyb, trackfld)
/* sound hardware */
MCFG_DEVICE_REMOVE("vlm")
- MCFG_CPU_ADD("adpcm", M6802, XTAL_14_31818MHz/8) /* unknown clock */
+ MCFG_CPU_ADD("adpcm", M6802, XTAL(14'318'181)/8) /* unknown clock */
MCFG_CPU_PROGRAM_MAP(hyprolyb_adpcm_map)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
diff --git a/src/mame/drivers/tranz330.cpp b/src/mame/drivers/tranz330.cpp
index 9b845675539..d05a806ee9c 100644
--- a/src/mame/drivers/tranz330.cpp
+++ b/src/mame/drivers/tranz330.cpp
@@ -144,30 +144,30 @@ static const z80_daisy_config tranz330_daisy_chain[] =
// * - check clocks
// ? - check purported RS232 hookup, inconsistent information found at the relevant webpage vs. user-submitted errata
MACHINE_CONFIG_START(tranz330_state::tranz330)
- MCFG_CPU_ADD(CPU_TAG, Z80, XTAL_7_15909MHz/2) //*
+ MCFG_CPU_ADD(CPU_TAG, Z80, XTAL(7'159'090)/2) //*
MCFG_CPU_PROGRAM_MAP(tranz330_mem)
MCFG_CPU_IO_MAP(tranz330_io)
MCFG_Z80_DAISY_CHAIN(tranz330_daisy_chain)
- MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_7_15909MHz/4) // ?
+ MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(7'159'090)/4) // ?
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(tranz330_state, clock_w))
- MCFG_DEVICE_ADD(RTC_TAG, MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(RTC_TAG, MSM6242, XTAL(32'768))
- MCFG_DEVICE_ADD(PIO_TAG, Z80PIO, XTAL_7_15909MHz/2) //*
+ MCFG_DEVICE_ADD(PIO_TAG, Z80PIO, XTAL(7'159'090)/2) //*
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(CPU_TAG, INPUT_LINE_IRQ0)) //*
MCFG_Z80PIO_OUT_PA_CB(WRITE8(tranz330_state, pio_a_w))
MCFG_Z80PIO_IN_PA_CB(READ8(tranz330_state, card_r))
MCFG_Z80PIO_IN_PB_CB(READ8(tranz330_state, pio_b_r))
- MCFG_DEVICE_ADD(DART_TAG, Z80DART, XTAL_7_15909MHz/2) //*
+ MCFG_DEVICE_ADD(DART_TAG, Z80DART, XTAL(7'159'090)/2) //*
MCFG_Z80DART_OUT_SYNCB_CB(WRITELINE(tranz330_state, syncb_w))
MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) //?
MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr)) //?
MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts)) //?
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(CPU_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(CTC_TAG, Z80CTC, XTAL_7_15909MHz/2) //*
+ MCFG_DEVICE_ADD(CTC_TAG, Z80CTC, XTAL(7'159'090)/2) //*
MCFG_Z80CTC_ZC2_CB(WRITELINE(tranz330_state, sound_w))
MCFG_Z80CTC_INTR_CB(INPUTLINE(CPU_TAG, INPUT_LINE_IRQ0))
diff --git a/src/mame/drivers/tricep.cpp b/src/mame/drivers/tricep.cpp
index 1f6e2bca15e..38fca039d05 100644
--- a/src/mame/drivers/tricep.cpp
+++ b/src/mame/drivers/tricep.cpp
@@ -77,7 +77,7 @@ void tricep_state::kbd_put(u8 data)
MACHINE_CONFIG_START(tricep_state::tricep)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(tricep_mem)
/* video hardware */
diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp
index 525c9a07eba..a490597f53d 100644
--- a/src/mame/drivers/trs80.cpp
+++ b/src/mame/drivers/trs80.cpp
@@ -634,7 +634,7 @@ MACHINE_CONFIG_DERIVED(trs80_state::model1, trs80) // model I, level II
MCFG_QUICKLOAD_ADD("quickload", trs80_state, trs80_cmd, "cmd", 0.5)
- MCFG_FD1793_ADD("fdc", XTAL_1MHz) // todo: should be fd1771
+ MCFG_FD1793_ADD("fdc", XTAL(1'000'000)) // todo: should be fd1771
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(trs80_state,trs80_fdc_intrq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", trs80_floppies, "sssd", trs80_state::floppy_formats)
diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp
index 5dccb534093..3645d0b8dc1 100644
--- a/src/mame/drivers/trs80m2.cpp
+++ b/src/mame/drivers/trs80m2.cpp
@@ -234,7 +234,7 @@ WRITE8_MEMBER( trs80m2_state::nmi_w )
// 80/40 character mode
m_80_40_char_en = BIT(data, 4);
- m_crtc->set_clock(m_80_40_char_en ? XTAL_12_48MHz/16 : XTAL_12_48MHz/8);
+ m_crtc->set_clock(m_80_40_char_en ? XTAL(12'480'000)/16 : XTAL(12'480'000)/8);
// RTC interrupt enable
m_enable_rtc_int = BIT(data, 5);
@@ -704,7 +704,7 @@ void trs80m2_state::machine_reset()
MACHINE_CONFIG_START(trs80m2_state::trs80m2)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain)
MCFG_CPU_PROGRAM_MAP(z80_mem)
MCFG_CPU_IO_MAP(z80_io)
@@ -719,7 +719,7 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_12_48MHz/8)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(12'480'000)/8)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(trs80m2_state, crtc_update_row)
@@ -727,7 +727,7 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2)
MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(trs80m2_state, vsync_w))
// devices
- MCFG_FD1791_ADD(FD1791_TAG, XTAL_8MHz/4)
+ MCFG_FD1791_ADD(FD1791_TAG, XTAL(8'000'000)/4)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITE8(Z80PIO_TAG, z80pio_device, pa_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
@@ -735,15 +735,15 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2)
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":2", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":3", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats)
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxca_w))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, txca_w))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
- MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", trs80m2_state, ctc_tick, attotime::from_hz(XTAL_8MHz/2/2))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", trs80m2_state, ctc_tick, attotime::from_hz(XTAL(8'000'000)/2/2))
- MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(8'000'000)/2)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80DMA_IN_MREQ_CB(READ8(trs80m2_state, read))
@@ -751,14 +751,14 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2)
MCFG_Z80DMA_IN_IORQ_CB(READ8(trs80m2_state, io_read_byte))
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(trs80m2_state, io_write_byte))
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(8'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(trs80m2_state, pio_pa_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(trs80m2_state, pio_pa_w))
MCFG_Z80PIO_OUT_PB_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(trs80m2_state, strobe_w))
- MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(8'000'000)/2)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
@@ -789,13 +789,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(trs80m16_state::trs80m16)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain)
MCFG_CPU_PROGRAM_MAP(z80_mem)
MCFG_CPU_IO_MAP(m16_z80_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(AM9519A_TAG, pic8259_device, inta_cb)
- MCFG_CPU_ADD(M68000_TAG, M68000, XTAL_24MHz/4)
+ MCFG_CPU_ADD(M68000_TAG, M68000, XTAL(24'000'000)/4)
MCFG_CPU_PROGRAM_MAP(m68000_mem)
MCFG_DEVICE_DISABLE()
@@ -809,7 +809,7 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_12_48MHz/8)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(12'480'000)/8)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(trs80m2_state, crtc_update_row)
@@ -817,7 +817,7 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16)
MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(trs80m2_state, vsync_w))
// devices
- MCFG_FD1791_ADD(FD1791_TAG, XTAL_8MHz/4)
+ MCFG_FD1791_ADD(FD1791_TAG, XTAL(8'000'000)/4)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITE8(Z80PIO_TAG, z80pio_device, pa_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
@@ -825,15 +825,15 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16)
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":2", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":3", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats)
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxca_w))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, txca_w))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
- MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", trs80m2_state, ctc_tick, attotime::from_hz(XTAL_8MHz/2/2))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", trs80m2_state, ctc_tick, attotime::from_hz(XTAL(8'000'000)/2/2))
- MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(8'000'000)/2)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80DMA_IN_MREQ_CB(READ8(trs80m2_state, read))
@@ -841,14 +841,14 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16)
MCFG_Z80DMA_IN_IORQ_CB(READ8(trs80m2_state, io_read_byte))
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(trs80m2_state, io_write_byte))
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(8'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(trs80m2_state, pio_pa_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(trs80m2_state, pio_pa_w))
MCFG_Z80PIO_OUT_PB_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(trs80m2_state, strobe_w))
- MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(8'000'000)/2)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(AM9519A_TAG, PIC8259, 0)
diff --git a/src/mame/drivers/truco.cpp b/src/mame/drivers/truco.cpp
index 27731b770ba..8e3df82e2ff 100644
--- a/src/mame/drivers/truco.cpp
+++ b/src/mame/drivers/truco.cpp
@@ -212,7 +212,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_12MHz /* confirmed */
+#define MASTER_CLOCK XTAL(12'000'000) /* confirmed */
#define CPU_CLOCK (MASTER_CLOCK/16) /* guess */
#define CRTC_CLOCK (MASTER_CLOCK/8) /* guess */
diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp
index bf2c14e461c..1643ce25226 100644
--- a/src/mame/drivers/trvmadns.cpp
+++ b/src/mame/drivers/trvmadns.cpp
@@ -381,7 +381,7 @@ void trvmadns_state::machine_reset()
}
MACHINE_CONFIG_START(trvmadns_state::trvmadns)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/4) // Most likely 2.5MHz (less likely 5MHz (10MHz/2))
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(10'000'000)/4) // Most likely 2.5MHz (less likely 5MHz (10MHz/2))
MCFG_CPU_PROGRAM_MAP(cpu_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", trvmadns_state, nmi_line_pulse)
@@ -403,7 +403,7 @@ MACHINE_CONFIG_START(trvmadns_state::trvmadns)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_10MHz/2/4) //?
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(10'000'000)/2/4) //?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/trvquest.cpp b/src/mame/drivers/trvquest.cpp
index f90c3f657d7..7dd97c901ff 100644
--- a/src/mame/drivers/trvquest.cpp
+++ b/src/mame/drivers/trvquest.cpp
@@ -179,7 +179,7 @@ INTERRUPT_GEN_MEMBER(gameplan_state::trvquest_interrupt)
MACHINE_CONFIG_START(gameplan_state::trvquest)
- MCFG_CPU_ADD("maincpu", M6809,XTAL_6MHz/4)
+ MCFG_CPU_ADD("maincpu", M6809,XTAL(6'000'000)/4)
MCFG_CPU_PROGRAM_MAP(cpu_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gameplan_state, trvquest_interrupt)
@@ -193,24 +193,24 @@ MACHINE_CONFIG_START(gameplan_state::trvquest)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_6MHz/2)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(6'000'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_6MHz/2)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(6'000'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* via */
- MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL_6MHz/4)
+ MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL(6'000'000)/4)
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(gameplan_state, video_data_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gameplan_state, gameplan_video_command_w))
MCFG_VIA6522_CA2_HANDLER(WRITELINE(gameplan_state, video_command_trigger_w))
- MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL_6MHz/4)
+ MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL(6'000'000)/4)
MCFG_VIA6522_READPA_HANDLER(IOPORT("IN0"))
MCFG_VIA6522_READPB_HANDLER(IOPORT("IN1"))
MCFG_VIA6522_CA2_HANDLER(WRITELINE(gameplan_state, trvquest_coin_w))
- MCFG_DEVICE_ADD("via6522_2", VIA6522, XTAL_6MHz/4)
+ MCFG_DEVICE_ADD("via6522_2", VIA6522, XTAL(6'000'000)/4)
MCFG_VIA6522_READPA_HANDLER(IOPORT("UNK"))
MCFG_VIA6522_READPB_HANDLER(IOPORT("DSW"))
MCFG_VIA6522_CA2_HANDLER(WRITELINE(gameplan_state, trvquest_misc_w))
diff --git a/src/mame/drivers/ts3000.cpp b/src/mame/drivers/ts3000.cpp
index e113578f402..79d65248f16 100644
--- a/src/mame/drivers/ts3000.cpp
+++ b/src/mame/drivers/ts3000.cpp
@@ -38,7 +38,7 @@ static INPUT_PORTS_START( ts3000 )
INPUT_PORTS_END
MACHINE_CONFIG_START(ts3000_state::ts3000)
- MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3) // no idea of clock
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3) // no idea of clock
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp
index 9bcf306314e..86e4bf34fa6 100644
--- a/src/mame/drivers/ts802.cpp
+++ b/src/mame/drivers/ts802.cpp
@@ -182,7 +182,7 @@ DRIVER_INIT_MEMBER( ts802_state, ts802 )
MACHINE_CONFIG_START(ts802_state::ts802)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(ts802_mem)
MCFG_CPU_IO_MAP(ts802_io)
//MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) // causes problems
@@ -192,7 +192,7 @@ MACHINE_CONFIG_START(ts802_state::ts802)
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(ts802_state, kbd_put))
- MCFG_DEVICE_ADD("dma", Z80DMA, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000) / 4)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE("maincpu", INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80DMA_IN_MREQ_CB(READ8(ts802_state, memory_read_byte))
@@ -200,16 +200,16 @@ MACHINE_CONFIG_START(ts802_state::ts802)
MCFG_Z80DMA_IN_IORQ_CB(READ8(ts802_state, io_read_byte))
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(ts802_state, io_write_byte))
- MCFG_DEVICE_ADD("dart1", Z80DART, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("dart1", Z80DART, XTAL(16'000'000) / 4)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("dart2", Z80DART, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("dart2", Z80DART, XTAL(16'000'000) / 4)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_FD1793_ADD("fdc", XTAL_4MHz / 2) // unknown clock
+ MCFG_FD1793_ADD("fdc", XTAL(4'000'000) / 2) // unknown clock
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ts802_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp
index 66d36732abc..47ff477724e 100644
--- a/src/mame/drivers/ts803.cpp
+++ b/src/mame/drivers/ts803.cpp
@@ -413,7 +413,7 @@ static const z80_daisy_config daisy_chain[] =
};
MACHINE_CONFIG_START(ts803_state::ts803)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/4)
MCFG_CPU_PROGRAM_MAP(ts803_mem)
MCFG_CPU_IO_MAP(ts803_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
@@ -433,19 +433,19 @@ MACHINE_CONFIG_START(ts803_state::ts803)
MCFG_MC6845_UPDATE_ROW_CB(ts803_state, crtc_update_row)
MCFG_MC6845_ADDR_CHANGED_CB(ts803_state, crtc_update_addr)
- MCFG_DEVICE_ADD("sti_clock", CLOCK, XTAL_16MHz / 13)
+ MCFG_DEVICE_ADD("sti_clock", CLOCK, XTAL(16'000'000) / 13)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("sti", z80sti_device, tc_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sti", z80sti_device, rc_w))
- MCFG_DEVICE_ADD("dart_clock", CLOCK, (XTAL_16MHz / 13) / 8)
+ MCFG_DEVICE_ADD("dart_clock", CLOCK, (XTAL(16'000'000) / 13) / 8)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("dart", z80dart_device, txca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxca_w))
- MCFG_DEVICE_ADD("sti", Z80STI, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD("sti", Z80STI, XTAL(16'000'000)/4)
MCFG_Z80STI_OUT_TBO_CB(DEVWRITELINE("dart", z80dart_device, rxtxcb_w))
MCFG_Z80STI_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("dart", Z80DART, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("dart", Z80DART, XTAL(16'000'000) / 4)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
@@ -453,7 +453,7 @@ MACHINE_CONFIG_START(ts803_state::ts803)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart", z80dart_device, rxa_w))
/* floppy disk */
- MCFG_FD1793_ADD("fdc", XTAL_1MHz)
+ MCFG_FD1793_ADD("fdc", XTAL(1'000'000))
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("sti", z80sti_device, i7_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ts803_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
diff --git a/src/mame/drivers/ts816.cpp b/src/mame/drivers/ts816.cpp
index 367fdc7238c..bdd2cad334f 100644
--- a/src/mame/drivers/ts816.cpp
+++ b/src/mame/drivers/ts816.cpp
@@ -258,7 +258,7 @@ DRIVER_INIT_MEMBER( ts816_state, ts816 )
MACHINE_CONFIG_START(ts816_state::ts816)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(ts816_mem)
MCFG_CPU_IO_MAP(ts816_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
@@ -267,39 +267,39 @@ MACHINE_CONFIG_START(ts816_state::ts816)
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(ts816_state, kbd_put))
- //MCFG_DEVICE_ADD("sio0", Z80SIO, XTAL_16MHz / 4)
+ //MCFG_DEVICE_ADD("sio0", Z80SIO, XTAL(16'000'000) / 4)
//MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("sio3", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio3", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("sio4", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio4", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("sio5", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio5", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("sio6", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio6", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("sio7", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio7", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("sio8", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio8", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("sio9", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio9", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(16'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
//MCFG_Z80PIO_IN_PA_CB(READ8(ts816_state, porta_r))
//MCFG_Z80PIO_IN_PB_CB(READ8(ts816_state, portb_r))
//MCFG_Z80PIO_OUT_PB_CB(WRITE8(ts816_state, portb_w))
- MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("dma", Z80DMA, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000) / 4)
//MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(ts816_state, busreq_w))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp
index 7e1e4943683..82f828d9c0f 100644
--- a/src/mame/drivers/tsamurai.cpp
+++ b/src/mame/drivers/tsamurai.cpp
@@ -705,15 +705,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(tsamurai_state::tsamurai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/8)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/8)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(z80_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tsamurai_state, interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/8)
MCFG_CPU_PROGRAM_MAP(sound1_map)
- MCFG_CPU_ADD("audio2", Z80, XTAL_24MHz/8)
+ MCFG_CPU_ADD("audio2", Z80, XTAL(24'000'000)/8)
MCFG_CPU_PROGRAM_MAP(sound2_map)
MCFG_MACHINE_START_OVERRIDE(tsamurai_state,tsamurai)
@@ -741,7 +741,7 @@ MACHINE_CONFIG_START(tsamurai_state::tsamurai)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_24MHz/8)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(24'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
@@ -755,11 +755,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tsamurai_state::vsgongf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/8)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/8)
MCFG_CPU_PROGRAM_MAP(vsgongf_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tsamurai_state, interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/8)
MCFG_CPU_PROGRAM_MAP(sound_vsgongf_map)
MCFG_CPU_IO_MAP(vsgongf_audio_io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(tsamurai_state, vsgongf_sound_interrupt, 3*60)
@@ -791,7 +791,7 @@ MACHINE_CONFIG_START(tsamurai_state::vsgongf)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_24MHz/8)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(24'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
@@ -803,18 +803,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tsamurai_state::m660)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/8)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/8)
MCFG_CPU_PROGRAM_MAP(m660_map)
MCFG_CPU_IO_MAP(z80_m660_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tsamurai_state, interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/8)
MCFG_CPU_PROGRAM_MAP(sound1_m660_map)
- MCFG_CPU_ADD("audio2", Z80, XTAL_24MHz/8)
+ MCFG_CPU_ADD("audio2", Z80, XTAL(24'000'000)/8)
MCFG_CPU_PROGRAM_MAP(sound2_m660_map)
- MCFG_CPU_ADD("audio3", Z80, XTAL_24MHz/8)
+ MCFG_CPU_ADD("audio3", Z80, XTAL(24'000'000)/8)
MCFG_CPU_PROGRAM_MAP(sound3_m660_map)
MCFG_CPU_IO_MAP(sound3_m660_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tsamurai_state, nmi_line_pulse)
@@ -845,7 +845,7 @@ MACHINE_CONFIG_START(tsamurai_state::m660)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_24MHz/8)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(24'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
diff --git a/src/mame/drivers/tti.cpp b/src/mame/drivers/tti.cpp
index 14f3f2d834e..568fdfae5e2 100644
--- a/src/mame/drivers/tti.cpp
+++ b/src/mame/drivers/tti.cpp
@@ -55,12 +55,12 @@ static ADDRESS_MAP_START( prg_map, AS_PROGRAM, 8, tti_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(tti_state::tti)
- MCFG_DEVICE_ADD("maincpu", M68008, XTAL_20MHz / 2) // guess
+ MCFG_DEVICE_ADD("maincpu", M68008, XTAL(20'000'000) / 2) // guess
MCFG_CPU_PROGRAM_MAP(prg_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(tti_state, intack)
MCFG_DEVICE_ADD("mfp", MC68901, 0)
- MCFG_MC68901_TIMER_CLOCK(XTAL_20MHz / 2) // guess
+ MCFG_MC68901_TIMER_CLOCK(XTAL(20'000'000) / 2) // guess
MCFG_MC68901_RX_CLOCK(9600) // for testing (FIXME: actually 16x)
MCFG_MC68901_TX_CLOCK(9600) // for testing (FIXME: actually 16x)
MCFG_MC68901_OUT_SO_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp
index 5aedfd13a0f..589c4b74a06 100644
--- a/src/mame/drivers/tugboat.cpp
+++ b/src/mame/drivers/tugboat.cpp
@@ -385,7 +385,7 @@ MACHINE_CONFIG_START(tugboat_state::tugboat)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, XTAL_10MHz/8)
+ MCFG_SOUND_ADD("aysnd", AY8912, XTAL(10'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tunhunt.cpp b/src/mame/drivers/tunhunt.cpp
index 137948dd66a..180f5941648 100644
--- a/src/mame/drivers/tunhunt.cpp
+++ b/src/mame/drivers/tunhunt.cpp
@@ -271,7 +271,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(tunhunt_state::tunhunt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz/6) /* ??? */
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(12'096'000)/6) /* ??? */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_PERIODIC_INT_DRIVER(tunhunt_state, irq0_line_hold, 4*60) /* 48V, 112V, 176V, 240V */
@@ -292,12 +292,12 @@ MACHINE_CONFIG_START(tunhunt_state::tunhunt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey1", POKEY, XTAL_12_096MHz/10)
+ MCFG_SOUND_ADD("pokey1", POKEY, XTAL(12'096'000)/10)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW"))
MCFG_POKEY_OUTPUT_RC(RES_K(1), CAP_U(0.047), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("pokey2", POKEY, XTAL_12_096MHz/10)
+ MCFG_SOUND_ADD("pokey2", POKEY, XTAL(12'096'000)/10)
MCFG_POKEY_POT0_R_CB(IOPORT("IN1"))
MCFG_POKEY_POT1_R_CB(IOPORT("IN2"))
MCFG_POKEY_POT2_R_CB(READ8(tunhunt_state, dsw2_0r))
diff --git a/src/mame/drivers/turbo.cpp b/src/mame/drivers/turbo.cpp
index 565afb7d86f..8770bb50585 100644
--- a/src/mame/drivers/turbo.cpp
+++ b/src/mame/drivers/turbo.cpp
@@ -165,7 +165,7 @@
*
*************************************/
-#define MASTER_CLOCK (XTAL_19_968MHz)
+#define MASTER_CLOCK (XTAL(19'968'000))
#define PIXEL_CLOCK (MASTER_CLOCK/4*TURBO_X_SCALE)
diff --git a/src/mame/drivers/turrett.cpp b/src/mame/drivers/turrett.cpp
index 5b98dd6db7c..df98938e124 100644
--- a/src/mame/drivers/turrett.cpp
+++ b/src/mame/drivers/turrett.cpp
@@ -24,7 +24,7 @@
*
*************************************/
-#define R3041_CLOCK XTAL_25MHz
+#define R3041_CLOCK XTAL(25'000'000)
diff --git a/src/mame/drivers/tutankhm.cpp b/src/mame/drivers/tutankhm.cpp
index b984a3fb9f1..d0f2c5f2be4 100644
--- a/src/mame/drivers/tutankhm.cpp
+++ b/src/mame/drivers/tutankhm.cpp
@@ -226,7 +226,7 @@ MACHINE_RESET_MEMBER(tutankhm_state,tutankhm)
MACHINE_CONFIG_START(tutankhm_state::tutankhm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_18_432MHz/12) /* 1.5 MHz ??? */
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(18'432'000)/12) /* 1.5 MHz ??? */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tutankhm_state, tutankhm_interrupt)
diff --git a/src/mame/drivers/tutor.cpp b/src/mame/drivers/tutor.cpp
index 83cf2d1168a..ec153e791d1 100644
--- a/src/mame/drivers/tutor.cpp
+++ b/src/mame/drivers/tutor.cpp
@@ -739,10 +739,10 @@ MACHINE_CONFIG_START(tutor_state::tutor)
// basic machine hardware
// TMS9995 CPU @ 10.7 MHz
// No lines connected yet
- MCFG_TMS99xx_ADD("maincpu", TMS9995, XTAL_10_738635MHz, tutor_memmap, tutor_io)
+ MCFG_TMS99xx_ADD("maincpu", TMS9995, XTAL(10'738'635), tutor_memmap, tutor_io)
/* video hardware */
- MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update )
diff --git a/src/mame/drivers/tv910.cpp b/src/mame/drivers/tv910.cpp
index c653d99cf81..e831debb201 100644
--- a/src/mame/drivers/tv910.cpp
+++ b/src/mame/drivers/tv910.cpp
@@ -39,7 +39,7 @@
#define RS232_TAG "rs232"
#define KBDC_TAG "ay3600"
-#define MASTER_CLOCK XTAL_13_608MHz
+#define MASTER_CLOCK XTAL(13'608'000)
class tv910_state : public driver_device
{
@@ -540,7 +540,7 @@ MACHINE_CONFIG_START(tv910_state::tv910)
MCFG_AY3600_AKO_CB(WRITELINE(tv910_state, ay3600_ako_w))
MCFG_DEVICE_ADD(ACIA_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<1>))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
diff --git a/src/mame/drivers/tv912.cpp b/src/mame/drivers/tv912.cpp
index 23b34652899..3adcd9a6d7a 100644
--- a/src/mame/drivers/tv912.cpp
+++ b/src/mame/drivers/tv912.cpp
@@ -269,7 +269,7 @@ void tv912_state::device_timer(emu_timer &timer, device_timer_id id, int param,
if (!BIT(sel, b))
{
unsigned divisor = 11 * (b < 9 ? 1 << b : 176);
- m_baudgen_timer->adjust(attotime::from_hz(XTAL_23_814MHz / 3.5 / divisor), !param);
+ m_baudgen_timer->adjust(attotime::from_hz(XTAL(23'814'000) / 3.5 / divisor), !param);
break;
}
}
@@ -882,7 +882,7 @@ static INPUT_PORTS_START( tv912c )
INPUT_PORTS_END
MACHINE_CONFIG_START(tv912_state::tv912)
- MCFG_CPU_ADD("maincpu", I8035, XTAL_23_814MHz / 4) // nominally +6MHz, actually 5.9535 MHz
+ MCFG_CPU_ADD("maincpu", I8035, XTAL(23'814'000) / 4) // nominally +6MHz, actually 5.9535 MHz
MCFG_CPU_PROGRAM_MAP(prog_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(tv912_state, p1_w))
@@ -899,10 +899,10 @@ MACHINE_CONFIG_START(tv912_state::tv912)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x100)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_23_814MHz, 105 * CHAR_WIDTH, 0, 80 * CHAR_WIDTH, 270, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(23'814'000), 105 * CHAR_WIDTH, 0, 80 * CHAR_WIDTH, 270, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(tv912_state, screen_update)
- MCFG_DEVICE_ADD("crtc", TMS9927, XTAL_23_814MHz)
+ MCFG_DEVICE_ADD("crtc", TMS9927, XTAL(23'814'000))
MCFG_TMS9927_CHAR_WIDTH(CHAR_WIDTH)
MCFG_TMS9927_VSYN_CALLBACK(INPUTLINE("maincpu", MCS48_INPUT_IRQ))
MCFG_VIDEO_SET_SCREEN("screen")
@@ -914,7 +914,7 @@ MACHINE_CONFIG_START(tv912_state::tv912)
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "loopback")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beep", BEEP, XTAL_23_814MHz / 7 / 11 / 256) // nominally 1200 Hz
+ MCFG_SOUND_ADD("beep", BEEP, XTAL(23'814'000) / 7 / 11 / 256) // nominally 1200 Hz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tv950.cpp b/src/mame/drivers/tv950.cpp
index 9194ab703e5..5e665a95278 100644
--- a/src/mame/drivers/tv950.cpp
+++ b/src/mame/drivers/tv950.cpp
@@ -51,7 +51,7 @@
#define RS232A_TAG "rs232a"
#define RS232B_TAG "rs232b"
-#define MASTER_CLOCK XTAL_23_814MHz
+#define MASTER_CLOCK XTAL(23'814'000)
class tv950_state : public driver_device
{
@@ -304,7 +304,7 @@ MACHINE_CONFIG_START(tv950_state::tv950)
MCFG_DEVICE_ADD(ACIA3_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(MASTER_CLOCK/13)
- MCFG_DEVICE_ADD("kbd", I8748, XTAL_5_7143MHz)
+ MCFG_DEVICE_ADD("kbd", I8748, XTAL(5'714'300))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/tv990.cpp b/src/mame/drivers/tv990.cpp
index ce9906b6636..681bdd80838 100644
--- a/src/mame/drivers/tv990.cpp
+++ b/src/mame/drivers/tv990.cpp
@@ -381,13 +381,13 @@ MACHINE_CONFIG_START(tv990_state::tv990)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
- MCFG_DEVICE_ADD( UART0_TAG, NS16450, XTAL_3_6864MHz )
+ MCFG_DEVICE_ADD( UART0_TAG, NS16450, XTAL(3'686'400) )
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_rts))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
MCFG_INS8250_OUT_INT_CB(WRITELINE(tv990_state, uart0_irq))
- MCFG_DEVICE_ADD( UART1_TAG, NS16450, XTAL_3_6864MHz )
+ MCFG_DEVICE_ADD( UART1_TAG, NS16450, XTAL(3'686'400) )
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_rts))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
diff --git a/src/mame/drivers/tvgame.cpp b/src/mame/drivers/tvgame.cpp
index 594ac38fdfa..d493bf6b145 100644
--- a/src/mame/drivers/tvgame.cpp
+++ b/src/mame/drivers/tvgame.cpp
@@ -96,7 +96,7 @@ uint32_t tvgame_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
MACHINE_CONFIG_START(tvgame_state::tvgame)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp
index 65b91c9b6a6..0a889cbbc3a 100644
--- a/src/mame/drivers/twin16.cpp
+++ b/src/mame/drivers/twin16.cpp
@@ -663,15 +663,15 @@ void twin16_state::machine_start()
MACHINE_CONFIG_START(twin16_state::twin16)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, XTAL_18_432MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(18'432'000)/2)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", twin16_state, CPUA_interrupt)
- MCFG_CPU_ADD("sub", M68000, XTAL_18_432MHz/2)
+ MCFG_CPU_ADD("sub", M68000, XTAL(18'432'000)/2)
MCFG_CPU_PROGRAM_MAP(sub_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", twin16_state, CPUB_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -682,7 +682,7 @@ MACHINE_CONFIG_START(twin16_state::twin16)
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_18_432MHz/2, 576, 0, 40*8, 264, 2*8, 30*8)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(18'432'000)/2, 576, 0, 40*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(twin16_state, screen_update_twin16)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(twin16_state, screen_vblank_twin16))
MCFG_SCREEN_PALETTE("palette")
@@ -699,11 +699,11 @@ MACHINE_CONFIG_START(twin16_state::twin16)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545))
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(twin16_state, volume_callback))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.12) // estimated with gradius2 OST
MCFG_SOUND_ROUTE(0, "rspeaker", 0.12)
@@ -721,11 +721,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fround_state::fround)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_18_432MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(18'432'000)/2)
MCFG_CPU_PROGRAM_MAP(fround_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", twin16_state, CPUA_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -736,7 +736,7 @@ MACHINE_CONFIG_START(fround_state::fround)
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_18_432MHz/2, 576, 0, 40*8, 264, 2*8, 30*8)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(18'432'000)/2, 576, 0, 40*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(twin16_state, screen_update_twin16)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(twin16_state, screen_vblank_twin16))
MCFG_SCREEN_PALETTE("palette")
@@ -753,11 +753,11 @@ MACHINE_CONFIG_START(fround_state::fround)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545))
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(twin16_state, volume_callback))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.12)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.12)
@@ -771,12 +771,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(twin16_state::miaj, twin16)
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_RAW_PARAMS(XTAL_18_432MHz/2, 576, 1*8, 39*8, 264, 2*8, 30*8)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(18'432'000)/2, 576, 1*8, 39*8, 264, 2*8, 30*8)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(cuebrickj_state::cuebrickj, twin16)
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_RAW_PARAMS(XTAL_18_432MHz/2, 576, 1*8, 39*8, 264, 2*8, 30*8)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(18'432'000)/2, 576, 1*8, 39*8, 264, 2*8, 30*8)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/twincobr.cpp b/src/mame/drivers/twincobr.cpp
index 00dd3ca04c3..e8689747d7e 100644
--- a/src/mame/drivers/twincobr.cpp
+++ b/src/mame/drivers/twincobr.cpp
@@ -658,15 +658,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(twincobr_state::twincobr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/4) /* 7MHz - Main board Crystal is 28MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000)/4) /* 7MHz - Main board Crystal is 28MHz */
MCFG_CPU_PROGRAM_MAP(main_program_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", twincobr_state, twincobr_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8) /* 3.5MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8) /* 3.5MHz */
MCFG_CPU_PROGRAM_MAP(sound_program_map)
MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_CPU_ADD("dsp", TMS32010, XTAL_28MHz/2) /* 14MHz CLKin */
+ MCFG_CPU_ADD("dsp", TMS32010, XTAL(28'000'000)/2) /* 14MHz CLKin */
MCFG_CPU_PROGRAM_MAP(DSP_program_map)
/* Data Map is internal to the CPU */
MCFG_CPU_IO_MAP(DSP_io_map)
@@ -691,7 +691,7 @@ MACHINE_CONFIG_START(twincobr_state::twincobr)
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(twincobr_state, coin_lockout_2_w))
/* video hardware */
- MCFG_MC6845_ADD("crtc", HD6845, "screen", XTAL_28MHz/8) /* 3.5MHz measured on CLKin */
+ MCFG_MC6845_ADD("crtc", HD6845, "screen", XTAL(28'000'000)/8) /* 3.5MHz measured on CLKin */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(2)
@@ -701,7 +701,7 @@ MACHINE_CONFIG_START(twincobr_state::twincobr)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz/4, 446, 0, 320, 286, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000)/4, 446, 0, 320, 286, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(twincobr_state, screen_update_toaplan0)
MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram16", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
@@ -715,7 +715,7 @@ MACHINE_CONFIG_START(twincobr_state::twincobr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -735,7 +735,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(twincobr_state::fsharkbt, fshark)
- MCFG_CPU_ADD("mcu", I8741, XTAL_28MHz/16)
+ MCFG_CPU_ADD("mcu", I8741, XTAL(28'000'000)/16)
/* Program Map is internal to the CPU */
MCFG_CPU_IO_MAP(fsharkbt_i8741_io_map)
MCFG_DEVICE_DISABLE() /* Internal program code is not dumped */
diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp
index 00585f4c966..84a8d168f2e 100644
--- a/src/mame/drivers/twinkle.cpp
+++ b/src/mame/drivers/twinkle.cpp
@@ -1024,7 +1024,7 @@ void twinkle_state::cdrom_config(device_t *device)
MACHINE_CONFIG_START(twinkle_state::twinkle)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz )
+ MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) )
MCFG_CPU_PROGRAM_MAP( main_map )
MCFG_RAM_MODIFY("maincpu:ram")
@@ -1055,7 +1055,7 @@ MACHINE_CONFIG_START(twinkle_state::twinkle)
MCFG_DEVICE_ADD("rtc", RTC65271, 0)
- MCFG_DEVICE_ADD("fdc37c665gt", FDC37C665GT, XTAL_24MHz)
+ MCFG_DEVICE_ADD("fdc37c665gt", FDC37C665GT, XTAL(24'000'000))
MCFG_DEVICE_ADD("rs232", RS232_PORT, 0)
MCFG_SLOT_OPTION_ADD("xvd701", JVC_XVD701)
@@ -1073,16 +1073,16 @@ MACHINE_CONFIG_START(twinkle_state::twinkle)
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("^rs232", rs232_port_device, write_rts))
/* video hardware */
- MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL(53'693'175) )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("speakerleft", "speakerright")
- MCFG_SPU_ADD( "spu", XTAL_67_7376MHz/2 )
+ MCFG_SPU_ADD( "spu", XTAL(67'737'600)/2 )
MCFG_SOUND_ROUTE( 0, "speakerleft", 0.75 )
MCFG_SOUND_ROUTE( 1, "speakerright", 0.75 )
- MCFG_RF5C400_ADD("rfsnd", XTAL_33_8688MHz/2);
+ MCFG_RF5C400_ADD("rfsnd", XTAL(33'868'800)/2);
MCFG_DEVICE_ADDRESS_MAP(0, rf5c400_map)
MCFG_SOUND_ROUTE(0, "speakerleft", 1.0)
MCFG_SOUND_ROUTE(1, "speakerright", 1.0)
diff --git a/src/mame/drivers/twins.cpp b/src/mame/drivers/twins.cpp
index 1c41da0050f..dfb84a1bb28 100644
--- a/src/mame/drivers/twins.cpp
+++ b/src/mame/drivers/twins.cpp
@@ -432,7 +432,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(twins_state::twinsa)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", V30, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(twins_map)
MCFG_CPU_IO_MAP(twinsa_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", twins_state, nmi_line_pulse)
@@ -455,7 +455,7 @@ MACHINE_CONFIG_START(twins_state::twinsa)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_16MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(16'000'000)/8) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/ultratnk.cpp b/src/mame/drivers/ultratnk.cpp
index 02d66908954..3dfcf08f6d5 100644
--- a/src/mame/drivers/ultratnk.cpp
+++ b/src/mame/drivers/ultratnk.cpp
@@ -13,7 +13,7 @@ Atari Ultra Tank driver
#include "machine/74259.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_12_096MHz
+#define MASTER_CLOCK XTAL(12'096'000)
#define HTOTAL 384
#define VTOTAL 262
diff --git a/src/mame/drivers/ultrsprt.cpp b/src/mame/drivers/ultrsprt.cpp
index 8e091032716..1b347610af5 100644
--- a/src/mame/drivers/ultrsprt.cpp
+++ b/src/mame/drivers/ultrsprt.cpp
@@ -261,12 +261,12 @@ MACHINE_CONFIG_START(ultrsprt_state::ultrsprt)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
/* sound hardware */
- MCFG_K056800_ADD("k056800", XTAL_18_432MHz)
+ MCFG_K056800_ADD("k056800", XTAL(18'432'000))
MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_6))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_DEVICE_ADD("k054539", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
MCFG_K054539_TIMER_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_5))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/undrfire.cpp b/src/mame/drivers/undrfire.cpp
index 733bb53fd03..0c7725ed5b2 100644
--- a/src/mame/drivers/undrfire.cpp
+++ b/src/mame/drivers/undrfire.cpp
@@ -624,7 +624,7 @@ INTERRUPT_GEN_MEMBER(undrfire_state::undrfire_interrupt)
MACHINE_CONFIG_START(undrfire_state::undrfire)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_40MHz/2) /* 20 MHz - NOT verified */
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(40'000'000)/2) /* 20 MHz - NOT verified */
MCFG_CPU_PROGRAM_MAP(undrfire_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", undrfire_state, undrfire_interrupt)
@@ -677,11 +677,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(undrfire_state::cbombers)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_40MHz/2) /* 20 MHz - NOT verified */
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(40'000'000)/2) /* 20 MHz - NOT verified */
MCFG_CPU_PROGRAM_MAP(cbombers_cpua_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", undrfire_state, irq4_line_hold)
- MCFG_CPU_ADD("sub", M68000, XTAL_32MHz/2) /* 16 MHz */
+ MCFG_CPU_ADD("sub", M68000, XTAL(32'000'000)/2) /* 16 MHz */
MCFG_CPU_PROGRAM_MAP(cbombers_cpub_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", undrfire_state, irq4_line_hold)
diff --git a/src/mame/drivers/unichamp.cpp b/src/mame/drivers/unichamp.cpp
index f6240a60072..c528264d21a 100644
--- a/src/mame/drivers/unichamp.cpp
+++ b/src/mame/drivers/unichamp.cpp
@@ -236,10 +236,10 @@ MACHINE_CONFIG_START(unichamp_state::unichamp)
/* basic machine hardware */
//The CPU is really clocked this way:
- //MCFG_CPU_ADD("maincpu", CP1610, XTAL_3_579545MHz/4)
+ //MCFG_CPU_ADD("maincpu", CP1610, XTAL(3'579'545)/4)
//But since it is only running 7752/29868 th's of the time...
//TODO find a more accurate method? (the emulation will me the same though)
- MCFG_CPU_ADD("maincpu", CP1610, (int)((7752.0/29868.0)*XTAL_3_579545MHz/4))
+ MCFG_CPU_ADD("maincpu", CP1610, (7752.0/29868.0)*XTAL(3'579'545)/4)
MCFG_CPU_PROGRAM_MAP(unichamp_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -247,7 +247,7 @@ MACHINE_CONFIG_START(unichamp_state::unichamp)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( XTAL_3_579545MHz,
+ MCFG_SCREEN_RAW_PARAMS( XTAL(3'579'545),
gic_device::LINE_CLOCKS,
gic_device::START_ACTIVE_SCAN,
gic_device::END_ACTIVE_SCAN,
@@ -263,7 +263,7 @@ MACHINE_CONFIG_START(unichamp_state::unichamp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_GIC_ADD( "gic", XTAL_3_579545MHz, "screen", READ8(unichamp_state, unichamp_gicram_r) )
+ MCFG_GIC_ADD( "gic", XTAL(3'579'545), "screen", READ8(unichamp_state, unichamp_gicram_r) )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
/* cartridge */
diff --git a/src/mame/drivers/unico.cpp b/src/mame/drivers/unico.cpp
index 87db60bc451..0388f7595ab 100644
--- a/src/mame/drivers/unico.cpp
+++ b/src/mame/drivers/unico.cpp
@@ -573,7 +573,7 @@ MACHINE_RESET_MEMBER(unico_state,unico)
MACHINE_CONFIG_START(unico_state::burglarx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz */
MCFG_CPU_PROGRAM_MAP(burglarx_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", unico_state, irq2_line_hold)
@@ -596,11 +596,11 @@ MACHINE_CONFIG_START(unico_state::burglarx)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_14_31818MHz/4) /* 3.579545 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'318'181)/4) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/32, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -619,7 +619,7 @@ MACHINE_RESET_MEMBER(unico_state,zeropt)
MACHINE_CONFIG_START(unico_state::zeropnt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz */
MCFG_CPU_PROGRAM_MAP(zeropnt_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", unico_state, irq2_line_hold)
@@ -642,11 +642,11 @@ MACHINE_CONFIG_START(unico_state::zeropnt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_14_31818MHz/4) /* 3.579545 MHz */
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'318'181)/4) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/32, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -660,7 +660,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(unico_state::zeropnt2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* 16MHz */
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL(32'000'000)/2) /* 16MHz */
MCFG_CPU_PROGRAM_MAP(zeropnt2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", unico_state, irq2_line_hold)
@@ -685,15 +685,15 @@ MACHINE_CONFIG_START(unico_state::zeropnt2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545 MHz */
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.70)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.70)
- MCFG_OKIM6295_ADD("oki1", XTAL_32MHz/32, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'000'000)/32, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MCFG_OKIM6295_ADD("oki2", XTAL_14_31818MHz/4, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", XTAL(14'318'181)/4, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/unior.cpp b/src/mame/drivers/unior.cpp
index c1fc4425f38..4e0b26a9aca 100644
--- a/src/mame/drivers/unior.cpp
+++ b/src/mame/drivers/unior.cpp
@@ -376,7 +376,7 @@ void unior_state::machine_reset()
MACHINE_CONFIG_START(unior_state::unior)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL_20MHz / 9)
+ MCFG_CPU_ADD("maincpu",I8080, XTAL(20'000'000) / 9)
MCFG_CPU_PROGRAM_MAP(unior_mem)
MCFG_CPU_IO_MAP(unior_io)
@@ -399,11 +399,11 @@ MACHINE_CONFIG_START(unior_state::unior)
MCFG_DEVICE_ADD("uart", I8251, 0)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_20MHz / 12)
- MCFG_PIT8253_CLK1(XTAL_20MHz / 9)
+ MCFG_PIT8253_CLK0(XTAL(20'000'000) / 12)
+ MCFG_PIT8253_CLK1(XTAL(20'000'000) / 9)
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
- MCFG_PIT8253_CLK2(XTAL_16MHz / 9 / 64) // unknown frequency
+ MCFG_PIT8253_CLK2(XTAL(16'000'000) / 9 / 64) // unknown frequency
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w))
MCFG_DEVICE_ADD("ppi0", I8255, 0)
@@ -420,12 +420,12 @@ MACHINE_CONFIG_START(unior_state::unior)
MCFG_I8255_IN_PORTC_CB(READ8(unior_state, ppi1_c_r))
MCFG_I8255_OUT_PORTC_CB(WRITE8(unior_state, ppi1_c_w))
- MCFG_DEVICE_ADD("dma", I8257, XTAL_20MHz / 9)
+ MCFG_DEVICE_ADD("dma", I8257, XTAL(20'000'000) / 9)
MCFG_I8257_OUT_HRQ_CB(WRITELINE(unior_state, hrq_w))
MCFG_I8257_IN_MEMR_CB(READ8(unior_state, dma_r))
MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("crtc", i8275_device, dack_w))
- MCFG_DEVICE_ADD("crtc", I8275, XTAL_20MHz / 12)
+ MCFG_DEVICE_ADD("crtc", I8275, XTAL(20'000'000) / 12)
MCFG_I8275_CHARACTER_WIDTH(6)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(unior_state, display_pixels)
MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma",i8257_device, dreq2_w))
diff --git a/src/mame/drivers/unistar.cpp b/src/mame/drivers/unistar.cpp
index 8f55d2e3ed7..b312bbf343f 100644
--- a/src/mame/drivers/unistar.cpp
+++ b/src/mame/drivers/unistar.cpp
@@ -93,11 +93,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(unistar_state::unistar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL_2MHz)
+ MCFG_CPU_ADD("maincpu",I8085A, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(unistar_mem)
MCFG_CPU_IO_MAP(unistar_io)
- MCFG_DEVICE_ADD("stc", AM9513, XTAL_8MHz)
+ MCFG_DEVICE_ADD("stc", AM9513, XTAL(8'000'000))
MCFG_AM9513_FOUT_CALLBACK(DEVWRITELINE("stc", am9513_device, source1_w))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp
index b5c7c00df58..de334fdafa4 100644
--- a/src/mame/drivers/univac.cpp
+++ b/src/mame/drivers/univac.cpp
@@ -309,7 +309,7 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(univac_state::uts20)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) // unknown clock
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000)) // unknown clock
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
@@ -333,13 +333,13 @@ MACHINE_CONFIG_START(univac_state::uts20)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg3))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("uart", z80sio_device, txca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", z80sio_device, rxca_w))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("uart", z80sio_device, rxtxcb_w))
- MCFG_DEVICE_ADD("uart", Z80SIO, XTAL_4MHz)
+ MCFG_DEVICE_ADD("uart", Z80SIO, XTAL(4'000'000))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("uart", z80sio_device, rxa_w)) // FIXME: hacked in permanent loopback to pass test
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("uart", z80sio_device, rxb_w)) // FIXME: hacked in permanent loopback to pass test
diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp
index caed276ba56..f942c62608e 100644
--- a/src/mame/drivers/unixpc.cpp
+++ b/src/mame/drivers/unixpc.cpp
@@ -316,13 +316,13 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(unixpc_state::unixpc)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68010, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", M68010, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(unixpc_mem)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_UPDATE_DRIVER(unixpc_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_20MHz, 896, 0, 720, 367, 0, 348)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(20'000'000), 896, 0, 720, 367, 0, 348)
MCFG_SCREEN_PALETTE("palette")
// vsync should actually last 17264 pixels
diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp
index 57256824ad0..3e229750444 100644
--- a/src/mame/drivers/unkhorse.cpp
+++ b/src/mame/drivers/unkhorse.cpp
@@ -195,12 +195,12 @@ INTERRUPT_GEN_MEMBER(horse_state::interrupt)
MACHINE_CONFIG_START(horse_state::horse)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_12MHz / 2)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(12'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(horse_map)
MCFG_CPU_IO_MAP(horse_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", horse_state, interrupt)
- MCFG_DEVICE_ADD("i8155", I8155, XTAL_12MHz / 2) // port A input, B output, C output but unused
+ MCFG_DEVICE_ADD("i8155", I8155, XTAL(12'000'000) / 2) // port A input, B output, C output but unused
MCFG_I8155_IN_PORTA_CB(READ8(horse_state, input_r))
MCFG_I8155_OUT_PORTB_CB(WRITE8(horse_state, output_w))
MCFG_I8155_OUT_TIMEROUT_CB(DEVWRITELINE("speaker", speaker_sound_device, level_w))
diff --git a/src/mame/drivers/usgames.cpp b/src/mame/drivers/usgames.cpp
index 57fe79e8701..223ade5326f 100644
--- a/src/mame/drivers/usgames.cpp
+++ b/src/mame/drivers/usgames.cpp
@@ -239,7 +239,7 @@ MACHINE_CONFIG_START(usgames_state::usg32)
MCFG_PALETTE_ADD("palette", 2*256)
MCFG_PALETTE_INIT_OWNER(usgames_state, usgames)
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_18MHz / 16)
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(18'000'000) / 16)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
diff --git a/src/mame/drivers/v100.cpp b/src/mame/drivers/v100.cpp
index c710fb26b8f..f78e6530191 100644
--- a/src/mame/drivers/v100.cpp
+++ b/src/mame/drivers/v100.cpp
@@ -209,34 +209,34 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(v100_state::v100)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_47_736MHz / 12) // divider not verified
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(47'736'000) / 12) // divider not verified
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(v100_state, irq_ack)
- MCFG_DEVICE_ADD("usart1", I8251, XTAL_47_736MHz / 12) // divider not verified
+ MCFG_DEVICE_ADD("usart1", I8251, XTAL(47'736'000) / 12) // divider not verified
MCFG_DEVICE_ADD("brg1", COM8116, 5068800) // TODO: clock and divisors for this customized variant
MCFG_COM8116_FR_HANDLER(DEVWRITELINE("usart1", i8251_device, write_rxc))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE("usart1", i8251_device, write_txc))
- MCFG_DEVICE_ADD("usart2", I8251, XTAL_47_736MHz / 12)
+ MCFG_DEVICE_ADD("usart2", I8251, XTAL(47'736'000) / 12)
MCFG_DEVICE_ADD("brg2", COM8116, 5068800)
MCFG_COM8116_FR_HANDLER(DEVWRITELINE("usart2", i8251_device, write_rxc))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE("usart2", i8251_device, write_txc))
MCFG_SCREEN_ADD("screen", RASTER)
- //MCFG_SCREEN_RAW_PARAMS(XTAL_47_736MHz / 2, 102 * CHAR_WIDTH, 0, 80 * CHAR_WIDTH, 260, 0, 240)
- MCFG_SCREEN_RAW_PARAMS(XTAL_47_736MHz, 170 * CHAR_WIDTH, 0, 132 * CHAR_WIDTH, 312, 0, 240)
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(47'736'000) / 2, 102 * CHAR_WIDTH, 0, 80 * CHAR_WIDTH, 260, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(47'736'000), 170 * CHAR_WIDTH, 0, 132 * CHAR_WIDTH, 312, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(v100_state, screen_update)
// FIXME: dot clock should be divided by char width
- MCFG_DEVICE_ADD("vtac", CRT5037, XTAL_47_736MHz)
+ MCFG_DEVICE_ADD("vtac", CRT5037, XTAL(47'736'000))
MCFG_TMS9927_CHAR_WIDTH(CHAR_WIDTH)
MCFG_VIDEO_SET_SCREEN("screen")
- MCFG_DEVICE_ADD("picu", I8214, XTAL_47_736MHz / 12)
+ MCFG_DEVICE_ADD("picu", I8214, XTAL(47'736'000) / 12)
MCFG_I8214_INT_CALLBACK(ASSERTLINE("maincpu", 0))
MCFG_DEVICE_ADD("ppi", I8255, 0)
diff --git a/src/mame/drivers/v102.cpp b/src/mame/drivers/v102.cpp
index f2b4d76cc3b..8b7b19cfa83 100644
--- a/src/mame/drivers/v102.cpp
+++ b/src/mame/drivers/v102.cpp
@@ -70,13 +70,13 @@ static INPUT_PORTS_START( v102 )
INPUT_PORTS_END
MACHINE_CONFIG_START(v102_state::v102)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_575MHz / 5) // divider not verified
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'575'000) / 5) // divider not verified
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_18_575MHz, 970, 0, 800, 319, 0, 300)
- //MCFG_SCREEN_RAW_PARAMS(XTAL_18_575MHz, 948, 0, 792, 319, 0, 300)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(18'575'000), 970, 0, 800, 319, 0, 300)
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(18'575'000), 948, 0, 792, 319, 0, 300)
MCFG_SCREEN_UPDATE_DRIVER(v102_state, screen_update)
//MCFG_DEVICE_ADD("vpac", CRT9007, CRTC_CLOCK)
@@ -84,9 +84,9 @@ MACHINE_CONFIG_START(v102_state::v102)
MCFG_EEPROM_2804_ADD("eeprom")
- MCFG_DEVICE_ADD("mpsc", UPD7201_NEW, XTAL_18_575MHz / 5) // divider not verified
+ MCFG_DEVICE_ADD("mpsc", UPD7201_NEW, XTAL(18'575'000) / 5) // divider not verified
- MCFG_DEVICE_ADD("usart", I8251, XTAL_18_575MHz / 5) // divider not verified
+ MCFG_DEVICE_ADD("usart", I8251, XTAL(18'575'000) / 5) // divider not verified
MCFG_DEVICE_ADD("pit", PIT8253, 0)
diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp
index ee0f9e67a7b..a48254c5962 100644
--- a/src/mame/drivers/v1050.cpp
+++ b/src/mame/drivers/v1050.cpp
@@ -1022,14 +1022,14 @@ void v1050_state::machine_reset()
MACHINE_CONFIG_START(v1050_state::v1050)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
MCFG_CPU_PROGRAM_MAP(v1050_mem)
MCFG_CPU_IO_MAP(v1050_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(v1050_state,v1050_int_ack)
MCFG_QUANTUM_PERFECT_CPU(Z80_TAG)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_15_36MHz/16)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(15'360'000)/16)
MCFG_CPU_PROGRAM_MAP(v1050_crt_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
@@ -1040,10 +1040,10 @@ MACHINE_CONFIG_START(v1050_state::v1050)
MCFG_FRAGMENT_ADD(v1050_video)
// devices
- MCFG_DEVICE_ADD(UPB8214_TAG, I8214, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(UPB8214_TAG, I8214, XTAL(16'000'000)/4)
MCFG_I8214_INT_CALLBACK(WRITELINE(v1050_state, pic_int_w))
- MCFG_DEVICE_ADD(MSM58321RS_TAG, MSM58321, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(MSM58321RS_TAG, MSM58321, XTAL(32'768))
MCFG_MSM58321_D0_HANDLER(WRITELINE(v1050_state, rtc_ppi_pa_0_w))
MCFG_MSM58321_D1_HANDLER(WRITELINE(v1050_state, rtc_ppi_pa_1_w))
MCFG_MSM58321_D2_HANDLER(WRITELINE(v1050_state, rtc_ppi_pa_2_w))
@@ -1071,18 +1071,18 @@ MACHINE_CONFIG_START(v1050_state::v1050)
MCFG_I8255_IN_PORTA_CB(DEVREAD8(I8255A_DISP_TAG, i8255_device, pb_r))
MCFG_I8255_OUT_PORTC_CB(WRITE8(v1050_state, m6502_ppi_pc_w))
- MCFG_DEVICE_ADD(I8251A_KB_TAG, I8251, 0/*XTAL_16MHz/8,*/)
+ MCFG_DEVICE_ADD(I8251A_KB_TAG, I8251, 0/*XTAL(16'000'000)/8,*/)
MCFG_I8251_TXD_HANDLER(DEVWRITELINE(V1050_KEYBOARD_TAG, v1050_keyboard_device, si_w))
MCFG_I8251_RXRDY_HANDLER(WRITELINE(v1050_state, kb_rxrdy_w))
- MCFG_DEVICE_ADD(CLOCK_KB_TAG, CLOCK, XTAL_16MHz/4/13/8)
+ MCFG_DEVICE_ADD(CLOCK_KB_TAG, CLOCK, XTAL(16'000'000)/4/13/8)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(v1050_state, write_keyboard_clock))
// keyboard
MCFG_DEVICE_ADD(V1050_KEYBOARD_TAG, V1050_KEYBOARD, 0)
MCFG_V1050_KEYBOARD_OUT_TX_HANDLER(DEVWRITELINE(I8251A_KB_TAG, i8251_device, write_rxd))
- MCFG_DEVICE_ADD(I8251A_SIO_TAG, I8251, 0/*XTAL_16MHz/8,*/)
+ MCFG_DEVICE_ADD(I8251A_SIO_TAG, I8251, 0/*XTAL(16'000'000)/8,*/)
MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
@@ -1093,10 +1093,10 @@ MACHINE_CONFIG_START(v1050_state::v1050)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251A_SIO_TAG, i8251_device, write_rxd))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251A_SIO_TAG, i8251_device, write_dsr))
- MCFG_DEVICE_ADD(CLOCK_SIO_TAG, CLOCK, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(CLOCK_SIO_TAG, CLOCK, XTAL(16'000'000)/4)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(v1050_state, write_sio_clock))
- MCFG_MB8877_ADD(MB8877_TAG, XTAL_16MHz/16)
+ MCFG_MB8877_ADD(MB8877_TAG, XTAL(16'000'000)/16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(v1050_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(v1050_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", v1050_floppies, "525qd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp
index 8e55aa5b3ff..8544ed5308c 100644
--- a/src/mame/drivers/v6809.cpp
+++ b/src/mame/drivers/v6809.cpp
@@ -277,7 +277,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(v6809_state::v6809)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_16MHz / 4) // divided by 4 again internally
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(16'000'000) / 4) // divided by 4 again internally
MCFG_CPU_PROGRAM_MAP(v6809_mem)
MCFG_MACHINE_RESET_OVERRIDE(v6809_state, v6809)
@@ -297,7 +297,7 @@ MACHINE_CONFIG_START(v6809_state::v6809)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* devices */
- MCFG_MC6845_ADD("crtc", SY6545_1, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD("crtc", SY6545_1, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(v6809_state, crtc_update_row)
@@ -319,7 +319,7 @@ MACHINE_CONFIG_START(v6809_state::v6809)
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
- MCFG_DEVICE_ADD("ptm", PTM6840, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ptm", PTM6840, XTAL(16'000'000) / 4)
MCFG_PTM6840_EXTERNAL_CLOCKS(4000000/14, 4000000/14, 4000000/14/8)
MCFG_PTM6840_OUT1_CB(WRITELINE(v6809_state, speaker_w))
MCFG_PTM6840_OUT2_CB(WRITELINE(v6809_state, speaker_en_w))
@@ -340,7 +340,7 @@ MACHINE_CONFIG_START(v6809_state::v6809)
MCFG_MM58274C_MODE24(0) // 12 hour
MCFG_MM58274C_DAY1(1) // monday
- MCFG_MB8876_ADD("fdc", XTAL_16MHz / 16)
+ MCFG_MB8876_ADD("fdc", XTAL(16'000'000) / 16)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", v6809_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp
index 4ae57485533..011534092fb 100644
--- a/src/mame/drivers/vamphalf.cpp
+++ b/src/mame/drivers/vamphalf.cpp
@@ -1032,11 +1032,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::sound_ym_oki)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_28MHz/8) /* 3.5MHz */
+ MCFG_YM2151_ADD("ymsnd", XTAL(28'000'000)/8) /* 3.5MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_28MHz/16 , PIN7_HIGH) /* 1.75MHz */
+ MCFG_OKIM6295_ADD("oki", XTAL(28'000'000)/16 , PIN7_HIGH) /* 1.75MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1044,11 +1044,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::sound_suplup)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545 MHz */
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/8, PIN7_HIGH) /* 1.7897725 MHz */
+ MCFG_OKIM6295_ADD("oki", XTAL(14'318'181)/8, PIN7_HIGH) /* 1.7897725 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1057,7 +1057,7 @@ MACHINE_CONFIG_START(vamphalf_state::sound_qs1000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("qs1000", QS1000, XTAL_24MHz)
+ MCFG_SOUND_ADD("qs1000", QS1000, XTAL(24'000'000))
MCFG_QS1000_EXTERNAL_ROM(true)
MCFG_QS1000_IN_P1_CB(READ8(vamphalf_state, qs1000_p1_r))
MCFG_QS1000_OUT_P3_CB(WRITE8(vamphalf_state, qs1000_p3_w))
@@ -1073,7 +1073,7 @@ MACHINE_CONFIG_DERIVED(vamphalf_state::vamphalf, common)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(vamphalf_state::misncrft, common)
- MCFG_CPU_REPLACE("maincpu", GMS30C2116, XTAL_50MHz) /* 50 MHz */
+ MCFG_CPU_REPLACE("maincpu", GMS30C2116, XTAL(50'000'000)) /* 50 MHz */
MCFG_CPU_PROGRAM_MAP(common_map)
MCFG_CPU_IO_MAP(misncrft_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
@@ -1103,7 +1103,7 @@ MACHINE_CONFIG_DERIVED(vamphalf_state::jmpbreak, common)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(vamphalf_state::mrdig, common)
- MCFG_CPU_REPLACE("maincpu", GMS30C2116, XTAL_50MHz) /* 50 MHz */
+ MCFG_CPU_REPLACE("maincpu", GMS30C2116, XTAL(50'000'000)) /* 50 MHz */
MCFG_CPU_PROGRAM_MAP(common_map)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(mrdig_io)
@@ -1113,7 +1113,7 @@ MACHINE_CONFIG_DERIVED(vamphalf_state::mrdig, common)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(vamphalf_state::wyvernwg, common)
- MCFG_CPU_REPLACE("maincpu", E132T, XTAL_50MHz) /* 50 MHz */
+ MCFG_CPU_REPLACE("maincpu", E132T, XTAL(50'000'000)) /* 50 MHz */
MCFG_CPU_PROGRAM_MAP(common_32bit_map)
MCFG_CPU_IO_MAP(wyvernwg_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
@@ -1122,7 +1122,7 @@ MACHINE_CONFIG_DERIVED(vamphalf_state::wyvernwg, common)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(vamphalf_state::finalgdr, common)
- MCFG_CPU_REPLACE("maincpu", E132T, XTAL_50MHz) /* 50 MHz */
+ MCFG_CPU_REPLACE("maincpu", E132T, XTAL(50'000'000)) /* 50 MHz */
MCFG_CPU_PROGRAM_MAP(common_32bit_map)
MCFG_CPU_IO_MAP(finalgdr_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
@@ -1133,7 +1133,7 @@ MACHINE_CONFIG_DERIVED(vamphalf_state::finalgdr, common)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(vamphalf_state::mrkickera, common)
- MCFG_CPU_REPLACE("maincpu", E132T, XTAL_50MHz) /* 50 MHz */
+ MCFG_CPU_REPLACE("maincpu", E132T, XTAL(50'000'000)) /* 50 MHz */
MCFG_CPU_PROGRAM_MAP(common_32bit_map)
MCFG_CPU_IO_MAP(mrkickera_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
@@ -1146,7 +1146,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::aoh)
- MCFG_CPU_ADD("maincpu", E132XN, XTAL_20MHz*4) /* 4x internal multiplier */
+ MCFG_CPU_ADD("maincpu", E132XN, XTAL(20'000'000)*4) /* 4x internal multiplier */
MCFG_CPU_PROGRAM_MAP(aoh_map)
MCFG_CPU_IO_MAP(aoh_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
@@ -1169,15 +1169,15 @@ MACHINE_CONFIG_START(vamphalf_state::aoh)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki_1", XTAL_32MHz/8, PIN7_HIGH) /* 4MHz */
+ MCFG_OKIM6295_ADD("oki_1", XTAL(32'000'000)/8, PIN7_HIGH) /* 4MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki_2", XTAL_32MHz/32, PIN7_HIGH) /* 1MHz */
+ MCFG_OKIM6295_ADD("oki_2", XTAL(32'000'000)/32, PIN7_HIGH) /* 1MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1190,7 +1190,7 @@ MACHINE_CONFIG_DERIVED(vamphalf_state::boonggab, common)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(vamphalf_state::yorijori, common)
- MCFG_CPU_REPLACE("maincpu", E132T, XTAL_50MHz) /* 50 MHz */
+ MCFG_CPU_REPLACE("maincpu", E132T, XTAL(50'000'000)) /* 50 MHz */
MCFG_CPU_PROGRAM_MAP(yorijori_32bit_map)
MCFG_CPU_IO_MAP(yorijori_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
diff --git a/src/mame/drivers/vaportra.cpp b/src/mame/drivers/vaportra.cpp
index 51129e80b57..fcbdf1a3f96 100644
--- a/src/mame/drivers/vaportra.cpp
+++ b/src/mame/drivers/vaportra.cpp
@@ -241,11 +241,11 @@ void vaportra_state::machine_reset()
MACHINE_CONFIG_START(vaportra_state::vaportra)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL_24MHz/2) /* Custom chip 59 */
+ MCFG_CPU_ADD("maincpu", M68000,XTAL(24'000'000)/2) /* Custom chip 59 */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vaportra_state, irq6_line_assert)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL_24MHz/4) /* Custom chip 45; Audio section crystal is 32.220 MHz but CPU clock is confirmed as coming from the 24MHz crystal (6Mhz exactly on the CPU) */
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL(24'000'000)/4) /* Custom chip 45; Audio section crystal is 32.220 MHz but CPU clock is confirmed as coming from the 24MHz crystal (6Mhz exactly on the CPU) */
MCFG_CPU_PROGRAM_MAP(sound_map)
@@ -303,18 +303,18 @@ MACHINE_CONFIG_START(vaportra_state::vaportra)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_32_22MHz/8)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_YM2151_ADD("ym2", XTAL_32_22MHz/9) // uses a preset LS163 to force the odd speed
+ MCFG_YM2151_ADD("ym2", XTAL(32'220'000)/9) // uses a preset LS163 to force the odd speed
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL(32'220'000)/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL(32'220'000)/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vastar.cpp b/src/mame/drivers/vastar.cpp
index cc39c3daf44..72894f6c460 100644
--- a/src/mame/drivers/vastar.cpp
+++ b/src/mame/drivers/vastar.cpp
@@ -416,12 +416,12 @@ INTERRUPT_GEN_MEMBER(vastar_state::vblank_irq)
MACHINE_CONFIG_START(vastar_state::vastar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_port_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vastar_state, vblank_irq)
- MCFG_CPU_ADD("sub", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_ADD("sub", Z80, XTAL(18'432'000)/6)
MCFG_CPU_PROGRAM_MAP(cpu2_map)
MCFG_CPU_IO_MAP(cpu2_port_map)
MCFG_CPU_PERIODIC_INT_DRIVER(vastar_state, irq0_line_hold, 242) /* 4 * vsync_freq(60.58) measured, it is not known yet how long it is asserted so we'll use HOLD_LINE for now */
@@ -450,7 +450,7 @@ MACHINE_CONFIG_START(vastar_state::vastar)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(18'432'000)/12)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/vax11.cpp b/src/mame/drivers/vax11.cpp
index d618103a240..6d27e229fc9 100644
--- a/src/mame/drivers/vax11.cpp
+++ b/src/mame/drivers/vax11.cpp
@@ -140,7 +140,7 @@ void vax11_state::kbd_put(u8 data)
MACHINE_CONFIG_START(vax11_state::vax11)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",T11, XTAL_4MHz) // Need proper CPU here
+ MCFG_CPU_ADD("maincpu",T11, XTAL(4'000'000)) // Need proper CPU here
MCFG_T11_INITIAL_MODE(0 << 13)
MCFG_CPU_PROGRAM_MAP(vax11_mem)
diff --git a/src/mame/drivers/vball.cpp b/src/mame/drivers/vball.cpp
index d8e605cd455..6f749d1ae47 100644
--- a/src/mame/drivers/vball.cpp
+++ b/src/mame/drivers/vball.cpp
@@ -93,7 +93,7 @@ VBlank = 58Hz
#include "sound/okim6295.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_12MHz
+#define MAIN_CLOCK XTAL(12'000'000)
#define CPU_CLOCK MAIN_CLOCK / 6
#define PIXEL_CLOCK MAIN_CLOCK / 2
diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp
index c522203d9c1..cd27537f9d3 100644
--- a/src/mame/drivers/vboy.cpp
+++ b/src/mame/drivers/vboy.cpp
@@ -1350,7 +1350,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(vboy_state::vboy)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", V810, XTAL_20MHz )
+ MCFG_CPU_ADD( "maincpu", V810, XTAL(20'000'000) )
MCFG_CPU_PROGRAM_MAP(vboy_mem)
MCFG_CPU_IO_MAP(vboy_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer_l", vboy_state, vboy_scanlineL, "3dleft", 0, 1)
@@ -1369,13 +1369,13 @@ MACHINE_CONFIG_START(vboy_state::vboy)
/* Left screen */
MCFG_SCREEN_ADD("3dleft", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_20MHz/2,757,0,384,264,0,224)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(20'000'000)/2,757,0,384,264,0,224)
MCFG_SCREEN_UPDATE_DRIVER(vboy_state, screen_update_vboy_left)
MCFG_SCREEN_PALETTE("palette")
/* Right screen */
MCFG_SCREEN_ADD("3dright", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_20MHz/2,757,0,384,264,0,224)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(20'000'000)/2,757,0,384,264,0,224)
MCFG_SCREEN_UPDATE_DRIVER(vboy_state, screen_update_vboy_right)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/vcombat.cpp b/src/mame/drivers/vcombat.cpp
index ccc26973acd..0f131cd054c 100644
--- a/src/mame/drivers/vcombat.cpp
+++ b/src/mame/drivers/vcombat.cpp
@@ -546,20 +546,20 @@ WRITE_LINE_MEMBER(vcombat_state::sound_update)
}
MACHINE_CONFIG_START(vcombat_state::vcombat)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vcombat_state, irq1_line_assert)
/* The middle board i860 */
- MCFG_CPU_ADD("vid_0", I860, XTAL_20MHz)
+ MCFG_CPU_ADD("vid_0", I860, XTAL(20'000'000))
MCFG_CPU_PROGRAM_MAP(vid_0_map)
/* The top board i860 */
- MCFG_CPU_ADD("vid_1", I860, XTAL_20MHz)
+ MCFG_CPU_ADD("vid_1", I860, XTAL(20'000'000))
MCFG_CPU_PROGRAM_MAP(vid_1_map)
/* Sound CPU */
- MCFG_CPU_ADD("soundcpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("soundcpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(vcombat_state, irq1_line_hold, 15000) /* Remove this if MC6845 is enabled */
@@ -579,11 +579,11 @@ MACHINE_CONFIG_START(vcombat_state::vcombat)
MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz / 2, 400, 0, 256, 291, 0, 208)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000) / 2, 400, 0, 256, 291, 0, 208)
MCFG_SCREEN_UPDATE_DRIVER(vcombat_state, screen_update_vcombat_main)
MCFG_SCREEN_ADD("aux", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz / 2, 400, 0, 256, 291, 0, 208)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000) / 2, 400, 0, 256, 291, 0, 208)
MCFG_SCREEN_UPDATE_DRIVER(vcombat_state, screen_update_vcombat_aux)
MCFG_SPEAKER_STANDARD_MONO("speaker")
@@ -594,16 +594,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vcombat_state::shadfgtr)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vcombat_state, irq1_line_assert)
/* The middle board i860 */
- MCFG_CPU_ADD("vid_0", I860, XTAL_20MHz)
+ MCFG_CPU_ADD("vid_0", I860, XTAL(20'000'000))
MCFG_CPU_PROGRAM_MAP(vid_0_map)
/* Sound CPU */
- MCFG_CPU_ADD("soundcpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("soundcpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -611,13 +611,13 @@ MACHINE_CONFIG_START(vcombat_state::shadfgtr)
MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_20MHz / 4 / 16)
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(20'000'000) / 4 / 16)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(vcombat_state, sound_update))
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_20MHz / 4, 320, 0, 256, 277, 0, 224)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(20'000'000) / 4, 320, 0, 256, 277, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(vcombat_state, screen_update_vcombat_main)
MCFG_SPEAKER_STANDARD_MONO("speaker")
diff --git a/src/mame/drivers/vcs80.cpp b/src/mame/drivers/vcs80.cpp
index c5709b1e161..867dc327b40 100644
--- a/src/mame/drivers/vcs80.cpp
+++ b/src/mame/drivers/vcs80.cpp
@@ -211,7 +211,7 @@ void vcs80_state::machine_start()
MACHINE_CONFIG_START(vcs80_state::vcs80)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_5MHz/2) /* U880D */
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(5'000'000)/2) /* U880D */
MCFG_CPU_PROGRAM_MAP(vcs80_mem)
MCFG_CPU_IO_MAP(vcs80_io)
MCFG_Z80_DAISY_CHAIN(vcs80_daisy_chain)
@@ -223,7 +223,7 @@ MACHINE_CONFIG_START(vcs80_state::vcs80)
MCFG_DEFAULT_LAYOUT( layout_vcs80 )
/* devices */
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_5MHz/2)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(5'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(vcs80_state, pio_pa_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(vcs80_state, pio_pb_w))
diff --git a/src/mame/drivers/vector06.cpp b/src/mame/drivers/vector06.cpp
index 6776a0f6f04..f0af9b082f3 100644
--- a/src/mame/drivers/vector06.cpp
+++ b/src/mame/drivers/vector06.cpp
@@ -198,7 +198,7 @@ MACHINE_CONFIG_START(vector06_state::vector06)
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
- MCFG_KR1818VG93_ADD("wd1793", XTAL_1MHz)
+ MCFG_KR1818VG93_ADD("wd1793", XTAL(1'000'000))
MCFG_FLOPPY_DRIVE_ADD("wd1793:0", vector06_floppies, "qd", vector06_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1793:1", vector06_floppies, "qd", vector06_state::floppy_formats)
diff --git a/src/mame/drivers/vector4.cpp b/src/mame/drivers/vector4.cpp
index 9f134aa633a..9b86580b939 100644
--- a/src/mame/drivers/vector4.cpp
+++ b/src/mame/drivers/vector4.cpp
@@ -64,7 +64,7 @@ void vector4_state::machine_reset()
MACHINE_CONFIG_START(vector4_state::vector4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(vector4_mem)
MCFG_CPU_IO_MAP(vector4_io)
diff --git a/src/mame/drivers/vectrex.cpp b/src/mame/drivers/vectrex.cpp
index a98075b7b2c..06c725b4d2b 100644
--- a/src/mame/drivers/vectrex.cpp
+++ b/src/mame/drivers/vectrex.cpp
@@ -97,7 +97,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(vectrex_state::vectrex)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_6MHz) // 68A09
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(6'000'000)) // 68A09
MCFG_CPU_PROGRAM_MAP(vectrex_map)
/* video hardware */
@@ -114,13 +114,13 @@ MACHINE_CONFIG_START(vectrex_state::vectrex)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("ay8912", AY8912, XTAL_6MHz / 4)
+ MCFG_SOUND_ADD("ay8912", AY8912, XTAL(6'000'000) / 4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("BUTTONS"))
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(vectrex_state, vectrex_psg_port_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2)
/* via */
- MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL_6MHz / 4)
+ MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL(6'000'000) / 4)
MCFG_VIA6522_READPA_HANDLER(READ8(vectrex_state, vectrex_via_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(vectrex_state, vectrex_via_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(vectrex_state, v_via_pa_w))
diff --git a/src/mame/drivers/vectrix.cpp b/src/mame/drivers/vectrix.cpp
index 1dbe2971987..e7b0c95bf47 100644
--- a/src/mame/drivers/vectrix.cpp
+++ b/src/mame/drivers/vectrix.cpp
@@ -46,7 +46,7 @@ static INPUT_PORTS_START( vectrix )
INPUT_PORTS_END
MACHINE_CONFIG_START(vectrix_state::vectrix)
- MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3) // no idea of clock
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3) // no idea of clock
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp
index f803a3c2cba..a2f29a891c8 100644
--- a/src/mame/drivers/vegaeo.cpp
+++ b/src/mame/drivers/vegaeo.cpp
@@ -219,7 +219,7 @@ uint32_t vegaeo_state::screen_update_vega(screen_device &screen, bitmap_ind16 &b
MACHINE_CONFIG_START(vegaeo_state::vega)
- MCFG_CPU_ADD("maincpu", GMS30C2132, XTAL_55MHz)
+ MCFG_CPU_ADD("maincpu", GMS30C2132, XTAL(55'000'000))
MCFG_CPU_PROGRAM_MAP(vega_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", vegaeo_state, eolith_speedup, "screen", 0, 1)
@@ -245,7 +245,7 @@ MACHINE_CONFIG_START(vegaeo_state::vega)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("qs1000", QS1000, XTAL_24MHz)
+ MCFG_SOUND_ADD("qs1000", QS1000, XTAL(24'000'000))
MCFG_QS1000_EXTERNAL_ROM(true)
MCFG_QS1000_IN_P1_CB(READ8(vegaeo_state, qs1000_p1_r))
MCFG_QS1000_OUT_P1_CB(WRITE8(vegaeo_state, qs1000_p1_w))
diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp
index 8b760f2a5aa..27d47044a4e 100644
--- a/src/mame/drivers/vendetta.cpp
+++ b/src/mame/drivers/vendetta.cpp
@@ -421,7 +421,7 @@ WRITE8_MEMBER( vendetta_state::banking_callback )
MACHINE_CONFIG_START(vendetta_state::vendetta)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/8) /* 052001 (verified on pcb) */
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/8) /* 052001 (verified on pcb) */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vendetta_state, irq)
MCFG_KONAMICPU_LINE_CB(WRITE8(vendetta_state, banking_callback))
@@ -440,7 +440,7 @@ MACHINE_CONFIG_START(vendetta_state::vendetta)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(13)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified with PCB */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified with PCB */
MCFG_CPU_PROGRAM_MAP(sound_map)
/* interrupts are triggered by the main CPU */
@@ -477,11 +477,11 @@ MACHINE_CONFIG_START(vendetta_state::vendetta)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified with PCB */
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified with PCB */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_K053260_ADD("k053260", XTAL_3_579545MHz) /* verified with PCB */
+ MCFG_K053260_ADD("k053260", XTAL(3'579'545)) /* verified with PCB */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vertigo.cpp b/src/mame/drivers/vertigo.cpp
index 10c362b6790..74207a0a84f 100644
--- a/src/mame/drivers/vertigo.cpp
+++ b/src/mame/drivers/vertigo.cpp
@@ -25,7 +25,7 @@
#include "machine/nvram.h"
#include "screen.h"
-#define EXIDY440_AUDIO_CLOCK (XTAL_12_9792MHz / 4)
+#define EXIDY440_AUDIO_CLOCK (XTAL(12'979'200) / 4)
#define EXIDY440_MC3418_CLOCK (EXIDY440_AUDIO_CLOCK / 4 / 16)
@@ -125,24 +125,24 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(vertigo_state::vertigo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 3)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(vertigo_map)
MCFG_CPU_PERIODIC_INT_DRIVER(vertigo_state, vertigo_interrupt, 60)
MCFG_FRAGMENT_ADD(exidy440_audio)
MCFG_DEVICE_ADD("pit", PIT8254, 0)
- MCFG_PIT8253_CLK0(XTAL_24MHz / 100)
+ MCFG_PIT8253_CLK0(XTAL(24'000'000) / 100)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(vertigo_state, v_irq4_w))
- MCFG_PIT8253_CLK1(XTAL_24MHz / 100)
+ MCFG_PIT8253_CLK1(XTAL(24'000'000) / 100)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(vertigo_state, v_irq3_w))
- MCFG_PIT8253_CLK2(XTAL_24MHz / 100)
+ MCFG_PIT8253_CLK2(XTAL(24'000'000) / 100)
MCFG_DEVICE_ADD("74148", TTL74148, 0)
MCFG_74148_OUTPUT_CB(vertigo_state, update_irq)
/* motor controller */
- MCFG_CPU_ADD("motorcpu", M68705P3, XTAL_24MHz / 6)
+ MCFG_CPU_ADD("motorcpu", M68705P3, XTAL(24'000'000) / 6)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/vg5k.cpp b/src/mame/drivers/vg5k.cpp
index 804b6a84f5a..8429ec4a871 100644
--- a/src/mame/drivers/vg5k.cpp
+++ b/src/mame/drivers/vg5k.cpp
@@ -362,7 +362,7 @@ DRIVER_INIT_MEMBER(vg5k_state,vg5k)
MACHINE_CONFIG_START(vg5k_state::vg5k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(vg5k_mem)
MCFG_CPU_IO_MAP(vg5k_io)
diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp
index 47a98917ad5..39404afc759 100644
--- a/src/mame/drivers/vgmplay.cpp
+++ b/src/mame/drivers/vgmplay.cpp
@@ -1391,7 +1391,7 @@ MACHINE_CONFIG_START(vgmplay_state::vgmplay)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
- MCFG_SOUND_ADD("dmg", DMG_APU, XTAL_4_194304Mhz)
+ MCFG_SOUND_ADD("dmg", DMG_APU, XTAL(4'194'304))
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
diff --git a/src/mame/drivers/vic10.cpp b/src/mame/drivers/vic10.cpp
index 0aeec370e71..554fb79983c 100644
--- a/src/mame/drivers/vic10.cpp
+++ b/src/mame/drivers/vic10.cpp
@@ -691,7 +691,7 @@ void vic10_state::machine_reset()
MACHINE_CONFIG_START(vic10_state::vic10)
// basic hardware
- MCFG_CPU_ADD(M6510_TAG, M6510, XTAL_8MHz/8)
+ MCFG_CPU_ADD(M6510_TAG, M6510, XTAL(8'000'000)/8)
MCFG_CPU_PROGRAM_MAP(vic10_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
MCFG_M6510_PORT_CALLBACKS(READ8(vic10_state, cpu_r), WRITE8(vic10_state, cpu_w))
@@ -699,7 +699,7 @@ MACHINE_CONFIG_START(vic10_state::vic10)
MCFG_QUANTUM_PERFECT_CPU(M6510_TAG)
// video hardware
- MCFG_DEVICE_ADD(MOS6566_TAG, MOS6566, XTAL_8MHz/8)
+ MCFG_DEVICE_ADD(MOS6566_TAG, MOS6566, XTAL(8'000'000)/8)
MCFG_MOS6566_CPU(M6510_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(vic10_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
@@ -713,13 +713,13 @@ MACHINE_CONFIG_START(vic10_state::vic10)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL_8MHz/8)
+ MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(8'000'000)/8)
MCFG_MOS6581_POTX_CALLBACK(READ8(vic10_state, sid_potx_r))
MCFG_MOS6581_POTY_CALLBACK(READ8(vic10_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
- MCFG_DEVICE_ADD(MOS6526_TAG, MOS6526, XTAL_8MHz/8)
+ MCFG_DEVICE_ADD(MOS6526_TAG, MOS6526, XTAL(8'000'000)/8)
MCFG_MOS6526_TOD(60)
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(vic10_state, cia_irq_w))
MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(VIC10_EXPANSION_SLOT_TAG, vic10_expansion_slot_device, cnt_w))
@@ -731,7 +731,7 @@ MACHINE_CONFIG_START(vic10_state::vic10)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS6566_TAG, mos6566_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
- MCFG_VIC10_EXPANSION_SLOT_ADD(VIC10_EXPANSION_SLOT_TAG, XTAL_8MHz/8, vic10_expansion_cards, nullptr)
+ MCFG_VIC10_EXPANSION_SLOT_ADD(VIC10_EXPANSION_SLOT_TAG, XTAL(8'000'000)/8, vic10_expansion_cards, nullptr)
MCFG_VIC10_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(vic10_state, exp_irq_w))
MCFG_VIC10_EXPANSION_SLOT_RES_CALLBACK(WRITELINE(vic10_state, exp_reset_w))
MCFG_VIC10_EXPANSION_SLOT_CNT_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, cnt_w))
diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp
index 28280cf350c..9f2cba9237f 100644
--- a/src/mame/drivers/vicdual.cpp
+++ b/src/mame/drivers/vicdual.cpp
@@ -63,7 +63,7 @@
#include "depthch.lh"
-#define VICDUAL_MASTER_CLOCK (XTAL_15_468MHz)
+#define VICDUAL_MASTER_CLOCK (XTAL(15'468'480))
#define VICDUAL_MAIN_CPU_CLOCK (VICDUAL_MASTER_CLOCK/8)
#define VICDUAL_PIXEL_CLOCK (VICDUAL_MASTER_CLOCK/3)
diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp
index e9e9d2458ae..ada56ad34da 100644
--- a/src/mame/drivers/victor9k.cpp
+++ b/src/mame/drivers/victor9k.cpp
@@ -247,7 +247,7 @@ MC6845_UPDATE_ROW( victor9k_state::crtc_update_row )
if (m_hires != hires)
{
m_hires = hires;
- m_crtc->set_clock(XTAL_30MHz / width);
+ m_crtc->set_clock(XTAL(30'000'000) / width);
m_crtc->set_hpixels_per_column(width);
}
@@ -677,7 +677,7 @@ void victor9k_state::machine_reset()
MACHINE_CONFIG_START(victor9k_state::victor9k)
// basic machine hardware
- MCFG_CPU_ADD(I8088_TAG, I8088, XTAL_30MHz/6)
+ MCFG_CPU_ADD(I8088_TAG, I8088, XTAL(30'000'000)/6)
MCFG_CPU_PROGRAM_MAP(victor9k_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb)
@@ -691,7 +691,7 @@ MACHINE_CONFIG_START(victor9k_state::victor9k)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(victor9k_state, victor9k)
- MCFG_MC6845_ADD(HD46505S_TAG, HD6845, SCREEN_TAG, XTAL_30MHz/10) // HD6845 == HD46505S
+ MCFG_MC6845_ADD(HD46505S_TAG, HD6845, SCREEN_TAG, XTAL(30'000'000)/10) // HD6845 == HD46505S
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(10)
MCFG_MC6845_UPDATE_ROW_CB(victor9k_state, crtc_update_row)
@@ -725,7 +725,7 @@ MACHINE_CONFIG_START(victor9k_state::victor9k)
MCFG_PIT8253_CLK2(100000)
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE(I8259A_TAG, pic8259_device, ir2_w))
- MCFG_DEVICE_ADD(UPD7201_TAG, UPD7201, XTAL_30MHz/30)
+ MCFG_DEVICE_ADD(UPD7201_TAG, UPD7201, XTAL(30'000'000)/30)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
@@ -734,24 +734,24 @@ MACHINE_CONFIG_START(victor9k_state::victor9k)
MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir1_w))
- MCFG_DEVICE_ADD(MC6852_TAG, MC6852, XTAL_30MHz/30)
+ MCFG_DEVICE_ADD(MC6852_TAG, MC6852, XTAL(30'000'000)/30)
MCFG_MC6852_TX_DATA_CALLBACK(DEVWRITELINE(HC55516_TAG, hc55516_device, digit_w))
MCFG_MC6852_SM_DTR_CALLBACK(WRITELINE(victor9k_state, ssda_sm_dtr_w))
MCFG_MC6852_IRQ_CALLBACK(WRITELINE(victor9k_state, ssda_irq_w))
- MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_30MHz/30)
+ MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(30'000'000)/30)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor9k_state, via1_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor9k_state, via1_pb_w))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(victor9k_state, codec_vol_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor9k_state, via1_irq_w))
- MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, XTAL_30MHz/30)
+ MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, XTAL(30'000'000)/30)
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor9k_state, via2_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor9k_state, via2_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor9k_state, via2_irq_w))
- MCFG_DEVICE_ADD(M6522_3_TAG, VIA6522, XTAL_30MHz/30)
+ MCFG_DEVICE_ADD(M6522_3_TAG, VIA6522, XTAL(30'000'000)/30)
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor9k_state, via3_pb_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor9k_state, via3_irq_w))
diff --git a/src/mame/drivers/vidbrain.cpp b/src/mame/drivers/vidbrain.cpp
index cabc90ef7b3..1a85fa17061 100644
--- a/src/mame/drivers/vidbrain.cpp
+++ b/src/mame/drivers/vidbrain.cpp
@@ -502,7 +502,7 @@ void vidbrain_state::machine_reset()
MACHINE_CONFIG_START(vidbrain_state::vidbrain)
// basic machine hardware
- MCFG_CPU_ADD(F3850_TAG, F8, XTAL_4MHz/2)
+ MCFG_CPU_ADD(F3850_TAG, F8, XTAL(4'000'000)/2)
MCFG_CPU_PROGRAM_MAP(vidbrain_mem)
MCFG_CPU_IO_MAP(vidbrain_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(vidbrain_state,vidbrain_int_ack)
@@ -522,7 +522,7 @@ MACHINE_CONFIG_START(vidbrain_state::vidbrain)
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
// devices
- MCFG_DEVICE_ADD(F3853_TAG, F3853, XTAL_4MHz/2)
+ MCFG_DEVICE_ADD(F3853_TAG, F3853, XTAL(4'000'000)/2)
MCFG_F3853_EXT_INPUT_CB(vidbrain_state, f3853_int_req_w)
// cartridge
diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp
index 89decc5bc8a..6ca5a876fce 100644
--- a/src/mame/drivers/videopkr.cpp
+++ b/src/mame/drivers/videopkr.cpp
@@ -295,9 +295,9 @@
#include "videopkr.lh"
-#define CPU_CLOCK (XTAL_6MHz) /* main cpu clock */
-#define CPU_CLOCK_ALT (XTAL_8MHz) /* alternative main cpu clock for newer games */
-#define SOUND_CLOCK (XTAL_8MHz) /* sound cpu clock */
+#define CPU_CLOCK (XTAL(6'000'000)) /* main cpu clock */
+#define CPU_CLOCK_ALT (XTAL(8'000'000)) /* alternative main cpu clock for newer games */
+#define SOUND_CLOCK (XTAL(8'000'000)) /* sound cpu clock */
#define VIDEO_CLOCK (XTAL_7.8643MHz)
@@ -1357,7 +1357,7 @@ MACHINE_CONFIG_DERIVED(videopkr_state::fortune1, videopkr)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(videopkr_state::bpoker, babypkr)
- MCFG_CPU_REPLACE("maincpu", I8751, XTAL_6MHz)
+ MCFG_CPU_REPLACE("maincpu", I8751, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(i8751_map)
MCFG_CPU_IO_MAP(i8751_io_port)
diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp
index d5757a7eea2..0eee52ad909 100644
--- a/src/mame/drivers/vii.cpp
+++ b/src/mame/drivers/vii.cpp
@@ -1185,7 +1185,7 @@ INTERRUPT_GEN_MEMBER(vii_state::vii_vblank)
MACHINE_CONFIG_START(vii_state::vii)
- MCFG_CPU_ADD( "maincpu", UNSP, XTAL_27MHz)
+ MCFG_CPU_ADD( "maincpu", UNSP, XTAL(27'000'000))
MCFG_CPU_PROGRAM_MAP( vii_mem )
MCFG_CPU_VBLANK_INT_DRIVER("screen", vii_state, vii_vblank)
@@ -1206,7 +1206,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vii_state::vsmile)
- MCFG_CPU_ADD( "maincpu", UNSP, XTAL_27MHz)
+ MCFG_CPU_ADD( "maincpu", UNSP, XTAL(27'000'000))
MCFG_CPU_PROGRAM_MAP( vii_mem )
MCFG_CPU_VBLANK_INT_DRIVER("screen", vii_state, vii_vblank)
@@ -1227,7 +1227,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vii_state::batman)
- MCFG_CPU_ADD( "maincpu", UNSP, XTAL_27MHz)
+ MCFG_CPU_ADD( "maincpu", UNSP, XTAL(27'000'000))
MCFG_CPU_PROGRAM_MAP( vii_mem )
MCFG_CPU_VBLANK_INT_DRIVER("screen", vii_state, vii_vblank)
@@ -1245,7 +1245,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vii_state::wirels60)
- MCFG_CPU_ADD( "maincpu", UNSP, XTAL_27MHz)
+ MCFG_CPU_ADD( "maincpu", UNSP, XTAL(27'000'000))
MCFG_CPU_PROGRAM_MAP( vii_mem )
MCFG_CPU_VBLANK_INT_DRIVER("screen", vii_state, vii_vblank)
diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp
index 24606ab0956..ca597628409 100644
--- a/src/mame/drivers/vip.cpp
+++ b/src/mame/drivers/vip.cpp
@@ -712,7 +712,7 @@ QUICKLOAD_LOAD_MEMBER( vip_state, vip )
MACHINE_CONFIG_START(vip_state::vip)
// basic machine hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_3_52128MHz/2)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(3'521'280)/2)
MCFG_CPU_PROGRAM_MAP(vip_mem)
MCFG_CPU_IO_MAP(vip_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
@@ -727,11 +727,11 @@ MACHINE_CONFIG_START(vip_state::vip)
MCFG_COSMAC_SC_CALLBACK(WRITE8(vip_state, sc_w))
// video hardware
- MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL_3_52128MHz/2)
+ MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL(3'521'280)/2)
MCFG_CDP1861_IRQ_CALLBACK(WRITELINE(vip_state, vdc_int_w))
MCFG_CDP1861_DMA_OUT_CALLBACK(WRITELINE(vip_state, vdc_dma_out_w))
MCFG_CDP1861_EFX_CALLBACK(WRITELINE(vip_state, vdc_ef1_w))
- MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL_3_52128MHz/2)
+ MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL(3'521'280)/2)
MCFG_SCREEN_UPDATE_DRIVER(vip_state, screen_update)
// sound hardware
@@ -742,7 +742,7 @@ MACHINE_CONFIG_START(vip_state::vip)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_VIP_BYTEIO_PORT_ADD(VIP_BYTEIO_PORT_TAG, vip_byteio_cards, nullptr, WRITELINE(vip_state, byteio_inst_w))
- MCFG_VIP_EXPANSION_SLOT_ADD(VIP_EXPANSION_SLOT_TAG, XTAL_3_52128MHz/2, vip_expansion_cards, nullptr)
+ MCFG_VIP_EXPANSION_SLOT_ADD(VIP_EXPANSION_SLOT_TAG, XTAL(3'521'280)/2, vip_expansion_cards, nullptr)
MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vip_state, exp_int_w))
MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vip_state, exp_dma_out_w))
MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vip_state, exp_dma_in_w))
diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp
index 3438e8c4194..dc596d073e2 100644
--- a/src/mame/drivers/vis.cpp
+++ b/src/mame/drivers/vis.cpp
@@ -132,7 +132,7 @@ void vis_audio_device::device_timer(emu_timer &timer, device_timer_id id, int pa
MACHINE_CONFIG_START(vis_audio_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymf262", YMF262, XTAL_14_31818MHz)
+ MCFG_SOUND_ADD("ymf262", YMF262, XTAL(14'318'181))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MCFG_SOUND_ROUTE(2, "lspeaker", 1.00)
@@ -259,7 +259,7 @@ vis_vga_device::vis_vga_device(const machine_config &mconfig, const char *tag, d
MACHINE_CONFIG_START(vis_vga_device::device_add_mconfig)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, vis_vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
MACHINE_CONFIG_END
@@ -270,7 +270,8 @@ void vis_vga_device::recompute_params()
attoseconds_t refresh;
uint8_t hclock_m = (!vga.gc.alpha_dis) ? (vga.sequencer.data[1]&1)?8:9 : 8;
int pixel_clock;
- int xtal = (vga.miscellaneous_output & 0xc) ? XTAL_28_63636MHz : XTAL_25_1748MHz;
+ const XTAL base_xtal = XTAL(14'318'181);
+ const XTAL xtal = (vga.miscellaneous_output & 0xc) ? base_xtal*2 : base_xtal*1.75;
int divisor = 1; // divisor is 2 for 15/16 bit rgb/yuv modes and 3 for 24bit
/* safety check */
@@ -283,7 +284,7 @@ void vis_vga_device::recompute_params()
hblank_period = ((vga.crtc.horz_total + 5) * ((float)(hclock_m)/divisor));
/* TODO: 10b and 11b settings aren't known */
- pixel_clock = xtal / (((vga.sequencer.data[1]&8) >> 3) + 1);
+ pixel_clock = xtal.value() / (((vga.sequencer.data[1]&8) >> 3) + 1);
refresh = HZ_TO_ATTOSECONDS(pixel_clock) * (hblank_period) * vblank_period;
machine().first_screen()->configure((hblank_period), (vblank_period), visarea, refresh );
@@ -884,7 +885,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(vis_state::vis)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80286, XTAL_12MHz )
+ MCFG_CPU_ADD("maincpu", I80286, XTAL(12'000'000) )
MCFG_CPU_PROGRAM_MAP(at16_map)
MCFG_CPU_IO_MAP(at16_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp
index 921847b9869..73ef74b20f7 100644
--- a/src/mame/drivers/vixen.cpp
+++ b/src/mame/drivers/vixen.cpp
@@ -485,7 +485,7 @@ uint32_t vixen_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
static DISCRETE_SOUND_START( vixen )
DISCRETE_INPUT_LOGIC(NODE_01)
- DISCRETE_SQUAREWAVE(NODE_02, NODE_01, XTAL_23_9616MHz/15360, 100, 50, 0, 90)
+ DISCRETE_SQUAREWAVE(NODE_02, NODE_01, (XTAL(23'961'600)/15360).dvalue(), 100, 50, 0, 90)
DISCRETE_OUTPUT(NODE_02, 2000)
DISCRETE_SOUND_END
@@ -739,7 +739,7 @@ void vixen_state::machine_reset()
MACHINE_CONFIG_START(vixen_state::vixen)
// basic machine hardware
- MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL_23_9616MHz/6)
+ MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL(23'961'600)/6)
MCFG_CPU_PROGRAM_MAP(vixen_mem)
MCFG_CPU_DECRYPTED_OPCODES_MAP(bios_mem)
MCFG_CPU_IO_MAP(vixen_io)
@@ -748,7 +748,7 @@ MACHINE_CONFIG_START(vixen_state::vixen)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber())
MCFG_SCREEN_UPDATE_DRIVER(vixen_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_23_9616MHz/2, 96*8, 0*8, 81*8, 27*10, 0*10, 26*10)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(23'961'600)/2, 96*8, 0*8, 81*8, 27*10, 0*10, 26*10)
MCFG_TIMER_DRIVER_ADD_SCANLINE("vsync", vixen_state, vsync_tick, SCREEN_TAG, 26*10, 27*10)
@@ -761,12 +761,12 @@ MACHINE_CONFIG_START(vixen_state::vixen)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
// devices
- MCFG_DEVICE_ADD(P8155H_TAG, I8155, XTAL_23_9616MHz/6)
+ MCFG_DEVICE_ADD(P8155H_TAG, I8155, XTAL(23'961'600)/6)
MCFG_I8155_IN_PORTA_CB(READ8(vixen_state, i8155_pa_r))
MCFG_I8155_OUT_PORTB_CB(WRITE8(vixen_state, i8155_pb_w))
MCFG_I8155_OUT_PORTC_CB(WRITE8(vixen_state, i8155_pc_w))
- MCFG_DEVICE_ADD(P8155H_IO_TAG, I8155, XTAL_23_9616MHz/6)
+ MCFG_DEVICE_ADD(P8155H_IO_TAG, I8155, XTAL(23'961'600)/6)
MCFG_I8155_OUT_PORTA_CB(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
MCFG_I8155_OUT_PORTB_CB(WRITE8(vixen_state, io_i8155_pb_w))
MCFG_I8155_OUT_PORTC_CB(WRITE8(vixen_state, io_i8155_pc_w))
@@ -783,7 +783,7 @@ MACHINE_CONFIG_START(vixen_state::vixen)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(P8251A_TAG, i8251_device, write_rxd))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE(P8251A_TAG, i8251_device, write_dsr))
- MCFG_FD1797_ADD(FDC1797_TAG, XTAL_23_9616MHz/24)
+ MCFG_FD1797_ADD(FDC1797_TAG, XTAL(23'961'600)/24)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(vixen_state, fdc_intrq_w))
MCFG_FLOPPY_DRIVE_ADD(FDC1797_TAG":0", vixen_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp
index 748091194e6..43b4a22615e 100644
--- a/src/mame/drivers/vk100.cpp
+++ b/src/mame/drivers/vk100.cpp
@@ -423,7 +423,7 @@ TIMER_CALLBACK_MEMBER(vk100_state::execute_vg)
m_vgPAT_Mask >>= 1; // shift the mask
if (m_vgPAT_Mask == 0) m_vgPAT_Mask = 0x80; // reset mask if it hits 0
}
- if (m_vgGO) timer_set(attotime::from_hz(XTAL_45_6192MHz/3/12/2), TIMER_EXECUTE_VG); // /3/12/2 is correct. the sync counter is clocked by the dot clock, despite the error on figure 5-21
+ if (m_vgGO) timer_set(attotime::from_hz(XTAL(45'619'200)/3/12/2), TIMER_EXECUTE_VG); // /3/12/2 is correct. the sync counter is clocked by the dot clock, despite the error on figure 5-21
}
/* ports 0x40 and 0x41: load low and high bytes of vector gen X register */
@@ -1035,16 +1035,16 @@ MC6845_UPDATE_ROW( vk100_state::crtc_update_row )
MACHINE_CONFIG_START(vk100_state::vk100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_5_0688MHz)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(5'068'800))
MCFG_CPU_PROGRAM_MAP(vk100_mem)
MCFG_CPU_IO_MAP(vk100_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_45_6192MHz/3, 882, 0, 720, 370, 0, 350 ) // fake screen timings for startup until 6845 sets real ones
+ MCFG_SCREEN_RAW_PARAMS(XTAL(45'619'200)/3, 882, 0, 720, 370, 0, 350 ) // fake screen timings for startup until 6845 sets real ones
MCFG_SCREEN_UPDATE_DEVICE( "crtc", mc6845_device, screen_update )
- MCFG_MC6845_ADD( "crtc", H46505, "screen", XTAL_45_6192MHz/3/12)
+ MCFG_MC6845_ADD( "crtc", H46505, "screen", XTAL(45'619'200)/3/12)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(12)
MCFG_MC6845_UPDATE_ROW_CB(vk100_state, crtc_update_row)
@@ -1062,7 +1062,7 @@ MACHINE_CONFIG_START(vk100_state::vk100)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxd))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE("i8251", i8251_device, write_dsr))
- MCFG_DEVICE_ADD(COM5016T_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(COM5016T_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxc))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE("i8251", i8251_device, write_txc))
diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp
index 4f12f4ed791..2a3b4fd4096 100644
--- a/src/mame/drivers/vlc.cpp
+++ b/src/mame/drivers/vlc.cpp
@@ -136,11 +136,11 @@ nevada TYPE2 : 64 45 51 06 32 02 31 31
#include "speaker.h"
-#define MASTER_CLOCK XTAL_16MHz
+#define MASTER_CLOCK XTAL(16'000'000)
#define MASTER_CPU ((MASTER_CLOCK)/2) // 8mhz
#define SOUND_CLOCK ((MASTER_CLOCK) /8) // 2mhz
-#define VIDEO_CLOCK XTAL_33MHz
+#define VIDEO_CLOCK XTAL(33'000'000)
#define MC6845_CLOCK ((VIDEO_CLOCK)/4/16) // 0.515625 MHZ
@@ -625,15 +625,15 @@ MACHINE_CONFIG_START(nevada_state::nevada)
MCFG_SOUND_ADD("aysnd", AY8912, SOUND_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_DEVICE_ADD("duart18_68681", MC68681, XTAL_3_6864MHz) // UARTA = Modem 1200Baud
+ MCFG_DEVICE_ADD("duart18_68681", MC68681, XTAL(3'686'400)) // UARTA = Modem 1200Baud
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(nevada_state, duart18_irq_handler))
MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW1"))
- MCFG_DEVICE_ADD("duart39_68681", MC68681, XTAL_3_6864MHz) // UARTA = Printer
+ MCFG_DEVICE_ADD("duart39_68681", MC68681, XTAL(3'686'400)) // UARTA = Printer
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(nevada_state, duart39_irq_handler))
MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW2"))
- MCFG_DEVICE_ADD("duart40_68681", MC68681, XTAL_3_6864MHz) // UARTA = Touch , UARTB = Bill Acceptor
+ MCFG_DEVICE_ADD("duart40_68681", MC68681, XTAL(3'686'400)) // UARTA = Touch , UARTB = Bill Acceptor
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(nevada_state, duart40_irq_handler))
MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_device, rx))
MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW3"))
@@ -641,7 +641,7 @@ MACHINE_CONFIG_START(nevada_state::nevada)
MCFG_MICROTOUCH_ADD( "microtouch", 9600, DEVWRITELINE("duart40_68681", mc68681_device, rx_a_w) )
/* devices */
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(nevada_state, nevada_rtc_irq))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/volfied.cpp b/src/mame/drivers/volfied.cpp
index 8af0748c1ad..583aba07d95 100644
--- a/src/mame/drivers/volfied.cpp
+++ b/src/mame/drivers/volfied.cpp
@@ -58,8 +58,8 @@ Stephh's notes (based on the game M68000 code and some tests) :
/* Define clocks based on actual OSC on the PCB */
-#define CPU_CLOCK (XTAL_32MHz / 4) /* 8 MHz clock for 68000 */
-#define SOUND_CPU_CLOCK (XTAL_32MHz / 8) /* 4 MHz clock for Z80 sound CPU */
+#define CPU_CLOCK (XTAL(32'000'000) / 4) /* 8 MHz clock for 68000 */
+#define SOUND_CPU_CLOCK (XTAL(32'000'000) / 8) /* 4 MHz clock for Z80 sound CPU */
/***********************************************************
@@ -229,7 +229,7 @@ MACHINE_CONFIG_START(volfied_state::volfied)
MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 4MHz sound CPU, required to run the game */
MCFG_CPU_PROGRAM_MAP(z80_map)
- MCFG_TAITO_CCHIP_ADD("cchip", XTAL_12MHz/2) /* ? MHz */
+ MCFG_TAITO_CCHIP_ADD("cchip", XTAL(12'000'000)/2) /* ? MHz */
MCFG_QUANTUM_TIME(attotime::from_hz(1200))
diff --git a/src/mame/drivers/votrpss.cpp b/src/mame/drivers/votrpss.cpp
index cbb25442fff..1ebbc5e1333 100644
--- a/src/mame/drivers/votrpss.cpp
+++ b/src/mame/drivers/votrpss.cpp
@@ -239,7 +239,7 @@ void votrpss_state::kbd_put(u8 data)
MACHINE_CONFIG_START(votrpss_state::votrpss)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* 4.000 MHz, verified */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* 4.000 MHz, verified */
MCFG_CPU_PROGRAM_MAP(votrpss_mem)
MCFG_CPU_IO_MAP(votrpss_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(votrpss_state,irq_ack)
@@ -249,7 +249,7 @@ MACHINE_CONFIG_START(votrpss_state::votrpss)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay", AY8910, XTAL_8MHz/4) /* 2.000 MHz, verified */
+ MCFG_SOUND_ADD("ay", AY8910, XTAL(8'000'000)/4) /* 2.000 MHz, verified */
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1")) // port B read
MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("votrax", votrax_sc01_device, write)) // port A write
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -272,11 +272,11 @@ MACHINE_CONFIG_START(votrpss_state::votrpss)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", i8251_device, write_cts))
MCFG_DEVICE_ADD("pit", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_8MHz) /* Timer 0: baud rate gen for 8251 */
+ MCFG_PIT8253_CLK0(XTAL(8'000'000)) /* Timer 0: baud rate gen for 8251 */
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
- MCFG_PIT8253_CLK1(XTAL_8MHz / 256) /* Timer 1: Pitch */
- MCFG_PIT8253_CLK2(XTAL_8MHz / 4096) /* Timer 2: Volume */
+ MCFG_PIT8253_CLK1(XTAL(8'000'000) / 256) /* Timer 1: Pitch */
+ MCFG_PIT8253_CLK2(XTAL(8'000'000) / 4096) /* Timer 2: Volume */
MCFG_DEVICE_ADD("ppi", I8255, 0)
MCFG_I8255_IN_PORTA_CB(READ8(votrpss_state, ppi_pa_r))
diff --git a/src/mame/drivers/votrtnt.cpp b/src/mame/drivers/votrtnt.cpp
index 34766a7c388..0c5ce51d07e 100644
--- a/src/mame/drivers/votrtnt.cpp
+++ b/src/mame/drivers/votrtnt.cpp
@@ -135,7 +135,7 @@ MACHINE_RESET_MEMBER( votrtnt_state, votrtnt )
MACHINE_CONFIG_START(votrtnt_state::votrtnt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL_2_4576MHz) /* 2.4576MHz XTAL, verified; divided by 4 inside the m6802*/
+ MCFG_CPU_ADD("maincpu", M6802, XTAL(2'457'600)) /* 2.4576MHz XTAL, verified; divided by 4 inside the m6802*/
MCFG_CPU_PROGRAM_MAP(6802_mem)
MCFG_MACHINE_RESET_OVERRIDE(votrtnt_state, votrtnt)
diff --git a/src/mame/drivers/vp122.cpp b/src/mame/drivers/vp122.cpp
index cd60ecbd11a..d7736db85c7 100644
--- a/src/mame/drivers/vp122.cpp
+++ b/src/mame/drivers/vp122.cpp
@@ -65,7 +65,7 @@ static INPUT_PORTS_START( vp122 )
INPUT_PORTS_END
MACHINE_CONFIG_START(vp122_state::vp122)
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
@@ -83,10 +83,10 @@ MACHINE_CONFIG_START(vp122_state::vp122)
MCFG_DEVICE_ADDRESS_MAP(0, vram_map)
MCFG_VIDEO_SET_SCREEN("screen")
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400))
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", I8085_RST55_LINE))
- MCFG_DEVICE_ADD("usart", I8251, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD("usart", I8251, XTAL(8'000'000) / 4)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vp60.cpp b/src/mame/drivers/vp60.cpp
index a892d8476b9..85353e8d88b 100644
--- a/src/mame/drivers/vp60.cpp
+++ b/src/mame/drivers/vp60.cpp
@@ -52,15 +52,15 @@ static INPUT_PORTS_START( vp60 )
INPUT_PORTS_END
MACHINE_CONFIG_START(vp60_state::vp60)
- MCFG_CPU_ADD("maincpu", I8051, XTAL_10_920MHz)
+ MCFG_CPU_ADD("maincpu", I8051, XTAL(10'920'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_92MHz, 1350, 0, 1056, 320, 0, 300) // dimensions guessed
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'920'000), 1350, 0, 1056, 320, 0, 300) // dimensions guessed
MCFG_SCREEN_UPDATE_DRIVER(vp60_state, screen_update)
- MCFG_CPU_ADD("kbdcpu", I8035, XTAL_3_579545MHz) // 48-300-010 XTAL
+ MCFG_CPU_ADD("kbdcpu", I8035, XTAL(3'579'545)) // 48-300-010 XTAL
MCFG_CPU_PROGRAM_MAP(kbd_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vpoker.cpp b/src/mame/drivers/vpoker.cpp
index 29e1825ed1e..3921e1d72bf 100644
--- a/src/mame/drivers/vpoker.cpp
+++ b/src/mame/drivers/vpoker.cpp
@@ -631,7 +631,7 @@ WRITE_LINE_MEMBER(vpoker_state::ptm_irq)
MACHINE_CONFIG_START(vpoker_state::vpoker)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6809,XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",M6809,XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vpoker_state, irq0_line_hold) //irq0 valid too
@@ -650,7 +650,7 @@ MACHINE_CONFIG_START(vpoker_state::vpoker)
MCFG_PALETTE_ADD_3BIT_GBR("palette")
/* 6840 PTM */
- MCFG_DEVICE_ADD("6840ptm", PTM6840, XTAL_4MHz)
+ MCFG_DEVICE_ADD("6840ptm", PTM6840, XTAL(4'000'000))
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
MCFG_PTM6840_IRQ_CB(WRITELINE(vpoker_state, ptm_irq))
diff --git a/src/mame/drivers/vsnes.cpp b/src/mame/drivers/vsnes.cpp
index f886ab3161c..caf6135921b 100644
--- a/src/mame/drivers/vsnes.cpp
+++ b/src/mame/drivers/vsnes.cpp
@@ -1826,13 +1826,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vsnes_state::vsnes_bootleg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502,XTAL_16MHz/4) // 4mhz? seems too high but flickers badly otherwise, issue elsewhere?
+ MCFG_CPU_ADD("maincpu", M6502,XTAL(16'000'000)/4) // 4mhz? seems too high but flickers badly otherwise, issue elsewhere?
MCFG_CPU_PROGRAM_MAP(vsnes_cpu1_bootleg_map)
/* some carts also trigger IRQs */
MCFG_MACHINE_RESET_OVERRIDE(vsnes_state,vsnes)
MCFG_MACHINE_START_OVERRIDE(vsnes_state,vsnes)
- MCFG_CPU_ADD("sub", Z80,XTAL_16MHz/4) /* ? MHz */ // Z8400APS-Z80CPU
+ MCFG_CPU_ADD("sub", Z80,XTAL(16'000'000)/4) /* ? MHz */ // Z8400APS-Z80CPU
MCFG_CPU_PROGRAM_MAP(vsnes_bootleg_z80_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen1", vsnes_state, irq0_line_hold)
// MCFG_CPU_PERIODIC_INT_DRIVER(vsnes_state, nmi_line_pulse)
@@ -1860,13 +1860,13 @@ MACHINE_CONFIG_START(vsnes_state::vsnes_bootleg)
MCFG_SPEAKER_STANDARD_MONO("mono")
// PCB has 2, code accesses 3? which 2 really exist?
- MCFG_SOUND_ADD("sn1", SN76489, XTAL_16MHz/4)
+ MCFG_SOUND_ADD("sn1", SN76489, XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76489, XTAL_16MHz/4)
+ MCFG_SOUND_ADD("sn2", SN76489, XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn3", SN76489, XTAL_16MHz/4)
+ MCFG_SOUND_ADD("sn3", SN76489, XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp
index 4020e8a8166..3b6144fa55c 100644
--- a/src/mame/drivers/vt100.cpp
+++ b/src/mame/drivers/vt100.cpp
@@ -264,7 +264,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(vt100_state::vt100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL_24_8832MHz / 9)
+ MCFG_CPU_ADD("maincpu",I8080, XTAL(24'883'200) / 9)
MCFG_CPU_PROGRAM_MAP(vt100_mem)
MCFG_CPU_IO_MAP(vt100_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vt100_state, vt100_vertical_interrupt)
@@ -272,8 +272,8 @@ MACHINE_CONFIG_START(vt100_state::vt100)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS(XTAL_24_0734MHz*2/3, 102*10, 0, 80*10, 262, 0, 25*10)
- //MCFG_SCREEN_RAW_PARAMS(XTAL_24_0734MHz, 170*9, 0, 132*9, 262, 0, 25*10)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'073'400)*2/3, 102*10, 0, 80*10, 262, 0, 25*10)
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(24'073'400), 170*9, 0, 132*9, 262, 0, 25*10)
MCFG_SCREEN_UPDATE_DRIVER(vt100_state, screen_update_vt100)
MCFG_SCREEN_PALETTE("vt100_video:palette")
@@ -282,7 +282,7 @@ MACHINE_CONFIG_START(vt100_state::vt100)
MCFG_DEFAULT_LAYOUT( layout_vt100 )
- MCFG_DEVICE_ADD("vt100_video", VT100_VIDEO, XTAL_24_0734MHz)
+ MCFG_DEVICE_ADD("vt100_video", VT100_VIDEO, XTAL(24'073'400))
MCFG_VT_SET_SCREEN("screen")
MCFG_VT_CHARGEN("chargen")
MCFG_VT_VIDEO_RAM_CALLBACK(READ8(vt100_state, vt100_read_video_ram_r))
@@ -298,7 +298,7 @@ MACHINE_CONFIG_START(vt100_state::vt100)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxd))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE("i8251", i8251_device, write_dsr))
- MCFG_DEVICE_ADD(COM5016T_TAG, COM8116, 5068800/*XTAL_24_8832MHz / 9*/) // COM5016T-013, 2.7648Mhz Clock, currently hacked wrongly
+ MCFG_DEVICE_ADD(COM5016T_TAG, COM8116, 5068800/*XTAL(24'883'200) / 9*/) // COM5016T-013, 2.7648Mhz Clock, currently hacked wrongly
MCFG_COM8116_FR_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxc))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE("i8251", i8251_device, write_txc))
@@ -309,13 +309,13 @@ MACHINE_CONFIG_START(vt100_state::vt100)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(vt100_state::vt180, vt100)
- MCFG_CPU_ADD("z80cpu", Z80, XTAL_24_8832MHz / 9)
+ MCFG_CPU_ADD("z80cpu", Z80, XTAL(24'883'200) / 9)
MCFG_CPU_PROGRAM_MAP(vt180_mem)
MCFG_CPU_IO_MAP(vt180_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(vt100_state::vt102, vt100)
- MCFG_CPU_REPLACE("maincpu",I8085A, XTAL_24_8832MHz / 9)
+ MCFG_CPU_REPLACE("maincpu",I8085A, XTAL(24'883'200) / 9)
MCFG_CPU_PROGRAM_MAP(vt100_mem)
MCFG_CPU_IO_MAP(vt100_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vt100_state, vt100_vertical_interrupt)
diff --git a/src/mame/drivers/vt220.cpp b/src/mame/drivers/vt220.cpp
index f6d2ef1c33d..46ad9fbb016 100644
--- a/src/mame/drivers/vt220.cpp
+++ b/src/mame/drivers/vt220.cpp
@@ -98,11 +98,11 @@ uint32_t vt220_state::screen_update_vt220(screen_device &screen, bitmap_ind16 &b
MACHINE_CONFIG_START(vt220_state::vt220)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8051, XTAL_11_0592MHz) // from schematic for earlier version
+ MCFG_CPU_ADD("maincpu", I8051, XTAL(11'059'200)) // from schematic for earlier version
MCFG_CPU_PROGRAM_MAP(vt220_mem)
MCFG_CPU_IO_MAP(vt220_io)
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400))
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", MCS51_INT1_LINE))
/* video hardware */
diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp
index db0965b4473..6a093399333 100644
--- a/src/mame/drivers/vt240.cpp
+++ b/src/mame/drivers/vt240.cpp
@@ -641,12 +641,12 @@ static INPUT_PORTS_START( vt240 )
INPUT_PORTS_END
MACHINE_CONFIG_START(vt240_state::vt240)
- MCFG_CPU_ADD("maincpu", T11, XTAL_7_3728MHz) // confirm
+ MCFG_CPU_ADD("maincpu", T11, XTAL(7'372'800)) // confirm
MCFG_CPU_PROGRAM_MAP(vt240_mem)
MCFG_T11_INITIAL_MODE(5 << 13)
MCFG_T11_RESET(WRITELINE(vt240_state, t11_reset_w))
- MCFG_CPU_ADD("charcpu", I8085A, XTAL_16_09728MHz / 2)
+ MCFG_CPU_ADD("charcpu", I8085A, XTAL(16'097'280) / 2)
MCFG_CPU_PROGRAM_MAP(vt240_char_mem)
MCFG_CPU_IO_MAP(vt240_char_io)
MCFG_I8085A_SOD(WRITELINE(vt240_state, i8085_rdy_w))
@@ -660,19 +660,19 @@ MACHINE_CONFIG_START(vt240_state::vt240)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16_09728MHz, 1024, 0, 800, 629, 0, 480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'097'280), 1024, 0, 800, 629, 0, 480)
MCFG_SCREEN_UPDATE_DEVICE("upd7220", upd7220_device, screen_update)
MCFG_PALETTE_ADD("palette", 32)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", vt240)
- MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL_16_09728MHz / 16) // actually /8?
+ MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL(16'097'280) / 16) // actually /8?
MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(vt240_state, hgdc_draw)
MCFG_UPD7220_VSYNC_CALLBACK(INPUTLINE("charcpu", I8085_RST75_LINE))
MCFG_UPD7220_BLANK_CALLBACK(INPUTLINE("charcpu", I8085_RST55_LINE))
MCFG_VIDEO_SET_SCREEN("screen")
- MCFG_DEVICE_ADD("duart", SCN2681, XTAL_7_3728MHz / 2)
+ MCFG_DEVICE_ADD("duart", SCN2681, XTAL(7'372'800) / 2)
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(vt240_state, irq13_w))
MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("host", rs232_port_device, write_txd))
MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("printer", rs232_port_device, write_txd))
diff --git a/src/mame/drivers/vt320.cpp b/src/mame/drivers/vt320.cpp
index 5301868641a..3349f373bf4 100644
--- a/src/mame/drivers/vt320.cpp
+++ b/src/mame/drivers/vt320.cpp
@@ -87,7 +87,7 @@ uint32_t vt320_state::screen_update_vt320(screen_device &screen, bitmap_ind16 &b
MACHINE_CONFIG_START(vt320_state::vt320)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8051, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", I8051, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(vt320_mem)
MCFG_CPU_IO_MAP(vt320_io)
diff --git a/src/mame/drivers/vt520.cpp b/src/mame/drivers/vt520.cpp
index a8650da1df8..3b8016f3ae0 100644
--- a/src/mame/drivers/vt520.cpp
+++ b/src/mame/drivers/vt520.cpp
@@ -79,7 +79,7 @@ uint32_t vt520_state::screen_update_vt520(screen_device &screen, bitmap_ind16 &b
MACHINE_CONFIG_START(vt520_state::vt420)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL_43_320MHz / 3) // SCN8031HCFN40 (divider not verified)
+ MCFG_CPU_ADD("maincpu", I80C31, XTAL(43'320'000) / 3) // SCN8031HCFN40 (divider not verified)
MCFG_CPU_PROGRAM_MAP(vt520_mem)
MCFG_CPU_IO_MAP(vt520_io)
@@ -97,7 +97,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vt520_state::vt520)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C32, XTAL_20MHz) // Philips P80C32IBPN
+ MCFG_CPU_ADD("maincpu", I80C32, XTAL(20'000'000)) // Philips P80C32IBPN
MCFG_CPU_PROGRAM_MAP(vt520_mem)
MCFG_CPU_IO_MAP(vt520_io)
diff --git a/src/mame/drivers/vta2000.cpp b/src/mame/drivers/vta2000.cpp
index a7b2f62c418..29d2a99e0f6 100644
--- a/src/mame/drivers/vta2000.cpp
+++ b/src/mame/drivers/vta2000.cpp
@@ -157,7 +157,7 @@ PALETTE_INIT_MEMBER(vta2000_state, vta2000)
MACHINE_CONFIG_START(vta2000_state::vta2000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL_4MHz / 4)
+ MCFG_CPU_ADD("maincpu",I8080, XTAL(4'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/vtech1.cpp b/src/mame/drivers/vtech1.cpp
index afeca778c5b..2b7a3a53b38 100644
--- a/src/mame/drivers/vtech1.cpp
+++ b/src/mame/drivers/vtech1.cpp
@@ -55,7 +55,7 @@ Todo:
#define LOG_VTECH1_LATCH 0
#define VTECH1_CLK 3579500
-#define VZ300_XTAL1_CLK XTAL_17_73447MHz
+#define VZ300_XTAL1_CLK XTAL(17'734'470)
/***************************************************************************
@@ -434,7 +434,7 @@ MACHINE_CONFIG_START(vtech1_state::laser110)
// video hardware
MCFG_SCREEN_MC6847_PAL_ADD("screen", "mc6847")
- MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL_4_433619MHz)
+ MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) MCFG_DEVCB_INVERT
MCFG_MC6847_INPUT_CALLBACK(READ8(vtech1_state, mc6847_videoram_r))
MCFG_MC6847_BW(true)
@@ -467,7 +467,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(vtech1_state::laser200, laser110)
MCFG_DEVICE_REMOVE("mc6847")
- MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL_4_433619MHz)
+ MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) MCFG_DEVCB_INVERT
MCFG_MC6847_INPUT_CALLBACK(READ8(vtech1_state, mc6847_videoram_r))
MCFG_MC6847_FIXED_MODE(mc6847_pal_device::MODE_GM1)
@@ -491,7 +491,7 @@ MACHINE_CONFIG_DERIVED(vtech1_state::laser310h, laser310)
MCFG_CPU_IO_MAP(vtech1_shrg_io)
MCFG_DEVICE_REMOVE("mc6847")
- MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL_4_433619MHz)
+ MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) MCFG_DEVCB_INVERT
MCFG_MC6847_INPUT_CALLBACK(READ8(vtech1_state, mc6847_videoram_r))
MCFG_MC6847_FIXED_MODE(mc6847_pal_device::MODE_GM1)
diff --git a/src/mame/drivers/vulgus.cpp b/src/mame/drivers/vulgus.cpp
index a8ec4d9ce68..89c2b162970 100644
--- a/src/mame/drivers/vulgus.cpp
+++ b/src/mame/drivers/vulgus.cpp
@@ -217,11 +217,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(vulgus_state::vulgus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vulgus_state, vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/4) /* 3 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(vulgus_state, irq0_line_hold, 8*60)
@@ -245,10 +245,10 @@ MACHINE_CONFIG_START(vulgus_state::vulgus)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8) /* 1.5 MHz */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* 1.5 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8) /* 1.5 MHz */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* 1.5 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp
index 9e41c4f9c3b..01f8e715eec 100644
--- a/src/mame/drivers/wacky_gator.cpp
+++ b/src/mame/drivers/wacky_gator.cpp
@@ -274,7 +274,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(wackygtr_state::wackygtr)
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_3_579545MHz) // HD68B09P
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(3'579'545)) // HD68B09P
MCFG_CPU_PROGRAM_MAP(program_map)
MCFG_CPU_PERIODIC_INT_DRIVER(wackygtr_state, irq0_line_assert, 50) // FIXME
@@ -285,12 +285,12 @@ MACHINE_CONFIG_START(wackygtr_state::wackygtr)
/* Sound */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz )
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000) )
MCFG_MSM5205_VCLK_CB(WRITELINE(wackygtr_state, adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz )
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545) )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("i8255_0", I8255, 0)
@@ -309,19 +309,19 @@ MACHINE_CONFIG_START(wackygtr_state::wackygtr)
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
MCFG_DEVICE_ADD("pit8253_0", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_3_579545MHz/16) // this is a guess
+ MCFG_PIT8253_CLK0(XTAL(3'579'545)/16) // this is a guess
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(wackygtr_state, alligator0_ck))
- MCFG_PIT8253_CLK1(XTAL_3_579545MHz/16) // this is a guess
+ MCFG_PIT8253_CLK1(XTAL(3'579'545)/16) // this is a guess
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(wackygtr_state, alligator1_ck))
- MCFG_PIT8253_CLK2(XTAL_3_579545MHz/16) // this is a guess
+ MCFG_PIT8253_CLK2(XTAL(3'579'545)/16) // this is a guess
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(wackygtr_state, alligator2_ck))
MCFG_DEVICE_ADD("pit8253_1", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_3_579545MHz/16) // this is a guess
+ MCFG_PIT8253_CLK0(XTAL(3'579'545)/16) // this is a guess
MCFG_PIT8253_OUT0_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
- MCFG_PIT8253_CLK1(XTAL_3_579545MHz/16) // this is a guess
+ MCFG_PIT8253_CLK1(XTAL(3'579'545)/16) // this is a guess
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(wackygtr_state, alligator3_ck))
- MCFG_PIT8253_CLK2(XTAL_3_579545MHz/16) // this is a guess
+ MCFG_PIT8253_CLK2(XTAL(3'579'545)/16) // this is a guess
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(wackygtr_state, alligator4_ck))
MCFG_TICKET_DISPENSER_ADD("ticket", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp
index 8dad17f417e..d2df7e8d6a4 100644
--- a/src/mame/drivers/wardner.cpp
+++ b/src/mame/drivers/wardner.cpp
@@ -364,7 +364,7 @@ void wardner_state::machine_reset()
MACHINE_CONFIG_START(wardner_state::wardner)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* 6MHz */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* 6MHz */
MCFG_CPU_PROGRAM_MAP(main_program_map)
MCFG_CPU_IO_MAP(main_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", wardner_state, wardner_interrupt)
@@ -376,11 +376,11 @@ MACHINE_CONFIG_START(wardner_state::wardner)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(18)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x8000)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14MHz/4) /* 3.5MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'000'000)/4) /* 3.5MHz */
MCFG_CPU_PROGRAM_MAP(sound_program_map)
MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_CPU_ADD("dsp", TMS32010, XTAL_14MHz) /* 14MHz Crystal CLKin */
+ MCFG_CPU_ADD("dsp", TMS32010, XTAL(14'000'000)) /* 14MHz Crystal CLKin */
MCFG_CPU_PROGRAM_MAP(DSP_program_map)
/* Data Map is internal to the CPU */
MCFG_CPU_IO_MAP(DSP_io_map)
@@ -403,7 +403,7 @@ MACHINE_CONFIG_START(wardner_state::wardner)
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(wardner_state, coin_lockout_2_w))
/* video hardware */
- MCFG_MC6845_ADD("crtc", HD6845, "screen", XTAL_14MHz/4) /* 3.5MHz measured on CLKin */
+ MCFG_MC6845_ADD("crtc", HD6845, "screen", XTAL(14'000'000)/4) /* 3.5MHz measured on CLKin */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(2)
@@ -413,7 +413,7 @@ MACHINE_CONFIG_START(wardner_state::wardner)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_RAW_PARAMS(XTAL_14MHz/2, 446, 0, 320, 286, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(14'000'000)/2, 446, 0, 320, 286, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(wardner_state, screen_update_toaplan0)
MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram8", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
@@ -427,7 +427,7 @@ MACHINE_CONFIG_START(wardner_state::wardner)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_14MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'000'000)/4)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/warpsped.cpp b/src/mame/drivers/warpsped.cpp
index e0ba6794f4b..5fa2dae2de7 100644
--- a/src/mame/drivers/warpsped.cpp
+++ b/src/mame/drivers/warpsped.cpp
@@ -319,7 +319,7 @@ PALETTE_INIT_MEMBER(warpspeed_state, warpspeed)
MACHINE_CONFIG_START(warpspeed_state::warpspeed)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000)/2)
MCFG_CPU_PROGRAM_MAP(warpspeed_map)
MCFG_CPU_IO_MAP(warpspeed_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", warpspeed_state, irq0_line_hold)
diff --git a/src/mame/drivers/warpwarp.cpp b/src/mame/drivers/warpwarp.cpp
index c151982dd15..4971ebfc08a 100644
--- a/src/mame/drivers/warpwarp.cpp
+++ b/src/mame/drivers/warpwarp.cpp
@@ -137,7 +137,7 @@ Notes:
#include "geebee.lh"
#include "navarone.lh"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
void warpwarp_state::machine_start()
{
diff --git a/src/mame/drivers/wc90.cpp b/src/mame/drivers/wc90.cpp
index 621029e50d9..3797a5e98fb 100644
--- a/src/mame/drivers/wc90.cpp
+++ b/src/mame/drivers/wc90.cpp
@@ -346,15 +346,15 @@ void wc90_state::machine_start()
MACHINE_CONFIG_START(wc90_state::wc90)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(wc90_map_1)
MCFG_CPU_VBLANK_INT_DRIVER("screen", wc90_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL_8MHz) /* verified on pcb */
+ MCFG_CPU_ADD("sub", Z80, XTAL(8'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(wc90_map_2)
MCFG_CPU_VBLANK_INT_DRIVER("screen", wc90_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
/* NMIs are triggered by the main CPU */
@@ -382,7 +382,7 @@ MACHINE_CONFIG_START(wc90_state::wc90)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM2608, XTAL_8MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2608, XTAL(8'000'000)) /* verified on pcb */
MCFG_YM2608_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/wc90b.cpp b/src/mame/drivers/wc90b.cpp
index f91b4d079d1..0771d0220e1 100644
--- a/src/mame/drivers/wc90b.cpp
+++ b/src/mame/drivers/wc90b.cpp
@@ -95,10 +95,10 @@ Noted added by ClawGrip 28-Mar-2008:
#define TEST_DIPS false /* enable to test unmapped dip switches */
-#define MASTER_CLOCK XTAL_14_31818MHz/2
-#define SOUND_CLOCK XTAL_20MHz/4
-#define YM2203_CLOCK XTAL_20MHz/16
-#define MSM5205_CLOCK XTAL_384kHz
+#define MASTER_CLOCK XTAL(14'318'181)/2
+#define SOUND_CLOCK XTAL(20'000'000)/4
+#define YM2203_CLOCK XTAL(20'000'000)/16
+#define MSM5205_CLOCK XTAL(384'000)
WRITE8_MEMBER(wc90b_state::bankswitch_w)
diff --git a/src/mame/drivers/welltris.cpp b/src/mame/drivers/welltris.cpp
index 632e1e0db12..be90e9be39b 100644
--- a/src/mame/drivers/welltris.cpp
+++ b/src/mame/drivers/welltris.cpp
@@ -691,7 +691,7 @@ MACHINE_CONFIG_START(welltris_state::welltris)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0)
MCFG_VSYSTEM_SPR2_SET_GFXREGION(1)
diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp
index 2cb12a50a54..0c64f432835 100644
--- a/src/mame/drivers/wicat.cpp
+++ b/src/mame/drivers/wicat.cpp
@@ -766,10 +766,10 @@ I8275_DRAW_CHARACTER_MEMBER(wicat_state::wicat_display_pixels)
MACHINE_CONFIG_START(wicat_state::wicat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(wicat_mem)
- MCFG_DEVICE_ADD("via", VIA6522, XTAL_8MHz)
+ MCFG_DEVICE_ADD("via", VIA6522, XTAL(8'000'000))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(wicat_state, via_a_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(wicat_state, via_b_w))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_1))
@@ -779,41 +779,41 @@ MACHINE_CONFIG_START(wicat_state::wicat)
MCFG_MM58274C_DAY1(1) // monday
// internal terminal
- MCFG_DEVICE_ADD("uart0", MC2661, XTAL_5_0688MHz) // connected to terminal board
+ MCFG_DEVICE_ADD("uart0", MC2661, XTAL(5'068'800)) // connected to terminal board
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("videouart0", mc2661_device, rx_w))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("videouart0", mc2661_device, cts_w))
MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("videouart0", mc2661_device, dsr_w))
// RS232C ports (x5)
- MCFG_DEVICE_ADD("uart1", MC2661, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD("uart1", MC2661, XTAL(5'068'800))
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial1", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial1", rs232_port_device, write_rts))
MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial1", rs232_port_device, write_dtr))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_DEVICE_ADD("uart2", MC2661, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD("uart2", MC2661, XTAL(5'068'800))
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial2", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial2", rs232_port_device, write_rts))
MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial2", rs232_port_device, write_dtr))
- MCFG_DEVICE_ADD("uart3", MC2661, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD("uart3", MC2661, XTAL(5'068'800))
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial3", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial3", rs232_port_device, write_rts))
MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial3", rs232_port_device, write_dtr))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_DEVICE_ADD("uart4", MC2661, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD("uart4", MC2661, XTAL(5'068'800))
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial4", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial4", rs232_port_device, write_rts))
MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial4", rs232_port_device, write_dtr))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_DEVICE_ADD("uart5", MC2661, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD("uart5", MC2661, XTAL(5'068'800))
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial5", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial5", rs232_port_device, write_rts))
@@ -821,7 +821,7 @@ MACHINE_CONFIG_START(wicat_state::wicat)
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
// modem
- MCFG_DEVICE_ADD("uart6", MC2661, XTAL_5_0688MHz) // connected to modem port
+ MCFG_DEVICE_ADD("uart6", MC2661, XTAL(5'068'800)) // connected to modem port
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
@@ -856,11 +856,11 @@ MACHINE_CONFIG_START(wicat_state::wicat)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart5",mc2661_device,cts_w))
/* video hardware */
- MCFG_CPU_ADD("videocpu",Z8002,XTAL_8MHz/2) // AMD AMZ8002DC
+ MCFG_CPU_ADD("videocpu",Z8002,XTAL(8'000'000)/2) // AMD AMZ8002DC
MCFG_CPU_PROGRAM_MAP(wicat_video_mem)
MCFG_CPU_IO_MAP(wicat_video_io)
- MCFG_DEVICE_ADD("videodma", AM9517A, XTAL_8MHz) // clock is a bit of guess
+ MCFG_DEVICE_ADD("videodma", AM9517A, XTAL(8'000'000)) // clock is a bit of guess
MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(wicat_state, dma_hrq_w))
MCFG_AM9517A_OUT_EOP_CB(WRITELINE(wicat_state, dma_nmi_cb))
MCFG_AM9517A_IN_MEMR_CB(READ8(wicat_state, vram_r))
@@ -870,13 +870,13 @@ MACHINE_CONFIG_START(wicat_state::wicat)
MCFG_IM6402_DR_CALLBACK(WRITELINE(wicat_state, kb_data_ready))
// terminal (2x INS2651, 1x IM6042 - one of these is for the keyboard, another communicates with the main board, the third is unknown)
- MCFG_DEVICE_ADD("videouart0", MC2661, XTAL_5_0688MHz) // the INS2651 looks similar enough to the MC2661...
+ MCFG_DEVICE_ADD("videouart0", MC2661, XTAL(5'068'800)) // the INS2651 looks similar enough to the MC2661...
MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("uart0", mc2661_device, rx_w))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("videocpu", INPUT_LINE_IRQ0))
MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("uart0", mc2661_device, cts_w))
MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("uart0", mc2661_device, dsr_w))
- MCFG_DEVICE_ADD("videouart1", MC2661, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD("videouart1", MC2661, XTAL(5'068'800))
MCFG_MC2661_RXC(19200)
MCFG_MC2661_TXC(19200)
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("videocpu", INPUT_LINE_IRQ0))
@@ -891,7 +891,7 @@ MACHINE_CONFIG_START(wicat_state::wicat)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD("video", I8275, XTAL_19_6608MHz/8)
+ MCFG_DEVICE_ADD("video", I8275, XTAL(19'660'800)/8)
MCFG_I8275_CHARACTER_WIDTH(9)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(wicat_state, wicat_display_pixels)
MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("videodma",am9517a_device, dreq0_w))
@@ -901,10 +901,10 @@ MACHINE_CONFIG_START(wicat_state::wicat)
MCFG_DEFAULT_LAYOUT(layout_wicat)
/* Winchester Disk Controller (WD1000 + FD1795) */
- MCFG_CPU_ADD("wd1kcpu",N8X300,XTAL_8MHz)
+ MCFG_CPU_ADD("wd1kcpu",N8X300,XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(wicat_wd1000_mem)
MCFG_CPU_IO_MAP(wicat_wd1000_io)
- MCFG_FD1795_ADD("fdc",XTAL_8MHz)
+ MCFG_FD1795_ADD("fdc",XTAL(8'000'000))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", wicat_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", wicat_floppies, nullptr, floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/wico.cpp b/src/mame/drivers/wico.cpp
index cf5648e6fa1..f268f7f730c 100644
--- a/src/mame/drivers/wico.cpp
+++ b/src/mame/drivers/wico.cpp
@@ -431,9 +431,9 @@ void wico_state::machine_reset()
MACHINE_CONFIG_START(wico_state::wico)
/* basic machine hardware */
- MCFG_CPU_ADD("ccpu", MC6809E, XTAL_10MHz / 8) // MC68A09EP @ U51
+ MCFG_CPU_ADD("ccpu", MC6809E, XTAL(10'000'000) / 8) // MC68A09EP @ U51
MCFG_CPU_PROGRAM_MAP(ccpu_map)
- MCFG_CPU_ADD("hcpu", MC6809E, XTAL_10MHz / 8) // MC68A09EP @ U24
+ MCFG_CPU_ADD("hcpu", MC6809E, XTAL(10'000'000) / 8) // MC68A09EP @ U24
MCFG_CPU_PROGRAM_MAP(hcpu_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", wico_state, irq_housekeeping, attotime::from_hz(120)) // zero crossing
MCFG_TIMER_DRIVER_ADD_PERIODIC("firq", wico_state, firq_housekeeping, attotime::from_hz(750)) // time generator
@@ -445,7 +445,7 @@ MACHINE_CONFIG_START(wico_state::wico)
/* Sound */
MCFG_FRAGMENT_ADD( genpin_audio )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76494", SN76494, XTAL_10MHz / 64)
+ MCFG_SOUND_ADD("sn76494", SN76494, XTAL(10'000'000) / 64)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wildpkr.cpp b/src/mame/drivers/wildpkr.cpp
index acc42fe7c33..19dd672c27f 100644
--- a/src/mame/drivers/wildpkr.cpp
+++ b/src/mame/drivers/wildpkr.cpp
@@ -171,11 +171,11 @@
#include "speaker.h"
-#define MAIN_CLOCK XTAL_12MHz
+#define MAIN_CLOCK XTAL(12'000'000)
#define AY_CLOCK MAIN_CLOCK / 8
-#define SEC_CLOCK XTAL_3_6864MHz
-#define AUX1_CLOCK XTAL_26MHz
-#define AUX2_CLOCK XTAL_24MHz
+#define SEC_CLOCK XTAL(3'686'400)
+#define AUX1_CLOCK XTAL(26'000'000)
+#define AUX2_CLOCK XTAL(24'000'000)
class wildpkr_state : public driver_device
@@ -485,7 +485,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(wildpkr_state::tabpkr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(tabpkr_map)
MCFG_CPU_PERIODIC_INT_DRIVER(wildpkr_state, irq3_line_assert, 60*256)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(wildpkr_state, tabpkr_irq_ack)
diff --git a/src/mame/drivers/williams.cpp b/src/mame/drivers/williams.cpp
index cb89505a767..d4c887c765a 100644
--- a/src/mame/drivers/williams.cpp
+++ b/src/mame/drivers/williams.cpp
@@ -510,8 +510,8 @@ Reference video: https://www.youtube.com/watch?v=R5OeC6Wc_yI
#include "speaker.h"
-#define MASTER_CLOCK (XTAL_12MHz)
-#define SOUND_CLOCK (XTAL_3_579545MHz)
+#define MASTER_CLOCK (XTAL(12'000'000))
+#define SOUND_CLOCK (XTAL(3'579'545))
diff --git a/src/mame/drivers/witch.cpp b/src/mame/drivers/witch.cpp
index e7666dbabaa..b6a9851f5c4 100644
--- a/src/mame/drivers/witch.cpp
+++ b/src/mame/drivers/witch.cpp
@@ -232,7 +232,7 @@ TODO :
#include "speaker.h"
-#define MAIN_CLOCK XTAL_12MHz
+#define MAIN_CLOCK XTAL(12'000'000)
#define CPU_CLOCK MAIN_CLOCK / 4
#define YM2203_CLOCK MAIN_CLOCK / 4
#define ES8712_CLOCK 8000 // 8Khz, it's the only clock for sure (pin13) it come from pin14 of M5205.
diff --git a/src/mame/drivers/wmg.cpp b/src/mame/drivers/wmg.cpp
index f829eb21188..45b1a459f32 100644
--- a/src/mame/drivers/wmg.cpp
+++ b/src/mame/drivers/wmg.cpp
@@ -78,8 +78,8 @@ of save-state is also needed.
#include "speaker.h"
-#define MASTER_CLOCK (XTAL_12MHz)
-#define SOUND_CLOCK (XTAL_3_579545MHz)
+#define MASTER_CLOCK (XTAL(12'000'000))
+#define SOUND_CLOCK (XTAL(3'579'545))
class wmg_state : public williams_state
{
diff --git a/src/mame/drivers/wms.cpp b/src/mame/drivers/wms.cpp
index 8dfdd38c463..b625e094e44 100644
--- a/src/mame/drivers/wms.cpp
+++ b/src/mame/drivers/wms.cpp
@@ -82,10 +82,10 @@
#include "screen.h"
-#define MAIN_CLOCK XTAL_40MHz // Pletronics 40.000 MHz. Crystal. Used for CPU clock.
-#define VIDEO_CLOCK XTAL_14_31818MHz // Pletronics MP49 14.31818 MHz. Crystal. Used in common VGA ISA cards.
+#define MAIN_CLOCK XTAL(40'000'000) // Pletronics 40.000 MHz. Crystal. Used for CPU clock.
+#define VIDEO_CLOCK XTAL(14'318'181) // Pletronics MP49 14.31818 MHz. Crystal. Used in common VGA ISA cards.
-#define UART_CLOCK XTAL_1_8432MHz // Seems UART clock, since allows integer division to common baud rates.
+#define UART_CLOCK XTAL(1'843'200) // Seems UART clock, since allows integer division to common baud rates.
// (16 * 115200 baud, 192 * 9600 baud, 1536 * 1200 baud, etc...)
diff --git a/src/mame/drivers/wpc_95.cpp b/src/mame/drivers/wpc_95.cpp
index 7e78b1eb79c..5c1e3b4d98e 100644
--- a/src/mame/drivers/wpc_95.cpp
+++ b/src/mame/drivers/wpc_95.cpp
@@ -2247,9 +2247,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(wpc_95_state::wpc_95)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_8MHz/4) // 68B09E
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(8'000'000)/4) // 68B09E
MCFG_CPU_PROGRAM_MAP(wpc_95_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(wpc_95_state, irq0_line_assert, XTAL_8MHz/8192.0)
+ MCFG_CPU_PERIODIC_INT_DRIVER(wpc_95_state, irq0_line_assert, XTAL(8'000'000)/8192.0)
MCFG_TIMER_DRIVER_ADD_PERIODIC("zero_crossing", wpc_95_state, zc_timer, attotime::from_hz(120)) // Mains power zero crossing
MCFG_WPC_PIC_ADD("pic")
diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp
index cbdc91b9795..9f517cca4e2 100644
--- a/src/mame/drivers/wpc_an.cpp
+++ b/src/mame/drivers/wpc_an.cpp
@@ -320,7 +320,7 @@ DRIVER_INIT_MEMBER(wpc_an_state,wpc_an)
MACHINE_CONFIG_START(wpc_an_state::wpc_an_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_8MHz / 4) // 68B09E
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(8'000'000) / 4) // 68B09E
MCFG_CPU_PROGRAM_MAP(wpc_an_map)
MCFG_WMS_WPC_ADD("wpc")
diff --git a/src/mame/drivers/wpc_dcs.cpp b/src/mame/drivers/wpc_dcs.cpp
index 48ce3ecfb11..fd00b0e3d38 100644
--- a/src/mame/drivers/wpc_dcs.cpp
+++ b/src/mame/drivers/wpc_dcs.cpp
@@ -423,10 +423,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(wpc_dcs_state::wpc_dcs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, XTAL_8MHz/4)
+ MCFG_CPU_ADD("maincpu", M6809, XTAL(8'000'000)/4)
MCFG_CPU_PROGRAM_MAP(wpc_dcs_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(wpc_dcs_state, irq0_line_assert, XTAL_8MHz/8192.0)
+ MCFG_CPU_PERIODIC_INT_DRIVER(wpc_dcs_state, irq0_line_assert, XTAL(8'000'000)/8192.0)
MCFG_TIMER_DRIVER_ADD_PERIODIC("zero_crossing", wpc_dcs_state, zc_timer, attotime::from_hz(120)) // Mains power zero crossing
MCFG_WPC_LAMP_ADD("lamp")
diff --git a/src/mame/drivers/wpc_s.cpp b/src/mame/drivers/wpc_s.cpp
index 5269e43c18d..f66b4199022 100644
--- a/src/mame/drivers/wpc_s.cpp
+++ b/src/mame/drivers/wpc_s.cpp
@@ -1970,9 +1970,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(wpc_s_state::wpc_s)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_8MHz/4)
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(8'000'000)/4)
MCFG_CPU_PROGRAM_MAP(wpc_s_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(wpc_s_state, irq0_line_assert, XTAL_8MHz/8192.0)
+ MCFG_CPU_PERIODIC_INT_DRIVER(wpc_s_state, irq0_line_assert, XTAL(8'000'000)/8192.0)
MCFG_TIMER_DRIVER_ADD_PERIODIC("zero_crossing", wpc_s_state, zc_timer, attotime::from_hz(120)) // Mains power zero crossing
MCFG_WPC_SHIFT_ADD("shift")
diff --git a/src/mame/drivers/wrally.cpp b/src/mame/drivers/wrally.cpp
index da67c15b0d7..f84847c1374 100644
--- a/src/mame/drivers/wrally.cpp
+++ b/src/mame/drivers/wrally.cpp
@@ -261,11 +261,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(wrally_state::wrally)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000,XTAL(24'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(wrally_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", wrally_state, irq6_line_hold)
- MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) /* verified on pcb */
+ MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(24'000'000) / 2) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
/* video hardware */
@@ -294,7 +294,7 @@ MACHINE_CONFIG_START(wrally_state::wrally)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp
index 0c2ee17a582..8f81a285bd6 100644
--- a/src/mame/drivers/wswan.cpp
+++ b/src/mame/drivers/wswan.cpp
@@ -110,7 +110,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(wswan_state::wswan)
/* Basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30MZ, XTAL_3_072MHz)
+ MCFG_CPU_ADD("maincpu", V30MZ, XTAL(3'072'000))
MCFG_CPU_PROGRAM_MAP(wswan_mem)
MCFG_CPU_IO_MAP(wswan_io)
@@ -125,7 +125,7 @@ MACHINE_CONFIG_START(wswan_state::wswan)
MCFG_SCREEN_UPDATE_DEVICE("vdp", wswan_video_device, screen_update)
// MCFG_SCREEN_SIZE(WSWAN_X_PIXELS, WSWAN_Y_PIXELS)
// MCFG_SCREEN_VISIBLE_AREA(0*8, WSWAN_X_PIXELS - 1, 0, WSWAN_Y_PIXELS - 1)
- MCFG_SCREEN_RAW_PARAMS(XTAL_3_072MHz,256,0,WSWAN_X_PIXELS,159,0,WSWAN_Y_PIXELS)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(3'072'000),256,0,WSWAN_X_PIXELS,159,0,WSWAN_Y_PIXELS)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEFAULT_LAYOUT(layout_wswan)
diff --git a/src/mame/drivers/wwfsstar.cpp b/src/mame/drivers/wwfsstar.cpp
index 10ab02f782e..3a4adbb8379 100644
--- a/src/mame/drivers/wwfsstar.cpp
+++ b/src/mame/drivers/wwfsstar.cpp
@@ -163,7 +163,7 @@ Notes:
#include "speaker.h"
-#define MASTER_CLOCK XTAL_20MHz
+#define MASTER_CLOCK XTAL(20'000'000)
#define CPU_CLOCK MASTER_CLOCK / 2
#define PIXEL_CLOCK MASTER_CLOCK / 4
@@ -418,7 +418,7 @@ MACHINE_CONFIG_START(wwfsstar_state::wwfsstar)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", wwfsstar_state, scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
@@ -437,12 +437,12 @@ MACHINE_CONFIG_START(wwfsstar_state::wwfsstar)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp
index 6c8ac77bd29..6cdf80c98b6 100644
--- a/src/mame/drivers/x07.cpp
+++ b/src/mame/drivers/x07.cpp
@@ -1480,7 +1480,7 @@ void x07_state::machine_reset()
MACHINE_CONFIG_START(x07_state::x07)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NSC800, XTAL_15_36MHz / 4)
+ MCFG_CPU_ADD("maincpu", NSC800, XTAL(15'360'000) / 4)
MCFG_CPU_PROGRAM_MAP(x07_mem)
MCFG_CPU_IO_MAP(x07_io)
diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp
index 914ced01170..b151dfb9fdf 100644
--- a/src/mame/drivers/x1.cpp
+++ b/src/mame/drivers/x1.cpp
@@ -216,9 +216,9 @@
#include "formats/2d_dsk.h"
-#define MAIN_CLOCK XTAL_16MHz
-#define VDP_CLOCK XTAL_42_9545MHz
-#define MCU_CLOCK XTAL_6MHz
+#define MAIN_CLOCK XTAL(16'000'000)
+#define VDP_CLOCK XTAL(42'954'545)
+#define MCU_CLOCK XTAL(6'000'000)
diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp
index a385a405c89..3dbf58b3c9b 100644
--- a/src/mame/drivers/x1twin.cpp
+++ b/src/mame/drivers/x1twin.cpp
@@ -38,9 +38,9 @@ public:
};
-#define X1_MAIN_CLOCK XTAL_16MHz
-#define VDP_CLOCK XTAL_42_9545MHz
-#define MCU_CLOCK XTAL_6MHz
+#define X1_MAIN_CLOCK XTAL(16'000'000)
+#define VDP_CLOCK XTAL(42'954'545)
+#define MCU_CLOCK XTAL(6'000'000)
#define PCE_MAIN_CLOCK VDP_CLOCK / 2
uint32_t x1twin_state::screen_update_x1pce(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp
index 2fef9604e7c..3655a3b5fd0 100644
--- a/src/mame/drivers/x68k.cpp
+++ b/src/mame/drivers/x68k.cpp
@@ -1684,7 +1684,7 @@ MACHINE_CONFIG_START(x68k_state::x68000)
MCFG_DEVICE_ADD("scc", SCC8530, 5000000)
- MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL(32'768))
MCFG_RP5C15_OUT_ALARM_CB(DEVWRITELINE(MC68901_TAG, mc68901_device, i0_w))
/* video hardware */
diff --git a/src/mame/drivers/xain.cpp b/src/mame/drivers/xain.cpp
index b9a7086930f..05d3040fbed 100644
--- a/src/mame/drivers/xain.cpp
+++ b/src/mame/drivers/xain.cpp
@@ -147,7 +147,7 @@ Updates by Bryan McPhail, 12/12/2004:
#include "speaker.h"
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
#define CPU_CLOCK MASTER_CLOCK / 8
#define MCU_CLOCK MASTER_CLOCK / 4
#define PIXEL_CLOCK MASTER_CLOCK / 2
diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp
index ac69159b8d9..e6e7050ab8e 100644
--- a/src/mame/drivers/xavix.cpp
+++ b/src/mame/drivers/xavix.cpp
@@ -52,7 +52,7 @@
#include "speaker.h"
-#define MAIN_CLOCK XTAL_21_4772MHz
+#define MAIN_CLOCK XTAL(21'477'272)
class xavix_state : public driver_device
{
diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp
index 8eb95d802c0..5aa9d671571 100644
--- a/src/mame/drivers/xerox820.cpp
+++ b/src/mame/drivers/xerox820.cpp
@@ -285,7 +285,7 @@ WRITE8_MEMBER( xerox820_state::kbpio_pa_w )
{
m_8n5 = _8n5;
- m_fdc->set_unscaled_clock(m_8n5 ? XTAL_20MHz/10 : XTAL_20MHz/20);
+ m_fdc->set_unscaled_clock(m_8n5 ? XTAL(20'000'000)/10 : XTAL(20'000'000)/20);
}
m_400_460 = !floppy->twosid_r();
@@ -547,7 +547,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(xerox820_state::xerox820)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_20MHz/8)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(20'000'000)/8)
MCFG_CPU_PROGRAM_MAP(xerox820_mem)
MCFG_CPU_IO_MAP(xerox820_io)
MCFG_Z80_DAISY_CHAIN(xerox820_daisy_chain)
@@ -555,34 +555,34 @@ MACHINE_CONFIG_START(xerox820_state::xerox820)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_UPDATE_DRIVER(xerox820_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_10_69425MHz, 700, 0, 560, 260, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(10'694'250), 700, 0, 560, 260, 0, 240)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", xerox820)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* devices */
- MCFG_DEVICE_ADD(Z80PIO_KB_TAG, Z80PIO, XTAL_20MHz/8)
+ MCFG_DEVICE_ADD(Z80PIO_KB_TAG, Z80PIO, XTAL(20'000'000)/8)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(xerox820_state, kbpio_pa_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(xerox820_state, kbpio_pa_w))
MCFG_Z80PIO_IN_PB_CB(READ8(xerox820_state, kbpio_pb_r))
- MCFG_DEVICE_ADD(Z80PIO_GP_TAG, Z80PIO, XTAL_20MHz/8)
+ MCFG_DEVICE_ADD(Z80PIO_GP_TAG, Z80PIO, XTAL(20'000'000)/8)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_20MHz/8)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(20'000'000)/8)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg1))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
- //MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(XTAL_20MHz/8))
+ //MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(XTAL(20'000'000)/8))
- MCFG_FD1771_ADD(FD1771_TAG, XTAL_20MHz/20)
+ MCFG_FD1771_ADD(FD1771_TAG, XTAL(20'000'000)/20)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(xerox820_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(xerox820_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":0", xerox820_floppies, "sa400", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":1", xerox820_floppies, "sa400", floppy_image_device::default_floppy_formats)
- MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL_20MHz/8)
+ MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(20'000'000)/8)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
@@ -597,7 +597,7 @@ MACHINE_CONFIG_START(xerox820_state::xerox820)
MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio0_device, rxb_w))
- MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(WRITELINE(xerox820_state, fr_w))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
@@ -621,7 +621,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(xerox820ii_state::xerox820ii)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
MCFG_CPU_PROGRAM_MAP(xerox820ii_mem)
MCFG_CPU_IO_MAP(xerox820ii_io)
MCFG_Z80_DAISY_CHAIN(xerox820_daisy_chain)
@@ -629,7 +629,7 @@ MACHINE_CONFIG_START(xerox820ii_state::xerox820ii)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_UPDATE_DRIVER(xerox820ii_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_10_69425MHz, 700, 0, 560, 260, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(10'694'250), 700, 0, 560, 260, 0, 240)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", xerox820ii)
MCFG_PALETTE_ADD_MONOCHROME("palette")
@@ -640,16 +640,16 @@ MACHINE_CONFIG_START(xerox820ii_state::xerox820ii)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* devices */
- MCFG_DEVICE_ADD(Z80PIO_KB_TAG, Z80PIO, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80PIO_KB_TAG, Z80PIO, XTAL(16'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(xerox820_state, kbpio_pa_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(xerox820_state, kbpio_pa_w))
MCFG_Z80PIO_IN_PB_CB(READ8(xerox820_state, kbpio_pb_r))
- MCFG_DEVICE_ADD(Z80PIO_GP_TAG, Z80PIO, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80PIO_GP_TAG, Z80PIO, XTAL(16'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(Z80PIO_RD_TAG, Z80PIO, XTAL_20MHz/8)
+ MCFG_DEVICE_ADD(Z80PIO_RD_TAG, Z80PIO, XTAL(20'000'000)/8)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(DEVREAD8("sasi_data_in", input_buffer_device, read))
MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("sasi_data_out", output_latch_device, write))
@@ -657,19 +657,19 @@ MACHINE_CONFIG_START(xerox820ii_state::xerox820ii)
MCFG_Z80PIO_IN_PB_CB(DEVREAD8("sasi_ctrl_in", input_buffer_device, read))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(xerox820ii_state, rdpio_pb_w))
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg1))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
- //MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(XTAL_16MHz/4))
+ //MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(XTAL(16'000'000)/4))
- MCFG_FD1797_ADD(FD1797_TAG, XTAL_16MHz/8)
+ MCFG_FD1797_ADD(FD1797_TAG, XTAL(16'000'000)/8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(xerox820_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(xerox820_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", xerox820_floppies, "sa450", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", xerox820_floppies, "sa450", floppy_image_device::default_floppy_formats)
- MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(16'000'000)/4)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
@@ -684,7 +684,7 @@ MACHINE_CONFIG_START(xerox820ii_state::xerox820ii)
MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio0_device, rxb_w))
- MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(WRITELINE(xerox820_state, fr_w))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
diff --git a/src/mame/drivers/xexex.cpp b/src/mame/drivers/xexex.cpp
index 8fd03ee01f5..773f93202ec 100644
--- a/src/mame/drivers/xexex.cpp
+++ b/src/mame/drivers/xexex.cpp
@@ -468,11 +468,11 @@ void xexex_state::machine_reset()
MACHINE_CONFIG_START(xexex_state::xexex)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // 16MHz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) // 16MHz
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", xexex_state, xexex_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/4) // Z80E 8Mhz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/4) // Z80E 8Mhz
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(1920))
@@ -482,8 +482,8 @@ MACHINE_CONFIG_START(xexex_state::xexex)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
-// MCFG_SCREEN_REFRESH_RATE(XTAL_32MHz/4/512/288)
- MCFG_SCREEN_RAW_PARAMS(XTAL_32MHz/4, 384+33+40+55, 0, 383, 256+12+6+14, 0, 255) // 8Mhz horizontal dotclock
+// MCFG_SCREEN_REFRESH_RATE(XTAL(32'000'000)/4/512/288)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(32'000'000)/4, 384+33+40+55, 0, 383, 256+12+6+14, 0, 255) // 8Mhz horizontal dotclock
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 0, 0+256-1)
@@ -508,7 +508,7 @@ MACHINE_CONFIG_START(xexex_state::xexex)
MCFG_K053251_ADD("k053251")
- MCFG_DEVICE_ADD("k053252", K053252, XTAL_32MHz/4)
+ MCFG_DEVICE_ADD("k053252", K053252, XTAL(32'000'000)/4)
MCFG_DEVICE_ADD("k054338", K054338, 0)
@@ -517,13 +517,13 @@ MACHINE_CONFIG_START(xexex_state::xexex)
MCFG_K054321_ADD("k054321", ":lspeaker", ":rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_32MHz/8) // 4MHz
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'000'000)/8) // 4MHz
MCFG_SOUND_ROUTE(0, "filter1l", 0.50)
MCFG_SOUND_ROUTE(0, "filter1r", 0.50)
MCFG_SOUND_ROUTE(1, "filter2l", 0.50)
MCFG_SOUND_ROUTE(1, "filter2r", 0.50)
- MCFG_DEVICE_ADD("k054539", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
MCFG_K054539_APAN_CB(xexex_state, ym_set_mixing)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp
index ae42fe9270b..9ef75e9aa65 100644
--- a/src/mame/drivers/xmen.cpp
+++ b/src/mame/drivers/xmen.cpp
@@ -297,11 +297,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(xmen_state::xmen_scanline)
MACHINE_CONFIG_START(xmen_state::xmen)
/* 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(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", xmen_state, xmen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom")
@@ -337,11 +337,11 @@ MACHINE_CONFIG_START(xmen_state::xmen)
MCFG_K054321_ADD("k054321", ":lspeaker", ":rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_16MHz/4) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
- MCFG_DEVICE_ADD("k054539", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MACHINE_CONFIG_END
@@ -349,11 +349,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(xmen_state::xmen6p)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(6p_main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", xmen_state, xmen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/2)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/2)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom")
@@ -402,11 +402,11 @@ MACHINE_CONFIG_START(xmen_state::xmen6p)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_16MHz/4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
- MCFG_DEVICE_ADD("k054539", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/xor100.cpp b/src/mame/drivers/xor100.cpp
index 2e39e09afe0..4e071a25785 100644
--- a/src/mame/drivers/xor100.cpp
+++ b/src/mame/drivers/xor100.cpp
@@ -505,12 +505,12 @@ void xor100_state::post_load()
MACHINE_CONFIG_START(xor100_state::xor100)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(xor100_mem)
MCFG_CPU_IO_MAP(xor100_io)
/* devices */
- MCFG_DEVICE_ADD(I8251_A_TAG, I8251, 0/*XTAL_8MHz/2,*/)
+ MCFG_DEVICE_ADD(I8251_A_TAG, I8251, 0/*XTAL(8'000'000)/2,*/)
MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
@@ -519,7 +519,7 @@ MACHINE_CONFIG_START(xor100_state::xor100)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_A_TAG, i8251_device, write_rxd))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_A_TAG, i8251_device, write_dsr))
- MCFG_DEVICE_ADD(I8251_B_TAG, I8251, 0/*XTAL_8MHz/2,*/)
+ MCFG_DEVICE_ADD(I8251_B_TAG, I8251, 0/*XTAL(8'000'000)/2,*/)
MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
@@ -530,7 +530,7 @@ MACHINE_CONFIG_START(xor100_state::xor100)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE(I8251_B_TAG, i8251_device, write_cts))
MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal)
- MCFG_DEVICE_ADD(COM5016_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(COM5016_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(DEVWRITELINE(I8251_A_TAG, i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(I8251_A_TAG, i8251_device, write_rxc))
MCFG_COM8116_FT_HANDLER(DEVWRITELINE(I8251_B_TAG, i8251_device, write_txc))
@@ -541,13 +541,13 @@ MACHINE_CONFIG_START(xor100_state::xor100)
MCFG_I8255_OUT_PORTB_CB(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
MCFG_I8255_IN_PORTC_CB(READ8(xor100_state, i8255_pc_r))
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(xor100_state, ctc_z0_w))
MCFG_Z80CTC_ZC1_CB(WRITELINE(xor100_state, ctc_z1_w))
MCFG_Z80CTC_ZC2_CB(WRITELINE(xor100_state, ctc_z2_w))
- MCFG_FD1795_ADD(WD1795_TAG, XTAL_8MHz/4)
+ MCFG_FD1795_ADD(WD1795_TAG, XTAL(8'000'000)/4)
MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":0", xor100_floppies, "8ssdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":1", xor100_floppies, "8ssdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":2", xor100_floppies, nullptr, floppy_image_device::default_floppy_formats)
@@ -561,7 +561,7 @@ MACHINE_CONFIG_START(xor100_state::xor100)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
// S-100
- MCFG_DEVICE_ADD(S100_TAG, S100_BUS, XTAL_8MHz/4)
+ MCFG_DEVICE_ADD(S100_TAG, S100_BUS, XTAL(8'000'000)/4)
MCFG_S100_RDY_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT))
MCFG_S100_SLOT_ADD(S100_TAG ":1", xor100_s100_cards, nullptr)
MCFG_S100_SLOT_ADD(S100_TAG ":2", xor100_s100_cards, nullptr)
diff --git a/src/mame/drivers/yiear.cpp b/src/mame/drivers/yiear.cpp
index d1e3312642b..f4521d64af9 100644
--- a/src/mame/drivers/yiear.cpp
+++ b/src/mame/drivers/yiear.cpp
@@ -281,7 +281,7 @@ void yiear_state::machine_reset()
MACHINE_CONFIG_START(yiear_state::yiear)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", yiear_state, yiear_vblank_interrupt)
MCFG_CPU_PERIODIC_INT_DRIVER(yiear_state, yiear_nmi_interrupt, 480) /* music tempo (correct frequency unknown) */
@@ -306,10 +306,10 @@ MACHINE_CONFIG_START(yiear_state::yiear)
MCFG_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
- MCFG_SOUND_ADD("snsnd", SN76489A, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_SOUND_ADD("snsnd", SN76489A, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("vlm", VLM5030, XTAL(3'579'545)) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ymmu100.cpp b/src/mame/drivers/ymmu100.cpp
index 6f0c6f1fbb8..47e15218d7a 100644
--- a/src/mame/drivers/ymmu100.cpp
+++ b/src/mame/drivers/ymmu100.cpp
@@ -433,7 +433,7 @@ static ADDRESS_MAP_START( mu100_iomap, AS_IO, 16, mu100_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(mu100_state::mu100)
- MCFG_CPU_ADD( "maincpu", H8S2655, XTAL_16MHz )
+ MCFG_CPU_ADD( "maincpu", H8S2655, XTAL(16'000'000) )
MCFG_CPU_PROGRAM_MAP( mu100_map )
MCFG_CPU_IO_MAP( mu100_iomap )
diff --git a/src/mame/drivers/yunsun16.cpp b/src/mame/drivers/yunsun16.cpp
index d64d3721825..f509f37e070 100644
--- a/src/mame/drivers/yunsun16.cpp
+++ b/src/mame/drivers/yunsun16.cpp
@@ -589,18 +589,18 @@ MACHINE_RESET_MEMBER(yunsun16_state, shocking)
MACHINE_CONFIG_START(yunsun16_state::magicbub)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", yunsun16_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_port_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz/2, 512, 0x20, 0x180-0x20, 260, 0, 0xe0) /* TODO: completely inaccurate */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000)/2, 512, 0x20, 0x180-0x20, 260, 0, 0xe0) /* TODO: completely inaccurate */
MCFG_SCREEN_UPDATE_DRIVER(yunsun16_state, screen_update_yunsun16)
MCFG_SCREEN_PALETTE("palette")
@@ -614,12 +614,12 @@ MACHINE_CONFIG_START(yunsun16_state::magicbub)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_16MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(16'000'000)/4)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -632,7 +632,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(yunsun16_state::shocking)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", yunsun16_state, irq2_line_hold)
@@ -641,7 +641,7 @@ MACHINE_CONFIG_START(yunsun16_state::shocking)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz/2, 512, 0, 0x180-4, 260, 0, 0xe0) /* TODO: completely inaccurate */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000)/2, 512, 0, 0x180-4, 260, 0, 0xe0) /* TODO: completely inaccurate */
MCFG_SCREEN_UPDATE_DRIVER(yunsun16_state, screen_update_yunsun16)
MCFG_SCREEN_PALETTE("palette")
@@ -652,7 +652,7 @@ MACHINE_CONFIG_START(yunsun16_state::shocking)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
diff --git a/src/mame/drivers/yunsung8.cpp b/src/mame/drivers/yunsung8.cpp
index 4fb6d56d8f6..d0993fbf6b5 100644
--- a/src/mame/drivers/yunsung8.cpp
+++ b/src/mame/drivers/yunsung8.cpp
@@ -353,17 +353,17 @@ void yunsung8_state::machine_reset()
MACHINE_CONFIG_START(yunsung8_state::yunsung8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* Z80B @ 8MHz? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* Z80B @ 8MHz? */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(port_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", yunsung8_state, irq0_line_assert) /* No nmi routine */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* ? */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* ? */
MCFG_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz/2, 512, 64, 512-64, 262, 8, 256-8) /* TODO: completely inaccurate */
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000)/2, 512, 64, 512-64, 262, 8, 256-8) /* TODO: completely inaccurate */
MCFG_SCREEN_UPDATE_DRIVER(yunsung8_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -376,14 +376,14 @@ MACHINE_CONFIG_START(yunsung8_state::yunsung8)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_16MHz/4)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(400'000)) /* verified on pcb */
MCFG_MSM5205_VCLK_CB(WRITELINE(yunsung8_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
diff --git a/src/mame/drivers/yuvomz80.cpp b/src/mame/drivers/yuvomz80.cpp
index f0052279001..20cfacc39c4 100644
--- a/src/mame/drivers/yuvomz80.cpp
+++ b/src/mame/drivers/yuvomz80.cpp
@@ -86,11 +86,11 @@ static INPUT_PORTS_START( goldhexa )
INPUT_PORTS_END
MACHINE_CONFIG_START(yuvomz80_state::goldhexa)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(audio_mem_map)
MCFG_CPU_IO_MAP(audio_io_map)
@@ -100,16 +100,16 @@ MACHINE_CONFIG_START(yuvomz80_state::goldhexa)
MCFG_DEVICE_ADD("ppi3", I8255A, 0)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(yuvomz80_state::hexapres)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000))
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(audio_mem_map)
MCFG_CPU_IO_MAP(hexapres_audio_io_map)
diff --git a/src/mame/drivers/z100.cpp b/src/mame/drivers/z100.cpp
index 9f61636b54f..b90ce629873 100644
--- a/src/mame/drivers/z100.cpp
+++ b/src/mame/drivers/z100.cpp
@@ -668,7 +668,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(z100_state::z100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8088, XTAL_14_31818MHz/3)
+ MCFG_CPU_ADD("maincpu",I8088, XTAL(14'318'181)/3)
MCFG_CPU_PROGRAM_MAP(z100_mem)
MCFG_CPU_IO_MAP(z100_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
@@ -685,7 +685,7 @@ MACHINE_CONFIG_START(z100_state::z100)
MCFG_PALETTE_ADD("palette", 8)
/* devices */
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_14_31818MHz/8) /* unknown clock, hand tuned to get ~50/~60 fps */
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(14'318'181)/8) /* unknown clock, hand tuned to get ~50/~60 fps */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
@@ -706,7 +706,7 @@ MACHINE_CONFIG_START(z100_state::z100)
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_FD1797_ADD("z207_fdc", XTAL_1MHz)
+ MCFG_FD1797_ADD("z207_fdc", XTAL(1'000'000))
MCFG_FLOPPY_DRIVE_ADD("z207_fdc:0", z100_floppies, "dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("z207_fdc:1", z100_floppies, "dd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp
index 32eeb47da86..c8b212db28c 100644
--- a/src/mame/drivers/z1013.cpp
+++ b/src/mame/drivers/z1013.cpp
@@ -366,7 +366,7 @@ GFXDECODE_END
/* Machine driver */
MACHINE_CONFIG_START(z1013_state::z1013)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_1MHz )
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(1'000'000) )
MCFG_CPU_PROGRAM_MAP(z1013_mem)
MCFG_CPU_IO_MAP(z1013_io)
@@ -388,7 +388,7 @@ MACHINE_CONFIG_START(z1013_state::z1013)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_1MHz)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(1'000'000))
MCFG_Z80PIO_IN_PB_CB(READ8(z1013_state, port_b_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(z1013_state, port_b_w))
@@ -400,7 +400,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(z1013_state::z1013k76, z1013)
MCFG_DEVICE_REMOVE("z80pio")
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_1MHz)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(1'000'000))
MCFG_Z80PIO_IN_PB_CB(READ8(z1013_state, k7659_port_b_r))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/z80dev.cpp b/src/mame/drivers/z80dev.cpp
index ac68e67604f..905d593aab1 100644
--- a/src/mame/drivers/z80dev.cpp
+++ b/src/mame/drivers/z80dev.cpp
@@ -109,7 +109,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(z80dev_state::z80dev)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp
index 6f7310073c2..79d3b8bdfab 100644
--- a/src/mame/drivers/z80ne.cpp
+++ b/src/mame/drivers/z80ne.cpp
@@ -455,7 +455,7 @@ MACHINE_CONFIG_DERIVED(z80ne_state::z80net, z80ne)
/* video hardware */
MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847")
- MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL_4_433619MHz)
+ MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_INPUT_CALLBACK(READ8(z80ne_state, lx388_mc6847_videoram_r))
// AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND
// other lines not connected
@@ -496,7 +496,7 @@ MACHINE_CONFIG_START(z80ne_state::z80netb)
/* video hardware */
MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847")
- MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL_4_433619MHz)
+ MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_INPUT_CALLBACK(READ8(z80ne_state, lx388_mc6847_videoram_r))
// AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND
// other lines not connected
@@ -537,12 +537,12 @@ MACHINE_CONFIG_START(z80ne_state::z80netf)
/* video hardware */
MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847")
- MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL_4_433619MHz)
+ MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_INPUT_CALLBACK(READ8(z80ne_state, lx388_mc6847_videoram_r))
// AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND
// other lines not connected
- MCFG_FD1771_ADD("wd1771", XTAL_2MHz / 2)
+ MCFG_FD1771_ADD("wd1771", XTAL(2'000'000) / 2)
MCFG_FLOPPY_DRIVE_ADD("wd1771:0", z80ne_floppies, "sssd", z80ne_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1771:1", z80ne_floppies, "sssd", z80ne_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1771:2", z80ne_floppies, nullptr, z80ne_state::floppy_formats)
diff --git a/src/mame/drivers/z88.cpp b/src/mame/drivers/z88.cpp
index 0cad0467b8b..4267f05830a 100644
--- a/src/mame/drivers/z88.cpp
+++ b/src/mame/drivers/z88.cpp
@@ -623,7 +623,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(z88_state::z88)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_9_8304MHz/3) // divided by 3 through the uPD65031
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(9'830'400)/3) // divided by 3 through the uPD65031
MCFG_CPU_PROGRAM_MAP(z88_mem)
MCFG_CPU_IO_MAP(z88_io)
@@ -641,7 +641,7 @@ MACHINE_CONFIG_START(z88_state::z88)
MCFG_DEFAULT_LAYOUT(layout_lcd)
- MCFG_DEVICE_ADD("blink", UPD65031, XTAL_9_8304MHz)
+ MCFG_DEVICE_ADD("blink", UPD65031, XTAL(9'830'400))
MCFG_UPD65031_KB_CALLBACK(READ8(z88_state, kb_r))
MCFG_UPD65031_INT_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_UPD65031_NMI_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI))
diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp
index e9e57befae7..a98d2c32086 100644
--- a/src/mame/drivers/z9001.cpp
+++ b/src/mame/drivers/z9001.cpp
@@ -201,7 +201,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(z9001_state::z9001)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_9_8304MHz / 4)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(9'830'400) / 4)
MCFG_CPU_PROGRAM_MAP(z9001_mem)
MCFG_CPU_IO_MAP(z9001_io)
MCFG_Z80_DAISY_CHAIN(z9001_daisy_chain)
@@ -230,14 +230,14 @@ MACHINE_CONFIG_START(z9001_state::z9001)
MCFG_GENERIC_KEYBOARD_CB(PUT(z9001_state, kbd_put))
MCFG_TIMER_DRIVER_ADD_PERIODIC("z9001_timer", z9001_state, timer_callback, attotime::from_msec(10))
- MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL_9_8304MHz / 4)
+ MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL(9'830'400) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(z9001_state, port88_w))
- MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL_9_8304MHz / 4) // keyboard PIO
+ MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL(9'830'400) / 4) // keyboard PIO
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_9_8304MHz / 4)
+ MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(9'830'400) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(z9001_state, cass_w))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3))
diff --git a/src/mame/drivers/zac_proto.cpp b/src/mame/drivers/zac_proto.cpp
index bf971826804..1ddcde3cccd 100644
--- a/src/mame/drivers/zac_proto.cpp
+++ b/src/mame/drivers/zac_proto.cpp
@@ -236,7 +236,7 @@ void zac_proto_state::machine_reset()
MACHINE_CONFIG_START(zac_proto_state::zac_proto)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", INS8060, XTAL_4MHz / 2) // Using SC/MP II chip which has an internal /2 circuit.
+ MCFG_CPU_ADD("maincpu", INS8060, XTAL(4'000'000) / 2) // Using SC/MP II chip which has an internal /2 circuit.
MCFG_CPU_PROGRAM_MAP(zac_proto_map)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/zaccaria.cpp b/src/mame/drivers/zaccaria.cpp
index 46ea13015b9..9f2d4040257 100644
--- a/src/mame/drivers/zaccaria.cpp
+++ b/src/mame/drivers/zaccaria.cpp
@@ -333,7 +333,7 @@ INTERRUPT_GEN_MEMBER(zaccaria_state::vblank_irq)
MACHINE_CONFIG_START(zaccaria_state::zaccaria)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80,XTAL(18'432'000)/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", zaccaria_state, vblank_irq)
// MCFG_QUANTUM_TIME(attotime::from_hz(1000000))
diff --git a/src/mame/drivers/zapcomputer.cpp b/src/mame/drivers/zapcomputer.cpp
index 65b52946970..3e06e2f6d39 100644
--- a/src/mame/drivers/zapcomputer.cpp
+++ b/src/mame/drivers/zapcomputer.cpp
@@ -159,7 +159,7 @@ void zapcomp_state::machine_start()
MACHINE_CONFIG_START(zapcomp_state::zapcomp)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL_2MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(zapcomp_mem)
MCFG_CPU_IO_MAP(zapcomp_io)
diff --git a/src/mame/drivers/zaurus.cpp b/src/mame/drivers/zaurus.cpp
index 1a8df06ec52..aa00f4dfc49 100644
--- a/src/mame/drivers/zaurus.cpp
+++ b/src/mame/drivers/zaurus.cpp
@@ -1412,7 +1412,7 @@ Note:
#include "speaker.h"
-#define MAIN_CLOCK XTAL_8MHz
+#define MAIN_CLOCK XTAL(8'000'000)
class zaurus_state : public driver_device
{
@@ -1755,7 +1755,7 @@ MACHINE_CONFIG_START(zaurus_state::zaurus)
MCFG_CPU_ADD("maincpu",PXA255,MAIN_CLOCK)
MCFG_CPU_PROGRAM_MAP(zaurus_map)
- MCFG_TIMER_DRIVER_ADD_PERIODIC("rtc_timer", zaurus_state, rtc_irq_callback, attotime::from_hz(XTAL_32_768kHz))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("rtc_timer", zaurus_state, rtc_irq_callback, attotime::from_hz(XTAL(32'768)))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/zaxxon.cpp b/src/mame/drivers/zaxxon.cpp
index 7b12a293c75..64572f1e190 100644
--- a/src/mame/drivers/zaxxon.cpp
+++ b/src/mame/drivers/zaxxon.cpp
@@ -274,8 +274,8 @@
*
*************************************/
-#define MASTER_CLOCK XTAL_48_66MHz
-#define SOUND_CLOCK XTAL_4MHz
+#define MASTER_CLOCK XTAL(48'660'000)
+#define SOUND_CLOCK XTAL(4'000'000)
#define PIXEL_CLOCK (MASTER_CLOCK/8)
@@ -1046,7 +1046,7 @@ MACHINE_CONFIG_DERIVED(zaxxon_state::congo, root)
MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK)
MCFG_CPU_PROGRAM_MAP(congo_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(zaxxon_state, irq0_line_hold, (double)SOUND_CLOCK/16/16/16/4)
+ MCFG_CPU_PERIODIC_INT_DRIVER(zaxxon_state, irq0_line_hold, SOUND_CLOCK/16/16/16/4)
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
diff --git a/src/mame/drivers/zexall.cpp b/src/mame/drivers/zexall.cpp
index e9cf07d78e5..d26e6f90a59 100644
--- a/src/mame/drivers/zexall.cpp
+++ b/src/mame/drivers/zexall.cpp
@@ -157,7 +157,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(zexall_state::zexall)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(z80_mem)
/* video hardware */
diff --git a/src/mame/drivers/zms8085.cpp b/src/mame/drivers/zms8085.cpp
index b216b6a5302..c2e082eeb50 100644
--- a/src/mame/drivers/zms8085.cpp
+++ b/src/mame/drivers/zms8085.cpp
@@ -85,12 +85,12 @@ static INPUT_PORTS_START( zephyr )
INPUT_PORTS_END
MACHINE_CONFIG_START(zms8085_state::zephyr)
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_15_582MHz / 2) // divider not verified
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(15'582'000) / 2) // divider not verified
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_15_582MHz, 980, 0, 800, 265, 0, 250)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(15'582'000), 980, 0, 800, 265, 0, 250)
MCFG_SCREEN_UPDATE_DRIVER(zms8085_state, screen_update)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp
index b488b270f7e..b8fbc5c4ae3 100644
--- a/src/mame/drivers/zn.cpp
+++ b/src/mame/drivers/zn.cpp
@@ -344,7 +344,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(zn_state::zn1_1mb_vram)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz )
+ MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) )
MCFG_CPU_PROGRAM_MAP( zn_map)
MCFG_RAM_MODIFY("maincpu:ram")
@@ -368,14 +368,14 @@ MACHINE_CONFIG_START(zn_state::zn1_1mb_vram)
MCFG_ZNMCU_ANALOG2_HANDLER(IOPORT(":ANALOG2"))
/* video hardware */
- MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x100000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x100000, XTAL(53'693'175) )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SPU_ADD( "spu", XTAL_67_7376MHz/2 )
+ MCFG_SPU_ADD( "spu", XTAL(67'737'600)/2 )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
@@ -383,13 +383,13 @@ MACHINE_CONFIG_START(zn_state::zn1_1mb_vram)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(zn_state::zn1_2mb_vram, zn1_1mb_vram)
- MCFG_PSXGPU_REPLACE( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_REPLACE( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL(53'693'175) )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(zn_state::zn2)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8661R, XTAL_100MHz )
+ MCFG_CPU_ADD( "maincpu", CXD8661R, XTAL(100'000'000) )
MCFG_CPU_PROGRAM_MAP( zn_map)
MCFG_RAM_MODIFY("maincpu:ram")
@@ -413,14 +413,14 @@ MACHINE_CONFIG_START(zn_state::zn2)
MCFG_ZNMCU_ANALOG2_HANDLER(IOPORT(":ANALOG2"))
/* video hardware */
- MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8654Q, 0x200000, XTAL_53_693175MHz )
+ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8654Q, 0x200000, XTAL(53'693'175) )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SPU_ADD( "spu", XTAL_67_7376MHz/2 )
+ MCFG_SPU_ADD( "spu", XTAL(67'737'600)/2 )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
@@ -613,7 +613,7 @@ MACHINE_CONFIG_DERIVED(zn_state::coh1000c, zn1_1mb_vram)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(coh1000c_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(qsound_map)
MCFG_CPU_IO_MAP(qsound_portmap)
MCFG_CPU_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp)
@@ -633,7 +633,7 @@ MACHINE_CONFIG_DERIVED(zn_state::coh1002c, zn1_2mb_vram)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(coh1000c_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(qsound_map)
MCFG_CPU_IO_MAP(qsound_portmap)
MCFG_CPU_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp)
@@ -790,7 +790,7 @@ MACHINE_CONFIG_DERIVED(zn_state::coh3002c, zn2)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(coh1000c_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(qsound_map)
MCFG_CPU_IO_MAP(qsound_portmap)
MCFG_CPU_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp)
@@ -1072,11 +1072,11 @@ MACHINE_CONFIG_DERIVED(zn_state::coh1000ta, zn1_1mb_vram)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(coh1000ta_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz / 4) /* 4 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000) / 4) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(fx1a_sound_map)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta)
- MCFG_SOUND_ADD("ymsnd", YM2610B, XTAL_16MHz/2)
+ MCFG_SOUND_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -1592,12 +1592,12 @@ MACHINE_CONFIG_DERIVED(zn_state::coh1002e, zn1_2mb_vram)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(coh1002e_map)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("audiocpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(psarc_snd_map)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002e)
- MCFG_SOUND_ADD("ymf", YMF271, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymf", YMF271, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -2235,14 +2235,14 @@ MACHINE_CONFIG_DERIVED(zn_state::coh1001l, zn1_2mb_vram)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(coh1001l_map)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL_10MHz)
+ MCFG_CPU_ADD("audiocpu", M68000, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(atlus_snd_map)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1001l)
MCFG_GENERIC_LATCH_16_ADD("soundlatch16")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_YMZ280B_IRQ_HANDLER(INPUTLINE("audiocpu", 2))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
@@ -2519,7 +2519,7 @@ MACHINE_CONFIG_DERIVED(zn_state::coh1002msnd, coh1002m)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(coh1002msnd_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8)
MCFG_CPU_PROGRAM_MAP(cbaj_z80_map)
MCFG_CPU_IO_MAP(cbaj_z80_port_map)
@@ -2529,7 +2529,7 @@ MACHINE_CONFIG_DERIVED(zn_state::coh1002msnd, coh1002m)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
/* sound hardware */
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zodiack.cpp b/src/mame/drivers/zodiack.cpp
index f622bd80858..d5fa2267afb 100644
--- a/src/mame/drivers/zodiack.cpp
+++ b/src/mame/drivers/zodiack.cpp
@@ -98,7 +98,7 @@ Notes:
#include "speaker.h"
-#define PIXEL_CLOCK (XTAL_18_432MHz/3)
+#define PIXEL_CLOCK (XTAL(18'432'000)/3)
#define HTOTAL (396)
#define HBEND (0)
@@ -566,12 +566,12 @@ void zodiack_state::machine_reset()
MACHINE_CONFIG_START(zodiack_state::zodiack)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", zodiack_state, zodiack_main_nmi_gen)
MCFG_CPU_PERIODIC_INT_DRIVER(zodiack_state, irq0_line_hold, 1*60) // sound related - unknown source, timing is guessed
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(zodiack_state, zodiack_sound_nmi_gen, 8*60) // sound tempo - unknown source, timing is guessed
@@ -594,7 +594,7 @@ MACHINE_CONFIG_START(zodiack_state::zodiack)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(18'432'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp
index 6e37277f3dc..aff82fb8fbb 100644
--- a/src/mame/drivers/zorba.cpp
+++ b/src/mame/drivers/zorba.cpp
@@ -135,7 +135,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(zorba_state::zorba)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000) / 6)
MCFG_CPU_PROGRAM_MAP(zorba_mem)
MCFG_CPU_IO_MAP(zorba_io)
MCFG_MACHINE_RESET_OVERRIDE(zorba_state, zorba)
@@ -160,7 +160,7 @@ MACHINE_CONFIG_START(zorba_state::zorba)
MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(zorba_state, irq_w<2>))
/* devices */
- MCFG_DEVICE_ADD("dma", Z80DMA, XTAL_24MHz/6)
+ MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(24'000'000)/6)
// busack on cpu connects to bai pin
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(zorba_state, busreq_w)) //connects to busreq on cpu
MCFG_Z80DMA_OUT_INT_CB(DEVWRITELINE("irq0", input_merger_device, in_w<0>))
@@ -208,9 +208,9 @@ MACHINE_CONFIG_START(zorba_state::zorba)
// PIT
MCFG_DEVICE_ADD("pit", PIT8254, 0)
- MCFG_PIT8253_CLK0(XTAL_24MHz / 3)
- MCFG_PIT8253_CLK1(XTAL_24MHz / 3)
- MCFG_PIT8253_CLK2(XTAL_24MHz / 3)
+ MCFG_PIT8253_CLK0(XTAL(24'000'000) / 3)
+ MCFG_PIT8253_CLK1(XTAL(24'000'000) / 3)
+ MCFG_PIT8253_CLK2(XTAL(24'000'000) / 3)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(zorba_state, br1_w))
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart1", i8251_device, write_txc))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart1", i8251_device, write_rxc))
@@ -218,7 +218,7 @@ MACHINE_CONFIG_START(zorba_state::zorba)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart2", i8251_device, write_rxc))
// CRTC
- MCFG_DEVICE_ADD("crtc", I8275, XTAL_14_31818MHz/7)
+ MCFG_DEVICE_ADD("crtc", I8275, XTAL(14'318'181)/7)
MCFG_I8275_CHARACTER_WIDTH(8)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(zorba_state, zorba_update_chr)
MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w))
@@ -226,7 +226,7 @@ MACHINE_CONFIG_START(zorba_state::zorba)
MCFG_VIDEO_SET_SCREEN("screen")
// Floppies
- MCFG_FD1793_ADD("fdc", XTAL_24MHz / 24)
+ MCFG_FD1793_ADD("fdc", XTAL(24'000'000) / 24)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("irq2", input_merger_device, in_w<0>))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("irq2", input_merger_device, in_w<1>))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", zorba_floppies, "525dd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp
index 7595425bd1d..5685932f9d3 100644
--- a/src/mame/drivers/zr107.cpp
+++ b/src/mame/drivers/zr107.cpp
@@ -761,14 +761,14 @@ void zr107_state::machine_reset()
MACHINE_CONFIG_START(zr107_state::zr107)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */
+ MCFG_CPU_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
MCFG_CPU_PROGRAM_MAP(zr107_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", zr107_state, zr107_vblank)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL_64MHz/8) /* 8MHz */
+ MCFG_CPU_ADD("audiocpu", M68000, XTAL(64'000'000)/8) /* 8MHz */
MCFG_CPU_PROGRAM_MAP(sound_memmap)
- MCFG_CPU_ADD("dsp", ADSP21062, XTAL_36MHz)
+ MCFG_CPU_ADD("dsp", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
MCFG_CPU_DATA_MAP(sharc_map)
@@ -804,18 +804,18 @@ MACHINE_CONFIG_START(zr107_state::zr107)
MCFG_K001006_GFX_REGION("gfx1")
MCFG_K001006_TEX_LAYOUT(0)
- MCFG_K056800_ADD("k056800", XTAL_18_432MHz)
+ MCFG_K056800_ADD("k056800", XTAL(18'432'000))
MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_1))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_DEVICE_ADD("k054539_1", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_K054539_TIMER_HANDLER(WRITELINE(zr107_state, k054539_irq_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MCFG_DEVICE_ADD("k054539_2", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
@@ -832,14 +832,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zr107_state::jetwave)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */
+ MCFG_CPU_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
MCFG_CPU_PROGRAM_MAP(jetwave_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", zr107_state, zr107_vblank)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL_64MHz/8) /* 8MHz */
+ MCFG_CPU_ADD("audiocpu", M68000, XTAL(64'000'000)/8) /* 8MHz */
MCFG_CPU_PROGRAM_MAP(sound_memmap)
- MCFG_CPU_ADD("dsp", ADSP21062, XTAL_36MHz)
+ MCFG_CPU_ADD("dsp", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
MCFG_CPU_DATA_MAP(sharc_map)
@@ -883,18 +883,18 @@ MACHINE_CONFIG_START(zr107_state::jetwave)
MCFG_K001006_GFX_REGION("gfx1")
MCFG_K001006_TEX_LAYOUT(0)
- MCFG_K056800_ADD("k056800", XTAL_18_432MHz)
+ MCFG_K056800_ADD("k056800", XTAL(18'432'000))
MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_1))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_DEVICE_ADD("k054539_1", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_K054539_TIMER_HANDLER(WRITELINE(zr107_state, k054539_irq_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MCFG_DEVICE_ADD("k054539_2", K054539, XTAL_18_432MHz)
+ MCFG_DEVICE_ADD("k054539_2", K054539, XTAL(18'432'000))
MCFG_K054539_REGION_OVERRRIDE("shared")
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp
index d5126429a88..efa4cb7fcb2 100644
--- a/src/mame/drivers/zrt80.cpp
+++ b/src/mame/drivers/zrt80.cpp
@@ -270,7 +270,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(zrt80_state::zrt80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_2_4576MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(2'457'600))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
@@ -290,7 +290,7 @@ MACHINE_CONFIG_START(zrt80_state::zrt80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_20MHz / 8)
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(20'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8) /*?*/
MCFG_MC6845_UPDATE_ROW_CB(zrt80_state, crtc_update_row)
diff --git a/src/mame/drivers/zsbc3.cpp b/src/mame/drivers/zsbc3.cpp
index 8e9965c7a3e..f2fbe490ba2 100644
--- a/src/mame/drivers/zsbc3.cpp
+++ b/src/mame/drivers/zsbc3.cpp
@@ -79,21 +79,21 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(zsbc3_state::zsbc3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(zsbc3_mem)
MCFG_CPU_IO_MAP(zsbc3_io)
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, txca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxca_w))
- MCFG_DEVICE_ADD("clk2mhz", CLOCK, XTAL_16MHz / 8)
+ MCFG_DEVICE_ADD("clk2mhz", CLOCK, XTAL(16'000'000) / 8)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg3))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(16'000'000) / 4)
//MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // no evidence of a daisy chain because IM2 is not set
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
@@ -103,7 +103,7 @@ MACHINE_CONFIG_START(zsbc3_state::zsbc3)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(16'000'000) / 4)
//MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp
index c0e12353a67..bff09cc2a6e 100644
--- a/src/mame/drivers/zwackery.cpp
+++ b/src/mame/drivers/zwackery.cpp
@@ -492,7 +492,7 @@ void zwackery_state::machine_start()
MACHINE_CONFIG_START(zwackery_state::zwackery)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, 7652400) // based on counter usage, should be XTAL_16MHz/2
+ MCFG_CPU_ADD("maincpu", M68000, 7652400) // based on counter usage, should be XTAL(16'000'000)/2
MCFG_CPU_PROGRAM_MAP(zwackery_map)
MCFG_WATCHDOG_ADD("watchdog")
diff --git a/src/mame/drivers/zx.cpp b/src/mame/drivers/zx.cpp
index 0708b92a05c..17209f4b969 100644
--- a/src/mame/drivers/zx.cpp
+++ b/src/mame/drivers/zx.cpp
@@ -320,14 +320,14 @@ PALETTE_INIT_MEMBER(zx_state, zx)
MACHINE_CONFIG_START(zx_state::zx80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_6_5MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(6'500'000)/2)
MCFG_CPU_PROGRAM_MAP(zx80_map)
MCFG_CPU_IO_MAP(zx80_io_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(ula_map)
MCFG_Z80_SET_REFRESH_CALLBACK(WRITE16(zx_state, refresh_w))
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE(XTAL_6_5MHz/2/64159.0) // 54223 for NTSC
+ MCFG_SCREEN_REFRESH_RATE(XTAL(6'500'000)/2/64159.0) // 54223 for NTSC
/* video hardware */
MCFG_SCREEN_UPDATE_DRIVER(zx_state, screen_update)
diff --git a/src/mame/etc/korgm1.cpp b/src/mame/etc/korgm1.cpp
index 3b2ae6a1dd8..99edbf4b23d 100644
--- a/src/mame/etc/korgm1.cpp
+++ b/src/mame/etc/korgm1.cpp
@@ -17,7 +17,7 @@
#include "machine/cxd1095.h"
//#include "sound/ay8910.h"
-#define MAIN_CLOCK XTAL_16MHz // Unknown clock
+#define MAIN_CLOCK XTAL(16'000'000) // Unknown clock
class korgm1_state : public driver_device
{
diff --git a/src/mame/etc/template_driver.cpp b/src/mame/etc/template_driver.cpp
index 1e4d97672ff..cda424ccfed 100644
--- a/src/mame/etc/template_driver.cpp
+++ b/src/mame/etc/template_driver.cpp
@@ -13,7 +13,7 @@ Template for skeleton drivers
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_8MHz
+#define MAIN_CLOCK XTAL(8'000'000)
class xxx_state : public driver_device
{
@@ -158,7 +158,7 @@ MACHINE_CONFIG_START(xxx_state::xxx)
// MCFG_SCREEN_SIZE(32*8, 32*8)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 442, 0, 320, 264, 0, 240) /* generic NTSC video timing at 320x240 */
- //MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2, 384, 0, 256, 264, 16, 240) /* generic NTSC video timing at 256x224 */
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2, 384, 0, 256, 264, 16, 240) /* generic NTSC video timing at 256x224 */
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", xxx)
diff --git a/src/mame/includes/abc80x.h b/src/mame/includes/abc80x.h
index b1553305520..fa7f6e88418 100644
--- a/src/mame/includes/abc80x.h
+++ b/src/mame/includes/abc80x.h
@@ -25,8 +25,8 @@
// MACROS / CONSTANTS
//**************************************************************************
-#define ABC800_X01 XTAL_12MHz
-#define ABC806_X02 XTAL_32_768kHz
+#define ABC800_X01 XTAL(12'000'000)
+#define ABC806_X02 XTAL(32'768)
#define ABC802_AT0 0x01
#define ABC802_AT1 0x02
diff --git a/src/mame/includes/aim65.h b/src/mame/includes/aim65.h
index 9db8b749bd0..ddd5bdd1b12 100644
--- a/src/mame/includes/aim65.h
+++ b/src/mame/includes/aim65.h
@@ -29,7 +29,7 @@
* crystal controlled oscillator. Dual D-type flip-flop Z10 divides the 4 MHz
* signal by four to drive the R6502 phase 0 (O0) input with a 1 MHz clock.
*/
-#define AIM65_CLOCK XTAL_4MHz/4
+#define AIM65_CLOCK XTAL(4'000'000)/4
class aim65_state : public driver_device
diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h
index 7a6fcbb0a8d..8efcea63582 100644
--- a/src/mame/includes/amiga.h
+++ b/src/mame/includes/amiga.h
@@ -463,15 +463,15 @@ public:
DECLARE_WRITE_LINE_MEMBER(fdc_dsksyn_w);
// standard clocks
- static const int CLK_28M_PAL = XTAL_28_37516MHz;
- static const int CLK_7M_PAL = CLK_28M_PAL / 4;
- static const int CLK_C1_PAL = CLK_28M_PAL / 8;
- static const int CLK_E_PAL = CLK_7M_PAL / 10;
-
- static const int CLK_28M_NTSC = XTAL_28_63636MHz;
- static const int CLK_7M_NTSC = CLK_28M_NTSC / 4;
- static const int CLK_C1_NTSC = CLK_28M_NTSC / 8;
- static const int CLK_E_NTSC = CLK_7M_NTSC / 10;
+ static constexpr auto CLK_28M_PAL = XTAL(28'375'160);
+ static constexpr auto CLK_7M_PAL = CLK_28M_PAL / 4;
+ static constexpr auto CLK_C1_PAL = CLK_28M_PAL / 8;
+ static constexpr auto CLK_E_PAL = CLK_7M_PAL / 10;
+
+ static constexpr auto CLK_28M_NTSC = XTAL(28'636'363);
+ static constexpr auto CLK_7M_NTSC = CLK_28M_NTSC / 4;
+ static constexpr auto CLK_C1_NTSC = CLK_28M_NTSC / 8;
+ static constexpr auto CLK_E_NTSC = CLK_7M_NTSC / 10;
// screen layout
enum
diff --git a/src/mame/includes/apple2gs.h b/src/mame/includes/apple2gs.h
index fb897ae331e..8d67258d55a 100644
--- a/src/mame/includes/apple2gs.h
+++ b/src/mame/includes/apple2gs.h
@@ -26,7 +26,7 @@
#define RS232B_TAG "modem"
// IIgs clocks as marked on the schematics
-#define APPLE2GS_28M (XTAL_28_63636MHz) // IIGS master clock
+#define APPLE2GS_28M (XTAL(28'636'363)) // IIGS master clock
#define APPLE2GS_14M (APPLE2GS_28M/2)
#define APPLE2GS_7M (APPLE2GS_28M/4)
diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h
index 4f4c7582953..c0f2f31b52e 100644
--- a/src/mame/includes/astrocde.h
+++ b/src/mame/includes/astrocde.h
@@ -13,7 +13,7 @@
#include "sound/votrax.h"
#include "screen.h"
-#define ASTROCADE_CLOCK (XTAL_14_31818MHz/2)
+#define ASTROCADE_CLOCK (XTAL(14'318'181)/2)
#define AC_SOUND_PRESENT (0x01)
#define AC_LIGHTPEN_INTS (0x02)
diff --git a/src/mame/includes/atarist.h b/src/mame/includes/atarist.h
index 7455667a3ef..f015381dad8 100644
--- a/src/mame/includes/atarist.h
+++ b/src/mame/includes/atarist.h
@@ -39,13 +39,13 @@
// Atari ST
-#define Y1 XTAL_2_4576MHz
+#define Y1 XTAL(2'457'600)
// STBook
-#define U517 XTAL_16MHz
-#define Y200 XTAL_2_4576MHz
-#define Y700 XTAL_10MHz
+#define U517 XTAL(16'000'000)
+#define Y200 XTAL(2'457'600)
+#define Y700 XTAL(10'000'000)
#define DMA_STATUS_DRQ 0x04
#define DMA_STATUS_SECTOR_COUNT 0x02
diff --git a/src/mame/includes/atom.h b/src/mame/includes/atom.h
index 990331a1095..0d21fd98489 100644
--- a/src/mame/includes/atom.h
+++ b/src/mame/includes/atom.h
@@ -38,8 +38,8 @@
#define BASERAM_TAG "baseram"
-#define X1 XTAL_3_579545MHz // MC6847 Clock
-#define X2 XTAL_4MHz // CPU Clock - a divider reduces it to 1MHz
+#define X1 XTAL(3'579'545) // MC6847 Clock
+#define X2 XTAL(4'000'000) // CPU Clock - a divider reduces it to 1MHz
class atom_state : public driver_device
{
diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h
index 469c81e0bbe..9b6c3badb46 100644
--- a/src/mame/includes/bagman.h
+++ b/src/mame/includes/bagman.h
@@ -90,7 +90,7 @@ public:
/*----------- timings -----------*/
-#define BAGMAN_MAIN_CLOCK XTAL_18_432MHz
+#define BAGMAN_MAIN_CLOCK XTAL(18'432'000)
#define BAGMAN_HCLK (BAGMAN_MAIN_CLOCK / 3)
#define BAGMAN_H0 (BAGMAN_HCLK / 2)
#define BAGMAN_H1 (BAGMAN_H0 / 2)
diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h
index 279f1fdaab0..173900f033c 100644
--- a/src/mame/includes/bishi.h
+++ b/src/mame/includes/bishi.h
@@ -13,8 +13,8 @@
#include "video/konami_helper.h"
#include "screen.h"
-#define CPU_CLOCK (XTAL_24MHz / 2) /* 68000 clock */
-#define SOUND_CLOCK XTAL_16_9344MHz /* YMZ280 clock */
+#define CPU_CLOCK (XTAL(24'000'000) / 2) /* 68000 clock */
+#define SOUND_CLOCK XTAL(16'934'400) /* YMZ280 clock */
class bishi_state : public driver_device
{
diff --git a/src/mame/includes/bwidow.h b/src/mame/includes/bwidow.h
index c2fd4fffedf..559aaf58531 100644
--- a/src/mame/includes/bwidow.h
+++ b/src/mame/includes/bwidow.h
@@ -4,8 +4,8 @@
#ifndef BWIDOW_H_
#define BWIDOW_H_
-#define MASTER_CLOCK (XTAL_12_096MHz)
-#define CLOCK_3KHZ ((double)MASTER_CLOCK / 4096)
+#define MASTER_CLOCK (XTAL(12'096'000))
+#define CLOCK_3KHZ (MASTER_CLOCK / 4096)
class bwidow_state : public driver_device
diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h
index 601fcbf3282..fbfde507639 100644
--- a/src/mame/includes/bzone.h
+++ b/src/mame/includes/bzone.h
@@ -10,8 +10,8 @@
#include "machine/mathbox.h"
#include "sound/discrete.h"
-#define BZONE_MASTER_CLOCK (XTAL_12_096MHz)
-#define BZONE_CLOCK_3KHZ ((double)BZONE_MASTER_CLOCK / 4096)
+#define BZONE_MASTER_CLOCK (XTAL(12'096'000))
+#define BZONE_CLOCK_3KHZ (BZONE_MASTER_CLOCK / 4096)
class bzone_state : public driver_device
{
diff --git a/src/mame/includes/cdi.h b/src/mame/includes/cdi.h
index c835a87bcd6..570983327c1 100644
--- a/src/mame/includes/cdi.h
+++ b/src/mame/includes/cdi.h
@@ -12,8 +12,8 @@
/*----------- driver state -----------*/
-#define CLOCK_A XTAL_30MHz
-#define CLOCK_B XTAL_19_6608MHz
+#define CLOCK_A XTAL(30'000'000)
+#define CLOCK_B XTAL(19'660'800)
class cdi_state : public driver_device
{
diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h
index e7743662804..4f09b21e6fc 100644
--- a/src/mame/includes/cidelsa.h
+++ b/src/mame/includes/cidelsa.h
@@ -21,12 +21,12 @@
#define AY8910_TAG "ay8910"
#define DESTRYER_CHR1 3579000.0 // unverified
-#define DESTRYER_CHR2 XTAL_5_7143MHz
+#define DESTRYER_CHR2 XTAL(5'714'300)
#define ALTAIR_CHR1 3579000.0 // unverified
#define ALTAIR_CHR2 cdp1869_device::DOT_CLK_PAL // unverified
-#define DRACO_CHR1 XTAL_4_43361MHz
+#define DRACO_CHR1 XTAL(4'433'610)
#define DRACO_CHR2 cdp1869_device::DOT_CLK_PAL // unverified
-#define DRACO_SND_CHR1 XTAL_2_01216MHz
+#define DRACO_SND_CHR1 XTAL(2'012'160)
#define CIDELSA_PAGERAM_SIZE 0x400
#define DRACO_PAGERAM_SIZE 0x800
diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h
index 2d327fabc84..739b369ac43 100644
--- a/src/mame/includes/cosmic.h
+++ b/src/mame/includes/cosmic.h
@@ -11,8 +11,8 @@
#include "sound/dac.h"
#include "screen.h"
-#define COSMICG_MASTER_CLOCK XTAL_9_828MHz
-#define Z80_MASTER_CLOCK XTAL_10_816MHz
+#define COSMICG_MASTER_CLOCK XTAL(9'828'000)
+#define Z80_MASTER_CLOCK XTAL(10'816'000)
class cosmic_state : public driver_device
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h
index ee81999ec7c..3023c5566cd 100644
--- a/src/mame/includes/cps1.h
+++ b/src/mame/includes/cps1.h
@@ -30,7 +30,7 @@
Frame size: 262 scanlines
Refresh rate: 59.63 MHz.
*/
-#define CPS_PIXEL_CLOCK (XTAL_16MHz/2)
+#define CPS_PIXEL_CLOCK (XTAL(16'000'000)/2)
#define CPS_HTOTAL (512)
#define CPS_HBEND (64)
diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h
index 1945f18f96a..70a4558b5c9 100644
--- a/src/mame/includes/crbaloon.h
+++ b/src/mame/includes/crbaloon.h
@@ -9,7 +9,7 @@ Crazy Ballooon
#include "sound/discrete.h"
#include "sound/sn76477.h"
-#define CRBALOON_MASTER_XTAL (XTAL_9_987MHz)
+#define CRBALOON_MASTER_XTAL (XTAL(9'987'000))
class crbaloon_state : public driver_device
diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h
index a03f52ccbff..84ff4825603 100644
--- a/src/mame/includes/crgolf.h
+++ b/src/mame/includes/crgolf.h
@@ -7,7 +7,7 @@
**************************************************************************/
#include "sound/msm5205.h"
#include "machine/bankdev.h"
-#define MASTER_CLOCK XTAL_18_432MHz
+#define MASTER_CLOCK XTAL(18'432'000)
class crgolf_state : public driver_device
diff --git a/src/mame/includes/divebomb.h b/src/mame/includes/divebomb.h
index 5a18807a365..98da0682c5d 100644
--- a/src/mame/includes/divebomb.h
+++ b/src/mame/includes/divebomb.h
@@ -10,7 +10,7 @@
#include "sound/sn76496.h"
#include "video/k051316.h"
-#define XTAL1 XTAL_24MHz
+#define XTAL1 XTAL(24'000'000)
class divebomb_state : public driver_device
{
diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h
index d47b547d56f..0455d287b9d 100644
--- a/src/mame/includes/dkong.h
+++ b/src/mame/includes/dkong.h
@@ -41,7 +41,7 @@
* 256VF is not being used, so counting is from 248...255, 0...255, ....
*/
-#define MASTER_CLOCK XTAL_61_44MHz
+#define MASTER_CLOCK XTAL(61'440'000)
#define CLOCK_1H (MASTER_CLOCK / 5 / 4)
#define CLOCK_16H (CLOCK_1H / 16)
#define CLOCK_1VF ((CLOCK_16H) / 12 / 2)
@@ -55,7 +55,7 @@
#define VBSTART (240)
#define VBEND (16)
-#define I8035_CLOCK (XTAL_6MHz)
+#define I8035_CLOCK (XTAL(6'000'000))
/****************************************************************************
* CONSTANTS
diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h
index a9a261c260c..bcbc7398795 100644
--- a/src/mame/includes/esripsys.h
+++ b/src/mame/includes/esripsys.h
@@ -17,7 +17,7 @@
#include "screen.h"
/* TODO */
-#define ESRIPSYS_PIXEL_CLOCK (XTAL_25MHz / 2)
+#define ESRIPSYS_PIXEL_CLOCK (XTAL(25'000'000) / 2)
#define ESRIPSYS_HTOTAL (512 + 141 + 2)
#define ESRIPSYS_HBLANK_START (512)
#define ESRIPSYS_HBLANK_END (0)
diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h
index c96ad806ccf..7909a742ee4 100644
--- a/src/mame/includes/exerion.h
+++ b/src/mame/includes/exerion.h
@@ -8,7 +8,7 @@
#include "screen.h"
-#define EXERION_MASTER_CLOCK (XTAL_19_968MHz) /* verified on pcb */
+#define EXERION_MASTER_CLOCK (XTAL(19'968'000)) /* verified on pcb */
#define EXERION_CPU_CLOCK (EXERION_MASTER_CLOCK / 6)
#define EXERION_AY8910_CLOCK (EXERION_CPU_CLOCK / 2)
#define EXERION_PIXEL_CLOCK (EXERION_MASTER_CLOCK / 3)
diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h
index 90db0aa04ec..7179192e9e0 100644
--- a/src/mame/includes/exidy.h
+++ b/src/mame/includes/exidy.h
@@ -10,7 +10,7 @@
#include "sound/samples.h"
#include "screen.h"
-#define EXIDY_MASTER_CLOCK (XTAL_11_289MHz)
+#define EXIDY_MASTER_CLOCK (XTAL(11'289'000))
#define EXIDY_CPU_CLOCK (EXIDY_MASTER_CLOCK / 16)
#define EXIDY_PIXEL_CLOCK (EXIDY_MASTER_CLOCK / 2)
#define EXIDY_HTOTAL (0x150)
diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h
index cc812d32b80..c87bee1178d 100644
--- a/src/mame/includes/exidy440.h
+++ b/src/mame/includes/exidy440.h
@@ -9,7 +9,7 @@
#include "audio/exidy440.h"
#include "screen.h"
-#define EXIDY440_MASTER_CLOCK (XTAL_12_9792MHz)
+#define EXIDY440_MASTER_CLOCK (XTAL(12'979'200))
class exidy440_state : public driver_device
diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h
index 72265195bbd..139ca904c57 100644
--- a/src/mame/includes/fuukifg3.h
+++ b/src/mame/includes/fuukifg3.h
@@ -5,9 +5,9 @@
/* Define clocks based on actual OSC on the PCB */
-#define CPU_CLOCK (XTAL_40MHz / 2) /* clock for 68020 */
-#define SOUND_CPU_CLOCK (XTAL_12MHz / 2) /* clock for Z80 sound CPU */
-#define FM_SOUND_CLOCK (XTAL_33_8688MHz / 2) /* FM clock */
+#define CPU_CLOCK (XTAL(40'000'000) / 2) /* clock for 68020 */
+#define SOUND_CPU_CLOCK (XTAL(12'000'000) / 2) /* clock for Z80 sound CPU */
+#define FM_SOUND_CLOCK (XTAL(33'868'800) / 2) /* FM clock */
/* NOTE: YMF278B_STD_CLOCK is defined in /src/emu/sound/ymf278b.h */
diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h
index 9f498f4fc05..9f847751e78 100644
--- a/src/mame/includes/galaxian.h
+++ b/src/mame/includes/galaxian.h
@@ -18,7 +18,7 @@
#define GALAXIAN_XSCALE 3
/* master clocks */
-#define GALAXIAN_MASTER_CLOCK (XTAL_18_432MHz)
+#define GALAXIAN_MASTER_CLOCK (XTAL(18'432'000))
#define GALAXIAN_PIXEL_CLOCK (GALAXIAN_XSCALE*GALAXIAN_MASTER_CLOCK/3)
/* H counts from 128->511, HBLANK starts at 130 and ends at 250 */
diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h
index 372c1b8b479..e2241755398 100644
--- a/src/mame/includes/gameplan.h
+++ b/src/mame/includes/gameplan.h
@@ -13,16 +13,16 @@ driver by Chris Moore
#include "machine/gen_latch.h"
#include "screen.h"
-#define GAMEPLAN_MAIN_MASTER_CLOCK (XTAL_3_579545MHz)
-#define GAMEPLAN_AUDIO_MASTER_CLOCK (XTAL_3_579545MHz)
+#define GAMEPLAN_MAIN_MASTER_CLOCK (XTAL(3'579'545))
+#define GAMEPLAN_AUDIO_MASTER_CLOCK (XTAL(3'579'545))
#define GAMEPLAN_MAIN_CPU_CLOCK (GAMEPLAN_MAIN_MASTER_CLOCK / 4)
#define GAMEPLAN_AUDIO_CPU_CLOCK (GAMEPLAN_AUDIO_MASTER_CLOCK / 4)
#define GAMEPLAN_AY8910_CLOCK (GAMEPLAN_AUDIO_MASTER_CLOCK / 2)
-#define GAMEPLAN_PIXEL_CLOCK (XTAL_11_6688MHz / 2)
+#define GAMEPLAN_PIXEL_CLOCK (XTAL(11'668'800) / 2)
/* Used Leprechaun/Pot of Gold (and Pirate Treasure) - as stated in manual for Pot Of Gold */
-#define LEPRECHAUN_MAIN_MASTER_CLOCK (XTAL_4MHz)
+#define LEPRECHAUN_MAIN_MASTER_CLOCK (XTAL(4'000'000))
#define LEPRECHAUN_MAIN_CPU_CLOCK (LEPRECHAUN_MAIN_MASTER_CLOCK / 4)
diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h
index 1ade185e0b5..649b9bbc119 100644
--- a/src/mame/includes/harddriv.h
+++ b/src/mame/includes/harddriv.h
@@ -31,8 +31,8 @@
#include "screen.h"
-#define HARDDRIV_MASTER_CLOCK XTAL_32MHz
-#define HARDDRIV_GSP_CLOCK XTAL_48MHz
+#define HARDDRIV_MASTER_CLOCK XTAL(32'000'000)
+#define HARDDRIV_GSP_CLOCK XTAL(48'000'000)
DECLARE_DEVICE_TYPE(HARDDRIV_BOARD, harddriv_board_device_state)
DECLARE_DEVICE_TYPE(HARDDRIVC_BOARD, harddrivc_board_device_state)
diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h
index 7f9d4030616..7c282d6c1b4 100644
--- a/src/mame/includes/itech32.h
+++ b/src/mame/includes/itech32.h
@@ -11,11 +11,11 @@
#include "machine/ticket.h"
#include "screen.h"
-#define VIDEO_CLOCK XTAL_8MHz /* video (pixel) clock */
-#define CPU_CLOCK XTAL_12MHz /* clock for 68000-based systems */
-#define CPU020_CLOCK XTAL_25MHz /* clock for 68EC020-based systems */
-#define SOUND_CLOCK XTAL_16MHz /* clock for sound board */
-#define TMS_CLOCK XTAL_40MHz /* TMS320C31 clocks on drivedge */
+#define VIDEO_CLOCK XTAL(8'000'000) /* video (pixel) clock */
+#define CPU_CLOCK XTAL(12'000'000) /* clock for 68000-based systems */
+#define CPU020_CLOCK XTAL(25'000'000) /* clock for 68EC020-based systems */
+#define SOUND_CLOCK XTAL(16'000'000) /* clock for sound board */
+#define TMS_CLOCK XTAL(40'000'000) /* TMS320C31 clocks on drivedge */
class itech32_state : public driver_device
diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h
index 38825563609..5b5a8657a2d 100644
--- a/src/mame/includes/jackal.h
+++ b/src/mame/includes/jackal.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
// thanks-to:Kenneth Lin (original driver author)
-#define MASTER_CLOCK XTAL_18_432MHz
-#define SOUND_CLOCK XTAL_3_579545MHz
+#define MASTER_CLOCK XTAL(18'432'000)
+#define SOUND_CLOCK XTAL(3'579'545)
diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h
index 660f8f5661f..b282ae22a83 100644
--- a/src/mame/includes/jaguar.h
+++ b/src/mame/includes/jaguar.h
@@ -21,9 +21,9 @@
#endif
/* CoJag and Jaguar have completely different XTALs, pixel clock in Jaguar is the same as the GPU one */
-#define COJAG_PIXEL_CLOCK XTAL_14_31818MHz
-#define JAGUAR_CLOCK XTAL_25_590906MHz // NTSC
-// XTAL_25_593900MHz PAL, TODO
+#define COJAG_PIXEL_CLOCK XTAL(14'318'181)
+#define JAGUAR_CLOCK XTAL(25'590'906) // NTSC
+// XTAL(25'593'900) PAL, TODO
class jaguar_state : public driver_device
{
diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h
index d71ed321855..9c08d84a959 100644
--- a/src/mame/includes/jailbrek.h
+++ b/src/mame/includes/jailbrek.h
@@ -8,8 +8,8 @@
#include "sound/vlm5030.h"
-#define MASTER_CLOCK XTAL_18_432MHz
-#define VOICE_CLOCK XTAL_3_579545MHz
+#define MASTER_CLOCK XTAL(18'432'000)
+#define VOICE_CLOCK XTAL(3'579'545)
class jailbrek_state : public driver_device
{
diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h
index a3dda068fa4..5b3aff7f54b 100644
--- a/src/mame/includes/jedi.h
+++ b/src/mame/includes/jedi.h
@@ -10,8 +10,8 @@
/* oscillators and clocks */
-#define JEDI_MAIN_CPU_OSC (XTAL_10MHz)
-#define JEDI_AUDIO_CPU_OSC (XTAL_12_096MHz)
+#define JEDI_MAIN_CPU_OSC (XTAL(10'000'000))
+#define JEDI_AUDIO_CPU_OSC (XTAL(12'096'000))
#define JEDI_MAIN_CPU_CLOCK (JEDI_MAIN_CPU_OSC / 4)
#define JEDI_AUDIO_CPU_CLOCK (JEDI_AUDIO_CPU_OSC / 8)
#define JEDI_POKEY_CLOCK (JEDI_AUDIO_CPU_CLOCK)
diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h
index 913c50029a0..771bf2c903a 100644
--- a/src/mame/includes/lockon.h
+++ b/src/mame/includes/lockon.h
@@ -11,8 +11,8 @@
#include "screen.h"
/* Calculated from CRT controller writes */
-#define PIXEL_CLOCK (XTAL_21MHz / 3)
-#define FRAMEBUFFER_CLOCK XTAL_10MHz
+#define PIXEL_CLOCK (XTAL(21'000'000) / 3)
+#define FRAMEBUFFER_CLOCK XTAL(10'000'000)
#define HBSTART 320
#define HBEND 0
#define HTOTAL 448
diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h
index 29ea08483e8..aca5d66308d 100644
--- a/src/mame/includes/madalien.h
+++ b/src/mame/includes/madalien.h
@@ -12,7 +12,7 @@
#include "sound/discrete.h"
-#define MADALIEN_MAIN_CLOCK XTAL_10_595MHz
+#define MADALIEN_MAIN_CLOCK XTAL(10'595'000)
class madalien_state : public driver_device
diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h
index 36d6730059d..225b5c86ad4 100644
--- a/src/mame/includes/mario.h
+++ b/src/mame/includes/mario.h
@@ -22,7 +22,7 @@
* 7C -> 100 => 256 - 124 = 132 ==> 264 Scanlines
*/
-#define MASTER_CLOCK XTAL_24MHz
+#define MASTER_CLOCK XTAL(24'000'000)
#define PIXEL_CLOCK (MASTER_CLOCK / 4)
#define CLOCK_1H (MASTER_CLOCK / 8)
#define CLOCK_16H (CLOCK_1H / 16)
@@ -36,10 +36,10 @@
#define VBSTART (240)
#define VBEND (16)
-#define Z80_MASTER_CLOCK XTAL_8MHz
+#define Z80_MASTER_CLOCK XTAL(8'000'000)
#define Z80_CLOCK (Z80_MASTER_CLOCK / 2) /* verified on pcb */
-#define I8035_MASTER_CLOCK XTAL_11MHz /* verified on pcb: 730Khz */
+#define I8035_MASTER_CLOCK XTAL(11'000'000) /* verified on pcb: 730Khz */
#define I8035_CLOCK (I8035_MASTER_CLOCK)
class mario_state : public driver_device
diff --git a/src/mame/includes/maygay1b.h b/src/mame/includes/maygay1b.h
index d8536adebe4..d9800286763 100644
--- a/src/mame/includes/maygay1b.h
+++ b/src/mame/includes/maygay1b.h
@@ -6,8 +6,8 @@
#define VERBOSE 0
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
-#define M1_MASTER_CLOCK (XTAL_8MHz)
-#define M1_DUART_CLOCK (XTAL_3_6864MHz)
+#define M1_MASTER_CLOCK (XTAL(8'000'000))
+#define M1_DUART_CLOCK (XTAL(3'686'400))
#include "cpu/m6809/m6809.h"
#include "machine/i8279.h"
diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h
index 0a800da08f6..e450bd7b3d2 100644
--- a/src/mame/includes/mcr.h
+++ b/src/mame/includes/mcr.h
@@ -18,7 +18,7 @@
#include "sound/samples.h"
/* constants */
-#define MAIN_OSC_MCR_I XTAL_19_968MHz
+#define MAIN_OSC_MCR_I XTAL(19'968'000)
class mcr_state : public driver_device
diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h
index 2f17721b2cd..f262f5327a3 100644
--- a/src/mame/includes/midzeus.h
+++ b/src/mame/includes/midzeus.h
@@ -6,7 +6,7 @@
**************************************************************************/
-#define MIDZEUS_VIDEO_CLOCK XTAL_66_6667MHz
+#define MIDZEUS_VIDEO_CLOCK XTAL(66'666'700)
#include "machine/timekpr.h"
#include "screen.h"
diff --git a/src/mame/includes/mpu4.h b/src/mame/includes/mpu4.h
index 4d3dae267f5..412132c9b41 100644
--- a/src/mame/includes/mpu4.h
+++ b/src/mame/includes/mpu4.h
@@ -16,8 +16,8 @@
#include "machine/meters.h"
-#define MPU4_MASTER_CLOCK XTAL_6_88MHz
-#define VIDEO_MASTER_CLOCK XTAL_10MHz
+#define MPU4_MASTER_CLOCK XTAL(6'880'000)
+#define VIDEO_MASTER_CLOCK XTAL(10'000'000)
#ifdef MAME_DEBUG
diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h
index 953a20efc2b..024adacc6ba 100644
--- a/src/mame/includes/mystston.h
+++ b/src/mame/includes/mystston.h
@@ -11,7 +11,7 @@
#include "screen.h"
-#define MYSTSTON_MASTER_CLOCK (XTAL_12MHz)
+#define MYSTSTON_MASTER_CLOCK (XTAL(12'000'000))
class mystston_state : public driver_device
diff --git a/src/mame/includes/osi.h b/src/mame/includes/osi.h
index 533cd1705f4..485204bf31c 100644
--- a/src/mame/includes/osi.h
+++ b/src/mame/includes/osi.h
@@ -21,7 +21,7 @@
#define DISCRETE_TAG "discrete"
#define X1 3932160
-#define UK101_X1 XTAL_8MHz
+#define UK101_X1 XTAL(8'000'000)
#define OSI600_VIDEORAM_SIZE 0x400
#define OSI630_COLORRAM_SIZE 0x400
diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h
index e2df7565ac6..9fb42207c03 100644
--- a/src/mame/includes/phoenix.h
+++ b/src/mame/includes/phoenix.h
@@ -67,7 +67,7 @@ protected:
/*----------- video timing -----------*/
-#define MASTER_CLOCK XTAL_11MHz
+#define MASTER_CLOCK XTAL(11'000'000)
#define PIXEL_CLOCK (MASTER_CLOCK/2)
#define CPU_CLOCK (PIXEL_CLOCK)
diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h
index 1b17cc61287..9b284d27c6d 100644
--- a/src/mame/includes/polyplay.h
+++ b/src/mame/includes/polyplay.h
@@ -9,7 +9,7 @@
#include "machine/z80sio.h"
#include "sound/spkrdev.h"
-#define POLYPLAY_MAIN_CLOCK XTAL_9_8304MHz
+#define POLYPLAY_MAIN_CLOCK XTAL(9'830'400)
#define Z80CPU_TAG "maincpu"
#define Z80CTC_TAG "z80ctc"
diff --git a/src/mame/includes/s11.h b/src/mame/includes/s11.h
index 8165cdfbfba..0aeafeeff23 100644
--- a/src/mame/includes/s11.h
+++ b/src/mame/includes/s11.h
@@ -18,7 +18,7 @@
// 6802/8 CPU's input clock is 4MHz
// but because it has an internal /4 divider, its E clock runs at 1/4 that frequency
-#define E_CLOCK (XTAL_4MHz/4)
+#define E_CLOCK (XTAL(4'000'000)/4)
// Length of time in cycles between IRQs on the main 6808 CPU
// This length is determined by the settings of the W14 and W15 jumpers
diff --git a/src/mame/includes/saturn.h b/src/mame/includes/saturn.h
index fbd8e7613ec..5812c4599b9 100644
--- a/src/mame/includes/saturn.h
+++ b/src/mame/includes/saturn.h
@@ -612,8 +612,9 @@ public:
};
-#define MASTER_CLOCK_352 XTAL_57_2727MHz
-#define MASTER_CLOCK_320 XTAL_53_693175MHz
+// These two clocks are synthesized by the 315-5746
+#define MASTER_CLOCK_352 XTAL(14'318'181)*4
+#define MASTER_CLOCK_320 XTAL(14'318'181)*3.75
#define CEF_1 m_vdp1_regs[0x010/2]|=0x0002
#define CEF_0 m_vdp1_regs[0x010/2]&=~0x0002
#define BEF_1 m_vdp1_regs[0x010/2]|=0x0001
diff --git a/src/mame/includes/spectrum.h b/src/mame/includes/spectrum.h
index d227e10e58c..2b75781ab68 100644
--- a/src/mame/includes/spectrum.h
+++ b/src/mame/includes/spectrum.h
@@ -24,11 +24,11 @@
/* Spectrum crystals */
-#define X1 XTAL_14MHz // Main clock (48k Spectrum)
+#define X1 XTAL(14'000'000) // Main clock (48k Spectrum)
#define X1_128_AMSTRAD 35469000 // Main clock (Amstrad 128K model, +2A?)
#define X1_128_SINCLAIR 17734475 // Main clock (Sinclair 128K model)
-#define X2 XTAL_4_433619MHz // PAL color subcarrier
+#define X2 XTAL(4'433'619) // PAL color subcarrier
/* Spectrum screen size in pixels */
#define SPEC_UNSEEN_LINES 16 /* Non-visible scanlines before first border
diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h
index d298f7901b3..efed6938214 100644
--- a/src/mame/includes/starfire.h
+++ b/src/mame/includes/starfire.h
@@ -10,7 +10,7 @@
#include "screen.h"
-#define STARFIRE_MASTER_CLOCK (XTAL_20MHz)
+#define STARFIRE_MASTER_CLOCK (XTAL(20'000'000))
#define STARFIRE_CPU_CLOCK (STARFIRE_MASTER_CLOCK / 8)
#define STARFIRE_PIXEL_CLOCK (STARFIRE_MASTER_CLOCK / 4)
#define STARFIRE_HTOTAL (0x13f) /* could be 0x140, but I think this is right */
diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h
index 3c1927f7b8f..98779e583b1 100644
--- a/src/mame/includes/tx1.h
+++ b/src/mame/includes/tx1.h
@@ -13,7 +13,7 @@
#include "screen.h"
-#define TX1_PIXEL_CLOCK (XTAL_18MHz / 3)
+#define TX1_PIXEL_CLOCK (XTAL(18'000'000) / 3)
#define TX1_HBSTART 256
#define TX1_HBEND 0
#define TX1_HTOTAL 384
@@ -26,7 +26,7 @@
* that prevents one of the start countdown tones
* from playing.
*/
-#define BB_PIXEL_CLOCK (XTAL_18MHz / 3)
+#define BB_PIXEL_CLOCK (XTAL(18'000'000) / 3)
#define BB_HBSTART 256
#define BB_HBEND 0
#define BB_HTOTAL 384
@@ -34,7 +34,7 @@
#define BB_VBEND 0
#define BB_VTOTAL 288 + 1
-#define CPU_MASTER_CLOCK (XTAL_15MHz)
+#define CPU_MASTER_CLOCK (XTAL(15'000'000))
#define BUGGYBOY_ZCLK (CPU_MASTER_CLOCK / 2)
struct math_t
diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h
index 9cf5941860e..6358f0500c0 100644
--- a/src/mame/includes/victory.h
+++ b/src/mame/includes/victory.h
@@ -9,9 +9,9 @@
#include "screen.h"
-#define VICTORY_MAIN_CPU_CLOCK (XTAL_8MHz / 2)
+#define VICTORY_MAIN_CPU_CLOCK (XTAL(8'000'000) / 2)
-#define VICTORY_PIXEL_CLOCK (XTAL_11_289MHz / 2)
+#define VICTORY_PIXEL_CLOCK (XTAL(11'289'000) / 2)
#define VICTORY_HTOTAL (0x150)
#define VICTORY_HBEND (0x000)
#define VICTORY_HBSTART (0x100)
diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp
index 9cc2c6e8d84..c8e82e280f8 100644
--- a/src/mame/machine/abc1600mac.cpp
+++ b/src/mame/machine/abc1600mac.cpp
@@ -68,7 +68,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(abc1600_mac_device::device_add_mconfig)
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1600)) // XTAL_64MHz/8/10/20000/8/8
+ MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1600)) // XTAL(64'000'000)/8/10/20000/8/8
MACHINE_CONFIG_END
diff --git a/src/mame/machine/acs8600_ics.cpp b/src/mame/machine/acs8600_ics.cpp
index bd75dde71c2..bf7ac233dfe 100644
--- a/src/mame/machine/acs8600_ics.cpp
+++ b/src/mame/machine/acs8600_ics.cpp
@@ -93,12 +93,12 @@ static const z80_daisy_config ics_daisy_chain[] =
};
MACHINE_CONFIG_START(acs8600_ics_device::device_add_mconfig)
- MCFG_CPU_ADD("icscpu", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("icscpu", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(ics_mem)
MCFG_CPU_IO_MAP(ics_io)
MCFG_Z80_DAISY_CHAIN(ics_daisy_chain)
- MCFG_DEVICE_ADD("stc1", AM9513, XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("stc1", AM9513, XTAL(1'843'200))
MCFG_AM9513_OUT1_CALLBACK(DEVWRITELINE("sio1", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1", z80sio_device, txca_w))
MCFG_AM9513_OUT2_CALLBACK(DEVWRITELINE("sio1", z80sio_device, rxtxcb_w))
@@ -107,13 +107,13 @@ MACHINE_CONFIG_START(acs8600_ics_device::device_add_mconfig)
MCFG_AM9513_OUT4_CALLBACK(DEVWRITELINE("sio2", z80sio_device, rxtxcb_w))
MCFG_AM9513_OUT5_CALLBACK(DEVWRITELINE("sio3", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio3", z80sio_device, txca_w))
- MCFG_DEVICE_ADD("stc2", AM9513, XTAL_1_8432MHz)
+ MCFG_DEVICE_ADD("stc2", AM9513, XTAL(1'843'200))
MCFG_AM9513_OUT1_CALLBACK(DEVWRITELINE("sio3", z80sio_device, rxtxcb_w))
MCFG_AM9513_OUT2_CALLBACK(DEVWRITELINE("sio4", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio4", z80sio_device, txca_w))
MCFG_AM9513_OUT3_CALLBACK(DEVWRITELINE("sio4", z80sio_device, rxtxcb_w))
- MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(8'000'000)/2)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs2321a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs2321a", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs2321a", rs232_port_device, write_rts))
@@ -133,7 +133,7 @@ MACHINE_CONFIG_START(acs8600_ics_device::device_add_mconfig)
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio1", z80sio_device, dcdb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio1", z80sio_device, ctsb_w))
- MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL(8'000'000)/2)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs2322a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs2322a", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs2322a", rs232_port_device, write_rts))
@@ -152,7 +152,7 @@ MACHINE_CONFIG_START(acs8600_ics_device::device_add_mconfig)
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio2", z80sio_device, dcdb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio2", z80sio_device, ctsb_w))
- MCFG_DEVICE_ADD("sio3", Z80SIO, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD("sio3", Z80SIO, XTAL(8'000'000)/2)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs2323a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs2323a", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs2323a", rs232_port_device, write_rts))
@@ -171,7 +171,7 @@ MACHINE_CONFIG_START(acs8600_ics_device::device_add_mconfig)
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio3", z80sio_device, dcdb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio3", z80sio_device, ctsb_w))
- MCFG_DEVICE_ADD("sio4", Z80SIO, XTAL_8MHz/2)
+ MCFG_DEVICE_ADD("sio4", Z80SIO, XTAL(8'000'000)/2)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs2324a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs2324a", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs2324a", rs232_port_device, write_rts))
diff --git a/src/mame/machine/amiga.cpp b/src/mame/machine/amiga.cpp
index cbead271e62..f48180c1ace 100644
--- a/src/mame/machine/amiga.cpp
+++ b/src/mame/machine/amiga.cpp
@@ -132,6 +132,12 @@ const char *const amiga_state::s_custom_reg_names[0x100] =
"UNK1F8", "UNK1FA", "FMODE", "UNK1FE"
};
+constexpr XTAL amiga_state::CLK_C1_NTSC;
+constexpr XTAL amiga_state::CLK_C1_PAL;
+constexpr XTAL amiga_state::CLK_E_NTSC;
+constexpr XTAL amiga_state::CLK_E_PAL;
+constexpr XTAL amiga_state::CLK_7M_NTSC;
+constexpr XTAL amiga_state::CLK_7M_PAL;
/*************************************
diff --git a/src/mame/machine/amstrad.cpp b/src/mame/machine/amstrad.cpp
index 95c5aa5c768..66795b03a54 100644
--- a/src/mame/machine/amstrad.cpp
+++ b/src/mame/machine/amstrad.cpp
@@ -654,7 +654,7 @@ void amstrad_state::amstrad_update_video()
if ( m_gate_array.draw_p )
{
- uint32_t cycles_passed = (now - m_gate_array.last_draw_time ).as_ticks(XTAL_16MHz);
+ uint32_t cycles_passed = (now - m_gate_array.last_draw_time ).as_ticks(XTAL(16'000'000));
while( cycles_passed )
{
@@ -729,7 +729,7 @@ void amstrad_state::amstrad_plus_update_video()
if ( m_gate_array.draw_p )
{
- uint32_t cycles_passed = (now - m_gate_array.last_draw_time ).as_ticks(XTAL_16MHz);
+ uint32_t cycles_passed = (now - m_gate_array.last_draw_time ).as_ticks(XTAL(16'000'000));
while( cycles_passed )
{
@@ -2208,7 +2208,7 @@ The exception is the case where none of b7-b0 are reset (i.e. port &FBFF), which
{
m_aleste_mode = data;
logerror("EXTEND: Port &FABF write 0x%02x\n",data);
- m_crtc->set_clock( ( m_aleste_mode & 0x02 ) ? ( XTAL_16MHz / 8 ) : ( XTAL_16MHz / 16 ) );
+ m_crtc->set_clock( ( m_aleste_mode & 0x02 ) ? ( XTAL(16'000'000) / 8 ) : ( XTAL(16'000'000) / 16 ) );
}
mface2 = dynamic_cast<cpc_multiface2_device*>(get_expansion_device(machine(),"multiface2"));
@@ -3100,7 +3100,7 @@ TIMER_CALLBACK_MEMBER(amstrad_state::cb_set_resolution)
visarea.set(0, 64 + 640 + 64 - 1, 16, 16 + 15 + 200 + 15 - 1);
height = 262;
}
- refresh = HZ_TO_ATTOSECONDS( XTAL_16MHz ) * 1024 * height;
+ refresh = HZ_TO_ATTOSECONDS( XTAL(16'000'000) ) * 1024 * height;
m_screen->configure( 1024, height, visarea, refresh );
}
diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp
index 964cb70f5df..ee2cb07d752 100644
--- a/src/mame/machine/apollo.cpp
+++ b/src/mame/machine/apollo.cpp
@@ -1058,7 +1058,7 @@ MACHINE_CONFIG_START(apollo_state::common)
// configuration MUST be reset first !
MCFG_DEVICE_ADD(APOLLO_CONF_TAG, APOLLO_CONF, 0)
- MCFG_DEVICE_ADD( APOLLO_DMA1_TAG, AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( APOLLO_DMA1_TAG, AM9517A, XTAL(14'318'181)/3 )
MCFG_I8237_OUT_HREQ_CB(WRITELINE(apollo_state, apollo_dma_1_hrq_changed))
MCFG_I8237_OUT_EOP_CB(WRITELINE(apollo_state, apollo_dma8237_out_eop))
MCFG_I8237_IN_MEMR_CB(READ8(apollo_state, apollo_dma_read_byte))
@@ -1075,7 +1075,7 @@ MACHINE_CONFIG_START(apollo_state::common)
MCFG_I8237_OUT_DACK_1_CB(WRITELINE(apollo_state, pc_dack1_w))
MCFG_I8237_OUT_DACK_2_CB(WRITELINE(apollo_state, pc_dack2_w))
MCFG_I8237_OUT_DACK_3_CB(WRITELINE(apollo_state, pc_dack3_w))
- MCFG_DEVICE_ADD( APOLLO_DMA2_TAG, AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( APOLLO_DMA2_TAG, AM9517A, XTAL(14'318'181)/3 )
MCFG_I8237_OUT_HREQ_CB(WRITELINE(apollo_state, apollo_dma_2_hrq_changed))
MCFG_I8237_IN_MEMR_CB(READ8(apollo_state, apollo_dma_read_word))
MCFG_I8237_OUT_MEMW_CB(WRITE8(apollo_state, apollo_dma_write_word))
@@ -1105,7 +1105,7 @@ MACHINE_CONFIG_START(apollo_state::common)
MCFG_DEVICE_ADD("ptmclock", CLOCK, 250000)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(apollo_state, apollo_ptm_timer_tick))
- MCFG_MC146818_ADD( APOLLO_RTC_TAG, XTAL_32_768kHz )
+ MCFG_MC146818_ADD( APOLLO_RTC_TAG, XTAL(32'768) )
MCFG_MC146818_UTC( true )
MCFG_MC146818_BINARY( false )
MCFG_MC146818_24_12( false )
@@ -1113,7 +1113,7 @@ MACHINE_CONFIG_START(apollo_state::common)
MCFG_APOLLO_NI_ADD( APOLLO_NI_TAG, 0 )
- MCFG_APOLLO_SIO_ADD( APOLLO_SIO2_TAG, XTAL_3_6864MHz )
+ MCFG_APOLLO_SIO_ADD( APOLLO_SIO2_TAG, XTAL(3'686'400) )
MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(apollo_state, sio2_irq_handler))
MCFG_DEVICE_ADD(APOLLO_ISA_TAG, ISA16, 0)
@@ -1151,7 +1151,7 @@ MACHINE_CONFIG_END
// for machines with the keyboard and a graphics head
MACHINE_CONFIG_START(apollo_state::apollo)
MCFG_FRAGMENT_ADD(common)
- MCFG_APOLLO_SIO_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz )
+ MCFG_APOLLO_SIO_ADD( APOLLO_SIO_TAG, XTAL(3'686'400) )
MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler))
MCFG_APOLLO_SIO_OUTPORT_CALLBACK(WRITE8(apollo_state, sio_output))
MCFG_APOLLO_SIO_A_TX_CALLBACK(DEVWRITELINE(APOLLO_KBD_TAG, apollo_kbd_device, rx_w))
@@ -1173,7 +1173,7 @@ DEVICE_INPUT_DEFAULTS_END
// for headless machines using a serial console
MACHINE_CONFIG_START(apollo_state::apollo_terminal)
MCFG_FRAGMENT_ADD(common)
- MCFG_APOLLO_SIO_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz )
+ MCFG_APOLLO_SIO_ADD( APOLLO_SIO_TAG, XTAL(3'686'400) )
MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler))
MCFG_APOLLO_SIO_OUTPORT_CALLBACK(WRITE8(apollo_state, sio_output))
MCFG_APOLLO_SIO_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
diff --git a/src/mame/machine/apricotkb.cpp b/src/mame/machine/apricotkb.cpp
index 0eb5aeea02d..e3aee079966 100644
--- a/src/mame/machine/apricotkb.cpp
+++ b/src/mame/machine/apricotkb.cpp
@@ -69,7 +69,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(apricot_keyboard_device::device_add_mconfig)
#ifdef UPD7507_EMULATED
- MCFG_CPU_ADD(UPD7507C_TAG, UPD7507, XTAL_32_768kHz)
+ MCFG_CPU_ADD(UPD7507C_TAG, UPD7507, XTAL(32'768))
MCFG_CPU_IO_MAP(apricot_keyboard_io)
#endif
MACHINE_CONFIG_END
diff --git a/src/mame/machine/at.cpp b/src/mame/machine/at.cpp
index 19d4ee78bc2..82fd33da4ad 100644
--- a/src/mame/machine/at.cpp
+++ b/src/mame/machine/at.cpp
@@ -61,7 +61,7 @@ MACHINE_CONFIG_START(at_mb_device::device_add_mconfig)
MCFG_PIT8253_CLK2(4772720/4) /* pio port c pin 4, and speaker polling enough */
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(at_mb_device, pit8254_out2_changed))
- MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 )
MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq0_w))
MCFG_I8237_OUT_EOP_CB(WRITELINE(at_mb_device, dma8237_out_eop))
MCFG_I8237_IN_MEMR_CB(READ8(at_mb_device, dma_read_byte))
@@ -78,7 +78,7 @@ MACHINE_CONFIG_START(at_mb_device::device_add_mconfig)
MCFG_I8237_OUT_DACK_1_CB(WRITELINE(at_mb_device, dack1_w))
MCFG_I8237_OUT_DACK_2_CB(WRITELINE(at_mb_device, dack2_w))
MCFG_I8237_OUT_DACK_3_CB(WRITELINE(at_mb_device, dack3_w))
- MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 )
MCFG_I8237_OUT_HREQ_CB(WRITELINE(at_mb_device, dma_hrq_changed))
MCFG_I8237_IN_MEMR_CB(READ8(at_mb_device, dma_read_word))
MCFG_I8237_OUT_MEMW_CB(WRITE8(at_mb_device, dma_write_word))
@@ -123,7 +123,7 @@ MACHINE_CONFIG_START(at_mb_device::device_add_mconfig)
MCFG_ISA_OUT_DRQ6_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq2_w))
MCFG_ISA_OUT_DRQ7_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq3_w))
- MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz )
+ MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic8259_slave", pic8259_device, ir0_w)) MCFG_DEVCB_INVERT
MCFG_MC146818_CENTURY_INDEX(0x32)
@@ -132,7 +132,7 @@ MACHINE_CONFIG_START(at_mb_device::device_add_mconfig)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL_12MHz)
+ MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000))
MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(INPUTLINE(":maincpu", INPUT_LINE_RESET))
MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(INPUTLINE(":maincpu", INPUT_LINE_A20))
MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir1_w))
diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h
index 759fa003fac..caea246c8f0 100644
--- a/src/mame/machine/atarigen.h
+++ b/src/mame/machine/atarigen.h
@@ -21,10 +21,10 @@
CONSTANTS
***************************************************************************/
-#define ATARI_CLOCK_14MHz XTAL_14_31818MHz
-#define ATARI_CLOCK_20MHz XTAL_20MHz
-#define ATARI_CLOCK_32MHz XTAL_32MHz
-#define ATARI_CLOCK_50MHz XTAL_50MHz
+#define ATARI_CLOCK_14MHz XTAL(14'318'181)
+#define ATARI_CLOCK_20MHz XTAL(20'000'000)
+#define ATARI_CLOCK_32MHz XTAL(32'000'000)
+#define ATARI_CLOCK_50MHz XTAL(50'000'000)
diff --git a/src/mame/machine/beta.cpp b/src/mame/machine/beta.cpp
index a714a26d310..0a649523f3f 100644
--- a/src/mame/machine/beta.cpp
+++ b/src/mame/machine/beta.cpp
@@ -267,7 +267,7 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(beta_disk_device::device_add_mconfig)
- MCFG_KR1818VG93_ADD("wd179x", XTAL_8MHz / 8)
+ MCFG_KR1818VG93_ADD("wd179x", XTAL(8'000'000) / 8)
MCFG_FLOPPY_DRIVE_ADD("wd179x:0", beta_disk_floppies, "525qd", beta_disk_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("wd179x:1", beta_disk_floppies, "525qd", beta_disk_device::floppy_formats)
diff --git a/src/mame/machine/compiskb.cpp b/src/mame/machine/compiskb.cpp
index efb0bf05d8d..cb9a48a5ac7 100644
--- a/src/mame/machine/compiskb.cpp
+++ b/src/mame/machine/compiskb.cpp
@@ -56,7 +56,7 @@ const tiny_rom_entry *compis_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(compis_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8748_TAG, I8748, 2016000) // XTAL_4_032MHz/2 ???
+ MCFG_CPU_ADD(I8748_TAG, I8748, 2016000) // XTAL(4'032'000)/2 ???
MCFG_MCS48_PORT_BUS_IN_CB(READ8(compis_keyboard_device, bus_r))
MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(compis_keyboard_device, bus_w))
MCFG_MCS48_PORT_P1_IN_CB(READ8(compis_keyboard_device, p1_r))
diff --git a/src/mame/machine/cuda.cpp b/src/mame/machine/cuda.cpp
index 0a37d7d57e9..8324541ac06 100644
--- a/src/mame/machine/cuda.cpp
+++ b/src/mame/machine/cuda.cpp
@@ -85,7 +85,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(cuda_device::device_add_mconfig)
- MCFG_CPU_ADD(CUDA_CPU_TAG, M68HC05EG, XTAL_32_768kHz*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control
+ MCFG_CPU_ADD(CUDA_CPU_TAG, M68HC05EG, XTAL(32'768)*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control
MCFG_CPU_PROGRAM_MAP(cuda_map)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/dec_lk201.cpp b/src/mame/machine/dec_lk201.cpp
index 21d7f57640f..2c5c7bf7d55 100644
--- a/src/mame/machine/dec_lk201.cpp
+++ b/src/mame/machine/dec_lk201.cpp
@@ -211,7 +211,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(lk201_device::device_add_mconfig)
- MCFG_CPU_ADD(LK201_CPU_TAG, M68HC05EG, XTAL_4MHz) // actually 68HC05C4, clock verified by Lord_Nightmare
+ MCFG_CPU_ADD(LK201_CPU_TAG, M68HC05EG, XTAL(4'000'000)) // actually 68HC05C4, clock verified by Lord_Nightmare
MCFG_CPU_PROGRAM_MAP(lk201_map)
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/machine/decopincpu.cpp b/src/mame/machine/decopincpu.cpp
index ae645f7799a..0a149dcf516 100644
--- a/src/mame/machine/decopincpu.cpp
+++ b/src/mame/machine/decopincpu.cpp
@@ -199,7 +199,7 @@ WRITE8_MEMBER( decocpu_type1_device::solenoid2_w )
MACHINE_CONFIG_START(decocpu_type1_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", M6808, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(decocpu1_map)
/* Devices */
diff --git a/src/mame/machine/decopincpu.h b/src/mame/machine/decopincpu.h
index 8e7cd21aab3..1c9d7894fc0 100644
--- a/src/mame/machine/decopincpu.h
+++ b/src/mame/machine/decopincpu.h
@@ -54,7 +54,7 @@
// 6808 CPU's input clock is 4MHz
// but because it has an internal /4 divider, its E clock runs at 1/4 that frequency
-#define E_CLOCK (XTAL_4MHz/4)
+#define E_CLOCK (XTAL(4'000'000)/4)
// Length of time in cycles between IRQs on the main 6808 CPU
// This length is determined by the settings of the W14 and W15 jumpers
diff --git a/src/mame/machine/dmv_keyb.cpp b/src/mame/machine/dmv_keyb.cpp
index 4339065374d..601c30e12ed 100644
--- a/src/mame/machine/dmv_keyb.cpp
+++ b/src/mame/machine/dmv_keyb.cpp
@@ -228,7 +228,7 @@ void dmv_keyboard_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(dmv_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8741, XTAL_6MHz)
+ MCFG_CPU_ADD("mcu", I8741, XTAL(6'000'000))
MCFG_MCS48_PORT_P1_IN_CB(READ8(dmv_keyboard_device, port1_r))
MCFG_MCS48_PORT_P2_IN_CB(READ8(dmv_keyboard_device, port2_r))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(dmv_keyboard_device, port2_w))
diff --git a/src/mame/machine/egret.cpp b/src/mame/machine/egret.cpp
index 60f59bb7010..7bc2161beab 100644
--- a/src/mame/machine/egret.cpp
+++ b/src/mame/machine/egret.cpp
@@ -84,7 +84,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(egret_device::device_add_mconfig)
- MCFG_CPU_ADD(EGRET_CPU_TAG, M68HC05EG, XTAL_32_768kHz*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control
+ MCFG_CPU_ADD(EGRET_CPU_TAG, M68HC05EG, XTAL(32'768)*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control
MCFG_CPU_PROGRAM_MAP(egret_map)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/gamecom.cpp b/src/mame/machine/gamecom.cpp
index 62f4da29c56..1bf4068febe 100644
--- a/src/mame/machine/gamecom.cpp
+++ b/src/mame/machine/gamecom.cpp
@@ -258,7 +258,7 @@ void gamecom_state::recompute_lcd_params()
H_timing = ((m_lch_reg & 0x1f) + 1) * 200/4;
V_timing = (m_lcv_reg & 0x1f);
- pixel_clock = (XTAL_11_0592MHz / 2); // TODO: divisor actually settable
+ pixel_clock = (XTAL(11'059'200) / 2).value(); // TODO: divisor actually settable
rectangle visarea(0, 200-1, 0, 160-1); // TODO: check settings
diff --git a/src/mame/machine/hec2hrp.cpp b/src/mame/machine/hec2hrp.cpp
index 7b30674683b..19048ba6458 100644
--- a/src/mame/machine/hec2hrp.cpp
+++ b/src/mame/machine/hec2hrp.cpp
@@ -134,7 +134,7 @@ WRITE8_MEMBER(hec2hrp_state::hector_switch_bank_w)
if (m_flag_clk ==1)
{
m_flag_clk=0;
- m_maincpu->set_unscaled_clock(XTAL_5MHz); /* increase CPU*/
+ m_maincpu->set_unscaled_clock(XTAL(5'000'000)); /* increase CPU*/
}
}
if (offset==0x04) { /* 0x804 => video page, BR*/
@@ -144,7 +144,7 @@ WRITE8_MEMBER(hec2hrp_state::hector_switch_bank_w)
if (m_flag_clk ==0)
{
m_flag_clk=1;
- m_maincpu->set_unscaled_clock(XTAL_1_75MHz); /* slowdown CPU*/
+ m_maincpu->set_unscaled_clock(XTAL(1'750'000)); /* slowdown CPU*/
}
}
if (offset==0x08) { /* 0x808 => base page, HR*/
@@ -153,7 +153,7 @@ WRITE8_MEMBER(hec2hrp_state::hector_switch_bank_w)
if (m_flag_clk ==1)
{
m_flag_clk=0;
- m_maincpu->set_unscaled_clock(XTAL_5MHz); /* increase CPU*/
+ m_maincpu->set_unscaled_clock(XTAL(5'000'000)); /* increase CPU*/
}
}
@@ -164,7 +164,7 @@ WRITE8_MEMBER(hec2hrp_state::hector_switch_bank_w)
if (m_flag_clk ==0)
{
m_flag_clk=1;
- m_maincpu->set_unscaled_clock(XTAL_1_75MHz); /* slowdown CPU*/
+ m_maincpu->set_unscaled_clock(XTAL(1'750'000)); /* slowdown CPU*/
}
}
}
diff --git a/src/mame/machine/ibm6580_fdc.cpp b/src/mame/machine/ibm6580_fdc.cpp
index 5553456a683..7f0553e1d52 100644
--- a/src/mame/machine/ibm6580_fdc.cpp
+++ b/src/mame/machine/ibm6580_fdc.cpp
@@ -33,7 +33,7 @@ const tiny_rom_entry *dw_fdc_device::device_rom_region() const
}
MACHINE_CONFIG_START(dw_fdc_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8048, XTAL_24MHz/4) // divisor is unverified
+ MCFG_CPU_ADD("mcu", I8048, XTAL(24'000'000)/4) // divisor is unverified
// MCFG_MCS48_PORT_BUS_IN_CB(READ8(dw_fdc_device, bus_r))
// MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(dw_fdc_device, bus_w))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(dw_fdc_device, p1_w))
diff --git a/src/mame/machine/ibm6580_kbd.cpp b/src/mame/machine/ibm6580_kbd.cpp
index 15941df6c22..31d2b080d56 100644
--- a/src/mame/machine/ibm6580_kbd.cpp
+++ b/src/mame/machine/ibm6580_kbd.cpp
@@ -33,7 +33,7 @@ const tiny_rom_entry *dw_keyboard_device::device_rom_region() const
}
MACHINE_CONFIG_START(dw_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8049, XTAL_6MHz) // XXX RC oscillator
+ MCFG_CPU_ADD("mcu", I8049, XTAL(6'000'000)) // XXX RC oscillator
MCFG_MCS48_PORT_BUS_IN_CB(READ8(dw_keyboard_device, bus_r))
MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(dw_keyboard_device, bus_w))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(dw_keyboard_device, p1_w))
diff --git a/src/mame/machine/inder_vid.cpp b/src/mame/machine/inder_vid.cpp
index 07e17105110..3db45e7e43c 100644
--- a/src/mame/machine/inder_vid.cpp
+++ b/src/mame/machine/inder_vid.cpp
@@ -86,10 +86,10 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, inder_vid_device )
ADDRESS_MAP_END
MACHINE_CONFIG_START(inder_vid_device::device_add_mconfig)
- MCFG_CPU_ADD("tms", TMS34010, XTAL_40MHz)
+ MCFG_CPU_ADD("tms", TMS34010, XTAL(40'000'000))
MCFG_CPU_PROGRAM_MAP(megaphx_tms_map)
MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */
- MCFG_TMS340X0_PIXEL_CLOCK(XTAL_40MHz/12) /* pixel clock */
+ MCFG_TMS340X0_PIXEL_CLOCK(XTAL(40'000'000)/12) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(2) /* pixels per clock */
MCFG_TMS340X0_SCANLINE_RGB32_CB(inder_vid_device, scanline) /* scanline updater (RGB32) */
MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(inder_vid_device, m68k_gen_int))
@@ -97,7 +97,7 @@ MACHINE_CONFIG_START(inder_vid_device::device_add_mconfig)
MCFG_TMS340X0_FROM_SHIFTREG_CB(inder_vid_device, from_shiftreg) /* read from shiftreg function */
MCFG_SCREEN_ADD("inder_screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz/12, 424, 0, 338-1, 262, 0, 246-1)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(40'000'000)/12, 424, 0, 338-1, 262, 0, 246-1)
MCFG_SCREEN_UPDATE_DEVICE("tms", tms34010_device, tms340x0_rgb32)
MCFG_PALETTE_ADD("palette", 256)
diff --git a/src/mame/machine/interpro_ioga.cpp b/src/mame/machine/interpro_ioga.cpp
index 434fc08bee5..96f47ed7c20 100644
--- a/src/mame/machine/interpro_ioga.cpp
+++ b/src/mame/machine/interpro_ioga.cpp
@@ -1052,7 +1052,7 @@ WRITE32_MEMBER(interpro_ioga_device::timer3_w)
LOGMASKED(LOG_TIMER3, "timer3_w data 0x%08x mask 0x%08x (%s)\n", data, mem_mask, machine().describe_context());
// theory: timer 3 is 12.5MHz (typical value of 12500 giving a delay of 1ms)
- m_timer3->adjust(attotime::zero, false, attotime::from_hz(XTAL_12_5MHz));
+ m_timer3->adjust(attotime::zero, false, attotime::from_hz(XTAL(12'500'000)));
}
}
diff --git a/src/mame/machine/isbc_208.cpp b/src/mame/machine/isbc_208.cpp
index 5b85b93536d..e2b11f1851b 100644
--- a/src/mame/machine/isbc_208.cpp
+++ b/src/mame/machine/isbc_208.cpp
@@ -29,7 +29,7 @@ static SLOT_INTERFACE_START( isbc_208_floppies )
SLOT_INTERFACE_END
MACHINE_CONFIG_START(isbc_208_device::device_add_mconfig)
- MCFG_DEVICE_ADD("dmac", AM9517A, XTAL_8MHz/4)
+ MCFG_DEVICE_ADD("dmac", AM9517A, XTAL(8'000'000)/4)
MCFG_I8237_OUT_HREQ_CB(WRITELINE(isbc_208_device, hreq_w))
MCFG_I8237_OUT_EOP_CB(WRITELINE(isbc_208_device, out_eop_w))
MCFG_I8237_IN_MEMR_CB(READ8(isbc_208_device, dma_read_byte))
diff --git a/src/mame/machine/isbc_215g.cpp b/src/mame/machine/isbc_215g.cpp
index 58789cf1cff..05a80b0f4de 100644
--- a/src/mame/machine/isbc_215g.cpp
+++ b/src/mame/machine/isbc_215g.cpp
@@ -351,7 +351,7 @@ WRITE_LINE_MEMBER(isbc_215g_device::isbx_irq_11_w)
}
MACHINE_CONFIG_START(isbc_215g_device::device_add_mconfig)
- MCFG_CPU_ADD("u84", I8089, XTAL_15MHz / 3)
+ MCFG_CPU_ADD("u84", I8089, XTAL(15'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(isbc_215g_mem)
MCFG_CPU_IO_MAP(isbc_215g_io)
MCFG_I8089_DATA_WIDTH(16)
diff --git a/src/mame/machine/iteagle_fpga.cpp b/src/mame/machine/iteagle_fpga.cpp
index 5c8962d57ae..b36978129a8 100644
--- a/src/mame/machine/iteagle_fpga.cpp
+++ b/src/mame/machine/iteagle_fpga.cpp
@@ -42,7 +42,7 @@ MACHINE_CONFIG_START(iteagle_fpga_device::device_add_mconfig)
// RS232 serial ports
// The console terminal (com1) operates at 38400 baud
- MCFG_SCC85C30_ADD(AM85C30_TAG, XTAL_7_3728MHz, XTAL_7_3728MHz, 0, XTAL_7_3728MHz, 0)
+ MCFG_SCC85C30_ADD(AM85C30_TAG, XTAL(7'372'800).value(), XTAL(7'372'800).value(), 0, XTAL(7'372'800).value(), 0)
MCFG_Z80SCC_OUT_INT_CB(WRITELINE(iteagle_fpga_device, serial_interrupt))
MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(COM2_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(COM1_TAG, rs232_port_device, write_txd))
diff --git a/src/mame/machine/kay_kbd.cpp b/src/mame/machine/kay_kbd.cpp
index 1c811d57459..9f44f40cbd7 100644
--- a/src/mame/machine/kay_kbd.cpp
+++ b/src/mame/machine/kay_kbd.cpp
@@ -350,7 +350,7 @@ tiny_rom_entry const *kaypro_10_keyboard_device::device_rom_region() const
}
MACHINE_CONFIG_START(kaypro_10_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8049, XTAL_6MHz)
+ MCFG_CPU_ADD("mcu", I8049, XTAL(6'000'000))
MCFG_MCS48_PORT_P1_IN_CB(READ8(kaypro_10_keyboard_device, p1_r))
MCFG_MCS48_PORT_P2_IN_CB(READ8(kaypro_10_keyboard_device, p2_r))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(kaypro_10_keyboard_device, p2_w))
diff --git a/src/mame/machine/km035.cpp b/src/mame/machine/km035.cpp
index d376eb1125d..6357ad66b90 100644
--- a/src/mame/machine/km035.cpp
+++ b/src/mame/machine/km035.cpp
@@ -55,7 +55,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(km035_device::device_add_mconfig)
- MCFG_CPU_ADD(KM035_CPU_TAG, I8035, XTAL_4_608MHz)
+ MCFG_CPU_ADD(KM035_CPU_TAG, I8035, XTAL(4'608'000))
MCFG_CPU_PROGRAM_MAP(km035_map)
MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(km035_device, bus_w))
MCFG_MCS48_PORT_P1_IN_CB(READ8(km035_device, p1_r))
diff --git a/src/mame/machine/m20_8086.cpp b/src/mame/machine/m20_8086.cpp
index abd414b7065..05f3f6508d6 100644
--- a/src/mame/machine/m20_8086.cpp
+++ b/src/mame/machine/m20_8086.cpp
@@ -56,7 +56,7 @@ static ADDRESS_MAP_START(i86_io, AS_IO, 16, m20_8086_device)
ADDRESS_MAP_END
MACHINE_CONFIG_START(m20_8086_device::device_add_mconfig)
- MCFG_CPU_ADD("8086", I8086, XTAL_24MHz/3)
+ MCFG_CPU_ADD("8086", I8086, XTAL(24'000'000)/3)
MCFG_CPU_PROGRAM_MAP(i86_prog)
MCFG_CPU_IO_MAP(i86_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(m20_8086_device, int_cb)
diff --git a/src/mame/machine/m24_kbd.cpp b/src/mame/machine/m24_kbd.cpp
index c3a4f8c2147..8b6102b994d 100644
--- a/src/mame/machine/m24_kbd.cpp
+++ b/src/mame/machine/m24_kbd.cpp
@@ -17,7 +17,7 @@ const tiny_rom_entry *m24_keyboard_device::device_rom_region() const
}
MACHINE_CONFIG_START(m24_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8049, XTAL_6MHz)
+ MCFG_CPU_ADD("mcu", I8049, XTAL(6'000'000))
MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(m24_keyboard_device, bus_w))
MCFG_MCS48_PORT_P1_IN_CB(READ8(m24_keyboard_device, p1_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(m24_keyboard_device, p1_w))
diff --git a/src/mame/machine/m24_z8000.cpp b/src/mame/machine/m24_z8000.cpp
index 92477f5c5e1..49e7493b8d6 100644
--- a/src/mame/machine/m24_z8000.cpp
+++ b/src/mame/machine/m24_z8000.cpp
@@ -64,7 +64,7 @@ static ADDRESS_MAP_START(z8000_io, AS_IO, 16, m24_z8000_device)
ADDRESS_MAP_END
MACHINE_CONFIG_START(m24_z8000_device::device_add_mconfig)
- MCFG_CPU_ADD("z8000", Z8001, XTAL_8MHz/2)
+ MCFG_CPU_ADD("z8000", Z8001, XTAL(8'000'000)/2)
MCFG_CPU_PROGRAM_MAP(z8000_prog)
MCFG_CPU_DATA_MAP(z8000_data)
MCFG_CPU_IO_MAP(z8000_io)
diff --git a/src/mame/machine/micro3d.cpp b/src/mame/machine/micro3d.cpp
index dbc18a3018a..94112fc1373 100644
--- a/src/mame/machine/micro3d.cpp
+++ b/src/mame/machine/micro3d.cpp
@@ -22,7 +22,7 @@
*
*************************************/
-#define MAC_CLK XTAL_10MHz
+#define MAC_CLK XTAL(10'000'000)
#define VTXROM_FMT(x) (((x) << 14) | ((x) & (1 << 15) ? 0xc0000000 : 0))
diff --git a/src/mame/machine/ms7004.cpp b/src/mame/machine/ms7004.cpp
index dd7aeb70168..df4e55daee7 100644
--- a/src/mame/machine/ms7004.cpp
+++ b/src/mame/machine/ms7004.cpp
@@ -57,7 +57,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(ms7004_device::device_add_mconfig)
- MCFG_CPU_ADD(MS7004_CPU_TAG, I8035, XTAL_4_608MHz)
+ MCFG_CPU_ADD(MS7004_CPU_TAG, I8035, XTAL(4'608'000))
MCFG_CPU_PROGRAM_MAP(ms7004_map)
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(ms7004_device, p1_w))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(ms7004_device, p2_w))
diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp
index bff7f8f22e3..24b31eacbd2 100644
--- a/src/mame/machine/pc1512kb.cpp
+++ b/src/mame/machine/pc1512kb.cpp
@@ -51,7 +51,7 @@ const tiny_rom_entry *pc1512_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(pc1512_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_6MHz)
+ MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(6'000'000))
MCFG_MCS48_PORT_BUS_IN_CB(READ8(pc1512_keyboard_device, kb_bus_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(pc1512_keyboard_device, kb_p1_w))
MCFG_MCS48_PORT_P2_IN_CB(READ8(pc1512_keyboard_device, kb_p2_r))
diff --git a/src/mame/machine/pcshare.cpp b/src/mame/machine/pcshare.cpp
index a2a72f64f3d..41e2c8b1e8d 100644
--- a/src/mame/machine/pcshare.cpp
+++ b/src/mame/machine/pcshare.cpp
@@ -142,7 +142,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(pcat_base_state::pcvideo_vga)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -151,7 +151,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcat_base_state::pcvideo_trident_vga)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", trident_vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -160,7 +160,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcat_base_state::pcvideo_s3_vga)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", s3_vga_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -170,7 +170,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcat_base_state::pcvideo_cirrus_gd5428)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -179,7 +179,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcat_base_state::pcvideo_cirrus_gd5430)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5430_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -196,7 +196,7 @@ MACHINE_CONFIG_START(pcat_base_state::pcat_common)
MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir2_w))
MCFG_PIC8259_IN_SP_CB(GND)
- MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 )
MCFG_I8237_OUT_HREQ_CB(WRITELINE(pcat_base_state, pc_dma_hrq_changed))
MCFG_I8237_IN_MEMR_CB(READ8(pcat_base_state, pc_dma_read_byte))
MCFG_I8237_OUT_MEMW_CB(WRITE8(pcat_base_state, pc_dma_write_byte))
@@ -204,7 +204,7 @@ MACHINE_CONFIG_START(pcat_base_state::pcat_common)
MCFG_I8237_OUT_DACK_1_CB(WRITELINE(pcat_base_state, pc_dack1_w))
MCFG_I8237_OUT_DACK_2_CB(WRITELINE(pcat_base_state, pc_dack2_w))
MCFG_I8237_OUT_DACK_3_CB(WRITELINE(pcat_base_state, pc_dack3_w))
- MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 )
MCFG_DEVICE_ADD("pit8254", PIT8254, 0)
MCFG_PIT8253_CLK0(4772720/4) /* heartbeat IRQ */
@@ -213,7 +213,7 @@ MACHINE_CONFIG_START(pcat_base_state::pcat_common)
MCFG_PIT8253_CLK2(4772720/4) /* pio port c pin 4, and speaker polling enough */
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(pcat_base_state, at_pit8254_out2_changed))
- MCFG_MC146818_ADD("rtc", XTAL_32_768kHz)
+ MCFG_MC146818_ADD("rtc", XTAL(32'768))
MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir0_w))
MCFG_MC146818_CENTURY_INDEX(0x32)
diff --git a/src/mame/machine/pgmprot_igs027a_type3.cpp b/src/mame/machine/pgmprot_igs027a_type3.cpp
index 70681d25856..f37081d6dcc 100644
--- a/src/mame/machine/pgmprot_igs027a_type3.cpp
+++ b/src/mame/machine/pgmprot_igs027a_type3.cpp
@@ -197,7 +197,7 @@ MACHINE_CONFIG_START(pgm_arm_type3_state::pgm_arm_type3)
MCFG_CPU_PROGRAM_MAP(svg_68k_mem)
/* protection CPU */
- MCFG_CPU_ADD("prot", ARM7, XTAL_33MHz) // 55857G - 33Mhz Xtal, at least on SVG
+ MCFG_CPU_ADD("prot", ARM7, XTAL(33'000'000)) // 55857G - 33Mhz Xtal, at least on SVG
MCFG_CPU_PROGRAM_MAP(55857G_arm7_map)
MCFG_MACHINE_RESET_OVERRIDE(pgm_arm_type3_state, pgm_arm_type3_reset)
diff --git a/src/mame/machine/saturn.cpp b/src/mame/machine/saturn.cpp
index c9d3013432d..6483bd5b8a3 100644
--- a/src/mame/machine/saturn.cpp
+++ b/src/mame/machine/saturn.cpp
@@ -377,9 +377,7 @@ WRITE_LINE_MEMBER(saturn_state::system_halt_w)
WRITE_LINE_MEMBER(saturn_state::dot_select_w)
{
- uint32_t xtal;
-
- xtal = state ? MASTER_CLOCK_320 : MASTER_CLOCK_352;
+ const XTAL &xtal = state ? MASTER_CLOCK_320 : MASTER_CLOCK_352;
machine().device("maincpu")->set_unscaled_clock(xtal/2);
machine().device("slave")->set_unscaled_clock(xtal/2);
diff --git a/src/mame/machine/v1050kb.cpp b/src/mame/machine/v1050kb.cpp
index 4f082e7afcd..34fc2d2b8e8 100644
--- a/src/mame/machine/v1050kb.cpp
+++ b/src/mame/machine/v1050kb.cpp
@@ -73,7 +73,7 @@ DISCRETE_SOUND_END
//-------------------------------------------------
MACHINE_CONFIG_START(v1050_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8049_TAG, I8049, XTAL_4_608MHz)
+ MCFG_CPU_ADD(I8049_TAG, I8049, XTAL(4'608'000))
MCFG_MCS48_PORT_P1_IN_CB(READ8(v1050_keyboard_device, kb_p1_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(v1050_keyboard_device, kb_p1_w))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(v1050_keyboard_device, kb_p2_w))
diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp
index 51616732043..5e9bf3ddb55 100644
--- a/src/mame/machine/victor9k_fdc.cpp
+++ b/src/mame/machine/victor9k_fdc.cpp
@@ -159,7 +159,7 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(victor_9000_fdc_device::device_add_mconfig)
- MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_30MHz/6)
+ MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(30'000'000)/6)
MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_fdc_device, floppy_p1_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(victor_9000_fdc_device, floppy_p1_w))
MCFG_MCS48_PORT_P2_IN_CB(READ8(victor_9000_fdc_device, floppy_p2_r))
@@ -168,7 +168,7 @@ MACHINE_CONFIG_START(victor_9000_fdc_device::device_add_mconfig)
MCFG_MCS48_PORT_T1_IN_CB(READLINE(victor_9000_fdc_device, tach1_r))
MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(victor_9000_fdc_device, da_w))
- MCFG_DEVICE_ADD(M6522_4_TAG, VIA6522, XTAL_30MHz/30)
+ MCFG_DEVICE_ADD(M6522_4_TAG, VIA6522, XTAL(30'000'000)/30)
MCFG_VIA6522_READPA_HANDLER(READ8(victor_9000_fdc_device, via4_pa_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor_9000_fdc_device, via4_pa_w))
MCFG_VIA6522_READPB_HANDLER(READ8(victor_9000_fdc_device, via4_pb_r))
@@ -176,12 +176,12 @@ MACHINE_CONFIG_START(victor_9000_fdc_device::device_add_mconfig)
MCFG_VIA6522_CA2_HANDLER(WRITELINE(victor_9000_fdc_device, wrsync_w))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor_9000_fdc_device, via4_irq_w))
- MCFG_DEVICE_ADD(M6522_5_TAG, VIA6522, XTAL_30MHz/30)
+ MCFG_DEVICE_ADD(M6522_5_TAG, VIA6522, XTAL(30'000'000)/30)
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor_9000_fdc_device, via5_irq_w))
MCFG_VIA6522_READPA_HANDLER(READ8(victor_9000_fdc_device, via5_pa_r))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor_9000_fdc_device, via5_pb_w))
- MCFG_DEVICE_ADD(M6522_6_TAG, VIA6522, XTAL_30MHz/30)
+ MCFG_DEVICE_ADD(M6522_6_TAG, VIA6522, XTAL(30'000'000)/30)
MCFG_VIA6522_READPA_HANDLER(READ8(victor_9000_fdc_device, via6_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(victor_9000_fdc_device, via6_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor_9000_fdc_device, via6_pa_w))
@@ -245,7 +245,7 @@ victor_9000_fdc_device::victor_9000_fdc_device(const machine_config &mconfig, co
m_via4_irq(CLEAR_LINE),
m_via5_irq(CLEAR_LINE),
m_via6_irq(CLEAR_LINE),
- m_period(attotime::from_hz(XTAL_15MHz/32))
+ m_period(attotime::from_hz(XTAL(15'000'000)/32))
{
cur_live.tm = attotime::never;
cur_live.state = IDLE;
diff --git a/src/mame/machine/victor9k_kb.cpp b/src/mame/machine/victor9k_kb.cpp
index 836ade989ec..8a0a4d0bd6c 100644
--- a/src/mame/machine/victor9k_kb.cpp
+++ b/src/mame/machine/victor9k_kb.cpp
@@ -381,7 +381,7 @@ const tiny_rom_entry *victor_9000_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(victor_9000_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8021_TAG, I8021, XTAL_3_579545MHz)
+ MCFG_CPU_ADD(I8021_TAG, I8021, XTAL(3'579'545))
// P0 is unconnected on pcb
MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_keyboard_device, kb_p1_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(victor_9000_keyboard_device, kb_p1_w))
diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp
index 2199745dc6b..74e0f5d8f65 100644
--- a/src/mame/machine/wangpckb.cpp
+++ b/src/mame/machine/wangpckb.cpp
@@ -113,7 +113,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(wangpc_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8051_TAG, I8051, XTAL_4MHz)
+ MCFG_CPU_ADD(I8051_TAG, I8051, XTAL(4'000'000))
MCFG_CPU_IO_MAP(wangpc_keyboard_io)
MCFG_MCS51_SERIAL_TX_CB(WRITE8(wangpc_keyboard_device, mcs51_tx_callback))
MCFG_MCS51_SERIAL_RX_CB(READ8(wangpc_keyboard_device, mcs51_rx_callback))
diff --git a/src/mame/machine/x820kb.cpp b/src/mame/machine/x820kb.cpp
index 61ddee37ef5..9d5a2f657ca 100644
--- a/src/mame/machine/x820kb.cpp
+++ b/src/mame/machine/x820kb.cpp
@@ -85,7 +85,7 @@ const tiny_rom_entry *xerox_820_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(xerox_820_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8748_TAG, I8048, XTAL_6MHz)
+ MCFG_CPU_ADD(I8748_TAG, I8048, XTAL(6'000'000))
MCFG_MCS48_PORT_P1_IN_CB(READ8(xerox_820_keyboard_device, kb_p1_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(xerox_820_keyboard_device, kb_p1_w))
MCFG_MCS48_PORT_P2_IN_CB(READ8(xerox_820_keyboard_device, kb_p2_r))
diff --git a/src/mame/machine/zorbakbd.cpp b/src/mame/machine/zorbakbd.cpp
index 51d0e9bef9d..499ea769d42 100644
--- a/src/mame/machine/zorbakbd.cpp
+++ b/src/mame/machine/zorbakbd.cpp
@@ -311,7 +311,7 @@ void zorba_keyboard_device::device_start()
MACHINE_CONFIG_START(zorba_keyboard_device::device_add_mconfig)
// MC68705P3S
- MCFG_CPU_ADD("mcu", M68705P3, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("mcu", M68705P3, XTAL(3'579'545))
MCFG_M68705_PORTA_R_CB(READ8(zorba_keyboard_device, mcu_pa_r));
MCFG_M68705_PORTB_R_CB(READ8(zorba_keyboard_device, mcu_pb_r));
MCFG_M68705_PORTB_W_CB(WRITE8(zorba_keyboard_device, mcu_pb_w));
diff --git a/src/mame/machine/zx8302.h b/src/mame/machine/zx8302.h
index 4ada67efb8c..a2a96de72ba 100644
--- a/src/mame/machine/zx8302.h
+++ b/src/mame/machine/zx8302.h
@@ -100,6 +100,7 @@ public:
zx8302_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
static void set_rtc_clock(device_t &device, int rtc_clock) { downcast<zx8302_device &>(device).m_rtc_clock = rtc_clock; }
+ static void set_rtc_clock(device_t &device, const XTAL &rtc_clock) { set_rtc_clock(device, rtc_clock.value()); }
template <class Object> static devcb_base &set_out_ipl1l_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_ipl1l_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_out_baudx4_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_baudx4_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> static devcb_base &set_out_comdata_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_comdata_cb.set_callback(std::forward<Object>(cb)); }
diff --git a/src/mame/video/abc1600.cpp b/src/mame/video/abc1600.cpp
index 6fed2fda971..f3e34a187a7 100644
--- a/src/mame/video/abc1600.cpp
+++ b/src/mame/video/abc1600.cpp
@@ -198,11 +198,11 @@ MACHINE_CONFIG_START(abc1600_mover_device::device_add_mconfig)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DRIVER(abc1600_mover_device, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_64MHz, 0x3e0, 0, 0x300, 0x433, 0, 0x400)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(64'000'000), 0x3e0, 0, 0x300, 0x433, 0, 0x400)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_MC6845_ADD(SY6845E_TAG, SY6845E, SCREEN_TAG, XTAL_64MHz/32)
+ MCFG_MC6845_ADD(SY6845E_TAG, SY6845E, SCREEN_TAG, XTAL(64'000'000)/32)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(32)
MCFG_MC6845_UPDATE_ROW_CB(abc1600_mover_device, crtc_update_row)
diff --git a/src/mame/video/abc80.cpp b/src/mame/video/abc80.cpp
index 293f0ae9f19..e5ec8065269 100644
--- a/src/mame/video/abc80.cpp
+++ b/src/mame/video/abc80.cpp
@@ -163,7 +163,7 @@ void abc80_state::video_start()
m_scanline_timer->adjust(m_screen->time_until_pos(0, ABC80_HBEND), 0, m_screen->scan_period());
m_blink_timer = timer_alloc(TIMER_ID_BLINK);
- m_blink_timer->adjust(attotime::from_hz(XTAL_11_9808MHz/2/6/64/312/16), 0, attotime::from_hz(XTAL_11_9808MHz/2/6/64/312/16));
+ m_blink_timer->adjust(attotime::from_hz(XTAL(11'980'800)/2/6/64/312/16), 0, attotime::from_hz(XTAL(11'980'800)/2/6/64/312/16));
m_vsync_on_timer = timer_alloc(TIMER_ID_VSYNC_ON);
m_vsync_on_timer->adjust(m_screen->time_until_pos(0, 0), 0, m_screen->frame_period());
@@ -196,7 +196,7 @@ MACHINE_CONFIG_START(abc80_state::abc80_video)
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_UPDATE_DRIVER(abc80_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_11_9808MHz/2, ABC80_HTOTAL, ABC80_HBEND, ABC80_HBSTART, ABC80_VTOTAL, ABC80_VBEND, ABC80_VBSTART)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(11'980'800)/2, ABC80_HTOTAL, ABC80_HBEND, ABC80_HBSTART, ABC80_VTOTAL, ABC80_VBEND, ABC80_VBSTART)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", abc80)
MCFG_PALETTE_ADD_MONOCHROME("palette")
diff --git a/src/mame/video/abc800.cpp b/src/mame/video/abc800.cpp
index 439bb132e62..2b867977dff 100644
--- a/src/mame/video/abc800.cpp
+++ b/src/mame/video/abc800.cpp
@@ -185,7 +185,7 @@ MACHINE_CONFIG_START(abc800c_state::abc800c_video)
MCFG_PALETTE_ADD("palette", 8)
MCFG_PALETTE_INIT_OWNER(abc800c_state, abc800c)
- MCFG_DEVICE_ADD(SAA5052_TAG, SAA5052, XTAL_12MHz/2)
+ MCFG_DEVICE_ADD(SAA5052_TAG, SAA5052, XTAL(12'000'000)/2)
MCFG_SAA5050_D_CALLBACK(READ8(abc800c_state, char_ram_r))
MCFG_SAA5050_SCREEN_SIZE(40, 24, 40)
MACHINE_CONFIG_END
@@ -304,7 +304,7 @@ MACHINE_CONFIG_START(abc800m_state::abc800m_video)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t(0xff, 0xff, 0x00))
MCFG_SCREEN_UPDATE_DRIVER(abc800m_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz, 0x300, 0, 0x1e0, 0x13a, 0, 0xf0)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000), 0x300, 0, 0x1e0, 0x13a, 0, 0xf0)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MACHINE_CONFIG_END
diff --git a/src/mame/video/abc802.cpp b/src/mame/video/abc802.cpp
index a189f8036dc..98531fa16c6 100644
--- a/src/mame/video/abc802.cpp
+++ b/src/mame/video/abc802.cpp
@@ -212,7 +212,7 @@ MACHINE_CONFIG_START(abc802_state::abc802_video)
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber())
MCFG_SCREEN_UPDATE_DRIVER(abc802_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz, 0x300, 0, 0x1e0, 0x13a, 0, 0xf0)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000), 0x300, 0, 0x1e0, 0x13a, 0, 0xf0)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MACHINE_CONFIG_END
diff --git a/src/mame/video/abc806.cpp b/src/mame/video/abc806.cpp
index 9093fb7496e..e85958885ba 100644
--- a/src/mame/video/abc806.cpp
+++ b/src/mame/video/abc806.cpp
@@ -499,7 +499,7 @@ MACHINE_CONFIG_START(abc806_state::abc806_video)
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_UPDATE_DRIVER(abc806_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz, 0x300, 0, 0x1e0, 0x13a, 0, 0xfa)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000), 0x300, 0, 0x1e0, 0x13a, 0, 0xfa)
MCFG_PALETTE_ADD("palette", 8)
MCFG_PALETTE_INIT_OWNER(abc806_state, abc806)
diff --git a/src/mame/video/agat7.cpp b/src/mame/video/agat7.cpp
index 58394684e30..c05ba271414 100644
--- a/src/mame/video/agat7.cpp
+++ b/src/mame/video/agat7.cpp
@@ -41,7 +41,7 @@ DEFINE_DEVICE_TYPE(AGAT7VIDEO, agat7video_device, "agat7video", "Agat-7 Video")
MACHINE_CONFIG_START(agat7video_device::device_add_mconfig)
MCFG_SCREEN_ADD("a7screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_10_5MHz, 672, 0, 512, 312, 0, 256)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(10'500'000), 672, 0, 512, 312, 0, 256)
MCFG_SCREEN_UPDATE_DRIVER(agat7video_device, screen_update)
MCFG_SCREEN_PALETTE("a7palette")
diff --git a/src/mame/video/bbc.cpp b/src/mame/video/bbc.cpp
index 19c71faf61c..ec6ecc29437 100644
--- a/src/mame/video/bbc.cpp
+++ b/src/mame/video/bbc.cpp
@@ -175,13 +175,13 @@ WRITE8_MEMBER(bbc_state::bbc_videoULA_w)
m_hd6845->set_hpixels_per_column(m_pixels_per_byte);
if (m_video_ula.clock_rate_6845)
- m_hd6845->set_clock(XTAL_16MHz / 8);
+ m_hd6845->set_clock(XTAL(16'000'000) / 8);
else
- m_hd6845->set_clock(XTAL_16MHz / 16);
+ m_hd6845->set_clock(XTAL(16'000'000) / 16);
// FIXME: double clock for MODE7 until interlace is implemented
if (m_video_ula.teletext_normal_select)
- m_hd6845->set_clock(XTAL_16MHz / 8);
+ m_hd6845->set_clock(XTAL(16'000'000) / 8);
break;
// Set a palette register in the Video ULA
case 1:
diff --git a/src/mame/video/bfm_adr2.cpp b/src/mame/video/bfm_adr2.cpp
index 52ee9c35516..2f19191e33b 100644
--- a/src/mame/video/bfm_adr2.cpp
+++ b/src/mame/video/bfm_adr2.cpp
@@ -113,7 +113,7 @@ E000-FFFF | R | D D D D D D D D | 8K ROM
#define SL_DISPLAY 0x02 // displayed Adder screen, 1=screen1 0=screen0
#define SL_ACCESS 0x01 // accessable Adder screen, 1=screen1 0=screen0
-#define ADDER_CLOCK (XTAL_8MHz)
+#define ADDER_CLOCK (XTAL(8'000'000))
diff --git a/src/mame/video/cgc7900.cpp b/src/mame/video/cgc7900.cpp
index 13527dc1d3f..c4c9ed7324f 100644
--- a/src/mame/video/cgc7900.cpp
+++ b/src/mame/video/cgc7900.cpp
@@ -240,5 +240,5 @@ MACHINE_CONFIG_START(cgc7900_state::cgc7900_video)
MCFG_PALETTE_ADD("palette", 8)
MCFG_PALETTE_INIT_OWNER(cgc7900_state, cgc7900)
- MCFG_TIMER_DRIVER_ADD_PERIODIC("blink", cgc7900_state, blink_tick, attotime::from_hz(XTAL_28_48MHz/7500000))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("blink", cgc7900_state, blink_tick, attotime::from_hz(XTAL(28'480'000)/7500000))
MACHINE_CONFIG_END
diff --git a/src/mame/video/decodmd1.cpp b/src/mame/video/decodmd1.cpp
index 9b96eed22b0..f96794998e3 100644
--- a/src/mame/video/decodmd1.cpp
+++ b/src/mame/video/decodmd1.cpp
@@ -201,7 +201,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(decodmd_type1_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("dmdcpu", Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("dmdcpu", Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(decodmd1_map)
MCFG_CPU_IO_MAP(decodmd1_io_map)
diff --git a/src/mame/video/decodmd2.cpp b/src/mame/video/decodmd2.cpp
index a80dde312b5..4b568e1c93a 100644
--- a/src/mame/video/decodmd2.cpp
+++ b/src/mame/video/decodmd2.cpp
@@ -130,14 +130,14 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(decodmd_type2_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("dmdcpu", MC6809E, XTAL_8MHz / 4)
+ MCFG_CPU_ADD("dmdcpu", MC6809E, XTAL(8'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(decodmd2_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_TIMER_DRIVER_ADD_PERIODIC("firq_timer", decodmd_type2_device, dmd_firq, attotime::from_hz(80))
- MCFG_MC6845_ADD("dmd6845", MC6845, nullptr, XTAL_8MHz / 8) // TODO: confirm clock speed
+ MCFG_MC6845_ADD("dmd6845", MC6845, nullptr, XTAL(8'000'000) / 8) // TODO: confirm clock speed
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(decodmd_type2_device, crtc_update_row)
diff --git a/src/mame/video/decodmd3.cpp b/src/mame/video/decodmd3.cpp
index f990ce564a3..a31099806a5 100644
--- a/src/mame/video/decodmd3.cpp
+++ b/src/mame/video/decodmd3.cpp
@@ -132,14 +132,14 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(decodmd_type3_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("dmdcpu", M68000, XTAL_12MHz)
+ MCFG_CPU_ADD("dmdcpu", M68000, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(decodmd3_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer", decodmd_type3_device, dmd_irq, attotime::from_hz(150))
- MCFG_MC6845_ADD("dmd6845", MC6845, nullptr, XTAL_12MHz / 4) // TODO: confirm clock speed
+ MCFG_MC6845_ADD("dmd6845", MC6845, nullptr, XTAL(12'000'000) / 4) // TODO: confirm clock speed
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_UPDATE_ROW_CB(decodmd_type3_device, crtc_update_row)
diff --git a/src/mame/video/dkong.cpp b/src/mame/video/dkong.cpp
index 60d1b6b5af8..bf152d90b64 100644
--- a/src/mame/video/dkong.cpp
+++ b/src/mame/video/dkong.cpp
@@ -678,7 +678,7 @@ inline double dkong_state::CD4049(double x)
#define RC32 ((18e3 + 68e3) * 33e-6)
#define RC4 (90e3 * 0.47e-6)
#define dt (1./60./(double) VTOTAL)
-#define period2 (((int64_t)(PIXEL_CLOCK) * ( 33L * 68L )) / (int32_t)10000000L / 3) /* period/2 in pixel ... */
+#define period2 (((int64_t)(PIXEL_CLOCK.value()) * ( 33L * 68L )) / (int32_t)10000000L / 3) /* period/2 in pixel ... */
void dkong_state::radarscp_step(int line_cnt)
{
diff --git a/src/mame/video/jaguar.cpp b/src/mame/video/jaguar.cpp
index 18a25f86519..08c01a43200 100644
--- a/src/mame/video/jaguar.cpp
+++ b/src/mame/video/jaguar.cpp
@@ -822,7 +822,7 @@ void jaguar_state::video_start()
save_item(NAME(m_blitter_regs));
save_item(NAME(m_gpu_regs));
save_item(NAME(m_cpu_irq_state));
- m_pixel_clock = m_is_cojag ? COJAG_PIXEL_CLOCK : JAGUAR_CLOCK;
+ m_pixel_clock = m_is_cojag ? COJAG_PIXEL_CLOCK.value() : JAGUAR_CLOCK.value();
}
diff --git a/src/mame/video/kyocera.cpp b/src/mame/video/kyocera.cpp
index c0d413b5481..217f54db8fc 100644
--- a/src/mame/video/kyocera.cpp
+++ b/src/mame/video/kyocera.cpp
@@ -88,7 +88,7 @@ MACHINE_CONFIG_START(tandy200_state::tandy200_video)
MCFG_PALETTE_ADD("palette", 2)
MCFG_PALETTE_INIT_OWNER(tandy200_state,tandy200)
- MCFG_DEVICE_ADD(HD61830_TAG, HD61830, XTAL_4_9152MHz/2/2)
+ MCFG_DEVICE_ADD(HD61830_TAG, HD61830, XTAL(4'915'200)/2/2)
MCFG_DEVICE_ADDRESS_MAP(0, tandy200_lcdc)
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MACHINE_CONFIG_END
diff --git a/src/mame/video/lethalj.cpp b/src/mame/video/lethalj.cpp
index 09d3a4c06e7..85ac76c1b1a 100644
--- a/src/mame/video/lethalj.cpp
+++ b/src/mame/video/lethalj.cpp
@@ -170,7 +170,7 @@ WRITE16_MEMBER(lethalj_state::lethalj_blitter_w)
else
do_blit();
- m_gen_ext1_int_timer->adjust(attotime::from_hz(XTAL_32MHz) * ((m_blitter_data[5] + 1) * (m_blitter_data[7] + 1)));
+ m_gen_ext1_int_timer->adjust(attotime::from_hz(XTAL(32'000'000)) * ((m_blitter_data[5] + 1) * (m_blitter_data[7] + 1)));
}
/* clear the IRQ on offset 0 */
diff --git a/src/mame/video/lockon.cpp b/src/mame/video/lockon.cpp
index ee98db7a6a1..38d7f7f0326 100644
--- a/src/mame/video/lockon.cpp
+++ b/src/mame/video/lockon.cpp
@@ -14,7 +14,7 @@
#define CURSOR_XPOS 168
#define CURSOR_YPOS 239
#define FRAMEBUFFER_MAX_X 431
-#define FRAMEBUFFER_MAX_Y (uint32_t)((FRAMEBUFFER_CLOCK / (float)(FRAMEBUFFER_MAX_X-1)) / ((float)PIXEL_CLOCK/(HTOTAL*VTOTAL)))
+#define FRAMEBUFFER_MAX_Y (uint32_t)((FRAMEBUFFER_CLOCK / (FRAMEBUFFER_MAX_X-1)).dvalue() / (PIXEL_CLOCK/(HTOTAL*VTOTAL)).dvalue())
/*************************************
diff --git a/src/mame/video/m92.cpp b/src/mame/video/m92.cpp
index c9b837865dd..62efdbc1a85 100644
--- a/src/mame/video/m92.cpp
+++ b/src/mame/video/m92.cpp
@@ -91,7 +91,7 @@ WRITE16_MEMBER(m92_state::m92_spritecontrol_w)
/* Pixel clock is 26.6666MHz (some boards 27MHz??), we have 0x800 bytes, or 0x400 words to copy from
spriteram to the buffer. It seems safe to assume 1 word can be copied per clock. */
- m_spritebuffer_timer->adjust(attotime::from_hz(XTAL_26_66666MHz) * 0x400);
+ m_spritebuffer_timer->adjust(attotime::from_hz(XTAL(26'666'666)) * 0x400);
}
// logerror("%s: m92_spritecontrol_w %08x %08x\n",m_maincpu->pc(),offset,data);
}
diff --git a/src/mame/video/midzeus.cpp b/src/mame/video/midzeus.cpp
index 76b596c5a22..6032119a7bd 100644
--- a/src/mame/video/midzeus.cpp
+++ b/src/mame/video/midzeus.cpp
@@ -765,7 +765,7 @@ void midzeus_state::zeus_register_update(offs_t offset)
rectangle visarea(m_zeusbase[0xc6] & 0xffff, htotal - 3, 0, m_zeusbase[0xc8] & 0xffff);
if (htotal > 0 && vtotal > 0 && visarea.min_x < visarea.max_x && visarea.max_y < vtotal)
{
- m_screen->configure(htotal, vtotal, visarea, HZ_TO_ATTOSECONDS((double)MIDZEUS_VIDEO_CLOCK / 8.0 / (htotal * vtotal)));
+ m_screen->configure(htotal, vtotal, visarea, HZ_TO_ATTOSECONDS(MIDZEUS_VIDEO_CLOCK / 8.0 / (htotal * vtotal)));
zeus_cliprect = visarea;
zeus_cliprect.max_x -= zeus_cliprect.min_x;
zeus_cliprect.min_x = 0;
diff --git a/src/mame/video/mikromik.cpp b/src/mame/video/mikromik.cpp
index 214a9727413..7a53a10c976 100644
--- a/src/mame/video/mikromik.cpp
+++ b/src/mame/video/mikromik.cpp
@@ -134,20 +134,20 @@ MACHINE_CONFIG_START(mm1_state::mm1m6_video)
MCFG_SCREEN_UPDATE_DRIVER(mm1_state, screen_update)
MCFG_SCREEN_SIZE( 800, 375 ) // (25 text rows * 15 vertical pixels / character)
MCFG_SCREEN_VISIBLE_AREA( 0, 800-1, 0, 375-1 )
- //MCFG_SCREEN_RAW_PARAMS(XTAL_18_720MHz, ...)
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(18'720'000), ...)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mm1)
MCFG_PALETTE_ADD("palette", 3)
MCFG_PALETTE_INIT_OWNER(mm1_state, mm1)
- MCFG_DEVICE_ADD(I8275_TAG, I8275, XTAL_18_720MHz/8)
+ MCFG_DEVICE_ADD(I8275_TAG, I8275, XTAL(18'720'000)/8)
MCFG_I8275_CHARACTER_WIDTH(HORIZONTAL_CHARACTER_PIXELS)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(mm1_state, crtc_display_pixels)
MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE(I8237_TAG, am9517a_device, dreq0_w))
MCFG_I8275_VRTC_CALLBACK(DEVWRITELINE(UPD7220_TAG, upd7220_device, ext_sync_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
- MCFG_DEVICE_ADD(UPD7220_TAG, UPD7220, XTAL_18_720MHz/8)
+ MCFG_DEVICE_ADD(UPD7220_TAG, UPD7220, XTAL(18'720'000)/8)
MCFG_DEVICE_ADDRESS_MAP(0, mm1_upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(mm1_state, hgdc_display_pixels)
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
diff --git a/src/mame/video/mystston.cpp b/src/mame/video/mystston.cpp
index 8a1b0dfea61..ef9c26677bf 100644
--- a/src/mame/video/mystston.cpp
+++ b/src/mame/video/mystston.cpp
@@ -26,8 +26,8 @@
*
*************************************/
// HMC20
-// MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2,384,0,256,272,8,248)
-#define PIXEL_CLOCK (XTAL_12MHz / 2)
+// MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2,384,0,256,272,8,248)
+#define PIXEL_CLOCK (XTAL(12'000'000) / 2)
#define HTOTAL (384)
#define HBEND (0)
#define HBSTART (256)
diff --git a/src/mame/video/pc1512.cpp b/src/mame/video/pc1512.cpp
index 7cd301b1f95..78278a84f72 100644
--- a/src/mame/video/pc1512.cpp
+++ b/src/mame/video/pc1512.cpp
@@ -233,17 +233,17 @@ WRITE8_MEMBER( pc1512_state::vdu_w )
case ALPHA_40:
case GRAPHICS_1:
m_vdu->set_hpixels_per_column(8);
- m_vdu->set_clock(XTAL_28_63636MHz/32);
+ m_vdu->set_clock(XTAL(28'636'363)/32);
break;
case ALPHA_80:
m_vdu->set_hpixels_per_column(8);
- m_vdu->set_clock(XTAL_28_63636MHz/16);
+ m_vdu->set_clock(XTAL(28'636'363)/16);
break;
case GRAPHICS_2:
m_vdu->set_hpixels_per_column(16);
- m_vdu->set_clock(XTAL_28_63636MHz/32);
+ m_vdu->set_clock(XTAL(28'636'363)/32);
break;
}
}
@@ -601,7 +601,7 @@ MACHINE_CONFIG_START(pc1512_state::pc1512_video)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
MCFG_SCREEN_REFRESH_RATE(50)
- MCFG_MC6845_ADD(AMS40041_TAG, AMS40041, SCREEN_TAG, XTAL_28_63636MHz/32)
+ MCFG_MC6845_ADD(AMS40041_TAG, AMS40041, SCREEN_TAG, XTAL(28'636'363)/32)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(pc1512_state, crtc_update_row)
diff --git a/src/mame/video/pc_t1t.cpp b/src/mame/video/pc_t1t.cpp
index 0f5b3e56fa9..b0cdea24ba6 100644
--- a/src/mame/video/pc_t1t.cpp
+++ b/src/mame/video/pc_t1t.cpp
@@ -117,13 +117,13 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(pcvideo_t1000_device::device_add_mconfig)
MCFG_SCREEN_ADD(T1000_SCREEN_NAME, RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,262,0,200)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181),912,0,640,262,0,200)
MCFG_SCREEN_UPDATE_DEVICE( T1000_MC6845_NAME, mc6845_device, screen_update )
MCFG_PALETTE_ADD( "palette", 32 )
MCFG_PALETTE_INIT_OWNER(pc_t1t_device, pcjr)
- MCFG_MC6845_ADD(T1000_MC6845_NAME, MC6845, T1000_SCREEN_NAME, XTAL_14_31818MHz/8)
+ MCFG_MC6845_ADD(T1000_MC6845_NAME, MC6845, T1000_SCREEN_NAME, XTAL(14'318'181)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(pc_t1t_device, crtc_update_row)
@@ -141,13 +141,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcvideo_pcjr_device::device_add_mconfig)
MCFG_SCREEN_ADD(T1000_SCREEN_NAME, RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz, 912, 0, 640, 262, 0, 200)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181), 912, 0, 640, 262, 0, 200)
MCFG_SCREEN_UPDATE_DEVICE( T1000_MC6845_NAME, mc6845_device, screen_update )
MCFG_PALETTE_ADD( "palette", 32 )
MCFG_PALETTE_INIT_OWNER(pc_t1t_device, pcjr)
- MCFG_MC6845_ADD(T1000_MC6845_NAME, MC6845, T1000_SCREEN_NAME, XTAL_14_31818MHz/16)
+ MCFG_MC6845_ADD(T1000_MC6845_NAME, MC6845, T1000_SCREEN_NAME, XTAL(14'318'181)/16)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(pcvideo_pcjr_device, crtc_update_row)
@@ -616,11 +616,11 @@ void pcvideo_pcjr_device::pc_pcjr_mode_switch()
/* Determine mc6845 input clock */
if ( m_reg.data[0] & 0x01 )
{
- m_mc6845->set_clock( XTAL_14_31818MHz/8 );
+ m_mc6845->set_clock( XTAL(14'318'181)/8 );
}
else
{
- m_mc6845->set_clock( XTAL_14_31818MHz/16 );
+ m_mc6845->set_clock( XTAL(14'318'181)/16 );
}
/* color or b/w? */
diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp
index 28e9c4ee482..e928d69547e 100644
--- a/src/mame/video/pcd.cpp
+++ b/src/mame/video/pcd.cpp
@@ -100,7 +100,7 @@ ioport_constructor pcd_video_device::device_input_ports() const
}
MACHINE_CONFIG_START(pcd_video_device::device_add_mconfig)
- MCFG_CPU_ADD("graphics", I8741, XTAL_16MHz/2)
+ MCFG_CPU_ADD("graphics", I8741, XTAL(16'000'000)/2)
MCFG_MCS48_PORT_P1_IN_CB(READ8(pcd_video_device, p1_r))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(pcd_video_device, p2_w))
MCFG_MCS48_PORT_T1_IN_CB(READLINE(pcd_video_device, t1_r))
@@ -141,7 +141,7 @@ static ADDRESS_MAP_START( pcx_vram, 0, 8, pcx_video_device )
ADDRESS_MAP_END
MACHINE_CONFIG_START(pcx_video_device::device_add_mconfig)
- MCFG_CPU_ADD("graphics", I8031, XTAL_24MHz/2)
+ MCFG_CPU_ADD("graphics", I8031, XTAL(24'000'000)/2)
MCFG_CPU_PROGRAM_MAP(pcx_vid_map)
MCFG_CPU_IO_MAP(pcx_vid_io)
diff --git a/src/mame/video/tmc1800.cpp b/src/mame/video/tmc1800.cpp
index 28a6aa5646b..42a1820d732 100644
--- a/src/mame/video/tmc1800.cpp
+++ b/src/mame/video/tmc1800.cpp
@@ -37,11 +37,11 @@ uint32_t osc1000b_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm
/* Machine Drivers */
MACHINE_CONFIG_START(tmc1800_state::tmc1800_video)
- MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL_1_75MHz)
+ MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL(1'750'000))
MCFG_CDP1861_IRQ_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT))
MCFG_CDP1861_DMA_OUT_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT))
MCFG_CDP1861_EFX_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1))
- MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL_1_75MHz)
+ MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL(1'750'000))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(osc1000b_state::osc1000b_video)
@@ -53,21 +53,21 @@ MACHINE_CONFIG_START(osc1000b_state::osc1000b_video)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmc2000_state::tmc2000_video)
- MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL_1_75MHz)
+ MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL(1'750'000))
MCFG_SCREEN_UPDATE_DEVICE(CDP1864_TAG, cdp1864_device, screen_update)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL_1_75MHz, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(tmc2000_state, rdata_r), READLINE(tmc2000_state, bdata_r), READLINE(tmc2000_state, gdata_r))
+ MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(1'750'000), GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(tmc2000_state, rdata_r), READLINE(tmc2000_state, bdata_r), READLINE(tmc2000_state, gdata_r))
MCFG_CDP1864_CHROMINANCE(RES_K(1.21), RES_K(2.05), RES_K(2.26), RES_K(3.92)) // RL64, RL63, RL61, RL65 (also RH62 (2K pot) in series, but ignored here)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nano_state::nano_video)
- MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL_1_75MHz)
+ MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL(1'750'000))
MCFG_SCREEN_UPDATE_DEVICE(CDP1864_TAG, cdp1864_device, screen_update)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL_1_75MHz, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, VCC, VCC, VCC)
+ MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(1'750'000), GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, VCC, VCC, VCC)
MCFG_CDP1864_CHROMINANCE(RES_K(1.21), RES_INF, RES_INF, 0) // R18 (unconfirmed)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/video/v1050.cpp b/src/mame/video/v1050.cpp
index 12bdd6e15f6..8e5c2dc38eb 100644
--- a/src/mame/video/v1050.cpp
+++ b/src/mame/video/v1050.cpp
@@ -110,7 +110,7 @@ void v1050_state::video_start()
/* Machine Drivers */
MACHINE_CONFIG_START(v1050_state::v1050_video)
- MCFG_MC6845_ADD(H46505_TAG, H46505, SCREEN_TAG, XTAL_15_36MHz/8)
+ MCFG_MC6845_ADD(H46505_TAG, H46505, SCREEN_TAG, XTAL(15'360'000)/8)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(v1050_state, crtc_update_row)
diff --git a/src/mame/video/victory.cpp b/src/mame/video/victory.cpp
index 0b0d5cfd429..19a86d83c08 100644
--- a/src/mame/video/victory.cpp
+++ b/src/mame/video/victory.cpp
@@ -15,7 +15,7 @@
/* from what I can tell, this should be divided by 32, not 8 */
/* but the interrupt test does some precise timing, and fails */
/* if it's not 8 */
-#define VICTORY_MICRO_STATE_CLOCK (XTAL_11_289MHz)
+#define VICTORY_MICRO_STATE_CLOCK (XTAL(11'289'000))
#define MICRO_STATE_CLOCK_PERIOD attotime::from_hz(VICTORY_MICRO_STATE_CLOCK / 8)
diff --git a/src/zexall/zexall.cpp b/src/zexall/zexall.cpp
index 72fe67162e7..25e8d07841e 100644
--- a/src/zexall/zexall.cpp
+++ b/src/zexall/zexall.cpp
@@ -141,7 +141,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(zexall_state::zexall)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(z80_mem)
MACHINE_CONFIG_END