diff options
author | Olivier Galibert <galibert@pobox.com> | 2018-01-21 23:42:41 +0100 |
---|---|---|
committer | Olivier Galibert <galibert@pobox.com> | 2018-01-23 10:25:25 +0100 |
commit | 03ba80e0ef3e021f6ff89ef91ae5cdce4e24b994 (patch) | |
tree | f127b7f533d36df2484f82fcb05cef5f4c04f232 /src/devices/bus | |
parent | f61a64ea29bf46bf2deb2e1fbace5b24f3d7b0aa (diff) |
xtal.h is dead, long live to xtal.cpp [O. Galibert]
Diffstat (limited to 'src/devices/bus')
199 files changed, 465 insertions, 465 deletions
diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp index 30ddb40f5ac..ffb0b14f0f1 100644 --- a/src/devices/bus/a2bus/a2arcadebd.cpp +++ b/src/devices/bus/a2bus/a2arcadebd.cpp @@ -37,7 +37,7 @@ DEFINE_DEVICE_TYPE(A2BUS_ARCADEBOARD, a2bus_arcboard_device, "a2arcbd", "Third M //------------------------------------------------- MACHINE_CONFIG_START(a2bus_arcboard_device::device_add_mconfig) - MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 ) + MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL(10'738'635) / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_arcboard_device, tms_irq_w)) MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG ) diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h index 1c8fb15b06f..9a2010b8a80 100644 --- a/src/devices/bus/a2bus/a2bus.h +++ b/src/devices/bus/a2bus/a2bus.h @@ -51,7 +51,7 @@ MCFG_DEVICE_INPUT_DEFAULTS(_def_inp) \ device_a2bus_card_interface::static_set_a2bus_tag(*device, _nbtag, _tag); -// 7M = XTAL_14_31818MHz / 2 or XTAL_28_63636MHz / 4 (for IIgs) +// 7M = XTAL(14'318'181) / 2 or XTAL(28'636'363) / 4 (for IIgs) static constexpr uint32_t A2BUS_7M_CLOCK = 7159090; //************************************************************************** diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp index a6454d41500..10ca6bf211f 100644 --- a/src/devices/bus/a2bus/a2ssc.cpp +++ b/src/devices/bus/a2bus/a2ssc.cpp @@ -98,7 +98,7 @@ ioport_constructor a2bus_ssc_device::device_input_ports() const MACHINE_CONFIG_START(a2bus_ssc_device::device_add_mconfig) MCFG_DEVICE_ADD(SSC_ACIA_TAG, MOS6551, 0) - MCFG_MOS6551_XTAL(XTAL_1_8432MHz) + MCFG_MOS6551_XTAL(XTAL(1'843'200)) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2bus_ssc_device, acia_irq_w)) MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(SSC_RS232_TAG, rs232_port_device, write_txd)) diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp index 6776260e208..0b8b7c9d153 100644 --- a/src/devices/bus/a2bus/corvfdc01.cpp +++ b/src/devices/bus/a2bus/corvfdc01.cpp @@ -83,7 +83,7 @@ enum //------------------------------------------------- MACHINE_CONFIG_START(a2bus_corvfdc01_device::device_add_mconfig) - MCFG_FD1793_ADD(FDC01_FDC_TAG, XTAL_16MHz / 8) + MCFG_FD1793_ADD(FDC01_FDC_TAG, XTAL(16'000'000) / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, drq_w)) MCFG_FLOPPY_DRIVE_ADD(FDC01_FDC_TAG":0", corv_floppies, "8sssd", a2bus_corvfdc01_device::corv_floppy_formats) diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp index 812494bafc6..7114b6f4156 100644 --- a/src/devices/bus/a2bus/ezcgi.cpp +++ b/src/devices/bus/a2bus/ezcgi.cpp @@ -41,7 +41,7 @@ DEFINE_DEVICE_TYPE(A2BUS_EZCGI_9958, a2bus_ezcgi_9958_device, "a2ezcgi5", "E-Z C //------------------------------------------------- MACHINE_CONFIG_START(a2bus_ezcgi_device::device_add_mconfig) - MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 ) + MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL(10'738'635) / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_ezcgi_device, tms_irq_w)) MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG ) @@ -49,7 +49,7 @@ MACHINE_CONFIG_START(a2bus_ezcgi_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(a2bus_ezcgi_9938_device::device_add_mconfig) - MCFG_V9938_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL_21_4772MHz) // 192K of VRAM / typical 9938 clock, not verified + MCFG_V9938_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL(21'477'272)) // 192K of VRAM / typical 9938 clock, not verified MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9938_device, tms_irq_w)) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) @@ -62,7 +62,7 @@ MACHINE_CONFIG_START(a2bus_ezcgi_9938_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(a2bus_ezcgi_9958_device::device_add_mconfig) - MCFG_V9958_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL_21_4772MHz) // 192K of VRAM / typcial 9938/9958 clock, not verified + MCFG_V9958_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL(21'477'272)) // 192K of VRAM / typcial 9938/9958 clock, not verified MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9958_device, tms_irq_w)) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) diff --git a/src/devices/bus/a2bus/ssprite.cpp b/src/devices/bus/a2bus/ssprite.cpp index d3540134ad0..16d22760b04 100644 --- a/src/devices/bus/a2bus/ssprite.cpp +++ b/src/devices/bus/a2bus/ssprite.cpp @@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(A2BUS_SSPRITE, a2bus_ssprite_device, "a2ssprite", "Synetix Su //------------------------------------------------- MACHINE_CONFIG_START(a2bus_ssprite_device::device_add_mconfig) - MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL_10_738635MHz / 2 ) + MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL(10'738'635) / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_ssprite_device, tms_irq_w)) MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG ) diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp index 5b53463e211..24d771dd596 100644 --- a/src/devices/bus/a7800/cpuwiz.cpp +++ b/src/devices/bus/a7800/cpuwiz.cpp @@ -123,6 +123,6 @@ WRITE8_MEMBER(a78_megacart_device::write_40xx) MACHINE_CONFIG_START(a78_rom_p450_vb_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("addon") - MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8) + MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00) MACHINE_CONFIG_END diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp index a87ce5993ee..f6228971794 100644 --- a/src/devices/bus/a7800/rom.cpp +++ b/src/devices/bus/a7800/rom.cpp @@ -247,7 +247,7 @@ WRITE8_MEMBER(a78_rom_pokey_device::write_40xx) MACHINE_CONFIG_START(a78_rom_pokey_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("addon") - MCFG_SOUND_ADD("pokey", POKEY, XTAL_14_31818MHz/8) + MCFG_SOUND_ADD("pokey", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00) MACHINE_CONFIG_END @@ -345,7 +345,7 @@ WRITE8_MEMBER(a78_rom_sg_pokey_device::write_40xx) MACHINE_CONFIG_START(a78_rom_sg_pokey_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("addon") - MCFG_SOUND_ADD("pokey", POKEY, XTAL_14_31818MHz/8) + MCFG_SOUND_ADD("pokey", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00) MACHINE_CONFIG_END @@ -500,17 +500,17 @@ WRITE8_MEMBER(a78_rom_act_device::write_40xx) MACHINE_CONFIG_START(a78_rom_p450_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("pokey_450") - MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8) + MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00) MACHINE_CONFIG_END MACHINE_CONFIG_START(a78_rom_p450_pokey_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("addon") - MCFG_SOUND_ADD("pokey", POKEY, XTAL_14_31818MHz/8) + MCFG_SOUND_ADD("pokey", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00) - MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8) + MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00) MACHINE_CONFIG_END @@ -518,13 +518,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(a78_rom_p450_sg_ram_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("pokey_450") - MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8) + MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00) MACHINE_CONFIG_END MACHINE_CONFIG_START(a78_rom_p450_sg9_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("pokey_450") - MCFG_SOUND_ADD("pokey450", POKEY, XTAL_14_31818MHz/8) + MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00) MACHINE_CONFIG_END diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp index c849d45085f..f7f7436b634 100644 --- a/src/devices/bus/a7800/xboard.cpp +++ b/src/devices/bus/a7800/xboard.cpp @@ -111,7 +111,7 @@ MACHINE_CONFIG_START(a78_xboard_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("xb_speaker") - MCFG_SOUND_ADD("xb_pokey", POKEY, XTAL_14_31818MHz/8) + MCFG_SOUND_ADD("xb_pokey", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "xb_speaker", 1.00) MACHINE_CONFIG_END @@ -120,10 +120,10 @@ MACHINE_CONFIG_START(a78_xm_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("xb_speaker") - MCFG_SOUND_ADD("xb_pokey", POKEY, XTAL_14_31818MHz/8) + MCFG_SOUND_ADD("xb_pokey", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "xb_speaker", 1.00) - MCFG_SOUND_ADD("xm_ym2151", YM2151, XTAL_14_31818MHz/4) + MCFG_SOUND_ADD("xm_ym2151", YM2151, XTAL(14'318'181)/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "xb_speaker", 1.00) MACHINE_CONFIG_END diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp index 3f1a16b0be5..6d0d93f94b5 100644 --- a/src/devices/bus/abcbus/fd2.cpp +++ b/src/devices/bus/abcbus/fd2.cpp @@ -235,19 +235,19 @@ FLOPPY_FORMATS_END //------------------------------------------------- MACHINE_CONFIG_START(abc_fd2_device::device_add_mconfig) - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz/2) + MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000)/2) MCFG_CPU_PROGRAM_MAP(abc_fd2_mem) MCFG_CPU_IO_MAP(abc_fd2_io) MCFG_Z80_DAISY_CHAIN(daisy_chain) - MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_4MHz/2) + MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(4'000'000)/2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(abc_fd2_device, pio_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(abc_fd2_device, pio_pa_w)) MCFG_Z80PIO_IN_PB_CB(READ8(abc_fd2_device, pio_pb_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(abc_fd2_device, pio_pb_w)) - MCFG_FD1771_ADD(FD1771_TAG, XTAL_4MHz/4) + MCFG_FD1771_ADD(FD1771_TAG, XTAL(4'000'000)/4) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb7_w)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb5_w)) MCFG_WD_FDC_HLD_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb6_w)) diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp index 3a57ab09179..bcf151e6ac9 100644 --- a/src/devices/bus/abcbus/lux10828.cpp +++ b/src/devices/bus/abcbus/lux10828.cpp @@ -318,19 +318,19 @@ WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_drq_w ) //------------------------------------------------- MACHINE_CONFIG_START(luxor_55_10828_device::device_add_mconfig) - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz/2) + MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000)/2) MCFG_CPU_PROGRAM_MAP(luxor_55_10828_mem) MCFG_CPU_IO_MAP(luxor_55_10828_io) MCFG_Z80_DAISY_CHAIN(daisy_chain) - MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_4MHz/2) + MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(4'000'000)/2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(luxor_55_10828_device, pio_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(luxor_55_10828_device, pio_pa_w)) MCFG_Z80PIO_IN_PB_CB(READ8(luxor_55_10828_device, pio_pb_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(luxor_55_10828_device, pio_pb_w)) - MCFG_MB8876_ADD(MB8876_TAG, XTAL_4MHz/4) + MCFG_MB8876_ADD(MB8876_TAG, XTAL(4'000'000)/4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(luxor_55_10828_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(luxor_55_10828_device, fdc_drq_w)) diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index 50e33b7b884..cfda28d875b 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -288,12 +288,12 @@ static const z80_daisy_config z80_daisy_chain[] = //------------------------------------------------- MACHINE_CONFIG_START(luxor_55_21046_device::device_add_mconfig) - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) + MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4) MCFG_Z80_DAISY_CHAIN(z80_daisy_chain) MCFG_CPU_PROGRAM_MAP(luxor_55_21046_mem) MCFG_CPU_IO_MAP(luxor_55_21046_io) - MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL_16MHz/4) + MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(16'000'000)/4) MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT)) MCFG_Z80DMA_OUT_INT_CB(WRITELINE(luxor_55_21046_device, dma_int_w)) MCFG_Z80DMA_IN_MREQ_CB(READ8(luxor_55_21046_device, memory_read_byte)) @@ -301,7 +301,7 @@ MACHINE_CONFIG_START(luxor_55_21046_device::device_add_mconfig) MCFG_Z80DMA_IN_IORQ_CB(READ8(luxor_55_21046_device, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(luxor_55_21046_device, io_write_byte)) - MCFG_FD1793_ADD(SAB1793_TAG, XTAL_16MHz/16) + MCFG_FD1793_ADD(SAB1793_TAG, XTAL(16'000'000)/16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(luxor_55_21046_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80DMA_TAG, z80dma_device, rdy_w)) MACHINE_CONFIG_END @@ -1051,11 +1051,11 @@ WRITE8_MEMBER( luxor_55_21046_device::_8a_w ) if (BIT(data, 2)) { - m_fdc->set_unscaled_clock(XTAL_16MHz/16); + m_fdc->set_unscaled_clock(XTAL(16'000'000)/16); } else { - m_fdc->set_unscaled_clock(XTAL_16MHz/8); + m_fdc->set_unscaled_clock(XTAL(16'000'000)/8); } } diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp index 02b5b6ec38f..4b1b7f0e998 100644 --- a/src/devices/bus/abcbus/lux21056.cpp +++ b/src/devices/bus/abcbus/lux21056.cpp @@ -246,12 +246,12 @@ WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_msg ) //------------------------------------------------- MACHINE_CONFIG_START(luxor_55_21056_device::device_add_mconfig) - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) + MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) MCFG_CPU_PROGRAM_MAP(luxor_55_21056_mem) MCFG_CPU_IO_MAP(luxor_55_21056_io) MCFG_Z80_DAISY_CHAIN(daisy_chain) - MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL_8MHz/2) + MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(8'000'000)/2) MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT)) MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80DMA_IN_MREQ_CB(READ8(luxor_55_21056_device, memory_read_byte)) diff --git a/src/devices/bus/abcbus/sio.cpp b/src/devices/bus/abcbus/sio.cpp index 9cfb67300ac..1521e5b7459 100644 --- a/src/devices/bus/abcbus/sio.cpp +++ b/src/devices/bus/abcbus/sio.cpp @@ -77,7 +77,7 @@ const tiny_rom_entry *abc_sio_device::device_rom_region() const //------------------------------------------------- MACHINE_CONFIG_START(abc_sio_device::device_add_mconfig) - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_4_9152MHz) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(4'915'200)) MCFG_DEVICE_ADD(Z80SIO_TAG, Z80DART, 0) MACHINE_CONFIG_END diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp index 02f4b9f6e16..6081d256406 100644 --- a/src/devices/bus/abckb/abc77.cpp +++ b/src/devices/bus/abckb/abc77.cpp @@ -129,7 +129,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(abc77_device::device_add_mconfig) // keyboard cpu - MCFG_CPU_ADD(I8035_TAG, I8035, XTAL_4_608MHz) + MCFG_CPU_ADD(I8035_TAG, I8035, XTAL(4'608'000)) MCFG_CPU_PROGRAM_MAP(abc77_map) MCFG_CPU_IO_MAP(abc77_io) MCFG_MCS48_PORT_P1_IN_CB(READ8(abc77_device, p1_r)) @@ -139,7 +139,7 @@ MACHINE_CONFIG_START(abc77_device::device_add_mconfig) // watchdog MCFG_WATCHDOG_ADD("watchdog") - MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(XTAL_4_608MHz/3/5/4096)) + MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(XTAL(4'608'000)/3/5/4096)) // discrete sound MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp index f5597eb625f..50c26c98942 100644 --- a/src/devices/bus/abckb/abc800kb.cpp +++ b/src/devices/bus/abckb/abc800kb.cpp @@ -113,7 +113,7 @@ const tiny_rom_entry *abc800_keyboard_device::device_rom_region() const //------------------------------------------------- MACHINE_CONFIG_START(abc800_keyboard_device::device_add_mconfig) - MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5_9904MHz) + MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(5'990'400)) MCFG_MCS48_PORT_P1_IN_CB(READ8(abc800_keyboard_device, kb_p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(abc800_keyboard_device, kb_p1_w)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(abc800_keyboard_device, kb_p2_w)) @@ -337,7 +337,7 @@ void abc800_keyboard_device::device_start() { // allocate timers m_serial_timer = timer_alloc(); - m_serial_timer->adjust(attotime::from_hz(XTAL_5_9904MHz/(3*5)/20), 0, attotime::from_hz(XTAL_5_9904MHz/(3*5)/20)); // ??? + m_serial_timer->adjust(attotime::from_hz(XTAL(5'990'400)/(3*5)/20), 0, attotime::from_hz(XTAL(5'990'400)/(3*5)/20)); // ??? // state saving save_item(NAME(m_row)); diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp index 6e918ab3909..9730c9f0a58 100644 --- a/src/devices/bus/abckb/abc99.cpp +++ b/src/devices/bus/abckb/abc99.cpp @@ -151,7 +151,7 @@ ADDRESS_MAP_END MACHINE_CONFIG_START(abc99_device::device_add_mconfig) // keyboard CPU - MCFG_CPU_ADD(I8035_Z2_TAG, I8035, XTAL_6MHz/3) // from Z5 T0 output + MCFG_CPU_ADD(I8035_Z2_TAG, I8035, XTAL(6'000'000)/3) // from Z5 T0 output MCFG_CPU_PROGRAM_MAP(abc99_z2_mem) MCFG_CPU_IO_MAP(abc99_z2_io) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(abc99_device, z2_p1_w)) @@ -160,7 +160,7 @@ MACHINE_CONFIG_START(abc99_device::device_add_mconfig) MCFG_MCS48_PORT_T1_IN_CB(READLINE(abc99_device, z2_t1_r)) // mouse CPU - MCFG_CPU_ADD(I8035_Z5_TAG, I8035, XTAL_6MHz) + MCFG_CPU_ADD(I8035_Z5_TAG, I8035, XTAL(6'000'000)) MCFG_CPU_PROGRAM_MAP(abc99_z5_mem) //MCFG_MCS48_PORT_P1_IN_CB(READ8(abc99_device, z5_p1_r)) //MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(abc99_device, z5_p2_w)) @@ -497,7 +497,7 @@ void abc99_device::device_start() { // allocate timers m_serial_timer = timer_alloc(TIMER_SERIAL); - m_serial_timer->adjust(MCS48_ALE_CLOCK(XTAL_6MHz/3), 0, MCS48_ALE_CLOCK(XTAL_6MHz/3)); + m_serial_timer->adjust(MCS48_ALE_CLOCK(XTAL(6'000'000)/3), 0, MCS48_ALE_CLOCK(XTAL(6'000'000)/3)); m_mouse_timer = timer_alloc(TIMER_MOUSE); diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp index 10235caa0df..469b0c72707 100644 --- a/src/devices/bus/adamnet/ddp.cpp +++ b/src/devices/bus/adamnet/ddp.cpp @@ -82,7 +82,7 @@ static const struct CassetteOptions adam_cassette_options = //------------------------------------------------- MACHINE_CONFIG_START(adam_digital_data_pack_device::device_add_mconfig) - MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz) + MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000)) MCFG_CPU_PROGRAM_MAP(adam_ddp_mem) MCFG_CPU_IO_MAP(adam_ddp_io) diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp index 7e04986df16..7074309db84 100644 --- a/src/devices/bus/adamnet/fdc.cpp +++ b/src/devices/bus/adamnet/fdc.cpp @@ -125,11 +125,11 @@ SLOT_INTERFACE_END //------------------------------------------------- MACHINE_CONFIG_START(adam_fdc_device::device_add_mconfig) - MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz) + MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000)) MCFG_CPU_PROGRAM_MAP(adam_fdc_mem) MCFG_CPU_IO_MAP(adam_fdc_io) - MCFG_WD2793_ADD(WD2793_TAG, XTAL_4MHz/4) + MCFG_WD2793_ADD(WD2793_TAG, XTAL(4'000'000)/4) MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(M6801_TAG, INPUT_LINE_NMI)) MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", adam_fdc_floppies, "525ssdd", adam_fdc_device::floppy_formats) diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp index 731f75fe571..f32bd5acfdf 100644 --- a/src/devices/bus/adamnet/kb.cpp +++ b/src/devices/bus/adamnet/kb.cpp @@ -74,7 +74,7 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(adam_keyboard_device::device_add_mconfig) - MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz) + MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000)) MCFG_CPU_PROGRAM_MAP(adam_kb_mem) MCFG_CPU_IO_MAP(adam_kb_io) MACHINE_CONFIG_END diff --git a/src/devices/bus/adamnet/printer.cpp b/src/devices/bus/adamnet/printer.cpp index 6edd3e6da82..1a4ee40aacc 100644 --- a/src/devices/bus/adamnet/printer.cpp +++ b/src/devices/bus/adamnet/printer.cpp @@ -74,7 +74,7 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(adam_printer_device::device_add_mconfig) - MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz) + MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000)) MCFG_CPU_PROGRAM_MAP(adam_prn_mem) MCFG_CPU_IO_MAP(adam_prn_io) MCFG_DEVICE_DISABLE() // TODO diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp index 99889b79a99..f789b0e00af 100644 --- a/src/devices/bus/adamnet/spi.cpp +++ b/src/devices/bus/adamnet/spi.cpp @@ -74,12 +74,12 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(adam_spi_device::device_add_mconfig) - MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz) + MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000)) MCFG_CPU_PROGRAM_MAP(adam_spi_mem) MCFG_CPU_IO_MAP(adam_spi_io) MCFG_DEVICE_DISABLE() - MCFG_DEVICE_ADD(MC2661_TAG, MC2661, XTAL_4_9152MHz) + MCFG_DEVICE_ADD(MC2661_TAG, MC2661, XTAL(4'915'200)) MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr) diff --git a/src/devices/bus/amiga/keyboard/a1200.cpp b/src/devices/bus/amiga/keyboard/a1200.cpp index a0ba5339de8..b3490a34075 100644 --- a/src/devices/bus/amiga/keyboard/a1200.cpp +++ b/src/devices/bus/amiga/keyboard/a1200.cpp @@ -127,7 +127,7 @@ WRITE_LINE_MEMBER(a1200_kbd_device::mpu_tcmp) } MACHINE_CONFIG_START(a1200_kbd_device::device_add_mconfig) - MCFG_CPU_ADD("mpu", M68HC705C8A, XTAL_3MHz) + MCFG_CPU_ADD("mpu", M68HC705C8A, XTAL(3'000'000)) MCFG_M68HC05_PORTB_R_CB(READ8(a1200_kbd_device, mpu_portb_r)); MCFG_M68HC05_PORTD_R_CB(IOPORT("MOD")); MCFG_M68HC05_PORTA_W_CB(WRITE8(a1200_kbd_device, mpu_porta_w)); diff --git a/src/devices/bus/amiga/keyboard/a500.cpp b/src/devices/bus/amiga/keyboard/a500.cpp index b8817124343..8080d9c3a0c 100644 --- a/src/devices/bus/amiga/keyboard/a500.cpp +++ b/src/devices/bus/amiga/keyboard/a500.cpp @@ -137,7 +137,7 @@ INPUT_PORTS_END MACHINE_CONFIG_START(a500_kbd_device::device_add_mconfig) - MCFG_CPU_ADD("ic1", M6502, XTAL_3MHz / 2) + MCFG_CPU_ADD("ic1", M6502, XTAL(3'000'000) / 2) MCFG_CPU_PROGRAM_MAP(mpu6500_map) MACHINE_CONFIG_END @@ -279,7 +279,7 @@ void a500_kbd_device::device_reset() m_counter = 0xffff; // not initialized by hardware m_control = 0x00; - m_timer->adjust(attotime::zero, 0, attotime::from_hz(XTAL_3MHz / 2)); + m_timer->adjust(attotime::zero, 0, attotime::from_hz(XTAL(3'000'000) / 2)); m_watchdog->adjust(attotime::from_msec(54)); } diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp index 8e5e260b3ad..536ecb7b8ef 100644 --- a/src/devices/bus/amiga/zorro/a2232.cpp +++ b/src/devices/bus/amiga/zorro/a2232.cpp @@ -47,47 +47,47 @@ ADDRESS_MAP_END MACHINE_CONFIG_START(a2232_device::device_add_mconfig) // main cpu - MCFG_CPU_ADD("iocpu", M65CE02, XTAL_28_37516MHz / 8) // should run at Amiga clock 7M / 2 + MCFG_CPU_ADD("iocpu", M65CE02, XTAL(28'375'160) / 8) // should run at Amiga clock 7M / 2 MCFG_CPU_PROGRAM_MAP(iocpu_map) // acia - MCFG_DEVICE_ADD("acia_0", MOS6551, XTAL_28_37516MHz / 8) - MCFG_MOS6551_XTAL(XTAL_1_8432MHz) + MCFG_DEVICE_ADD("acia_0", MOS6551, XTAL(28'375'160) / 8) + MCFG_MOS6551_XTAL(XTAL(1'843'200)) MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_1", rs232_port_device, write_txd)) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_0_irq_w)) - MCFG_DEVICE_ADD("acia_1", MOS6551, XTAL_28_37516MHz / 8) - MCFG_MOS6551_XTAL(XTAL_1_8432MHz) + MCFG_DEVICE_ADD("acia_1", MOS6551, XTAL(28'375'160) / 8) + MCFG_MOS6551_XTAL(XTAL(1'843'200)) MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_2", rs232_port_device, write_txd)) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_1_irq_w)) - MCFG_DEVICE_ADD("acia_2", MOS6551, XTAL_28_37516MHz / 8) - MCFG_MOS6551_XTAL(XTAL_1_8432MHz) + MCFG_DEVICE_ADD("acia_2", MOS6551, XTAL(28'375'160) / 8) + MCFG_MOS6551_XTAL(XTAL(1'843'200)) MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_3", rs232_port_device, write_txd)) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_2_irq_w)) - MCFG_DEVICE_ADD("acia_3", MOS6551, XTAL_28_37516MHz / 8) - MCFG_MOS6551_XTAL(XTAL_1_8432MHz) + MCFG_DEVICE_ADD("acia_3", MOS6551, XTAL(28'375'160) / 8) + MCFG_MOS6551_XTAL(XTAL(1'843'200)) MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_4", rs232_port_device, write_txd)) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_3_irq_w)) - MCFG_DEVICE_ADD("acia_4", MOS6551, XTAL_28_37516MHz / 8) - MCFG_MOS6551_XTAL(XTAL_1_8432MHz) + MCFG_DEVICE_ADD("acia_4", MOS6551, XTAL(28'375'160) / 8) + MCFG_MOS6551_XTAL(XTAL(1'843'200)) MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_5", rs232_port_device, write_txd)) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_4_irq_w)) - MCFG_DEVICE_ADD("acia_5", MOS6551, XTAL_28_37516MHz / 8) - MCFG_MOS6551_XTAL(XTAL_1_8432MHz) + MCFG_DEVICE_ADD("acia_5", MOS6551, XTAL(28'375'160) / 8) + MCFG_MOS6551_XTAL(XTAL(1'843'200)) MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_6", rs232_port_device, write_txd)) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_5_irq_w)) - MCFG_DEVICE_ADD("acia_6", MOS6551, XTAL_28_37516MHz / 8) - MCFG_MOS6551_XTAL(XTAL_1_8432MHz) + MCFG_DEVICE_ADD("acia_6", MOS6551, XTAL(28'375'160) / 8) + MCFG_MOS6551_XTAL(XTAL(1'843'200)) MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_7", rs232_port_device, write_txd)) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_6_irq_w)) // cia - MCFG_DEVICE_ADD("cia", MOS8520, XTAL_1_8432MHz) + MCFG_DEVICE_ADD("cia", MOS8520, XTAL(1'843'200)) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(a2232_device, cia_irq_w)) MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(a2232_device, cia_port_a_r)) MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(a2232_device, cia_port_b_r)) diff --git a/src/devices/bus/apricot/keyboard/hle.cpp b/src/devices/bus/apricot/keyboard/hle.cpp index 9663e2505e3..1388047a062 100644 --- a/src/devices/bus/apricot/keyboard/hle.cpp +++ b/src/devices/bus/apricot/keyboard/hle.cpp @@ -196,7 +196,7 @@ ioport_constructor apricot_keyboard_hle_device::device_input_ports() const } MACHINE_CONFIG_START(apricot_keyboard_hle_device::device_add_mconfig) - MCFG_MSM5832_ADD("rtc", XTAL_32_768kHz) + MCFG_MSM5832_ADD("rtc", XTAL(32'768)) MACHINE_CONFIG_END diff --git a/src/devices/bus/bbc/1mhzbus/beebsid.cpp b/src/devices/bus/bbc/1mhzbus/beebsid.cpp index d10db3133a6..21dc23da7d4 100644 --- a/src/devices/bus/bbc/1mhzbus/beebsid.cpp +++ b/src/devices/bus/bbc/1mhzbus/beebsid.cpp @@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(BBC_BEEBSID, bbc_beebsid_device, "beebsid", "BeebSID") MACHINE_CONFIG_START(bbc_beebsid_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("speaker") - MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL_16MHz / 16) + MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL(16'000'000) / 16) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MCFG_BBC_PASSTHRU_1MHZBUS_SLOT_ADD() diff --git a/src/devices/bus/bbc/1mhzbus/opus3.cpp b/src/devices/bus/bbc/1mhzbus/opus3.cpp index d505b59db49..6aedae49556 100644 --- a/src/devices/bus/bbc/1mhzbus/opus3.cpp +++ b/src/devices/bus/bbc/1mhzbus/opus3.cpp @@ -82,7 +82,7 @@ ROM_END MACHINE_CONFIG_START(bbc_opus3_device::device_add_mconfig) /* fdc */ - MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2) + MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opus3_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("wd1770:0", bbc_floppies, "525qd", floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) diff --git a/src/devices/bus/bbc/fdc/acorn.cpp b/src/devices/bus/bbc/fdc/acorn.cpp index 4398d8db7dc..1d0be677968 100644 --- a/src/devices/bus/bbc/fdc/acorn.cpp +++ b/src/devices/bus/bbc/fdc/acorn.cpp @@ -132,7 +132,7 @@ MACHINE_CONFIG_START(bbc_acorn8271_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(bbc_acorn1770_device::device_add_mconfig) - MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2) + MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_acorn1770_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_acorn1770_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("wd1770:0", bbc_floppies_525, "525qd", bbc_acorn8271_device::floppy_formats) diff --git a/src/devices/bus/bbc/fdc/cumana.cpp b/src/devices/bus/bbc/fdc/cumana.cpp index c15d196d7be..bfe97abd240 100644 --- a/src/devices/bus/bbc/fdc/cumana.cpp +++ b/src/devices/bus/bbc/fdc/cumana.cpp @@ -59,7 +59,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_cumana1_device::device_add_mconfig) - MCFG_MB8877_ADD("mb8877a", XTAL_16MHz / 16) + MCFG_MB8877_ADD("mb8877a", XTAL(16'000'000) / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_cumanafdc_device, motor_w)) @@ -70,7 +70,7 @@ MACHINE_CONFIG_START(bbc_cumana1_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(bbc_cumana2_device::device_add_mconfig) - MCFG_MB8877_ADD("mb8877a", XTAL_16MHz / 16) + MCFG_MB8877_ADD("mb8877a", XTAL(16'000'000) / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_cumanafdc_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_cumanafdc_device, motor_w)) diff --git a/src/devices/bus/bbc/fdc/cv1797.cpp b/src/devices/bus/bbc/fdc/cv1797.cpp index a623cff1cef..a8c3f683cb1 100644 --- a/src/devices/bus/bbc/fdc/cv1797.cpp +++ b/src/devices/bus/bbc/fdc/cv1797.cpp @@ -52,7 +52,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_cv1797_device::device_add_mconfig) - MCFG_FD1797_ADD("fd1797", XTAL_8MHz / 8) + MCFG_FD1797_ADD("fd1797", XTAL(8'000'000) / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_cv1797_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_cv1797_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_cv1797_device, motor_w)) diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp index b8288fe87c4..246b3ad203f 100644 --- a/src/devices/bus/bbc/fdc/opus.cpp +++ b/src/devices/bus/bbc/fdc/opus.cpp @@ -98,7 +98,7 @@ MACHINE_CONFIG_START(bbc_opus8272_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(bbc_opus2791_device::device_add_mconfig) - MCFG_WD2791_ADD("fdc", XTAL_16MHz / 16) + MCFG_WD2791_ADD("fdc", XTAL(16'000'000) / 16) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_opusfdc_device, motor_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats) @@ -108,7 +108,7 @@ MACHINE_CONFIG_START(bbc_opus2791_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(bbc_opus2793_device::device_add_mconfig) - MCFG_WD2793_ADD("fdc", XTAL_16MHz / 16) + MCFG_WD2793_ADD("fdc", XTAL(16'000'000) / 16) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_opusfdc_device, motor_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats) @@ -118,7 +118,7 @@ MACHINE_CONFIG_START(bbc_opus2793_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(bbc_opus1770_device::device_add_mconfig) - MCFG_WD1770_ADD("fdc", XTAL_16MHz / 2) + MCFG_WD1770_ADD("fdc", XTAL(16'000'000) / 2) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) diff --git a/src/devices/bus/bbc/fdc/watford.cpp b/src/devices/bus/bbc/fdc/watford.cpp index 031a9a03255..fcc465c84f6 100644 --- a/src/devices/bus/bbc/fdc/watford.cpp +++ b/src/devices/bus/bbc/fdc/watford.cpp @@ -65,7 +65,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_weddb2_device::device_add_mconfig) - MCFG_WD1772_ADD("wd1772", XTAL_16MHz / 2) + MCFG_WD1772_ADD("wd1772", XTAL(16'000'000) / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_weddb2_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_weddb2_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("wd1772:0", bbc_floppies_525, "525qd", floppy_formats) @@ -75,7 +75,7 @@ MACHINE_CONFIG_START(bbc_weddb2_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(bbc_weddb3_device::device_add_mconfig) - MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2) + MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_weddb3_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_weddb3_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("wd1770:0", bbc_floppies_525, "525qd", floppy_formats) diff --git a/src/devices/bus/bbc/tube/tube_6502.cpp b/src/devices/bus/bbc/tube/tube_6502.cpp index f70a5093200..10da176316f 100644 --- a/src/devices/bus/bbc/tube/tube_6502.cpp +++ b/src/devices/bus/bbc/tube/tube_6502.cpp @@ -43,7 +43,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_tube_6502_device::device_add_mconfig) - MCFG_CPU_ADD("m6502", M65C02, XTAL_12MHz / 4) + MCFG_CPU_ADD("m6502", M65C02, XTAL(12'000'000) / 4) MCFG_CPU_PROGRAM_MAP(tube_6502_mem) MCFG_TUBE_ADD("ula") diff --git a/src/devices/bus/bbc/tube/tube_65c102.cpp b/src/devices/bus/bbc/tube/tube_65c102.cpp index 35f979cf361..6f15b5866cf 100644 --- a/src/devices/bus/bbc/tube/tube_65c102.cpp +++ b/src/devices/bus/bbc/tube/tube_65c102.cpp @@ -43,7 +43,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_tube_65c102_device::device_add_mconfig) - MCFG_CPU_ADD("maincpu", M65C02, XTAL_16MHz / 4) + MCFG_CPU_ADD("maincpu", M65C02, XTAL(16'000'000) / 4) MCFG_CPU_PROGRAM_MAP(tube_6502_mem) MCFG_TUBE_ADD("ula") diff --git a/src/devices/bus/bbc/tube/tube_80186.cpp b/src/devices/bus/bbc/tube/tube_80186.cpp index d64eaa47213..9e04a20cf6a 100644 --- a/src/devices/bus/bbc/tube/tube_80186.cpp +++ b/src/devices/bus/bbc/tube/tube_80186.cpp @@ -52,7 +52,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_tube_80186_device::device_add_mconfig) - MCFG_CPU_ADD("i80186", I80186, XTAL_20MHz / 2) + MCFG_CPU_ADD("i80186", I80186, XTAL(20'000'000) / 2) MCFG_CPU_PROGRAM_MAP(tube_80186_mem) MCFG_CPU_IO_MAP(tube_80186_io) //MCFG_80186_CHIP_SELECT_CB(WRITE16(bbc_tube_80186_device, chip_select_cb)) diff --git a/src/devices/bus/bbc/tube/tube_80286.cpp b/src/devices/bus/bbc/tube/tube_80286.cpp index 7701b2e0ce2..d8f9e027dc9 100644 --- a/src/devices/bus/bbc/tube/tube_80286.cpp +++ b/src/devices/bus/bbc/tube/tube_80286.cpp @@ -56,7 +56,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_tube_80286_device::device_add_mconfig) - MCFG_CPU_ADD("i80286", I80286, XTAL_12MHz / 2) + MCFG_CPU_ADD("i80286", I80286, XTAL(12'000'000) / 2) MCFG_CPU_PROGRAM_MAP(tube_80286_mem) MCFG_CPU_IO_MAP(tube_80286_io) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, bbc_tube_80286_device, irq_callback) diff --git a/src/devices/bus/bbc/tube/tube_arm.cpp b/src/devices/bus/bbc/tube/tube_arm.cpp index d23131674cb..e6c91cc8675 100644 --- a/src/devices/bus/bbc/tube/tube_arm.cpp +++ b/src/devices/bus/bbc/tube/tube_arm.cpp @@ -50,7 +50,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_tube_arm_device::device_add_mconfig) - MCFG_CPU_ADD("arm", ARM, XTAL_20MHz / 3) + MCFG_CPU_ADD("arm", ARM, XTAL(20'000'000) / 3) MCFG_CPU_PROGRAM_MAP(tube_arm_mem) MCFG_TUBE_ADD("ula") diff --git a/src/devices/bus/bbc/tube/tube_casper.cpp b/src/devices/bus/bbc/tube/tube_casper.cpp index af49f67c5f9..7dc88d50339 100644 --- a/src/devices/bus/bbc/tube/tube_casper.cpp +++ b/src/devices/bus/bbc/tube/tube_casper.cpp @@ -48,16 +48,16 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_tube_casper_device::device_add_mconfig) - MCFG_CPU_ADD("m68000", M68000, XTAL_4MHz) + MCFG_CPU_ADD("m68000", M68000, XTAL(4'000'000)) MCFG_CPU_PROGRAM_MAP(tube_casper_mem) - MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL_4MHz / 2) + MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL(4'000'000) / 2) MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8("via6522_1", via6522_device, write_pa)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_cb1)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_ca1)) MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, bbc_tube_slot_device, irq_w)) - MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL_4MHz / 2) + MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL(4'000'000) / 2) MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8("via6522_0", via6522_device, write_pa)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("via6522_0", via6522_device, write_cb1)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE("via6522_0", via6522_device, write_ca1)) diff --git a/src/devices/bus/bbc/tube/tube_z80.cpp b/src/devices/bus/bbc/tube/tube_z80.cpp index 668220320e4..3c79a8002aa 100644 --- a/src/devices/bus/bbc/tube/tube_z80.cpp +++ b/src/devices/bus/bbc/tube/tube_z80.cpp @@ -59,7 +59,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_tube_z80_device::device_add_mconfig) - MCFG_CPU_ADD("z80", Z80, XTAL_12MHz / 2) + MCFG_CPU_ADD("z80", Z80, XTAL(12'000'000) / 2) MCFG_CPU_PROGRAM_MAP(tube_z80_mem) MCFG_CPU_DECRYPTED_OPCODES_MAP(tube_z80_fetch) MCFG_CPU_IO_MAP(tube_z80_io) diff --git a/src/devices/bus/bbc/tube/tube_zep100.cpp b/src/devices/bus/bbc/tube/tube_zep100.cpp index 2f9525aa4a0..76d0f5677f0 100644 --- a/src/devices/bus/bbc/tube/tube_zep100.cpp +++ b/src/devices/bus/bbc/tube/tube_zep100.cpp @@ -56,11 +56,11 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_tube_zep100_device::device_add_mconfig) - MCFG_CPU_ADD("z80", Z80, XTAL_4MHz) + MCFG_CPU_ADD("z80", Z80, XTAL(4'000'000)) MCFG_CPU_PROGRAM_MAP(tube_zep100_mem) MCFG_CPU_IO_MAP(tube_zep100_io) - MCFG_DEVICE_ADD("via", VIA6522, XTAL_4MHz / 2) + MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 2) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(bbc_tube_zep100_device, via_pb_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE("ppi", i8255_device, pc2_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("ppi", i8255_device, pc6_w)) diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp index 698fa6dd6a1..dd27a9c53ec 100644 --- a/src/devices/bus/bml3/bml3mp1802.cpp +++ b/src/devices/bus/bml3/bml3mp1802.cpp @@ -52,7 +52,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bml3bus_mp1802_device::device_add_mconfig) - MCFG_MB8866_ADD("fdc", XTAL_1MHz) + MCFG_MB8866_ADD("fdc", XTAL(1'000'000)) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bml3bus_mp1802_device, bml3_wd17xx_intrq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", mp1802_floppies, "dd", floppy_image_device::default_floppy_formats) diff --git a/src/devices/bus/c64/fcc.cpp b/src/devices/bus/c64/fcc.cpp index 3dfda72f137..48f7595eed3 100644 --- a/src/devices/bus/c64/fcc.cpp +++ b/src/devices/bus/c64/fcc.cpp @@ -75,7 +75,7 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(c64_final_chesscard_device::device_add_mconfig) - MCFG_CPU_ADD(G65SC02P4_TAG, M65SC02, XTAL_5MHz) + MCFG_CPU_ADD(G65SC02P4_TAG, M65SC02, XTAL(5'000'000)) MCFG_CPU_PROGRAM_MAP(c64_fcc_map) MACHINE_CONFIG_END diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp index 22291412210..16d50a12870 100644 --- a/src/devices/bus/c64/ide64.cpp +++ b/src/devices/bus/c64/ide64.cpp @@ -48,7 +48,7 @@ DEFINE_DEVICE_TYPE(C64_IDE64, c64_ide64_cartridge_device, "c64_ide64", "C64 IDE6 MACHINE_CONFIG_START(c64_ide64_cartridge_device::device_add_mconfig) MCFG_ATMEL_29C010_ADD(AT29C010A_TAG) - MCFG_DS1302_ADD(DS1302_TAG, XTAL_32_768kHz) + MCFG_DS1302_ADD(DS1302_TAG, XTAL(32'768)) MCFG_ATA_INTERFACE_ADD(ATA_TAG, ata_devices, "hdd", nullptr, false) MACHINE_CONFIG_END diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp index cd507231fc1..8f7b866b303 100644 --- a/src/devices/bus/c64/magic_voice.cpp +++ b/src/devices/bus/c64/magic_voice.cpp @@ -233,7 +233,7 @@ MACHINE_CONFIG_START(c64_magic_voice_cartridge_device::device_add_mconfig) MCFG_40105_DATA_IN_READY_CB(DEVWRITELINE(MOS6525_TAG, tpi6525_device, i3_w)) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(T6721A_TAG, T6721A, XTAL_640kHz) + MCFG_SOUND_ADD(T6721A_TAG, T6721A, XTAL(640'000)) MCFG_T6721A_EOS_HANDLER(DEVWRITELINE(MOS6525_TAG, tpi6525_device, i2_w)) MCFG_T6721A_PHI2_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_magic_voice_cartridge_device, phi2_w)) MCFG_T6721A_DTRD_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_magic_voice_cartridge_device, dtrd_w)) diff --git a/src/devices/bus/c64/multiscreen.cpp b/src/devices/bus/c64/multiscreen.cpp index 0e2687b4f9d..17dcded3409 100644 --- a/src/devices/bus/c64/multiscreen.cpp +++ b/src/devices/bus/c64/multiscreen.cpp @@ -112,7 +112,7 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(c64_multiscreen_cartridge_device::device_add_mconfig) - MCFG_CPU_ADD(MC6802P_TAG, M6802, XTAL_4MHz) + MCFG_CPU_ADD(MC6802P_TAG, M6802, XTAL(4'000'000)) MCFG_CPU_PROGRAM_MAP(multiscreen_mem) MCFG_DEVICE_ADD(MC6821P_0_TAG, PIA6821, 0) diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp index a284abfd0fc..2df60f4ef17 100644 --- a/src/devices/bus/c64/sfx_sound_expander.cpp +++ b/src/devices/bus/c64/sfx_sound_expander.cpp @@ -43,7 +43,7 @@ WRITE_LINE_MEMBER( c64_sfx_sound_expander_cartridge_device::opl_irq_w ) MACHINE_CONFIG_START(c64_sfx_sound_expander_cartridge_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(YM3526_TAG, YM3526, XTAL_3_579545MHz) + MCFG_SOUND_ADD(YM3526_TAG, YM3526, XTAL(3'579'545)) MCFG_YM3526_IRQ_HANDLER(WRITELINE(c64_sfx_sound_expander_cartridge_device, opl_irq_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) diff --git a/src/devices/bus/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp index 2dd8d26147f..7fffd60dac2 100644 --- a/src/devices/bus/c64/swiftlink.cpp +++ b/src/devices/bus/c64/swiftlink.cpp @@ -40,7 +40,7 @@ DEFINE_DEVICE_TYPE(C64_SWIFTLINK, c64_swiftlink_cartridge_device, "c64_swiftlink MACHINE_CONFIG_START(c64_swiftlink_cartridge_device::device_add_mconfig) MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0) - MCFG_MOS6551_XTAL(XTAL_3_6864MHz) + MCFG_MOS6551_XTAL(XTAL(3'686'400)) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_swiftlink_cartridge_device, acia_irq_w)) MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) diff --git a/src/devices/bus/c64/tdos.cpp b/src/devices/bus/c64/tdos.cpp index d42666401f8..679905cf25d 100644 --- a/src/devices/bus/c64/tdos.cpp +++ b/src/devices/bus/c64/tdos.cpp @@ -154,7 +154,7 @@ DEFINE_DEVICE_TYPE(C64_TDOS, c64_tdos_cartridge_device, "c64_tdos", "C64 TDOS ca //------------------------------------------------- MACHINE_CONFIG_START(c64_tdos_cartridge_device::device_add_mconfig) - MCFG_DEVICE_ADD(MC68A52P_TAG, MC6852, XTAL_6_5MHz) + MCFG_DEVICE_ADD(MC68A52P_TAG, MC6852, XTAL(6'500'000)) MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD() MACHINE_CONFIG_END diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp index e268511349d..653a79a7627 100644 --- a/src/devices/bus/c64/turbo232.cpp +++ b/src/devices/bus/c64/turbo232.cpp @@ -39,7 +39,7 @@ DEFINE_DEVICE_TYPE(C64_TURBO232, c64_turbo232_cartridge_device, "c64_turbo232", MACHINE_CONFIG_START(c64_turbo232_cartridge_device::device_add_mconfig) MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0) - MCFG_MOS6551_XTAL(XTAL_3_6864MHz) + MCFG_MOS6551_XTAL(XTAL(3'686'400)) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_turbo232_cartridge_device, acia_irq_w)) MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) @@ -183,9 +183,9 @@ void c64_turbo232_cartridge_device::c64_cd_w(address_space &space, offs_t offset switch (m_es & ES_S_MASK) { - case ES_S_230400: m_acia->set_xtal(XTAL_3_6864MHz); break; - case ES_S_115200: m_acia->set_xtal(XTAL_3_6864MHz/2); break; - case ES_S_57600: m_acia->set_xtal(XTAL_3_6864MHz/4); break; + case ES_S_230400: m_acia->set_xtal(XTAL(3'686'400)); break; + case ES_S_115200: m_acia->set_xtal(XTAL(3'686'400)/2); break; + case ES_S_57600: m_acia->set_xtal(XTAL(3'686'400)/4); break; case ES_S_UNDEFINED: m_acia->set_xtal(0); break; } } diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp index 8474fee85a5..3c6d3d099dd 100644 --- a/src/devices/bus/c64/xl80.cpp +++ b/src/devices/bus/c64/xl80.cpp @@ -133,7 +133,7 @@ MACHINE_CONFIG_START(c64_xl80_device::device_add_mconfig) MCFG_GFXDECODE_ADD("gfxdecode", "palette", c64_xl80) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_MC6845_ADD(HD46505SP_TAG, H46505, MC6845_SCREEN_TAG, XTAL_14_31818MHz / 8) + MCFG_MC6845_ADD(HD46505SP_TAG, H46505, MC6845_SCREEN_TAG, XTAL(14'318'181) / 8) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(c64_xl80_device, crtc_update_row) diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp index 53d14803fe9..49c4279d508 100644 --- a/src/devices/bus/cbmiec/c1526.cpp +++ b/src/devices/bus/cbmiec/c1526.cpp @@ -88,7 +88,7 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(c1526_device::device_add_mconfig) - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_4MHz/4) + MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(4'000'000)/4) MCFG_CPU_PROGRAM_MAP(c1526_mem) MACHINE_CONFIG_END @@ -98,7 +98,7 @@ MACHINE_CONFIG_END //------------------------------------------------- MACHINE_CONFIG_START(c4023_device::device_add_mconfig) - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_4MHz/4) + MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(4'000'000)/4) MCFG_CPU_PROGRAM_MAP(c1526_mem) MACHINE_CONFIG_END diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp index 2c11785c946..84d4c6e2e38 100644 --- a/src/devices/bus/cbmiec/c1541.cpp +++ b/src/devices/bus/cbmiec/c1541.cpp @@ -812,11 +812,11 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pb_w ) //------------------------------------------------- MACHINE_CONFIG_START(c1541_device_base::device_add_mconfig) - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(c1541_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) - MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(READ8(c1541_device_base, via0_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c1541_device_base, via0_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1541_device_base, via0_pa_w)) @@ -824,7 +824,7 @@ MACHINE_CONFIG_START(c1541_device_base::device_add_mconfig) MCFG_VIA6522_CB2_HANDLER(WRITELINE(c1541_device_base, via0_ca2_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1541_device_base, via0_irq_w)) - MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c1541_device_base, via1_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w)) @@ -833,7 +833,7 @@ MACHINE_CONFIG_START(c1541_device_base::device_add_mconfig) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1541_device_base, via1_irq_w)) - MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz) + MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000)) MCFG_64H156_ATN_CALLBACK(WRITELINE(c1541_device_base, atn_w)) MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1541_device_base, byte_w)) MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1540_floppies, "525ssqd", c1541_device_base::floppy_formats) diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp index 8d85be61809..58f5b2e6d46 100644 --- a/src/devices/bus/cbmiec/c1571.cpp +++ b/src/devices/bus/cbmiec/c1571.cpp @@ -233,7 +233,7 @@ WRITE8_MEMBER( c1571_device::via0_pa_w ) if (m_1_2mhz != clock_1_2) { - uint32_t clock = clock_1_2 ? XTAL_16MHz/8 : XTAL_16MHz/16; + const XTAL clock = clock_1_2 ? XTAL(16'000'000)/8 : XTAL(16'000'000)/16; m_maincpu->set_unscaled_clock(clock); m_cia->set_unscaled_clock(clock); @@ -275,7 +275,7 @@ WRITE8_MEMBER( c1571cr_device::via0_pa_w ) if (m_1_2mhz != clock_1_2) { - uint32_t clock = clock_1_2 ? XTAL_16MHz/8 : XTAL_16MHz/16; + const XTAL clock = clock_1_2 ? XTAL(16'000'000)/8 : XTAL(16'000'000)/16; m_maincpu->set_unscaled_clock(clock); m_cia->set_unscaled_clock(clock); @@ -601,18 +601,18 @@ SLOT_INTERFACE_END //------------------------------------------------- MACHINE_CONFIG_START(c1570_device::device_add_mconfig) - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(c1571_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) - MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w)) - MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w)) @@ -621,7 +621,7 @@ MACHINE_CONFIG_START(c1570_device::device_add_mconfig) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w)) - MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w)) MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w)) MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w)) @@ -629,26 +629,26 @@ MACHINE_CONFIG_START(c1570_device::device_add_mconfig) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w)) MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w)) - MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2) - MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz) + MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2) + MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000)) MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w)) MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats) MACHINE_CONFIG_END MACHINE_CONFIG_START(c1571_device::device_add_mconfig) - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(c1571_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) - MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w)) - MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w)) @@ -657,7 +657,7 @@ MACHINE_CONFIG_START(c1571_device::device_add_mconfig) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w)) - MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w)) MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w)) MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w)) @@ -665,26 +665,26 @@ MACHINE_CONFIG_START(c1571_device::device_add_mconfig) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w)) MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w)) - MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2) - MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz) + MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2) + MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000)) MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w)) MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats) MACHINE_CONFIG_END MACHINE_CONFIG_START(c1571cr_device::device_add_mconfig) - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(c1571_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) - MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571cr_device, via0_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571cr_device, via0_pb_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w)) - MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w)) @@ -693,28 +693,28 @@ MACHINE_CONFIG_START(c1571cr_device::device_add_mconfig) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w)) - //MCFG_MOS5710_ADD(M5710_TAG, XTAL_16MHz/16, 0) + //MCFG_MOS5710_ADD(M5710_TAG, XTAL(16'000'000)/16, 0) - MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2) - MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz) + MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2) + MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000)) MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w)) MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats) MACHINE_CONFIG_END MACHINE_CONFIG_START(mini_chief_device::device_add_mconfig) - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(mini_chief_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) - MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w)) - MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w)) @@ -723,7 +723,7 @@ MACHINE_CONFIG_START(mini_chief_device::device_add_mconfig) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w)) - MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w)) MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w)) MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w)) @@ -731,8 +731,8 @@ MACHINE_CONFIG_START(mini_chief_device::device_add_mconfig) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w)) MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w)) - MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2) - MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz) + MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2) + MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000)) MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w)) MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats) diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp index 52e22cfe725..ed1d0ebfe26 100644 --- a/src/devices/bus/cbmiec/c1581.cpp +++ b/src/devices/bus/cbmiec/c1581.cpp @@ -266,10 +266,10 @@ FLOPPY_FORMATS_END //------------------------------------------------- MACHINE_CONFIG_START(c1581_device::device_add_mconfig) - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/8) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/8) MCFG_CPU_PROGRAM_MAP(c1581_mem) - MCFG_DEVICE_ADD(M8520_TAG, MOS8520, XTAL_16MHz/8) + MCFG_DEVICE_ADD(M8520_TAG, MOS8520, XTAL(16'000'000)/8) MCFG_MOS6526_IRQ_CALLBACK(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1581_device, cnt_w)) MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1581_device, sp_w)) @@ -278,7 +278,7 @@ MACHINE_CONFIG_START(c1581_device::device_add_mconfig) MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1581_device, cia_pb_r)) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1581_device, cia_pb_w)) - MCFG_WD1772_ADD(WD1772_TAG, XTAL_16MHz/2) + MCFG_WD1772_ADD(WD1772_TAG, XTAL(16'000'000)/2) MCFG_FLOPPY_DRIVE_ADD_FIXED(WD1772_TAG":0", c1581_floppies, "35dd", c1581_device::floppy_formats) MACHINE_CONFIG_END diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp index 18fffca8d8d..55b40e386cc 100644 --- a/src/devices/bus/cbmiec/cmdhd.cpp +++ b/src/devices/bus/cbmiec/cmdhd.cpp @@ -83,7 +83,7 @@ MACHINE_CONFIG_START(cmd_hd_device::device_add_mconfig) MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 2000000) MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, 2000000) MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0) - MCFG_DEVICE_ADD(RTC72421A_TAG, RTC72421, XTAL_32_768kHz) + MCFG_DEVICE_ADD(RTC72421A_TAG, RTC72421, XTAL(32'768)) MCFG_DEVICE_ADD(SCSIBUS_TAG, SCSI_PORT, 0) MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_0) diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp index 2f637199896..bac81b01567 100644 --- a/src/devices/bus/cbmiec/fd2000.cpp +++ b/src/devices/bus/cbmiec/fd2000.cpp @@ -212,10 +212,10 @@ FLOPPY_FORMATS_END //------------------------------------------------- MACHINE_CONFIG_START(fd2000_device::device_add_mconfig) - MCFG_CPU_ADD(G65SC02PI2_TAG, M65C02, XTAL_24MHz/12) + MCFG_CPU_ADD(G65SC02PI2_TAG, M65C02, XTAL(24'000'000)/12) MCFG_CPU_PROGRAM_MAP(fd2000_mem) - MCFG_DEVICE_ADD(G65SC22P2_TAG, VIA6522, XTAL_24MHz/12) + MCFG_DEVICE_ADD(G65SC22P2_TAG, VIA6522, XTAL(24'000'000)/12) MCFG_VIA6522_READPA_HANDLER(READ8(fd2000_device, via_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(fd2000_device, via_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(fd2000_device, via_pa_w)) @@ -228,10 +228,10 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(fd4000_device::device_add_mconfig) - MCFG_CPU_ADD(R65C02P4_TAG, M65C02, XTAL_24MHz/6) + MCFG_CPU_ADD(R65C02P4_TAG, M65C02, XTAL(24'000'000)/6) MCFG_CPU_PROGRAM_MAP(fd4000_mem) - MCFG_DEVICE_ADD(G65SC22P2_TAG, VIA6522, XTAL_24MHz/12) + MCFG_DEVICE_ADD(G65SC22P2_TAG, VIA6522, XTAL(24'000'000)/12) MCFG_VIA6522_READPA_HANDLER(READ8(fd2000_device, via_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(fd2000_device, via_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(fd2000_device, via_pa_w)) diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp index 92f4f6e2226..6f68ccae9c4 100644 --- a/src/devices/bus/cbmiec/serialbox.cpp +++ b/src/devices/bus/cbmiec/serialbox.cpp @@ -69,7 +69,7 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(serial_box_device::device_add_mconfig) - MCFG_CPU_ADD(M6502_TAG, M65C02, XTAL_4MHz/4) + MCFG_CPU_ADD(M6502_TAG, M65C02, XTAL(4'000'000)/4) MCFG_CPU_PROGRAM_MAP(serial_box_mem) MACHINE_CONFIG_END diff --git a/src/devices/bus/cbmiec/vic1515.cpp b/src/devices/bus/cbmiec/vic1515.cpp index 93d76fcfced..229f3ed76ec 100644 --- a/src/devices/bus/cbmiec/vic1515.cpp +++ b/src/devices/bus/cbmiec/vic1515.cpp @@ -60,7 +60,7 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(vic1515_device::device_add_mconfig) - MCFG_CPU_ADD("maincpu", I8039, XTAL_6MHz) + MCFG_CPU_ADD("maincpu", I8039, XTAL(6'000'000)) MCFG_CPU_PROGRAM_MAP(vic1515_mem) MCFG_CPU_IO_MAP(vic1515_io) MACHINE_CONFIG_END diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp index 3e5c48cae00..30291266d9f 100644 --- a/src/devices/bus/cbmiec/vic1520.cpp +++ b/src/devices/bus/cbmiec/vic1520.cpp @@ -94,7 +94,7 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(vic1520_device::device_add_mconfig) - MCFG_CPU_ADD(M6500_1_TAG, M6502, XTAL_2MHz) // M6500/1 + MCFG_CPU_ADD(M6500_1_TAG, M6502, XTAL(2'000'000)) // M6500/1 MCFG_CPU_PROGRAM_MAP(vic1520_mem) MACHINE_CONFIG_END diff --git a/src/devices/bus/cbus/pc9801_118.cpp b/src/devices/bus/cbus/pc9801_118.cpp index d5cb715035a..ecd86eb39c2 100644 --- a/src/devices/bus/cbus/pc9801_118.cpp +++ b/src/devices/bus/cbus/pc9801_118.cpp @@ -20,7 +20,7 @@ #include "speaker.h" -#define MAIN_CLOCK_X2 XTAL_2_4576MHz +#define MAIN_CLOCK_X2 XTAL(2'457'600) //************************************************************************** // GLOBAL VARIABLES diff --git a/src/devices/bus/cbus/pc9801_26.cpp b/src/devices/bus/cbus/pc9801_26.cpp index 57fa3e8b888..57fc88f09e5 100644 --- a/src/devices/bus/cbus/pc9801_26.cpp +++ b/src/devices/bus/cbus/pc9801_26.cpp @@ -19,7 +19,7 @@ #include "speaker.h" -#define MAIN_CLOCK_X1 XTAL_1_9968MHz +#define MAIN_CLOCK_X1 XTAL(1'996'800) //************************************************************************** // GLOBAL VARIABLES diff --git a/src/devices/bus/cbus/pc9801_86.cpp b/src/devices/bus/cbus/pc9801_86.cpp index 8469e8f16c4..2e984e61436 100644 --- a/src/devices/bus/cbus/pc9801_86.cpp +++ b/src/devices/bus/cbus/pc9801_86.cpp @@ -20,7 +20,7 @@ #include "sound/volt_reg.h" #include "speaker.h" -#define MAIN_CLOCK_X1 XTAL_1_9968MHz +#define MAIN_CLOCK_X1 XTAL(1'996'800) #define QUEUE_SIZE 32768 //************************************************************************** diff --git a/src/devices/bus/cbus/pc9801_amd98.cpp b/src/devices/bus/cbus/pc9801_amd98.cpp index 6442f13c3ab..3fb6e13d9a8 100644 --- a/src/devices/bus/cbus/pc9801_amd98.cpp +++ b/src/devices/bus/cbus/pc9801_amd98.cpp @@ -32,7 +32,7 @@ #include "speaker.h" -#define MAIN_CLOCK_X1 XTAL_1_9968MHz +#define MAIN_CLOCK_X1 XTAL(1'996'800) //************************************************************************** // GLOBAL VARIABLES diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp index b81ba2c88fb..03b36b63df1 100644 --- a/src/devices/bus/centronics/epson_lx800.cpp +++ b/src/devices/bus/centronics/epson_lx800.cpp @@ -67,7 +67,7 @@ ADDRESS_MAP_END MACHINE_CONFIG_START(epson_lx800_device::device_add_mconfig) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", UPD7810, XTAL_14_7456MHz) + MCFG_CPU_ADD("maincpu", UPD7810, XTAL(14'745'600)) MCFG_CPU_PROGRAM_MAP(lx800_mem) MCFG_UPD7810_PORTA_READ_CB(READ8(epson_lx800_device, porta_r)) MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(epson_lx800_device, porta_w)) diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp index c2782e451e2..24b06396ff2 100644 --- a/src/devices/bus/centronics/epson_lx810l.cpp +++ b/src/devices/bus/centronics/epson_lx810l.cpp @@ -110,7 +110,7 @@ ADDRESS_MAP_END MACHINE_CONFIG_START(epson_lx810l_device::device_add_mconfig) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", UPD7810, XTAL_14_7456MHz) + MCFG_CPU_ADD("maincpu", UPD7810, XTAL(14'745'600)) MCFG_CPU_PROGRAM_MAP(lx810l_mem) MCFG_UPD7810_PORTA_READ_CB(READ8(epson_lx810l_device, porta_r)) MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(epson_lx810l_device, porta_w)) diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp index b906a7a8c0a..58639e698d5 100644 --- a/src/devices/bus/centronics/nec_p72.cpp +++ b/src/devices/bus/centronics/nec_p72.cpp @@ -50,7 +50,7 @@ ADDRESS_MAP_END MACHINE_CONFIG_START(nec_p72_device::device_add_mconfig) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", V33, XTAL_16MHz/2) /* TODO it's actually a V40 */ + MCFG_CPU_ADD("maincpu", V33, XTAL(16'000'000)/2) /* TODO it's actually a V40 */ MCFG_CPU_PROGRAM_MAP(p72_mem) MACHINE_CONFIG_END diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp index bca9110bff5..e53ad30fbe6 100644 --- a/src/devices/bus/cgenie/expansion/floppy.cpp +++ b/src/devices/bus/cgenie/expansion/floppy.cpp @@ -72,7 +72,7 @@ const tiny_rom_entry *cgenie_fdc_device::device_rom_region() const MACHINE_CONFIG_START(cgenie_fdc_device::device_add_mconfig) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer", cgenie_fdc_device, timer_callback, attotime::from_msec(25)) - MCFG_FD1793_ADD("fd1793", XTAL_1MHz) + MCFG_FD1793_ADD("fd1793", XTAL(1'000'000)) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(cgenie_fdc_device, intrq_w)) MCFG_FLOPPY_DRIVE_ADD("fd1793:0", cgenie_floppies, "ssdd", cgenie_fdc_device::floppy_formats) diff --git a/src/devices/bus/coco/coco_dcmodem.cpp b/src/devices/bus/coco/coco_dcmodem.cpp index 4e7a12081ff..f0dd20b86da 100644 --- a/src/devices/bus/coco/coco_dcmodem.cpp +++ b/src/devices/bus/coco/coco_dcmodem.cpp @@ -85,7 +85,7 @@ namespace MACHINE_CONFIG_START(coco_dc_modem_device::device_add_mconfig) MCFG_DEVICE_ADD(UART_TAG, MOS6551, 0) - MCFG_MOS6551_XTAL(XTAL_1_8432MHz) + MCFG_MOS6551_XTAL(XTAL(1'843'200)) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(coco_dc_modem_device, uart_irq_w)) MACHINE_CONFIG_END diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp index be84d919982..037c155fb63 100644 --- a/src/devices/bus/coco/coco_fdc.cpp +++ b/src/devices/bus/coco/coco_fdc.cpp @@ -122,7 +122,7 @@ static SLOT_INTERFACE_START( coco_fdc_floppies ) SLOT_INTERFACE_END MACHINE_CONFIG_START(coco_fdc_device_base::device_add_mconfig) - MCFG_WD1773_ADD(WD_TAG, XTAL_8MHz) + MCFG_WD1773_ADD(WD_TAG, XTAL(8'000'000)) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(coco_fdc_device_base, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(coco_fdc_device_base, fdc_drq_w)) @@ -135,7 +135,7 @@ MACHINE_CONFIG_START(coco_fdc_device_base::device_add_mconfig) MCFG_FLOPPY_DRIVE_ADD(WD_TAG ":3", coco_fdc_floppies, nullptr, coco_fdc_device_base::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) - MCFG_DEVICE_ADD(DISTO_TAG, MSM6242, XTAL_32_768kHz) + MCFG_DEVICE_ADD(DISTO_TAG, MSM6242, XTAL(32'768)) MCFG_DS1315_ADD(CLOUD9_TAG) MACHINE_CONFIG_END diff --git a/src/devices/bus/coco/coco_gmc.cpp b/src/devices/bus/coco/coco_gmc.cpp index 75d6c28669e..1cd11645fc9 100644 --- a/src/devices/bus/coco/coco_gmc.cpp +++ b/src/devices/bus/coco/coco_gmc.cpp @@ -53,7 +53,7 @@ namespace MACHINE_CONFIG_START(coco_pak_gmc_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("gmc_speaker") - MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL_4MHz) + MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL(4'000'000)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "gmc_speaker", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/coco/coco_rs232.cpp b/src/devices/bus/coco/coco_rs232.cpp index c6bf6bd0c23..2ec1f7a4d2a 100644 --- a/src/devices/bus/coco/coco_rs232.cpp +++ b/src/devices/bus/coco/coco_rs232.cpp @@ -69,7 +69,7 @@ IMPLEMENTATION MACHINE_CONFIG_START(coco_rs232_device::device_add_mconfig) MCFG_DEVICE_ADD(UART_TAG, MOS6551, 0) - MCFG_MOS6551_XTAL(XTAL_1_8432MHz) + MCFG_MOS6551_XTAL(XTAL(1'843'200)) MACHINE_CONFIG_END diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp index 2397af5aa14..96df8ea8d3c 100644 --- a/src/devices/bus/coco/coco_ssc.cpp +++ b/src/devices/bus/coco/coco_ssc.cpp @@ -167,7 +167,7 @@ MACHINE_CONFIG_START(coco_ssc_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("ssc_audio") - MCFG_SOUND_ADD(SP0256_TAG, SP0256, XTAL_3_12MHz) + MCFG_SOUND_ADD(SP0256_TAG, SP0256, XTAL(3'120'000)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ssc_audio", SP0256_GAIN) MCFG_SP0256_DATA_REQUEST_CB(INPUTLINE(PIC_TAG, TMS7000_INT1_LINE)) diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp index 7a79343b5b5..1800ba64874 100644 --- a/src/devices/bus/coco/coco_t4426.cpp +++ b/src/devices/bus/coco/coco_t4426.cpp @@ -163,7 +163,7 @@ MACHINE_CONFIG_START(coco_t4426_device::device_add_mconfig) MCFG_RS232_CTS_HANDLER (DEVWRITELINE (UART_TAG, acia6850_device, write_cts)) /* Bit Rate Generator */ - MCFG_MC14411_ADD (BRG_TAG, XTAL_1_8432MHz) + MCFG_MC14411_ADD (BRG_TAG, XTAL(1'843'200)) MCFG_MC14411_F1_CB(WRITELINE (coco_t4426_device, write_f1_clock)) MCFG_MC14411_F3_CB(WRITELINE (coco_t4426_device, write_f3_clock)) MCFG_MC14411_F5_CB(WRITELINE (coco_t4426_device, write_f5_clock)) diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp index 675485d9f54..d13488df8a7 100644 --- a/src/devices/bus/coco/dragon_fdc.cpp +++ b/src/devices/bus/coco/dragon_fdc.cpp @@ -146,7 +146,7 @@ SLOT_INTERFACE_END MACHINE_CONFIG_START(dragon_fdc_device_base::device_add_mconfig) - MCFG_WD2797_ADD(WD2797_TAG, XTAL_4MHz / 4) + MCFG_WD2797_ADD(WD2797_TAG, XTAL(4'000'000) / 4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(dragon_fdc_device_base, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(dragon_fdc_device_base, fdc_drq_w)) MCFG_WD_FDC_FORCE_READY @@ -163,7 +163,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(premier_fdc_device_base::device_add_mconfig) - MCFG_WD2791_ADD(WD2791_TAG, XTAL_2MHz / 2) + MCFG_WD2791_ADD(WD2791_TAG, XTAL(2'000'000) / 2) MCFG_WD_FDC_FORCE_READY MCFG_FLOPPY_DRIVE_ADD(WD2791_TAG ":0", dragon_fdc_device_base, "qd", dragon_fdc_device_base::floppy_formats) diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp index 7e692069baa..07b6a737133 100644 --- a/src/devices/bus/comx35/clm.cpp +++ b/src/devices/bus/comx35/clm.cpp @@ -147,7 +147,7 @@ MACHINE_CONFIG_START(comx_clm_device::device_add_mconfig) MCFG_GFXDECODE_ADD("gfxdecode", "palette", comx_clm) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_MC6845_ADD(MC6845_TAG, MC6845, MC6845_SCREEN_TAG, XTAL_14_31818MHz/7) + MCFG_MC6845_ADD(MC6845_TAG, MC6845, MC6845_SCREEN_TAG, XTAL(14'318'181)/7) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(comx_clm_device, crtc_update_row) diff --git a/src/devices/bus/comx35/fdc.cpp b/src/devices/bus/comx35/fdc.cpp index de9267969d9..49ea672b1ee 100644 --- a/src/devices/bus/comx35/fdc.cpp +++ b/src/devices/bus/comx35/fdc.cpp @@ -96,7 +96,7 @@ SLOT_INTERFACE_END //------------------------------------------------- MACHINE_CONFIG_START(comx_fd_device::device_add_mconfig) - MCFG_WD1770_ADD(WD1770_TAG, XTAL_8MHz) + MCFG_WD1770_ADD(WD1770_TAG, XTAL(8'000'000)) MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", comx_fd_floppies, "525sd35t", comx_fd_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":1", comx_fd_floppies, nullptr, comx_fd_device::floppy_formats) diff --git a/src/devices/bus/cpc/cpc_pds.cpp b/src/devices/bus/cpc/cpc_pds.cpp index 4687e2366a3..bc170675a51 100644 --- a/src/devices/bus/cpc/cpc_pds.cpp +++ b/src/devices/bus/cpc/cpc_pds.cpp @@ -18,7 +18,7 @@ DEFINE_DEVICE_TYPE(CPC_PDS, cpc_pds_device, "cpc_pds", "Programmers Development MACHINE_CONFIG_START(cpc_pds_device::device_add_mconfig) - MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_4MHz) // no clock on the PCB, so will presume that it uses the CPC's clock + MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(4'000'000)) // no clock on the PCB, so will presume that it uses the CPC's clock // no pass-through seen on remake PCBs, unknown if actual hardware had a pass-through port or not MACHINE_CONFIG_END diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp index b187e514e6a..c0914b93b68 100644 --- a/src/devices/bus/cpc/cpc_rs232.cpp +++ b/src/devices/bus/cpc/cpc_rs232.cpp @@ -42,7 +42,7 @@ MACHINE_CONFIG_START(cpc_rs232_device::device_add_mconfig) MCFG_PIT8253_OUT1_HANDLER(WRITELINE(cpc_rs232_device, pit_out1_w)) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(cpc_rs232_device, pit_out2_w)) - MCFG_DEVICE_ADD("dart", Z80DART, XTAL_4MHz) + MCFG_DEVICE_ADD("dart", Z80DART, XTAL(4'000'000)) MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr)) MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts)) diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp index aa9ade4b124..59369e577df 100644 --- a/src/devices/bus/cpc/cpc_ssa1.cpp +++ b/src/devices/bus/cpc/cpc_ssa1.cpp @@ -117,7 +117,7 @@ const tiny_rom_entry *cpc_dkspeech_device::device_rom_region() const // device machine config MACHINE_CONFIG_START(cpc_ssa1_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sp0256",SP0256,XTAL_3_12MHz) + MCFG_SOUND_ADD("sp0256",SP0256,XTAL(3'120'000)) MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(cpc_ssa1_device, lrq_cb)) MCFG_SP0256_STANDBY_CB(WRITELINE(cpc_ssa1_device, sby_cb)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) @@ -133,7 +133,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cpc_dkspeech_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sp0256",SP0256,XTAL_4MHz) // uses the CPC's clock from pin 50 of the expansion port + MCFG_SOUND_ADD("sp0256",SP0256,XTAL(4'000'000)) // uses the CPC's clock from pin 50 of the expansion port MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(cpc_dkspeech_device, lrq_cb)) MCFG_SP0256_STANDBY_CB(WRITELINE(cpc_dkspeech_device, sby_cb)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp index c62aa4313dd..ef3b9cb52e0 100644 --- a/src/devices/bus/cpc/magicsound.cpp +++ b/src/devices/bus/cpc/magicsound.cpp @@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(AL_MAGICSOUND, al_magicsound_device, "al_magicsound", "Aleste MACHINE_CONFIG_START(al_magicsound_device::device_add_mconfig) - MCFG_DEVICE_ADD( "dmac", AM9517A, XTAL_4MHz ) // CLK from expansion port + MCFG_DEVICE_ADD( "dmac", AM9517A, XTAL(4'000'000) ) // CLK from expansion port // According to the schematics, the TC pin (EOP on western chips) is connected to NMI on the expansion port. // NMIs seem to occur too quickly when this is active, so either EOP is not triggered at the correct time, or // the K1810WT37 is different to the i8237/AM9517A @@ -42,19 +42,19 @@ MACHINE_CONFIG_START(al_magicsound_device::device_add_mconfig) // passes through an inverter to each CLK pin on both timers. This seems to be too fast. // Timer outputs to SAM0/1/2/3 are sample clocks for each sound channel, D/A0 is the low bit of the channel select. MCFG_DEVICE_ADD("timer1", PIT8254, 0) - MCFG_PIT8253_CLK0(XTAL_4MHz) + MCFG_PIT8253_CLK0(XTAL(4'000'000)) MCFG_PIT8253_OUT0_HANDLER(WRITELINE(al_magicsound_device, sam0_w)) - MCFG_PIT8253_CLK1(XTAL_4MHz) + MCFG_PIT8253_CLK1(XTAL(4'000'000)) MCFG_PIT8253_OUT1_HANDLER(WRITELINE(al_magicsound_device, sam1_w)) - MCFG_PIT8253_CLK2(XTAL_4MHz) + MCFG_PIT8253_CLK2(XTAL(4'000'000)) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(al_magicsound_device, sam2_w)) MCFG_DEVICE_ADD("timer2", PIT8254, 0) - MCFG_PIT8253_CLK0(XTAL_4MHz) + MCFG_PIT8253_CLK0(XTAL(4'000'000)) MCFG_PIT8253_OUT0_HANDLER(WRITELINE(al_magicsound_device, sam3_w)) - MCFG_PIT8253_CLK1(XTAL_4MHz) + MCFG_PIT8253_CLK1(XTAL(4'000'000)) MCFG_PIT8253_OUT1_HANDLER(WRITELINE(al_magicsound_device, da0_w)) - MCFG_PIT8253_CLK2(XTAL_4MHz) + MCFG_PIT8253_CLK2(XTAL(4'000'000)) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC diff --git a/src/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp index ca165673e26..9ec331ffd54 100644 --- a/src/devices/bus/cpc/playcity.cpp +++ b/src/devices/bus/cpc/playcity.cpp @@ -25,15 +25,15 @@ DEFINE_DEVICE_TYPE(CPC_PLAYCITY, cpc_playcity_device, "cpc_playcity", "PlayCity" // device machine config MACHINE_CONFIG_START(cpc_playcity_device::device_add_mconfig) - MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz) + MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000)) MCFG_Z80CTC_ZC1_CB(WRITELINE(cpc_playcity_device, ctc_zc1_cb)) MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc",z80ctc_device, trg3)) MCFG_Z80CTC_INTR_CB(WRITELINE(cpc_playcity_device, ctc_intr_cb)) MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") - MCFG_SOUND_ADD("ymz_1",YMZ294,XTAL_4MHz) // when timer is not set, operates at 4MHz (interally divided by 2, so equivalent to the ST) + MCFG_SOUND_ADD("ymz_1",YMZ294,XTAL(4'000'000)) // when timer is not set, operates at 4MHz (interally divided by 2, so equivalent to the ST) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) - MCFG_SOUND_ADD("ymz_2",YMZ294,XTAL_4MHz) + MCFG_SOUND_ADD("ymz_2",YMZ294,XTAL(4'000'000)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) // pass-through @@ -132,7 +132,7 @@ void cpc_playcity_device::update_ymz_clock() { // Bit of a hack job here, since there is no way currently to connect the CTC channel output directly to the YMZ clocks. uint8_t rate = m_ctc->get_channel_constant(0); - uint32_t clk = XTAL_4MHz; + uint32_t clk = 4000000; switch(rate) { diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp index 776a3970fdd..cf9a1cfffc2 100644 --- a/src/devices/bus/dmv/k210.cpp +++ b/src/devices/bus/dmv/k210.cpp @@ -142,7 +142,7 @@ WRITE8_MEMBER( dmv_k210_device::portc_w ) if (!(data & 0x80)) { m_centronics->write_strobe(ASSERT_LINE); - m_clk1_timer->adjust(attotime::from_hz(XTAL_1MHz)); + m_clk1_timer->adjust(attotime::from_hz(XTAL(1'000'000))); } m_centronics->write_init(!BIT(data, 1)); diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp index b449d4d8dc3..196943863a7 100644 --- a/src/devices/bus/dmv/k220.cpp +++ b/src/devices/bus/dmv/k220.cpp @@ -162,7 +162,7 @@ MACHINE_CONFIG_START(dmv_k220_device::device_add_mconfig) MCFG_I8255_OUT_PORTC_CB(WRITE8(dmv_k220_device, portc_w)) MCFG_DEVICE_ADD("pit8253", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL_1MHz) // CLK1 + MCFG_PIT8253_CLK0(XTAL(1'000'000)) // CLK1 MCFG_PIT8253_OUT0_HANDLER(WRITELINE(dmv_k220_device, write_out0)) MCFG_PIT8253_OUT1_HANDLER(WRITELINE(dmv_k220_device, write_out1)) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(dmv_k220_device, write_out2)) diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp index a21e4e12aae..217fa423022 100644 --- a/src/devices/bus/dmv/k230.cpp +++ b/src/devices/bus/dmv/k230.cpp @@ -163,18 +163,18 @@ void dmv_k234_device::device_reset() //------------------------------------------------- MACHINE_CONFIG_START(dmv_k230_device::device_add_mconfig) - MCFG_CPU_ADD("maincpu", I8088, XTAL_15MHz / 3) + MCFG_CPU_ADD("maincpu", I8088, XTAL(15'000'000) / 3) MCFG_CPU_PROGRAM_MAP(k230_mem) MCFG_CPU_IO_MAP(k230_io) MACHINE_CONFIG_END MACHINE_CONFIG_START(dmv_k234_device::device_add_mconfig) - MCFG_CPU_ADD("maincpu", M68008, XTAL_16MHz / 2) + MCFG_CPU_ADD("maincpu", M68008, XTAL(16'000'000) / 2) MCFG_CPU_PROGRAM_MAP(k234_mem) MACHINE_CONFIG_END MACHINE_CONFIG_START(dmv_k235_device::device_add_mconfig) - MCFG_CPU_ADD("maincpu", V20, XTAL_15MHz / 3) + MCFG_CPU_ADD("maincpu", V20, XTAL(15'000'000) / 3) MCFG_CPU_PROGRAM_MAP(k230_mem) MCFG_CPU_IO_MAP(k235_io) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb) diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp index fdb33c2e427..cb6352ba058 100644 --- a/src/devices/bus/dmv/k801.cpp +++ b/src/devices/bus/dmv/k801.cpp @@ -143,7 +143,7 @@ void dmv_k801_device::device_reset() //------------------------------------------------- MACHINE_CONFIG_START(dmv_k801_device::device_add_mconfig) - MCFG_DEVICE_ADD("epci", MC2661, XTAL_5_0688MHz) + MCFG_DEVICE_ADD("epci", MC2661, XTAL(5'068'800)) MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr)) diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp index 2e46256e9e9..99deb19fdde 100644 --- a/src/devices/bus/dmv/k803.cpp +++ b/src/devices/bus/dmv/k803.cpp @@ -76,7 +76,7 @@ void dmv_k803_device::device_reset() //------------------------------------------------- MACHINE_CONFIG_START(dmv_k803_device::device_add_mconfig) - MCFG_DEVICE_ADD("rtc", MM58167, XTAL_32_768kHz) + MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768)) MCFG_MM58167_IRQ_CALLBACK(WRITELINE(dmv_k803_device, rtc_irq_w)) MACHINE_CONFIG_END diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp index 48758217e3c..742f97c2a33 100644 --- a/src/devices/bus/dmv/k806.cpp +++ b/src/devices/bus/dmv/k806.cpp @@ -101,7 +101,7 @@ void dmv_k806_device::device_reset() //------------------------------------------------- MACHINE_CONFIG_START(dmv_k806_device::device_add_mconfig) - MCFG_CPU_ADD("mcu", I8741, XTAL_6MHz) + MCFG_CPU_ADD("mcu", I8741, XTAL(6'000'000)) MCFG_MCS48_PORT_P1_IN_CB(READ8(dmv_k806_device, port1_r)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(dmv_k806_device, port2_w)) MCFG_MCS48_PORT_T1_IN_CB(READLINE(dmv_k806_device, portt1_r)) diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index 2b6556b54a7..30174aa4e83 100644 --- a/src/devices/bus/ecbbus/grip.cpp +++ b/src/devices/bus/ecbbus/grip.cpp @@ -459,7 +459,7 @@ void ecb_grip21_device::kb_w(uint8_t data) MACHINE_CONFIG_START(ecb_grip21_device::device_add_mconfig) // basic machine hardware - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) + MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4) MCFG_Z80_DAISY_CHAIN(grip_daisy_chain) MCFG_CPU_PROGRAM_MAP(grip_mem) MCFG_CPU_IO_MAP(grip_io) @@ -481,14 +481,14 @@ MACHINE_CONFIG_START(ecb_grip21_device::device_add_mconfig) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // devices - MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/4) + MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(16'000'000)/4) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(ecb_grip21_device, crtc_update_row) MCFG_MC6845_OUT_DE_CB(DEVWRITELINE(Z80STI_TAG, z80sti_device, i1_w)) MCFG_MC6845_OUT_CUR_CB(DEVWRITELINE(Z80STI_TAG, z80sti_device, i1_w)) -// MCFG_MC6845_ADD(HD6345_TAG, HD6345, SCREEN_TAG, XTAL_16MHz/4) +// MCFG_MC6845_ADD(HD6345_TAG, HD6345, SCREEN_TAG, XTAL(16'000'000)/4) MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0) MCFG_I8255_IN_PORTA_CB(READ8(ecb_grip21_device, ppi_pa_r)) @@ -496,7 +496,7 @@ MACHINE_CONFIG_START(ecb_grip21_device::device_add_mconfig) MCFG_I8255_IN_PORTB_CB(READ8(ecb_grip21_device, ppi_pb_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(ecb_grip21_device, ppi_pc_w)) - MCFG_DEVICE_ADD(Z80STI_TAG, Z80STI, XTAL_16MHz/4) + MCFG_DEVICE_ADD(Z80STI_TAG, Z80STI, XTAL(16'000'000)/4) MCFG_Z80STI_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80STI_IN_GPIO_CB(READ8(ecb_grip21_device, sti_gpio_r)) MCFG_Z80STI_OUT_TBO_CB(WRITELINE(ecb_grip21_device, speaker_w)) diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp index 5cb5c6704c9..94c7cfe26b1 100644 --- a/src/devices/bus/econet/e01.cpp +++ b/src/devices/bus/econet/e01.cpp @@ -243,21 +243,21 @@ ADDRESS_MAP_END MACHINE_CONFIG_START(econet_e01_device::device_add_mconfig) // basic machine hardware - MCFG_CPU_ADD(R65C102_TAG, M65C02, XTAL_8MHz/4) // Rockwell R65C102P3 + MCFG_CPU_ADD(R65C102_TAG, M65C02, XTAL(8'000'000)/4) // Rockwell R65C102P3 MCFG_CPU_PROGRAM_MAP(e01_mem) - MCFG_MC146818_ADD(HD146818_TAG, XTAL_32_768kHz) + MCFG_MC146818_ADD(HD146818_TAG, XTAL(32'768)) MCFG_MC146818_IRQ_HANDLER(WRITELINE(econet_e01_device, rtc_irq_w)) // devices - MCFG_DEVICE_ADD(R6522_TAG, VIA6522, XTAL_8MHz / 4) + MCFG_DEVICE_ADD(R6522_TAG, VIA6522, XTAL(8'000'000) / 4) MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(econet_e01_device, via_irq_w)) MCFG_DEVICE_ADD(MC6854_TAG, MC6854, 0) MCFG_MC6854_OUT_IRQ_CB(WRITELINE(econet_e01_device, adlc_irq_w)) MCFG_MC6854_OUT_TXD_CB(WRITELINE(econet_e01_device, econet_data_w)) - MCFG_WD2793_ADD(WD2793_TAG, XTAL_8MHz/4) + MCFG_WD2793_ADD(WD2793_TAG, XTAL(8'000'000)/4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(econet_e01_device, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(econet_e01_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", e01_floppies, "35dd", floppy_formats_afs) diff --git a/src/devices/bus/einstein/pipe/tk02.cpp b/src/devices/bus/einstein/pipe/tk02.cpp index 763181c2ed8..14aa1b661c7 100644 --- a/src/devices/bus/einstein/pipe/tk02.cpp +++ b/src/devices/bus/einstein/pipe/tk02.cpp @@ -97,14 +97,14 @@ GFXDECODE_END MACHINE_CONFIG_START(tk02_device::device_add_mconfig) MCFG_SCREEN_ADD_MONOCHROME("mono", RASTER, rgb_t::green()) - MCFG_SCREEN_RAW_PARAMS(XTAL_8MHz * 2, 1024, 0, 640, 312, 0, 250) + MCFG_SCREEN_RAW_PARAMS(XTAL(8'000'000) * 2, 1024, 0, 640, 312, 0, 250) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", tk02) - MCFG_MC6845_ADD("crtc", MC6845, "mono", XTAL_8MHz / 4) + MCFG_MC6845_ADD("crtc", MC6845, "mono", XTAL(8'000'000) / 4) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(tk02_device, crtc_update_row) diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp index 918d73e3670..81c68a80e4d 100644 --- a/src/devices/bus/electron/m2105.cpp +++ b/src/devices/bus/electron/m2105.cpp @@ -78,7 +78,7 @@ MACHINE_CONFIG_START(electron_m2105_device::device_add_mconfig) MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<1>)) /* duart */ - MCFG_DEVICE_ADD("duart", SCN2681, XTAL_3_6864MHz) + MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400)) MCFG_MC68681_IRQ_CALLBACK(DEVWRITELINE("irqs", input_merger_device, in_w<2>)) MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd)) //MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(electron_m2105_device, sio_out_w)) diff --git a/src/devices/bus/electron/plus3.cpp b/src/devices/bus/electron/plus3.cpp index 0f00958fd75..413bbc8ec6c 100644 --- a/src/devices/bus/electron/plus3.cpp +++ b/src/devices/bus/electron/plus3.cpp @@ -66,7 +66,7 @@ ROM_END MACHINE_CONFIG_START(electron_plus3_device::device_add_mconfig) /* fdc */ - MCFG_WD1770_ADD("fdc", XTAL_16MHz / 2) + MCFG_WD1770_ADD("fdc", XTAL(16'000'000) / 2) MCFG_FLOPPY_DRIVE_ADD_FIXED("fdc:0", electron_floppies, "35dd", floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", electron_floppies, nullptr, floppy_formats) diff --git a/src/devices/bus/ep64/exdos.cpp b/src/devices/bus/ep64/exdos.cpp index 931ae243aa1..eb5b61229c9 100644 --- a/src/devices/bus/ep64/exdos.cpp +++ b/src/devices/bus/ep64/exdos.cpp @@ -103,7 +103,7 @@ SLOT_INTERFACE_END //------------------------------------------------- MACHINE_CONFIG_START(ep64_exdos_device::device_add_mconfig) - MCFG_WD1770_ADD(WD1770_TAG, XTAL_8MHz) + MCFG_WD1770_ADD(WD1770_TAG, XTAL(8'000'000)) MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", ep64_exdos_floppies, "35dd", ep64_exdos_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":1", ep64_exdos_floppies, nullptr, ep64_exdos_device::floppy_formats) diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp index ac0e8e1884e..728e096b50e 100644 --- a/src/devices/bus/epson_sio/pf10.cpp +++ b/src/devices/bus/epson_sio/pf10.cpp @@ -64,7 +64,7 @@ static SLOT_INTERFACE_START( pf10_floppies ) SLOT_INTERFACE_END MACHINE_CONFIG_START(epson_pf10_device::device_add_mconfig) - MCFG_CPU_ADD("maincpu", HD6303Y, XTAL_4_9152MHz) // HD63A03XF + MCFG_CPU_ADD("maincpu", HD6303Y, XTAL(4'915'200)) // HD63A03XF MCFG_CPU_PROGRAM_MAP(cpu_mem) MCFG_CPU_IO_MAP(cpu_io) MCFG_M6801_SER_TX(DEVWRITELINE(DEVICE_SELF, epson_pf10_device, hd6303_tx_w)) diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp index f50c5c7af89..35a86b25009 100644 --- a/src/devices/bus/epson_sio/tf20.cpp +++ b/src/devices/bus/epson_sio/tf20.cpp @@ -15,8 +15,8 @@ #include "emu.h" #include "tf20.h" -#define XTAL_CR1 XTAL_8MHz -#define XTAL_CR2 XTAL_4_9152MHz +#define XTAL_CR1 XTAL(8'000'000) +#define XTAL_CR2 XTAL(4'915'200) //************************************************************************** diff --git a/src/devices/bus/epson_sio/tf20.h b/src/devices/bus/epson_sio/tf20.h index e509e6ffcaa..cde9509f685 100644 --- a/src/devices/bus/epson_sio/tf20.h +++ b/src/devices/bus/epson_sio/tf20.h @@ -79,8 +79,8 @@ private: epson_sio_device *m_sio_input; - static const int XTAL_CR1 = XTAL_8MHz; - static const int XTAL_CR2 = XTAL_4_9152MHz; + static constexpr XTAL XTAL_CR1 = XTAL(8'000'000); + static constexpr XTAL XTAL_CR2 = XTAL(4'915'200); }; diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp index 8da82eaff2e..48713edcc13 100644 --- a/src/devices/bus/hp80_io/82937.cpp +++ b/src/devices/bus/hp80_io/82937.cpp @@ -328,7 +328,7 @@ const tiny_rom_entry *hp82937_io_card_device::device_rom_region() const } MACHINE_CONFIG_START(hp82937_io_card_device::device_add_mconfig) - MCFG_CPU_ADD("cpu" , I8049 , XTAL_11MHz) + MCFG_CPU_ADD("cpu" , I8049 , XTAL(11'000'000)) MCFG_CPU_IO_MAP(cpu_io_map) MCFG_MCS48_PORT_T0_IN_CB(READLINE(hp82937_io_card_device , t0_r)) MCFG_MCS48_PORT_T1_IN_CB(DEVREADLINE("xlator" , hp_1mb5_device , int_r)) diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp index cc08e339a79..886faf6957f 100644 --- a/src/devices/bus/hp9845_io/98035.cpp +++ b/src/devices/bus/hp9845_io/98035.cpp @@ -94,7 +94,7 @@ #define BIT_SET(w , n) ((w) |= BIT_MASK(n)) // Frequency of digit multiplexing in clock chip -#define DIGIT_MUX_FREQ (XTAL_32_768kHz / 64) +#define DIGIT_MUX_FREQ (XTAL(32'768) / 64) // Duration of key presses #define KEY_PRESS_SHORT 1 // 1.95 ms @@ -247,7 +247,7 @@ void hp98035_io_card_device::device_timer(emu_timer &timer, device_timer_id id, m_prev_clock_keys = m_clock_keys; // Count seconds m_clock_1s_div++; - if (m_clock_1s_div >= DIGIT_MUX_FREQ) { + if (m_clock_1s_div >= DIGIT_MUX_FREQ.value()) { m_clock_1s_div = 0; advance_seconds(); regen_clock_image(); @@ -755,7 +755,7 @@ const tiny_rom_entry *hp98035_io_card_device::device_rom_region() const } MACHINE_CONFIG_START(hp98035_io_card_device::device_add_mconfig) - MCFG_CPU_ADD("np" , HP_NANOPROCESSOR , XTAL_1MHz) + MCFG_CPU_ADD("np" , HP_NANOPROCESSOR , XTAL(1'000'000)) MCFG_CPU_PROGRAM_MAP(np_program_map) MCFG_CPU_IO_MAP(np_io_map) MCFG_HP_NANO_DC_CHANGED(WRITE8(hp98035_io_card_device , dc_w)) diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp index 0a74402a923..6ea6f846c82 100644 --- a/src/devices/bus/ieee488/c2031.cpp +++ b/src/devices/bus/ieee488/c2031.cpp @@ -303,18 +303,18 @@ FLOPPY_FORMATS_END //------------------------------------------------- MACHINE_CONFIG_START(c2031_device::device_add_mconfig) - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(c2031_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) - MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(READ8(c2031_device, via0_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c2031_device, via0_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c2031_device, via0_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2031_device, via0_pb_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c2031_device, via0_irq_w)) - MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c2031_device, via1_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w)) @@ -323,7 +323,7 @@ MACHINE_CONFIG_START(c2031_device::device_add_mconfig) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c2031_device, via1_irq_w)) - MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz) + MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000)) MCFG_64H156_BYTE_CALLBACK(WRITELINE(c2031_device, byte_w)) MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c2031_floppies, "525ssqd", c2031_device::floppy_formats) MACHINE_CONFIG_END diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp index 379152202d2..1031e7129c2 100644 --- a/src/devices/bus/ieee488/c2040.cpp +++ b/src/devices/bus/ieee488/c2040.cpp @@ -449,14 +449,14 @@ FLOPPY_FORMATS_END MACHINE_CONFIG_START(c2040_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(c2040_main_mem) - MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(16'000'000)/16) MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r)) MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w)) - MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(16'000'000)/16) MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r)) MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w)) MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r)) @@ -464,16 +464,16 @@ MACHINE_CONFIG_START(c2040_device::device_add_mconfig) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_16MHz/16) + MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(c2040_fdc_mem) - MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_device, read)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w)) - MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(16'000'000)/16) MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c2040_fdc_device, write)) MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w)) MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds0_w)) @@ -481,7 +481,7 @@ MACHINE_CONFIG_START(c2040_device::device_add_mconfig) MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c2040_fdc_device, wps_r)) - MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL_16MHz) + MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL(16'000'000)) MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_new_device, pb6_w)) MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) @@ -492,14 +492,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(c3040_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(c2040_main_mem) - MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(16'000'000)/16) MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r)) MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w)) - MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(16'000'000)/16) MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r)) MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w)) MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r)) @@ -507,16 +507,16 @@ MACHINE_CONFIG_START(c3040_device::device_add_mconfig) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_16MHz/16) + MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(c2040_fdc_mem) - MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_device, read)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w)) - MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(16'000'000)/16) MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c2040_fdc_device, write)) MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w)) MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds0_w)) @@ -524,7 +524,7 @@ MACHINE_CONFIG_START(c3040_device::device_add_mconfig) MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c2040_fdc_device, wps_r)) MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) - MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL_16MHz) + MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL(16'000'000)) MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_new_device, pb6_w)) MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) @@ -535,14 +535,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(c4040_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(c2040_main_mem) - MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(16'000'000)/16) MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r)) MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w)) - MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(16'000'000)/16) MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r)) MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w)) MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r)) @@ -550,16 +550,16 @@ MACHINE_CONFIG_START(c4040_device::device_add_mconfig) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_16MHz/16) + MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(c2040_fdc_mem) - MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_device, read)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w)) - MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(16'000'000)/16) MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c2040_fdc_device, write)) MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w)) MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds0_w)) @@ -567,7 +567,7 @@ MACHINE_CONFIG_START(c4040_device::device_add_mconfig) MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c2040_fdc_device, wps_r)) MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) - MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL_16MHz) + MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL(16'000'000)) MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_new_device, pb6_w)) MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp index 88c214a1b06..799abbd599e 100644 --- a/src/devices/bus/ieee488/c8050.cpp +++ b/src/devices/bus/ieee488/c8050.cpp @@ -526,14 +526,14 @@ FLOPPY_FORMATS_END MACHINE_CONFIG_START(c8050_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12) MCFG_CPU_PROGRAM_MAP(c8050_main_mem) - MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12) MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r)) MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w)) - MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12) MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r)) MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w)) MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r)) @@ -541,16 +541,16 @@ MACHINE_CONFIG_START(c8050_device::device_add_mconfig) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_12MHz/12) + MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12) MCFG_CPU_PROGRAM_MAP(c8050_fdc_mem) - MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w)) - MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12) MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write)) MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w)) MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w)) @@ -559,7 +559,7 @@ MACHINE_CONFIG_START(c8050_device::device_add_mconfig) MCFG_MOS6530n_IN_PB6_CB(VCC) // SINGLE SIDED MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) - MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL_12MHz/2) + MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2) MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7)) MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1) @@ -571,14 +571,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(c8250_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12) MCFG_CPU_PROGRAM_MAP(c8050_main_mem) - MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12) MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r)) MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w)) - MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12) MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r)) MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w)) MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r)) @@ -586,16 +586,16 @@ MACHINE_CONFIG_START(c8250_device::device_add_mconfig) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_12MHz/12) + MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12) MCFG_CPU_PROGRAM_MAP(c8050_fdc_mem) - MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w)) - MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12) MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write)) MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w)) MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w)) @@ -605,7 +605,7 @@ MACHINE_CONFIG_START(c8250_device::device_add_mconfig) MCFG_MOS6530n_IN_PB6_CB(GND) // DOUBLE SIDED MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) - MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL_12MHz/2) + MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2) MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7)) MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1) @@ -617,14 +617,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(c8250lp_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12) MCFG_CPU_PROGRAM_MAP(c8050_main_mem) - MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12) MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r)) MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w)) - MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12) MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r)) MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w)) MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r)) @@ -632,16 +632,16 @@ MACHINE_CONFIG_START(c8250lp_device::device_add_mconfig) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_12MHz/12) + MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12) MCFG_CPU_PROGRAM_MAP(c8250lp_fdc_mem) - MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w)) - MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12) MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write)) MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w)) MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w)) @@ -651,7 +651,7 @@ MACHINE_CONFIG_START(c8250lp_device::device_add_mconfig) MCFG_MOS6530n_IN_PB6_CB(GND) // DOUBLE SIDED MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) - MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL_12MHz/2) + MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2) MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7)) MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1) @@ -663,14 +663,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(sfd1001_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_12MHz/12) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12) MCFG_CPU_PROGRAM_MAP(c8050_main_mem) - MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12) MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r)) MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w)) - MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12) MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r)) MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w)) MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r)) @@ -678,16 +678,16 @@ MACHINE_CONFIG_START(sfd1001_device::device_add_mconfig) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL_12MHz/12) + MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12) MCFG_CPU_PROGRAM_MAP(sfd1001_fdc_mem) - MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w)) - MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL_12MHz/12) + MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12) MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write)) MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w)) MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds1_w)) @@ -696,7 +696,7 @@ MACHINE_CONFIG_START(sfd1001_device::device_add_mconfig) MCFG_MOS6530n_IN_PB6_CB(GND) // DOUBLE SIDED MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) - MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL_12MHz/2) + MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2) MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7)) MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1) diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp index d4fed8cec5f..5bb49da2c71 100644 --- a/src/devices/bus/ieee488/c8280.cpp +++ b/src/devices/bus/ieee488/c8280.cpp @@ -290,24 +290,24 @@ FLOPPY_FORMATS_END //------------------------------------------------- MACHINE_CONFIG_START(c8280_device::device_add_mconfig) - MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL_12MHz/8) + MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL(12'000'000)/8) MCFG_CPU_PROGRAM_MAP(c8280_main_mem) - MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_12MHz/8) + MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/8) MCFG_MOS6530n_IN_PA_CB(READ8(c8280_device, dio_r)) MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8280_device, dio_w)) - MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_12MHz/8) + MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/8) MCFG_MOS6530n_IN_PA_CB(READ8(c8280_device, riot1_pa_r)) MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8280_device, riot1_pa_w)) MCFG_MOS6530n_IN_PB_CB(READ8(c8280_device, riot1_pb_r)) MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8280_device, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_DOS_TAG, INPUT_LINE_IRQ0)) - MCFG_CPU_ADD(M6502_FDC_TAG, M6502, XTAL_12MHz/8) + MCFG_CPU_ADD(M6502_FDC_TAG, M6502, XTAL(12'000'000)/8) MCFG_CPU_PROGRAM_MAP(c8280_fdc_mem) - MCFG_FD1797_ADD(WD1797_TAG, XTAL_12MHz/6) + MCFG_FD1797_ADD(WD1797_TAG, XTAL(12'000'000)/6) MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(M6502_FDC_TAG, M6502_IRQ_LINE)) MCFG_WD_FDC_DRQ_CALLBACK(INPUTLINE(M6502_FDC_TAG, M6502_SET_OVERFLOW)) MCFG_FLOPPY_DRIVE_ADD(WD1797_TAG ":0", c8280_floppies, "8dsdd", c8280_device::floppy_formats) diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp index 2f003f5b282..5104527ad70 100644 --- a/src/devices/bus/ieee488/d9060.cpp +++ b/src/devices/bus/ieee488/d9060.cpp @@ -370,14 +370,14 @@ WRITE8_MEMBER( d9060_device_base::scsi_data_w ) MACHINE_CONFIG_START(d9060_device_base::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL_4MHz/4) + MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL(4'000'000)/4) MCFG_CPU_PROGRAM_MAP(d9060_main_mem) - MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL_4MHz/4) + MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(4'000'000)/4) MCFG_MOS6530n_IN_PA_CB(READ8(d9060_device_base, dio_r)) MCFG_MOS6530n_OUT_PB_CB(WRITE8(d9060_device_base, dio_w)) - MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL_4MHz/4) + MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(4'000'000)/4) MCFG_MOS6530n_IN_PA_CB(READ8(d9060_device_base, riot1_pa_r)) MCFG_MOS6530n_OUT_PA_CB(WRITE8(d9060_device_base, riot1_pa_w)) MCFG_MOS6530n_IN_PB_CB(READ8(d9060_device_base, riot1_pb_r)) @@ -385,10 +385,10 @@ MACHINE_CONFIG_START(d9060_device_base::device_add_mconfig) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_DOS_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6502_HDC_TAG, M6502, XTAL_4MHz/4) + MCFG_CPU_ADD(M6502_HDC_TAG, M6502, XTAL(4'000'000)/4) MCFG_CPU_PROGRAM_MAP(d9060_hdc_mem) - MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_4MHz/4) + MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(4'000'000)/4) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(d9060_device_base, scsi_data_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(d9060_device_base, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(d9060_device_base, ack_w)) diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp index a2256e32fe5..5cf5c5e74eb 100644 --- a/src/devices/bus/ieee488/hardbox.cpp +++ b/src/devices/bus/ieee488/hardbox.cpp @@ -267,7 +267,7 @@ WRITE8_MEMBER( hardbox_device::ppi1_pc_w ) MACHINE_CONFIG_START(hardbox_device::device_add_mconfig) // basic machine hardware - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) + MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) MCFG_CPU_PROGRAM_MAP(hardbox_mem) MCFG_CPU_IO_MAP(hardbox_io) diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp index 2e82ea4d1d1..e54e0d9dc83 100644 --- a/src/devices/bus/ieee488/softbox.cpp +++ b/src/devices/bus/ieee488/softbox.cpp @@ -234,7 +234,7 @@ DEVICE_INPUT_DEFAULTS_END MACHINE_CONFIG_START(softbox_device::device_add_mconfig) // basic machine hardware - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) + MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) MCFG_CPU_PROGRAM_MAP(softbox_mem) MCFG_CPU_IO_MAP(softbox_io) @@ -260,7 +260,7 @@ MACHINE_CONFIG_START(softbox_device::device_add_mconfig) MCFG_I8255_IN_PORTC_CB(READ8(softbox_device, ppi1_pc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(softbox_device, ppi1_pc_w)) - MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL_5_0688MHz) + MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800)) MCFG_COM8116_FR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxc)) MCFG_COM8116_FT_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_txc)) diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp index 36a5cd9d51f..395181ff77e 100644 --- a/src/devices/bus/imi7000/imi5000h.cpp +++ b/src/devices/bus/imi7000/imi5000h.cpp @@ -341,18 +341,18 @@ WRITE8_MEMBER( imi5000h_device::pio3_pb_w ) //------------------------------------------------- MACHINE_CONFIG_START(imi5000h_device::device_add_mconfig) - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) + MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) MCFG_Z80_DAISY_CHAIN(z80_daisy_chain) MCFG_CPU_PROGRAM_MAP(imi5000h_mem) MCFG_CPU_IO_MAP(imi5000h_io) - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_8MHz / 2) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000) / 2) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE(imi5000h_device, ctc_z0_w)) MCFG_Z80CTC_ZC1_CB(WRITELINE(imi5000h_device, ctc_z1_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE(imi5000h_device, ctc_z2_w)) - MCFG_DEVICE_ADD(Z80PIO_0_TAG, Z80PIO, XTAL_8MHz/2) + MCFG_DEVICE_ADD(Z80PIO_0_TAG, Z80PIO, XTAL(8'000'000)/2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(imi5000h_device, pio0_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(imi5000h_device, pio0_pa_w)) @@ -361,7 +361,7 @@ MACHINE_CONFIG_START(imi5000h_device::device_add_mconfig) MCFG_Z80PIO_OUT_PB_CB(WRITE8(imi5000h_device, pio0_pb_w)) MCFG_Z80PIO_OUT_BRDY_CB(DEVWRITELINE(Z80PIO_0_TAG, z80pio_device, strobe_b)) - MCFG_DEVICE_ADD(Z80PIO_2_TAG, Z80PIO, XTAL_8MHz/2) + MCFG_DEVICE_ADD(Z80PIO_2_TAG, Z80PIO, XTAL(8'000'000)/2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(imi5000h_device, pio2_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(imi5000h_device, pio2_pa_w)) @@ -369,7 +369,7 @@ MACHINE_CONFIG_START(imi5000h_device::device_add_mconfig) MCFG_Z80PIO_IN_PB_CB(READ8(imi5000h_device, pio2_pb_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(imi5000h_device, pio2_pb_w)) - MCFG_DEVICE_ADD(Z80PIO_3_TAG, Z80PIO, XTAL_8MHz/2) + MCFG_DEVICE_ADD(Z80PIO_3_TAG, Z80PIO, XTAL(8'000'000)/2) MCFG_Z80PIO_IN_PA_CB(READ8(imi5000h_device, pio3_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(imi5000h_device, pio3_pa_w)) MCFG_Z80PIO_OUT_ARDY_CB(DEVWRITELINE(Z80PIO_3_TAG, z80pio_device, strobe_a)) diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp index d85b680de18..90f0e4abd54 100644 --- a/src/devices/bus/intv/ecs.cpp +++ b/src/devices/bus/intv/ecs.cpp @@ -97,7 +97,7 @@ void intv_ecs_device::late_subslot_setup() MACHINE_CONFIG_START(intv_ecs_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("mono_ecs") - MCFG_SOUND_ADD("ay8914", AY8914, XTAL_3_579545MHz/2) + MCFG_SOUND_ADD("ay8914", AY8914, XTAL(3'579'545)/2) MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("ctrl_port", intvecs_control_port_device, portA_r)) MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("ctrl_port", intvecs_control_port_device, portB_r)) MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("ctrl_port", intvecs_control_port_device, portA_w)) diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp index 6a536b69f1f..51c9e1679c9 100644 --- a/src/devices/bus/isa/aga.cpp +++ b/src/devices/bus/isa/aga.cpp @@ -9,8 +9,8 @@ #include "aga.h" #include "video/cgapal.h" -#define CGA_HCLK (XTAL_14_31818MHz/8) -#define CGA_LCLK (XTAL_14_31818MHz/16) +#define CGA_HCLK (XTAL(14'318'181)/8) +#define CGA_LCLK (XTAL(14'318'181)/16) #define AGA_SCREEN_NAME "screen" #define AGA_MC6845_NAME "mc6845_aga" @@ -275,12 +275,12 @@ MC6845_UPDATE_ROW( isa8_aga_device::aga_update_row ) MACHINE_CONFIG_START(isa8_aga_device::device_add_mconfig) MCFG_SCREEN_ADD( AGA_SCREEN_NAME, RASTER ) - MCFG_SCREEN_RAW_PARAMS( XTAL_14_31818MHz,912,0,640,262,0,200 ) + MCFG_SCREEN_RAW_PARAMS( XTAL(14'318'181),912,0,640,262,0,200 ) MCFG_SCREEN_UPDATE_DEVICE( AGA_MC6845_NAME, mc6845_device, screen_update ) MCFG_PALETTE_ADD( "palette", /* CGA_PALETTE_SETS * 16*/ 65536 ) - MCFG_MC6845_ADD(AGA_MC6845_NAME, MC6845, AGA_SCREEN_NAME, XTAL_14_31818MHz/8) + MCFG_MC6845_ADD(AGA_MC6845_NAME, MC6845, AGA_SCREEN_NAME, XTAL(14'318'181)/8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(isa8_aga_device, aga_update_row) @@ -863,7 +863,7 @@ void isa8_aga_device::pc_aga_set_mode( AGA_MODE mode) switch (m_mode) { case AGA_COLOR: - m_mc6845->set_clock( XTAL_14_31818MHz/8 ); + m_mc6845->set_clock( XTAL(14'318'181)/8 ); break; case AGA_MONO: m_mc6845->set_clock( 16257000/9 ); diff --git a/src/devices/bus/isa/aha1542.cpp b/src/devices/bus/isa/aha1542.cpp index 9b633c5717a..5be4b1de3cb 100644 --- a/src/devices/bus/isa/aha1542.cpp +++ b/src/devices/bus/isa/aha1542.cpp @@ -175,7 +175,7 @@ const tiny_rom_entry *aha1542_device::device_rom_region() const } MACHINE_CONFIG_START(aha1542_device::device_add_mconfig) - MCFG_CPU_ADD(Z84C0010_TAG, Z80, XTAL_12MHz) + MCFG_CPU_ADD(Z84C0010_TAG, Z80, XTAL(12'000'000)) MCFG_CPU_PROGRAM_MAP( z84c0010_mem ) MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp index 0609d9ce7a3..7d87ae853bf 100644 --- a/src/devices/bus/isa/cga.cpp +++ b/src/devices/bus/isa/cga.cpp @@ -240,8 +240,8 @@ MC6845_UPDATE_ROW( isa8_cga_pc1512_device::crtc_update_row ) } -#define CGA_HCLK (XTAL_14_31818MHz/8) -#define CGA_LCLK (XTAL_14_31818MHz/16) +#define CGA_HCLK (XTAL(14'318'181)/8) +#define CGA_LCLK (XTAL(14'318'181)/16) ROM_START( cga ) @@ -263,12 +263,12 @@ DEFINE_DEVICE_TYPE(ISA8_CGA, isa8_cga_device, "cga", "IBM Color/Graphics Monitor MACHINE_CONFIG_START(isa8_cga_device::device_add_mconfig) MCFG_SCREEN_ADD(CGA_SCREEN_NAME, RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,262,0,200) + MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181),912,0,640,262,0,200) MCFG_SCREEN_UPDATE_DEVICE( DEVICE_SELF, isa8_cga_device, screen_update ) MCFG_PALETTE_ADD("palette", /* CGA_PALETTE_SETS * 16*/ 65536 ) - MCFG_MC6845_ADD(CGA_MC6845_NAME, MC6845, CGA_SCREEN_NAME, XTAL_14_31818MHz/8) + MCFG_MC6845_ADD(CGA_MC6845_NAME, MC6845, CGA_SCREEN_NAME, XTAL(14'318'181)/8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(isa8_cga_device, crtc_update_row) @@ -1705,7 +1705,7 @@ MACHINE_CONFIG_START(isa8_cga_m24_device::device_add_mconfig) isa8_cga_device::device_add_mconfig(config); MCFG_DEVICE_MODIFY(CGA_SCREEN_NAME) - MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,462,0,400) + MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181),912,0,640,462,0,400) MCFG_DEVICE_MODIFY(CGA_MC6845_NAME) MCFG_MC6845_RECONFIGURE_CB(isa8_cga_m24_device, reconfigure) MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp index 86d0ff8e6ab..3fa3a9b3ffb 100644 --- a/src/devices/bus/isa/com.cpp +++ b/src/devices/bus/isa/com.cpp @@ -33,22 +33,22 @@ DEFINE_DEVICE_TYPE(ISA8_COM, isa8_com_device, "isa_com", "Communications Adapter //------------------------------------------------- MACHINE_CONFIG_START(isa8_com_device::device_add_mconfig) - MCFG_DEVICE_ADD( "uart_0", INS8250, XTAL_1_8432MHz ) + MCFG_DEVICE_ADD( "uart_0", INS8250, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport0", rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1)) - MCFG_DEVICE_ADD( "uart_1", INS8250, XTAL_1_8432MHz ) + MCFG_DEVICE_ADD( "uart_1", INS8250, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport1", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport1", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport1", rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_2)) - /*MCFG_DEVICE_ADD( "uart_2", INS8250, XTAL_1_8432MHz ) + /*MCFG_DEVICE_ADD( "uart_2", INS8250, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport2", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport2", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport2", rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1)) - MCFG_DEVICE_ADD( "uart_3", INS8250, XTAL_1_8432MHz ) + MCFG_DEVICE_ADD( "uart_3", INS8250, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport3", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport3", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport3", rs232_port_device, write_rts)) @@ -135,22 +135,22 @@ DEFINE_DEVICE_TYPE(ISA8_COM_AT, isa8_com_at_device, "isa_com_at", "Communication //------------------------------------------------- MACHINE_CONFIG_START(isa8_com_at_device::device_add_mconfig) - MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL_1_8432MHz ) /* Verified: IBM P/N 6320947 Serial/Parallel card uses an NS16450N */ + MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL(1'843'200) ) /* Verified: IBM P/N 6320947 Serial/Parallel card uses an NS16450N */ MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport0", rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1)) - MCFG_DEVICE_ADD( "uart_1", NS16450, XTAL_1_8432MHz ) + MCFG_DEVICE_ADD( "uart_1", NS16450, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport1", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport1", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport1", rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_2)) - /*MCFG_DEVICE_ADD( "uart_2", NS16450, XTAL_1_8432MHz ) + /*MCFG_DEVICE_ADD( "uart_2", NS16450, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport2", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport2", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport2", rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1)) - MCFG_DEVICE_ADD( "uart_3", NS16450, XTAL_1_8432MHz ) + MCFG_DEVICE_ADD( "uart_3", NS16450, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport3", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport3", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport3", rs232_port_device, write_rts)) diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp index 38477e648ab..7cb022c0a19 100644 --- a/src/devices/bus/isa/dectalk.cpp +++ b/src/devices/bus/isa/dectalk.cpp @@ -154,12 +154,12 @@ const tiny_rom_entry* dectalk_isa_device::device_rom_region() const } MACHINE_CONFIG_START(dectalk_isa_device::device_add_mconfig) - MCFG_CPU_ADD("dectalk_cpu", I80186, XTAL_20MHz) + MCFG_CPU_ADD("dectalk_cpu", I80186, XTAL(20'000'000)) MCFG_CPU_IO_MAP(dectalk_cpu_io) MCFG_CPU_PROGRAM_MAP(dectalk_cpu_map) MCFG_80186_TMROUT0_HANDLER(WRITELINE(dectalk_isa_device, clock_w)); - MCFG_CPU_ADD("dectalk_dsp", TMS32015, XTAL_20MHz) + MCFG_CPU_ADD("dectalk_dsp", TMS32015, XTAL(20'000'000)) MCFG_CPU_IO_MAP(dectalk_dsp_io) MCFG_TMS32010_BIO_IN_CB(READLINE(dectalk_isa_device, bio_line_r)) MCFG_CPU_PROGRAM_MAP(dectalk_dsp_map) diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp index ceb8b9ddc5d..12ca0086531 100644 --- a/src/devices/bus/isa/ega.cpp +++ b/src/devices/bus/isa/ega.cpp @@ -940,7 +940,7 @@ void isa8_ega_device::change_mode() } /* Check for changes to the crtc input clock and number of pixels per clock */ - clock = ( ( m_misc_output & 0x0c ) ? 16257000 : XTAL_14_31818MHz ); + clock = ( ( m_misc_output & 0x0c ) ? 16257000 : 14318181 ); pixels = ( ( m_sequencer.data[0x01] & 0x01 ) ? 8 : 9 ); if ( m_sequencer.data[0x01] & 0x08 ) diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp index a0ac2dd5177..d98d404451c 100644 --- a/src/devices/bus/isa/ibm_mfc.cpp +++ b/src/devices/bus/isa/ibm_mfc.cpp @@ -373,7 +373,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(isa8_ibm_mfc_device::device_add_mconfig) - MCFG_CPU_ADD("ibm_mfc", Z80, XTAL_11_8MHz / 2) + MCFG_CPU_ADD("ibm_mfc", Z80, XTAL(11'800'000) / 2) MCFG_CPU_PROGRAM_MAP(prg_map) MCFG_CPU_IO_MAP(io_map) @@ -390,19 +390,19 @@ MACHINE_CONFIG_START(isa8_ibm_mfc_device::device_add_mconfig) MCFG_DEVICE_ADD("d71051", I8251, 0) - MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL_4MHz / 8) // 500KHz + MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL(4'000'000) / 8) // 500KHz MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(isa8_ibm_mfc_device, write_usart_clock)) MCFG_DEVICE_ADD("d8253", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL_4MHz / 8) + MCFG_PIT8253_CLK0(XTAL(4'000'000) / 8) MCFG_PIT8253_OUT0_HANDLER(WRITELINE(isa8_ibm_mfc_device, d8253_out0)) MCFG_PIT8253_CLK1(0) MCFG_PIT8253_OUT1_HANDLER(WRITELINE(isa8_ibm_mfc_device, d8253_out1)) - MCFG_PIT8253_CLK2(XTAL_4MHz / 2) + MCFG_PIT8253_CLK2(XTAL(4'000'000) / 2) MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("d8253", pit8253_device, write_clk1)) MCFG_SPEAKER_STANDARD_STEREO("ymleft", "ymright") - MCFG_YM2151_ADD("ym2151", XTAL_4MHz) + MCFG_YM2151_ADD("ym2151", XTAL(4'000'000)) MCFG_YM2151_IRQ_HANDLER(WRITELINE(isa8_ibm_mfc_device, ibm_mfc_ym_irq)) MCFG_SOUND_ROUTE(0, "ymleft", 1.00) MCFG_SOUND_ROUTE(1, "ymright", 1.00) diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp index 6209473b467..d97985550f7 100644 --- a/src/devices/bus/isa/mc1502_fdc.cpp +++ b/src/devices/bus/isa/mc1502_fdc.cpp @@ -52,7 +52,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(mc1502_fdc_device::device_add_mconfig) - MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16) + MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", mc1502_floppies, "525qd", mc1502_fdc_device::floppy_formats) diff --git a/src/devices/bus/isa/myb3k_com.cpp b/src/devices/bus/isa/myb3k_com.cpp index fbbaa39d8c1..61a79abe6f2 100644 --- a/src/devices/bus/isa/myb3k_com.cpp +++ b/src/devices/bus/isa/myb3k_com.cpp @@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(ISA8_MYB3K_COM, isa8_myb3k_com_device, "isa8_myb3k_com", "ADP // device_add_mconfig - add device configuration //------------------------------------------------- MACHINE_CONFIG_START(isa8_myb3k_com_device::device_add_mconfig) - MCFG_DEVICE_ADD( "usart", I8251, XTAL_15_9744MHz / 8 ) + MCFG_DEVICE_ADD( "usart", I8251, XTAL(15'974'400) / 8 ) MCFG_I8251_TXD_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_txd)) MCFG_I8251_DTR_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_dtr)) MCFG_I8251_RTS_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_rts)) @@ -48,9 +48,9 @@ MACHINE_CONFIG_START(isa8_myb3k_com_device::device_add_mconfig) /* Timer chip */ MCFG_DEVICE_ADD("pit", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL_15_9744MHz / 8 ) /* TxC */ + MCFG_PIT8253_CLK0(XTAL(15'974'400) / 8 ) /* TxC */ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(isa8_myb3k_com_device, pit_txc)) - MCFG_PIT8253_CLK1(XTAL_15_9744MHz / 8 ) /* RxC */ + MCFG_PIT8253_CLK1(XTAL(15'974'400) / 8 ) /* RxC */ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(isa8_myb3k_com_device, pit_rxc)) // Timer 2 is not used/connected to anything on the schematics MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/myb3k_fdc.cpp b/src/devices/bus/isa/myb3k_fdc.cpp index b23fe5258bc..2f4db748450 100644 --- a/src/devices/bus/isa/myb3k_fdc.cpp +++ b/src/devices/bus/isa/myb3k_fdc.cpp @@ -93,7 +93,7 @@ SLOT_INTERFACE_END //------------------------------------------------- /* */ MACHINE_CONFIG_START(isa8_myb3k_fdc4710_device::device_add_mconfig) - MCFG_DEVICE_ADD("fdc", MB8876, XTAL_15_9744MHz / 8) /* From StepOne schematics */ + MCFG_DEVICE_ADD("fdc", MB8876, XTAL(15'974'400) / 8) /* From StepOne schematics */ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4710_device, irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4710_device, drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_sd_floppies, "525sd", isa8_myb3k_fdc4710_device::myb3k_floppy_formats) @@ -102,7 +102,7 @@ MACHINE_CONFIG_END /* Main difference from fdc4710 is that a Hitachi HA16632AP has replaced the descrete VFO enabling 720Kb disks */ MACHINE_CONFIG_START(isa8_myb3k_fdc4711_device::device_add_mconfig) - MCFG_DEVICE_ADD("fdc", FD1791, XTAL_15_9744MHz / 16) + MCFG_DEVICE_ADD("fdc", FD1791, XTAL(15'974'400) / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4711_device, irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4711_device, drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_qd_floppies, "525qd", isa8_myb3k_fdc4711_device::myb3k_floppy_formats) @@ -113,7 +113,7 @@ MACHINE_CONFIG_END #if 0 MACHINE_CONFIG_START(isa8_myb3k_fdc4712_device::device_add_mconfig) - MCFG_DEVICE_ADD("fdc", FD1791, XTAL_15_9744MHz / 8) + MCFG_DEVICE_ADD("fdc", FD1791, XTAL(15'974'400) / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4712_device, irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4712_device, drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_8inch_floppies, "8dsdd", isa8_myb3k_fdc4712_device::myb3k_floppy_formats) diff --git a/src/devices/bus/isa/num9rev.cpp b/src/devices/bus/isa/num9rev.cpp index ebdd5b7e4cb..5ec78ab8399 100644 --- a/src/devices/bus/isa/num9rev.cpp +++ b/src/devices/bus/isa/num9rev.cpp @@ -60,7 +60,7 @@ MACHINE_CONFIG_START(isa8_number_9_rev_device::device_add_mconfig) MCFG_SCREEN_UPDATE_DRIVER(isa8_number_9_rev_device, screen_update) MCFG_PALETTE_ADD("palette", 4096) - MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL_4_433619MHz/2) // unknown clock + MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL(4'433'619)/2) // unknown clock MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map) MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(isa8_number_9_rev_device, hgdc_display_pixels) MCFG_VIDEO_SET_SCREEN("screen") diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp index d9a0e3d86a0..5d47a021d94 100644 --- a/src/devices/bus/isa/p1_fdc.cpp +++ b/src/devices/bus/isa/p1_fdc.cpp @@ -62,7 +62,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(p1_fdc_device::device_add_mconfig) - MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16) + MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", poisk1_floppies, "525qd", p1_fdc_device::floppy_formats) diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp index e9a12df010b..9fa6ea3852e 100644 --- a/src/devices/bus/isa/p1_sound.cpp +++ b/src/devices/bus/isa/p1_sound.cpp @@ -40,28 +40,28 @@ MACHINE_CONFIG_START(p1_sound_device::device_add_mconfig) MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout") MCFG_DEVICE_ADD("d14", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK0(XTAL(12'500'000)/10) // sampler at 10 KHz MCFG_PIT8253_OUT0_HANDLER(WRITELINE(p1_sound_device, sampler_sync)) - MCFG_PIT8253_CLK1(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK1(XTAL(12'500'000)/10) MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("midi", i8251_device, write_txc)) - MCFG_PIT8253_CLK2(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK2(XTAL(12'500'000)/10) MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("midi", i8251_device, write_rxc)) MCFG_DEVICE_ADD("d16", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK0(XTAL(12'500'000)/10) // MCFG_PIT8253_OUT0_HANDLER(XXX) - MCFG_PIT8253_CLK1(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK1(XTAL(12'500'000)/10) // MCFG_PIT8253_OUT1_HANDLER(XXX) - MCFG_PIT8253_CLK2(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK2(XTAL(12'500'000)/10) // MCFG_PIT8253_OUT2_HANDLER(XXX) MCFG_DEVICE_ADD("d17", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK0(XTAL(12'500'000)/10) // MCFG_PIT8253_OUT0_HANDLER(XXX) - MCFG_PIT8253_CLK1(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK1(XTAL(12'500'000)/10) // MCFG_PIT8253_OUT1_HANDLER(XXX) - MCFG_PIT8253_CLK2(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK2(XTAL(12'500'000)/10) // MCFG_PIT8253_OUT2_HANDLER(XXX) MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp index 5caced97de5..6c49434e456 100644 --- a/src/devices/bus/isa/pgc.cpp +++ b/src/devices/bus/isa/pgc.cpp @@ -151,7 +151,7 @@ DEFINE_DEVICE_TYPE(ISA8_PGC, isa8_pgc_device, "isa_ibm_pgc", "IBM Professional G //------------------------------------------------- MACHINE_CONFIG_START(isa8_pgc_device::device_add_mconfig) - MCFG_CPU_ADD("maincpu", I8088, XTAL_24MHz/3) + MCFG_CPU_ADD("maincpu", I8088, XTAL(24'000'000)/3) MCFG_CPU_PROGRAM_MAP(pgc_map) MCFG_CPU_IO_MAP(pgc_io) #if 0 @@ -161,10 +161,10 @@ MACHINE_CONFIG_START(isa8_pgc_device::device_add_mconfig) MCFG_TIMER_DRIVER_ADD_PERIODIC("scantimer", isa8_pgc_device, scanline_callback, attotime::from_hz(60*PGC_TOTAL_VERT)) - MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL_50MHz/(2*PGC_HORZ_START))) + MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL(50'000'000)/(2*PGC_HORZ_START))) MCFG_SCREEN_ADD(PGC_SCREEN_NAME, RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_50MHz/2, + MCFG_SCREEN_RAW_PARAMS(XTAL(50'000'000)/2, PGC_TOTAL_HORZ, PGC_HORZ_START, PGC_HORZ_START+PGC_DISP_HORZ, PGC_TOTAL_VERT, PGC_VERT_START, PGC_VERT_START+PGC_DISP_VERT) MCFG_SCREEN_UPDATE_DRIVER(isa8_pgc_device, screen_update) diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp index 27c142036bf..7fbc8be6aff 100644 --- a/src/devices/bus/isa/s3virge.cpp +++ b/src/devices/bus/isa/s3virge.cpp @@ -260,15 +260,15 @@ uint8_t s3virge_vga_device::s3_crtc_reg_read(uint8_t index) void s3virge_vga_device::s3_define_video_mode() { int divisor = 1; - int xtal = (vga.miscellaneous_output & 0xc) ? XTAL_28_63636MHz : XTAL_25_1748MHz; - double freq; + const XTAL base_xtal = XTAL(14'318'181); + XTAL xtal = (vga.miscellaneous_output & 0xc) ? base_xtal*2 : base_xtal*1.75; if((vga.miscellaneous_output & 0xc) == 0x0c) { // Dot clock is set via SR12 and SR13 // DCLK calculation - freq = ((double)(s3.clk_pll_m+2) / (double)((s3.clk_pll_n+2)*(pow(2.0,s3.clk_pll_r)))) * 14.318; // clock between XIN and XOUT - xtal = freq * 1000000; + double ratio = (double)(s3.clk_pll_m+2) / (double)((s3.clk_pll_n+2)*(pow(2.0,s3.clk_pll_r))); // clock between XIN and XOUT + xtal = base_xtal * ratio; //printf("DCLK set to %dHz M=%i N=%i R=%i\n",xtal,s3.clk_pll_m,s3.clk_pll_n,s3.clk_pll_r); } @@ -296,7 +296,7 @@ void s3virge_vga_device::s3_define_video_mode() } if(s3.cr43 & 0x80) // Horizontal clock doubling (techincally, doubles horizontal CRT parameters) divisor *= 2; - recompute_params_clock(divisor, xtal); + recompute_params_clock(divisor, xtal.value()); } void s3virge_vga_device::s3_crtc_reg_write(uint8_t index, uint8_t data) diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp index 7f0f2d52b12..4d2fb059c2e 100644 --- a/src/devices/bus/isa/sb16.cpp +++ b/src/devices/bus/isa/sb16.cpp @@ -411,11 +411,11 @@ const tiny_rom_entry *sb16_lle_device::device_rom_region() const } MACHINE_CONFIG_START(sb16_lle_device::device_add_mconfig) - MCFG_CPU_ADD("sb16_cpu", I80C52, XTAL_24MHz) + MCFG_CPU_ADD("sb16_cpu", I80C52, XTAL(24'000'000)) MCFG_CPU_IO_MAP(sb16_io) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ymf262", YMF262, XTAL_14_31818MHz) + MCFG_SOUND_ADD("ymf262", YMF262, XTAL(14'318'181)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp index c693e4648c9..9e1260fa25b 100644 --- a/src/devices/bus/isa/sblaster.cpp +++ b/src/devices/bus/isa/sblaster.cpp @@ -52,8 +52,8 @@ jumperable? normally 0x220 */ -#define ym3812_StdClock XTAL_3_579545MHz -#define ymf262_StdClock XTAL_14_31818MHz +#define ym3812_StdClock XTAL(3'579'545) +#define ymf262_StdClock XTAL(14'318'181) static const int m_cmd_fifo_length[256] = { diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp index 4f8568032e4..45adc68b34b 100644 --- a/src/devices/bus/isa/ssi2001.cpp +++ b/src/devices/bus/isa/ssi2001.cpp @@ -12,7 +12,7 @@ DEFINE_DEVICE_TYPE(ISA8_SSI2001, ssi2001_device, "ssi2001", "Innovation SSI-2001 MACHINE_CONFIG_START(ssi2001_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sid6581", MOS6581, XTAL_14_31818MHz/16) + MCFG_SOUND_ADD("sid6581", MOS6581, XTAL(14'318'181)/16) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_PC_JOY_ADD("pc_joy") MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp index 5b9b05033b1..93b397fb703 100644 --- a/src/devices/bus/isa/stereo_fx.cpp +++ b/src/devices/bus/isa/stereo_fx.cpp @@ -115,12 +115,12 @@ const tiny_rom_entry *stereo_fx_device::device_rom_region() const } MACHINE_CONFIG_START(stereo_fx_device::device_add_mconfig) - MCFG_CPU_ADD("stereo_fx_cpu", I80C31, XTAL_30MHz) + MCFG_CPU_ADD("stereo_fx_cpu", I80C31, XTAL(30'000'000)) MCFG_CPU_IO_MAP(stereo_fx_io) MCFG_CPU_PROGRAM_MAP(stereo_fx_rom) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ym3812", YM3812, XTAL_3_579545MHz) + MCFG_SOUND_ADD("ym3812", YM3812, XTAL(3'579'545)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) /* no CM/S support (empty sockets) */ diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp index a28ef5876e2..a7204ce8457 100644 --- a/src/devices/bus/isa/svga_cirrus.cpp +++ b/src/devices/bus/isa/svga_cirrus.cpp @@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_CIRRUS_GD542X, isa16_svga_cirrus_gd542x_device, "c MACHINE_CONFIG_START(isa16_svga_cirrus_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5430_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) @@ -113,7 +113,7 @@ ROM_END MACHINE_CONFIG_START(isa16_svga_cirrus_gd542x_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp index ee5df928b97..353316e1891 100644 --- a/src/devices/bus/isa/svga_s3.cpp +++ b/src/devices/bus/isa/svga_s3.cpp @@ -42,7 +42,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_S3, isa16_svga_s3_device, "s3_764", "Number Nine 9 MACHINE_CONFIG_START(isa16_svga_s3_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) @@ -149,7 +149,7 @@ DEFINE_DEVICE_TYPE(ISA16_S3VIRGE, isa16_s3virge_device, "s3virge", "S3 ViRGE Gra MACHINE_CONFIG_START(isa16_s3virge_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3virge_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) @@ -231,7 +231,7 @@ DEFINE_DEVICE_TYPE(ISA16_S3VIRGEDX, isa16_s3virgedx_device, "s3virgedx", "S3 ViR MACHINE_CONFIG_START(isa16_s3virgedx_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3virgedx_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) @@ -314,7 +314,7 @@ DEFINE_DEVICE_TYPE(ISA16_DMS3D2KPRO, isa16_stealth3d2kpro_device, "dms3d2kp", "D MACHINE_CONFIG_START(isa16_stealth3d2kpro_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3virgedx_rev1_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp index 22b307cd6ad..55c01884f63 100644 --- a/src/devices/bus/isa/svga_trident.cpp +++ b/src/devices/bus/isa/svga_trident.cpp @@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_TGUI9680, isa16_svga_tgui9680_device, "tgui9680", MACHINE_CONFIG_START(isa16_svga_tgui9680_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", trident_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp index 8d60d1a2400..16c76e169b7 100644 --- a/src/devices/bus/isa/svga_tseng.cpp +++ b/src/devices/bus/isa/svga_tseng.cpp @@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(ISA8_SVGA_ET4K, isa8_svga_et4k_device, "et4000", "SVGA Tseng MACHINE_CONFIG_START(isa8_svga_et4k_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", tseng_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) diff --git a/src/devices/bus/isa/trident.cpp b/src/devices/bus/isa/trident.cpp index 287ef49b40a..2357f0cdfbc 100644 --- a/src/devices/bus/isa/trident.cpp +++ b/src/devices/bus/isa/trident.cpp @@ -346,8 +346,8 @@ void trident_vga_device::trident_define_video_mode() switch(tri.clock) { case 0: - default: xtal = XTAL_25_1748MHz; break; - case 1: xtal = XTAL_28_63636MHz; break; + default: xtal = 25174800; break; + case 1: xtal = 28636363; break; case 2: xtal = 44900000; break; case 3: xtal = 36000000; break; case 4: xtal = 57272000; break; @@ -378,8 +378,8 @@ void trident_vga_device::trident_define_video_mode() switch((vga.miscellaneous_output & 0x0c) >> 2) { case 0: - default: xtal = XTAL_25_1748MHz; break; - case 1: xtal = XTAL_28_63636MHz; break; + default: xtal = 25174800; break; + case 1: xtal = 28636363; break; case 2: xtal = calculate_clock(); break; } diff --git a/src/devices/bus/isa/vga.cpp b/src/devices/bus/isa/vga.cpp index 88c38cd1543..280108cb5b3 100644 --- a/src/devices/bus/isa/vga.cpp +++ b/src/devices/bus/isa/vga.cpp @@ -29,7 +29,7 @@ DEFINE_DEVICE_TYPE(ISA8_VGA, isa8_vga_device, "ibm_vga", "IBM VGA Graphics Card" MACHINE_CONFIG_START(isa8_vga_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp index 25f4202cd89..ff1bd656b9b 100644 --- a/src/devices/bus/isa/vga_ati.cpp +++ b/src/devices/bus/isa/vga_ati.cpp @@ -78,7 +78,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_MACH64, isa16_vga_mach64_device, "mach64 MACHINE_CONFIG_START(isa16_vga_gfxultra_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", ati_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) @@ -88,7 +88,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(isa16_vga_gfxultrapro_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", mach32_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) @@ -98,7 +98,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(isa16_vga_mach64_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", mach64_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp index f2103e0f860..c58713bde33 100644 --- a/src/devices/bus/kc/d004.cpp +++ b/src/devices/bus/kc/d004.cpp @@ -147,12 +147,12 @@ void kc_d004_device::device_reset() //------------------------------------------------- MACHINE_CONFIG_START(kc_d004_device::device_add_mconfig) - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) + MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) MCFG_CPU_PROGRAM_MAP(kc_d004_mem) MCFG_CPU_IO_MAP(kc_d004_io) MCFG_Z80_DAISY_CHAIN(kc_d004_daisy_chain) - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_8MHz/2) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/2) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, 0)) MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg1)) MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg2)) diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp index 861bde164c8..882ceb26efa 100644 --- a/src/devices/bus/lpci/southbridge.cpp +++ b/src/devices/bus/lpci/southbridge.cpp @@ -34,7 +34,7 @@ MACHINE_CONFIG_START(southbridge_device::device_add_mconfig) MCFG_PIT8253_CLK2(4772720/4) // pio port c pin 4, and speaker polling enough MCFG_PIT8253_OUT2_HANDLER(WRITELINE(southbridge_device, at_pit8254_out2_changed)) - MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL_14_31818MHz/3 ) + MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 ) MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq0_w)) MCFG_I8237_OUT_EOP_CB(WRITELINE(southbridge_device, at_dma8237_out_eop)) MCFG_I8237_IN_MEMR_CB(READ8(southbridge_device, pc_dma_read_byte)) @@ -52,7 +52,7 @@ MACHINE_CONFIG_START(southbridge_device::device_add_mconfig) MCFG_I8237_OUT_DACK_2_CB(WRITELINE(southbridge_device, pc_dack2_w)) MCFG_I8237_OUT_DACK_3_CB(WRITELINE(southbridge_device, pc_dack3_w)) - MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL_14_31818MHz/3 ) + MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 ) MCFG_I8237_OUT_HREQ_CB(WRITELINE(southbridge_device, pc_dma_hrq_changed)) MCFG_I8237_IN_MEMR_CB(READ8(southbridge_device, pc_dma_read_word)) MCFG_I8237_OUT_MEMW_CB(WRITE8(southbridge_device, pc_dma_write_word)) @@ -456,7 +456,7 @@ SLOT_INTERFACE_END MACHINE_CONFIG_START(southbridge_extended_device::device_add_mconfig) southbridge_device::device_add_mconfig(config); - MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL_12MHz) + MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000)) MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(INPUTLINE(":maincpu", INPUT_LINE_RESET)) MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(INPUTLINE(":maincpu", INPUT_LINE_A20)) MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir1_w)) diff --git a/src/devices/bus/msx_cart/bm_012.cpp b/src/devices/bus/msx_cart/bm_012.cpp index bf1f8cbc977..949c2b64d46 100644 --- a/src/devices/bus/msx_cart/bm_012.cpp +++ b/src/devices/bus/msx_cart/bm_012.cpp @@ -47,7 +47,7 @@ MACHINE_CONFIG_START(msx_cart_bm_012_device::device_add_mconfig) // - PIO // - CGC // - WDT - MCFG_CPU_ADD("tmpz84c015af", TMPZ84C015, XTAL_12MHz/2) /* 6 MHz */ + MCFG_CPU_ADD("tmpz84c015af", TMPZ84C015, XTAL(12'000'000)/2) /* 6 MHz */ MCFG_CPU_PROGRAM_MAP(bm_012_memory_map) // PIO callbacks MCFG_TMPZ84C015_IN_PA_CB(DEVREAD8("bm012_pio", z80pio_device, pa_r)) @@ -60,7 +60,7 @@ MACHINE_CONFIG_START(msx_cart_bm_012_device::device_add_mconfig) // Sony CXK5864BSP-10L (8KB ram) // Sharp LH0081A Z80A-PIO-0 - For communicating between the MSX and the TMP - MCFG_DEVICE_ADD("bm012_pio", Z80PIO, XTAL_3_579545MHz) // ????? + MCFG_DEVICE_ADD("bm012_pio", Z80PIO, XTAL(3'579'545)) // ????? MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("tmpz84c015af", tmpz84c015_device, pa_w)) MCFG_Z80PIO_IN_PA_CB(DEVREAD8("tmpz84c015af", tmpz84c015_device, pa_r)) MCFG_Z80PIO_OUT_PB_CB(DEVWRITE8("tmpz84c015af", tmpz84c015_device, pb_w)) diff --git a/src/devices/bus/msx_cart/disk.cpp b/src/devices/bus/msx_cart/disk.cpp index eddd5d9cfa0..30ff4361e7c 100644 --- a/src/devices/bus/msx_cart/disk.cpp +++ b/src/devices/bus/msx_cart/disk.cpp @@ -199,7 +199,7 @@ MACHINE_CONFIG_START(msx_cart_vy0010_device::device_add_mconfig) // HLT pulled high // SSO/-ENMF + -DDEN + ENP + -5/8 - pulled low // READY inverted in VY-0010 cartridge and pulled low on VY-0010/VY-0011 floppy drive - MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) + MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 4) MCFG_WD_FDC_FORCE_READY // Single sided 3.5" floppy drive @@ -214,7 +214,7 @@ MACHINE_CONFIG_START(msx_cart_vy0010_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_cart_fsfd1_device::device_add_mconfig) - MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) + MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 4) // Double sided 3.5" floppy drive MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35dd", msx_cart_disk_device::floppy_formats) @@ -244,7 +244,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_cart_fscf351_device::device_add_mconfig) - MCFG_MB8877_ADD("fdc", XTAL_4MHz / 4) + MCFG_MB8877_ADD("fdc", XTAL(4'000'000) / 4) MCFG_WD_FDC_FORCE_READY // Double sided 3.5" floppy drive diff --git a/src/devices/bus/msx_cart/fmpac.cpp b/src/devices/bus/msx_cart/fmpac.cpp index 788fbb6827e..97edffd3b11 100644 --- a/src/devices/bus/msx_cart/fmpac.cpp +++ b/src/devices/bus/msx_cart/fmpac.cpp @@ -32,7 +32,7 @@ msx_cart_fmpac_device::msx_cart_fmpac_device(const machine_config &mconfig, cons MACHINE_CONFIG_START(msx_cart_fmpac_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ym2413", YM2413, XTAL_10_738635MHz/3) + MCFG_SOUND_ADD("ym2413", YM2413, XTAL(10'738'635)/3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END diff --git a/src/devices/bus/msx_cart/konami.cpp b/src/devices/bus/msx_cart/konami.cpp index 57d08bc2c7d..0663422b69c 100644 --- a/src/devices/bus/msx_cart/konami.cpp +++ b/src/devices/bus/msx_cart/konami.cpp @@ -144,7 +144,7 @@ msx_cart_konami_scc_device::msx_cart_konami_scc_device(const machine_config &mco MACHINE_CONFIG_START(msx_cart_konami_scc_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("k051649", K051649, XTAL_10_738635MHz/3/2) + MCFG_SOUND_ADD("k051649", K051649, XTAL(10'738'635)/3/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) MACHINE_CONFIG_END @@ -548,7 +548,7 @@ msx_cart_konami_sound_device::msx_cart_konami_sound_device(const machine_config MACHINE_CONFIG_START(msx_cart_konami_sound_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("k052539", K051649, XTAL_10_738635MHz/3/2) + MCFG_SOUND_ADD("k052539", K051649, XTAL(10'738'635)/3/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) MACHINE_CONFIG_END @@ -874,7 +874,7 @@ ADDRESS_MAP_END MACHINE_CONFIG_START(msx_cart_keyboard_master_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("vlm5030", VLM5030, XTAL_3_579545MHz) + MCFG_SOUND_ADD("vlm5030", VLM5030, XTAL(3'579'545)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_DEVICE_ADDRESS_MAP(0, vlm_map) MACHINE_CONFIG_END diff --git a/src/devices/bus/msx_cart/msx_audio.cpp b/src/devices/bus/msx_cart/msx_audio.cpp index 9dcfb09d869..5184a15c2a1 100644 --- a/src/devices/bus/msx_cart/msx_audio.cpp +++ b/src/devices/bus/msx_cart/msx_audio.cpp @@ -83,7 +83,7 @@ msx_cart_msx_audio_hxmu900_device::msx_cart_msx_audio_hxmu900_device(const machi MACHINE_CONFIG_START(msx_cart_msx_audio_hxmu900_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("y8950", Y8950, XTAL_3_579545MHz) // Not verified + MCFG_SOUND_ADD("y8950", Y8950, XTAL(3'579'545)) // Not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_Y8950_KEYBOARD_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write)) MCFG_Y8950_KEYBOARD_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read)) @@ -149,7 +149,7 @@ MACHINE_CONFIG_START(msx_cart_msx_audio_nms1205_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. // At the same time the sound is also output on two output on the nms1205 cartridge itself MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("y8950", Y8950, XTAL_3_579545MHz) + MCFG_SOUND_ADD("y8950", Y8950, XTAL(3'579'545)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_Y8950_KEYBOARD_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write)) MCFG_Y8950_KEYBOARD_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read)) @@ -249,7 +249,7 @@ msx_cart_msx_audio_fsca1_device::msx_cart_msx_audio_fsca1_device(const machine_c MACHINE_CONFIG_START(msx_cart_msx_audio_fsca1_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("y8950", Y8950, XTAL_3_579545MHz) + MCFG_SOUND_ADD("y8950", Y8950, XTAL(3'579'545)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_Y8950_KEYBOARD_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write)) MCFG_Y8950_KEYBOARD_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read)) diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp index f0ef8ecc1aa..3bb4f7c63dc 100644 --- a/src/devices/bus/msx_cart/yamaha.cpp +++ b/src/devices/bus/msx_cart/yamaha.cpp @@ -52,12 +52,12 @@ MACHINE_CONFIG_START(msx_cart_sfg_device::device_add_mconfig) // YM2148 (MKS) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_YM2151_ADD("ym2151", XTAL_3_579545MHz) // The SFG01 uses a YM2151, the SFG05 uses a YM2164, input clock comes from the main cpu frequency + MCFG_YM2151_ADD("ym2151", XTAL(3'579'545)) // The SFG01 uses a YM2151, the SFG05 uses a YM2164, input clock comes from the main cpu frequency MCFG_YM2151_IRQ_HANDLER(WRITELINE(msx_cart_sfg_device, ym2151_irq_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) - MCFG_DEVICE_ADD("ym2148", YM2148, XTAL_4MHz) + MCFG_DEVICE_ADD("ym2148", YM2148, XTAL(4'000'000)) MCFG_YM2148_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd)) MCFG_YM2148_PORT_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write)) MCFG_YM2148_PORT_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read)) diff --git a/src/devices/bus/nasbus/avc.cpp b/src/devices/bus/nasbus/avc.cpp index 327ab6a5146..0fb9ecdcd1b 100644 --- a/src/devices/bus/nasbus/avc.cpp +++ b/src/devices/bus/nasbus/avc.cpp @@ -29,7 +29,7 @@ MACHINE_CONFIG_START(nascom_avc_device::device_add_mconfig) MCFG_PALETTE_ADD_3BIT_RGB("palette") - MCFG_MC6845_ADD("mc6845", MC6845, "screen", XTAL_16MHz / 8) + MCFG_MC6845_ADD("mc6845", MC6845, "screen", XTAL(16'000'000) / 8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(6) MCFG_MC6845_UPDATE_ROW_CB(nascom_avc_device, crtc_update_row) diff --git a/src/devices/bus/nasbus/floppy.cpp b/src/devices/bus/nasbus/floppy.cpp index a59e51ce422..ffa1be5fce8 100644 --- a/src/devices/bus/nasbus/floppy.cpp +++ b/src/devices/bus/nasbus/floppy.cpp @@ -38,7 +38,7 @@ SLOT_INTERFACE_END //------------------------------------------------- MACHINE_CONFIG_START(nascom_fdc_device::device_add_mconfig) - MCFG_FD1793_ADD("fd1793", XTAL_16MHz / 4 / 4) + MCFG_FD1793_ADD("fd1793", XTAL(16'000'000) / 4 / 4) MCFG_FLOPPY_DRIVE_ADD("fd1793:0", nascom_floppies, "55f", nascom_fdc_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1793:1", nascom_floppies, "55f", nascom_fdc_device::floppy_formats) diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp index 91f7f192f87..4f3d8644bff 100644 --- a/src/devices/bus/nes/konami.cpp +++ b/src/devices/bus/nes/konami.cpp @@ -645,7 +645,7 @@ MACHINE_CONFIG_START(nes_konami_vrc6_device::device_add_mconfig) // TODO: this is not how VRC6 clock signaling works! // The board uses the CLK pin in reality, not hardcoded NTSC values! - MCFG_SOUND_ADD("vrc6snd", VRC6, XTAL_21_4772MHz/12) + MCFG_SOUND_ADD("vrc6snd", VRC6, XTAL(21'477'272)/12) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.5) MACHINE_CONFIG_END @@ -769,6 +769,6 @@ MACHINE_CONFIG_START(nes_konami_vrc7_device::device_add_mconfig) // TODO: this is not how VRC7 clock signaling works! // The board uses the CLK pin in reality, not hardcoded NTSC values! - MCFG_SOUND_ADD("ym", YM2413, XTAL_21_4772MHz/12) + MCFG_SOUND_ADD("ym", YM2413, XTAL(21'477'272)/12) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.5) MACHINE_CONFIG_END diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp index 8b527d1ec43..bffd3b2b608 100644 --- a/src/devices/bus/nes/sunsoft.cpp +++ b/src/devices/bus/nes/sunsoft.cpp @@ -617,6 +617,6 @@ MACHINE_CONFIG_START(nes_sunsoft_5_device::device_add_mconfig) // TODO: this is not how Sunsoft 5B clock signaling works! // The board uses the CLK pin in reality, not hardcoded NTSC values! - MCFG_SOUND_ADD("ay", YM2149, (XTAL_21_4772MHz/12)/2) // divide by 2 for the internal divider + MCFG_SOUND_ADD("ay", YM2149, (XTAL(21'477'272)/12)/2) // divide by 2 for the internal divider MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50) MACHINE_CONFIG_END diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp index f07e29b245e..503c9086835 100644 --- a/src/devices/bus/newbrain/eim.cpp +++ b/src/devices/bus/newbrain/eim.cpp @@ -69,12 +69,12 @@ const tiny_rom_entry *newbrain_eim_device::device_rom_region() const MACHINE_CONFIG_START(newbrain_eim_device::device_add_mconfig) // devices - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_16MHz/8) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/8) MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(MC6850_TAG, acia6850_device, write_rxc)) MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(MC6850_TAG, acia6850_device, write_txc)) MCFG_Z80CTC_ZC2_CB(WRITELINE(newbrain_eim_device, ctc_z2_w)) - MCFG_TIMER_DRIVER_ADD_PERIODIC("z80ctc_c2", newbrain_eim_device, ctc_c2_tick, attotime::from_hz(XTAL_16MHz/4/13)) + MCFG_TIMER_DRIVER_ADD_PERIODIC("z80ctc_c2", newbrain_eim_device, ctc_c2_tick, attotime::from_hz(XTAL(16'000'000)/4/13)) MCFG_DEVICE_ADD(ADC0809_TAG, ADC0808, 500000) MCFG_ADC0808_OUT_EOC_CB(WRITELINE(newbrain_eim_device, adc_eoc_w)) MCFG_ADC0808_IN_VREF_POS_CB(newbrain_eim_device, adc_vref_pos_r) @@ -92,7 +92,7 @@ MACHINE_CONFIG_START(newbrain_eim_device::device_add_mconfig) MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(newbrain_eim_device, acia_interrupt)) MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr) - MCFG_NEWBRAIN_EXPANSION_SLOT_ADD(NEWBRAIN_EXPANSION_SLOT_TAG, XTAL_16MHz/8, newbrain_expansion_cards, "fdc") + MCFG_NEWBRAIN_EXPANSION_SLOT_ADD(NEWBRAIN_EXPANSION_SLOT_TAG, XTAL(16'000'000)/8, newbrain_expansion_cards, "fdc") // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp index 52ee62e262a..33e81c93ac3 100644 --- a/src/devices/bus/newbrain/fdc.cpp +++ b/src/devices/bus/newbrain/fdc.cpp @@ -102,7 +102,7 @@ SLOT_INTERFACE_END //------------------------------------------------- MACHINE_CONFIG_START(newbrain_fdc_device::device_add_mconfig) - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz) + MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000)) MCFG_CPU_PROGRAM_MAP(newbrain_fdc_mem) MCFG_CPU_IO_MAP(newbrain_fdc_io) @@ -114,7 +114,7 @@ MACHINE_CONFIG_START(newbrain_fdc_device::device_add_mconfig) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":2", newbrain_floppies, nullptr, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":3", newbrain_floppies, nullptr, floppy_image_device::default_floppy_formats) - MCFG_NEWBRAIN_EXPANSION_SLOT_ADD(NEWBRAIN_EXPANSION_SLOT_TAG, XTAL_16MHz/8, newbrain_expansion_cards, nullptr) + MCFG_NEWBRAIN_EXPANSION_SLOT_ADD(NEWBRAIN_EXPANSION_SLOT_TAG, XTAL(16'000'000)/8, newbrain_expansion_cards, nullptr) MACHINE_CONFIG_END diff --git a/src/devices/bus/nubus/bootbug.cpp b/src/devices/bus/nubus/bootbug.cpp index 5a8db4cec39..447887dd032 100644 --- a/src/devices/bus/nubus/bootbug.cpp +++ b/src/devices/bus/nubus/bootbug.cpp @@ -46,7 +46,7 @@ DEFINE_DEVICE_TYPE(NUBUS_BOOTBUG, nubus_bootbug_device, "nb_btbug", "Brigent Boo //------------------------------------------------- MACHINE_CONFIG_START(nubus_bootbug_device::device_add_mconfig) - MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL_1_8432MHz ) + MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport0", rs232_port_device, write_rts)) diff --git a/src/devices/bus/nubus/quadralink.cpp b/src/devices/bus/nubus/quadralink.cpp index 3fca63470bc..199cd08d13f 100644 --- a/src/devices/bus/nubus/quadralink.cpp +++ b/src/devices/bus/nubus/quadralink.cpp @@ -37,11 +37,11 @@ DEFINE_DEVICE_TYPE(NUBUS_QUADRALINK, nubus_quadralink_device, "nb_qdlink", "Appl //------------------------------------------------- MACHINE_CONFIG_START(nubus_quadralink_device::device_add_mconfig) - MCFG_SCC8530_ADD("scc1", XTAL_3_6864MHz, 0, 0, 0, 0) + MCFG_SCC8530_ADD("scc1", XTAL(3'686'400), 0, 0, 0, 0) MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd)) MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE("serport1", rs232_port_device, write_txd)) - MCFG_SCC8530_ADD("scc2", XTAL_3_6864MHz, 0, 0, 0, 0) + MCFG_SCC8530_ADD("scc2", XTAL(3'686'400), 0, 0, 0, 0) MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE("serport2", rs232_port_device, write_txd)) MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE("serport3", rs232_port_device, write_txd)) diff --git a/src/devices/bus/odyssey2/chess.cpp b/src/devices/bus/odyssey2/chess.cpp index fd44863bae3..a3f5609fbe7 100644 --- a/src/devices/bus/odyssey2/chess.cpp +++ b/src/devices/bus/odyssey2/chess.cpp @@ -44,7 +44,7 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(o2_chess_device::device_add_mconfig) - MCFG_CPU_ADD("subcpu", NSC800, XTAL_4MHz) + MCFG_CPU_ADD("subcpu", NSC800, XTAL(4'000'000)) MCFG_CPU_PROGRAM_MAP(chess_mem) MCFG_CPU_IO_MAP(chess_io) MACHINE_CONFIG_END diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp index 400311da867..b573f11657e 100644 --- a/src/devices/bus/oricext/jasmin.cpp +++ b/src/devices/bus/oricext/jasmin.cpp @@ -71,7 +71,7 @@ const tiny_rom_entry *jasmin_device::device_rom_region() const } MACHINE_CONFIG_START(jasmin_device::device_add_mconfig) - MCFG_WD1770_ADD("fdc", XTAL_8MHz) + MCFG_WD1770_ADD("fdc", XTAL(8'000'000)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(oricext_device, irq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", jasmin_floppies, "3dsdd", jasmin_device::floppy_formats) diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp index 7d151fa1b54..f53e3cb0e73 100644 --- a/src/devices/bus/oricext/microdisc.cpp +++ b/src/devices/bus/oricext/microdisc.cpp @@ -67,7 +67,7 @@ const tiny_rom_entry *microdisc_device::device_rom_region() const } MACHINE_CONFIG_START(microdisc_device::device_add_mconfig) - MCFG_FD1793_ADD("fdc", XTAL_8MHz/8) + MCFG_FD1793_ADD("fdc", XTAL(8'000'000)/8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(microdisc_device, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(microdisc_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(microdisc_device, fdc_hld_w)) diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp index dfbc2aaed62..26af0640856 100644 --- a/src/devices/bus/pc_kbd/ec1841.cpp +++ b/src/devices/bus/pc_kbd/ec1841.cpp @@ -67,7 +67,7 @@ const tiny_rom_entry *ec_1841_keyboard_device::device_rom_region() const //------------------------------------------------- MACHINE_CONFIG_START(ec_1841_keyboard_device::device_add_mconfig) - MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5_46MHz) + MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(5'460'000)) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(ec_1841_keyboard_device, bus_w)) MCFG_MCS48_PORT_P1_IN_CB(READ8(ec_1841_keyboard_device, p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(ec_1841_keyboard_device, p1_w)) diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp index 4908db4baef..8ff77fb9727 100644 --- a/src/devices/bus/pc_kbd/iskr1030.cpp +++ b/src/devices/bus/pc_kbd/iskr1030.cpp @@ -71,7 +71,7 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(iskr_1030_keyboard_device::device_add_mconfig) - MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_5MHz) + MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(5'000'000)) MCFG_CPU_IO_MAP(iskr_1030_keyboard_io) MCFG_MCS48_PORT_P1_IN_CB(READ8(iskr_1030_keyboard_device, p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(iskr_1030_keyboard_device, p1_w)) diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp index 5cf275fbe33..304a3b6f4ac 100644 --- a/src/devices/bus/pc_kbd/msnat.cpp +++ b/src/devices/bus/pc_kbd/msnat.cpp @@ -258,7 +258,7 @@ void pc_kbd_microsoft_natural_device::device_reset() //------------------------------------------------- MACHINE_CONFIG_START(pc_kbd_microsoft_natural_device::device_add_mconfig) - MCFG_CPU_ADD("ms_natrl_cpu", I8051, XTAL_6MHz) + MCFG_CPU_ADD("ms_natrl_cpu", I8051, XTAL(6'000'000)) MCFG_CPU_IO_MAP(microsoft_natural_io) MACHINE_CONFIG_END diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp index 6857de7add9..7fbad750ebe 100644 --- a/src/devices/bus/pet/superpet.cpp +++ b/src/devices/bus/pet/superpet.cpp @@ -70,13 +70,13 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(superpet_device::device_add_mconfig) - MCFG_CPU_ADD(M6809_TAG, M6809, XTAL_16MHz/16) + MCFG_CPU_ADD(M6809_TAG, M6809, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(superpet_mem) - MCFG_MOS6702_ADD(MOS6702_TAG, XTAL_16MHz/16) + MCFG_MOS6702_ADD(MOS6702_TAG, XTAL(16'000'000)/16) MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0) - MCFG_MOS6551_XTAL(XTAL_1_8432MHz) + MCFG_MOS6551_XTAL(XTAL(1'843'200)) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(superpet_device, acia_irq_w)) MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp index 424902d9cef..f1e711ac7f7 100644 --- a/src/devices/bus/plus4/c1551.cpp +++ b/src/devices/bus/plus4/c1551.cpp @@ -344,7 +344,7 @@ FLOPPY_FORMATS_END //------------------------------------------------- MACHINE_CONFIG_START(c1551_device::device_add_mconfig) - MCFG_CPU_ADD(M6510T_TAG, M6510T, XTAL_16MHz/8) + MCFG_CPU_ADD(M6510T_TAG, M6510T, XTAL(16'000'000)/8) MCFG_CPU_PROGRAM_MAP(c1551_mem) MCFG_M6510T_PORT_CALLBACKS(READ8(c1551_device, port_r), WRITE8(c1551_device, port_w)) MCFG_QUANTUM_PERFECT_CPU(M6510T_TAG) @@ -364,7 +364,7 @@ MACHINE_CONFIG_START(c1551_device::device_add_mconfig) MCFG_TPI6525_IN_PC_CB(READ8(c1551_device, tpi1_pc_r)) MCFG_TPI6525_OUT_PC_CB(WRITE8(c1551_device, tpi1_pc_w)) - MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz) + MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000)) MCFG_64H156_BYTE_CALLBACK(DEVWRITELINE(C64H156_TAG, c64h156_device, atni_w)) MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1551_floppies, "525ssqd", c1551_device::floppy_formats) diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp index d0977f62951..ffecc19bdb5 100644 --- a/src/devices/bus/plus4/sid.cpp +++ b/src/devices/bus/plus4/sid.cpp @@ -66,7 +66,7 @@ const tiny_rom_entry *plus4_sid_cartridge_device::device_rom_region() const MACHINE_CONFIG_START(plus4_sid_cartridge_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("speaker") - MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL_17_73447MHz/20) + MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL(17'734'470)/20) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr) diff --git a/src/devices/bus/pofo/hpc102.cpp b/src/devices/bus/pofo/hpc102.cpp index a81c38bd837..3955eafd5c2 100644 --- a/src/devices/bus/pofo/hpc102.cpp +++ b/src/devices/bus/pofo/hpc102.cpp @@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(POFO_HPC102, pofo_hpc102_device, "pofo_hpc102", "Atari Portfo //------------------------------------------------- MACHINE_CONFIG_START(pofo_hpc102_device::device_add_mconfig) - MCFG_DEVICE_ADD(M82C50A_TAG, INS8250, XTAL_1_8432MHz) // should be INS8250A + MCFG_DEVICE_ADD(M82C50A_TAG, INS8250, XTAL(1'843'200)) // should be INS8250A MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts)) diff --git a/src/devices/bus/pofo/hpc104.cpp b/src/devices/bus/pofo/hpc104.cpp index 0a675077059..580f1e602b8 100644 --- a/src/devices/bus/pofo/hpc104.cpp +++ b/src/devices/bus/pofo/hpc104.cpp @@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(POFO_HPC104_2, pofo_hpc104_2_device, "pofo_hpc104_2", "Atari MACHINE_CONFIG_START(pofo_hpc104_device::device_add_mconfig) MCFG_PORTFOLIO_MEMORY_CARD_SLOT_ADD(PORTFOLIO_MEMORY_CARD_SLOT_B_TAG, portfolio_memory_cards, nullptr) - MCFG_PORTFOLIO_EXPANSION_SLOT_ADD(PORTFOLIO_EXPANSION_SLOT_TAG, XTAL_4_9152MHz, portfolio_expansion_cards, nullptr) + MCFG_PORTFOLIO_EXPANSION_SLOT_ADD(PORTFOLIO_EXPANSION_SLOT_TAG, XTAL(4'915'200), portfolio_expansion_cards, nullptr) MCFG_PORTFOLIO_EXPANSION_SLOT_EINT_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, portfolio_expansion_slot_device, eint_w)) MCFG_PORTFOLIO_EXPANSION_SLOT_NMIO_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, portfolio_expansion_slot_device, nmio_w)) MCFG_PORTFOLIO_EXPANSION_SLOT_WAKE_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, portfolio_expansion_slot_device, wake_w)) diff --git a/src/devices/bus/psi_kbd/ergoline.cpp b/src/devices/bus/psi_kbd/ergoline.cpp index 35bd6d74230..ee97b6c5f9f 100644 --- a/src/devices/bus/psi_kbd/ergoline.cpp +++ b/src/devices/bus/psi_kbd/ergoline.cpp @@ -57,7 +57,7 @@ const tiny_rom_entry *ergoline_keyboard_device::device_rom_region() const } MACHINE_CONFIG_START(ergoline_keyboard_device::device_add_mconfig) - MCFG_CPU_ADD("maincpu", I8031, XTAL_5_5296MHz) + MCFG_CPU_ADD("maincpu", I8031, XTAL(5'529'600)) MCFG_CPU_PROGRAM_MAP(kbd_mem) MCFG_CPU_IO_MAP(kbd_io) MACHINE_CONFIG_END diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp index c15c1d656ba..3965736bd01 100644 --- a/src/devices/bus/ql/sandy_superqboard.cpp +++ b/src/devices/bus/ql/sandy_superqboard.cpp @@ -103,7 +103,7 @@ WRITE_LINE_MEMBER( sandy_superqboard_device::busy_w ) //------------------------------------------------- MACHINE_CONFIG_START(sandy_superqboard_device::device_add_mconfig) - MCFG_DEVICE_ADD(WD1772_TAG, WD1772, XTAL_16MHz/2) + MCFG_DEVICE_ADD(WD1772_TAG, WD1772, XTAL(16'000'000)/2) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_superqboard_floppies, "35hd", sandy_superqboard_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_superqboard_floppies, nullptr, sandy_superqboard_device::floppy_formats) @@ -411,7 +411,7 @@ void sandy_superqboard_device::write(address_space &space, offs_t offset, uint8_ break; case 5: - m_fdc->set_unscaled_clock(XTAL_16MHz / (BIT(data, 0) ? 1 : 2)); + m_fdc->set_unscaled_clock(XTAL(16'000'000) / (BIT(data, 0) ? 1 : 2)); break; } } diff --git a/src/devices/bus/s100/dj2db.cpp b/src/devices/bus/s100/dj2db.cpp index e34be7e4163..78ac2ae6ad8 100644 --- a/src/devices/bus/s100/dj2db.cpp +++ b/src/devices/bus/s100/dj2db.cpp @@ -102,10 +102,10 @@ WRITE_LINE_MEMBER( s100_dj2db_device::fdc_drq_w ) //------------------------------------------------- MACHINE_CONFIG_START(s100_dj2db_device::device_add_mconfig) - MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL_5_0688MHz) + MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL(5'068'800)) MCFG_COM8116_FR_HANDLER(WRITELINE(s100_dj2db_device, fr_w)) - MCFG_MB8866_ADD(MB8866_TAG, XTAL_10MHz/5) + MCFG_MB8866_ADD(MB8866_TAG, XTAL(10'000'000)/5) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(s100_dj2db_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(s100_dj2db_device, fdc_drq_w)) diff --git a/src/devices/bus/s100/djdma.cpp b/src/devices/bus/s100/djdma.cpp index 68949a5b7aa..c34602e3248 100644 --- a/src/devices/bus/s100/djdma.cpp +++ b/src/devices/bus/s100/djdma.cpp @@ -77,7 +77,7 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(s100_djdma_device::device_add_mconfig) - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz) + MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000)) MCFG_CPU_PROGRAM_MAP(djdma_mem) MCFG_CPU_IO_MAP(djdma_io) MACHINE_CONFIG_END diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp index a550be2adef..4e0a68c4c6d 100644 --- a/src/devices/bus/s100/wunderbus.cpp +++ b/src/devices/bus/s100/wunderbus.cpp @@ -92,19 +92,19 @@ MACHINE_CONFIG_START(s100_wunderbus_device::device_add_mconfig) MCFG_PIC8259_OUT_INT_CB(WRITELINE(s100_wunderbus_device, pic_int_w)) MCFG_PIC8259_IN_SP_CB(VCC) - MCFG_DEVICE_ADD(INS8250_1_TAG, INS8250, XTAL_18_432MHz/10) + MCFG_DEVICE_ADD(INS8250_1_TAG, INS8250, XTAL(18'432'000)/10) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir3_w)) - MCFG_DEVICE_ADD(INS8250_2_TAG, INS8250, XTAL_18_432MHz/10) + MCFG_DEVICE_ADD(INS8250_2_TAG, INS8250, XTAL(18'432'000)/10) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir4_w)) - MCFG_DEVICE_ADD(INS8250_3_TAG, INS8250, XTAL_18_432MHz/10) + MCFG_DEVICE_ADD(INS8250_3_TAG, INS8250, XTAL(18'432'000)/10) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_rts)) @@ -132,7 +132,7 @@ MACHINE_CONFIG_START(s100_wunderbus_device::device_add_mconfig) MCFG_RS232_RI_HANDLER(DEVWRITELINE(INS8250_3_TAG, ins8250_uart_device, ri_w)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE(INS8250_3_TAG, ins8250_uart_device, cts_w)) - MCFG_UPD1990A_ADD(UPD1990C_TAG, XTAL_32_768kHz, NOOP, DEVWRITELINE(DEVICE_SELF, s100_wunderbus_device, rtc_tp_w)) + MCFG_UPD1990A_ADD(UPD1990C_TAG, XTAL(32'768), NOOP, DEVWRITELINE(DEVICE_SELF, s100_wunderbus_device, rtc_tp_w)) MACHINE_CONFIG_END diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp index c61046950f7..6a07f495842 100644 --- a/src/devices/bus/scsi/s1410.cpp +++ b/src/devices/bus/scsi/s1410.cpp @@ -164,7 +164,7 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(s1410_device::device_add_mconfig) - MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL_16MHz/4) + MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL(16'000'000)/4) MCFG_CPU_PROGRAM_MAP(s1410_mem) MCFG_CPU_IO_MAP(s1410_io) MCFG_DEVICE_DISABLE() diff --git a/src/devices/bus/sg1000_exp/fm_unit.cpp b/src/devices/bus/sg1000_exp/fm_unit.cpp index ba46f795885..c43b143248c 100644 --- a/src/devices/bus/sg1000_exp/fm_unit.cpp +++ b/src/devices/bus/sg1000_exp/fm_unit.cpp @@ -51,7 +51,7 @@ DEFINE_DEVICE_TYPE(SEGA_FM_UNIT, sega_fm_unit_device, "sega_fm_unit", "SG-1000 F MACHINE_CONFIG_START(sega_fm_unit_device::device_add_mconfig) - MCFG_SOUND_ADD("ym2413", YM2413, XTAL_10_738635MHz/3) + MCFG_SOUND_ADD("ym2413", YM2413, XTAL(10'738'635)/3) // if this output gain is changed, the gain set when unmute the output need // to be changed too, probably along the gain set for SMSJ/SMSKRFM drivers. MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":mono", 1.00) diff --git a/src/devices/bus/sms_ctrl/paddle.cpp b/src/devices/bus/sms_ctrl/paddle.cpp index f19da195186..4d3ade12477 100644 --- a/src/devices/bus/sms_ctrl/paddle.cpp +++ b/src/devices/bus/sms_ctrl/paddle.cpp @@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(SMS_PADDLE, sms_paddle_device, "sms_paddle", "Sega SMS Paddle // time interval not verified // Player 2 of Galactic Protector is the most sensible to this timming. -#define PADDLE_INTERVAL attotime::from_hz(XTAL_10_738635MHz/3/100) +#define PADDLE_INTERVAL attotime::from_hz(XTAL(10'738'635)/3/100) CUSTOM_INPUT_MEMBER( sms_paddle_device::rldu_pins_r ) diff --git a/src/devices/bus/sms_ctrl/sports.cpp b/src/devices/bus/sms_ctrl/sports.cpp index cd814ff14cc..646126c232f 100644 --- a/src/devices/bus/sms_ctrl/sports.cpp +++ b/src/devices/bus/sms_ctrl/sports.cpp @@ -50,7 +50,7 @@ Notes: DEFINE_DEVICE_TYPE(SMS_SPORTS_PAD, sms_sports_pad_device, "sms_sports_pad", "Sega SMS Sports Pad (US)") // time interval not verified -#define SPORTS_PAD_INTERVAL attotime::from_hz(XTAL_10_738635MHz/3/512) +#define SPORTS_PAD_INTERVAL attotime::from_hz(XTAL(10'738'635)/3/512) void sms_sports_pad_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) diff --git a/src/devices/bus/snes/sgb.cpp b/src/devices/bus/snes/sgb.cpp index 88f2f10048d..cb07ecc9fc1 100644 --- a/src/devices/bus/snes/sgb.cpp +++ b/src/devices/bus/snes/sgb.cpp @@ -187,14 +187,14 @@ const tiny_rom_entry *sns_rom_sgb1_device::device_rom_region() const MACHINE_CONFIG_START(sns_rom_sgb2_device::device_add_mconfig) - MCFG_CPU_ADD("sgb_cpu", LR35902, XTAL_4_194304Mhz) /* 4.194MHz derived from clock on sgb2 pcb */ + MCFG_CPU_ADD("sgb_cpu", LR35902, XTAL(4'194'304)) /* 4.194MHz derived from clock on sgb2 pcb */ MCFG_CPU_PROGRAM_MAP(supergb_map) MCFG_LR35902_TIMER_CB(WRITE8(sns_rom_sgb_device, gb_timer_callback)) MCFG_LR35902_HALT_BUG MCFG_SGB_PPU_ADD("sgb_ppu", "sgb_cpu") - MCFG_SOUND_ADD("sgb_apu", DMG_APU, XTAL_4_194304Mhz) + MCFG_SOUND_ADD("sgb_apu", DMG_APU, XTAL(4'194'304)) MCFG_GB_CARTRIDGE_ADD("gb_slot", supergb_cart, nullptr) MACHINE_CONFIG_END diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp index 691d93e2758..a79ccb92bf7 100644 --- a/src/devices/bus/spc1000/fdd.cpp +++ b/src/devices/bus/spc1000/fdd.cpp @@ -80,7 +80,7 @@ SLOT_INTERFACE_END MACHINE_CONFIG_START(spc1000_fdd_exp_device::device_add_mconfig) // sub CPU (5 inch floppy drive) - MCFG_CPU_ADD("fdccpu", Z80, XTAL_4MHz) + MCFG_CPU_ADD("fdccpu", Z80, XTAL(4'000'000)) MCFG_CPU_PROGRAM_MAP(sd725_mem) MCFG_CPU_IO_MAP(sd725_io) diff --git a/src/devices/bus/spc1000/vdp.cpp b/src/devices/bus/spc1000/vdp.cpp index 9eedd2feb80..a65594e5e68 100644 --- a/src/devices/bus/spc1000/vdp.cpp +++ b/src/devices/bus/spc1000/vdp.cpp @@ -25,7 +25,7 @@ WRITE_LINE_MEMBER(spc1000_vdp_exp_device::vdp_interrupt) MACHINE_CONFIG_START(spc1000_vdp_exp_device::device_add_mconfig) - MCFG_DEVICE_ADD("tms", TMS9928A, XTAL_10_738635MHz / 2) // TODO: which clock? + MCFG_DEVICE_ADD("tms", TMS9928A, XTAL(10'738'635) / 2) // TODO: which clock? MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(spc1000_vdp_exp_device, vdp_interrupt)) MCFG_TMS9928A_SCREEN_ADD_NTSC("tms_screen") diff --git a/src/devices/bus/spectrum/fuller.cpp b/src/devices/bus/spectrum/fuller.cpp index bebb169b7f3..46419753217 100644 --- a/src/devices/bus/spectrum/fuller.cpp +++ b/src/devices/bus/spectrum/fuller.cpp @@ -47,7 +47,7 @@ ioport_constructor spectrum_fuller_device::device_input_ports() const MACHINE_CONFIG_START(spectrum_fuller_device::device_add_mconfig) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ay8912", AY8912, XTAL_3_579545MHz / 2) // unverified clock + MCFG_SOUND_ADD("ay8912", AY8912, XTAL(3'579'545) / 2) // unverified clock MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* passthru */ diff --git a/src/devices/bus/spectrum/melodik.cpp b/src/devices/bus/spectrum/melodik.cpp index 63b5d3f3cbe..6395427501e 100644 --- a/src/devices/bus/spectrum/melodik.cpp +++ b/src/devices/bus/spectrum/melodik.cpp @@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(SPECTRUM_MELODIK, spectrum_melodik_device, "spectrum_melodik" MACHINE_CONFIG_START(spectrum_melodik_device::device_add_mconfig) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ay8912", AY8912, XTAL_3_579545MHz / 2) + MCFG_SOUND_ADD("ay8912", AY8912, XTAL(3'579'545) / 2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* passthru */ diff --git a/src/devices/bus/spectrum/uspeech.cpp b/src/devices/bus/spectrum/uspeech.cpp index bfbbf9d3516..ae3f49250af 100644 --- a/src/devices/bus/spectrum/uspeech.cpp +++ b/src/devices/bus/spectrum/uspeech.cpp @@ -55,7 +55,7 @@ const tiny_rom_entry *spectrum_uspeech_device::device_rom_region() const MACHINE_CONFIG_START(spectrum_uspeech_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(SP0256_TAG, SP0256, XTAL_14MHz / 4) + MCFG_SOUND_ADD(SP0256_TAG, SP0256, XTAL(14'000'000) / 4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/svi3x8/expander/sv603.cpp b/src/devices/bus/svi3x8/expander/sv603.cpp index c4191bdb7f7..f2adbdd584a 100644 --- a/src/devices/bus/svi3x8/expander/sv603.cpp +++ b/src/devices/bus/svi3x8/expander/sv603.cpp @@ -39,7 +39,7 @@ const tiny_rom_entry *sv603_device::device_rom_region() const MACHINE_CONFIG_START(sv603_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snd", SN76489A, XTAL_10_738635MHz / 3) + MCFG_SOUND_ADD("snd", SN76489A, XTAL(10'738'635) / 3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) // cartridge slot diff --git a/src/devices/bus/svi3x8/slot/sv801.cpp b/src/devices/bus/svi3x8/slot/sv801.cpp index c0f17f0bc60..c7137d3d8d6 100644 --- a/src/devices/bus/svi3x8/slot/sv801.cpp +++ b/src/devices/bus/svi3x8/slot/sv801.cpp @@ -31,7 +31,7 @@ SLOT_INTERFACE_END //------------------------------------------------- MACHINE_CONFIG_START(sv801_device::device_add_mconfig) - MCFG_FD1793_ADD("fdc", XTAL_8MHz / 8) + MCFG_FD1793_ADD("fdc", XTAL(8'000'000) / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(sv801_device, intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(sv801_device, drq_w)) diff --git a/src/devices/bus/svi3x8/slot/sv805.cpp b/src/devices/bus/svi3x8/slot/sv805.cpp index 65ea09ed1d0..a3d994e549f 100644 --- a/src/devices/bus/svi3x8/slot/sv805.cpp +++ b/src/devices/bus/svi3x8/slot/sv805.cpp @@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(SV805, sv805_device, "sv805", "SV-805 RS-232 Interface") //------------------------------------------------- MACHINE_CONFIG_START(sv805_device::device_add_mconfig) - MCFG_DEVICE_ADD("uart", INS8250, XTAL_3_072MHz) + MCFG_DEVICE_ADD("uart", INS8250, XTAL(3'072'000)) MCFG_INS8250_OUT_INT_CB(WRITELINE(sv805_device, uart_intr_w)) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr)) diff --git a/src/devices/bus/svi3x8/slot/sv806.cpp b/src/devices/bus/svi3x8/slot/sv806.cpp index 44f6fb7de57..539f9435586 100644 --- a/src/devices/bus/svi3x8/slot/sv806.cpp +++ b/src/devices/bus/svi3x8/slot/sv806.cpp @@ -41,12 +41,12 @@ const tiny_rom_entry *sv806_device::device_rom_region() const MACHINE_CONFIG_START(sv806_device::device_add_mconfig) MCFG_SCREEN_ADD_MONOCHROME("80col", RASTER, rgb_t::green()) - MCFG_SCREEN_RAW_PARAMS((XTAL_12MHz / 6) * 8, 864, 0, 640, 317, 0, 192) + MCFG_SCREEN_RAW_PARAMS((XTAL(12'000'000) / 6) * 8, 864, 0, 640, 317, 0, 192) MCFG_SCREEN_UPDATE_DEVICE("crtc", hd6845_device, screen_update) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_MC6845_ADD("crtc", HD6845, "80col", XTAL_12MHz / 6) + MCFG_MC6845_ADD("crtc", HD6845, "80col", XTAL(12'000'000) / 6) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(sv806_device, crtc_update_row) diff --git a/src/devices/bus/ti99/peb/bwg.cpp b/src/devices/bus/ti99/peb/bwg.cpp index 7a911c6d7fc..a1d2f41a31b 100644 --- a/src/devices/bus/ti99/peb/bwg.cpp +++ b/src/devices/bus/ti99/peb/bwg.cpp @@ -694,7 +694,7 @@ ROM_START( bwg_fdc ) ROM_END MACHINE_CONFIG_START(snug_bwg_device::device_add_mconfig) - MCFG_WD1773_ADD(FDC_TAG, XTAL_8MHz) + MCFG_WD1773_ADD(FDC_TAG, XTAL(8'000'000)) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_drq_w)) diff --git a/src/devices/bus/ti99/peb/evpc.cpp b/src/devices/bus/ti99/peb/evpc.cpp index 30726024e2c..df93f54ff2b 100644 --- a/src/devices/bus/ti99/peb/evpc.cpp +++ b/src/devices/bus/ti99/peb/evpc.cpp @@ -480,9 +480,9 @@ ioport_constructor snug_enhanced_video_device::device_input_ports() const MACHINE_CONFIG_START(snug_enhanced_video_device::device_add_mconfig) // video hardware - MCFG_V9938_ADD(TI_VDP_TAG, TI_SCREEN_TAG, 0x20000, XTAL_21_4772MHz) /* typical 9938 clock, not verified */ + MCFG_V9938_ADD(TI_VDP_TAG, TI_SCREEN_TAG, 0x20000, XTAL(21'477'272)) /* typical 9938 clock, not verified */ MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(snug_enhanced_video_device, video_interrupt_in)) - MCFG_V99X8_SCREEN_ADD_NTSC(TI_SCREEN_TAG, TI_VDP_TAG, XTAL_21_4772MHz) + MCFG_V99X8_SCREEN_ADD_NTSC(TI_SCREEN_TAG, TI_VDP_TAG, XTAL(21'477'272)) // Sound hardware MCFG_SPEAKER_STANDARD_MONO("sound_out") diff --git a/src/devices/bus/ti99/peb/ti_fdc.cpp b/src/devices/bus/ti99/peb/ti_fdc.cpp index 82ee10722b2..28f80a48787 100644 --- a/src/devices/bus/ti99/peb/ti_fdc.cpp +++ b/src/devices/bus/ti99/peb/ti_fdc.cpp @@ -450,7 +450,7 @@ ROM_START( ti_fdc ) ROM_END MACHINE_CONFIG_START(ti_fdc_device::device_add_mconfig) - MCFG_FD1771_ADD(FDC_TAG, XTAL_1MHz) + MCFG_FD1771_ADD(FDC_TAG, XTAL(1'000'000)) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("0", tifdc_floppies, "525dd", ti_fdc_device::floppy_formats) diff --git a/src/devices/bus/ti99/ti99defs.h b/src/devices/bus/ti99/ti99defs.h index f1cdd5b43cd..6c7f8308d07 100644 --- a/src/devices/bus/ti99/ti99defs.h +++ b/src/devices/bus/ti99/ti99defs.h @@ -36,7 +36,7 @@ #define TI_VDP_TAG "vdp" #define TI_SCREEN_TAG "screen" #define TI_HEXBUS_TAG "hexbus" -#define TI_VDPFREQ XTAL_10_738635MHz +#define TI_VDPFREQ XTAL(10'738'635) // v9938 #define COLORBUS_TAG "colorbus" diff --git a/src/devices/bus/tvc/hbf.cpp b/src/devices/bus/tvc/hbf.cpp index 6d0a4673cf9..90dc378056b 100644 --- a/src/devices/bus/tvc/hbf.cpp +++ b/src/devices/bus/tvc/hbf.cpp @@ -84,7 +84,7 @@ void tvc_hbf_device::device_reset() //------------------------------------------------- MACHINE_CONFIG_START(tvc_hbf_device::device_add_mconfig) - MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16) + MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 16) MCFG_FLOPPY_DRIVE_ADD("fdc:0", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats) MACHINE_CONFIG_END diff --git a/src/devices/bus/vic20/videopak.cpp b/src/devices/bus/vic20/videopak.cpp index 65fdc84ddba..ed071d13554 100644 --- a/src/devices/bus/vic20/videopak.cpp +++ b/src/devices/bus/vic20/videopak.cpp @@ -107,7 +107,7 @@ MACHINE_CONFIG_START(vic20_video_pak_device::device_add_mconfig) MCFG_GFXDECODE_ADD("gfxdecode", "palette", vic20_video_pak) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_MC6845_ADD(MC6845_TAG, H46505, MC6845_SCREEN_TAG, XTAL_14_31818MHz / 8) + MCFG_MC6845_ADD(MC6845_TAG, H46505, MC6845_SCREEN_TAG, XTAL(14'318'181) / 8) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(vic20_video_pak_device, crtc_update_row) diff --git a/src/devices/bus/vip/vp575.cpp b/src/devices/bus/vip/vp575.cpp index 158dbd49c8f..544481760af 100644 --- a/src/devices/bus/vip/vp575.cpp +++ b/src/devices/bus/vip/vp575.cpp @@ -46,27 +46,27 @@ void vp575_device::update_interrupts() //------------------------------------------------- MACHINE_CONFIG_START(vp575_device::device_add_mconfig) - MCFG_VIP_EXPANSION_SLOT_ADD("exp1", XTAL_3_52128MHz/2, vip_expansion_cards, nullptr) + MCFG_VIP_EXPANSION_SLOT_ADD("exp1", XTAL(3'521'280)/2, vip_expansion_cards, nullptr) MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp1_int_w)) MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp1_dma_out_w)) MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp1_dma_in_w)) - MCFG_VIP_EXPANSION_SLOT_ADD("exp2", XTAL_3_52128MHz/2, vip_expansion_cards, nullptr) + MCFG_VIP_EXPANSION_SLOT_ADD("exp2", XTAL(3'521'280)/2, vip_expansion_cards, nullptr) MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp2_int_w)) MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp2_dma_out_w)) MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp2_dma_in_w)) - MCFG_VIP_EXPANSION_SLOT_ADD("exp3", XTAL_3_52128MHz/2, vip_expansion_cards, nullptr) + MCFG_VIP_EXPANSION_SLOT_ADD("exp3", XTAL(3'521'280)/2, vip_expansion_cards, nullptr) MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp3_int_w)) MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp3_dma_out_w)) MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp3_dma_in_w)) - MCFG_VIP_EXPANSION_SLOT_ADD("exp4", XTAL_3_52128MHz/2, vip_expansion_cards, nullptr) + MCFG_VIP_EXPANSION_SLOT_ADD("exp4", XTAL(3'521'280)/2, vip_expansion_cards, nullptr) MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp4_int_w)) MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp4_dma_out_w)) MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp4_dma_in_w)) - MCFG_VIP_EXPANSION_SLOT_ADD("exp5", XTAL_3_52128MHz/2, vip_expansion_cards, nullptr) + MCFG_VIP_EXPANSION_SLOT_ADD("exp5", XTAL(3'521'280)/2, vip_expansion_cards, nullptr) MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp5_int_w)) MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp5_dma_out_w)) MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp5_dma_in_w)) diff --git a/src/devices/bus/vme/vme_fccpu20.cpp b/src/devices/bus/vme/vme_fccpu20.cpp index 36c4523d2e0..fb317a1f24a 100644 --- a/src/devices/bus/vme/vme_fccpu20.cpp +++ b/src/devices/bus/vme/vme_fccpu20.cpp @@ -222,9 +222,9 @@ DEFINE_DEVICE_TYPE(VME_FCCPU21YA, vme_fccpu21ya_card_device, "fccpu21ya", "Force DEFINE_DEVICE_TYPE(VME_FCCPU21B, vme_fccpu21b_card_device, "fccpu21b", "Force Computer SYS68K/CPU-21B CPU Board") DEFINE_DEVICE_TYPE(VME_FCCPU21YB, vme_fccpu21yb_card_device, "fccpu21yb", "Force Computer SYS68K/CPU-21YB CPU Board") -#define CLOCK50 XTAL_50MHz /* HCJ */ -#define CLOCK40 XTAL_40MHz /* HCJ */ -#define CLOCK32 XTAL_32MHz /* HCJ */ +#define CLOCK50 XTAL(50'000'000) /* HCJ */ +#define CLOCK40 XTAL(40'000'000) /* HCJ */ +#define CLOCK32 XTAL(32'000'000) /* HCJ */ static ADDRESS_MAP_START (cpu20_mem, AS_PROGRAM, 32, vme_fccpu20_device) ADDRESS_MAP_UNMAP_HIGH diff --git a/src/devices/bus/vme/vme_fcisio.cpp b/src/devices/bus/vme/vme_fcisio.cpp index 001c7bef1ab..8673b375858 100644 --- a/src/devices/bus/vme/vme_fcisio.cpp +++ b/src/devices/bus/vme/vme_fcisio.cpp @@ -158,8 +158,8 @@ DEFINE_DEVICE_TYPE(VME_FCISIO1, vme_fcisio1_card_device, "fcisio1", "Force Computer SYS68K/ISIO-1/2 Intelligent Serial I/O Board") -#define CPU_CLOCK XTAL_20MHz /* HCJ */ -#define DUSCC_CLOCK XTAL_14_7456MHz /* HCJ */ +#define CPU_CLOCK XTAL(20'000'000) /* HCJ */ +#define DUSCC_CLOCK XTAL(14'745'600) /* HCJ */ static ADDRESS_MAP_START (fcisio1_mem, AS_PROGRAM, 16, vme_fcisio1_card_device) ADDRESS_MAP_UNMAP_HIGH @@ -361,10 +361,10 @@ MACHINE_CONFIG_START(vme_fcisio1_card_device::device_add_mconfig) MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc3", duscc68562_device, rxb_w)) MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc3", duscc68562_device, ctsb_w)) - MCFG_DEVICE_ADD ("pit", PIT68230, XTAL_20MHz / 2) + MCFG_DEVICE_ADD ("pit", PIT68230, XTAL(20'000'000) / 2) MCFG_PIT68230_PB_INPUT_CB(READ8(vme_fcisio1_card_device, config_rd)) - MCFG_MC68153_ADD("bim", XTAL_20MHz / 2) + MCFG_MC68153_ADD("bim", XTAL(20'000'000) / 2) MACHINE_CONFIG_END const tiny_rom_entry *vme_fcisio1_card_device::device_rom_region() const diff --git a/src/devices/bus/vme/vme_fcscsi.cpp b/src/devices/bus/vme/vme_fcscsi.cpp index 26cc9dfd60b..083e08a0f19 100644 --- a/src/devices/bus/vme/vme_fcscsi.cpp +++ b/src/devices/bus/vme/vme_fcscsi.cpp @@ -182,8 +182,8 @@ DEFINE_DEVICE_TYPE(VME_FCSCSI1, vme_fcscsi1_card_device, "fcscsi1", "Force Computer SYS68K/ISCSI-1 Intelligent Mass Storage Controller Board") -#define CPU_CRYSTAL XTAL_20MHz /* Jauch */ -#define PIT_CRYSTAL XTAL_16MHz /* Jauch */ +#define CPU_CRYSTAL XTAL(20'000'000) /* Jauch */ +#define PIT_CRYSTAL XTAL(16'000'000) /* Jauch */ static ADDRESS_MAP_START (fcscsi1_mem, AS_PROGRAM, 16, vme_fcscsi1_card_device) ADDRESS_MAP_UNMAP_HIGH diff --git a/src/devices/bus/vme/vme_hcpu30.cpp b/src/devices/bus/vme/vme_hcpu30.cpp index 30ed0c405f7..9c98292c178 100644 --- a/src/devices/bus/vme/vme_hcpu30.cpp +++ b/src/devices/bus/vme/vme_hcpu30.cpp @@ -42,7 +42,7 @@ #endif -#define DUSCC_CLOCK XTAL_14_7456MHz /* XXX Unverified */ +#define DUSCC_CLOCK XTAL(14'745'600) /* XXX Unverified */ #define RS232P1_TAG "rs232p1" #define RS232P2_TAG "rs232p2" diff --git a/src/devices/bus/vme/vme_mvme350.cpp b/src/devices/bus/vme/vme_mvme350.cpp index 40d2f3bd30e..1fe35f8dfbb 100644 --- a/src/devices/bus/vme/vme_mvme350.cpp +++ b/src/devices/bus/vme/vme_mvme350.cpp @@ -190,10 +190,10 @@ ROM_END MACHINE_CONFIG_START(vme_mvme350_card_device::device_add_mconfig) /* basic machine hardware */ - MCFG_CPU_ADD (MVME350_CPU_TAG, M68010, XTAL_10MHz) + MCFG_CPU_ADD (MVME350_CPU_TAG, M68010, XTAL(10'000'000)) MCFG_CPU_PROGRAM_MAP (mvme350_mem) /* PIT Parallel Interface and Timer device, assuming strapped for on board clock */ - MCFG_DEVICE_ADD("pit", PIT68230, XTAL_16MHz / 2) + MCFG_DEVICE_ADD("pit", PIT68230, XTAL(16'000'000) / 2) MACHINE_CONFIG_END const tiny_rom_entry *vme_mvme350_card_device::device_rom_region() const diff --git a/src/devices/bus/vme/vme_mzr8105.cpp b/src/devices/bus/vme/vme_mzr8105.cpp index 9ec70e3f851..c0d863635ac 100644 --- a/src/devices/bus/vme/vme_mzr8105.cpp +++ b/src/devices/bus/vme/vme_mzr8105.cpp @@ -38,7 +38,7 @@ DEFINE_DEVICE_TYPE(VME_MZR8105, vme_mzr8105_card_device, "mzr8105", "Mizar 8105 MACHINE_CONFIG_START(vme_mzr8105_card_device::device_add_mconfig) { - MCFG_CPU_ADD ("maincpu", M68000, XTAL_10MHz) + MCFG_CPU_ADD ("maincpu", M68000, XTAL(10'000'000)) MCFG_CPU_PROGRAM_MAP (mzr8105_mem) MCFG_VME_DEVICE_ADD("vme") MCFG_VME_BUS_OWNER_SPACES() diff --git a/src/devices/bus/vme/vme_mzr8300.cpp b/src/devices/bus/vme/vme_mzr8300.cpp index 6505a681663..7f643075b15 100644 --- a/src/devices/bus/vme/vme_mzr8300.cpp +++ b/src/devices/bus/vme/vme_mzr8300.cpp @@ -125,18 +125,18 @@ DEFINE_DEVICE_TYPE(VME_MZR8300, vme_mzr8300_card_device, "mzr8300", "Mizar 8300 //------------------------------------------------- MACHINE_CONFIG_START(vme_mzr8300_card_device::device_add_mconfig) - MCFG_DEVICE_ADD("sio0", UPD7201_NEW, XTAL_4MHz) + MCFG_DEVICE_ADD("sio0", UPD7201_NEW, XTAL(4'000'000)) MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232p1", rs232_port_device, write_txd)) MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232p1", rs232_port_device, write_dtr)) MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232p1", rs232_port_device, write_rts)) - MCFG_DEVICE_ADD("sio1", UPD7201_NEW, XTAL_4MHz) + MCFG_DEVICE_ADD("sio1", UPD7201_NEW, XTAL(4'000'000)) MCFG_RS232_PORT_ADD("rs232p1", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio0", upd7201_new_device, rxb_w)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio0", upd7201_new_device, ctsb_w)) - MCFG_DEVICE_ADD("stc", AM9513, XTAL_4MHz) + MCFG_DEVICE_ADD("stc", AM9513, XTAL(4'000'000)) MCFG_AM9513_OUT1_CALLBACK(DEVWRITELINE("sio0", upd7201_new_device, rxca_w)) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio0", upd7201_new_device, txca_w)) MCFG_AM9513_OUT2_CALLBACK(DEVWRITELINE("sio0", upd7201_new_device, rxcb_w)) diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp index bc11ac14b8c..c7709ee97a9 100644 --- a/src/devices/bus/wangpc/lvc.cpp +++ b/src/devices/bus/wangpc/lvc.cpp @@ -124,7 +124,7 @@ MACHINE_CONFIG_START(wangpc_lvc_device::device_add_mconfig) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_REFRESH_RATE(60) - MCFG_MC6845_ADD(MC6845_TAG, MC6845_1, SCREEN_TAG, XTAL_14_31818MHz/16) + MCFG_MC6845_ADD(MC6845_TAG, MC6845_1, SCREEN_TAG, XTAL(14'318'181)/16) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(wangpc_lvc_device, crtc_update_row) @@ -296,11 +296,11 @@ void wangpc_lvc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, u if (OPTION_80_COL) { - m_crtc->set_clock(XTAL_14_31818MHz / 8); + m_crtc->set_clock(XTAL(14'318'181) / 8); } else { - m_crtc->set_clock(XTAL_14_31818MHz / 16); + m_crtc->set_clock(XTAL(14'318'181) / 16); } } break; diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp index c4ef69379fe..c2a5b1af0dc 100644 --- a/src/devices/bus/wangpc/mvc.cpp +++ b/src/devices/bus/wangpc/mvc.cpp @@ -144,7 +144,7 @@ MACHINE_CONFIG_START(wangpc_mvc_device::device_add_mconfig) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_REFRESH_RATE(60) - MCFG_MC6845_ADD(MC6845_TAG, MC6845_1, SCREEN_TAG, XTAL_14_31818MHz/16) + MCFG_MC6845_ADD(MC6845_TAG, MC6845_1, SCREEN_TAG, XTAL(14'318'181)/16) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(10) MCFG_MC6845_UPDATE_ROW_CB(wangpc_mvc_device, crtc_update_row) diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp index a73131b53a7..936340a4267 100644 --- a/src/devices/bus/wangpc/tig.cpp +++ b/src/devices/bus/wangpc/tig.cpp @@ -122,12 +122,12 @@ MACHINE_CONFIG_START(wangpc_tig_device::device_add_mconfig) MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") - MCFG_DEVICE_ADD(UPD7720_0_TAG, UPD7220, XTAL_52_832MHz/28) + MCFG_DEVICE_ADD(UPD7720_0_TAG, UPD7220, XTAL(52'832'000)/28) MCFG_DEVICE_ADDRESS_MAP(0, upd7220_0_map) MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(wangpc_tig_device, hgdc_draw_text) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) - MCFG_DEVICE_ADD(UPD7720_1_TAG, UPD7220, XTAL_52_832MHz/28) + MCFG_DEVICE_ADD(UPD7720_1_TAG, UPD7220, XTAL(52'832'000)/28) MCFG_DEVICE_ADDRESS_MAP(0, upd7220_1_map) MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(wangpc_tig_device, hgdc_display_pixels) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp index a5424a8863d..095bb28bdaf 100644 --- a/src/devices/bus/wangpc/wdc.cpp +++ b/src/devices/bus/wangpc/wdc.cpp @@ -91,7 +91,7 @@ ADDRESS_MAP_END //------------------------------------------------- MACHINE_CONFIG_START(wangpc_wdc_device::device_add_mconfig) - MCFG_CPU_ADD(Z80_TAG, Z80, 2000000) // XTAL_10MHz / ? + MCFG_CPU_ADD(Z80_TAG, Z80, 2000000) // XTAL(10'000'000) / ? //MCFG_Z80_DAISY_CHAIN(wangpc_wdc_daisy_chain) MCFG_CPU_PROGRAM_MAP(wangpc_wdc_mem) MCFG_CPU_IO_MAP(wangpc_wdc_io) diff --git a/src/devices/bus/x68k/x68k_midi.cpp b/src/devices/bus/x68k/x68k_midi.cpp index 7289959627b..91bb5713715 100644 --- a/src/devices/bus/x68k/x68k_midi.cpp +++ b/src/devices/bus/x68k/x68k_midi.cpp @@ -18,7 +18,7 @@ DEFINE_DEVICE_TYPE(X68K_MIDI, x68k_midi_device, "x68k_midi", "X68000 MIDI Interface") MACHINE_CONFIG_START(x68k_midi_device::device_add_mconfig) - MCFG_DEVICE_ADD("midi", YM3802, XTAL_1MHz) // clock is unknown + MCFG_DEVICE_ADD("midi", YM3802, XTAL(1'000'000)) // clock is unknown MCFG_YM3802_TXD_HANDLER(DEVWRITELINE("mdout",midi_port_device,write_txd)) MCFG_YM3802_IRQ_HANDLER(WRITELINE(x68k_midi_device,irq_w)) MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin") |