From add0c3b9e7149bd6b6a390d1adfae60a56428aba Mon Sep 17 00:00:00 2001 From: hap Date: Fri, 26 Jan 2018 15:37:44 +0100 Subject: search-replace .0_?Hz_XTAL to _?Hz_XTAL (nw) --- src/emu/xtal.cpp | 106 ++++++++++++++++++++-------------------- src/mame/drivers/cave.cpp | 72 +++++++++++++-------------- src/mame/drivers/ckz80.cpp | 2 +- src/mame/drivers/cxgz80.cpp | 2 +- src/mame/drivers/ddragon3.cpp | 8 +-- src/mame/drivers/dooyong.cpp | 34 ++++++------- src/mame/drivers/equites.cpp | 4 +- src/mame/drivers/eva.cpp | 12 ++--- src/mame/drivers/fidel6502.cpp | 32 ++++++------ src/mame/drivers/fidel68k.cpp | 18 +++---- src/mame/drivers/fidelmcs48.cpp | 2 +- src/mame/drivers/fidelz80.cpp | 8 +-- src/mame/drivers/flicker.cpp | 2 +- src/mame/drivers/gcpinbal.cpp | 4 +- src/mame/drivers/gladiatr.cpp | 32 ++++++------ src/mame/drivers/goldstar.cpp | 6 +-- src/mame/drivers/hh_melps4.cpp | 4 +- src/mame/drivers/hh_tms1k.cpp | 2 +- src/mame/drivers/hh_ucom4.cpp | 22 ++++----- src/mame/drivers/kaypro.cpp | 18 +++---- src/mame/drivers/laserbat.cpp | 4 +- src/mame/drivers/m68705prg.cpp | 8 +-- src/mame/drivers/mikromik.cpp | 2 +- src/mame/drivers/novag6502.cpp | 8 +-- src/mame/drivers/novag68k.cpp | 2 +- src/mame/drivers/sderby.cpp | 2 +- src/mame/drivers/shangha3.cpp | 22 ++++----- src/mame/drivers/stadhero.cpp | 8 +-- src/mame/drivers/taito_l.cpp | 20 ++++---- src/mame/drivers/tispeak.cpp | 2 +- src/mame/drivers/v1050.cpp | 14 +++--- src/mame/drivers/wwfsstar.cpp | 2 +- src/mame/drivers/zaxxon.cpp | 2 +- src/mame/drivers/zorba.cpp | 12 ++--- src/mame/machine/kay_kbd.cpp | 2 +- 35 files changed, 250 insertions(+), 250 deletions(-) diff --git a/src/emu/xtal.cpp b/src/emu/xtal.cpp index de656069bf3..2df4226b67d 100644 --- a/src/emu/xtal.cpp +++ b/src/emu/xtal.cpp @@ -33,8 +33,8 @@ MAME supports fractions in crystal frequencies, but for historical and readability reasons we tend to write the closest integer - value. For example, XTAL(3'579'545) should actually be - 3579545.454545...Hz (315/88). This is no problem though: see above + value. For example, 3.579545_MHz_XTAL should actually be + 3.579545454545...MHz (315/88). This is no problem though: see above note about tolerance. In the "Examples" column, please don't add 1000 examples, this is just @@ -52,31 +52,31 @@ // This array *must* stay in order, it's binary-searched const double XTAL::known_xtals[] = { /* - Frequency Literal Examples + Frequency Sugarvassed Examples ----------- ---------------------- ---------------------------------------- */ 32'768, /* 32.768_kHz_XTAL Used to drive RTC chips */ - 384'000, /* 384.0_kHz_XTAL Resonator - Commonly used for driving OKI MSM5205 */ - 400'000, /* 400.0_kHz_XTAL Resonator - OKI MSM5205 on Great Swordman h/w */ - 430'000, /* 430.0_kHz_XTAL Resonator */ - 455'000, /* 455.0_kHz_XTAL Resonator - OKI MSM5205 on Gladiator h/w */ - 512'000, /* 512.0_kHz_XTAL Resonator - Toshiba TC8830F */ - 600'000, /* 600.0_kHz_XTAL - */ - 640'000, /* 640.0_kHz_XTAL Resonator - NEC UPD7759, Texas Instruments Speech Chips @ 8khz */ - 960'000, /* 960.0_kHz_XTAL Resonator - Xerox Notetaker Keyboard UART */ - 1'000'000, /* 1.0_MHz_XTAL Used to drive OKI M6295 chips */ + 384'000, /* 384_kHz_XTAL Resonator - Commonly used for driving OKI MSM5205 */ + 400'000, /* 400_kHz_XTAL Resonator - OKI MSM5205 on Great Swordman h/w */ + 430'000, /* 430_kHz_XTAL Resonator */ + 455'000, /* 455_kHz_XTAL Resonator - OKI MSM5205 on Gladiator h/w */ + 512'000, /* 512_kHz_XTAL Resonator - Toshiba TC8830F */ + 600'000, /* 600_kHz_XTAL - */ + 640'000, /* 640_kHz_XTAL Resonator - NEC UPD7759, Texas Instruments Speech Chips @ 8khz */ + 960'000, /* 960_kHz_XTAL Resonator - Xerox Notetaker Keyboard UART */ + 1'000'000, /* 1_MHz_XTAL Used to drive OKI M6295 chips */ 1'056'000, /* 1.056_MHz_XTAL Resonator - OKI M6295 on Trio The Punch h/w */ 1'294'400, /* 1.2944_MHz_XTAL BBN BitGraph PSG */ 1'750'000, /* 1.75_MHz_XTAL RCA CDP1861 */ 1'797'100, /* 1.7971_MHz_XTAL SWTPC 6800 (with MIKBUG) */ 1'843'200, /* 1.8432_MHz_XTAL Bondwell 12/14 */ 1'996'800, /* 1.9968_MHz_XTAL NEC PC-98xx */ - 2'000'000, /* 2.0_MHz_XTAL - */ + 2'000'000, /* 2_MHz_XTAL - */ 2'012'160, /* 2.01216_MHz_XTAL Cidelsa Draco sound board */ 2'097'152, /* 2.097152_MHz_XTAL Icatel 1995 - Brazilian public payphone */ 2'457'600, /* 2.4576_MHz_XTAL Atari ST MFP, NEC PC-98xx */ 2'500'000, /* 2.5_MHz_XTAL Janken Man units */ 2'950'000, /* 2.95_MHz_XTAL Playmatic MPU-C, MPU-III & Sound-3 */ - 3'000'000, /* 3.0_MHz_XTAL Probably only used to drive 68705 or similar MCUs on 80's Taito PCBs */ + 3'000'000, /* 3_MHz_XTAL Probably only used to drive 68705 or similar MCUs on 80's Taito PCBs */ 3'072'000, /* 3.072_MHz_XTAL INS 8520 input clock rate */ 3'120'000, /* 3.12_MHz_XTAL SP0250 clock on Gottlieb games */ 3'521'280, /* 3.52128_MHz_XTAL RCA COSMAC VIP */ @@ -86,7 +86,7 @@ const double XTAL::known_xtals[] = { 3'686'400, /* 3.6864_MHz_XTAL Baud rate clock for MC68681 and similar UARTs */ 3'840'000, /* 3.84_MHz_XTAL Fairlight CMI Alphanumeric Keyboard */ 3'900'000, /* 3.9_MHz_XTAL Resonator - Used on some Fidelity boards */ - 4'000'000, /* 4.0_MHz_XTAL - */ + 4'000'000, /* 4_MHz_XTAL - */ 4'028'000, /* 4.028_MHz_XTAL Sony SMC-777 */ 4'032'000, /* 4.032_MHz_XTAL GRiD Compass modem board */ 4'096'000, /* 4.096_MHz_XTAL Used to drive OKI M9810 chips */ @@ -97,7 +97,7 @@ const double XTAL::known_xtals[] = { 4'433'619, /* 4.433619_MHz_XTAL PAL color subcarrier (technically 4.43361875mhz)*/ 4'608'000, /* 4.608_MHz_XTAL Luxor ABC-77 keyboard (Keytronic custom part #48-300-107 is equivalent) */ 4'915'200, /* 4.9152_MHz_XTAL - */ - 5'000'000, /* 5.0_MHz_XTAL Mutant Night */ + 5'000'000, /* 5_MHz_XTAL Mutant Night */ 5'068'800, /* 5.0688_MHz_XTAL Usually used as MC2661 or COM8116 baud rate clock */ 5'185'000, /* 5.185_MHz_XTAL Intel INTELLEC® 4 */ 5'460'000, /* 5.46_MHz_XTAL ec1840 and ec1841 keyboard */ @@ -107,16 +107,16 @@ const double XTAL::known_xtals[] = { 5'714'300, /* 5.7143_MHz_XTAL Cidelsa Destroyer, TeleVideo serial keyboards */ 5'911'000, /* 5.911_MHz_XTAL Philips Videopac Plus G7400 */ 5'990'400, /* 5.9904_MHz_XTAL Luxor ABC 800 keyboard (Keytronic custom part #48-300-008 is equivalent) */ - 6'000'000, /* 6.0_MHz_XTAL American Poker II, Taito SJ System */ + 6'000'000, /* 6_MHz_XTAL American Poker II, Taito SJ System */ 6'144'000, /* 6.144_MHz_XTAL Used on Alpha Denshi early 80's games sound board, Casio FP-200 and Namco Universal System 16 */ 6'500'000, /* 6.5_MHz_XTAL Jupiter Ace */ 6'880'000, /* 6.88_MHz_XTAL Barcrest MPU4 */ 6'900'000, /* 6.9_MHz_XTAL BBN BitGraph CPU */ - 7'000'000, /* 7.0_MHz_XTAL Jaleco Mega System PCBs */ + 7'000'000, /* 7_MHz_XTAL Jaleco Mega System PCBs */ 7'159'090, /* 7.15909_MHz_XTAL Blood Bros (2x NTSC subcarrier) */ 7'372'800, /* 7.3728_MHz_XTAL - */ 7'864'300, /* 7.8643_MHz_XTAL Used on InterFlip games as video clock */ - 8'000'000, /* 8.0_MHz_XTAL Extremely common, used on 100's of PCBs */ + 8'000'000, /* 8_MHz_XTAL Extremely common, used on 100's of PCBs */ 8'200'000, /* 8.2_MHz_XTAL Universal Mr. Do - Model 8021 PCB */ 8'388'000, /* 8.388_MHz_XTAL Nintendo Game Boy Color */ 8'448'000, /* 8.448_MHz_XTAL Banpresto's Note Chance - Used to drive OKI M6295 chips, usually with /8 divider */ @@ -132,7 +132,7 @@ const double XTAL::known_xtals[] = { 9'832'000, /* 9.832_MHz_XTAL Robotron A7150 */ 9'877'680, /* 9.87768_MHz_XTAL Microterm 420 */ 9'987'000, /* 9.987_MHz_XTAL Crazy Balloon */ - 10'000'000, /* 10.0_MHz_XTAL - */ + 10'000'000, /* 10_MHz_XTAL - */ 10'245'000, /* 10.245_MHz_XTAL PES Speech box */ 10'380'000, /* 10.38_MHz_XTAL Fairlight Q219 Lightpen/Graphics Card */ 10'500'000, /* 10.5_MHz_XTAL Agat-7 */ @@ -145,7 +145,7 @@ const double XTAL::known_xtals[] = { 10'738'635, /* 10.738635_MHz_XTAL TMS9918 family (3x NTSC subcarrier) */ 10'816'000, /* 10.816_MHz_XTAL Universal 1979-1980 (Cosmic Alien, etc) */ 10'920'000, /* 10.92_MHz_XTAL ADDS Viewpoint 60, Viewpoint A2 */ - 11'000'000, /* 11.0_MHz_XTAL Mario I8039 sound */ + 11'000'000, /* 11_MHz_XTAL Mario I8039 sound */ 11'059'200, /* 11.0592_MHz_XTAL Used with MCS-51 to generate common baud rates */ 11'200'000, /* 11.2_MHz_XTAL New York, New York */ 11'289'000, /* 11.289_MHz_XTAL Vanguard */ @@ -153,7 +153,7 @@ const double XTAL::known_xtals[] = { 11'668'800, /* 11.6688_MHz_XTAL Gameplan pixel clock */ 11'800'000, /* 11.8_MHz_XTAL IBM PC Music Feature Card */ 11'980'800, /* 11.9808_MHz_XTAL Luxor ABC 80 */ - 12'000'000, /* 12.0_MHz_XTAL Extremely common, used on 100's of PCBs */ + 12'000'000, /* 12_MHz_XTAL Extremely common, used on 100's of PCBs */ 12'057'600, /* 12.0576_MHz_XTAL Poly 1 (38400 * 314) */ 12'096'000, /* 12.096_MHz_XTAL Some early 80's Atari games */ 12'288'000, /* 12.288_MHz_XTAL Sega Model 3 digital audio board */ @@ -173,7 +173,7 @@ const double XTAL::known_xtals[] = { 13'495'200, /* 13.4952_MHz_XTAL Used on Shadow Force pcb and maybe other Technos pcbs? */ 13'516'800, /* 13.5168_MHz_XTAL Kontron KDT6 */ 13'608'000, /* 13.608_MHz_XTAL TeleVideo 910 & 925 */ - 14'000'000, /* 14.0_MHz_XTAL - */ + 14'000'000, /* 14_MHz_XTAL - */ 14'112'000, /* 14.112_MHz_XTAL Timex/Sinclair TS2068 */ 14'192'640, /* 14.19264_MHz_XTAL Central Data 2650 */ 14'218'000, /* 14.218_MHz_XTAL Dragon */ @@ -183,7 +183,7 @@ const double XTAL::known_xtals[] = { 14'705'882, /* 14.705882_MHz_XTAL Aleck64 */ 14'745'600, /* 14.7456_MHz_XTAL Namco System 12 & System Super 22/23 for JVS */ 14'916'000, /* 14.916_MHz_XTAL ADDS Viewpoint 122 */ - 15'000'000, /* 15.0_MHz_XTAL Sinclair QL, Amusco Poker */ + 15'000'000, /* 15_MHz_XTAL Sinclair QL, Amusco Poker */ 15'148'800, /* 15.1488_MHz_XTAL Zentec 9002/9003 */ 15'288'000, /* 15.288_MHz_XTAL DEC VT220 80-column display clock */ 15'300'720, /* 15.30072_MHz_XTAL Microterm 420 */ @@ -194,7 +194,7 @@ const double XTAL::known_xtals[] = { 15'897'600, /* 15.8976_MHz_XTAL IAI Swyft */ 15'920'000, /* 15.92_MHz_XTAL HP Integral PC */ 15'974'400, /* 15.9744_MHz_XTAL Osborne 1 (9600 * 52 * 32) */ - 16'000'000, /* 16.0_MHz_XTAL Extremely common, used on 100's of PCBs */ + 16'000'000, /* 16_MHz_XTAL Extremely common, used on 100's of PCBs */ 16'097'280, /* 16.09728_MHz_XTAL DEC VT240 (1024 * 262 * 60) */ 16'128'000, /* 16.128_MHz_XTAL Fujitsu FM-7 */ 16'384'000, /* 16.384_MHz_XTAL - */ @@ -210,7 +210,7 @@ const double XTAL::known_xtals[] = { 17'734'470, /* 17.73447_MHz_XTAL (~4x PAL subcarrier) */ 17'734'472, /* 17.734472_MHz_XTAL actually ~4x PAL subcarrier */ 17'971'200, /* 17.9712_MHz_XTAL - */ - 18'000'000, /* 18.0_MHz_XTAL S.A.R, Ikari Warriors 3 */ + 18'000'000, /* 18_MHz_XTAL S.A.R, Ikari Warriors 3 */ 18'432'000, /* 18.432_MHz_XTAL Extremely common, used on 100's of PCBs (48000 * 384) */ 18'575'000, /* 18.575_MHz_XTAL Visual 102, Visual 220 */ 18'720'000, /* 18.72_MHz_XTAL Nokia MikroMikko 1 */ @@ -221,18 +221,18 @@ const double XTAL::known_xtals[] = { 19'661'400, /* 19.6614_MHz_XTAL Wyse WY-30 */ 19'923'000, /* 19.923_MHz_XTAL Cinematronics vectors */ 19'968'000, /* 19.968_MHz_XTAL Used mostly by some Taito games */ - 20'000'000, /* 20.0_MHz_XTAL - */ + 20'000'000, /* 20_MHz_XTAL - */ 20'160'000, /* 20.16_MHz_XTAL Nintendo 8080 */ 20'625'000, /* 20.625_MHz_XTAL SM 7238 */ 20'790'000, /* 20.79_MHz_XTAL Blockade-hardware Gremlin games */ - 21'000'000, /* 21.0_MHz_XTAL Lock-On pixel clock */ + 21'000'000, /* 21_MHz_XTAL Lock-On pixel clock */ 21'052'600, /* 21.0526_MHz_XTAL NEC PC-98xx pixel clock */ 21'060'000, /* 21.06_MHz_XTAL HP 264x display clock (60 Hz configuration) */ 21'254'400, /* 21.2544_MHz_XTAL TeleVideo 970 132-column display clock */ 21'281'370, /* 21.28137_MHz_XTAL Radica Tetris (PAL) */ 21'300'000, /* 21.3_MHz_XTAL - */ 21'477'272, /* 21.477272_MHz_XTAL BMC bowling, some Data East 90's games, Vtech Socrates; (6x NTSC subcarrier) */ - 22'000'000, /* 22.0_MHz_XTAL - */ + 22'000'000, /* 22_MHz_XTAL - */ 22'096'000, /* 22.096_MHz_XTAL ADDS Viewpoint 122 */ 22'118'400, /* 22.1184_MHz_XTAL Amusco Poker */ 22'321'000, /* 22.321_MHz_XTAL Apple LaserWriter II NT */ @@ -240,11 +240,11 @@ const double XTAL::known_xtals[] = { 22'896'000, /* 22.896_MHz_XTAL DEC VT220 132-column display clock */ 23'814'000, /* 23.814_MHz_XTAL TeleVideo TVI-912, 920 & 950 */ 23'961'600, /* 23.9616_MHz_XTAL Osborne 4 (Vixen) */ - 24'000'000, /* 24.0_MHz_XTAL Mario, 80's Data East games, 80's Konami games */ + 24'000'000, /* 24_MHz_XTAL Mario, 80's Data East games, 80's Konami games */ 24'073'400, /* 24.0734_MHz_XTAL DEC Rainbow 100 */ 24'576'000, /* 24.576_MHz_XTAL Pole Position h/w, Model 3 CPU board */ 24'883'200, /* 24.8832_MHz_XTAL DEC VT100 */ - 25'000'000, /* 25.0_MHz_XTAL Namco System 22, Taito GNET, Dogyuun h/w */ + 25'000'000, /* 25_MHz_XTAL Namco System 22, Taito GNET, Dogyuun h/w */ 25'174'800, /* 25.1748_MHz_XTAL Sega System 16A/16B (1600x NTSC line rate) */ 25'200'000, /* 25.2_MHz_XTAL Tektronix 4404 video clock */ 25'398'360, /* 25.39836_MHz_XTAL Tandberg TDV 2324 */ @@ -253,7 +253,7 @@ const double XTAL::known_xtals[] = { 25'593'900, /* 25.5939_MHz_XTAL Atari Jaguar PAL */ 25'771'500, /* 25.7715_MHz_XTAL HP-2622A */ 25'920'000, /* 25.92_MHz_XTAL ADDS Viewpoint 60 */ - 26'000'000, /* 26.0_MHz_XTAL Gaelco PCBs */ + 26'000'000, /* 26_MHz_XTAL Gaelco PCBs */ 26'366'000, /* 26.366_MHz_XTAL DEC VT320 */ 26'580'000, /* 26.58_MHz_XTAL Wyse WY-60 80-column display clock */ 26'601'712, /* 26.601712_MHz_XTAL Astro Corp.'s Show Hand, PAL Vtech/Yeno Socrates (6x PAL subcarrier) */ @@ -261,11 +261,11 @@ const double XTAL::known_xtals[] = { 26'666'666, /* 26.666666_MHz_XTAL Irem M92 but most use 27MHz */ 26'686'000, /* 26.686_MHz_XTAL Typically used on 90's Taito PCBs to drive the custom chips */ 26'989'200, /* 26.9892_MHz_XTAL TeleVideo 965 */ - 27'000'000, /* 27.0_MHz_XTAL Some Banpresto games macrossp, Irem M92 and 90's Toaplan games */ + 27'000'000, /* 27_MHz_XTAL Some Banpresto games macrossp, Irem M92 and 90's Toaplan games */ 27'164'000, /* 27.164_MHz_XTAL Typically used on 90's Taito PCBs to drive the custom chips */ 27'210'900, /* 27.2109_MHz_XTAL LA Girl */ 27'562'000, /* 27.562_MHz_XTAL Visual 220 */ - 28'000'000, /* 28.0_MHz_XTAL - */ + 28'000'000, /* 28_MHz_XTAL - */ 28'322'000, /* 28.322_MHz_XTAL Saitek RISC 2500, Mephisto Montreux */ 28'375'160, /* 28.37516_MHz_XTAL Amiga PAL systems */ 28'475'000, /* 28.475_MHz_XTAL CoCo 3 PAL */ @@ -275,72 +275,72 @@ const double XTAL::known_xtals[] = { 28'700'000, /* 28.7_MHz_XTAL - */ 29'376'000, /* 29.376_MHz_XTAL Qume QVT-103 */ 29'491'200, /* 29.4912_MHz_XTAL Xerox Alto-II system clock (tagged 29.4MHz in the schematics) */ - 30'000'000, /* 30.0_MHz_XTAL Impera Magic Card */ + 30'000'000, /* 30_MHz_XTAL Impera Magic Card */ 30'476'100, /* 30.4761_MHz_XTAL Taito JC */ 30'800'000, /* 30.8_MHz_XTAL 15IE-00-013 */ 31'279'500, /* 31.2795_MHz_XTAL Wyse WY-30+ */ 31'684'000, /* 31.684_MHz_XTAL TeleVideo TVI-955 132-column display clock */ 31'948'800, /* 31.9488_MHz_XTAL NEC PC-88xx, PC-98xx */ - 32'000'000, /* 32.0_MHz_XTAL - */ + 32'000'000, /* 32_MHz_XTAL - */ 32'220'000, /* 32.22_MHz_XTAL Typically used on 90's Data East PCBs (close to 9x NTSC subcarrier which is 32.215905Mhz */ 32'317'400, /* 32.3174_MHz_XTAL DEC VT330, VT340 */ 32'530'400, /* 32.5304_MHz_XTAL Seta 2 */ - 33'000'000, /* 33.0_MHz_XTAL Sega Model 3 video board */ + 33'000'000, /* 33_MHz_XTAL Sega Model 3 video board */ 33'264'000, /* 33.264_MHz_XTAL Hazeltine 1500 terminal */ 33'333'000, /* 33.333_MHz_XTAL Sega Model 3 CPU board, Vegas */ 33'833'000, /* 33.833_MHz_XTAL - */ 33'868'800, /* 33.8688_MHz_XTAL Usually used to drive 90's Yamaha OPL/FM chips with /2 divider */ - 34'000'000, /* 34.0_MHz_XTAL Gaelco PCBs */ + 34'000'000, /* 34_MHz_XTAL Gaelco PCBs */ 34'291'712, /* 34.291712_MHz_XTAL Fairlight CMI master card */ - 36'000'000, /* 36.0_MHz_XTAL Sega Model 1 video board */ + 36'000'000, /* 36_MHz_XTAL Sega Model 1 video board */ 38'769'220, /* 38.76922_MHz_XTAL Namco System 21 video board */ 39'321'600, /* 39.3216_MHz_XTAL Sun 2/120 */ 39'710'000, /* 39.71_MHz_XTAL Wyse WY-60 132-column display clock */ - 40'000'000, /* 40.0_MHz_XTAL - */ + 40'000'000, /* 40_MHz_XTAL - */ 40'210'000, /* 40.21_MHz_XTAL Fairlight CMI IIx */ - 42'000'000, /* 42.0_MHz_XTAL BMC A-00211 - Popo Bear */ + 42'000'000, /* 42_MHz_XTAL BMC A-00211 - Popo Bear */ 42'105'200, /* 42.1052_MHz_XTAL NEC PC-88xx */ 42'954'545, /* 42.954545_MHz_XTAL CPS3 (12x NTSC subcarrier)*/ 43'320'000, /* 43.32_MHz_XTAL DEC VT420 */ 44'100'000, /* 44.1_MHz_XTAL Subsino's Bishou Jan */ 44'452'800, /* 44.4528_MHz_XTAL TeleVideo 965 */ - 45'000'000, /* 45.0_MHz_XTAL Eolith with Hyperstone CPUs */ + 45'000'000, /* 45_MHz_XTAL Eolith with Hyperstone CPUs */ 45'158'000, /* 45.158_MHz_XTAL Sega Model 2A video board, Model 3 CPU board */ 45'619'200, /* 45.6192_MHz_XTAL DEC VK100 */ 45'830'400, /* 45.8304_MHz_XTAL Microterm 5510 */ 47'736'000, /* 47.736_MHz_XTAL Visual 100 */ - 48'000'000, /* 48.0_MHz_XTAL Williams/Midway Y/Z-unit system / SSV board */ + 48'000'000, /* 48_MHz_XTAL Williams/Midway Y/Z-unit system / SSV board */ 48'384'000, /* 48.384_MHz_XTAL Namco NB-1 */ 48'556'800, /* 48.5568_MHz_XTAL Wyse WY-85 */ 48'654'000, /* 48.654_MHz_XTAL Qume QVT-201 */ 48'660'000, /* 48.66_MHz_XTAL Zaxxon */ 49'152'000, /* 49.152_MHz_XTAL Used on some Namco PCBs, Baraduke h/w, System 21, Super System 22 */ 49'423'500, /* 49.4235_MHz_XTAL Wyse WY-185 */ - 50'000'000, /* 50.0_MHz_XTAL Williams/Midway T/W/V-unit system */ + 50'000'000, /* 50_MHz_XTAL Williams/Midway T/W/V-unit system */ 50'113'000, /* 50.113_MHz_XTAL Namco NA-1 (14x NTSC subcarrier)*/ 50'349'000, /* 50.349_MHz_XTAL Sega System 18 (~3200x NTSC line rate) */ - 52'000'000, /* 52.0_MHz_XTAL Cojag */ + 52'000'000, /* 52_MHz_XTAL Cojag */ 52'832'000, /* 52.832_MHz_XTAL Wang PC TIG video controller */ 53'203'400, /* 53.2034_MHz_XTAL Master System, Mega Drive PAL (~12x PAL subcarrier) */ 53'693'175, /* 53.693175_MHz_XTAL PSX-based h/w, Sony ZN1-2-based (15x NTSC subcarrier) */ - 54'000'000, /* 54.0_MHz_XTAL Taito JC */ - 55'000'000, /* 55.0_MHz_XTAL Eolith Vega */ + 54'000'000, /* 54_MHz_XTAL Taito JC */ + 55'000'000, /* 55_MHz_XTAL Eolith Vega */ 57'272'727, /* 57.272727_MHz_XTAL Psikyo SH2 with /2 divider (16x NTSC subcarrier)*/ - 58'000'000, /* 58.0_MHz_XTAL Magic Reel (Play System) */ + 58'000'000, /* 58_MHz_XTAL Magic Reel (Play System) */ 59'292'000, /* 59.292_MHz_XTAL Data General D461 */ - 60'000'000, /* 60.0_MHz_XTAL - */ + 60'000'000, /* 60_MHz_XTAL - */ 61'440'000, /* 61.44_MHz_XTAL Donkey Kong */ - 64'000'000, /* 64.0_MHz_XTAL BattleToads */ + 64'000'000, /* 64_MHz_XTAL BattleToads */ 66'666'700, /* 66.6667_MHz_XTAL Later Midway games */ 67'737'600, /* 67.7376_MHz_XTAL PSX-based h/w, Sony ZN1-2-based */ 68'850'000, /* 68.85_MHz_XTAL Wyse WY-50 */ - 72'000'000, /* 72.0_MHz_XTAL Aristocrat MKV */ + 72'000'000, /* 72_MHz_XTAL Aristocrat MKV */ 72'576'000, /* 72.576_MHz_XTAL Centipede, Millipede, Missile Command, Let's Go Bowling "Multipede" */ 73'728'000, /* 73.728_MHz_XTAL Ms. Pac-Man/Galaga 20th Anniversary */ 87'183'360, /* 87.18336_MHz_XTAL AT&T 630 MTG */ - 100'000'000, /* 100.0_MHz_XTAL PSX-based Namco System 12, Vegas, Sony ZN1-2-based */ + 100'000'000, /* 100_MHz_XTAL PSX-based Namco System 12, Vegas, Sony ZN1-2-based */ 101'491'200, /* 101.4912_MHz_XTAL PSX-based Namco System 10 */ - 200'000'000 /* 200.0_MHz_XTAL Base SH4 CPU (Naomi, Hikaru etc.) */ + 200'000'000 /* 200_MHz_XTAL Base SH4 CPU (Naomi, Hikaru etc.) */ }; double XTAL::last_correct_value = -1; diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp index 2b7e5e169a4..b6ff3a50174 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, 16.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(dfeveron_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2140,7 +2140,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::ddonpach) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(ddonpach_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2180,7 +2180,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::donpachi) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(donpachi_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2227,7 +2227,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::esprade) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(esprade_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2267,7 +2267,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::gaia) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(gaia_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2308,7 +2308,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::guwange) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(guwange_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2347,11 +2347,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::hotdogst) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 32.0_MHz_XTAL/2) + MCFG_CPU_ADD("maincpu", M68000, 32_MHz_XTAL/2) MCFG_CPU_PROGRAM_MAP(hotdogst_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, 32.0_MHz_XTAL/8) + MCFG_CPU_ADD("audiocpu", Z80, 32_MHz_XTAL/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, 32.0_MHz_XTAL/8) + MCFG_SOUND_ADD("ymsnd", YM2203, 32_MHz_XTAL/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", 32.0_MHz_XTAL/16, PIN7_HIGH) // pin 7 not verified + MCFG_OKIM6295_ADD("oki", 32_MHz_XTAL/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, 16.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(korokoro_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2445,11 +2445,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::mazinger) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(mazinger_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, 4.0_MHz_XTAL) // Bidirectional communication + MCFG_CPU_ADD("audiocpu", Z80, 4_MHz_XTAL) // Bidirectional communication MCFG_CPU_PROGRAM_MAP(mazinger_sound_map) MCFG_CPU_IO_MAP(mazinger_sound_portmap) @@ -2481,7 +2481,7 @@ MACHINE_CONFIG_START(cave_state::mazinger) MCFG_GENERIC_LATCH_16_ADD("soundlatch") - MCFG_SOUND_ADD("ymsnd", YM2203, 4.0_MHz_XTAL) + MCFG_SOUND_ADD("ymsnd", YM2203, 4_MHz_XTAL) MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.20) MCFG_SOUND_ROUTE(1, "mono", 0.20) @@ -2501,11 +2501,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::metmqstr) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 32.0_MHz_XTAL / 2) + MCFG_CPU_ADD("maincpu", M68000, 32_MHz_XTAL / 2) MCFG_CPU_PROGRAM_MAP(metmqstr_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, 32.0_MHz_XTAL / 4) + MCFG_CPU_ADD("audiocpu", Z80, 32_MHz_XTAL / 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", 16.0_MHz_XTAL / 4) + MCFG_YM2151_ADD("ymsnd", 16_MHz_XTAL / 4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6) - MCFG_OKIM6295_ADD("oki1", 32.0_MHz_XTAL / 16 , PIN7_HIGH) + MCFG_OKIM6295_ADD("oki1", 32_MHz_XTAL / 16 , PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MCFG_DEVICE_ADDRESS_MAP(0, oki_map) - MCFG_OKIM6295_ADD("oki2", 32.0_MHz_XTAL / 16 , PIN7_HIGH) + MCFG_OKIM6295_ADD("oki2", 32_MHz_XTAL / 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, 28.0_MHz_XTAL / 2) + MCFG_CPU_ADD("maincpu", M68000, 28_MHz_XTAL / 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", 28.0_MHz_XTAL / 28, PIN7_HIGH) // clock frequency & pin 7 not verified + MCFG_OKIM6295_ADD("oki1", 28_MHz_XTAL / 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", 28.0_MHz_XTAL / 28, PIN7_HIGH) // clock frequency & pin 7 not verified + MCFG_OKIM6295_ADD("oki2", 28_MHz_XTAL / 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, 16.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(ppsatan_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt_ppsatan) @@ -2681,11 +2681,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::pwrinst2) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) /* 16 MHz */ + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) /* 16 MHz */ MCFG_CPU_PROGRAM_MAP(pwrinst2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, 16.0_MHz_XTAL / 2) /* 8 MHz */ + MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL / 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, 16.0_MHz_XTAL / 4) + MCFG_SOUND_ADD("ymsnd", YM2203, 16_MHz_XTAL / 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", 3.0_MHz_XTAL, PIN7_LOW) + MCFG_OKIM6295_ADD("oki1", 3_MHz_XTAL, PIN7_LOW) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_OKIM6295_ADD("oki2", 3.0_MHz_XTAL, PIN7_LOW) + MCFG_OKIM6295_ADD("oki2", 3_MHz_XTAL, 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, 16.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) 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, 8.0_MHz_XTAL) // Bidirectional Communication + MCFG_CPU_ADD("audiocpu", Z80, 8_MHz_XTAL) // 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", 16.0_MHz_XTAL/4) + MCFG_YM2151_ADD("ymsnd", 16_MHz_XTAL/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, 28.0_MHz_XTAL / 2) + MCFG_CPU_ADD("maincpu", M68000, 28_MHz_XTAL / 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", 28.0_MHz_XTAL / 28, PIN7_HIGH) // clock frequency & pin 7 not verified + MCFG_OKIM6295_ADD("oki1", 28_MHz_XTAL / 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, 28.0_MHz_XTAL / 2) + MCFG_CPU_ADD("maincpu", M68000, 28_MHz_XTAL / 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", 28.0_MHz_XTAL / 28, PIN7_HIGH) // clock frequency & pin 7 not verified + MCFG_OKIM6295_ADD("oki1", 28_MHz_XTAL / 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, 16.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(uopoko_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) diff --git a/src/mame/drivers/ckz80.cpp b/src/mame/drivers/ckz80.cpp index 1f4ec3b2fe2..f22e97e740f 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, 8.0_MHz_XTAL/2) + MCFG_CPU_ADD("maincpu", Z80, 8_MHz_XTAL/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/cxgz80.cpp b/src/mame/drivers/cxgz80.cpp index b6d7ef262ba..6d894e8b069 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, 8.0_MHz_XTAL/2) + MCFG_CPU_ADD("maincpu", Z80, 8_MHz_XTAL/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/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp index 9c6368cee9b..dae558a5463 100644 --- a/src/mame/drivers/ddragon3.cpp +++ b/src/mame/drivers/ddragon3.cpp @@ -817,7 +817,7 @@ void ddragon3_state::machine_reset() MACHINE_CONFIG_START(ddragon3_state::ddragon3) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 20.0_MHz_XTAL / 2) + MCFG_CPU_ADD("maincpu", M68000, 20_MHz_XTAL / 2) MCFG_CPU_PROGRAM_MAP(ddragon3_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ddragon3_state, ddragon3_scanline, "screen", 0, 1) @@ -826,7 +826,7 @@ MACHINE_CONFIG_START(ddragon3_state::ddragon3) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(28.0_MHz_XTAL / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */ + MCFG_SCREEN_RAW_PARAMS(28_MHz_XTAL / 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") @@ -892,7 +892,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(wwfwfest_state::wwfwfest) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 24.0_MHz_XTAL / 2) /* 24 crystal, 12 rated chip */ + MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL / 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) @@ -903,7 +903,7 @@ MACHINE_CONFIG_START(wwfwfest_state::wwfwfest) MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(28.0_MHz_XTAL / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */ + MCFG_SCREEN_RAW_PARAMS(28_MHz_XTAL / 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") diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp index 06df86b137a..ff6e33413d6 100644 --- a/src/mame/drivers/dooyong.cpp +++ b/src/mame/drivers/dooyong.cpp @@ -1454,7 +1454,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::sound_2151) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) - MCFG_OKIM6295_ADD("oki", 1.0_MHz_XTAL, PIN7_HIGH) + MCFG_OKIM6295_ADD("oki", 1_MHz_XTAL, 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", 16.0_MHz_XTAL/4) /* 4MHz (16MHz/4 for most, 8Mhz/2 for Super-X) */ + MCFG_YM2151_ADD("ymsnd", 16_MHz_XTAL/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", 16.0_MHz_XTAL/16, PIN7_HIGH) /* 1MHz (16MHz/16 for most, 8Mhz/8 for Super-X) */ + MCFG_OKIM6295_ADD("oki", 16_MHz_XTAL/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, 16.0_MHz_XTAL/2) /* 8MHz verified for Last Day / D-day */ + MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL/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, 16.0_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */ + MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/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, 16.0_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */ + MCFG_SOUND_ADD("ym1", YM2203, 16_MHz_XTAL/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, 16.0_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */ + MCFG_SOUND_ADD("ym2", YM2203, 16_MHz_XTAL/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, 16.0_MHz_XTAL/2) /* 8Mhz */ + MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8Mhz */ MCFG_CPU_PROGRAM_MAP(pollux_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, 16.0_MHz_XTAL/4) /* 4Mhz */ + MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/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, 16.0_MHz_XTAL/2) /* 8MHz */ + MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz */ MCFG_CPU_PROGRAM_MAP(flytiger_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, 16.0_MHz_XTAL/4) /* 4Mhz */ + MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/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, 16.0_MHz_XTAL/2) /* 8MHz */ + MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz */ MCFG_CPU_PROGRAM_MAP(primella_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, 16.0_MHz_XTAL/4) /* 4MHz */ + MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/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, 8.0_MHz_XTAL) // 8MHz measured on Super-X + MCFG_CPU_ADD("maincpu", M68000, 8_MHz_XTAL) // 8MHz measured on Super-X MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dooyong_68k_state, scanline, "screen", 0, 1) - MCFG_CPU_ADD("audiocpu", Z80, 8.0_MHz_XTAL/2) // 4MHz measured on Super-X + MCFG_CPU_ADD("audiocpu", Z80, 8_MHz_XTAL/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, 20.0_MHz_XTAL/2) // 10MHz measured + MCFG_CPU_ADD("maincpu", M68000, 20_MHz_XTAL/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, 16.0_MHz_XTAL/4) // 4MHz measured + MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/4) // 4MHz measured MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map) // video hardware diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp index 92fdeafaa2e..e4326f32c00 100644 --- a/src/mame/drivers/equites.cpp +++ b/src/mame/drivers/equites.cpp @@ -1130,7 +1130,7 @@ void equites_state::machine_reset() MACHINE_CONFIG_START(equites_state::equites) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 12.0_MHz_XTAL/4) /* 68000P8 running at 3mhz! verified on pcb */ + MCFG_CPU_ADD("maincpu", M68000, 12_MHz_XTAL/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, 24.0_MHz_XTAL/4) /* 68000P8 running at 6mhz, verified on pcb */ + MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL/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/eva.cpp b/src/mame/drivers/eva.cpp index 5df8b41ca8e..ff670e0515d 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, 640.0_kHz_XTAL/2) // guessed + MCFG_CPU_ADD("maincpu", COP420, 640_kHz_XTAL/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, 640.0_kHz_XTAL/4) + MCFG_DEVICE_ADD("tms6100", TMS6100, 640_kHz_XTAL/4) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("tms5100", TMS5110A, 640.0_kHz_XTAL) + MCFG_SOUND_ADD("tms5100", TMS5110A, 640_kHz_XTAL) MCFG_FRAGMENT_ADD(tms5110_route) MACHINE_CONFIG_END MACHINE_CONFIG_START(eva_state::eva11) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", TMS1000, 640.0_kHz_XTAL/2) // from TMS5110A CPU CK + MCFG_CPU_ADD("maincpu", TMS1000, 640_kHz_XTAL/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, 640.0_kHz_XTAL/4) + MCFG_DEVICE_ADD("tms6100", TMS6100, 640_kHz_XTAL/4) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("tms5100", TMS5110A, 640.0_kHz_XTAL) + MCFG_SOUND_ADD("tms5100", TMS5110A, 640_kHz_XTAL) MCFG_FRAGMENT_ADD(tms5110_route) MACHINE_CONFIG_END diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp index 9eb6ff362a2..0bec9839be6 100644 --- a/src/mame/drivers/fidel6502.cpp +++ b/src/mame/drivers/fidel6502.cpp @@ -603,7 +603,7 @@ READ8_MEMBER(fidel6502_state::csc_speech_r) void fidel6502_state::su9_set_cpu_freq() { // SU9 CPU is clocked 1.95MHz, DS9 is 2.5MHz - m_maincpu->set_unscaled_clock((ioport("FAKE")->read() & 1) ? (5.0_MHz_XTAL/2) : (3.9_MHz_XTAL/2)); + m_maincpu->set_unscaled_clock((ioport("FAKE")->read() & 1) ? (5_MHz_XTAL/2) : (3.9_MHz_XTAL/2)); } MACHINE_RESET_MEMBER(fidel6502_state, su9) @@ -1712,7 +1712,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel6502_state::eas) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", R65C02, 3.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", R65C02, 3_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(eas_map) MCFG_CPU_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed @@ -1747,7 +1747,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(fidel6502_state::eag, eas) /* basic machine hardware */ - MCFG_CPU_REPLACE("maincpu", R65C02, 5.0_MHz_XTAL) // R65C02P4 + MCFG_CPU_REPLACE("maincpu", R65C02, 5_MHz_XTAL) // R65C02P4 MCFG_CPU_PROGRAM_MAP(eag_map) MCFG_CPU_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed @@ -1804,13 +1804,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel6502_state::sc12) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", R65C02, 3.0_MHz_XTAL) // R65C02P3 + MCFG_CPU_ADD("maincpu", R65C02, 3_MHz_XTAL) // 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(3.0_MHz_XTAL)) // MCFG_QUANTUM_PERFECT_CPU("maincpu") didn't work + MCFG_TIMER_DRIVER_ADD_PERIODIC("dummy_timer", fidel6502_state, dummy, attotime::from_hz(3_MHz_XTAL)) // MCFG_QUANTUM_PERFECT_CPU("maincpu") didn't work MCFG_DEVICE_ADD("sc12_map", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(sc12_map) @@ -1838,7 +1838,7 @@ MACHINE_CONFIG_DERIVED(fidel6502_state::sc12b, sc12) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") - MCFG_DEVICE_CLOCK(4.0_MHz_XTAL) // R65C02P4 + MCFG_DEVICE_CLOCK(4_MHz_XTAL) // R65C02P4 // change irq timer frequency MCFG_DEVICE_REMOVE("irq_on") @@ -1848,13 +1848,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(4.0_MHz_XTAL)) // MCFG_QUANTUM_PERFECT_CPU("maincpu") didn't work + MCFG_TIMER_DRIVER_ADD_PERIODIC("dummy_timer", fidel6502_state, dummy, attotime::from_hz(4_MHz_XTAL)) // 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, 12.0_MHz_XTAL/4) // G65SC102P-3, 12.0M ceramic resonator + MCFG_CPU_ADD("maincpu", M65SC02, 12_MHz_XTAL/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 @@ -1873,7 +1873,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(fidel6502_state::fexcel4, fexcel) /* basic machine hardware */ - MCFG_CPU_REPLACE("maincpu", R65C02, 4.0_MHz_XTAL) // R65C02P4 + MCFG_CPU_REPLACE("maincpu", R65C02, 4_MHz_XTAL) // R65C02P4 MCFG_CPU_PROGRAM_MAP(fexcel_map) MACHINE_CONFIG_END @@ -1887,7 +1887,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(fidel6502_state::fexcelp, fexcel) /* basic machine hardware */ - MCFG_CPU_REPLACE("maincpu", R65C02, 5.0_MHz_XTAL) // R65C02P4 + MCFG_CPU_REPLACE("maincpu", R65C02, 5_MHz_XTAL) // R65C02P4 MCFG_CPU_PROGRAM_MAP(fexcelp_map) MACHINE_CONFIG_END @@ -1895,13 +1895,13 @@ MACHINE_CONFIG_DERIVED(fidel6502_state::granits, fexcelp) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") - MCFG_DEVICE_CLOCK(8.0_MHz_XTAL) // overclocked + MCFG_DEVICE_CLOCK(8_MHz_XTAL) // overclocked MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(fidel6502_state::fdes2100, fexcel) /* basic machine hardware */ - MCFG_CPU_REPLACE("maincpu", M65C02, 5.0_MHz_XTAL) // WDC 65C02 + MCFG_CPU_REPLACE("maincpu", M65C02, 5_MHz_XTAL) // WDC 65C02 MCFG_CPU_PROGRAM_MAP(fexcelp_map) // change irq timer frequency @@ -1917,7 +1917,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(fidel6502_state::fdes2000, fdes2100) /* basic machine hardware */ - MCFG_CPU_REPLACE("maincpu", R65C02, 3.0_MHz_XTAL) // RP65C02G + MCFG_CPU_REPLACE("maincpu", R65C02, 3_MHz_XTAL) // RP65C02G MCFG_CPU_PROGRAM_MAP(fexcelp_map) MACHINE_CONFIG_END @@ -1938,7 +1938,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel6502_state::fdes2100d) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M65C02, 6.0_MHz_XTAL) // W65C02P-6 + MCFG_CPU_ADD("maincpu", M65C02, 6_MHz_XTAL) // 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 @@ -1957,7 +1957,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(fidel6502_state::fdes2000d, fdes2100d) /* basic machine hardware */ - MCFG_CPU_REPLACE("maincpu", R65C02, 3.0_MHz_XTAL) // R65C02P3 + MCFG_CPU_REPLACE("maincpu", R65C02, 3_MHz_XTAL) // R65C02P3 MCFG_CPU_PROGRAM_MAP(fdesdis_map) MACHINE_CONFIG_END @@ -1983,7 +1983,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel6502_state::chesster) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", R65C02, 5.0_MHz_XTAL) // RP65C02G + MCFG_CPU_ADD("maincpu", R65C02, 5_MHz_XTAL) // 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 diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp index 8cea54cb6ad..98e165b4933 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, 12.0_MHz_XTAL) // HD68HC000P12 + MCFG_CPU_ADD("maincpu", M68000, 12_MHz_XTAL) // 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(16.0_MHz_XTAL) // factory overclock + MCFG_DEVICE_CLOCK(16_MHz_XTAL) // 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, 16.0_MHz_XTAL) // MC68HC000P12F + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) // 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, 20.0_MHz_XTAL) // MC68EC020RP25 + MCFG_CPU_REPLACE("maincpu", M68EC020, 20_MHz_XTAL) // MC68EC020RP25 MCFG_CPU_PROGRAM_MAP(fdes2325_map) MCFG_DEFAULT_LAYOUT(layout_fidel_desdis_68kg) @@ -604,7 +604,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel68k_state::eag) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(eag_map) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel68k_state, irq_on, attotime::from_hz(4.9152_MHz_XTAL/0x2000)) // 600Hz MCFG_TIMER_START_DELAY(attotime::from_hz(4.9152_MHz_XTAL/0x2000) - attotime::from_nsec(8250)) // active for 8.25us @@ -635,7 +635,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(fidel68k_state::eagv7, eag) /* basic machine hardware */ - MCFG_CPU_REPLACE("maincpu", M68020, 20.0_MHz_XTAL) + MCFG_CPU_REPLACE("maincpu", M68020, 20_MHz_XTAL) 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, 32.0_MHz_XTAL) + MCFG_CPU_REPLACE("maincpu", M68030, 32_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(eagv7_map) MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(fidel68k_state::eagv10, eagv7) /* basic machine hardware */ - MCFG_CPU_REPLACE("maincpu", M68040, 25.0_MHz_XTAL) + MCFG_CPU_REPLACE("maincpu", M68040, 25_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(eagv11_map) MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(fidel68k_state::eagv11, eagv7) /* basic machine hardware */ - MCFG_CPU_REPLACE("maincpu", M68EC040, 36.0_MHz_XTAL*2*2) // wrong! should be M68EC060 @ 72MHz + MCFG_CPU_REPLACE("maincpu", M68EC040, 36_MHz_XTAL*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 0b3a3b1a568..226d547cc90 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, 11.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", I8040, 11_MHz_XTAL) 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 750aec92937..cb3f7ab6288 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -1665,7 +1665,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(fidelz80_state::cc10) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 4.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", Z80, 4_MHz_XTAL) 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, 4.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", Z80, 4_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(vcc_map) MCFG_CPU_IO_MAP(vcc_io) @@ -1747,12 +1747,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(fidelz80_state::vbrc) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 5.0_MHz_XTAL/2) + MCFG_CPU_ADD("maincpu", Z80, 5_MHz_XTAL/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, 5.0_MHz_XTAL) + MCFG_CPU_ADD("mcu", I8041, 5_MHz_XTAL) 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)) diff --git a/src/mame/drivers/flicker.cpp b/src/mame/drivers/flicker.cpp index e7a92d09318..a8abf901516 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, 5.0_MHz_XTAL / 8) + MCFG_CPU_ADD("maincpu", I4004, 5_MHz_XTAL / 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/gcpinbal.cpp b/src/mame/drivers/gcpinbal.cpp index 419adf3062d..d1f1960c060 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, 32.0_MHz_XTAL/2) /* 16 MHz */ + MCFG_CPU_ADD("maincpu", M68000, 32_MHz_XTAL/2) /* 16 MHz */ MCFG_CPU_PROGRAM_MAP(gcpinbal_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", gcpinbal_state, gcpinbal_interrupt) @@ -485,7 +485,7 @@ MACHINE_CONFIG_START(gcpinbal_state::gcpinbal) MCFG_DEVICE_ADD("adpcm_select", HCT157, 0) MCFG_74157_OUT_CB(DEVWRITE8("msm", msm6585_device, data_w)) - MCFG_SOUND_ADD("msm", MSM6585, 640.0_kHz_XTAL) + MCFG_SOUND_ADD("msm", MSM6585, 640_kHz_XTAL) 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/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index decc2fc92a2..7e1859e29e7 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, 12.0_MHz_XTAL/2) /* verified on pcb */ + MCFG_CPU_ADD("maincpu", Z80, 12_MHz_XTAL/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, 12.0_MHz_XTAL/4) /* verified on pcb */ + MCFG_CPU_ADD("sub", Z80, 12_MHz_XTAL/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, 12.0_MHz_XTAL/4) /* verified on pcb */ + MCFG_CPU_ADD("audiocpu", MC6809, 12_MHz_XTAL/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(12.0_MHz_XTAL/2,384,0,256,264,16,240) // assume same as Arkanoid + MCFG_SCREEN_RAW_PARAMS(12_MHz_XTAL/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, 12.0_MHz_XTAL/8) /* verified on pcb */ + MCFG_SOUND_ADD("ymsnd", YM2203, 12_MHz_XTAL/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, 455.0_kHz_XTAL) /* verified on pcb */ + MCFG_SOUND_ADD("msm", MSM5205, 455_kHz_XTAL) /* 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, 12.0_MHz_XTAL/2) /* verified on pcb */ + MCFG_CPU_ADD("maincpu", Z80, 12_MHz_XTAL/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, 12.0_MHz_XTAL/4) /* verified on pcb */ + MCFG_CPU_ADD("sub", Z80, 12_MHz_XTAL/4) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(cpu2_map) MCFG_CPU_IO_MAP(gladiatr_cpu2_io) - MCFG_CPU_ADD("audiocpu", MC6809, 12.0_MHz_XTAL/4) /* verified on pcb */ + MCFG_CPU_ADD("audiocpu", MC6809, 12_MHz_XTAL/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, 12.0_MHz_XTAL/2) /* verified on pcb */ + MCFG_DEVICE_ADD("cctl", I8741, 12_MHz_XTAL/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, 12.0_MHz_XTAL/2) /* verified on pcb */ + MCFG_DEVICE_ADD("ccpu", I8741, 12_MHz_XTAL/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, 12.0_MHz_XTAL/2) /* verified on pcb */ + MCFG_DEVICE_ADD("ucpu", I8741, 12_MHz_XTAL/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, 12.0_MHz_XTAL/2) /* verified on pcb */ + MCFG_DEVICE_ADD("csnd", I8741, 12_MHz_XTAL/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", 12.0_MHz_XTAL/8/128/2) /* verified on pcb */ + MCFG_CLOCK_ADD("tclk", 12_MHz_XTAL/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, 12.0_MHz_XTAL/8) /* verified on pcb */ + MCFG_SOUND_ADD("ymsnd", YM2203, 12_MHz_XTAL/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, 455.0_kHz_XTAL) /* verified on pcb */ + MCFG_SOUND_ADD("msm", MSM5205, 455_kHz_XTAL) /* 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/goldstar.cpp b/src/mame/drivers/goldstar.cpp index f1df1441f24..6a745078fd9 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -250,7 +250,7 @@ namespace { -constexpr XTAL MASTER_CLOCK = 12.0_MHz_XTAL; +constexpr XTAL MASTER_CLOCK = 12_MHz_XTAL; constexpr XTAL CPU_CLOCK = MASTER_CLOCK / 4; constexpr XTAL PSG_CLOCK = MASTER_CLOCK / 4; constexpr XTAL AY_CLOCK = MASTER_CLOCK / 8; @@ -9114,12 +9114,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(unkch_state::bonusch) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 12.0_MHz_XTAL / 2) + MCFG_CPU_ADD("maincpu", Z80, 12_MHz_XTAL / 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, 12.0_MHz_XTAL) + MCFG_CPU_ADD("mcu", I80C51, 12_MHz_XTAL) MCFG_DEVICE_DISABLE() /* video hardware */ diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp index 690f1bf4a79..cb38f144dac 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, 600.0_kHz_XTAL) + MCFG_CPU_ADD("maincpu", M58846, 600_kHz_XTAL) 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, 600.0_kHz_XTAL) + MCFG_CPU_ADD("maincpu", M58846, 600_kHz_XTAL) 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_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index cdd2510ffbd..4a2984d7e37 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, 400.0_kHz_XTAL) + MCFG_CPU_ADD("maincpu", TMS1100, 400_kHz_XTAL) 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 252c76ed053..e4644c633bf 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, 400.0_kHz_XTAL) + MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL) 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, 400.0_kHz_XTAL) + MCFG_CPU_ADD("maincpu", NEC_D552, 400_kHz_XTAL) 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, 400.0_kHz_XTAL) + MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL) 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, 400.0_kHz_XTAL) + MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL) 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, 400.0_kHz_XTAL) + MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL) 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, 400.0_kHz_XTAL) + MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL) 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, 400.0_kHz_XTAL) // TDK FCR400K + MCFG_CPU_ADD("maincpu", NEC_D650, 400_kHz_XTAL) // 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, 430.0_kHz_XTAL) + MCFG_CPU_ADD("maincpu", NEC_D553, 430_kHz_XTAL) 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, 400.0_kHz_XTAL) + MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL) 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, 400.0_kHz_XTAL) + MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL) 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, 400.0_kHz_XTAL) + MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL) 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/kaypro.cpp b/src/mame/drivers/kaypro.cpp index 87f8787a4e6..97dc30f4919 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, 20.0_MHz_XTAL / 8) + MCFG_CPU_ADD("maincpu", Z80, 20_MHz_XTAL / 8) MCFG_CPU_PROGRAM_MAP(kaypro_map) MCFG_CPU_IO_MAP(kayproii_io) MCFG_Z80_DAISY_CHAIN(kayproii_daisy_chain) @@ -242,23 +242,23 @@ MACHINE_CONFIG_START(kaypro_state::kayproii) 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, 20.0_MHz_XTAL / 8) + MCFG_DEVICE_ADD("z80pio_g", Z80PIO, 20_MHz_XTAL / 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, 20.0_MHz_XTAL / 8) + MCFG_DEVICE_ADD("z80pio_s", Z80PIO, 20_MHz_XTAL / 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, 20.0_MHz_XTAL / 8) + MCFG_DEVICE_ADD("sio", Z80SIO, 20_MHz_XTAL / 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", 20.0_MHz_XTAL / 20) + MCFG_FD1793_ADD("fdc", 20_MHz_XTAL / 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, 16.0_MHz_XTAL / 4) + MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL / 4) MCFG_CPU_PROGRAM_MAP(kaypro_map) MCFG_CPU_IO_MAP(kaypro484_io) MCFG_Z80_DAISY_CHAIN(kaypro484_daisy_chain) @@ -340,14 +340,14 @@ 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, 16.0_MHz_XTAL / 4) + MCFG_DEVICE_ADD("sio_1", Z80SIO, 16_MHz_XTAL / 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, 16.0_MHz_XTAL / 4) /* extra sio for modem and printer */ + MCFG_DEVICE_ADD("sio_2", Z80SIO, 16_MHz_XTAL / 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)) @@ -357,7 +357,7 @@ MACHINE_CONFIG_START(kaypro_state::kaypro484) 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", 16.0_MHz_XTAL / 16) + MCFG_FD1793_ADD("fdc", 16_MHz_XTAL / 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/laserbat.cpp b/src/mame/drivers/laserbat.cpp index 414c25a7cef..fffa2937e62 100644 --- a/src/mame/drivers/laserbat.cpp +++ b/src/mame/drivers/laserbat.cpp @@ -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", 4.0_MHz_XTAL/16/2) // from the other one's /2 clock output + MCFG_TMS3615_ADD("synth_low", 4_MHz_XTAL/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", 4.0_MHz_XTAL/16) // 4MHz divided down with a 74LS161 + MCFG_TMS3615_ADD("synth_high", 4_MHz_XTAL/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/m68705prg.cpp b/src/mame/drivers/m68705prg.cpp index 631e4d11f22..4ba89c0f34c 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, 1.0_MHz_XTAL) + MCFG_CPU_ADD("mcu", M68705P3, 1_MHz_XTAL) 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, 1.0_MHz_XTAL) + MCFG_CPU_ADD("mcu", M68705P5, 1_MHz_XTAL) 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, 1.0_MHz_XTAL) + MCFG_CPU_ADD("mcu", M68705R3, 1_MHz_XTAL) 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, 1.0_MHz_XTAL) + MCFG_CPU_ADD("mcu", M68705U3, 1_MHz_XTAL) MCFG_M68705_PORTB_W_CB(WRITE8(u3prg_state, pb_w)) MCFG_MACHINE_RESET_OVERRIDE(u3prg_state, m68705prg) diff --git a/src/mame/drivers/mikromik.cpp b/src/mame/drivers/mikromik.cpp index a62054f629b..018578ac5bd 100644 --- a/src/mame/drivers/mikromik.cpp +++ b/src/mame/drivers/mikromik.cpp @@ -488,7 +488,7 @@ MACHINE_CONFIG_START(mm1_state::mm1) MCFG_PIT8253_CLK2(6.144_MHz_XTAL/2/2) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(mm1_state, auxc_w)) - MCFG_UPD765A_ADD(UPD765_TAG, /* 16.0_MHz_XTAL/2/2 */ true, true) + MCFG_UPD765A_ADD(UPD765_TAG, /* 16_MHz_XTAL/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) diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp index eae7418b418..74809572913 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) ? (12.0_MHz_XTAL/2) : (10.0_MHz_XTAL/2)); + m_maincpu->set_unscaled_clock((ioport("FAKE")->read() & 1) ? (12_MHz_XTAL/2) : (10_MHz_XTAL/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, 8.0_MHz_XTAL/2) + MCFG_CPU_ADD("maincpu", M6502, 8_MHz_XTAL/2) MCFG_CPU_PERIODIC_INT_DRIVER(novag6502_state, irq0_line_hold, 600) // guessed MCFG_CPU_PROGRAM_MAP(supercon_map) @@ -875,7 +875,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(novag6502_state::cforte) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", R65C02, 10.0_MHz_XTAL/2) + MCFG_CPU_ADD("maincpu", R65C02, 10_MHz_XTAL/2) MCFG_CPU_PROGRAM_MAP(cforte_map) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", novag6502_state, irq_on, attotime::from_hz(32.768_kHz_XTAL/128)) // 256Hz MCFG_TIMER_START_DELAY(attotime::from_hz(32.768_kHz_XTAL/128) - attotime::from_usec(11)) // active for 11us @@ -899,7 +899,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(novag6502_state::sexpert) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M65C02, 10.0_MHz_XTAL/2) // or 12.0_MHz_XTAL/2 + MCFG_CPU_ADD("maincpu", M65C02, 10_MHz_XTAL/2) // or 12_MHz_XTAL/2 MCFG_CPU_PROGRAM_MAP(sexpert_map) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", novag6502_state, irq_on, attotime::from_hz(32.768_kHz_XTAL/128)) // 256Hz MCFG_TIMER_START_DELAY(attotime::from_hz(32.768_kHz_XTAL/128) - attotime::from_nsec(21500)) // active for 21.5us diff --git a/src/mame/drivers/novag68k.cpp b/src/mame/drivers/novag68k.cpp index e5ee66ccbd0..03af1f6bea1 100644 --- a/src/mame/drivers/novag68k.cpp +++ b/src/mame/drivers/novag68k.cpp @@ -182,7 +182,7 @@ INPUT_PORTS_END MACHINE_CONFIG_START(novag68k_state::diablo68k) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) + MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) MCFG_CPU_PERIODIC_INT_DRIVER(novag68k_state, irq2_line_hold, 256) // guessed MCFG_CPU_PROGRAM_MAP(diablo68k_map) diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp index 664a78e8134..551f310b46b 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, 24.0_MHz_XTAL / 2) // verified + MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL / 2) // verified MCFG_CPU_PROGRAM_MAP(shinygld_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", sderby_state, irq4_line_hold) diff --git a/src/mame/drivers/shangha3.cpp b/src/mame/drivers/shangha3.cpp index 1470241bb86..a6f0a29ddba 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, 48.0_MHz_XTAL/3) // TMP68HC000N-16 + MCFG_CPU_ADD("maincpu", M68000, 48_MHz_XTAL/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(48.0_MHz_XTAL/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */ + MCFG_SCREEN_RAW_PARAMS(48_MHz_XTAL/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,7 +470,7 @@ MACHINE_CONFIG_START(shangha3_state::shangha3) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("aysnd", YM2149, 48.0_MHz_XTAL/32) // 1.5MHz + MCFG_SOUND_ADD("aysnd", YM2149, 48_MHz_XTAL/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) @@ -483,11 +483,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(shangha3_state::heberpop) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 48.0_MHz_XTAL/3) // TMP68HC000N-16 like the others?? + MCFG_CPU_ADD("maincpu", M68000, 48_MHz_XTAL/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, 48.0_MHz_XTAL/8) /* 6 MHz ??? */ + MCFG_CPU_ADD("audiocpu", Z80, 48_MHz_XTAL/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(48.0_MHz_XTAL/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */ + MCFG_SCREEN_RAW_PARAMS(48_MHz_XTAL/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,7 +514,7 @@ 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, 48.0_MHz_XTAL/6) /* 8 MHz? */ + MCFG_SOUND_ADD("ymsnd", YM3438, 48_MHz_XTAL/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) @@ -527,11 +527,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(shangha3_state::blocken) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 48.0_MHz_XTAL/3) // TMP68HC000N-16 + MCFG_CPU_ADD("maincpu", M68000, 48_MHz_XTAL/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, 48.0_MHz_XTAL/8) /* 6 MHz? */ + MCFG_CPU_ADD("audiocpu", Z80, 48_MHz_XTAL/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(48.0_MHz_XTAL/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */ + MCFG_SCREEN_RAW_PARAMS(48_MHz_XTAL/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,7 +558,7 @@ 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, 48.0_MHz_XTAL/6) /* 8 MHz? */ + MCFG_SOUND_ADD("ymsnd", YM3438, 48_MHz_XTAL/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) diff --git a/src/mame/drivers/stadhero.cpp b/src/mame/drivers/stadhero.cpp index 18cb205dede..78a9e6dd617 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, 20.0_MHz_XTAL/2) + MCFG_CPU_ADD("maincpu", M68000, 20_MHz_XTAL/2) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", stadhero_state, irq5_line_hold) - MCFG_CPU_ADD("audiocpu", M6502, 24.0_MHz_XTAL/16) + MCFG_CPU_ADD("audiocpu", M6502, 24_MHz_XTAL/16) MCFG_CPU_PROGRAM_MAP(audio_map) /* video hardware */ @@ -236,13 +236,13 @@ MACHINE_CONFIG_START(stadhero_state::stadhero) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ym1", YM2203, 24.0_MHz_XTAL/16) + MCFG_SOUND_ADD("ym1", YM2203, 24_MHz_XTAL/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, 24.0_MHz_XTAL/8) + MCFG_SOUND_ADD("ym2", YM3812, 24_MHz_XTAL/8) MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index 41832057ecb..58858fd681f 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -1546,10 +1546,10 @@ MACHINE_CONFIG_START(fhawk_state::fhawk) MCFG_CPU_PROGRAM_MAP(fhawk_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) - MCFG_CPU_ADD("audiocpu", Z80, 12.0_MHz_XTAL/3) /* verified on pcb */ + MCFG_CPU_ADD("audiocpu", Z80, 12_MHz_XTAL/3) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(fhawk_3_map) - MCFG_CPU_ADD("slave", Z80, 12.0_MHz_XTAL/3) /* verified on pcb */ + MCFG_CPU_ADD("slave", Z80, 12_MHz_XTAL/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, 12.0_MHz_XTAL/4) /* verified on pcb */ + MCFG_SOUND_ADD("ymsnd", YM2203, 12_MHz_XTAL/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, 384.0_kHz_XTAL) + MCFG_SOUND_ADD("msm", MSM5205, 384_kHz_XTAL) 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, 8.0_MHz_XTAL) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */ + MCFG_SOUND_ADD("ymsnd", YM2610, 8_MHz_XTAL) /* 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) @@ -1665,7 +1665,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::kurikint) MCFG_CPU_PROGRAM_MAP(kurikint_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) - MCFG_CPU_ADD("audiocpu", Z80, 12.0_MHz_XTAL/3) /* verified on pcb */ + MCFG_CPU_ADD("audiocpu", Z80, 12_MHz_XTAL/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, 12.0_MHz_XTAL/4) /* verified on pcb */ + MCFG_SOUND_ADD("ymsnd", YM2203, 12_MHz_XTAL/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) @@ -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, 3.0_MHz_XTAL) + MCFG_DEVICE_ADD("mcu", ARKANOID_68705P3, 3_MHz_XTAL) MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(taitol_1cpu_state::puzznici, plotting) @@ -1807,7 +1807,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::evilston) MCFG_CPU_PROGRAM_MAP(evilston_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) - MCFG_CPU_ADD("audiocpu", Z80, 12.0_MHz_XTAL/3) /* not verified */ + MCFG_CPU_ADD("audiocpu", Z80, 12_MHz_XTAL/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, 12.0_MHz_XTAL/4) /* not verified */ + MCFG_SOUND_ADD("ymsnd", YM2203, 12_MHz_XTAL/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/tispeak.cpp b/src/mame/drivers/tispeak.cpp index 6e6e0a9b434..0cd8f1da6f8 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 640.0_kHz_XTAL +#define MASTER_CLOCK 640_kHz_XTAL class tispeak_state : public hh_tms1k_state diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp index c192aaad2a0..9e2b8f9794f 100644 --- a/src/mame/drivers/v1050.cpp +++ b/src/mame/drivers/v1050.cpp @@ -1022,7 +1022,7 @@ void v1050_state::machine_reset() MACHINE_CONFIG_START(v1050_state::v1050) // basic machine hardware - MCFG_CPU_ADD(Z80_TAG, Z80, 16.0_MHz_XTAL/4) + MCFG_CPU_ADD(Z80_TAG, Z80, 16_MHz_XTAL/4) MCFG_CPU_PROGRAM_MAP(v1050_mem) MCFG_CPU_IO_MAP(v1050_io) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(v1050_state,v1050_int_ack) @@ -1040,7 +1040,7 @@ MACHINE_CONFIG_START(v1050_state::v1050) MCFG_FRAGMENT_ADD(v1050_video) // devices - MCFG_DEVICE_ADD(UPB8214_TAG, I8214, 16.0_MHz_XTAL/4) + MCFG_DEVICE_ADD(UPB8214_TAG, I8214, 16_MHz_XTAL/4) MCFG_I8214_INT_CALLBACK(WRITELINE(v1050_state, pic_int_w)) MCFG_DEVICE_ADD(MSM58321RS_TAG, MSM58321, 32.768_kHz_XTAL) @@ -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/*16.0_MHz_XTAL/8,*/) + MCFG_DEVICE_ADD(I8251A_KB_TAG, I8251, 0/*16_MHz_XTAL/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, 16.0_MHz_XTAL/4/13/8) + MCFG_DEVICE_ADD(CLOCK_KB_TAG, CLOCK, 16_MHz_XTAL/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/*16.0_MHz_XTAL/8,*/) + MCFG_DEVICE_ADD(I8251A_SIO_TAG, I8251, 0/*16_MHz_XTAL/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, 16.0_MHz_XTAL/4) + MCFG_DEVICE_ADD(CLOCK_SIO_TAG, CLOCK, 16_MHz_XTAL/4) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(v1050_state, write_sio_clock)) - MCFG_MB8877_ADD(MB8877_TAG, 16.0_MHz_XTAL/16) + MCFG_MB8877_ADD(MB8877_TAG, 16_MHz_XTAL/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/wwfsstar.cpp b/src/mame/drivers/wwfsstar.cpp index acd7cfc2315..f8f4e3cc5ea 100644 --- a/src/mame/drivers/wwfsstar.cpp +++ b/src/mame/drivers/wwfsstar.cpp @@ -163,7 +163,7 @@ Notes: #include "speaker.h" -static constexpr XTAL MASTER_CLOCK = 20.0_MHz_XTAL; +static constexpr XTAL MASTER_CLOCK = 20_MHz_XTAL; static constexpr XTAL CPU_CLOCK = MASTER_CLOCK / 2; static constexpr XTAL PIXEL_CLOCK = MASTER_CLOCK / 4; diff --git a/src/mame/drivers/zaxxon.cpp b/src/mame/drivers/zaxxon.cpp index c92f2f68e6c..be742b79c28 100644 --- a/src/mame/drivers/zaxxon.cpp +++ b/src/mame/drivers/zaxxon.cpp @@ -275,7 +275,7 @@ *************************************/ static constexpr XTAL MASTER_CLOCK = 48.66_MHz_XTAL; -static constexpr XTAL SOUND_CLOCK = 4.0_MHz_XTAL; +static constexpr XTAL SOUND_CLOCK = 4_MHz_XTAL; static constexpr XTAL PIXEL_CLOCK = MASTER_CLOCK/8; diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index 637092927ac..27df73cbcf0 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, 24.0_MHz_XTAL / 6) + MCFG_CPU_ADD("maincpu", Z80, 24_MHz_XTAL / 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, 24.0_MHz_XTAL / 6) + MCFG_DEVICE_ADD("dma", Z80DMA, 24_MHz_XTAL / 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(24.0_MHz_XTAL / 3) - MCFG_PIT8253_CLK1(24.0_MHz_XTAL / 3) - MCFG_PIT8253_CLK2(24.0_MHz_XTAL / 3) + MCFG_PIT8253_CLK0(24_MHz_XTAL / 3) + MCFG_PIT8253_CLK1(24_MHz_XTAL / 3) + MCFG_PIT8253_CLK2(24_MHz_XTAL / 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)) @@ -226,7 +226,7 @@ MACHINE_CONFIG_START(zorba_state::zorba) MCFG_VIDEO_SET_SCREEN("screen") // Floppies - MCFG_FD1793_ADD("fdc", 24.0_MHz_XTAL / 24) + MCFG_FD1793_ADD("fdc", 24_MHz_XTAL / 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/machine/kay_kbd.cpp b/src/mame/machine/kay_kbd.cpp index 20b2cbc3b8d..3dacc15285c 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, 6.0_MHz_XTAL) + MCFG_CPU_ADD("mcu", I8049, 6_MHz_XTAL) 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)) -- cgit v1.2.3