diff options
Diffstat (limited to 'src')
145 files changed, 690 insertions, 765 deletions
diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp index 5a9c9384b99..2e8e49cdb64 100644 --- a/src/devices/bus/a2bus/corvfdc01.cpp +++ b/src/devices/bus/a2bus/corvfdc01.cpp @@ -84,7 +84,7 @@ enum //------------------------------------------------- MACHINE_CONFIG_START(a2bus_corvfdc01_device::device_add_mconfig) - MCFG_FD1793_ADD(FDC01_FDC_TAG, XTAL(16'000'000) / 8) + MCFG_DEVICE_ADD(FDC01_FDC_TAG, FD1793, 16_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, a2bus_corvfdc01_device, intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, 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/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp index 0a235132e57..98b7c7288f1 100644 --- a/src/devices/bus/abcbus/fd2.cpp +++ b/src/devices/bus/abcbus/fd2.cpp @@ -238,19 +238,19 @@ FLOPPY_FORMATS_END //------------------------------------------------- MACHINE_CONFIG_START(abc_fd2_device::device_add_mconfig) - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(4'000'000)/2) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 4_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(abc_fd2_mem) MCFG_DEVICE_IO_MAP(abc_fd2_io) MCFG_Z80_DAISY_CHAIN(daisy_chain) - MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(4'000'000)/2) + MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 4_MHz_XTAL / 2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(*this, abc_fd2_device, pio_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, abc_fd2_device, pio_pa_w)) MCFG_Z80PIO_IN_PB_CB(READ8(*this, abc_fd2_device, pio_pb_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, abc_fd2_device, pio_pb_w)) - MCFG_FD1771_ADD(FD1771_TAG, XTAL(4'000'000)/4) + MCFG_DEVICE_ADD(FD1771_TAG, FD1771, 4_MHz_XTAL / 4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(Z80PIO_TAG, z80pio_device, pb7_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(Z80PIO_TAG, z80pio_device, pb5_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(Z80PIO_TAG, z80pio_device, pb6_w)) diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp index 095ee01e8d0..e4c092132be 100644 --- a/src/devices/bus/abcbus/lux10828.cpp +++ b/src/devices/bus/abcbus/lux10828.cpp @@ -321,19 +321,19 @@ WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_drq_w ) //------------------------------------------------- MACHINE_CONFIG_START(luxor_55_10828_device::device_add_mconfig) - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(4'000'000)/2) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 4_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(luxor_55_10828_mem) MCFG_DEVICE_IO_MAP(luxor_55_10828_io) MCFG_Z80_DAISY_CHAIN(daisy_chain) - MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(4'000'000)/2) + MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 4_MHz_XTAL / 2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(*this, luxor_55_10828_device, pio_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, luxor_55_10828_device, pio_pa_w)) MCFG_Z80PIO_IN_PB_CB(READ8(*this, luxor_55_10828_device, pio_pb_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, luxor_55_10828_device, pio_pb_w)) - MCFG_MB8876_ADD(MB8876_TAG, XTAL(4'000'000)/4) + MCFG_DEVICE_ADD(MB8876_TAG, MB8876, 4_MHz_XTAL / 4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, luxor_55_10828_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, luxor_55_10828_device, fdc_drq_w)) diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index 67e10c10a25..021fa342fc3 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -291,12 +291,12 @@ static const z80_daisy_config z80_daisy_chain[] = //------------------------------------------------- MACHINE_CONFIG_START(luxor_55_21046_device::device_add_mconfig) - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 16_MHz_XTAL / 4) MCFG_Z80_DAISY_CHAIN(z80_daisy_chain) MCFG_DEVICE_PROGRAM_MAP(luxor_55_21046_mem) MCFG_DEVICE_IO_MAP(luxor_55_21046_io) - MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, 16_MHz_XTAL / 4) MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT)) MCFG_Z80DMA_OUT_INT_CB(WRITELINE(*this, luxor_55_21046_device, dma_int_w)) MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, luxor_55_21046_device, memory_read_byte)) @@ -304,7 +304,7 @@ MACHINE_CONFIG_START(luxor_55_21046_device::device_add_mconfig) MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, luxor_55_21046_device, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, luxor_55_21046_device, io_write_byte)) - MCFG_FD1793_ADD(SAB1793_TAG, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(SAB1793_TAG, FD1793, 16_MHz_XTAL / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, luxor_55_21046_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(Z80DMA_TAG, z80dma_device, rdy_w)) MACHINE_CONFIG_END @@ -1052,14 +1052,7 @@ WRITE8_MEMBER( luxor_55_21046_device::_8a_w ) // density select m_fdc->dden_w(BIT(data, 1)); - if (BIT(data, 2)) - { - m_fdc->set_unscaled_clock(XTAL(16'000'000)/16); - } - else - { - m_fdc->set_unscaled_clock(XTAL(16'000'000)/8); - } + m_fdc->set_unscaled_clock(16_MHz_XTAL / (BIT(data, 2) ? 16 : 8)); } diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp index 25871d3d033..52d60478b2b 100644 --- a/src/devices/bus/adamnet/fdc.cpp +++ b/src/devices/bus/adamnet/fdc.cpp @@ -128,11 +128,11 @@ static void adam_fdc_floppies(device_slot_interface &device) //------------------------------------------------- MACHINE_CONFIG_START(adam_fdc_device::device_add_mconfig) - MCFG_DEVICE_ADD(M6801_TAG, M6801, XTAL(4'000'000)) + MCFG_DEVICE_ADD(M6801_TAG, M6801, 4_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(adam_fdc_mem) MCFG_DEVICE_IO_MAP(adam_fdc_io) - MCFG_WD2793_ADD(WD2793_TAG, XTAL(4'000'000)/4) + MCFG_DEVICE_ADD(WD2793_TAG, WD2793, 4_MHz_XTAL / 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/apricot/keyboard/hle.cpp b/src/devices/bus/apricot/keyboard/hle.cpp index 1388047a062..c8df35cd0cb 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'768)) + MCFG_DEVICE_ADD("rtc", MSM5832, 32.768_kHz_XTAL) MACHINE_CONFIG_END diff --git a/src/devices/bus/bbc/1mhzbus/opus3.cpp b/src/devices/bus/bbc/1mhzbus/opus3.cpp index b75d0c6d123..a9a9ff5259e 100644 --- a/src/devices/bus/bbc/1mhzbus/opus3.cpp +++ b/src/devices/bus/bbc/1mhzbus/opus3.cpp @@ -83,7 +83,7 @@ ROM_END MACHINE_CONFIG_START(bbc_opus3_device::device_add_mconfig) /* fdc */ - MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2) + MCFG_DEVICE_ADD("wd1770", WD1770, 16_MHz_XTAL / 2) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, 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 250dc54f81a..009e7a496f8 100644 --- a/src/devices/bus/bbc/fdc/acorn.cpp +++ b/src/devices/bus/bbc/fdc/acorn.cpp @@ -133,7 +133,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(16'000'000) / 2) + MCFG_DEVICE_ADD("wd1770", WD1770, XTAL(16'000'000) / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_acorn1770_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, 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 bbb63dfed6c..1b75af7fe83 100644 --- a/src/devices/bus/bbc/fdc/cumana.cpp +++ b/src/devices/bus/bbc/fdc/cumana.cpp @@ -60,7 +60,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_cumana1_device::device_add_mconfig) - MCFG_MB8877_ADD("mb8877a", XTAL(16'000'000) / 16) + MCFG_DEVICE_ADD("mb8877a", MB8877, 16_MHz_XTAL / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_cumanafdc_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_cumanafdc_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, bbc_cumanafdc_device, motor_w)) @@ -71,7 +71,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(16'000'000) / 16) + MCFG_DEVICE_ADD("mb8877a", MB8877, 16_MHz_XTAL / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_cumanafdc_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_cumanafdc_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, bbc_cumanafdc_device, motor_w)) diff --git a/src/devices/bus/bbc/fdc/cv1797.cpp b/src/devices/bus/bbc/fdc/cv1797.cpp index cc5059b0002..5f37b07722d 100644 --- a/src/devices/bus/bbc/fdc/cv1797.cpp +++ b/src/devices/bus/bbc/fdc/cv1797.cpp @@ -53,7 +53,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_cv1797_device::device_add_mconfig) - MCFG_FD1797_ADD("fd1797", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fd1797", FD1797, 8_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_cv1797_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_cv1797_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, bbc_cv1797_device, motor_w)) diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp index ee3437623df..d884d267a49 100644 --- a/src/devices/bus/bbc/fdc/opus.cpp +++ b/src/devices/bus/bbc/fdc/opus.cpp @@ -99,7 +99,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(16'000'000) / 16) + MCFG_DEVICE_ADD("fdc", WD2791, 16_MHz_XTAL / 16) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_opusfdc_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, bbc_opusfdc_device, motor_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats) @@ -109,7 +109,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(16'000'000) / 16) + MCFG_DEVICE_ADD("fdc", WD2793, 16_MHz_XTAL / 16) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_opusfdc_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, bbc_opusfdc_device, motor_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats) @@ -119,7 +119,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(16'000'000) / 2) + MCFG_DEVICE_ADD("fdc", WD1770, 16_MHz_XTAL / 2) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, 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 95b47bfe0eb..ef003c13da7 100644 --- a/src/devices/bus/bbc/fdc/watford.cpp +++ b/src/devices/bus/bbc/fdc/watford.cpp @@ -66,7 +66,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bbc_weddb2_device::device_add_mconfig) - MCFG_WD1772_ADD("wd1772", XTAL(16'000'000) / 2) + MCFG_DEVICE_ADD("wd1772", WD1772, 16_MHz_XTAL / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_weddb2_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_weddb2_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("wd1772:0", bbc_floppies_525, "525qd", floppy_formats) @@ -76,7 +76,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(16'000'000) / 2) + MCFG_DEVICE_ADD("wd1770", WD1770, 16_MHz_XTAL / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_weddb3_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_weddb3_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("wd1770:0", bbc_floppies_525, "525qd", floppy_formats) diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp index c26485461fb..c043030c6c1 100644 --- a/src/devices/bus/bml3/bml3mp1802.cpp +++ b/src/devices/bus/bml3/bml3mp1802.cpp @@ -55,7 +55,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(bml3bus_mp1802_device::device_add_mconfig) - MCFG_MB8866_ADD("fdc", XTAL(1'000'000)) + MCFG_DEVICE_ADD("fdc", MB8866, 1_MHz_XTAL) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, 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/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp index 706db1fd73f..ff981f0fa53 100644 --- a/src/devices/bus/cbmiec/c1571.cpp +++ b/src/devices/bus/cbmiec/c1571.cpp @@ -235,7 +235,7 @@ WRITE8_MEMBER( c1571_device::via0_pa_w ) if (m_1_2mhz != clock_1_2) { - const XTAL clock = clock_1_2 ? XTAL(16'000'000)/8 : XTAL(16'000'000)/16; + const XTAL clock = 16_MHz_XTAL / (clock_1_2 ? 8 : 16); m_maincpu->set_unscaled_clock(clock); m_cia->set_unscaled_clock(clock); @@ -277,7 +277,7 @@ WRITE8_MEMBER( c1571cr_device::via0_pa_w ) if (m_1_2mhz != clock_1_2) { - const XTAL clock = clock_1_2 ? XTAL(16'000'000)/8 : XTAL(16'000'000)/16; + const XTAL clock = 16_MHz_XTAL / (clock_1_2 ? 8 : 16); m_maincpu->set_unscaled_clock(clock); m_cia->set_unscaled_clock(clock); @@ -605,18 +605,18 @@ static void mini_chief_isa8_cards(device_slot_interface &device) //------------------------------------------------- MACHINE_CONFIG_START(c1570_device::device_add_mconfig) - MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6502_TAG, M6502, 16_MHz_XTAL / 16) MCFG_DEVICE_PROGRAM_MAP(c1571_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) - MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, 16_MHz_XTAL / 16) MCFG_VIA6522_READPA_HANDLER(READ8(*this, c1571_device, via0_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via0_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c1571_device, via0_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_device, via0_pb_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via0_irq_w)) - MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 16_MHz_XTAL / 16) MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r)) MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via1_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w)) @@ -625,7 +625,7 @@ MACHINE_CONFIG_START(c1570_device::device_add_mconfig) MCFG_VIA6522_CB2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, oe_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via1_irq_w)) - MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6526_TAG, MOS6526, 16_MHz_XTAL / 16) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c1571_device, cia_irq_w)) MCFG_MOS6526_CNT_CALLBACK(WRITELINE(*this, c1571_device, cia_cnt_w)) MCFG_MOS6526_SP_CALLBACK(WRITELINE(*this, c1571_device, cia_sp_w)) @@ -633,26 +633,27 @@ MACHINE_CONFIG_START(c1570_device::device_add_mconfig) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c1571_device, cia_pb_w)) MCFG_MOS6526_PC_CALLBACK(WRITELINE(*this, c1571_device, cia_pc_w)) - MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2) - MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000)) + MCFG_DEVICE_ADD(WD1770_TAG, WD1770, 16_MHz_XTAL / 2) + + MCFG_DEVICE_ADD(C64H156_TAG, C64H156, 16_MHz_XTAL) MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, 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_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6502_TAG, M6502, 16_MHz_XTAL / 16) MCFG_DEVICE_PROGRAM_MAP(c1571_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) - MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, 16_MHz_XTAL / 16) MCFG_VIA6522_READPA_HANDLER(READ8(*this, c1571_device, via0_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via0_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c1571_device, via0_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_device, via0_pb_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via0_irq_w)) - MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 16_MHz_XTAL / 16) MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r)) MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via1_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w)) @@ -661,7 +662,7 @@ MACHINE_CONFIG_START(c1571_device::device_add_mconfig) MCFG_VIA6522_CB2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, oe_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via1_irq_w)) - MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6526_TAG, MOS6526, 16_MHz_XTAL / 16) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c1571_device, cia_irq_w)) MCFG_MOS6526_CNT_CALLBACK(WRITELINE(*this, c1571_device, cia_cnt_w)) MCFG_MOS6526_SP_CALLBACK(WRITELINE(*this, c1571_device, cia_sp_w)) @@ -669,26 +670,27 @@ MACHINE_CONFIG_START(c1571_device::device_add_mconfig) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c1571_device, cia_pb_w)) MCFG_MOS6526_PC_CALLBACK(WRITELINE(*this, c1571_device, cia_pc_w)) - MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2) - MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000)) + MCFG_DEVICE_ADD(WD1770_TAG, WD1770, 16_MHz_XTAL / 2) + + MCFG_DEVICE_ADD(C64H156_TAG, C64H156, 16_MHz_XTAL) MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, 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_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6502_TAG, M6502, 16_MHz_XTAL / 16) MCFG_DEVICE_PROGRAM_MAP(c1571_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) - MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, 16_MHz_XTAL / 16) MCFG_VIA6522_READPA_HANDLER(READ8(*this, c1571_device, via0_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via0_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c1571cr_device, via0_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571cr_device, via0_pb_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via0_irq_w)) - MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 16_MHz_XTAL / 16) MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r)) MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via1_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w)) @@ -697,28 +699,29 @@ MACHINE_CONFIG_START(c1571cr_device::device_add_mconfig) MCFG_VIA6522_CB2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, oe_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via1_irq_w)) - //MCFG_MOS5710_ADD(M5710_TAG, XTAL(16'000'000)/16, 0) + //MCFG_MOS5710_ADD(M5710_TAG, 16_MHz_XTAL / 16, 0) - MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2) - MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000)) + MCFG_DEVICE_ADD(WD1770_TAG, WD1770, 16_MHz_XTAL / 2) + + MCFG_DEVICE_ADD(C64H156_TAG, C64H156, 16_MHz_XTAL) MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, 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_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6502_TAG, M6502, 16_MHz_XTAL / 16) MCFG_DEVICE_PROGRAM_MAP(mini_chief_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) - MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, 16_MHz_XTAL / 16) MCFG_VIA6522_READPA_HANDLER(READ8(*this, c1571_device, via0_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via0_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c1571_device, via0_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_device, via0_pb_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via0_irq_w)) - MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 16_MHz_XTAL / 16) MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r)) MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via1_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w)) @@ -727,7 +730,7 @@ MACHINE_CONFIG_START(mini_chief_device::device_add_mconfig) MCFG_VIA6522_CB2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, oe_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via1_irq_w)) - MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(M6526_TAG, MOS6526, 16_MHz_XTAL / 16) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c1571_device, cia_irq_w)) MCFG_MOS6526_CNT_CALLBACK(WRITELINE(*this, c1571_device, cia_cnt_w)) MCFG_MOS6526_SP_CALLBACK(WRITELINE(*this, c1571_device, cia_sp_w)) @@ -735,8 +738,9 @@ MACHINE_CONFIG_START(mini_chief_device::device_add_mconfig) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c1571_device, cia_pb_w)) MCFG_MOS6526_PC_CALLBACK(WRITELINE(*this, c1571_device, cia_pc_w)) - MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2) - MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000)) + MCFG_DEVICE_ADD(WD1770_TAG, WD1770, 16_MHz_XTAL / 2) + + MCFG_DEVICE_ADD(C64H156_TAG, C64H156, 16_MHz_XTAL) MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, 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 cec3e83ad1a..ce7b634174a 100644 --- a/src/devices/bus/cbmiec/c1581.cpp +++ b/src/devices/bus/cbmiec/c1581.cpp @@ -268,10 +268,10 @@ FLOPPY_FORMATS_END //------------------------------------------------- MACHINE_CONFIG_START(c1581_device::device_add_mconfig) - MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/8) + MCFG_DEVICE_ADD(M6502_TAG, M6502, 16_MHz_XTAL / 8) MCFG_DEVICE_PROGRAM_MAP(c1581_mem) - MCFG_DEVICE_ADD(M8520_TAG, MOS8520, XTAL(16'000'000)/8) + MCFG_DEVICE_ADD(M8520_TAG, MOS8520, 16_MHz_XTAL / 8) MCFG_MOS6526_IRQ_CALLBACK(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) MCFG_MOS6526_CNT_CALLBACK(WRITELINE(*this, c1581_device, cnt_w)) MCFG_MOS6526_SP_CALLBACK(WRITELINE(*this, c1581_device, sp_w)) @@ -280,7 +280,7 @@ MACHINE_CONFIG_START(c1581_device::device_add_mconfig) MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c1581_device, cia_pb_r)) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c1581_device, cia_pb_w)) - MCFG_WD1772_ADD(WD1772_TAG, XTAL(16'000'000)/2) + MCFG_DEVICE_ADD(WD1772_TAG, WD1772, 16_MHz_XTAL / 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/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp index 723376213e7..4070e985b7a 100644 --- a/src/devices/bus/cgenie/expansion/floppy.cpp +++ b/src/devices/bus/cgenie/expansion/floppy.cpp @@ -74,7 +74,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(1'000'000)) + MCFG_DEVICE_ADD("fd1793", FD1793, 1_MHz_XTAL) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, 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_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp index e3913c2e0e7..d8ae6f6d2f9 100644 --- a/src/devices/bus/coco/coco_fdc.cpp +++ b/src/devices/bus/coco/coco_fdc.cpp @@ -127,7 +127,7 @@ static void coco_fdc_floppies(device_slot_interface &device) } MACHINE_CONFIG_START(coco_fdc_device_base::device_add_mconfig) - MCFG_WD1773_ADD(WD_TAG, XTAL(8'000'000)) + MCFG_DEVICE_ADD(WD_TAG, WD1773, 8_MHz_XTAL) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, coco_fdc_device_base, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, coco_fdc_device_base, fdc_drq_w)) @@ -140,7 +140,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'768)) + MCFG_DEVICE_ADD(DISTO_TAG, MSM6242, 32.768_kHz_XTAL) MCFG_DS1315_ADD(CLOUD9_TAG) MACHINE_CONFIG_END diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp index e8a83e8c9a7..cbaf7a321c5 100644 --- a/src/devices/bus/coco/dragon_fdc.cpp +++ b/src/devices/bus/coco/dragon_fdc.cpp @@ -150,7 +150,7 @@ static void dragon_fdc_drives(device_slot_interface &device) MACHINE_CONFIG_START(dragon_fdc_device_base::device_add_mconfig) - MCFG_WD2797_ADD(WD2797_TAG, XTAL(4'000'000) / 4) + MCFG_DEVICE_ADD(WD2797_TAG, WD2797, 4_MHz_XTAL / 4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, dragon_fdc_device_base, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, dragon_fdc_device_base, fdc_drq_w)) MCFG_WD_FDC_FORCE_READY @@ -167,7 +167,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(premier_fdc_device_base::device_add_mconfig) - MCFG_WD2791_ADD(WD2791_TAG, XTAL(2'000'000) / 2) + MCFG_DEVICE_ADD(WD2791_TAG, WD2791, 2_MHz_XTAL / 2) MCFG_WD_FDC_FORCE_READY MCFG_FLOPPY_DRIVE_ADD(WD2791_TAG ":0", dragon_fdc_drives, "qd", dragon_fdc_device_base::floppy_formats) diff --git a/src/devices/bus/comx35/fdc.cpp b/src/devices/bus/comx35/fdc.cpp index 962ff78c6af..4b47ae79ff0 100644 --- a/src/devices/bus/comx35/fdc.cpp +++ b/src/devices/bus/comx35/fdc.cpp @@ -97,7 +97,7 @@ static void comx_fd_floppies(device_slot_interface &device) //------------------------------------------------- MACHINE_CONFIG_START(comx_fd_device::device_add_mconfig) - MCFG_WD1770_ADD(WD1770_TAG, XTAL(8'000'000)) + MCFG_DEVICE_ADD(WD1770_TAG, WD1770, 8_MHz_XTAL) 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/econet/e01.cpp b/src/devices/bus/econet/e01.cpp index 1375a9515b1..df722832c15 100644 --- a/src/devices/bus/econet/e01.cpp +++ b/src/devices/bus/econet/e01.cpp @@ -259,7 +259,7 @@ MACHINE_CONFIG_START(econet_e01_device::device_add_mconfig) MCFG_DEVICE_ADD(MC6854_TAG, MC6854, 0) MCFG_MC6854_OUT_IRQ_CB(WRITELINE(*this, econet_e01_device, adlc_irq_w)) MCFG_MC6854_OUT_TXD_CB(WRITELINE(*this, econet_e01_device, econet_data_w)) - MCFG_WD2793_ADD(WD2793_TAG, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD(WD2793_TAG, WD2793, XTAL(8'000'000)/4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, econet_e01_device, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, 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/electron/cart/ap34.cpp b/src/devices/bus/electron/cart/ap34.cpp index 053017c3c62..3e4e1a6813b 100644 --- a/src/devices/bus/electron/cart/ap34.cpp +++ b/src/devices/bus/electron/cart/ap34.cpp @@ -46,7 +46,7 @@ void ap34_floppies(device_slot_interface &device) MACHINE_CONFIG_START(electron_ap34_device::device_add_mconfig) /* fdc */ - MCFG_WD1770_ADD("fdc", 16_MHz_XTAL / 2) + MCFG_DEVICE_ADD("fdc", WD1770, 16_MHz_XTAL / 2) MCFG_FLOPPY_DRIVE_ADD("fdc:0", ap34_floppies, "525qd", electron_ap34_device::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", ap34_floppies, nullptr, electron_ap34_device::floppy_formats) diff --git a/src/devices/bus/electron/cart/cumana.cpp b/src/devices/bus/electron/cart/cumana.cpp index 94024d66053..7f7780400ad 100644 --- a/src/devices/bus/electron/cart/cumana.cpp +++ b/src/devices/bus/electron/cart/cumana.cpp @@ -47,7 +47,7 @@ void cumana_floppies(device_slot_interface &device) MACHINE_CONFIG_START(electron_cumana_device::device_add_mconfig) /* fdc */ - MCFG_FD1793_ADD("fdc", 16_MHz_XTAL / 16) // TODO: Not known whether DRQ and INTRQ are connected + MCFG_DEVICE_ADD("fdc", FD1793, 16_MHz_XTAL / 16) // TODO: Not known whether DRQ and INTRQ are connected MCFG_FLOPPY_DRIVE_ADD("fdc:0", cumana_floppies, "525qd", electron_cumana_device::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", cumana_floppies, nullptr, electron_cumana_device::floppy_formats) diff --git a/src/devices/bus/electron/cart/peg400.cpp b/src/devices/bus/electron/cart/peg400.cpp index 957223eab03..b8f1ff12489 100644 --- a/src/devices/bus/electron/cart/peg400.cpp +++ b/src/devices/bus/electron/cart/peg400.cpp @@ -43,7 +43,7 @@ void peg400_floppies(device_slot_interface &device) MACHINE_CONFIG_START(electron_peg400_device::device_add_mconfig) /* fdc */ - MCFG_WD1770_ADD("fdc", 16_MHz_XTAL / 2) + MCFG_DEVICE_ADD("fdc", WD1770, 16_MHz_XTAL / 2) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, electron_peg400_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", peg400_floppies, "525qd", electron_peg400_device::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) diff --git a/src/devices/bus/electron/cart/stlefs.cpp b/src/devices/bus/electron/cart/stlefs.cpp index 093b805bb83..3a9e5196b4b 100644 --- a/src/devices/bus/electron/cart/stlefs.cpp +++ b/src/devices/bus/electron/cart/stlefs.cpp @@ -46,7 +46,7 @@ void stlefs_floppies(device_slot_interface &device) MACHINE_CONFIG_START(electron_stlefs_device::device_add_mconfig) /* fdc */ - MCFG_WD1770_ADD("fdc", 16_MHz_XTAL / 2) + MCFG_DEVICE_ADD("fdc", WD1770, 16_MHz_XTAL / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, electron_stlefs_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, electron_stlefs_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", stlefs_floppies, "525qd", electron_stlefs_device::floppy_formats) diff --git a/src/devices/bus/electron/plus3.cpp b/src/devices/bus/electron/plus3.cpp index 5eb2f88ccb3..ca4c5b00539 100644 --- a/src/devices/bus/electron/plus3.cpp +++ b/src/devices/bus/electron/plus3.cpp @@ -67,7 +67,7 @@ ROM_END MACHINE_CONFIG_START(electron_plus3_device::device_add_mconfig) /* fdc */ - MCFG_WD1770_ADD("fdc", 16_MHz_XTAL / 2) + MCFG_DEVICE_ADD("fdc", WD1770, 16_MHz_XTAL / 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 1518130681f..a67ccace7e0 100644 --- a/src/devices/bus/ep64/exdos.cpp +++ b/src/devices/bus/ep64/exdos.cpp @@ -104,7 +104,7 @@ static void ep64_exdos_floppies(device_slot_interface &device) //------------------------------------------------- MACHINE_CONFIG_START(ep64_exdos_device::device_add_mconfig) - MCFG_WD1770_ADD(WD1770_TAG, XTAL(8'000'000)) + MCFG_DEVICE_ADD(WD1770_TAG, WD1770, 8_MHz_XTAL) 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/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp index 57203fde779..be2bc9607ab 100644 --- a/src/devices/bus/ieee488/c8280.cpp +++ b/src/devices/bus/ieee488/c8280.cpp @@ -310,7 +310,7 @@ MACHINE_CONFIG_START(c8280_device::device_add_mconfig) MCFG_DEVICE_ADD(M6502_FDC_TAG, M6502, XTAL(12'000'000)/8) MCFG_DEVICE_PROGRAM_MAP(c8280_fdc_mem) - MCFG_FD1797_ADD(WD1797_TAG, XTAL(12'000'000)/6) + MCFG_DEVICE_ADD(WD1797_TAG, FD1797, 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/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp index 3a7b5877c43..76f23cd74b6 100644 --- a/src/devices/bus/isa/mc1502_fdc.cpp +++ b/src/devices/bus/isa/mc1502_fdc.cpp @@ -53,7 +53,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(mc1502_fdc_device::device_add_mconfig) - MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 16) + MCFG_DEVICE_ADD("fdc", FD1793, 16_MHz_XTAL / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, mc1502_fdc_device, mc1502_fdc_irq_drq)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, 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/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp index e98304ae3bf..e9213ba0904 100644 --- a/src/devices/bus/isa/p1_fdc.cpp +++ b/src/devices/bus/isa/p1_fdc.cpp @@ -63,7 +63,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(p1_fdc_device::device_add_mconfig) - MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 16) + MCFG_DEVICE_ADD("fdc", FD1793, 16_MHz_XTAL / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, p1_fdc_device, p1_fdc_irq_drq)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, 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/msx_cart/disk.cpp b/src/devices/bus/msx_cart/disk.cpp index ba4b9f0d04c..f4f6b9c32aa 100644 --- a/src/devices/bus/msx_cart/disk.cpp +++ b/src/devices/bus/msx_cart/disk.cpp @@ -202,7 +202,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(4'000'000) / 4) + MCFG_DEVICE_ADD("fdc", WD2793, 4_MHz_XTAL / 4) MCFG_WD_FDC_FORCE_READY // Single sided 3.5" floppy drive @@ -217,7 +217,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(4'000'000) / 4) + MCFG_DEVICE_ADD("fdc", WD2793, 4_MHz_XTAL / 4) // Double sided 3.5" floppy drive MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35dd", msx_cart_disk_device::floppy_formats) @@ -247,7 +247,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_cart_fscf351_device::device_add_mconfig) - MCFG_MB8877_ADD("fdc", XTAL(4'000'000) / 4) + MCFG_DEVICE_ADD("fdc", MB8877, 4_MHz_XTAL / 4) MCFG_WD_FDC_FORCE_READY // Double sided 3.5" floppy drive diff --git a/src/devices/bus/nasbus/floppy.cpp b/src/devices/bus/nasbus/floppy.cpp index 55ad5c0d128..b911cbd9dab 100644 --- a/src/devices/bus/nasbus/floppy.cpp +++ b/src/devices/bus/nasbus/floppy.cpp @@ -39,7 +39,7 @@ static void nascom_floppies(device_slot_interface &device) //------------------------------------------------- MACHINE_CONFIG_START(nascom_fdc_device::device_add_mconfig) - MCFG_FD1793_ADD("fd1793", XTAL(16'000'000) / 4 / 4) + MCFG_DEVICE_ADD("fd1793", FD1793, 16_MHz_XTAL / 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/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp index a7795cbf8e2..b5af4ec8049 100644 --- a/src/devices/bus/oricext/jasmin.cpp +++ b/src/devices/bus/oricext/jasmin.cpp @@ -73,7 +73,7 @@ const tiny_rom_entry *jasmin_device::device_rom_region() const } MACHINE_CONFIG_START(jasmin_device::device_add_mconfig) - MCFG_WD1770_ADD("fdc", XTAL(8'000'000)) + MCFG_DEVICE_ADD("fdc", WD1770, 8_MHz_XTAL) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, 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 ea6498d0df8..66440d74b5f 100644 --- a/src/devices/bus/oricext/microdisc.cpp +++ b/src/devices/bus/oricext/microdisc.cpp @@ -69,7 +69,7 @@ const tiny_rom_entry *microdisc_device::device_rom_region() const } MACHINE_CONFIG_START(microdisc_device::device_add_mconfig) - MCFG_FD1793_ADD("fdc", XTAL(8'000'000)/8) + MCFG_DEVICE_ADD("fdc", FD1793, 8_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, microdisc_device, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, microdisc_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, microdisc_device, fdc_hld_w)) diff --git a/src/devices/bus/s100/dj2db.cpp b/src/devices/bus/s100/dj2db.cpp index 57d063f91d7..4d788ab851b 100644 --- a/src/devices/bus/s100/dj2db.cpp +++ b/src/devices/bus/s100/dj2db.cpp @@ -103,10 +103,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'068'800)) + MCFG_DEVICE_ADD(BR1941_TAG, COM8116, 5.0688_MHz_XTAL) MCFG_COM8116_FR_HANDLER(WRITELINE(*this, s100_dj2db_device, fr_w)) - MCFG_MB8866_ADD(MB8866_TAG, XTAL(10'000'000)/5) + MCFG_DEVICE_ADD(MB8866_TAG, MB8866, 10_MHz_XTAL / 5) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, s100_dj2db_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, s100_dj2db_device, fdc_drq_w)) diff --git a/src/devices/bus/svi3x8/slot/sv801.cpp b/src/devices/bus/svi3x8/slot/sv801.cpp index b89f7fffede..137757be168 100644 --- a/src/devices/bus/svi3x8/slot/sv801.cpp +++ b/src/devices/bus/svi3x8/slot/sv801.cpp @@ -32,7 +32,7 @@ static void svi_floppies(device_slot_interface &device) //------------------------------------------------- MACHINE_CONFIG_START(sv801_device::device_add_mconfig) - MCFG_FD1793_ADD("fdc", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fdc", FD1793, 8_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, sv801_device, intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, sv801_device, drq_w)) diff --git a/src/devices/bus/ti99/peb/bwg.cpp b/src/devices/bus/ti99/peb/bwg.cpp index 6e6e81661ae..68d12f581ea 100644 --- a/src/devices/bus/ti99/peb/bwg.cpp +++ b/src/devices/bus/ti99/peb/bwg.cpp @@ -695,7 +695,7 @@ ROM_START( bwg_fdc ) ROM_END MACHINE_CONFIG_START(snug_bwg_device::device_add_mconfig) - MCFG_WD1773_ADD(FDC_TAG, XTAL(8'000'000)) + MCFG_DEVICE_ADD(FDC_TAG, WD1773, 8_MHz_XTAL) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, snug_bwg_device, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, snug_bwg_device, fdc_drq_w)) diff --git a/src/devices/bus/ti99/peb/ti_fdc.cpp b/src/devices/bus/ti99/peb/ti_fdc.cpp index defbcfda7da..2e045d0cd12 100644 --- a/src/devices/bus/ti99/peb/ti_fdc.cpp +++ b/src/devices/bus/ti99/peb/ti_fdc.cpp @@ -451,7 +451,7 @@ ROM_START( ti_fdc ) ROM_END MACHINE_CONFIG_START(ti_fdc_device::device_add_mconfig) - MCFG_FD1771_ADD(FDC_TAG, XTAL(1'000'000)) + MCFG_DEVICE_ADD(FDC_TAG, FD1771, 1_MHz_XTAL) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, ti_fdc_device, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, 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/tvc/hbf.cpp b/src/devices/bus/tvc/hbf.cpp index de73cb1712a..9110b5c4b36 100644 --- a/src/devices/bus/tvc/hbf.cpp +++ b/src/devices/bus/tvc/hbf.cpp @@ -85,7 +85,7 @@ void tvc_hbf_device::device_reset() //------------------------------------------------- MACHINE_CONFIG_START(tvc_hbf_device::device_add_mconfig) - MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 16) + MCFG_DEVICE_ADD("fdc", FD1793, 16_MHz_XTAL / 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/vme/vme_fcscsi.cpp b/src/devices/bus/vme/vme_fcscsi.cpp index f1e3aedf23d..141665fd1e8 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(20'000'000) /* Jauch */ -#define PIT_CRYSTAL XTAL(16'000'000) /* Jauch */ +#define CPU_CRYSTAL 20_MHz_XTAL /* Jauch */ +#define PIT_CRYSTAL 16_MHz_XTAL /* Jauch */ void vme_fcscsi1_card_device::fcscsi1_mem(address_map &map) { @@ -230,12 +230,12 @@ ROM_END MACHINE_CONFIG_START(vme_fcscsi1_card_device::device_add_mconfig) /* basic machine hardware */ - MCFG_DEVICE_ADD ("maincpu", M68010, CPU_CRYSTAL / 2) /* 7474 based frequency divide by 2 */ - MCFG_DEVICE_PROGRAM_MAP (fcscsi1_mem) + MCFG_DEVICE_ADD("maincpu", M68010, CPU_CRYSTAL / 2) /* 7474 based frequency divide by 2 */ + MCFG_DEVICE_PROGRAM_MAP(fcscsi1_mem) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(vme_fcscsi1_card_device, maincpu_irq_acknowledge_callback) /* FDC */ - MCFG_WD1772_ADD("fdc", PIT_CRYSTAL / 2) + MCFG_DEVICE_ADD("fdc", WD1772, PIT_CRYSTAL / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITE8(*this, vme_fcscsi1_card_device, fdc_irq)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("mc68450", hd63450_device, drq1_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", fcscsi_floppies, "525qd", vme_fcscsi1_card_device::floppy_formats) @@ -244,7 +244,7 @@ MACHINE_CONFIG_START(vme_fcscsi1_card_device::device_add_mconfig) MCFG_FLOPPY_DRIVE_ADD("fdc:3", fcscsi_floppies, "525qd", vme_fcscsi1_card_device::floppy_formats) /* PIT Parallel Interface and Timer device */ - MCFG_DEVICE_ADD ("pit", PIT68230, PIT_CRYSTAL / 2) /* 7474 based frequency divide by 2 */ + MCFG_DEVICE_ADD("pit", PIT68230, PIT_CRYSTAL / 2) /* 7474 based frequency divide by 2 */ MCFG_PIT68230_PB_OUTPUT_CB(WRITE8(*this, vme_fcscsi1_card_device, led_w)) /* DMAC it is really a M68450 but the HD63850 is upwards compatible */ diff --git a/src/devices/machine/msm5832.h b/src/devices/machine/msm5832.h index a7878d11585..2e2ea4e5ad9 100644 --- a/src/devices/machine/msm5832.h +++ b/src/devices/machine/msm5832.h @@ -28,15 +28,6 @@ //************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_MSM5832_ADD(tag, clock) \ - MCFG_DEVICE_ADD((tag), MSM5832, (clock)) - - - -//************************************************************************** // TYPE DEFINITIONS //************************************************************************** diff --git a/src/devices/machine/wd_fdc.h b/src/devices/machine/wd_fdc.h index 39094490fc3..4cd0f4f2186 100644 --- a/src/devices/machine/wd_fdc.h +++ b/src/devices/machine/wd_fdc.h @@ -45,75 +45,6 @@ */ -#define MCFG_FD1771_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1771, _clock) - -#define MCFG_FD1781_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1781, _clock) - -#define MCFG_FD1791_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1791, _clock) - -#define MCFG_FD1792_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1792, _clock) - -#define MCFG_FD1793_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1793, _clock) - -#define MCFG_KR1818VG93_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, KR1818VG93, _clock) - -#define MCFG_FD1794_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1794, _clock) - -#define MCFG_FD1795_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1795, _clock) - -#define MCFG_FD1797_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1797, _clock) - -#define MCFG_MB8866_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, MB8866, _clock) - -#define MCFG_MB8876_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, MB8876, _clock) - -#define MCFG_MB8877_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, MB8877, _clock) - -#define MCFG_FD1761_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1761, _clock) - -#define MCFG_FD1763_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1763, _clock) - -#define MCFG_FD1765_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1765, _clock) - -#define MCFG_FD1767_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1767, _clock) - -#define MCFG_WD2791_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD2791, _clock) - -#define MCFG_WD2793_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD2793, _clock) - -#define MCFG_WD2795_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD2795, _clock) - -#define MCFG_WD2797_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD2797, _clock) - -#define MCFG_WD1770_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD1770, _clock) - -#define MCFG_WD1772_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD1772, _clock) - -#define MCFG_WD1773_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD1773, _clock) - #define MCFG_WD_FDC_FORCE_READY \ downcast<wd_fdc_device_base *>(device)->set_force_ready(true); diff --git a/src/mame/drivers/aa310.cpp b/src/mame/drivers/aa310.cpp index 2e5ac599b3c..dd94ef6496d 100644 --- a/src/mame/drivers/aa310.cpp +++ b/src/mame/drivers/aa310.cpp @@ -402,7 +402,7 @@ WRITE_LINE_MEMBER( archimedes_state::a310_kart_rx_w ) MACHINE_CONFIG_START(aa310_state::aa310) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", ARM, XTAL(24'000'000) / 3) /* ARM2 8 MHz */ + MCFG_DEVICE_ADD("maincpu", ARM, 24_MHz_XTAL / 3) /* ARM2 8 MHz */ MCFG_DEVICE_PROGRAM_MAP(aa310_mem) MCFG_ARM_COPRO(VL86C020) @@ -415,7 +415,7 @@ MACHINE_CONFIG_START(aa310_state::aa310) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000),1024,0,735,624/2,0,292) // RiscOS 3 default screen settings + MCFG_SCREEN_RAW_PARAMS(16_MHz_XTAL, 1024, 0, 735, 624/2, 0, 292) // RiscOS 3 default screen settings MCFG_SCREEN_UPDATE_DRIVER(archimedes_state, screen_update) MCFG_PALETTE_ADD("palette", 32768) @@ -423,7 +423,7 @@ MACHINE_CONFIG_START(aa310_state::aa310) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1M") - MCFG_WD1772_ADD("fdc", 8000000 / 1) // TODO: frequency + MCFG_DEVICE_ADD("fdc", WD1772, 8000000 / 1) // TODO: frequency MCFG_WD_FDC_DISABLE_MOTOR_CONTROL MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, aa310_state, aa310_wd177x_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, aa310_state, aa310_wd177x_drq_w)) @@ -514,7 +514,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(aa310_state::aa540) aa310(config); MCFG_DEVICE_MODIFY("maincpu") // ARM3 - MCFG_DEVICE_CLOCK(XTAL(52'000'000) / 2) + MCFG_DEVICE_CLOCK(52_MHz_XTAL / 2) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("4M") @@ -528,7 +528,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(aa310_state::aa5000) aa310(config); MCFG_DEVICE_MODIFY("maincpu") // ARM3 - MCFG_DEVICE_CLOCK(XTAL(50'000'000) / 2) + MCFG_DEVICE_CLOCK(50_MHz_XTAL / 2) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("2M") @@ -542,7 +542,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(aa310_state::aa4) aa5000(config); MCFG_DEVICE_MODIFY("maincpu") // ARM3 - MCFG_DEVICE_CLOCK(XTAL(24'000'000)) + MCFG_DEVICE_CLOCK(24_MHz_XTAL) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -562,7 +562,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(aa310_state::aa3010) aa310(config); MCFG_DEVICE_MODIFY("maincpu") // ARM250 - MCFG_DEVICE_CLOCK(XTAL(72'000'000) / 6) + MCFG_DEVICE_CLOCK(72_MHz_XTAL / 6) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1M") diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp index 0c34a9927b8..d674359a6a3 100644 --- a/src/mame/drivers/abc1600.cpp +++ b/src/mame/drivers/abc1600.cpp @@ -878,7 +878,7 @@ void abc1600_state::machine_reset() MACHINE_CONFIG_START(abc1600_state::abc1600) // basic machine hardware - MCFG_DEVICE_ADD(MC68008P8_TAG, M68008, XTAL(64'000'000)/8) + MCFG_DEVICE_ADD(MC68008P8_TAG, M68008, 64_MHz_XTAL / 8) MCFG_DEVICE_PROGRAM_MAP(abc1600_mem) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(abc1600_state,abc1600_int_ack) @@ -888,7 +888,7 @@ MACHINE_CONFIG_START(abc1600_state::abc1600) // devices MCFG_ABC1600_MAC_ADD(MC68008P8_TAG, mac_mem) - MCFG_DEVICE_ADD(Z8410AB1_0_TAG, Z80DMA, XTAL(64'000'000)/16) + MCFG_DEVICE_ADD(Z8410AB1_0_TAG, Z80DMA, 64_MHz_XTAL / 16) MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, abc1600_state, dbrq_w)) MCFG_Z80DMA_OUT_BAO_CB(WRITELINE(Z8410AB1_1_TAG, z80dma_device, bai_w)) MCFG_Z80DMA_IN_MREQ_CB(READ8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_mreq_r)) @@ -896,7 +896,7 @@ MACHINE_CONFIG_START(abc1600_state::abc1600) MCFG_Z80DMA_IN_IORQ_CB(READ8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_iorq_r)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_iorq_w)) - MCFG_DEVICE_ADD(Z8410AB1_1_TAG, Z80DMA, XTAL(64'000'000)/16) + MCFG_DEVICE_ADD(Z8410AB1_1_TAG, Z80DMA, 64_MHz_XTAL / 16) MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, abc1600_state, dbrq_w)) MCFG_Z80DMA_OUT_BAO_CB(WRITELINE(Z8410AB1_2_TAG, z80dma_device, bai_w)) MCFG_Z80DMA_IN_MREQ_CB(READ8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_mreq_r)) @@ -904,24 +904,24 @@ MACHINE_CONFIG_START(abc1600_state::abc1600) MCFG_Z80DMA_IN_IORQ_CB(READ8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_iorq_r)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_iorq_w)) - MCFG_DEVICE_ADD(Z8410AB1_2_TAG, Z80DMA, XTAL(64'000'000)/16) + MCFG_DEVICE_ADD(Z8410AB1_2_TAG, Z80DMA, 64_MHz_XTAL / 16) MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, abc1600_state, dbrq_w)) MCFG_Z80DMA_IN_MREQ_CB(READ8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_mreq_r)) MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_mreq_w)) MCFG_Z80DMA_IN_IORQ_CB(READ8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_iorq_r)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_iorq_w)) - MCFG_DEVICE_ADD(Z8470AB1_TAG, Z80DART, XTAL(64'000'000)/16) + MCFG_DEVICE_ADD(Z8470AB1_TAG, Z80DART, 64_MHz_XTAL / 16) MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd)) MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr)) MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts)) MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w)) MCFG_Z80DART_OUT_INT_CB(INPUTLINE(MC68008P8_TAG, M68K_IRQ_5)) // shared with SCC - MCFG_DEVICE_ADD(Z8530B1_TAG, SCC8530, XTAL(64'000'000)/16) + MCFG_DEVICE_ADD(Z8530B1_TAG, SCC8530, 64_MHz_XTAL / 16) MCFG_Z8530_INTRQ_CALLBACK(INPUTLINE(MC68008P8_TAG, M68K_IRQ_5)) - MCFG_DEVICE_ADD(Z8536B1_TAG, Z8536, XTAL(64'000'000)/16) + MCFG_DEVICE_ADD(Z8536B1_TAG, Z8536, 64_MHz_XTAL / 16) MCFG_Z8536_IRQ_CALLBACK(INPUTLINE(MC68008P8_TAG, M68K_IRQ_2)) MCFG_Z8536_PA_IN_CALLBACK(READ8(*this, abc1600_state, cio_pa_r)) MCFG_Z8536_PB_IN_CALLBACK(READ8(*this, abc1600_state, cio_pb_r)) @@ -931,9 +931,9 @@ MACHINE_CONFIG_START(abc1600_state::abc1600) MCFG_NMC9306_ADD(NMC9306_TAG) - MCFG_E0516_ADD(E050_C16PC_TAG, XTAL(32'768)) + MCFG_E0516_ADD(E050_C16PC_TAG, 32.768_kHz_XTAL) - MCFG_FD1797_ADD(SAB1797_02P_TAG, XTAL(64'000'000)/64) + MCFG_DEVICE_ADD(SAB1797_02P_TAG, FD1797, 64_MHz_XTAL / 64) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(Z8536B1_TAG, z8536_device, pb7_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, abc1600_state, fdc_drq_w)) diff --git a/src/mame/drivers/alphatpx.cpp b/src/mame/drivers/alphatpx.cpp index ea170023a98..a5ea9a7ffde 100644 --- a/src/mame/drivers/alphatpx.cpp +++ b/src/mame/drivers/alphatpx.cpp @@ -1205,13 +1205,13 @@ void alphatp_12_state::machine_reset() } MACHINE_CONFIG_START(alphatp_12_state::alphatp2) - MCFG_DEVICE_ADD("maincpu", I8085A, XTAL(6'000'000)) + MCFG_DEVICE_ADD("maincpu", I8085A, 6_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(alphatp2_mem) MCFG_DEVICE_IO_MAP(alphatp2_io) MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_DEVICE_ADD("kbdmcu", I8041, XTAL(12'854'400)/2) + MCFG_DEVICE_ADD("kbdmcu", I8041, 12.8544_MHz_XTAL / 2) MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, alphatp_12_state, kbd_matrix_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, alphatp_12_state, kbd_matrix_w)) MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, alphatp_12_state, kbd_port2_r)) @@ -1226,12 +1226,12 @@ MACHINE_CONFIG_START(alphatp_12_state::alphatp2) // video hardware MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) - MCFG_SCREEN_RAW_PARAMS(XTAL(12'854'400), 824, 0, 640, 312, 0, 288) + MCFG_SCREEN_RAW_PARAMS(12.8544_MHz_XTAL, 824, 0, 640, 312, 0, 288) MCFG_SCREEN_UPDATE_DRIVER(alphatp_12_state, screen_update) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_DEVICE_ADD("crtc", CRT5027, XTAL(12'854'400) / 8) + MCFG_DEVICE_ADD("crtc", CRT5027, 12.8544_MHz_XTAL / 8) MCFG_TMS9927_CHAR_WIDTH(8) MCFG_TMS9927_HSYN_CALLBACK(INPUTLINE("maincpu", I8085_RST55_LINE)) MCFG_TMS9927_VSYN_CALLBACK(INPUTLINE("maincpu", I8085_RST65_LINE)) MCFG_DEVCB_XOR(1) @@ -1245,9 +1245,9 @@ MACHINE_CONFIG_START(alphatp_12_state::alphatp2) MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 ) MCFG_DEVICE_ADD("uart", I8251, 0) - // XTAL(4'915'200) serial clock + // 4.9152_MHz_XTAL serial clock - MCFG_FD1791_ADD("fdc", XTAL(4'000'000) / 4) + MCFG_DEVICE_ADD("fdc", FD1791, 4_MHz_XTAL / 4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, alphatp_12_state, fdcirq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, alphatp_12_state, fdcdrq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, alphatp_12_state, fdchld_w)) @@ -1287,13 +1287,13 @@ void alphatp_34_state::machine_reset() m_88_da = m_85_da = m_88_started = false; } MACHINE_CONFIG_START(alphatp_34_state::alphatp3) - MCFG_DEVICE_ADD("maincpu", I8085A, XTAL(6'000'000)) + MCFG_DEVICE_ADD("maincpu", I8085A, 6_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(alphatp3_mem) MCFG_DEVICE_IO_MAP(alphatp3_io) MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_DEVICE_ADD("kbdmcu", I8041, XTAL(12'854'400)/2) + MCFG_DEVICE_ADD("kbdmcu", I8041, 12.8544_MHz_XTAL /2) MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, alphatp_34_state, kbd_matrix_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, alphatp_34_state, kbd_matrix_w)) MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, alphatp_34_state, kbd_port2_r)) @@ -1308,12 +1308,12 @@ MACHINE_CONFIG_START(alphatp_34_state::alphatp3) // video hardware MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) - MCFG_SCREEN_RAW_PARAMS(XTAL(12'854'400), 824, 0, 640, 312, 0, 288) + MCFG_SCREEN_RAW_PARAMS(12.8544_MHz_XTAL, 824, 0, 640, 312, 0, 288) MCFG_SCREEN_UPDATE_DRIVER(alphatp_34_state, screen_update) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_DEVICE_ADD("crtc", CRT5037, XTAL(12'854'400) / 8) + MCFG_DEVICE_ADD("crtc", CRT5037, 12.8544_MHz_XTAL / 8) MCFG_TMS9927_CHAR_WIDTH(8) MCFG_TMS9927_VSYN_CALLBACK(INPUTLINE("maincpu", I8085_RST65_LINE)) MCFG_DEVCB_XOR(1) MCFG_VIDEO_SET_SCREEN("screen") @@ -1326,9 +1326,9 @@ MACHINE_CONFIG_START(alphatp_34_state::alphatp3) MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 ) MCFG_DEVICE_ADD("uart", I8251, 0) - // XTAL(4'915'200) serial clock + // 4.9152_MHz_XTAL serial clock - MCFG_FD1791_ADD("fdc", XTAL(4'000'000) / 4) + MCFG_DEVICE_ADD("fdc", FD1791, 4_MHz_XTAL / 4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, alphatp_34_state, fdcirq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, alphatp_34_state, fdcdrq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, alphatp_34_state, fdchld_w)) diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp index a0a2391e14e..b1bbfeec99e 100644 --- a/src/mame/drivers/altos5.cpp +++ b/src/mame/drivers/altos5.cpp @@ -410,18 +410,18 @@ void altos5_state::init_altos5() MACHINE_CONFIG_START(altos5_state::altos5) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("maincpu", Z80, 8_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(mem_map) MCFG_DEVICE_IO_MAP(io_map) MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) - MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(8'000'000) / 4) // 2MHz + MCFG_DEVICE_ADD("ctc_clock", CLOCK, 8_MHz_XTAL / 4) // 2MHz MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc" ,z80ctc_device, trg0)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc" ,z80ctc_device, trg1)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc" ,z80ctc_device, trg2)) /* devices */ - MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("dma", Z80DMA, 8_MHz_XTAL / 2) MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, altos5_state, busreq_w)) MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // BAO, not used @@ -430,22 +430,22 @@ MACHINE_CONFIG_START(altos5_state::altos5) MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, altos5_state, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, altos5_state, io_write_byte)) - MCFG_DEVICE_ADD("pio0", Z80PIO, XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("pio0", Z80PIO, 8_MHz_XTAL / 2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(*this, altos5_state, port08_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, altos5_state, port08_w)) MCFG_Z80PIO_IN_PB_CB(READ8(*this, altos5_state, port09_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, altos5_state, port09_w)) - MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("pio1", Z80PIO, 8_MHz_XTAL / 2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("dart", Z80DART, XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("dart", Z80DART, 8_MHz_XTAL / 2) // Channel A - console #3 // Channel B - printer MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("sio", Z80SIO, 8_MHz_XTAL / 2) // Channel A - console #2 // WRDY connects to (altos5_state, fdc_intrq_w) // Channel B - console #1 @@ -454,7 +454,7 @@ MACHINE_CONFIG_START(altos5_state::altos5) MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232", rs232_port_device, write_rts)) MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("ctc", Z80CTC, 8_MHz_XTAL / 2) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE("sio", z80sio_device, rxtxcb_w)) // SIO Ch B MCFG_Z80CTC_ZC1_CB(WRITELINE("dart", z80dart_device, txca_w)) // Z80DART Ch A, SIO Ch A @@ -468,7 +468,7 @@ MACHINE_CONFIG_START(altos5_state::altos5) MCFG_RS232_DCD_HANDLER(WRITELINE("sio", z80sio_device, dcdb_w)) MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsb_w)) - MCFG_FD1797_ADD("fdc", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fdc", FD1797, 8_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, altos5_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("dma", z80dma_device, rdy_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", altos5_floppies, "525qd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/altos8600.cpp b/src/mame/drivers/altos8600.cpp index 17817abb021..0e26761964b 100644 --- a/src/mame/drivers/altos8600.cpp +++ b/src/mame/drivers/altos8600.cpp @@ -790,7 +790,7 @@ MACHINE_CONFIG_START(altos8600_state::altos8600) MCFG_PIT8253_CLK2(1228800) MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pic8259_1", pic8259_device, ir1_w)) - MCFG_FD1797_ADD("fd1797", 2000000) + MCFG_DEVICE_ADD("fd1797", FD1797, 2000000) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("pic8259_2", pic8259_device, ir1_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, altos8600_state, fddrq_w)) MCFG_FLOPPY_DRIVE_ADD("fd1797:0", altos8600_floppies, "8dd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp index 8aa098b91b2..341cfafa921 100644 --- a/src/mame/drivers/ampro.cpp +++ b/src/mame/drivers/ampro.cpp @@ -151,24 +151,24 @@ void ampro_state::init_ampro() MACHINE_CONFIG_START(ampro_state::ampro) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",Z80, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(ampro_mem) MCFG_DEVICE_IO_MAP(ampro_io) MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) MCFG_MACHINE_RESET_OVERRIDE(ampro_state, ampro) - MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(16'000'000) / 8) // 2MHz + MCFG_DEVICE_ADD("ctc_clock", CLOCK, 16_MHz_XTAL / 8) // 2MHz MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1)) /* Devices */ - MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("ctc", Z80CTC, 16_MHz_XTAL / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE("dart", z80dart_device, txca_w)) // Z80DART Ch A, SIO Ch A MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart", z80dart_device, rxca_w)) MCFG_Z80CTC_ZC1_CB(WRITELINE("dart", z80dart_device, rxtxcb_w)) // SIO Ch B - MCFG_DEVICE_ADD("dart", Z80DART, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("dart", Z80DART, 16_MHz_XTAL / 4) MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd)) MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr)) MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts)) @@ -177,7 +177,7 @@ MACHINE_CONFIG_START(ampro_state::ampro) MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(WRITELINE("dart", z80dart_device, rxa_w)) - MCFG_WD1772_ADD("fdc", XTAL(16'000'000) / 2) + MCFG_DEVICE_ADD("fdc", WD1772, 16_MHz_XTAL / 2) MCFG_FLOPPY_DRIVE_ADD("fdc:0", ampro_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_SOFTWARE_LIST_ADD("flop_list", "ampro") diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp index 89f25c92022..51c20c928e3 100644 --- a/src/mame/drivers/amusco.cpp +++ b/src/mame/drivers/amusco.cpp @@ -86,8 +86,8 @@ #include "amusco.lh" -#define MASTER_CLOCK XTAL(22'118'400) /* confirmed */ -#define SECOND_CLOCK XTAL(15'000'000) /* confirmed */ +#define MASTER_CLOCK 22.1184_MHz_XTAL /* confirmed */ +#define SECOND_CLOCK 15_MHz_XTAL /* confirmed */ #define CPU_CLOCK MASTER_CLOCK / 4 /* guess */ #define CRTC_CLOCK SECOND_CLOCK / 8 /* guess */ @@ -562,7 +562,7 @@ MACHINE_CONFIG_START(amusco_state::amusco) MCFG_I8155_IN_PORTB_CB(READ8(*this, amusco_state, lpt_status_r)) // Port C uses ALT 3 mode, which MAME does not currently emulate - MCFG_MSM5832_ADD("rtc", XTAL(32'768)) + MCFG_DEVICE_ADD("rtc", MSM5832, 32.768_kHz_XTAL) MCFG_DEVICE_ADD("rtc_interface", I8155, 0) MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, amusco_state, rtc_control_w)) diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp index 50a14607818..dcb72aed7f7 100644 --- a/src/mame/drivers/apf.cpp +++ b/src/mame/drivers/apf.cpp @@ -519,13 +519,13 @@ static void apf_cart(device_slot_interface &device) MACHINE_CONFIG_START(apf_state::apfm1000) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M6800, XTAL(3'579'545) / 4 ) // divided by 4 in external clock circuit + MCFG_DEVICE_ADD("maincpu", M6800, 3.579545_MHz_XTAL / 4) // divided by 4 in external clock circuit MCFG_DEVICE_PROGRAM_MAP(apfm1000_map) /* video hardware */ MCFG_SCREEN_MC6847_NTSC_ADD("screen", "mc6847") - MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, XTAL(3'579'545)) + MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, 3.579545_MHz_XTAL) MCFG_MC6847_FSYNC_CALLBACK(WRITELINE("pia0", pia6821_device, cb1_w)) MCFG_MC6847_INPUT_CALLBACK(READ8(*this, apf_state, videoram_r)) MCFG_MC6847_FIXED_MODE(mc6847_ntsc_device::MODE_GM2 | mc6847_ntsc_device::MODE_GM1) @@ -574,7 +574,7 @@ MACHINE_CONFIG_START(apf_state::apfimag) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_DISABLED) MCFG_CASSETTE_INTERFACE("apf_cass") - MCFG_FD1771_ADD("fdc", 1000000) // guess + MCFG_DEVICE_ADD("fdc", FD1771, 1000000) // guess MCFG_FLOPPY_DRIVE_ADD("fdc:0", apf_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", apf_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp index 895f803e069..3ecdd6d4a83 100644 --- a/src/mame/drivers/applix.cpp +++ b/src/mame/drivers/applix.cpp @@ -844,9 +844,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(applix_state::cass_timer) MACHINE_CONFIG_START(applix_state::applix) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(30'000'000) / 4) // MC68000-P10 @ 7.5 MHz + MCFG_DEVICE_ADD("maincpu", M68000, 30_MHz_XTAL / 4) // MC68000-P10 @ 7.5 MHz MCFG_DEVICE_PROGRAM_MAP(applix_mem) - MCFG_DEVICE_ADD("subcpu", Z80, XTAL(16'000'000) / 2) // Z80H + MCFG_DEVICE_ADD("subcpu", Z80, 16_MHz_XTAL / 2) // Z80H MCFG_DEVICE_PROGRAM_MAP(subcpu_mem) MCFG_DEVICE_IO_MAP(subcpu_io) MCFG_DEVICE_ADD("kbdcpu", I8051, 11060250) @@ -881,13 +881,13 @@ MACHINE_CONFIG_START(applix_state::applix) WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "lspeaker", 0.50); /* Devices */ - MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(30'000'000) / 16) // MC6545 @ 1.875 MHz + MCFG_MC6845_ADD("crtc", MC6845, "screen", 30_MHz_XTAL / 16) // MC6545 @ 1.875 MHz MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(applix_state, crtc_update_row) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, applix_state, vsync_w)) - MCFG_DEVICE_ADD("via6522", VIA6522, XTAL(30'000'000) / 4 / 10) // VIA uses 68000 E clock + MCFG_DEVICE_ADD("via6522", VIA6522, 30_MHz_XTAL / 4 / 10) // VIA uses 68000 E clock MCFG_VIA6522_READPB_HANDLER(READ8(*this, applix_state, applix_pb_r)) // in CB1 kbd clk // in CA2 vsync @@ -905,7 +905,7 @@ MACHINE_CONFIG_START(applix_state::applix) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED) - MCFG_WD1772_ADD("fdc", XTAL(16'000'000) / 2) //connected to Z80H clock pin + MCFG_DEVICE_ADD("fdc", WD1772, 16_MHz_XTAL / 2) //connected to Z80H clock pin MCFG_FLOPPY_DRIVE_ADD("fdc:0", applix_floppies, "35dd", applix_state::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", applix_floppies, "35dd", applix_state::floppy_formats) diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp index f510b5188e4..0f964567173 100644 --- a/src/mame/drivers/apricot.cpp +++ b/src/mame/drivers/apricot.cpp @@ -190,7 +190,7 @@ WRITE8_MEMBER( apricot_state::i8255_portb_w ) floppy->mon_w(0); // switch video modes - m_crtc->set_clock(m_video_mode ? XTAL(15'000'000) / 10 : XTAL(15'000'000) / 16); + m_crtc->set_clock(15_MHz_XTAL / (m_video_mode ? 10 : 16)); m_crtc->set_hpixels_per_column(m_video_mode ? 10 : 16); // PB7 Centronics transceiver direction. 0 = output, 1 = input @@ -357,14 +357,14 @@ void apricot_state::apricot_io(address_map &map) MACHINE_CONFIG_START(apricot_state::apricot) // main cpu - MCFG_DEVICE_ADD("ic91", I8086, XTAL(15'000'000) / 3) + MCFG_DEVICE_ADD("ic91", I8086, 15_MHz_XTAL / 3) MCFG_DEVICE_PROGRAM_MAP(apricot_mem) MCFG_DEVICE_IO_MAP(apricot_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("ic31", pic8259_device, inta_cb) MCFG_I8086_LOCK_HANDLER(WRITELINE(*this, apricot_state, i8086_lock_w)) // i/o cpu - MCFG_DEVICE_ADD("ic71", I8089, XTAL(15'000'000) / 3) + MCFG_DEVICE_ADD("ic71", I8089, 15_MHz_XTAL / 3) MCFG_DEVICE_PROGRAM_MAP(apricot_mem) MCFG_DEVICE_IO_MAP(apricot_io) MCFG_I8089_DATA_WIDTH(16) @@ -384,7 +384,7 @@ MACHINE_CONFIG_START(apricot_state::apricot) MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") - MCFG_MC6845_ADD("ic30", HD6845, "screen", XTAL(15'000'000) / 10) + MCFG_MC6845_ADD("ic30", HD6845, "screen", 15_MHz_XTAL / 10) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(10) MCFG_MC6845_UPDATE_ROW_CB(apricot_state, crtc_update_row) @@ -392,7 +392,7 @@ MACHINE_CONFIG_START(apricot_state::apricot) // sound hardware SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ic7", SN76489, XTAL(4'000'000) / 2) + MCFG_DEVICE_ADD("ic7", SN76489, 4_MHz_XTAL / 2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) // devices @@ -407,11 +407,11 @@ MACHINE_CONFIG_START(apricot_state::apricot) MCFG_PIC8259_OUT_INT_CB(INPUTLINE("ic91", 0)) MCFG_DEVICE_ADD("ic16", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL(4'000'000) / 16) + MCFG_PIT8253_CLK0(4_MHz_XTAL / 16) MCFG_PIT8253_OUT0_HANDLER(WRITELINE("ic31", pic8259_device, ir6_w)) - MCFG_PIT8253_CLK1(XTAL(4'000'000) / 2) + MCFG_PIT8253_CLK1(4_MHz_XTAL / 2) MCFG_PIT8253_OUT1_HANDLER(WRITELINE("ic14", ttl153_device, i0a_w)) - MCFG_PIT8253_CLK2(XTAL(4'000'000) / 2) + MCFG_PIT8253_CLK2(4_MHz_XTAL / 2) MCFG_PIT8253_OUT2_HANDLER(WRITELINE("ic14", ttl153_device, i0b_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ic14", ttl153_device, i2a_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ic14", ttl153_device, i2b_w)) @@ -420,10 +420,10 @@ MACHINE_CONFIG_START(apricot_state::apricot) MCFG_TTL153_ZA_CB(WRITELINE("ic15", z80sio_device, rxca_w)) MCFG_TTL153_ZB_CB(WRITELINE("ic15", z80sio_device, txca_w)) - MCFG_CLOCK_ADD("ic15_rxtxcb", XTAL(4'000'000) / 16) + MCFG_CLOCK_ADD("ic15_rxtxcb", 4_MHz_XTAL / 16) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ic15", z80sio_device, rxtxcb_w)) - MCFG_DEVICE_ADD("ic15", Z80SIO, XTAL(15'000'000) / 6) + MCFG_DEVICE_ADD("ic15", Z80SIO, 15_MHz_XTAL / 6) MCFG_Z80SIO_CPU("ic91") MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd)) MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr)) @@ -459,7 +459,7 @@ MACHINE_CONFIG_START(apricot_state::apricot) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") // floppy - MCFG_WD2797_ADD("ic68", XTAL(4'000'000) / 2) + MCFG_DEVICE_ADD("ic68", WD2797, 4_MHz_XTAL / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, apricot_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("ic71", i8089_device, drq1_w)) MCFG_FLOPPY_DRIVE_ADD("ic68:0", apricot_floppies, "d32w", apricot_state::floppy_formats) diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp index 8397709b352..884240c58e7 100644 --- a/src/mame/drivers/apricotf.cpp +++ b/src/mame/drivers/apricotf.cpp @@ -343,7 +343,7 @@ void apricotf_floppies(device_slot_interface &device) MACHINE_CONFIG_START(f1_state::act_f1) /* basic machine hardware */ - MCFG_DEVICE_ADD(I8086_TAG, I8086, XTAL(14'000'000)/4) + MCFG_DEVICE_ADD(I8086_TAG, I8086, 14_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(act_f1_mem) MCFG_DEVICE_IO_MAP(act_f1_io) @@ -379,7 +379,7 @@ MACHINE_CONFIG_START(f1_state::act_f1) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) // floppy - MCFG_WD2797_ADD(WD2797_TAG, XTAL(4'000'000) / 2 /* ? */) + MCFG_DEVICE_ADD(WD2797_TAG, WD2797, 4_MHz_XTAL / 2 /* ? */) MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(I8086_TAG, INPUT_LINE_NMI)) MCFG_WD_FDC_DRQ_CALLBACK(INPUTLINE(I8086_TAG, INPUT_LINE_TEST)) diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp index 43ed5c07a71..9b9cd95a229 100644 --- a/src/mame/drivers/apricotp.cpp +++ b/src/mame/drivers/apricotp.cpp @@ -586,7 +586,7 @@ static void fp_floppies(device_slot_interface &device) MACHINE_CONFIG_START(fp_state::fp) /* basic machine hardware */ - MCFG_DEVICE_ADD(I8086_TAG, I8086, XTAL(15'000'000)/3) + MCFG_DEVICE_ADD(I8086_TAG, I8086, 15_MHz_XTAL / 3) MCFG_DEVICE_PROGRAM_MAP(fp_mem) MCFG_DEVICE_IO_MAP(fp_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb) @@ -647,7 +647,7 @@ MACHINE_CONFIG_START(fp_state::fp) MCFG_DEVICE_ADD(Z80SIO0_TAG, Z80SIO, 2500000) MCFG_Z80SIO_OUT_INT_CB(WRITELINE(I8259A_TAG, pic8259_device, ir4_w)) - MCFG_WD2797_ADD(WD2797_TAG, 2000000) + MCFG_DEVICE_ADD(WD2797_TAG, WD2797, 2000000) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(I8259A_TAG, pic8259_device, ir1_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(I8237_TAG, am9517a_device, dreq1_w)) diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp index eba072bc099..eab05ca716f 100644 --- a/src/mame/drivers/at.cpp +++ b/src/mame/drivers/at.cpp @@ -435,7 +435,7 @@ static void pci_devices(device_slot_interface &device) MACHINE_CONFIG_START(at_state::ibm5170) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", I80286, XTAL(12'000'000)/2 /*6000000*/) + MCFG_DEVICE_ADD("maincpu", I80286, 12_MHz_XTAL / 2 /*6000000*/) MCFG_DEVICE_PROGRAM_MAP(at16_map) MCFG_DEVICE_IO_MAP(at16_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb) @@ -461,13 +461,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(at_state::ibm5170a) ibm5170(config); MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_CLOCK(XTAL(16'000'000)/2) + MCFG_DEVICE_CLOCK(16_MHz_XTAL / 2) MACHINE_CONFIG_END MACHINE_CONFIG_START(at_state::ews286) ibm5170(config); MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_CLOCK(XTAL(16'000'000)/2) // Exact crystal needs to be verified, 8 MHz according to specification + MCFG_DEVICE_CLOCK(16_MHz_XTAL / 2) // Exact crystal needs to be verified, 8 MHz according to specification MCFG_DEVICE_MODIFY("isa2") MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc", cfg_single_1200K) // From pictures but also with a 3.5" as second floppy @@ -495,7 +495,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(at_vrom_fix_state::ibmps1) ibm5170(config); MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_CLOCK(XTAL(10'000'000)) + MCFG_DEVICE_CLOCK(10_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(at16l_map) MCFG_DEVICE_IO_MAP(ps1_16_io) MCFG_DEVICE_MODIFY("isa1") @@ -611,7 +611,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(at_state::pc30iii) ibm5170(config); MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_CLOCK(6000000) // should be XTAL(24'000'000)/2, but doesn't post with that setting + MCFG_DEVICE_CLOCK(6000000) // should be 24_MHz_XTAL / 2, but doesn't post with that setting MCFG_DEVICE_MODIFY("isa1") MCFG_DEVICE_SLOT_INTERFACE(pc_isa16_cards, "vga", false) // should be ATI EGA Wonder 800+ MACHINE_CONFIG_END @@ -620,18 +620,18 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(at_state::pc40iii) ibm5170(config); MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_CLOCK(6000000) // should be XTAL(24'000'000)/2, but doesn't post with that setting + MCFG_DEVICE_CLOCK(6000000) // should be 24_MHz_XTAL / 2, but doesn't post with that setting MCFG_DEVICE_MODIFY("isa1") MCFG_DEVICE_SLOT_INTERFACE(pc_isa16_cards, "vga", false) // should be onboard Paradise VGA, see ROM declarations MACHINE_CONFIG_END MACHINE_CONFIG_START(megapc_state::megapc) - MCFG_DEVICE_ADD("maincpu", I386SX, XTAL(50'000'000) / 2) + MCFG_DEVICE_ADD("maincpu", I386SX, 50_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(megapc_map) MCFG_DEVICE_IO_MAP(megapc_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("wd7600", wd7600_device, intack_cb) - MCFG_WD7600_ADD("wd7600",XTAL(50'000'000) / 2, ":maincpu", ":isa", ":bios", ":keybc") + MCFG_WD7600_ADD("wd7600", 50_MHz_XTAL / 2, ":maincpu", ":isa", ":bios", ":keybc") MCFG_WD7600_HOLD(WRITELINE(*this, megapc_state, wd7600_hold)); MCFG_WD7600_NMI(INPUTLINE("maincpu", INPUT_LINE_NMI)); MCFG_WD7600_INTR(INPUTLINE("maincpu", INPUT_LINE_IRQ0)); @@ -674,7 +674,7 @@ MACHINE_CONFIG_START(megapc_state::megapc) // ISA cards MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "isabus", pc_isa16_cards, nullptr, false) - MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000)) + MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, 12_MHz_XTAL) MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(WRITELINE("wd7600", wd7600_device, kbrst_w)) MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(WRITELINE("wd7600", wd7600_device, gatea20_w)) MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(WRITELINE("wd7600", wd7600_device, irq01_w)) @@ -788,7 +788,7 @@ MACHINE_CONFIG_END // Compaq Portable III MACHINE_CONFIG_START(at_state::comportiii) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", I80286, 48_MHz_XTAL/4 /*12000000*/) + MCFG_DEVICE_ADD("maincpu", I80286, 48_MHz_XTAL / 4 /*12000000*/) MCFG_DEVICE_PROGRAM_MAP(at16_map) MCFG_DEVICE_IO_MAP(at16_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb) @@ -818,7 +818,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(at_state::comportii) ibm5170(config); MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_CLOCK(48_MHz_XTAL/6) + MCFG_DEVICE_CLOCK(48_MHz_XTAL / 6) MCFG_DEVICE_MODIFY("isa2") MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc", cfg_single_360K) MCFG_DEVICE_MODIFY("isa4") diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp index b18f91a298c..9fae35f994d 100644 --- a/src/mame/drivers/atarist.cpp +++ b/src/mame/drivers/atarist.cpp @@ -2055,7 +2055,7 @@ MACHINE_CONFIG_START(st_state::st) // devices - MCFG_WD1772_ADD(WD1772_TAG, Y2/4) + MCFG_DEVICE_ADD(WD1772_TAG, WD1772, Y2/4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, st_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) @@ -2146,7 +2146,7 @@ MACHINE_CONFIG_START(megast_state::megast) // devices MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL(32'768)) - MCFG_WD1772_ADD(WD1772_TAG, Y2/4) + MCFG_DEVICE_ADD(WD1772_TAG, WD1772, Y2/4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, st_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) @@ -2245,7 +2245,7 @@ MACHINE_CONFIG_START(ste_state::ste) // devices - MCFG_WD1772_ADD(WD1772_TAG, Y2/4) + MCFG_DEVICE_ADD(WD1772_TAG, WD1772, Y2/4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, st_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) @@ -2359,7 +2359,7 @@ static MACHINE_CONFIG_START(stbook_state::stbook) MCFG_MC68901_OUT_TDO_CB(WRITELINE(*this, st_state, mfp_tdo_w)) MCFG_MC68901_OUT_SO_CB(WRITELINE(RS232_TAG, rs232_port_device, write_txd)) - MCFG_WD1772_ADD(WD1772_TAG, U517/2) + MCFG_DEVICE_ADD(WD1772_TAG, WD1772, U517/2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, st_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", 0, st_state::floppy_formats) diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index 2f2f145b5ae..12ae1134d18 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -1108,7 +1108,7 @@ void attache816_state::machine_reset() } MACHINE_CONFIG_START(attache_state::attache) - MCFG_DEVICE_ADD("maincpu",Z80,XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("maincpu", Z80, 8_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(attache_map) MCFG_DEVICE_IO_MAP(attache_io) MCFG_Z80_DAISY_CHAIN(attache_daisy_chain) @@ -1116,24 +1116,24 @@ MACHINE_CONFIG_START(attache_state::attache) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) - MCFG_SCREEN_RAW_PARAMS(XTAL(12'324'000), 784, 0, 640, 262, 0, 240) + MCFG_SCREEN_RAW_PARAMS(12.324_MHz_XTAL, 784, 0, 640, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(attache_state, screen_update) MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("psg", AY8912, XTAL(8'000'000) / 4) + MCFG_DEVICE_ADD("psg", AY8912, 8_MHz_XTAL / 4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_MSM5832_ADD("rtc",XTAL(32'768)) + MCFG_DEVICE_ADD("rtc", MSM5832, 32.768_kHz_XTAL) - MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("pio", Z80PIO, 8_MHz_XTAL / 2) MCFG_Z80PIO_IN_PA_CB(READ8(*this, attache_state, pio_portA_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, attache_state, pio_portA_w)) MCFG_Z80PIO_IN_PB_CB(READ8(*this, attache_state, pio_portB_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, attache_state, pio_portB_w)) - MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("sio", Z80SIO, 8_MHz_XTAL / 2) MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd)) MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts)) MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd)) @@ -1148,17 +1148,17 @@ MACHINE_CONFIG_START(attache_state::attache) MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxb_w)) MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsb_w)) - MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("ctc", Z80CTC, 8_MHz_XTAL / 2) MCFG_Z80CTC_ZC0_CB(WRITELINE("sio", z80sio_device, rxca_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, txca_w)) MCFG_Z80CTC_ZC1_CB(WRITELINE("sio", z80sio_device, rxtxcb_w)) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("brc", CLOCK, XTAL(8'000'000) / 26) // 307.692 KHz + MCFG_DEVICE_ADD("brc", CLOCK, 8_MHz_XTAL / 26) // 307.692 KHz MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1)) - MCFG_DEVICE_ADD("dma", AM9517A, XTAL(8'000'000) / 4) + MCFG_DEVICE_ADD("dma", AM9517A, 8_MHz_XTAL / 4) MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(*this, attache_state, hreq_w)) MCFG_AM9517A_OUT_EOP_CB(WRITELINE(*this, attache_state, eop_w)) MCFG_AM9517A_IN_MEMR_CB(READ8(*this, attache_state, dma_mem_r)) @@ -1187,37 +1187,37 @@ MACHINE_CONFIG_START(attache_state::attache) MACHINE_CONFIG_END MACHINE_CONFIG_START(attache816_state::attache816) - MCFG_DEVICE_ADD("maincpu",Z80,XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("maincpu", Z80, 8_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(attache_map) MCFG_DEVICE_IO_MAP(attache816_io) MCFG_Z80_DAISY_CHAIN(attache_daisy_chain) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_DEVICE_ADD("extcpu",I8086,XTAL(24'000'000) / 3) + MCFG_DEVICE_ADD("extcpu", I8086, 24_MHz_XTAL / 3) MCFG_DEVICE_PROGRAM_MAP(attache_x86_map) MCFG_DEVICE_IO_MAP(attache_x86_io) MCFG_QUANTUM_PERFECT_CPU("extcpu") MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) - MCFG_SCREEN_RAW_PARAMS(XTAL(12'324'000), 784, 0, 640, 262, 0, 240) + MCFG_SCREEN_RAW_PARAMS(12.324_MHz_XTAL, 784, 0, 640, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(attache_state, screen_update) MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("psg", AY8912, XTAL(8'000'000) / 4) + MCFG_DEVICE_ADD("psg", AY8912, 8_MHz_XTAL / 4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_MSM5832_ADD("rtc",XTAL(32'768)) + MCFG_DEVICE_ADD("rtc", MSM5832, 32.768_MHz_XTAL) - MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("pio", Z80PIO, 8_MHz_XTAL / 2) MCFG_Z80PIO_IN_PA_CB(READ8(*this, attache_state, pio_portA_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, attache_state, pio_portA_w)) MCFG_Z80PIO_IN_PB_CB(READ8(*this, attache_state, pio_portB_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, attache_state, pio_portB_w)) - MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("sio", Z80SIO, 8_MHz_XTAL / 2) MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd)) MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts)) MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd)) @@ -1232,13 +1232,13 @@ MACHINE_CONFIG_START(attache816_state::attache816) MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxb_w)) MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsb_w)) - MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2) + MCFG_DEVICE_ADD("ctc", Z80CTC, 8_MHz_XTAL / 2) MCFG_Z80CTC_ZC0_CB(WRITELINE("sio", z80sio_device, rxca_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, txca_w)) MCFG_Z80CTC_ZC1_CB(WRITELINE("sio", z80sio_device, rxtxcb_w)) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("brc", CLOCK, XTAL(8'000'000) / 26) // 307.692 KHz + MCFG_DEVICE_ADD("brc", CLOCK, 8_MHz_XTAL / 26) // 307.692 KHz MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1)) @@ -1249,7 +1249,7 @@ MACHINE_CONFIG_START(attache816_state::attache816) MCFG_I8255_OUT_PORTC_CB(WRITELINE(*this, attache816_state, x86_dsr)) MCFG_DEVCB_BIT(0) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, attache816_state, ppi_irq)) MCFG_DEVCB_BIT(7) MCFG_DEVCB_INVERT - MCFG_DEVICE_ADD("dma", AM9517A, XTAL(8'000'000) / 4) + MCFG_DEVICE_ADD("dma", AM9517A, 8_MHz_XTAL / 4) MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(*this, attache_state, hreq_w)) MCFG_AM9517A_OUT_EOP_CB(WRITELINE(*this, attache_state, eop_w)) MCFG_AM9517A_IN_MEMR_CB(READ8(*this, attache_state, dma_mem_r)) diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp index d762763b273..27d180e9193 100644 --- a/src/mame/drivers/aussiebyte.cpp +++ b/src/mame/drivers/aussiebyte.cpp @@ -497,7 +497,7 @@ void aussiebyte_state::machine_reset() MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(aussiebyte_map) MCFG_DEVICE_IO_MAP(aussiebyte_io) MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) @@ -526,12 +526,12 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") - MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(4'915'200) / 4) + MCFG_DEVICE_ADD("ctc_clock", CLOCK, 4.9152_MHz_XTAL / 4) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg2)) - MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("ctc", Z80CTC, 16_MHz_XTAL / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE("sio1", z80sio_device, rxca_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio1", z80sio_device, txca_w)) @@ -541,7 +541,7 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, aussiebyte_state, ctc_z2_w)) // SIO2 Ch B, CTC Ch 3 MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio2", z80sio_device, rxtxcb_w)) - MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("dma", Z80DMA, 16_MHz_XTAL / 4) MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, aussiebyte_state, busreq_w)) // BAO, not used @@ -550,22 +550,22 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, aussiebyte_state, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, aussiebyte_state, io_write_byte)) - MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("pio1", Z80PIO, 16_MHz_XTAL / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write)) MCFG_Z80PIO_IN_PB_CB(READ8("cent_data_in", input_buffer_device, read)) MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE("centronics", centronics_device, write_strobe)) MCFG_DEVCB_INVERT - MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("pio2", Z80PIO, 16_MHz_XTAL / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, aussiebyte_state, port20_w)) - MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("sio1", Z80SIO, 16_MHz_XTAL / 4) MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(*this, aussiebyte_state, sio1_rdya_w)) MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(*this, aussiebyte_state, sio1_rdyb_w)) - MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("sio2", Z80SIO, 16_MHz_XTAL / 4) MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(*this, aussiebyte_state, sio2_rdya_w)) MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(*this, aussiebyte_state, sio2_rdyb_w)) @@ -576,7 +576,7 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard") MCFG_RS232_RXD_HANDLER(WRITELINE("sio2", z80sio_device, rxa_w)) - MCFG_WD2797_ADD("fdc", XTAL(16'000'000) / 16) + MCFG_DEVICE_ADD("fdc", WD2797, 16_MHz_XTAL / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, aussiebyte_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, aussiebyte_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", aussiebyte_floppies, "525qd", floppy_image_device::default_floppy_formats) @@ -585,13 +585,13 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) MCFG_FLOPPY_DRIVE_SOUND(true) /* devices */ - MCFG_MC6845_ADD("crtc", SY6545_1, "screen", XTAL(16'000'000) / 8) + MCFG_MC6845_ADD("crtc", SY6545_1, "screen", 16_MHz_XTAL / 8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(aussiebyte_state, crtc_update_row) MCFG_MC6845_ADDR_CHANGED_CB(aussiebyte_state, crtc_update_addr) - MCFG_MSM5832_ADD("rtc", XTAL(32'768)) + MCFG_DEVICE_ADD("rtc", MSM5832, 32.768_kHz_XTAL) /* quickload */ MCFG_QUICKLOAD_ADD("quickload", aussiebyte_state, aussiebyte, "com,cpm", 3) diff --git a/src/mame/drivers/b2m.cpp b/src/mame/drivers/b2m.cpp index 23abfff1d95..6f2153e29f7 100644 --- a/src/mame/drivers/b2m.cpp +++ b/src/mame/drivers/b2m.cpp @@ -242,7 +242,7 @@ MACHINE_CONFIG_START(b2m_state::b2m) /* uart */ MCFG_DEVICE_ADD("uart", I8251, 0) - MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fd1793", FD1793, 8_MHz_XTAL / 8) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, b2m_state, b2m_fdc_drq)) MCFG_FLOPPY_DRIVE_ADD("fd0", b2m_floppies, "525qd", b2m_state::b2m_floppy_formats) diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp index 1ff8fd52a8c..1a81a640c65 100644 --- a/src/mame/drivers/bbc.cpp +++ b/src/mame/drivers/bbc.cpp @@ -1058,7 +1058,7 @@ MACHINE_CONFIG_START(bbc_state::bbcbp) /* fdc */ MCFG_DEVICE_REMOVE("fdc") - MCFG_WD1770_ADD("wd1770", 16_MHz_XTAL / 2) + MCFG_DEVICE_ADD("wd1770", WD1770, 16_MHz_XTAL / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_drq_w)) @@ -1414,7 +1414,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm) MCFG_VIA6522_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<2>)) /* fdc */ - MCFG_WD1770_ADD("wd1770", 16_MHz_XTAL / 2) + MCFG_DEVICE_ADD("wd1770", WD1770, 16_MHz_XTAL / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_drq_w)) @@ -1613,7 +1613,7 @@ MACHINE_CONFIG_START(bbc_state::bbcmc) /* fdc */ MCFG_DEVICE_REMOVE("wd1770") - MCFG_WD1772_ADD("wd1772", 16_MHz_XTAL / 2) + MCFG_DEVICE_ADD("wd1772", WD1772, 16_MHz_XTAL / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_drq_w)) diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp index 19c31ef7186..8cb40961da9 100644 --- a/src/mame/drivers/bigbord2.cpp +++ b/src/mame/drivers/bigbord2.cpp @@ -544,7 +544,7 @@ MC6845_UPDATE_ROW( bigbord2_state::crtc_update_row ) /* Machine Drivers */ -#define MAIN_CLOCK XTAL(8'000'000) / 2 +#define MAIN_CLOCK 8_MHz_XTAL / 2 MACHINE_CONFIG_START(bigbord2_state::bigbord2) /* basic machine hardware */ @@ -555,7 +555,7 @@ MACHINE_CONFIG_START(bigbord2_state::bigbord2) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(10'694'250), 700, 0, 560, 260, 0, 240) + MCFG_SCREEN_RAW_PARAMS(10.69425_MHz_XTAL, 700, 0, 560, 260, 0, 240) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_crt8002) MCFG_PALETTE_ADD_MONOCHROME("palette") @@ -587,14 +587,14 @@ MACHINE_CONFIG_START(bigbord2_state::bigbord2) MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, bigbord2_state, ctc_z1_w)) // to SIO Ch A MCFG_Z80CTC_ZC2_CB(WRITELINE("ctc2", z80ctc_device, trg3)) - MCFG_MB8877_ADD("fdc", XTAL(16'000'000) / 8) // 2MHz for 8 inch, or 1MHz otherwise (jumper-selectable) + MCFG_DEVICE_ADD("fdc", MB8877, 16_MHz_XTAL / 8) // 2MHz for 8 inch, or 1MHz otherwise (jumper-selectable) //MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", ??)) // info missing from schematic MCFG_FLOPPY_DRIVE_ADD("fdc:0", bigbord2_floppies, "8dsdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", bigbord2_floppies, "8dsdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) - MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(16'000'000) / 8) + MCFG_MC6845_ADD("crtc", MC6845, "screen", 16_MHz_XTAL / 8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(bigbord2_state, crtc_update_row) diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp index 8e883db7a13..186f4b9d8cd 100644 --- a/src/mame/drivers/bullet.cpp +++ b/src/mame/drivers/bullet.cpp @@ -302,7 +302,7 @@ WRITE8_MEMBER( bullet_state::hdcon_w ) if (m_hdcon_sw) { // FDC clock - m_fdc->set_unscaled_clock(BIT(data, 2) ? XTAL(16'000'000)/16 : XTAL(16'000'000)/8); + m_fdc->set_unscaled_clock(16_MHz_XTAL / (BIT(data, 2) ? 16 : 8)); // density select m_fdc->dden_w(BIT(data, 3)); @@ -495,7 +495,7 @@ WRITE8_MEMBER( bulletf_state::xfdc_w ) } // FDC clock - m_fdc->set_unscaled_clock(BIT(data, 6) ? XTAL(16'000'000)/16 : XTAL(16'000'000)/8); + m_fdc->set_unscaled_clock(16_MHz_XTAL / (BIT(data, 6) ? 16 : 8)); // density select m_fdc->dden_w(BIT(data, 7)); @@ -1061,7 +1061,7 @@ void bullet_state::machine_reset() uint8_t sw1 = m_sw1->read(); int mini = BIT(sw1, 6); - m_fdc->set_unscaled_clock(mini ? XTAL(16'000'000)/16 : XTAL(16'000'000)/8); + m_fdc->set_unscaled_clock(16_MHz_XTAL / (mini ? 16 : 8)); m_fdc->dden_w(BIT(sw1, 7)); if (mini) @@ -1108,21 +1108,21 @@ void bulletf_state::machine_reset() MACHINE_CONFIG_START(bullet_state::bullet) // basic machine hardware - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(bullet_mem) MCFG_DEVICE_IO_MAP(bullet_io) MCFG_Z80_DAISY_CHAIN(daisy_chain) // devices - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 16_MHz_XTAL / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, bullet_state, dart_rxtxca_w)) MCFG_Z80CTC_ZC1_CB(WRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg3)) - MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", bullet_state, ctc_tick, attotime::from_hz(XTAL(4'915'200)/4)) + MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", bullet_state, ctc_tick, attotime::from_hz(4.9152_MHz_XTAL /4)) - MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, 16_MHz_XTAL / 4) MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) @@ -1133,7 +1133,7 @@ MACHINE_CONFIG_START(bullet_state::bullet) MCFG_Z80DART_OUT_WRDYB_CB(WRITELINE(*this, bullet_state, dartbrdy_w)) MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, 16_MHz_XTAL / 4) MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT)) MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, bullet_state, dma_mreq_r)) @@ -1141,12 +1141,12 @@ MACHINE_CONFIG_START(bullet_state::bullet) MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, bullet_state, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, bullet_state, io_write_byte)) - MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 16_MHz_XTAL / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write)) MCFG_Z80PIO_IN_PB_CB(READ8(*this, bullet_state, pio_pb_r)) - MCFG_MB8877_ADD(MB8877_TAG, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(MB8877_TAG, MB8877, 16_MHz_XTAL / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(Z80DART_TAG, z80dart_device, dcda_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bullet_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", bullet_525_floppies, "525qd", floppy_image_device::default_floppy_formats) @@ -1188,21 +1188,21 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(bulletf_state::bulletf) // basic machine hardware - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(bulletf_mem) MCFG_DEVICE_IO_MAP(bulletf_io) MCFG_Z80_DAISY_CHAIN(daisy_chain) // devices - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 16_MHz_XTAL / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, bullet_state, dart_rxtxca_w)) MCFG_Z80CTC_ZC1_CB(WRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg3)) - MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", bullet_state, ctc_tick, attotime::from_hz(XTAL(4'915'200)/4)) + MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", bullet_state, ctc_tick, attotime::from_hz(4.9152_MHz_XTAL / 4)) - MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, 16_MHz_XTAL / 4) MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) @@ -1213,7 +1213,7 @@ MACHINE_CONFIG_START(bulletf_state::bulletf) MCFG_Z80DART_OUT_WRDYB_CB(WRITELINE(*this, bullet_state, dartbrdy_w)) MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, 16_MHz_XTAL / 4) MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT)) MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, bullet_state, dma_mreq_r)) @@ -1221,14 +1221,14 @@ MACHINE_CONFIG_START(bulletf_state::bulletf) MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, bullet_state, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, bullet_state, io_write_byte)) - MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 16_MHz_XTAL / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8("scsi_ctrl_in", input_buffer_device, read)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, bulletf_state, pio_pa_w)) MCFG_Z80PIO_OUT_ARDY_CB(WRITE8("cent_data_out", output_latch_device, write)) MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, bulletf_state, cstrb_w)) - MCFG_MB8877_ADD(MB8877_TAG, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(MB8877_TAG, MB8877, 16_MHz_XTAL / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(Z80DART_TAG, z80dart_device, rib_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bullet_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", bullet_525_floppies, "525qd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp index 84b6c71256a..5d6df165a8a 100644 --- a/src/mame/drivers/bw2.cpp +++ b/src/mame/drivers/bw2.cpp @@ -575,7 +575,7 @@ void bw2_state::machine_start() MACHINE_CONFIG_START(bw2_state::bw2) // basic machine hardware - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(bw2_mem) MCFG_DEVICE_IO_MAP(bw2_io) @@ -592,7 +592,7 @@ MACHINE_CONFIG_START(bw2_state::bw2) // devices MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL(16'000'000)/4) // 8251 USART TXC, RXC + MCFG_PIT8253_CLK0(16_MHz_XTAL / 4) // 8251 USART TXC, RXC MCFG_PIT8253_OUT0_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_txc)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(I8251_TAG, i8251_device, write_rxc)) MCFG_PIT8253_CLK1(11000) // LCD controller @@ -606,7 +606,7 @@ MACHINE_CONFIG_START(bw2_state::bw2) MCFG_I8255_IN_PORTC_CB(READ8(*this, bw2_state, ppi_pc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, bw2_state, ppi_pc_w)) - MCFG_DEVICE_ADD(MSM6255_TAG, MSM6255, XTAL(16'000'000)) + MCFG_DEVICE_ADD(MSM6255_TAG, MSM6255, 16_MHz_XTAL) MCFG_DEVICE_ADDRESS_MAP(0, lcdc_map) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) @@ -624,13 +624,13 @@ MACHINE_CONFIG_START(bw2_state::bw2) MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxd)) MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_dsr)) - MCFG_WD2797_ADD(WD2797_TAG, XTAL(16'000'000)/16) + MCFG_DEVICE_ADD(WD2797_TAG, WD2797, 16_MHz_XTAL / 16) MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bw2_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":0", bw2_floppies, "35dd", bw2_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":1", bw2_floppies, nullptr, bw2_state::floppy_formats) - MCFG_BW2_EXPANSION_SLOT_ADD(BW2_EXPANSION_SLOT_TAG, XTAL(16'000'000), bw2_expansion_cards, nullptr) + MCFG_BW2_EXPANSION_SLOT_ADD(BW2_EXPANSION_SLOT_TAG, 16_MHz_XTAL, bw2_expansion_cards, nullptr) // software list MCFG_SOFTWARE_LIST_ADD("flop_list","bw2") diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp index bda51ce5ebe..2d58f50ffc3 100644 --- a/src/mame/drivers/camplynx.cpp +++ b/src/mame/drivers/camplynx.cpp @@ -855,7 +855,7 @@ MACHINE_CONFIG_START(camplynx_state::lynx_common) MACHINE_CONFIG_END MACHINE_CONFIG_START(camplynx_state::lynx_disk) - MCFG_FD1793_ADD("fdc", 24_MHz_XTAL / 24) + MCFG_DEVICE_ADD("fdc", FD1793, 24_MHz_XTAL / 24) MCFG_FLOPPY_DRIVE_ADD("fdc:0", camplynx_floppies, "525qd", camplynx_state::camplynx_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", camplynx_floppies, "525qd", camplynx_state::camplynx_floppy_formats) @@ -887,7 +887,7 @@ MACHINE_CONFIG_START(camplynx_state::lynx48k) MCFG_CASSETTE_INTERFACE("camplynx_cass") /* devices */ - MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(12'000'000) / 8 ) + MCFG_MC6845_ADD("crtc", MC6845, "screen", 12_MHz_XTAL / 8 ) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(camplynx_state, lynx48k_update_row) diff --git a/src/mame/drivers/candela.cpp b/src/mame/drivers/candela.cpp index 0f01b4ada1c..ca368f3eead 100644 --- a/src/mame/drivers/candela.cpp +++ b/src/mame/drivers/candela.cpp @@ -663,11 +663,11 @@ DEVICE_INPUT_DEFAULTS_END #endif /* Fake clock values until we TODO: figure out how the PTM generates the clocks */ -#define CAN09T_BAUDGEN_CLOCK XTAL(1'843'200) +#define CAN09T_BAUDGEN_CLOCK 1.8432_MHz_XTAL #define CAN09T_ACIA_CLOCK (CAN09T_BAUDGEN_CLOCK / 12) MACHINE_CONFIG_START(can09t_state::can09t) - MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'915'200)) // IPL crystal + MCFG_DEVICE_ADD("maincpu", MC6809, 4.9152_MHz_XTAL) // IPL crystal MCFG_DEVICE_PROGRAM_MAP(can09t_map) /* --PIA inits----------------------- */ @@ -708,7 +708,7 @@ MACHINE_CONFIG_START(can09t_state::can09t) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE (*this, can09t_state, write_acia_clock)) MACHINE_CONFIG_END -#define CAN09_X1_CLOCK XTAL(22'118'400) /* UKI 22118.40 Khz */ +#define CAN09_X1_CLOCK 22.1184_MHz_XTAL /* UKI 22118.40 Khz */ #define CAN09_CPU_CLOCK (CAN09_X1_CLOCK / 16) /* ~1.38MHz Divider needs to be check but is the most likelly */ MACHINE_CONFIG_START(can09_state::can09) MCFG_DEVICE_ADD("maincpu", MC6809E, CAN09_CPU_CLOCK) // MC68A09EP @@ -750,13 +750,13 @@ MACHINE_CONFIG_START(can09_state::can09) /* screen - totally faked value for now */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(50) - MCFG_SCREEN_RAW_PARAMS(XTAL(4'000'000)/2, 512, 0, 512, 576, 0, 576) + MCFG_SCREEN_RAW_PARAMS(4_MHz_XTAL / 2, 512, 0, 512, 576, 0, 576) MCFG_SCREEN_UPDATE_DRIVER(can09_state, screen_update) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD_MONOCHROME("palette") /* Floppy */ - MCFG_WD1770_ADD("wd1770", XTAL(8'000'000) ) // TODO: Verify 8MHz UKI crystal assumed to be used + MCFG_DEVICE_ADD("wd1770", WD1770, 8_MHz_XTAL) // TODO: Verify 8MHz UKI crystal assumed to be used #if 0 MCFG_FLOPPY_DRIVE_ADD("wd1770:0", candela_floppies, "3dd", floppy_image_device::default_floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop3_list", "candela") diff --git a/src/mame/drivers/ccs2810.cpp b/src/mame/drivers/ccs2810.cpp index ef7188be52c..1a53b57a487 100644 --- a/src/mame/drivers/ccs2810.cpp +++ b/src/mame/drivers/ccs2810.cpp @@ -905,7 +905,7 @@ static void ccs_floppies(device_slot_interface &device) MACHINE_CONFIG_START(ccs_state::ccs2810) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(ccs2810_mem) MCFG_DEVICE_IO_MAP(ccs2810_io) @@ -913,7 +913,7 @@ MACHINE_CONFIG_START(ccs_state::ccs2810) MCFG_RAM_DEFAULT_SIZE("64K") /* Devices */ - MCFG_DEVICE_ADD("ins8250", INS8250, XTAL(1'843'200)) + MCFG_DEVICE_ADD("ins8250", INS8250, 1.8432_MHz_XTAL) MCFG_INS8250_OUT_TX_CB(WRITELINE("rs232", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(WRITELINE("rs232", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(WRITELINE("rs232", rs232_port_device, write_rts)) @@ -929,7 +929,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(ccs_state::ccs2422) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(ccs2810_mem) MCFG_DEVICE_IO_MAP(ccs2422_io) @@ -937,7 +937,7 @@ MACHINE_CONFIG_START(ccs_state::ccs2422) MCFG_RAM_DEFAULT_SIZE("64K") /* Devices */ - MCFG_DEVICE_ADD("ins8250", INS8250, XTAL(1'843'200)) + MCFG_DEVICE_ADD("ins8250", INS8250, 1.8432_MHz_XTAL) MCFG_INS8250_OUT_TX_CB(WRITELINE("rs232", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(WRITELINE("rs232", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(WRITELINE("rs232", rs232_port_device, write_rts)) @@ -950,7 +950,7 @@ MACHINE_CONFIG_START(ccs_state::ccs2422) MCFG_RS232_DSR_HANDLER(WRITELINE("ins8250", ins8250_device, dsr_w)) MCFG_RS232_CTS_HANDLER(WRITELINE("ins8250", ins8250_device, cts_w)) - MCFG_MB8877_ADD("fdc", XTAL(16'000'000) / 8) // UB1793 or MB8877 + MCFG_DEVICE_ADD("fdc", MB8877, 16_MHz_XTAL / 8) // UB1793 or MB8877 MCFG_FLOPPY_DRIVE_ADD("fdc:0", ccs_floppies, "8sssd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp index 3f88a2f9604..c0348a743a6 100644 --- a/src/mame/drivers/cmi.cpp +++ b/src/mame/drivers/cmi.cpp @@ -123,10 +123,10 @@ #include "speaker.h" -#define Q209_CPU_CLOCK XTAL(40'210'000) / 40 // divider not verified (very complex circuit) +#define Q209_CPU_CLOCK 40.21_MHz_XTAL / 40 // divider not verified (very complex circuit) #define M6809_CLOCK 8000000 // wrong -#define MASTER_OSCILLATOR XTAL(34'291'712) +#define MASTER_OSCILLATOR 34.291712_MHz_XTAL #define CPU_1 0 #define CPU_2 1 @@ -142,7 +142,7 @@ #define PAGE_MASK (PAGE_SIZE - 1) #define PAGE_SHIFT 5 -#define PIXEL_CLOCK XTAL(10'380'000) +#define PIXEL_CLOCK 10.38_MHz_XTAL #define HTOTAL 672 #define HBLANK_END 0 #define HBLANK_START 512 @@ -2183,14 +2183,14 @@ MACHINE_CONFIG_START(cmi_state::cmi2x) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cmi_state, cpu2_interrupt_callback) MCFG_QUANTUM_PERFECT_CPU("maincpu2") - MCFG_DEVICE_ADD("muskeys", M6802, XTAL(4'000'000)) + MCFG_DEVICE_ADD("muskeys", M6802, 4_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(muskeys_map) - MCFG_DEVICE_ADD("alphakeys", M6802, XTAL(3'840'000)) + MCFG_DEVICE_ADD("alphakeys", M6802, 3.84_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(alphakeys_map) - MCFG_DEVICE_PERIODIC_INT_DRIVER(cmi_state, irq0_line_hold, XTAL(3'840'000) / 400) // TODO: PIA controls this + MCFG_DEVICE_PERIODIC_INT_DRIVER(cmi_state, irq0_line_hold, 3.84_MHz_XTAL / 400) // TODO: PIA controls this - MCFG_DEVICE_ADD("smptemidi", M68000, XTAL(20'000'000) / 2) + MCFG_DEVICE_ADD("smptemidi", M68000, 20_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(midicpu_map) MCFG_DEVICE_ADD("cmi07cpu", MC6809E, Q209_CPU_CLOCK) // ? @@ -2212,7 +2212,7 @@ MACHINE_CONFIG_START(cmi_state::cmi2x) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_MSM5832_ADD("msm5832", XTAL(32'768)) + MCFG_DEVICE_ADD("msm5832", MSM5832, 32.768_kHz_XTAL) MCFG_DEVICE_ADD("i8214_1", I8214, 1000000) // cmi_8214_intf_1 MCFG_I8214_INT_CALLBACK(WRITELINE(*this, cmi_state, i8214_1_int_w)) @@ -2251,30 +2251,30 @@ MACHINE_CONFIG_START(cmi_state::cmi2x) MCFG_PTM6840_O2_CB(WRITELINE(*this, cmi_state, cmi02_ptm_o2)) MCFG_PTM6840_IRQ_CB(WRITELINE(*this, cmi_state, cmi02_ptm_irq)) - MCFG_DEVICE_ADD("mkbd_acia_clock", CLOCK, XTAL(1'843'200) / 12) + MCFG_DEVICE_ADD("mkbd_acia_clock", CLOCK, 1.8432_MHz_XTAL / 12) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, cmi_state, mkbd_acia_clock)) - MCFG_DEVICE_ADD("q133_acia_0", MOS6551, XTAL(1'843'200)) - MCFG_MOS6551_XTAL(XTAL(1'843'200)) + MCFG_DEVICE_ADD("q133_acia_0", MOS6551, 1.8432_MHz_XTAL) + MCFG_MOS6551_XTAL(1.8432_MHz_XTAL) MCFG_MOS6551_IRQ_HANDLER(WRITELINE("q133_acia_irq", input_merger_device, in_w<0>)) - MCFG_DEVICE_ADD("q133_acia_1", MOS6551, XTAL(1'843'200)) - MCFG_MOS6551_XTAL(XTAL(1'843'200)) + MCFG_DEVICE_ADD("q133_acia_1", MOS6551, 1.8432_MHz_XTAL) + MCFG_MOS6551_XTAL(1.8432_MHz_XTAL) MCFG_MOS6551_IRQ_HANDLER(WRITELINE("q133_acia_irq", input_merger_device, in_w<1>)) - MCFG_DEVICE_ADD("q133_acia_2", MOS6551, XTAL(1'843'200)) - MCFG_MOS6551_XTAL(XTAL(1'843'200)) + MCFG_DEVICE_ADD("q133_acia_2", MOS6551, 1.8432_MHz_XTAL) + MCFG_MOS6551_XTAL(1.8432_MHz_XTAL) MCFG_MOS6551_IRQ_HANDLER(WRITELINE("q133_acia_irq", input_merger_device, in_w<2>)) - MCFG_DEVICE_ADD("q133_acia_3", MOS6551, XTAL(1'843'200)) - MCFG_MOS6551_XTAL(XTAL(1'843'200)) + MCFG_DEVICE_ADD("q133_acia_3", MOS6551, 1.8432_MHz_XTAL) + MCFG_MOS6551_XTAL(1.8432_MHz_XTAL) MCFG_MOS6551_IRQ_HANDLER(WRITELINE("q133_acia_irq", input_merger_device, in_w<3>)) MCFG_INPUT_MERGER_ANY_HIGH("q133_acia_irq") MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, cmi_state, q133_acia_irq)) - MCFG_DEVICE_ADD("acia_mkbd_kbd", ACIA6850, XTAL(1'843'200) / 12) // acia_mkbd_kbd - MCFG_DEVICE_ADD("acia_mkbd_cmi", ACIA6850, XTAL(1'843'200) / 12) // acia_mkbd_cmi + MCFG_DEVICE_ADD("acia_mkbd_kbd", ACIA6850, 1.8432_MHz_XTAL / 12) // acia_mkbd_kbd + MCFG_DEVICE_ADD("acia_mkbd_cmi", ACIA6850, 1.8432_MHz_XTAL / 12) // acia_mkbd_cmi MCFG_DEVICE_ADD("ank_pia", PIA6821, 0) // pia_ank_config MCFG_DEVICE_MODIFY("q133_acia_0") @@ -2308,7 +2308,7 @@ MACHINE_CONFIG_START(cmi_state::cmi2x) MCFG_DEVICE_ADD("cmi07_ptm", PTM6840, 2000000) // ptm_cmi07_config TODO MCFG_PTM6840_IRQ_CB(WRITELINE(*this, cmi_state, cmi07_irq)) - MCFG_FD1791_ADD("wd1791", XTAL(16'000'000) / 8) // wd1791_interface + MCFG_DEVICE_ADD("wd1791", FD1791, 16_MHz_XTAL / 8) // wd1791_interface MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, cmi_state, wd1791_irq)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, cmi_state, wd1791_drq)) MCFG_FLOPPY_DRIVE_ADD("wd1791:0", cmi2x_floppies, "8dsdd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/dgn_beta.cpp b/src/mame/drivers/dgn_beta.cpp index f664ed16dff..d2b02f28f82 100644 --- a/src/mame/drivers/dgn_beta.cpp +++ b/src/mame/drivers/dgn_beta.cpp @@ -372,7 +372,7 @@ MACHINE_CONFIG_START(dgn_beta_state::dgnbeta) MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, dgn_beta_state, d_pia2_irq_a)) MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, dgn_beta_state, d_pia2_irq_b)) - MCFG_WD2797_ADD(FDC_TAG, XTAL(1'000'000)) + MCFG_DEVICE_ADD(FDC_TAG, WD2797, 1_MHz_XTAL) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, dgn_beta_state, dgnbeta_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, dgn_beta_state, dgnbeta_fdc_drq_w)) @@ -385,7 +385,7 @@ MACHINE_CONFIG_START(dgn_beta_state::dgnbeta) MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":3", dgnbeta_floppies, nullptr, dgn_beta_state::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) - MCFG_MC6845_ADD("crtc", HD6845, "screen", XTAL(12'288'000) / 16) //XTAL is guessed + MCFG_MC6845_ADD("crtc", HD6845, "screen", 12.288_MHz_XTAL / 16) //XTAL is guessed MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(16) /*?*/ MCFG_MC6845_UPDATE_ROW_CB(dgn_beta_state, crtc_update_row) diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp index cbd6aac265a..258f1350cc7 100644 --- a/src/mame/drivers/dmax8000.cpp +++ b/src/mame/drivers/dmax8000.cpp @@ -151,17 +151,17 @@ static void floppies(device_slot_interface &device) MACHINE_CONFIG_START(dmax8000_state::dmax8000) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000) ) // no idea what crystal is used, but 4MHz clock is confirmed + MCFG_DEVICE_ADD("maincpu", Z80, 4'000'000) // no idea what crystal is used, but 4MHz clock is confirmed MCFG_DEVICE_PROGRAM_MAP(dmax8000_mem) MCFG_DEVICE_IO_MAP(dmax8000_io) MCFG_MACHINE_RESET_OVERRIDE(dmax8000_state, dmax8000) - MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(4'000'000) / 2) // 2MHz + MCFG_DEVICE_ADD("ctc_clock", CLOCK, 4'000'000 / 2) // 2MHz MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg2)) - MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000)) + MCFG_DEVICE_ADD("ctc", Z80CTC, 4'000'000) MCFG_Z80CTC_ZC0_CB(WRITELINE("dart1", z80dart_device, rxca_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart1", z80dart_device, txca_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart2", z80dart_device, rxca_w)) @@ -169,7 +169,7 @@ MACHINE_CONFIG_START(dmax8000_state::dmax8000) MCFG_Z80CTC_ZC1_CB(WRITELINE("dart2", z80dart_device, rxtxcb_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE("dart1", z80dart_device, rxtxcb_w)) - MCFG_DEVICE_ADD("dart1", Z80DART, XTAL(4'000'000)) // A = terminal; B = aux + MCFG_DEVICE_ADD("dart1", Z80DART, 4'000'000) // A = terminal; B = aux MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd)) MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr)) MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts)) @@ -180,15 +180,15 @@ MACHINE_CONFIG_START(dmax8000_state::dmax8000) MCFG_RS232_RI_HANDLER(WRITELINE("dart1", z80dart_device, ria_w)) MCFG_RS232_CTS_HANDLER(WRITELINE("dart1", z80dart_device, ctsa_w)) - MCFG_DEVICE_ADD("dart2", Z80DART, XTAL(4'000'000)) // RS232 ports + MCFG_DEVICE_ADD("dart2", Z80DART, 4'000'000) // RS232 ports - MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(4'000'000)) + MCFG_DEVICE_ADD("pio1", Z80PIO, 4'000'000) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, dmax8000_state, port0c_w)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, dmax8000_state, port0d_w)) - MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL(4'000'000)) + MCFG_DEVICE_ADD("pio2", Z80PIO, 4'000'000) - MCFG_FD1793_ADD("fdc", XTAL(2'000'000)) // no idea + MCFG_DEVICE_ADD("fdc", FD1793, 2'000'000) // no idea MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, dmax8000_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", floppies, "8dsdd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/dragon.cpp b/src/mame/drivers/dragon.cpp index 3093768247e..87dfef84a0f 100644 --- a/src/mame/drivers/dragon.cpp +++ b/src/mame/drivers/dragon.cpp @@ -189,7 +189,7 @@ static void dragon_alpha_floppies(device_slot_interface &device) MACHINE_CONFIG_START(dragon_state::dragon_base) MCFG_DEVICE_MODIFY(":") - MCFG_DEVICE_CLOCK(XTAL(14'218'000) / 16) + MCFG_DEVICE_CLOCK(14.218_MHz_XTAL / 16) // basic machine hardware MCFG_DEVICE_ADD("maincpu", MC6809E, DERIVED_CLOCK(1, 1)) @@ -214,7 +214,7 @@ MACHINE_CONFIG_START(dragon_state::dragon_base) MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, coco_state, pia1_firq_a)) MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, coco_state, pia1_firq_b)) - MCFG_SAM6883_ADD(SAM_TAG, XTAL(14'218'000), MAINCPU_TAG, AS_PROGRAM) + MCFG_SAM6883_ADD(SAM_TAG, 14.218_MHz_XTAL, MAINCPU_TAG, AS_PROGRAM) MCFG_SAM6883_RES_CALLBACK(READ8(*this, dragon_state, sam_read)) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_FORMATS(coco_cassette_formats) @@ -226,7 +226,7 @@ MACHINE_CONFIG_START(dragon_state::dragon_base) // video hardware MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, VDG_TAG) - MCFG_DEVICE_ADD(VDG_TAG, MC6847_PAL, XTAL(4'433'619)) + MCFG_DEVICE_ADD(VDG_TAG, MC6847_PAL, 4.433619_MHz_XTAL) MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(*this, dragon_state, horizontal_sync)) MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(*this, dragon_state, field_sync)) MCFG_MC6847_INPUT_CALLBACK(READ8(SAM_TAG, sam6883_device, display_read)) @@ -272,7 +272,7 @@ MACHINE_CONFIG_START(dragon64_state::dragon64) // acia MCFG_DEVICE_ADD("acia", MOS6551, 0) - MCFG_MOS6551_XTAL(XTAL(1'843'200)) + MCFG_MOS6551_XTAL(1.8432_MHz_XTAL) // software lists MCFG_SOFTWARE_LIST_ADD("dragon_flex_list", "dragon_flex") @@ -307,7 +307,7 @@ MACHINE_CONFIG_START(d64plus_state::d64plus) MCFG_PALETTE_ADD_MONOCHROME("palette") // crtc - MCFG_MC6845_ADD("crtc", HD6845, "plus_screen", XTAL(14'218'000)/4/2) + MCFG_MC6845_ADD("crtc", HD6845, "plus_screen", 14.218_MHz_XTAL / 4 / 2) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(d64plus_state, crtc_update_row) @@ -327,10 +327,10 @@ MACHINE_CONFIG_START(dragon_alpha_state::dgnalpha) // acia MCFG_DEVICE_ADD("acia", MOS6551, 0) - MCFG_MOS6551_XTAL(XTAL(1'843'200)) + MCFG_MOS6551_XTAL(1.8432_MHz_XTAL) // floppy - MCFG_WD2797_ADD(WD2797_TAG, XTAL(1'000'000)) + MCFG_DEVICE_ADD(WD2797_TAG, WD2797, 1_MHz_XTAL) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, dragon_alpha_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, dragon_alpha_state, fdc_drq_w)) @@ -364,7 +364,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dragon64_state::tanodr64) dragon64(config); MCFG_DEVICE_MODIFY(":") - MCFG_DEVICE_CLOCK(XTAL(14'318'181) / 4) + MCFG_DEVICE_CLOCK(14.318181_MHz_XTAL / 4) // video hardware MCFG_SCREEN_MODIFY(SCREEN_TAG) diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp index 648cb61afa1..595f5b08bab 100644 --- a/src/mame/drivers/einstein.cpp +++ b/src/mame/drivers/einstein.cpp @@ -41,8 +41,8 @@ #define VERBOSE_KEYBOARD 0 #define VERBOSE_DISK 0 -#define XTAL_X001 XTAL(10'738'635) -#define XTAL_X002 XTAL(8'000'000) +#define XTAL_X001 10.738635_MHz_XTAL +#define XTAL_X002 8_MHz_XTAL #define IC_I001 "i001" /* Z8400A */ #define IC_I030 "i030" /* AY-3-8910 */ @@ -614,7 +614,7 @@ MACHINE_CONFIG_START(einstein_state::einstein) MCFG_Z80DAISY_GENERIC_INT_CB(WRITELINE(*this, einstein_state, int_w<4>)) /* video hardware */ - MCFG_DEVICE_ADD("vdp", TMS9129, XTAL(10'738'635) / 2) + MCFG_DEVICE_ADD("vdp", TMS9129, 10.738635_MHz_XTAL / 2) MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k RAM, provided by IC i040 and i041 MCFG_TMS9928A_SET_SCREEN("screen") MCFG_TMS9928A_SCREEN_ADD_PAL("screen") @@ -658,7 +658,7 @@ MACHINE_CONFIG_START(einstein_state::einstein) MCFG_RS232_CTS_HANDLER(WRITELINE(IC_I060, i8251_device, write_cts)) // floppy - MCFG_WD1770_ADD(IC_I042, XTAL_X002) + MCFG_DEVICE_ADD(IC_I042, WD1770, XTAL_X002) MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":0", einstein_floppies, "3ss", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":1", einstein_floppies, "3ss", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp index 28b535b0973..9afc899ffed 100644 --- a/src/mame/drivers/enmirage.cpp +++ b/src/mame/drivers/enmirage.cpp @@ -238,7 +238,7 @@ MACHINE_CONFIG_START(enmirage_state::mirage) MCFG_DEVICE_ADD("acia6850", ACIA6850, 0) MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE)) - MCFG_WD1772_ADD("wd1772", 8000000) + MCFG_DEVICE_ADD("wd1772", WD1772, 8000000) MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_WD_FDC_DRQ_CALLBACK(INPUTLINE("maincpu", M6809_IRQ_LINE)) diff --git a/src/mame/drivers/esq1.cpp b/src/mame/drivers/esq1.cpp index 4b843e36ea7..d1e3b9a95d9 100644 --- a/src/mame/drivers/esq1.cpp +++ b/src/mame/drivers/esq1.cpp @@ -631,7 +631,7 @@ MACHINE_CONFIG_START(esq1_state::sq80) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(sq80_map) - MCFG_WD1772_ADD(WD1772_TAG, 4000000) + MCFG_DEVICE_ADD(WD1772_TAG, WD1772, 4000000) MACHINE_CONFIG_END static INPUT_PORTS_START( esq1 ) diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp index a9f05545702..e6672432911 100644 --- a/src/mame/drivers/esq5505.cpp +++ b/src/mame/drivers/esq5505.cpp @@ -616,11 +616,11 @@ INPUT_CHANGED_MEMBER(esq5505_state::key_stroke) #endif MACHINE_CONFIG_START(esq5505_state::vfx) - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000)) + MCFG_DEVICE_ADD("maincpu", M68000, 10_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(vfx_map) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(esq5505_state,maincpu_irq_acknowledge_callback) - MCFG_DEVICE_ADD("esp", ES5510, XTAL(10'000'000)) + MCFG_DEVICE_ADD("esp", ES5510, 10_MHz_XTAL) MCFG_DEVICE_DISABLE() MCFG_ESQPANEL2X40_VFX_ADD("panel") @@ -642,11 +642,11 @@ MACHINE_CONFIG_START(esq5505_state::vfx) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, XTAL(10'000'000) / (16 * 21)) + MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, 10_MHz_XTAL / (16 * 21)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) - MCFG_DEVICE_ADD("otis", ES5505, XTAL(10'000'000)) + MCFG_DEVICE_ADD("otis", ES5505, 10_MHz_XTAL) MCFG_ES5505_REGION0("waverom") /* Bank 0 */ MCFG_ES5505_REGION1("waverom2") /* Bank 1 */ MCFG_ES5505_CHANNELS(4) /* channels */ @@ -672,7 +672,7 @@ MACHINE_CONFIG_START(esq5505_state::eps) MCFG_ESQPANEL_TX_CALLBACK(WRITELINE("duart", mc68681_device, rx_b_w)) MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(*this, esq5505_state, analog_w)) - MCFG_WD1772_ADD("wd1772", 8000000) + MCFG_DEVICE_ADD("wd1772", WD1772, 8000000) MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", esq5505_state::floppy_formats) MCFG_DEVICE_ADD("mc68450", HD63450, 0) // MC68450 compatible @@ -687,20 +687,20 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(esq5505_state::vfxsd) vfx(config); - MCFG_DEVICE_MODIFY( "maincpu" ) + MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(vfxsd_map) - MCFG_WD1772_ADD("wd1772", 8000000) + MCFG_DEVICE_ADD("wd1772", WD1772, 8000000) MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", esq5505_state::floppy_formats) MACHINE_CONFIG_END // 32-voice machines with the VFX-SD type config MACHINE_CONFIG_START(esq5505_state::vfx32) - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(30'476'100) / 2) + MCFG_DEVICE_ADD("maincpu", M68000, 30.4761_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(vfxsd_map) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(esq5505_state,maincpu_irq_acknowledge_callback) - MCFG_DEVICE_ADD("esp", ES5510, XTAL(10'000'000)) + MCFG_DEVICE_ADD("esp", ES5510, 10_MHz_XTAL) MCFG_DEVICE_DISABLE() MCFG_ESQPANEL2X40_VFX_ADD("panel") @@ -722,11 +722,11 @@ MACHINE_CONFIG_START(esq5505_state::vfx32) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, XTAL(30'476'100) / (2 * 16 * 32)) + MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, 30.4761_MHz_XTAL / (2 * 16 * 32)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) - MCFG_DEVICE_ADD("otis", ES5505, XTAL(30'476'100) / 2) + MCFG_DEVICE_ADD("otis", ES5505, 30.4761_MHz_XTAL / 2) MCFG_ES5505_REGION0("waverom") /* Bank 0 */ MCFG_ES5505_REGION1("waverom2") /* Bank 1 */ MCFG_ES5505_CHANNELS(4) /* channels */ @@ -741,7 +741,7 @@ MACHINE_CONFIG_START(esq5505_state::vfx32) MCFG_SOUND_ROUTE(6, "pump", 1.0, 6) MCFG_SOUND_ROUTE(7, "pump", 1.0, 7) - MCFG_WD1772_ADD("wd1772", 8000000) + MCFG_DEVICE_ADD("wd1772", WD1772, 8000000) MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", esq5505_state::floppy_formats) MACHINE_CONFIG_END diff --git a/src/mame/drivers/eurocom2.cpp b/src/mame/drivers/eurocom2.cpp index ae97a83a487..fdee643cd01 100644 --- a/src/mame/drivers/eurocom2.cpp +++ b/src/mame/drivers/eurocom2.cpp @@ -434,11 +434,11 @@ static void eurocom_floppies(device_slot_interface &device) } MACHINE_CONFIG_START(eurocom2_state::eurocom2) - MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(10'717'200)/2) // EXTAL = CLK/2 = 5.3586 MHz; Q = E = 1.33965 MHz + MCFG_DEVICE_ADD("maincpu", MC6809, 10.7172_MHz_XTAL / 2) // EXTAL = CLK/2 = 5.3586 MHz; Q = E = 1.33965 MHz MCFG_DEVICE_PROGRAM_MAP(eurocom2_map) MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) - MCFG_SCREEN_RAW_PARAMS(XTAL(10'717'200), VC_TOTAL_HORZ, 0, VC_DISP_HORZ, VC_TOTAL_VERT, 0, VC_DISP_VERT) + MCFG_SCREEN_RAW_PARAMS(10.7172_MHz_XTAL, VC_TOTAL_HORZ, 0, VC_DISP_HORZ, VC_TOTAL_VERT, 0, VC_DISP_VERT) MCFG_SCREEN_UPDATE_DRIVER(eurocom2_state, screen_update) MCFG_SCREEN_PALETTE("palette") @@ -468,7 +468,7 @@ MACHINE_CONFIG_START(eurocom2_state::eurocom2) MCFG_RS232_RXD_HANDLER(WRITELINE ("acia", acia6850_device, write_rxd)) MCFG_RS232_CTS_HANDLER(WRITELINE ("acia", acia6850_device, write_cts)) - MCFG_FD1793_ADD("fdc", XTAL(2'000'000)/2) + MCFG_DEVICE_ADD("fdc", FD1793, 2_MHz_XTAL / 2) // MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", M6809_IRQ_LINE)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", eurocom_floppies, "525qd", eurocom2_state::floppy_formats) // MCFG_FLOPPY_DRIVE_SOUND(true) diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp index 1d0aee2ebd0..e28516c376a 100644 --- a/src/mame/drivers/excali64.cpp +++ b/src/mame/drivers/excali64.cpp @@ -551,7 +551,7 @@ MC6845_UPDATE_ROW( excali64_state::update_row ) MACHINE_CONFIG_START(excali64_state::excali64) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(mem_map) MCFG_DEVICE_IO_MAP(io_map) @@ -562,13 +562,13 @@ MACHINE_CONFIG_START(excali64_state::excali64) //MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts)) MCFG_DEVICE_ADD("pit", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL(16'000'000) / 16) /* Timer 0: tone gen for speaker */ + MCFG_PIT8253_CLK0(16_MHz_XTAL / 16) /* Timer 0: tone gen for speaker */ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("speaker", speaker_sound_device, level_w)) - //MCFG_PIT8253_CLK1(XTAL(16'000'000) / 16) /* Timer 1: baud rate gen for 8251 */ + //MCFG_PIT8253_CLK1(16_MHz_XTAL / 16) /* Timer 1: baud rate gen for 8251 */ //MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, excali64_state, write_uart_clock)) - //MCFG_PIT8253_CLK2(XTAL(16'000'000) / 16) /* Timer 2: not used */ + //MCFG_PIT8253_CLK2(16_MHz_XTAL / 16) /* Timer 2: not used */ - MCFG_DEVICE_ADD("ppi", I8255A, 0 ) + MCFG_DEVICE_ADD("ppi", I8255A, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) // parallel port MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, excali64_state, ppib_w)) MCFG_I8255_IN_PORTC_CB(READ8(*this, excali64_state, ppic_r)) @@ -589,7 +589,7 @@ MACHINE_CONFIG_START(excali64_state::excali64) MCFG_PALETTE_ADD("palette", 40) MCFG_PALETTE_INIT_OWNER(excali64_state, excali64) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_excali64) - MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(16'000'000) / 16) // 1MHz for lowres; 2MHz for highres + MCFG_MC6845_ADD("crtc", MC6845, "screen", 16_MHz_XTAL / 16) // 1MHz for lowres; 2MHz for highres MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(excali64_state, update_row) @@ -599,14 +599,14 @@ MACHINE_CONFIG_START(excali64_state::excali64) /* Devices */ MCFG_CASSETTE_ADD( "cassette" ) - MCFG_WD2793_ADD("fdc", XTAL(16'000'000) / 16) + MCFG_DEVICE_ADD("fdc", WD2793, 16_MHz_XTAL / 16) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("dma", z80dma_device, rdy_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", excali64_floppies, "525qd", excali64_state::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", excali64_floppies, "525qd", excali64_state::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) - MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD("dma", Z80DMA, 16_MHz_XTAL / 4) MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, excali64_state, busreq_w)) MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, excali64_state, memory_read_byte)) MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, excali64_state, memory_write_byte)) diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp index f7a80cb4a5a..eb5f21c793d 100644 --- a/src/mame/drivers/fm7.cpp +++ b/src/mame/drivers/fm7.cpp @@ -2068,18 +2068,18 @@ MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000) MACHINE_CONFIG_START(fm7_state::fm7) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(16'128'000) / 2) + MCFG_DEVICE_ADD("maincpu", MC6809, 16.128_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(fm7_mem) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack) MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_DEVICE_ADD("sub", MC6809, XTAL(16'128'000) / 2) + MCFG_DEVICE_ADD("sub", MC6809, 16.128_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(fm7_sub_mem) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack) MCFG_QUANTUM_PERFECT_CPU("sub") SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("psg", AY8910, XTAL(4'915'200) / 4) + MCFG_DEVICE_ADD("psg", AY8910, 4.9152_MHz_XTAL / 4) MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 1.00) BEEP(config, "beeper", 1200).add_route(ALL_OUTPUTS, "mono", 0.50); WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); @@ -2088,7 +2088,7 @@ MACHINE_CONFIG_START(fm7_state::fm7) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(16'128'000), 1024, 0, 640, 262, 0, 200) // H = 15.75 KHz, V = 60.1145 Hz + MCFG_SCREEN_RAW_PARAMS(16.128_MHz_XTAL, 1024, 0, 640, 262, 0, 200) // H = 15.75 KHz, V = 60.1145 Hz MCFG_SCREEN_UPDATE_DRIVER(fm7_state, screen_update_fm7) MCFG_PALETTE_ADD_3BIT_BRG("palette") @@ -2100,7 +2100,7 @@ MACHINE_CONFIG_START(fm7_state::fm7) MCFG_SOFTWARE_LIST_ADD("cass_list","fm7_cass") - MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fdc", MB8877, 8_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w)) @@ -2121,12 +2121,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(fm7_state::fm8) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'915'200)) // 1.2MHz 68A09 + MCFG_DEVICE_ADD("maincpu", MC6809, 4.9152_MHz_XTAL) // 1.2MHz 68A09 MCFG_DEVICE_PROGRAM_MAP(fm8_mem) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack) MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_DEVICE_ADD("sub", MC6809, XTAL(16'128'000) / 2) + MCFG_DEVICE_ADD("sub", MC6809, 16.128_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(fm7_sub_mem) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack) MCFG_QUANTUM_PERFECT_CPU("sub") @@ -2139,7 +2139,7 @@ MACHINE_CONFIG_START(fm7_state::fm8) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(16'128'000), 1024, 0, 640, 262, 0, 200) + MCFG_SCREEN_RAW_PARAMS(16.128_MHz_XTAL, 1024, 0, 640, 262, 0, 200) MCFG_SCREEN_UPDATE_DRIVER(fm7_state, screen_update_fm7) MCFG_PALETTE_ADD_3BIT_BRG("palette") @@ -2149,7 +2149,7 @@ MACHINE_CONFIG_START(fm7_state::fm8) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("fm7_cass") - MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fdc", MB8877, 8_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w)) @@ -2167,18 +2167,18 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(fm7_state::fm77av) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(16'128'000) / 8) + MCFG_DEVICE_ADD("maincpu", MC6809E, 16.128_MHz_XTAL / 8) MCFG_DEVICE_PROGRAM_MAP(fm77av_mem) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack) MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_DEVICE_ADD("sub", MC6809E, XTAL(16'128'000) / 8) + MCFG_DEVICE_ADD("sub", MC6809E, 16.128_MHz_XTAL / 8) MCFG_DEVICE_PROGRAM_MAP(fm77av_sub_mem) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack) MCFG_QUANTUM_PERFECT_CPU("sub") SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ym", YM2203, XTAL(4'915'200) / 4) + MCFG_DEVICE_ADD("ym", YM2203, 4.9152_MHz_XTAL / 4) MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, fm7_state, fm77av_fmirq)) MCFG_AY8910_PORT_A_READ_CB(READ8(*this, fm7_state, fm77av_joy_1_r)) MCFG_AY8910_PORT_B_READ_CB(READ8(*this, fm7_state, fm77av_joy_2_r)) @@ -2207,7 +2207,7 @@ MACHINE_CONFIG_START(fm7_state::fm77av) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(16'128'000), 1024, 0, 640, 262, 0, 200) + MCFG_SCREEN_RAW_PARAMS(16.128_MHz_XTAL, 1024, 0, 640, 262, 0, 200) MCFG_SCREEN_UPDATE_DRIVER(fm7_state, screen_update_fm7) MCFG_PALETTE_ADD_3BIT_BRG("palette") @@ -2220,7 +2220,7 @@ MACHINE_CONFIG_START(fm7_state::fm77av) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_list", "fm7_cass") - MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fdc", MB8877, 8_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w)) @@ -2290,7 +2290,7 @@ MACHINE_CONFIG_START(fm7_state::fm11) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("fm7_cass") - MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fdc", MB8877, 8_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w)) @@ -2336,7 +2336,7 @@ MACHINE_CONFIG_START(fm7_state::fm16beta) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("fm7_cass") - MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fdc", MB8877, 8_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w)) diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp index b02b1919ed6..8ccf053c22b 100644 --- a/src/mame/drivers/fmtowns.cpp +++ b/src/mame/drivers/fmtowns.cpp @@ -2825,7 +2825,7 @@ MACHINE_CONFIG_START(towns_state::towns_base) MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_master", pic8259_device, ir7_w)) MCFG_PIC8259_IN_SP_CB(GND) - MCFG_MB8877_ADD("fdc",XTAL(8'000'000)/4) // clock unknown + MCFG_DEVICE_ADD("fdc", MB8877, 8'000'000 / 4) // clock unknown MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, towns_state,mb8877a_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, towns_state,mb8877a_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", towns_floppies, "35hd", towns_state::floppy_formats) diff --git a/src/mame/drivers/gimix.cpp b/src/mame/drivers/gimix.cpp index e7f1d494444..f36402a961b 100644 --- a/src/mame/drivers/gimix.cpp +++ b/src/mame/drivers/gimix.cpp @@ -448,9 +448,9 @@ INPUT_CHANGED_MEMBER(gimix_state::drive_size_cb) { // set FDC clock based on DIP Switch S2-9 (5.25"/8" drive select) if(m_dma_dip->read() & 0x00000100) - m_fdc->set_unscaled_clock(XTAL(8'000'000) / 4); // 8 inch (2MHz) + m_fdc->set_unscaled_clock(8_MHz_XTAL / 4); // 8 inch (2MHz) else - m_fdc->set_unscaled_clock(XTAL(8'000'000) / 8); // 5.25 inch (1MHz) + m_fdc->set_unscaled_clock(8_MHz_XTAL / 8); // 5.25 inch (1MHz) } void gimix_state::machine_reset() @@ -471,9 +471,9 @@ void gimix_state::machine_reset() // initialise FDC clock based on DIP Switch S2-9 (5.25"/8" drive select) if(m_dma_dip->read() & 0x00000100) - m_fdc->set_unscaled_clock(XTAL(8'000'000) / 4); // 8 inch (2MHz) + m_fdc->set_unscaled_clock(8_MHz_XTAL / 4); // 8 inch (2MHz) else - m_fdc->set_unscaled_clock(XTAL(8'000'000) / 8); // 5.25 inch (1MHz) + m_fdc->set_unscaled_clock(8_MHz_XTAL / 8); // 5.25 inch (1MHz) } void gimix_state::machine_start() @@ -548,19 +548,19 @@ MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000) MACHINE_CONFIG_START(gimix_state::gimix) // basic machine hardware - MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(8'000'000)) + MCFG_DEVICE_ADD("maincpu", MC6809, 8_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(gimix_mem) /* rtc */ - MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768)) + MCFG_DEVICE_ADD("rtc", MM58167, 32.768_kHz_XTAL) MCFG_MM58167_IRQ_CALLBACK(WRITELINE(*this, gimix_state,irq_w)) /* timer */ - MCFG_DEVICE_ADD("timer", PTM6840, XTAL(2'000'000)) // clock is a guess + MCFG_DEVICE_ADD("timer", PTM6840, 2'000'000) // clock is a guess MCFG_PTM6840_IRQ_CB(WRITELINE(*this, gimix_state,irq_w)) // PCB pictures show both the RTC and timer set to generate IRQs (are jumper configurable) /* floppy disks */ - MCFG_FD1797_ADD("fdc",XTAL(8'000'000) / 4) + MCFG_DEVICE_ADD("fdc", FD1797, 8_MHz_XTAL / 4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, gimix_state,fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, gimix_state,fdc_drq_w)) MCFG_WD_FDC_FORCE_READY @@ -568,27 +568,27 @@ MACHINE_CONFIG_START(gimix_state::gimix) MCFG_FLOPPY_DRIVE_ADD("fdc:1", gimix_floppies, "525hd", gimix_state::floppy_formats) /* parallel ports */ - MCFG_DEVICE_ADD("pia1",PIA6821,XTAL(2'000'000)) + MCFG_DEVICE_ADD("pia1", PIA6821, 2'000'000) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, gimix_state,pia_pa_w)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, gimix_state,pia_pb_w)) MCFG_PIA_READPA_HANDLER(READ8(*this, gimix_state,pia_pa_r)) MCFG_PIA_READPB_HANDLER(READ8(*this, gimix_state,pia_pb_r)) - MCFG_DEVICE_ADD("pia2",PIA6821,XTAL(2'000'000)) + MCFG_DEVICE_ADD("pia2", PIA6821, 2'000'000) /* serial ports */ - MCFG_DEVICE_ADD("acia1",ACIA6850,XTAL(2'000'000)) + MCFG_DEVICE_ADD("acia1", ACIA6850, 2'000'000) MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial1",rs232_port_device,write_txd)) MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial1",rs232_port_device,write_rts)) - MCFG_DEVICE_ADD("acia2",ACIA6850,XTAL(2'000'000)) + MCFG_DEVICE_ADD("acia2", ACIA6850, 2'000'000) MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial2",rs232_port_device,write_txd)) MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial2",rs232_port_device,write_rts)) - MCFG_DEVICE_ADD("acia3",ACIA6850,XTAL(2'000'000)) + MCFG_DEVICE_ADD("acia3", ACIA6850, 2'000'000) MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial3",rs232_port_device,write_txd)) MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial3",rs232_port_device,write_rts)) - MCFG_DEVICE_ADD("acia4",ACIA6850,XTAL(2'000'000)) + MCFG_DEVICE_ADD("acia4", ACIA6850, 2'000'000) MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial4",rs232_port_device,write_txd)) MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial4",rs232_port_device,write_rts)) diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp index 55831bc094c..a61013c89a0 100644 --- a/src/mame/drivers/goupil.cpp +++ b/src/mame/drivers/goupil.cpp @@ -38,7 +38,7 @@ #include "logmacro.h" -#define MAIN_CLOCK XTAL(4'000'000) +#define MAIN_CLOCK 4_MHz_XTAL #define VIDEO_CLOCK MAIN_CLOCK / 8 /* 1.75 Mhz */ #define CPU_CLOCK MAIN_CLOCK / 4 /* 1 Mhz */ @@ -562,7 +562,7 @@ MACHINE_CONFIG_START(goupil_g1_state::goupil_g1) MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE)) /* Floppy */ - MCFG_FD1791_ADD("fd1791", XTAL(8'000'000) ) + MCFG_DEVICE_ADD("fd1791", FD1791, 8_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD("fd1791:0", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1791:1", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats) @@ -606,7 +606,7 @@ MACHINE_CONFIG_START(goupil_g2_state::goupil_g2) MCFG_SCREEN_VISIBLE_AREA(0, (80*8)-1, 0, (24*(8+4))-1) MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") - MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(14'318'181)/8) + MCFG_MC6845_ADD("crtc", MC6845, "screen", 14.318181_MHz_XTAL / 8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(goupil_g2_state, crtc_update_row) @@ -624,7 +624,7 @@ MACHINE_CONFIG_START(goupil_g2_state::goupil_g2) MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE)) /* Floppy */ - MCFG_FD1791_ADD("fd1791", XTAL(8'000'000) ) + MCFG_DEVICE_ADD("fd1791", FD1791, 8_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD("fd1791:0", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1791:1", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp index fcdec79f9b3..ad46cbf2c41 100644 --- a/src/mame/drivers/guab.cpp +++ b/src/mame/drivers/guab.cpp @@ -542,7 +542,7 @@ MACHINE_CONFIG_START(guab_state::guab) MCFG_DEVICE_ADD("acia6850_2", ACIA6850, 0) // floppy - MCFG_WD1773_ADD("fdc", 8000000) + MCFG_DEVICE_ADD("fdc", WD1773, 8000000) MCFG_WD_FDC_DRQ_CALLBACK(INPUTLINE("maincpu", 6)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", guab_floppies, "dd", guab_state::floppy_formats) diff --git a/src/mame/drivers/hec2hrp.cpp b/src/mame/drivers/hec2hrp.cpp index 1d92b4396a1..45b88184016 100644 --- a/src/mame/drivers/hec2hrp.cpp +++ b/src/mame/drivers/hec2hrp.cpp @@ -414,7 +414,7 @@ static void minidisc_floppies(device_slot_interface &device) MACHINE_CONFIG_START(hec2hrp_state::hec2hr) /******************************************************************************/ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",Z80, XTAL(5'000'000)) + MCFG_DEVICE_ADD("maincpu", Z80, 5_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(hec2hrp_mem) MCFG_DEVICE_IO_MAP(hec2hrp_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) /* put on the Z80 irq in Hz*/ @@ -449,7 +449,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(hec2hrp_state::hec2hrp) /*****************************************************************************/ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",Z80, XTAL(5'000'000)) + MCFG_DEVICE_ADD("maincpu", Z80, 5_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(hec2hrp_mem) MCFG_DEVICE_IO_MAP(hec2hrp_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) /* put on the Z80 irq in Hz*/ @@ -489,13 +489,13 @@ static void hector_floppies(device_slot_interface &device) MACHINE_CONFIG_START(hec2hrp_state::hec2mx40) /*****************************************************************************/ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",Z80, XTAL(5'000'000)) + MCFG_DEVICE_ADD("maincpu", Z80, 5_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(hec2hrx_mem) MCFG_DEVICE_IO_MAP(hec2mx40_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz /* Disc II unit */ - MCFG_DEVICE_ADD("disc2cpu",Z80, XTAL(4'000'000)) + MCFG_DEVICE_ADD("disc2cpu", Z80, 4_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(hecdisc2_mem) MCFG_DEVICE_IO_MAP(hecdisc2_io) MCFG_UPD765A_ADD("upd765", false, true) @@ -533,7 +533,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(hec2hrp_state::hec2hrx) /*****************************************************************************/ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",Z80, XTAL(5'000'000)) + MCFG_DEVICE_ADD("maincpu", Z80, 5_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(hec2hrx_mem) MCFG_DEVICE_IO_MAP(hec2hrx_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz @@ -541,7 +541,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2hrx) MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx) /* Disc II unit */ - MCFG_DEVICE_ADD("disc2cpu",Z80, XTAL(4'000'000)) + MCFG_DEVICE_ADD("disc2cpu", Z80, 4_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(hecdisc2_mem) MCFG_DEVICE_IO_MAP(hecdisc2_io) MCFG_UPD765A_ADD("upd765", false, true) @@ -578,7 +578,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2mdhrx) /*****************************************************************************/ // minidisc /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",Z80, XTAL(5'000'000)) + MCFG_DEVICE_ADD("maincpu", Z80, 5_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(hec2hrx_mem) MCFG_DEVICE_IO_MAP(hec2mdhrx_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz @@ -586,7 +586,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2mdhrx) MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2mdhrx) /* Mini Disc */ - MCFG_FD1793_ADD("wd179x", XTAL(1'000'000)) + MCFG_DEVICE_ADD("wd179x", FD1793, 1_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD("wd179x:0", minidisc_floppies, "dd", hec2hrp_state::minidisc_formats) @@ -619,7 +619,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(hec2hrp_state::hec2mx80) /*****************************************************************************/ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",Z80, XTAL(5'000'000)) + MCFG_DEVICE_ADD("maincpu", Z80, 5_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(hec2hrx_mem) MCFG_DEVICE_IO_MAP(hec2mx80_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz @@ -627,7 +627,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2mx80) MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx) /* Disc II unit */ - MCFG_DEVICE_ADD("disc2cpu",Z80, XTAL(4'000'000)) + MCFG_DEVICE_ADD("disc2cpu", Z80, 4_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(hecdisc2_mem) MCFG_DEVICE_IO_MAP(hecdisc2_io) MCFG_UPD765A_ADD("upd765", false, true) diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp index d4293f61fa5..e35f7671d0c 100644 --- a/src/mame/drivers/hp64k.cpp +++ b/src/mame/drivers/hp64k.cpp @@ -1409,7 +1409,7 @@ MACHINE_CONFIG_START(hp64k_state::hp64k) MCFG_SCREEN_VISIBLE_AREA(0, 720-1, 0, 390-1) MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") - MCFG_FD1791_ADD("fdc" , XTAL(4'000'000) / 4) + MCFG_DEVICE_ADD("fdc", FD1791, 4_MHz_XTAL / 4) MCFG_WD_FDC_FORCE_READY MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, hp64k_state , hp64k_flp_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, hp64k_state , hp64k_flp_drq_w)) diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp index afb1814a1b9..ed8476ccd5c 100644 --- a/src/mame/drivers/hp_ipc.cpp +++ b/src/mame/drivers/hp_ipc.cpp @@ -737,7 +737,7 @@ static void hp_ipc_floppies(device_slot_interface &device) * 1 Real-time clock */ MACHINE_CONFIG_START(hp_ipc_state::hp_ipc_base) - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(15'920'000) / 2) + MCFG_DEVICE_ADD("maincpu", M68000, 15.92_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(hp_ipc_mem_outer) MCFG_HP1LL3_ADD("gpu") @@ -746,22 +746,22 @@ MACHINE_CONFIG_START(hp_ipc_state::hp_ipc_base) // XXX actual clock is 1MHz; remove this workaround (and change 2000 to 100 in hp_ipc_dsk.cpp) // XXX when floppy code correctly handles 600 rpm drives. - MCFG_WD2797_ADD("fdc", XTAL(2'000'000)) + MCFG_DEVICE_ADD("fdc", WD2797, 2_MHz_XTAL) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, hp_ipc_state, irq_5)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", hp_ipc_floppies, "35dd", hp_ipc_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","hp_ipc") - MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768)) + MCFG_DEVICE_ADD("rtc", MM58167, 32.768_MHz_XTAL) MCFG_MM58167_IRQ_CALLBACK(WRITELINE(*this, hp_ipc_state, irq_1)) // MCFG_MM58167_STANDBY_IRQ_CALLBACK(WRITELINE(*this, hp_ipc_state, irq_6)) - MCFG_DEVICE_ADD("mlc", HP_HIL_MLC, XTAL(15'920'000)/2) + MCFG_DEVICE_ADD("mlc", HP_HIL_MLC, 15.92_MHz_XTAL / 2) MCFG_HP_HIL_INT_CALLBACK(WRITELINE(*this, hp_ipc_state, irq_2)) MCFG_HP_HIL_NMI_CALLBACK(WRITELINE(*this, hp_ipc_state, irq_7)) MCFG_HP_HIL_SLOT_ADD("mlc", "hil1", hp_hil_devices, "hp_ipc_kbd") - MCFG_DEVICE_ADD("hpib" , TMS9914 , XTAL(4000000)) + MCFG_DEVICE_ADD("hpib", TMS9914, 4_MHz_XTAL) MCFG_TMS9914_INT_WRITE_CB(WRITELINE(*this, hp_ipc_state, irq_3)) MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG , ieee488_device , dio_r) , WRITE8(IEEE488_TAG , ieee488_device , dio_w)) MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , eoi_w)) @@ -803,7 +803,7 @@ MACHINE_CONFIG_START(hp_ipc_state::hp_ipc) // ver.period = 16.7ms (~60 hz) MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber()) MCFG_SCREEN_UPDATE_DEVICE("gpu", hp1ll3_device, screen_update) - MCFG_SCREEN_RAW_PARAMS(XTAL(6'000'000) * 2, 720, 0, 512, 278, 0, 256) + MCFG_SCREEN_RAW_PARAMS(6_MHz_XTAL * 2, 720, 0, 512, 278, 0, 256) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("mlc", hp_hil_mlc_device, ap_w)) // XXX actually it's driven by 555 (U59) MCFG_DEFAULT_LAYOUT(layout_lcd) @@ -823,7 +823,7 @@ MACHINE_CONFIG_START(hp_ipc_state::hp9808a) MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber()) MCFG_SCREEN_UPDATE_DEVICE("gpu", hp1ll3_device, screen_update) - MCFG_SCREEN_RAW_PARAMS(XTAL(6'000'000) * 2, 720, 0, 640, 480, 0, 400) + MCFG_SCREEN_RAW_PARAMS(6_MHz_XTAL * 2, 720, 0, 640, 480, 0, 400) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("mlc", hp_hil_mlc_device, ap_w)) MCFG_DEFAULT_LAYOUT(layout_lcd) diff --git a/src/mame/drivers/ht68k.cpp b/src/mame/drivers/ht68k.cpp index 9039cf6bf9f..f7375f1ff62 100644 --- a/src/mame/drivers/ht68k.cpp +++ b/src/mame/drivers/ht68k.cpp @@ -129,11 +129,11 @@ static void ht68k_floppies(device_slot_interface &device) MACHINE_CONFIG_START(ht68k_state::ht68k) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",M68000, XTAL(8'000'000)) + MCFG_DEVICE_ADD("maincpu", M68000, 8_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(ht68k_mem) /* video hardware */ - MCFG_DEVICE_ADD( "duart68681", MC68681, XTAL(8'000'000) / 2 ) + MCFG_DEVICE_ADD("duart68681", MC68681, 8_MHz_XTAL / 2) MCFG_MC68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000) MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, ht68k_state, duart_irq_handler)) MCFG_MC68681_A_TX_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd)) @@ -143,7 +143,7 @@ MACHINE_CONFIG_START(ht68k_state::ht68k) MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(WRITELINE("duart68681", mc68681_device, rx_a_w)) - MCFG_WD1770_ADD("wd1770", XTAL(8'000'000) ) + MCFG_DEVICE_ADD("wd1770", WD1770, 8_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD("wd1770:0", ht68k_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1770:1", ht68k_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp index c060ed9c071..aa8befe2552 100644 --- a/src/mame/drivers/itt3030.cpp +++ b/src/mame/drivers/itt3030.cpp @@ -696,7 +696,7 @@ void itt3030_state::machine_reset() MACHINE_CONFIG_START(itt3030_state::itt3030) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",Z80,XTAL(4'000'000)) + MCFG_DEVICE_ADD("maincpu", Z80, 4_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(itt3030_map) MCFG_DEVICE_IO_MAP(itt3030_io) @@ -705,7 +705,7 @@ MACHINE_CONFIG_START(itt3030_state::itt3030) // bits 0-2 select bit to read back, bits 3-6 choose column to read from, bit 7 clocks the process (rising edge strobes the row, falling edge reads the data) // T0 is the key matrix return // pin 23 is the UPI-41 host IRQ line, it's unknown how it's connected to the Z80 - MCFG_DEVICE_ADD("kbdmcu", I8741, XTAL(6'000'000)) + MCFG_DEVICE_ADD("kbdmcu", I8741, 6_MHz_XTAL) MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, itt3030_state, kbd_matrix_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, itt3030_state, kbd_matrix_w)) MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, itt3030_state, kbd_port2_r)) @@ -728,10 +728,10 @@ MACHINE_CONFIG_START(itt3030_state::itt3030) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(20) MCFG_ADDRESS_MAP_BANK_STRIDE(0xc000) - MCFG_DEVICE_ADD("crt5027", CRT5027, XTAL(6'000'000) / 8) + MCFG_DEVICE_ADD("crt5027", CRT5027, 6_MHz_XTAL / 8) MCFG_TMS9927_CHAR_WIDTH(8) - MCFG_FD1791_ADD("fdc", XTAL(20'000'000) / 20) + MCFG_DEVICE_ADD("fdc", FD1791, 20_MHz_XTAL / 20) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, itt3030_state, fdcirq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, itt3030_state, fdcdrq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, itt3030_state, fdchld_w)) diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp index e5528315443..e7f8c088ab1 100644 --- a/src/mame/drivers/kaypro.cpp +++ b/src/mame/drivers/kaypro.cpp @@ -262,7 +262,7 @@ MACHINE_CONFIG_START(kaypro_state::kayproii) MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("serial", rs232_port_device, write_dtr)) MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("kbd", kaypro_10_keyboard_device, txd_w)) - MCFG_FD1793_ADD("fdc", 20_MHz_XTAL / 20) + MCFG_DEVICE_ADD("fdc", FD1793, 20_MHz_XTAL / 20) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, kaypro_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, kaypro_state, fdc_drq_w)) MCFG_WD_FDC_FORCE_READY @@ -362,7 +362,7 @@ MACHINE_CONFIG_START(kaypro_state::kaypro484) MCFG_COM8116_FT_HANDLER(WRITELINE("sio_2", z80sio_device, rxca_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio_2", z80sio_device, txca_w)) - MCFG_FD1793_ADD("fdc", 16_MHz_XTAL / 16) + MCFG_DEVICE_ADD("fdc", FD1793, 16_MHz_XTAL / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, kaypro_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, kaypro_state, fdc_drq_w)) MCFG_WD_FDC_FORCE_READY diff --git a/src/mame/drivers/lb186.cpp b/src/mame/drivers/lb186.cpp index 5368251f13b..da94d37d489 100644 --- a/src/mame/drivers/lb186.cpp +++ b/src/mame/drivers/lb186.cpp @@ -138,7 +138,7 @@ MACHINE_CONFIG_START(lb186_state::lb186) MCFG_DEVICE_PROGRAM_MAP(lb186_map) MCFG_DEVICE_IO_MAP(lb186_io) - MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400)) + MCFG_DEVICE_ADD("duart", SCN2681, 3.6864_MHz_XTAL) MCFG_MC68681_IRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, int0_w)) MCFG_MC68681_A_TX_CALLBACK(WRITELINE("rs232_1", rs232_port_device, write_txd)) MCFG_MC68681_B_TX_CALLBACK(WRITELINE("rs232_2", rs232_port_device, write_txd)) @@ -149,7 +149,7 @@ MACHINE_CONFIG_START(lb186_state::lb186) MCFG_DEVICE_ADD("rs232_2", RS232_PORT, default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(WRITELINE("duart", scn2681_device, rx_b_w)) - MCFG_WD1772_ADD("fdc", 16_MHz_XTAL / 2) + MCFG_DEVICE_ADD("fdc", WD1772, 16_MHz_XTAL / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, int2_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, drq0_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", lb186_floppies, "525dd", lb186_state::floppy_formats) diff --git a/src/mame/drivers/m20.cpp b/src/mame/drivers/m20.cpp index a62db5f02bd..8073359037c 100644 --- a/src/mame/drivers/m20.cpp +++ b/src/mame/drivers/m20.cpp @@ -121,7 +121,7 @@ public: #define MAIN_CLOCK 4000000 /* 4 MHz */ -#define PIXEL_CLOCK XTAL(4'433'619) +#define PIXEL_CLOCK 4.433619_MHz_XTAL MC6845_UPDATE_ROW( m20_state::update_row ) @@ -810,7 +810,7 @@ MACHINE_CONFIG_START(m20_state::m20) MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ - MCFG_FD1797_ADD("fd1797", 1000000) + MCFG_DEVICE_ADD("fd1797", FD1797, 1000000) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("i8259", pic8259_device, ir0_w)) MCFG_FLOPPY_DRIVE_ADD("fd1797:0", m20_floppies, "5dd", m20_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1797:1", m20_floppies, "5dd", m20_state::floppy_formats) diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp index 9417492d954..2d17ebc680d 100644 --- a/src/mame/drivers/m5.cpp +++ b/src/mame/drivers/m5.cpp @@ -1407,22 +1407,22 @@ void brno_state::machine_reset() MACHINE_CONFIG_START(m5_state::m5) // basic machine hardware - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(14'318'181)/4) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 14.318181_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(m5_mem) MCFG_DEVICE_IO_MAP(m5_io) MCFG_Z80_DAISY_CHAIN(m5_daisy_chain) - MCFG_DEVICE_ADD(Z80_FD5_TAG, Z80, XTAL(14'318'181)/4) + MCFG_DEVICE_ADD(Z80_FD5_TAG, Z80, 14.318181_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(fd5_mem) MCFG_DEVICE_IO_MAP(fd5_io) // sound hardware SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD(SN76489AN_TAG, SN76489A, XTAL(14'318'181)/4) + MCFG_DEVICE_ADD(SN76489AN_TAG, SN76489A, 14.318181_MHz_XTAL / 4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) // devices - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(14'318'181)/4) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 14.318181_MHz_XTAL / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) // CK0 = EXINT, CK1 = GND, CK2 = TCK, CK3 = VDP INT // ZC2 = EXCLK @@ -1471,7 +1471,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(m5_state::ntsc) m5(config); // video hardware - MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 ) + MCFG_DEVICE_ADD( "tms9928a", TMS9928A, 10.738635_MHz_XTAL / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, m5_state, sordm5_video_interrupt_callback)) MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" ) @@ -1486,7 +1486,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(m5_state::pal) m5(config); // video hardware - MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 ) + MCFG_DEVICE_ADD( "tms9928a", TMS9929A, 10.738635_MHz_XTAL / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, m5_state, sordm5_video_interrupt_callback)) MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" ) @@ -1514,7 +1514,7 @@ MACHINE_CONFIG_START(brno_state::brno) MCFG_DEVICE_REMOVE(UPD765_TAG) // video hardware - MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 ) + MCFG_DEVICE_ADD("tms9928a", TMS9929A, 10.738635_MHz_XTAL / 2) MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, m5_state, sordm5_video_interrupt_callback)) MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" ) @@ -1522,7 +1522,7 @@ MACHINE_CONFIG_START(brno_state::brno) // floppy - MCFG_WD2797_ADD(WD2797_TAG, XTAL(1'000'000)) + MCFG_DEVICE_ADD(WD2797_TAG, WD2797, 1_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":0", brno_floppies, "35hd", brno_state::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":1", brno_floppies, "35hd", brno_state::floppy_formats) diff --git a/src/mame/drivers/magnum.cpp b/src/mame/drivers/magnum.cpp index 246f5d6795c..c85055dd0b3 100644 --- a/src/mame/drivers/magnum.cpp +++ b/src/mame/drivers/magnum.cpp @@ -310,7 +310,7 @@ MACHINE_CONFIG_START(magnum_state::magnum) //MCFG_DEVICE_ADD("crtc", I8275, 3000000) // unknown clock - //MCFG_WD1793_ADD("fdc", 1000000) // nothing known, type or if any disks even exist, port 0x44 is possibly motor control + //MCFG_DEVICE_ADD("fdc", WD1793, 1000000) // nothing known, type or if any disks even exist, port 0x44 is possibly motor control MCFG_PALETTE_ADD_MONOCHROME_INVERTED("palette") diff --git a/src/mame/drivers/mbc200.cpp b/src/mame/drivers/mbc200.cpp index 06c2c5e5a56..c9b855c4041 100644 --- a/src/mame/drivers/mbc200.cpp +++ b/src/mame/drivers/mbc200.cpp @@ -302,11 +302,11 @@ GFXDECODE_END MACHINE_CONFIG_START(mbc200_state::mbc200) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",Z80, XTAL(8'000'000)/2) // NEC D780C-1 + MCFG_DEVICE_ADD("maincpu", Z80, 8_MHz_XTAL / 2) // NEC D780C-1 MCFG_DEVICE_PROGRAM_MAP(mbc200_mem) MCFG_DEVICE_IO_MAP(mbc200_io) - MCFG_DEVICE_ADD("subcpu",Z80, XTAL(8'000'000)/2) // NEC D780C-1 + MCFG_DEVICE_ADD("subcpu", Z80, 8_MHz_XTAL / 2) // NEC D780C-1 MCFG_DEVICE_PROGRAM_MAP(mbc200_sub_mem) MCFG_DEVICE_IO_MAP(mbc200_sub_io) @@ -320,7 +320,7 @@ MACHINE_CONFIG_START(mbc200_state::mbc200) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mbc200) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(8'000'000) / 4) // HD46505SP + MCFG_MC6845_ADD("crtc", H46505, "screen", 8_MHz_XTAL / 4) // HD46505SP MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(mbc200_state, update_row) @@ -346,7 +346,7 @@ MACHINE_CONFIG_START(mbc200_state::mbc200) MCFG_DEVICE_ADD("uart2", I8251, 0) // INS8251A - MCFG_MB8876_ADD("fdc", XTAL(8'000'000) / 8) // guess + MCFG_DEVICE_ADD("fdc", MB8876, 8_MHz_XTAL / 8) // guess MCFG_FLOPPY_DRIVE_ADD("fdc:0", mbc200_floppies, "qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", mbc200_floppies, "qd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/mbc55x.cpp b/src/mame/drivers/mbc55x.cpp index 94b2d12832c..9b0f322056b 100644 --- a/src/mame/drivers/mbc55x.cpp +++ b/src/mame/drivers/mbc55x.cpp @@ -250,7 +250,7 @@ MACHINE_CONFIG_START(mbc55x_state::mbc55x) /* video hardware */ MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181),896,0,300,262,0,200) + MCFG_SCREEN_RAW_PARAMS(14.318181_MHz_XTAL, 896, 0, 300, 262, 0, 200) MCFG_SCREEN_UPDATE_DEVICE(VID_MC6845_NAME, mc6845_device, screen_update) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mbc55x_state, screen_vblank_mbc55x)) @@ -290,7 +290,7 @@ MACHINE_CONFIG_START(mbc55x_state::mbc55x) MCFG_I8255_IN_PORTC_CB(READ8(*this, mbc55x_state, mbc55x_ppi_portc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mbc55x_state, mbc55x_ppi_portc_w)) - MCFG_MC6845_ADD(VID_MC6845_NAME, MC6845, SCREEN_TAG, XTAL(14'318'181)/8) + MCFG_MC6845_ADD(VID_MC6845_NAME, MC6845, SCREEN_TAG, 14.318181_MHz_XTAL / 8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(mbc55x_state, crtc_update_row) @@ -298,7 +298,7 @@ MACHINE_CONFIG_START(mbc55x_state::mbc55x) MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, mbc55x_state, vid_vsync_changed)) /* Backing storage */ - MCFG_FD1793_ADD(FDC_TAG, XTAL(1'000'000)) + MCFG_DEVICE_ADD(FDC_TAG, FD1793, 1_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", mbc55x_floppies, "qd", mbc55x_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", mbc55x_floppies, "qd", mbc55x_state::floppy_formats) diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp index ad60406944f..90a372766a1 100644 --- a/src/mame/drivers/mbee.cpp +++ b/src/mame/drivers/mbee.cpp @@ -647,14 +647,14 @@ static void mbee_floppies(device_slot_interface &device) MACHINE_CONFIG_START(mbee_state::mbee) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000) / 6) /* 2 MHz */ + MCFG_DEVICE_ADD("maincpu", Z80, 12_MHz_XTAL / 6) /* 2 MHz */ MCFG_DEVICE_PROGRAM_MAP(mbee_mem) MCFG_DEVICE_IO_MAP(mbee_io) MCFG_Z80_DAISY_CHAIN(mbee_daisy_chain) MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee) - MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(12'000'000) / 6) + MCFG_DEVICE_ADD("z80pio", Z80PIO, 12_MHz_XTAL / 6) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write)) MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, mbee_state, pio_ardy)) @@ -681,7 +681,7 @@ MACHINE_CONFIG_START(mbee_state::mbee) SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); /* devices */ - MCFG_MC6845_ADD("crtc", SY6545_1, "screen", XTAL(12'000'000) / 8) + MCFG_MC6845_ADD("crtc", SY6545_1, "screen", 12_MHz_XTAL / 8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(mbee_state, crtc_update_row) @@ -774,7 +774,8 @@ MACHINE_CONFIG_START(mbee_state::mbeeppc) MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_premium) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(mbee_state, premium) - MCFG_MC146818_ADD( "rtc", XTAL(32'768) ) + + MCFG_DEVICE_ADD("rtc", MC146818, 32.768_kHz_XTAL) MCFG_MC146818_IRQ_HANDLER(WRITELINE(*this, mbee_state, rtc_irq_w)) MACHINE_CONFIG_END @@ -784,7 +785,8 @@ MACHINE_CONFIG_START(mbee_state::mbee56) MCFG_DEVICE_PROGRAM_MAP(mbee56_mem) MCFG_DEVICE_IO_MAP(mbee56_io) MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee56) - MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 2) + + MCFG_DEVICE_ADD("fdc", WD2793, 4_MHz_XTAL / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, mbee_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, mbee_state, fdc_drq_w)) MCFG_WD_FDC_ENMF_CALLBACK(GND) @@ -800,7 +802,8 @@ MACHINE_CONFIG_START(mbee_state::mbee128) MCFG_DEVICE_PROGRAM_MAP(mbee256_mem) MCFG_DEVICE_IO_MAP(mbee128_io) MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee128) - MCFG_MC146818_ADD( "rtc", XTAL(32'768) ) + + MCFG_DEVICE_ADD("rtc", MC146818, 32.768_kHz_XTAL) MCFG_MC146818_IRQ_HANDLER(WRITELINE(*this, mbee_state, rtc_irq_w)) MACHINE_CONFIG_END @@ -810,7 +813,8 @@ MACHINE_CONFIG_START(mbee_state::mbee128p) MCFG_DEVICE_PROGRAM_MAP(mbee256_mem) MCFG_DEVICE_IO_MAP(mbee128_io) MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee128) - MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 2) + + MCFG_DEVICE_ADD("fdc", WD2793, 4_MHz_XTAL / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, mbee_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, mbee_state, fdc_drq_w)) MCFG_WD_FDC_ENMF_CALLBACK(GND) diff --git a/src/mame/drivers/micro20.cpp b/src/mame/drivers/micro20.cpp index 232ead28547..673ae4bd37c 100644 --- a/src/mame/drivers/micro20.cpp +++ b/src/mame/drivers/micro20.cpp @@ -156,26 +156,26 @@ void micro20_state::micro20_map(address_map &map) MACHINE_CONFIG_START(micro20_state::micro20) /* basic machine hardware */ - MCFG_DEVICE_ADD(MAINCPU_TAG, M68020, XTAL(16'670'000)) + MCFG_DEVICE_ADD(MAINCPU_TAG, M68020, 16.67_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(micro20_map) - MCFG_DEVICE_ADD(DUART_A_TAG, MC68681, XTAL(3'686'400)) + MCFG_DEVICE_ADD(DUART_A_TAG, MC68681, 3.6864_MHz_XTAL) MCFG_MC68681_A_TX_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd)) MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(WRITELINE(DUART_A_TAG, mc68681_device, rx_a_w)) - MCFG_DEVICE_ADD(DUART_B_TAG, MC68681, XTAL(3'686'400)) + MCFG_DEVICE_ADD(DUART_B_TAG, MC68681, 3.6864_MHz_XTAL) - MCFG_WD1772_ADD(FDC_TAG, XTAL(16'670'000) / 2) + MCFG_DEVICE_ADD(FDC_TAG, WD1772, 16.67_MHz_XTAL / 2) - MCFG_DEVICE_ADD(PIT_TAG, PIT68230, XTAL(16'670'000) / 2) + MCFG_DEVICE_ADD(PIT_TAG, PIT68230, 16.67_MHz_XTAL / 2) MCFG_PIT68230_TIMER_IRQ_CB(WRITELINE(*this, micro20_state, timerirq_w)) MCFG_PIT68230_H4_CB(WRITELINE(*this, micro20_state, h4_w)) MCFG_PIT68230_PB_OUTPUT_CB(WRITE8(*this, micro20_state, portb_w)) MCFG_PIT68230_PC_OUTPUT_CB(WRITE8(*this, micro20_state, portc_w)) - MCFG_DEVICE_ADD(RTC_TAG, MSM58321, XTAL(32'768)) + MCFG_DEVICE_ADD(RTC_TAG, MSM58321, 32.768_kHz_XTAL) MCFG_MSM58321_DEFAULT_24H(false) MCFG_MSM58321_D0_HANDLER(WRITELINE(PIT_TAG, pit68230_device, pb0_w)) MCFG_MSM58321_D1_HANDLER(WRITELINE(PIT_TAG, pit68230_device, pb1_w)) diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp index 6f73c243584..223f9f45f3b 100644 --- a/src/mame/drivers/msx.cpp +++ b/src/mame/drivers/msx.cpp @@ -1234,7 +1234,7 @@ WRITE_LINE_MEMBER(msx_state::turbo_w) { // 0 - 5.369317 MHz // 1 - 3.579545 MHz - m_maincpu->set_unscaled_clock(state ? XTAL(21'477'272)/6 : XTAL(21'477'272)/4); + m_maincpu->set_unscaled_clock(21.477272_MHz_XTAL / (state ? 6 : 4)); } @@ -1289,7 +1289,7 @@ static void msx_floppies(device_slot_interface &device) } MACHINE_CONFIG_START(msx_state::msx_fd1793) - MCFG_FD1793_ADD("fdc", XTAL(4'000'000) / 4) + MCFG_DEVICE_ADD("fdc", FD1793, 4_MHz_XTAL / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END @@ -1297,19 +1297,19 @@ MACHINE_CONFIG_START(msx_state::msx_wd2793_force_ready) // From NMS8245 schematics: // READY + HLT - pulled high // SSO/-ENMF + -DDEN + ENP + -5/8 - pulled low - MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 4) + MCFG_DEVICE_ADD("fdc", WD2793, 4_MHz_XTAL / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx_wd2793) - MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 4) + MCFG_DEVICE_ADD("fdc", WD2793, 4_MHz_XTAL / 4) MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx_mb8877a) // From CF-3300 FDC schematic: // READY + HLT - pulled high // -DDEN - pulled low - MCFG_MB8877_ADD("fdc", XTAL(4'000'000) / 4) + MCFG_DEVICE_ADD("fdc", MB8877, 4_MHz_XTAL / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END @@ -1318,7 +1318,7 @@ MACHINE_CONFIG_START(msx_state::msx_tc8566af) MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx_microsol) - MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 4) + MCFG_DEVICE_ADD("fdc", WD2793, 4_MHz_XTAL / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END @@ -1336,7 +1336,7 @@ MACHINE_CONFIG_START(msx_state::msx_2_35_dd_drive) MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx_ym2413) - MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(21'477'272)/6) + MCFG_DEVICE_ADD("ym2413", YM2413, 21.477272_MHz_XTAL / 6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) MACHINE_CONFIG_END @@ -1347,7 +1347,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'738'635)/3) /* 3.579545 MHz */ + MCFG_DEVICE_ADD("maincpu", Z80, 10.738635_MHz_XTAL / 3) /* 3.579545 MHz */ MCFG_DEVICE_PROGRAM_MAP(msx_memory_map) MCFG_DEVICE_IO_MAP(msx_io_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", msx_state, msx_interrupt) /* Needed for mouse updates */ @@ -1365,7 +1365,7 @@ MACHINE_CONFIG_START(msx_state::msx) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "speaker", 0.25); - MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(10'738'635)/3/2) + MCFG_DEVICE_ADD("ay8910", AY8910, 10.738635_MHz_XTAL / 3 / 2) MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) MCFG_AY8910_PORT_A_READ_CB(READ8(*this, msx_state, msx_psg_port_a_r)) MCFG_AY8910_PORT_B_READ_CB(READ8(*this, msx_state, msx_psg_port_b_r)) @@ -1397,7 +1397,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx_ntsc) msx(config); /* Video hardware */ - MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 ) + MCFG_DEVICE_ADD( "tms9928a", TMS9928A, 10.738635_MHz_XTAL / 2) MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0)) MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" ) @@ -1408,7 +1408,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx_tms9118) msx(config); /* Video hardware */ - MCFG_DEVICE_ADD( "tms9928a", TMS9118, XTAL(10'738'635) / 2 ) + MCFG_DEVICE_ADD("tms9928a", TMS9118, 10.738635_MHz_XTAL / 2) MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0)) MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" ) @@ -1419,7 +1419,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx_tms9128) msx(config); /* Video hardware */ - MCFG_DEVICE_ADD( "tms9928a", TMS9128, XTAL(10'738'635) / 2 ) + MCFG_DEVICE_ADD("tms9928a", TMS9128, 10.738635_MHz_XTAL / 2) MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0)) MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" ) @@ -1430,7 +1430,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx_tms9918) msx(config); /* Video hardware */ - MCFG_DEVICE_ADD( "tms9928a", TMS9918, XTAL(10'738'635) / 2 ) + MCFG_DEVICE_ADD("tms9928a", TMS9918, 10.738635_MHz_XTAL / 2) MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0)) MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" ) @@ -1441,7 +1441,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx_tms9918a) msx(config); /* Video hardware */ - MCFG_DEVICE_ADD( "tms9928a", TMS9918A, XTAL(10'738'635) / 2 ) + MCFG_DEVICE_ADD("tms9928a", TMS9918A, 10.738635_MHz_XTAL / 2) MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0)) MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" ) @@ -1452,7 +1452,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx_tms9928) msx(config); /* Video hardware */ - MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 ) + MCFG_DEVICE_ADD("tms9928a", TMS9928A, 10.738635_MHz_XTAL / 2) MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0)) MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" ) @@ -1463,7 +1463,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx_pal) msx(config); /* Video hardware */ - MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 ) + MCFG_DEVICE_ADD("tms9928a", TMS9929A, 10.738635_MHz_XTAL / 2) MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0)) MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" ) @@ -1474,7 +1474,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx_tms9129) msx(config); /* Video hardware */ - MCFG_DEVICE_ADD( "tms9928a", TMS9129, XTAL(10'738'635) / 2 ) + MCFG_DEVICE_ADD("tms9928a", TMS9129, 10.738635_MHz_XTAL / 2) MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0)) MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" ) @@ -1485,7 +1485,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx_tms9929) msx(config); /* Video hardware */ - MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 ) + MCFG_DEVICE_ADD("tms9928a", TMS9929A, 10.738635_MHz_XTAL / 2) MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0)) MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" ) @@ -1495,7 +1495,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx2) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(21'477'272)/6) /* 3.579545 MHz */ + MCFG_DEVICE_ADD("maincpu", Z80, 21.477272_MHz_XTAL / 6) /* 3.579545 MHz */ MCFG_DEVICE_PROGRAM_MAP(msx_memory_map) MCFG_DEVICE_IO_MAP(msx2_io_map) MCFG_QUANTUM_TIME(attotime::from_hz(60)) @@ -1506,9 +1506,9 @@ MACHINE_CONFIG_START(msx_state::msx2) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, msx_state, msx_ppi_port_c_w)) /* video hardware */ - MCFG_V9938_ADD("v9938", "screen", 0x20000, XTAL(21'477'272)) + MCFG_V9938_ADD("v9938", "screen", 0x20000, 21.477272_MHz_XTAL) MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(*this, msx_state,msx_irq_source0)) - MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9938", XTAL(21'477'272)) + MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9938", 21.477272_MHz_XTAL) /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1517,7 +1517,7 @@ MACHINE_CONFIG_START(msx_state::msx2) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "speaker", 0.25); - MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(21'477'272)/6/2) + MCFG_DEVICE_ADD("ay8910", AY8910, 21.477272_MHz_XTAL / 6 / 2) MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) MCFG_AY8910_PORT_A_READ_CB(READ8(*this, msx_state, msx_psg_port_a_r)) MCFG_AY8910_PORT_B_READ_CB(READ8(*this, msx_state, msx_psg_port_b_r)) @@ -1542,7 +1542,7 @@ MACHINE_CONFIG_START(msx_state::msx2) MCFG_CASSETTE_INTERFACE("msx_cass") /* real time clock */ - MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768)) + MCFG_DEVICE_ADD("rtc", RP5C01, 32.768_kHz_XTAL) /* Software lists */ MCFG_SOFTWARE_LIST_ADD("cass_list", "msx2_cass") @@ -1552,7 +1552,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx2p) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(21'477'272)/6) /* 3.579545 MHz */ + MCFG_DEVICE_ADD("maincpu", Z80, 21.477272_MHz_XTAL / 6) /* 3.579545 MHz */ MCFG_DEVICE_PROGRAM_MAP(msx_memory_map) MCFG_DEVICE_IO_MAP(msx2p_io_map) MCFG_QUANTUM_TIME(attotime::from_hz(60)) @@ -1563,9 +1563,9 @@ MACHINE_CONFIG_START(msx_state::msx2p) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, msx_state, msx_ppi_port_c_w)) /* video hardware */ - MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL(21'477'272)) + MCFG_V9958_ADD("v9958", "screen", 0x20000, 21.477272_MHz_XTAL) MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(*this, msx_state,msx_irq_source0)) - MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", XTAL(21'477'272)) + MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", 21.477272_MHz_XTAL) /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1574,7 +1574,7 @@ MACHINE_CONFIG_START(msx_state::msx2p) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "speaker", 0.25); - MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(21'477'272)/6/2) + MCFG_DEVICE_ADD("ay8910", AY8910, 21.477272_MHz_XTAL / 6 / 2) MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) MCFG_AY8910_PORT_A_READ_CB(READ8(*this, msx_state, msx_psg_port_a_r)) MCFG_AY8910_PORT_B_READ_CB(READ8(*this, msx_state, msx_psg_port_b_r)) @@ -1599,7 +1599,7 @@ MACHINE_CONFIG_START(msx_state::msx2p) MCFG_CASSETTE_INTERFACE("msx_cass") /* real time clock */ - MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768)) + MCFG_DEVICE_ADD("rtc", RP5C01, 32.768_kHz_XTAL) /* Software lists */ MCFG_SOFTWARE_LIST_ADD("cass_list", "msx2_cass") @@ -1610,7 +1610,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(msx_state::msx2_pal) msx2(config); MCFG_DEVICE_REMOVE("screen") - MCFG_V99X8_SCREEN_ADD_PAL("screen", "v9938", XTAL(21'477'272)) + MCFG_V99X8_SCREEN_ADD_PAL("screen", "v9938", 21.477272_MHz_XTAL) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp index 71c0054deb7..3c513a867fd 100644 --- a/src/mame/drivers/mycom.cpp +++ b/src/mame/drivers/mycom.cpp @@ -505,7 +505,7 @@ void mycom_state::init_mycom() MACHINE_CONFIG_START(mycom_state::mycom) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",Z80, XTAL(10'000'000) / 4) + MCFG_DEVICE_ADD("maincpu",Z80, 10_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(mycom_map) MCFG_DEVICE_IO_MAP(mycom_io) @@ -545,13 +545,15 @@ MACHINE_CONFIG_START(mycom_state::mycom) WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); - MCFG_DEVICE_ADD("sn1", SN76489, XTAL(10'000'000) / 4) + MCFG_DEVICE_ADD("sn1", SN76489, 10_MHz_XTAL / 4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.50) /* Devices */ - MCFG_MSM5832_ADD("rtc", XTAL(32'768)) - MCFG_CASSETTE_ADD( "cassette" ) - MCFG_FD1771_ADD("fdc", XTAL(16'000'000) / 16) + MCFG_DEVICE_ADD("rtc", MSM5832, 32.768_kHz_XTAL) + + MCFG_CASSETTE_ADD("cassette") + + MCFG_DEVICE_ADD("fdc", FD1771, 16_MHz_XTAL / 16) MCFG_FLOPPY_DRIVE_ADD("fdc:0", mycom_floppies, "525sd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", mycom_floppies, "525sd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp index 286957358c8..0d5a4c6e020 100644 --- a/src/mame/drivers/mz2000.cpp +++ b/src/mame/drivers/mz2000.cpp @@ -38,7 +38,7 @@ #include "formats/mz_cas.h" -#define MASTER_CLOCK XTAL(17'734'470)/5 /* TODO: was 4 MHz, but otherwise cassette won't work due of a bug with MZF support ... */ +#define MASTER_CLOCK 17.73447_MHz_XTAL / 5 /* TODO: was 4 MHz, but otherwise cassette won't work due of a bug with MZF support ... */ #define UTF8_POUND "\xc2\xa3" #define UTF8_YEN "\xc2\xa5" @@ -897,7 +897,7 @@ MACHINE_CONFIG_START(mz2000_state::mz2000) MCFG_PIT8253_CLK1(31250) /* needed by "Art Magic" to boot */ MCFG_PIT8253_CLK2(31250) - MCFG_MB8877_ADD("mb8877a", XTAL(1'000'000)) + MCFG_DEVICE_ADD("mb8877a", MB8877, 1_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD("mb8877a:0", mz2000_floppies, "dd", mz2000_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("mb8877a:1", mz2000_floppies, "dd", mz2000_state::floppy_formats) diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp index bad45c115c5..7726d3991f0 100644 --- a/src/mame/drivers/mz2500.cpp +++ b/src/mame/drivers/mz2500.cpp @@ -2107,7 +2107,7 @@ MACHINE_CONFIG_START(mz2500_state::mz2500) MCFG_DEVICE_ADD("z80sio", Z80SIO, 6000000) - MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL(32'768)) + MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, 32.768_MHz_XTAL) MCFG_RP5C15_OUT_ALARM_CB(WRITELINE(*this, mz2500_state, mz2500_rtc_alarm_irq)) MCFG_DEVICE_ADD("pit", PIT8253, 0) @@ -2118,7 +2118,7 @@ MACHINE_CONFIG_START(mz2500_state::mz2500) MCFG_PIT8253_CLK2(16) //CH2, used by Super MZ demo / The Black Onyx and a few others (TODO: timing of this) MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pit", pit8253_device, write_clk1)) - MCFG_MB8877_ADD("mb8877a", XTAL(1'000'000)) + MCFG_DEVICE_ADD("mb8877a", MB8877, 1_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD("mb8877a:0", mz2500_floppies, "dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("mb8877a:1", mz2500_floppies, "dd", floppy_image_device::default_floppy_formats) @@ -2129,7 +2129,7 @@ MACHINE_CONFIG_START(mz2500_state::mz2500) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(21'477'272), 640+108, 0, 640, 480, 0, 200) //unknown clock / divider + MCFG_SCREEN_RAW_PARAMS(21'477'272, 640+108, 0, 640, 480, 0, 200) //unknown clock / divider MCFG_SCREEN_UPDATE_DRIVER(mz2500_state, screen_update_mz2500) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp index e85e6269254..8393833ada6 100644 --- a/src/mame/drivers/ngen.cpp +++ b/src/mame/drivers/ngen.cpp @@ -928,7 +928,7 @@ static void ngen_floppies(device_slot_interface &device) MACHINE_CONFIG_START(ngen_state::ngen) // basic machine hardware - MCFG_DEVICE_ADD("maincpu", I80186, XTAL(16'000'000) / 2) + MCFG_DEVICE_ADD("maincpu", I80186, 16_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(ngen_mem) MCFG_DEVICE_IO_MAP(ngen_io) MCFG_80186_CHIP_SELECT_CB(WRITE16(*this, ngen_state, cpu_peripheral_cb)) @@ -941,12 +941,12 @@ MACHINE_CONFIG_START(ngen_state::ngen) MCFG_DEVICE_ADD("pit", PIT8254, 0) MCFG_PIT8253_CLK0(78120/4) // 19.53kHz, /4 of the CPU timer output? MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, ngen_state, pit_out0_w)) // RS232 channel B baud rate - MCFG_PIT8253_CLK1(XTAL(14'745'600)/12) // correct? - based on patent + MCFG_PIT8253_CLK1(14.7456_MHz_XTAL / 12) // correct? - based on patent MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, ngen_state, pit_out1_w)) // RS232 channel A baud rate - MCFG_PIT8253_CLK2(XTAL(14'745'600)/12) + MCFG_PIT8253_CLK2(14.7456_MHz_XTAL / 12) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, ngen_state, pit_out2_w)) - MCFG_DEVICE_ADD("dmac", AM9517A, XTAL(14'745'600) / 3) // NEC D8237A, divisor unknown + MCFG_DEVICE_ADD("dmac", AM9517A, 14.7456_MHz_XTAL / 3) // NEC D8237A, divisor unknown MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, ngen_state, dma_hrq_changed)) MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, ngen_state, dma_eop_changed)) MCFG_I8237_IN_MEMR_CB(READ8(*this, ngen_state, dma_read_word)) // DMA is always 16-bit @@ -1011,20 +1011,20 @@ MACHINE_CONFIG_START(ngen_state::ngen) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, ngen_state,timer_clk_out)) // floppy disk / hard disk module (WD2797 FDC, WD1010 HDC, plus an 8253 timer for each) - MCFG_WD2797_ADD("fdc", XTAL(20'000'000) / 20) + MCFG_DEVICE_ADD("fdc", WD2797, 20_MHz_XTAL / 20) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, ngen_state,fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("maincpu",i80186_cpu_device,drq1_w)) MCFG_WD_FDC_FORCE_READY MCFG_DEVICE_ADD("fdc_timer", PIT8253, 0) MCFG_PIT8253_CLK0(0) MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic",pic8259_device,ir5_w)) // clocked on FDC data register access - MCFG_PIT8253_CLK1(XTAL(20'000'000) / 20) + MCFG_PIT8253_CLK1(20_MHz_XTAL / 20) // MCFG_PIT8253_OUT1_HANDLER(WRITELINE("pic",pic8259_device,ir5_w)) // 1MHz - MCFG_PIT8253_CLK2(XTAL(20'000'000) / 20) + MCFG_PIT8253_CLK2(20_MHz_XTAL / 20) // MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pic",pic8259_device,ir5_w)) // TODO: WD1010 HDC (not implemented), use WD2010 for now - MCFG_DEVICE_ADD("hdc", WD2010, XTAL(20'000'000) / 4) + MCFG_DEVICE_ADD("hdc", WD2010, 20_MHz_XTAL / 4) MCFG_WD2010_OUT_INTRQ_CB(WRITELINE("pic",pic8259_device,ir2_w)) MCFG_WD2010_IN_BCS_CB(READ8(*this, ngen_state,hd_buffer_r)) MCFG_WD2010_OUT_BCS_CB(WRITE8(*this, ngen_state,hd_buffer_w)) @@ -1034,14 +1034,14 @@ MACHINE_CONFIG_START(ngen_state::ngen) MCFG_WD2010_IN_TK000_CB(VCC) MCFG_WD2010_IN_SC_CB(VCC) MCFG_DEVICE_ADD("hdc_timer", PIT8253, 0) - MCFG_PIT8253_CLK2(XTAL(20'000'000) / 10) // 2MHz + MCFG_PIT8253_CLK2(20_MHz_XTAL / 10) // 2MHz MCFG_FLOPPY_DRIVE_ADD("fdc:0", ngen_floppies, "525qd", floppy_image_device::default_floppy_formats) MCFG_HARDDISK_ADD("hard0") MACHINE_CONFIG_END MACHINE_CONFIG_START(ngen386_state::ngen386) - MCFG_DEVICE_ADD("i386cpu", I386, XTAL(50'000'000) / 2) + MCFG_DEVICE_ADD("i386cpu", I386, 50_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(ngen386_mem) MCFG_DEVICE_IO_MAP(ngen386_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic", pic8259_device, inta_cb) @@ -1052,12 +1052,12 @@ MACHINE_CONFIG_START(ngen386_state::ngen386) MCFG_DEVICE_ADD("pit", PIT8254, 0) MCFG_PIT8253_CLK0(78120/4) // 19.53kHz, /4 of the CPU timer output? MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, ngen_state, pit_out0_w)) // RS232 channel B baud rate - MCFG_PIT8253_CLK1(XTAL(14'745'600)/12) // correct? - based on patent + MCFG_PIT8253_CLK1(14.7456_MHz_XTAL / 12) // correct? - based on patent MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, ngen_state, pit_out1_w)) // RS232 channel A baud rate - MCFG_PIT8253_CLK2(XTAL(14'745'600)/12) + MCFG_PIT8253_CLK2(14.7456_MHz_XTAL / 12) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, ngen_state, pit_out2_w)) - MCFG_DEVICE_ADD("dmac", AM9517A, XTAL(14'745'600) / 3) // NEC D8237A, divisor unknown + MCFG_DEVICE_ADD("dmac", AM9517A, 14.7456_MHz_XTAL / 3) // NEC D8237A, divisor unknown MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, ngen_state, dma_hrq_changed)) MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, ngen_state, dma_eop_changed)) MCFG_I8237_IN_MEMR_CB(READ8(*this, ngen_state, dma_read_word)) // DMA is always 16-bit @@ -1122,20 +1122,20 @@ MACHINE_CONFIG_START(ngen386_state::ngen386) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, ngen_state,timer_clk_out)) // floppy disk / hard disk module (WD2797 FDC, WD1010 HDC, plus an 8253 timer for each) - MCFG_WD2797_ADD("fdc", XTAL(20'000'000) / 20) + MCFG_DEVICE_ADD("fdc", WD2797, 20_MHz_XTAL / 20) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, ngen_state,fdc_irq_w)) // MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("i386cpu",i80186_cpu_device,drq1_w)) MCFG_WD_FDC_FORCE_READY MCFG_DEVICE_ADD("fdc_timer", PIT8253, 0) MCFG_PIT8253_CLK0(0) MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic",pic8259_device,ir5_w)) // clocked on FDC data register access - MCFG_PIT8253_CLK1(XTAL(20'000'000) / 20) + MCFG_PIT8253_CLK1(20_MHz_XTAL / 20) // MCFG_PIT8253_OUT1_HANDLER(WRITELINE("pic",pic8259_device,ir5_w)) // 1MHz - MCFG_PIT8253_CLK2(XTAL(20'000'000) / 20) + MCFG_PIT8253_CLK2(20_MHz_XTAL / 20) // MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pic",pic8259_device,ir5_w)) // TODO: WD1010 HDC (not implemented), use WD2010 for now - MCFG_DEVICE_ADD("hdc", WD2010, XTAL(20'000'000) / 4) + MCFG_DEVICE_ADD("hdc", WD2010, 20_MHz_XTAL / 4) MCFG_WD2010_OUT_INTRQ_CB(WRITELINE("pic",pic8259_device,ir2_w)) MCFG_WD2010_IN_BCS_CB(READ8(*this, ngen_state,hd_buffer_r)) MCFG_WD2010_OUT_BCS_CB(WRITE8(*this, ngen_state,hd_buffer_w)) @@ -1145,7 +1145,7 @@ MACHINE_CONFIG_START(ngen386_state::ngen386) MCFG_WD2010_IN_TK000_CB(VCC) MCFG_WD2010_IN_SC_CB(VCC) MCFG_DEVICE_ADD("hdc_timer", PIT8253, 0) - MCFG_PIT8253_CLK2(XTAL(20'000'000) / 10) // 2MHz + MCFG_PIT8253_CLK2(20_MHz_XTAL / 10) // 2MHz MCFG_FLOPPY_DRIVE_ADD("fdc:0", ngen_floppies, "525qd", floppy_image_device::default_floppy_formats) MCFG_HARDDISK_ADD("hard0") MACHINE_CONFIG_END diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp index 78c37f8f5a1..5033d3360d0 100644 --- a/src/mame/drivers/notetaker.cpp +++ b/src/mame/drivers/notetaker.cpp @@ -264,7 +264,7 @@ TIMER_CALLBACK_MEMBER(notetaker_state::timer_fifoclk) } m_outfifo_tail_ptr&=0xF; m_dac->write(data); - m_FIFO_timer->adjust(attotime::from_hz(((XTAL(960'000)/10)/4)/((m_FrSel0<<3)+(m_FrSel1<<2)+(m_FrSel2<<1)+1))); + m_FIFO_timer->adjust(attotime::from_hz(((960_kHz_XTAL/10)/4)/((m_FrSel0<<3)+(m_FrSel1<<2)+(m_FrSel2<<1)+1))); } uint32_t notetaker_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -362,7 +362,7 @@ WRITE16_MEMBER(notetaker_state::FIFOReg_w) m_FrSel2 = (data&0x0400)?1:0; m_TabletXOn = (data&0x0200)?1:0; m_TabletYOn = (data&0x0100)?1:0; - m_FIFO_timer->adjust(attotime::from_hz(((XTAL(960'000)/10)/4)/((m_FrSel0<<3)+(m_FrSel1<<2)+(m_FrSel2<<1)+1))); + m_FIFO_timer->adjust(attotime::from_hz(((960_kHz_XTAL/10)/4)/((m_FrSel0<<3)+(m_FrSel1<<2)+(m_FrSel2<<1)+1))); /* FIFO timer is clocked by 960khz divided by 10 (74ls162 decade counter), divided by 4 (mc14568B with divider 1 pins set to 4), divided by 1,3,5,7,9,11,13,15 (or 0,2,4,6,8,10,12,14?) @@ -795,7 +795,7 @@ INPUT_PORTS_END MACHINE_CONFIG_START(notetaker_state::notetakr) /* basic machine hardware */ /* IO CPU: 8086@8MHz */ - MCFG_DEVICE_ADD("iop_cpu", I8086, XTAL(24'000'000)/3) /* iD8086-2 @ E4A; 24Mhz crystal divided down to 8Mhz by i8284 clock generator */ + MCFG_DEVICE_ADD("iop_cpu", I8086, 24_MHz_XTAL / 3) /* iD8086-2 @ E4A; 24Mhz crystal divided down to 8Mhz by i8284 clock generator */ MCFG_DEVICE_PROGRAM_MAP(iop_mem) MCFG_DEVICE_IO_MAP(iop_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("iop_pic8259", pic8259_device, inta_cb) @@ -804,7 +804,7 @@ MACHINE_CONFIG_START(notetaker_state::notetakr) MCFG_PIC8259_OUT_INT_CB(INPUTLINE("iop_cpu", 0)) /* Emulator CPU: 8086@5MHz */ - MCFG_DEVICE_ADD("ep_cpu", I8086, XTAL(15'000'000)/3) + MCFG_DEVICE_ADD("ep_cpu", I8086, 15_MHz_XTAL / 3) MCFG_DEVICE_DISABLE() // TODO: implement the cpu control bits so this doesn't execute garbage/zeroes before its firmware gets loaded MCFG_DEVICE_PROGRAM_MAP(ep_mem) MCFG_DEVICE_IO_MAP(ep_io) @@ -826,7 +826,7 @@ MACHINE_CONFIG_START(notetaker_state::notetakr) MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ - MCFG_DEVICE_ADD( "crt5027", CRT5027, (XTAL(36'000'000)/4)/8) // See below + MCFG_DEVICE_ADD( "crt5027", CRT5027, (36_MHz_XTAL / 4) / 8) // See below /* the clock for the crt5027 is configurable rate; 36MHz xtal divided by 1*, 2, 3, 4, 5, 6, 7, or 8 (* because this is a 74s163 this setting probably means divide by 1; documentation at @@ -842,15 +842,15 @@ MACHINE_CONFIG_START(notetaker_state::notetakr) MCFG_VIDEO_SET_SCREEN("screen") MCFG_DEVICE_ADD( "kbduart", AY31015, 0 ) // HD6402, == AY-3-1015D - MCFG_AY31015_RX_CLOCK(XTAL(960'000)) // hard-wired to 960KHz xtal #f11 (60000 baud, 16 clocks per baud) - MCFG_AY31015_TX_CLOCK(XTAL(960'000)) // hard-wired to 960KHz xtal #f11 (60000 baud, 16 clocks per baud) + MCFG_AY31015_RX_CLOCK(960_kHz_XTAL) // hard-wired to 960KHz xtal #f11 (60000 baud, 16 clocks per baud) + MCFG_AY31015_TX_CLOCK(960_kHz_XTAL) // hard-wired to 960KHz xtal #f11 (60000 baud, 16 clocks per baud) MCFG_DEVICE_ADD( "eiauart", AY31015, 0 ) // HD6402, == AY-3-1015D - MCFG_AY31015_RX_CLOCK(((XTAL(960'000)/10)/4)/5) // hard-wired through an mc14568b divider set to divide by 4, the result set to divide by 5; this resulting 4800hz signal being 300 baud (16 clocks per baud) - MCFG_AY31015_TX_CLOCK(((XTAL(960'000)/10)/4)/5) // hard-wired through an mc14568b divider set to divide by 4, the result set to divide by 5; this resulting 4800hz signal being 300 baud (16 clocks per baud) + MCFG_AY31015_RX_CLOCK(((960_kHz_XTAL/10)/4)/5) // hard-wired through an mc14568b divider set to divide by 4, the result set to divide by 5; this resulting 4800hz signal being 300 baud (16 clocks per baud) + MCFG_AY31015_TX_CLOCK(((960_kHz_XTAL/10)/4)/5) // hard-wired through an mc14568b divider set to divide by 4, the result set to divide by 5; this resulting 4800hz signal being 300 baud (16 clocks per baud) /* Floppy */ - MCFG_FD1791_ADD("wd1791", (((XTAL(24'000'000)/3)/2)/2)) // 2mhz, from 24mhz ip clock divided by 6 via 8284, an additional 2 by LS161 at #e1 on display/floppy board + MCFG_DEVICE_ADD("wd1791", FD1791, (((24_MHz_XTAL/3)/2)/2)) // 2mhz, from 24mhz ip clock divided by 6 via 8284, an additional 2 by LS161 at #e1 on display/floppy board MCFG_FLOPPY_DRIVE_ADD("wd1791:0", notetaker_floppies, "525dd", floppy_image_device::default_floppy_formats) /* sound hardware */ diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp index ba6d81d0dbd..c11b55d93da 100644 --- a/src/mame/drivers/octopus.cpp +++ b/src/mame/drivers/octopus.cpp @@ -621,7 +621,7 @@ WRITE8_MEMBER(octopus_state::vidcontrol_w) { m_vidctrl = data; m_fdc->dden_w(data & 0x04); - m_fdc->set_unscaled_clock((data & 0x08) ? XTAL(16'000'000) / 16 : XTAL(16'000'000) / 8); + m_fdc->set_unscaled_clock(16_MHz_XTAL / ((data & 0x08) ? 16 : 8)); } // Sound hardware @@ -881,16 +881,16 @@ void octopus_centronics_devices(device_slot_interface &device) MACHINE_CONFIG_START(octopus_state::octopus) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",I8088, XTAL(24'000'000) / 3) // 8MHz + MCFG_DEVICE_ADD("maincpu",I8088, 24_MHz_XTAL / 3) // 8MHz MCFG_DEVICE_PROGRAM_MAP(octopus_mem) MCFG_DEVICE_IO_MAP(octopus_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(octopus_state, x86_irq_cb) - MCFG_DEVICE_ADD("subcpu",Z80, XTAL(24'000'000) / 4) // 6MHz + MCFG_DEVICE_ADD("subcpu",Z80, 24_MHz_XTAL / 4) // 6MHz MCFG_DEVICE_PROGRAM_MAP(octopus_sub_mem) MCFG_DEVICE_IO_MAP(octopus_sub_io) - MCFG_DEVICE_ADD("dma1", AM9517A, XTAL(24'000'000) / 6) // 4MHz + MCFG_DEVICE_ADD("dma1", AM9517A, 24_MHz_XTAL / 6) // 4MHz MCFG_I8237_OUT_HREQ_CB(WRITELINE("dma2", am9517a_device, dreq0_w)) MCFG_I8237_IN_MEMR_CB(READ8(*this, octopus_state,dma_read)) MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, octopus_state,dma_write)) @@ -906,7 +906,7 @@ MACHINE_CONFIG_START(octopus_state::octopus) MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, octopus_state, dack1_w)) MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, octopus_state, dack2_w)) MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, octopus_state, dack3_w)) - MCFG_DEVICE_ADD("dma2", AM9517A, XTAL(24'000'000) / 6) // 4MHz + MCFG_DEVICE_ADD("dma2", AM9517A, 24_MHz_XTAL / 6) // 4MHz MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, octopus_state, dma_hrq_changed)) MCFG_I8237_IN_MEMR_CB(READ8(*this, octopus_state,dma_read)) MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, octopus_state,dma_write)) @@ -955,7 +955,7 @@ MACHINE_CONFIG_START(octopus_state::octopus) MCFG_DEVICE_ADD("keyboard_clock_tx", CLOCK, 1200 * 64) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("keyboard",i8251_device,write_txc)) - MCFG_FD1793_ADD("fdc",XTAL(16'000'000) / 8) + MCFG_DEVICE_ADD("fdc", FD1793, 16_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("pic_master",pic8259_device, ir5_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("dma2",am9517a_device, dreq1_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", octopus_floppies, "525dd", floppy_image_device::default_floppy_formats) @@ -974,7 +974,7 @@ MACHINE_CONFIG_START(octopus_state::octopus) MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MCFG_DEVICE_ADD("serial", Z80SIO, XTAL(16'000'000) / 4) // clock rate not mentioned in tech manual + MCFG_DEVICE_ADD("serial", Z80SIO, 16_MHz_XTAL / 4) // clock rate not mentioned in tech manual MCFG_Z80SIO_OUT_INT_CB(WRITELINE("pic_master",pic8259_device, ir1_w)) MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("serial_a",rs232_port_device, write_txd)) MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("serial_b",rs232_port_device, write_txd)) diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp index fccfc4647da..c9ab2f13589 100644 --- a/src/mame/drivers/oric.cpp +++ b/src/mame/drivers/oric.cpp @@ -776,13 +776,13 @@ INPUT_PORTS_END MACHINE_CONFIG_START(oric_state::oric) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M6502, XTAL(12'000'000)/12) + MCFG_DEVICE_ADD("maincpu", M6502, 12_MHz_XTAL / 12) MCFG_DEVICE_PROGRAM_MAP(oric_mem) MCFG_QUANTUM_TIME(attotime::from_hz(60)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2, 64*6, 0, 40*6, 312, 0, 28*8) // 260 lines in 60 Hz mode + MCFG_SCREEN_RAW_PARAMS(12_MHz_XTAL / 2, 64*6, 0, 40*6, 312, 0, 28*8) // 260 lines in 60 Hz mode MCFG_SCREEN_UPDATE_DRIVER(oric_state, screen_update_oric) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, oric_state, vblank_w)) @@ -791,7 +791,7 @@ MACHINE_CONFIG_START(oric_state::oric) /* sound hardware */ SPEAKER(config, "mono").front_center(); WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); - MCFG_DEVICE_ADD("ay8912", AY8912, XTAL(12'000'000)/12) + MCFG_DEVICE_ADD("ay8912", AY8912, 12_MHz_XTAL / 12) MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT) MCFG_AY8910_RES_LOADS(4700, 4700, 4700) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, oric_state, psg_a_w)) @@ -810,7 +810,7 @@ MACHINE_CONFIG_START(oric_state::oric) MCFG_TIMER_DRIVER_ADD_PERIODIC("tape_timer", oric_state, update_tape, attotime::from_hz(4800)) /* via */ - MCFG_DEVICE_ADD( "via6522", VIA6522, XTAL(12'000'000)/12 ) + MCFG_DEVICE_ADD("via6522", VIA6522, 12_MHz_XTAL / 12) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, oric_state, via_a_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, oric_state, via_b_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, oric_state, via_ca2_w)) @@ -841,11 +841,11 @@ MACHINE_CONFIG_START(telestrat_state::telstrat) /* acia */ MCFG_DEVICE_ADD("acia", MOS6551, 0) - MCFG_MOS6551_XTAL(XTAL(1'843'200)) + MCFG_MOS6551_XTAL(1.8432_MHz_XTAL) MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, telestrat_state, acia_irq_w)) /* via */ - MCFG_DEVICE_ADD( "via6522_2", VIA6522, XTAL(12'000'000)/12 ) + MCFG_DEVICE_ADD("via6522_2", VIA6522, 12_MHz_XTAL / 12) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, telestrat_state, via2_a_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, telestrat_state, via2_b_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, telestrat_state, via2_ca2_w)) @@ -853,7 +853,7 @@ MACHINE_CONFIG_START(telestrat_state::telstrat) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, telestrat_state, via2_irq_w)) /* microdisc */ - MCFG_FD1793_ADD("fdc", XTAL(8'000'000)/8) + MCFG_DEVICE_ADD("fdc", FD1793, 8_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, telestrat_state, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, telestrat_state, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, telestrat_state, fdc_hld_w)) diff --git a/src/mame/drivers/orion.cpp b/src/mame/drivers/orion.cpp index 16519932b7a..a85c6c9442f 100644 --- a/src/mame/drivers/orion.cpp +++ b/src/mame/drivers/orion.cpp @@ -135,7 +135,7 @@ MACHINE_CONFIG_START(orion_state::orion128) MCFG_SOFTWARE_LIST_ADD("cass_list", "orion_cass") - MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fd1793", FD1793, 8_MHz_XTAL / 8) MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", orion_state::orion_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", orion_state::orion_floppy_formats) @@ -213,7 +213,7 @@ MACHINE_CONFIG_START(orion_state::orionz80) MCFG_SOFTWARE_LIST_ADD("cass_list", "orion_cass") - MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fd1793", FD1793, 8_MHz_XTAL / 8) MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", orion_state::orion_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", orion_state::orion_floppy_formats) @@ -287,7 +287,7 @@ MACHINE_CONFIG_START(orion_state::orionpro) MCFG_SOFTWARE_LIST_ADD("cass_list", "orion_cass") - MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fd1793", FD1793, 8_MHz_XTAL / 8) MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", orion_state::orion_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", orion_state::orion_floppy_formats) diff --git a/src/mame/drivers/partner.cpp b/src/mame/drivers/partner.cpp index b3213d3c8fc..b63f3075835 100644 --- a/src/mame/drivers/partner.cpp +++ b/src/mame/drivers/partner.cpp @@ -171,7 +171,7 @@ GFXDECODE_END MACHINE_CONFIG_START(partner_state::partner) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", I8080, XTAL(16'000'000) / 9) + MCFG_DEVICE_ADD("maincpu", I8080, 16_MHz_XTAL / 9) MCFG_DEVICE_PROGRAM_MAP(partner_mem) MCFG_MACHINE_RESET_OVERRIDE(partner_state, partner ) @@ -182,7 +182,7 @@ MACHINE_CONFIG_START(partner_state::partner) MCFG_I8255_IN_PORTC_CB(READ8(*this, radio86_state, radio86_8255_portc_r2)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_8255_portc_w2)) - MCFG_DEVICE_ADD("i8275", I8275, XTAL(16'000'000) / 12) + MCFG_DEVICE_ADD("i8275", I8275, 16_MHz_XTAL / 12) MCFG_I8275_CHARACTER_WIDTH(6) MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(partner_state, display_pixels) MCFG_I8275_DRQ_CALLBACK(WRITELINE("dma8257",i8257_device, dreq2_w)) @@ -201,7 +201,7 @@ MACHINE_CONFIG_START(partner_state::partner) SPEAKER(config, "mono").front_center(); WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); - MCFG_DEVICE_ADD("dma8257", I8257, XTAL(16'000'000) / 9) + MCFG_DEVICE_ADD("dma8257", I8257, 16_MHz_XTAL / 9) MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, partner_state, hrq_w)) MCFG_I8257_IN_MEMR_CB(READ8(*this, radio86_state, memory_read_byte)) MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, radio86_state, memory_write_byte)) @@ -217,7 +217,7 @@ MACHINE_CONFIG_START(partner_state::partner) MCFG_SOFTWARE_LIST_ADD("cass_list","partner_cass") - MCFG_FD1793_ADD("wd1793", XTAL(16'000'000) / 16) + MCFG_DEVICE_ADD("wd1793", FD1793, 16_MHz_XTAL / 16) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("dma8257", i8257_device, dreq0_w)) MCFG_FLOPPY_DRIVE_ADD("wd1793:0", partner_floppies, "525qd", partner_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1793:1", partner_floppies, "525qd", partner_state::floppy_formats) diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp index 45452b56df2..e543360d118 100644 --- a/src/mame/drivers/pcd.cpp +++ b/src/mame/drivers/pcd.cpp @@ -497,13 +497,13 @@ static INPUT_PORTS_START(pcx) INPUT_PORTS_END MACHINE_CONFIG_START(pcd_state::pcd) - MCFG_DEVICE_ADD("maincpu", I80186, XTAL(16'000'000)) + MCFG_DEVICE_ADD("maincpu", I80186, 16_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(pcd_map) MCFG_DEVICE_IO_MAP(pcd_io) MCFG_80186_TMROUT1_HANDLER(WRITELINE(*this, pcd_state, i186_timer1_w)) MCFG_80186_IRQ_SLAVE_ACK(READ8(*this, pcd_state, irq_callback)) - MCFG_TIMER_DRIVER_ADD_PERIODIC("timer0_tick", pcd_state, timer0_tick, attotime::from_hz(XTAL(16'000'000) / 24)) // adjusted to pass post + MCFG_TIMER_DRIVER_ADD_PERIODIC("timer0_tick", pcd_state, timer0_tick, attotime::from_hz(16_MHz_XTAL / 24)) // adjusted to pass post MCFG_DEVICE_ADD("pic1", PIC8259, 0) MCFG_PIC8259_OUT_INT_CB(WRITELINE("maincpu", i80186_cpu_device, int0_w)) @@ -520,7 +520,7 @@ MACHINE_CONFIG_START(pcd_state::pcd) MCFG_NVRAM_ADD_1FILL("nvram") // floppy disk controller - MCFG_WD2793_ADD("fdc", XTAL(16'000'000) / 8) + MCFG_DEVICE_ADD("fdc", WD2793, 16_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("pic1", pic8259_device, ir6_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, drq1_w)) MCFG_WD_FDC_ENMF_CALLBACK(GND) @@ -530,15 +530,15 @@ MACHINE_CONFIG_START(pcd_state::pcd) MCFG_FLOPPY_DRIVE_ADD("fdc:1", pcd_floppies, "55f", pcd_state::floppy_formats) // usart - MCFG_DEVICE_ADD("usart1", MC2661, XTAL(4'915'200)) + MCFG_DEVICE_ADD("usart1", MC2661, 4.9152_MHz_XTAL) MCFG_MC2661_RXRDY_HANDLER(WRITELINE("pic1", pic8259_device, ir3_w)) MCFG_MC2661_TXRDY_HANDLER(WRITELINE("pic1", pic8259_device, ir3_w)) MCFG_MC2661_TXD_HANDLER(WRITELINE("rs232_1", rs232_port_device, write_txd)) - MCFG_DEVICE_ADD("usart2", MC2661, XTAL(4'915'200)) + MCFG_DEVICE_ADD("usart2", MC2661, 4.9152_MHz_XTAL) MCFG_MC2661_RXRDY_HANDLER(WRITELINE("pic1", pic8259_device, ir2_w)) //MCFG_MC2661_TXRDY_HANDLER(WRITELINE("pic1", pic8259_device, ir2_w)) // this gets stuck high causing the keyboard to not work MCFG_MC2661_TXD_HANDLER(WRITELINE("keyboard", pcd_keyboard_device, t0_w)) - MCFG_DEVICE_ADD("usart3", MC2661, XTAL(4'915'200)) + MCFG_DEVICE_ADD("usart3", MC2661, 4.9152_MHz_XTAL) MCFG_MC2661_RXRDY_HANDLER(WRITELINE("pic1", pic8259_device, ir4_w)) MCFG_MC2661_TXRDY_HANDLER(WRITELINE("pic1", pic8259_device, ir4_w)) MCFG_MC2661_TXD_HANDLER(WRITELINE("rs232_2", rs232_port_device, write_txd)) @@ -554,7 +554,7 @@ MACHINE_CONFIG_START(pcd_state::pcd) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) // rtc - MCFG_MC146818_ADD("rtc", XTAL(32'768)) + MCFG_MC146818_ADD("rtc", 32.768_kHz_XTAL) MCFG_MC146818_IRQ_HANDLER(WRITELINE("pic1", pic8259_device, ir7_w)) MCFG_MC146818_BINARY(true) MCFG_MC146818_BINARY_YEAR(true) diff --git a/src/mame/drivers/pk8020.cpp b/src/mame/drivers/pk8020.cpp index b58e930bbe8..51727c2600b 100644 --- a/src/mame/drivers/pk8020.cpp +++ b/src/mame/drivers/pk8020.cpp @@ -192,7 +192,7 @@ static void pk8020_floppies(device_slot_interface &device) /* Machine driver */ MACHINE_CONFIG_START(pk8020_state::pk8020) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", I8080, XTAL(20'000'000) / 8) + MCFG_DEVICE_ADD("maincpu", I8080, 20_MHz_XTAL / 8) MCFG_DEVICE_PROGRAM_MAP(pk8020_mem) MCFG_DEVICE_IO_MAP(pk8020_io) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pk8020_state, pk8020_interrupt) @@ -223,11 +223,11 @@ MACHINE_CONFIG_START(pk8020_state::pk8020) MCFG_DEVICE_ADD("ppi8255_3", I8255, 0) MCFG_DEVICE_ADD("pit8253", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL(20'000'000) / 10) + MCFG_PIT8253_CLK0(20_MHz_XTAL / 10) MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, pk8020_state,pk8020_pit_out0)) - MCFG_PIT8253_CLK1(XTAL(20'000'000) / 10) + MCFG_PIT8253_CLK1(20_MHz_XTAL / 10) MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, pk8020_state,pk8020_pit_out1)) - MCFG_PIT8253_CLK2((XTAL(20'000'000) / 8) / 164) + MCFG_PIT8253_CLK2((20_MHz_XTAL / 8) / 164) MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pic8259", pic8259_device, ir5_w)) MCFG_DEVICE_ADD("pic8259", PIC8259, 0) @@ -245,7 +245,7 @@ MACHINE_CONFIG_START(pk8020_state::pk8020) MCFG_DEVICE_ADD("i8251lan", I8251, 0) - MCFG_FD1793_ADD("wd1793", XTAL(20'000'000) / 20) + MCFG_DEVICE_ADD("wd1793", FD1793, 20_MHz_XTAL / 20) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("pic8259", pic8259_device, ir7_w)) MCFG_FLOPPY_DRIVE_ADD("wd1793:0", pk8020_floppies, "qd", pk8020_state::floppy_formats) diff --git a/src/mame/drivers/poly.cpp b/src/mame/drivers/poly.cpp index e0dd2d40cd7..070bb75105f 100644 --- a/src/mame/drivers/poly.cpp +++ b/src/mame/drivers/poly.cpp @@ -370,7 +370,7 @@ MACHINE_CONFIG_START(polydev_state::polydev) poly(config); /* fdc */ - MCFG_FD1771_ADD("fdc", 12.0_MHz_XTAL / 12) + MCFG_DEVICE_ADD("fdc", FD1771, 12.0_MHz_XTAL / 12) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, polydev_state, motor_w)) MCFG_WD_FDC_FORCE_READY diff --git a/src/mame/drivers/proteus.cpp b/src/mame/drivers/proteus.cpp index afe26ec9bf8..27e4796cbfd 100644 --- a/src/mame/drivers/proteus.cpp +++ b/src/mame/drivers/proteus.cpp @@ -333,7 +333,7 @@ MACHINE_CONFIG_START(proteus_state::proteus) MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("z80", INPUT_LINE_IRQ0)) /* fdc */ - MCFG_FD1771_ADD("fdc", 4_MHz_XTAL / 2) + MCFG_DEVICE_ADD("fdc", FD1771, 4_MHz_XTAL / 2) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, proteus_state, motor_w)) MCFG_WD_FDC_FORCE_READY diff --git a/src/mame/drivers/pt68k4.cpp b/src/mame/drivers/pt68k4.cpp index b3c9cdcc73d..5e48334c141 100644 --- a/src/mame/drivers/pt68k4.cpp +++ b/src/mame/drivers/pt68k4.cpp @@ -404,14 +404,14 @@ void pt68k4_isa8_cards(device_slot_interface &device) MACHINE_CONFIG_START(pt68k4_state::pt68k2) /* basic machine hardware */ - MCFG_DEVICE_ADD(M68K_TAG, M68000, XTAL(16'000'000)/2) // 68k2 came in 8, 10, and 12 MHz versions + MCFG_DEVICE_ADD(M68K_TAG, M68000, 16_MHz_XTAL / 2) // 68k2 came in 8, 10, and 12 MHz versions MCFG_DEVICE_PROGRAM_MAP(pt68k2_mem) - MCFG_DEVICE_ADD("duart1", MC68681, XTAL(3'686'400)) + MCFG_DEVICE_ADD("duart1", MC68681, 3.6864_MHz_XTAL) MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, pt68k4_state, duart1_irq)) MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, pt68k4_state, duart1_out)) - MCFG_DEVICE_ADD("duart2", MC68681, XTAL(3'686'400)) + MCFG_DEVICE_ADD("duart2", MC68681, 3.6864_MHz_XTAL) MCFG_DEVICE_ADD(KBDC_TAG, PC_KBDC, 0) MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(*this, pt68k4_state, keyboard_clock_w)) @@ -420,7 +420,7 @@ MACHINE_CONFIG_START(pt68k4_state::pt68k2) MCFG_M48T02_ADD(TIMEKEEPER_TAG) - MCFG_WD1772_ADD(WDFDC_TAG, XTAL(16'000'000) / 2) + MCFG_DEVICE_ADD(WDFDC_TAG, WD1772, 16_MHz_XTAL / 2) MCFG_FLOPPY_DRIVE_ADD(WDFDC_TAG":0", pt68k_floppies, "525dd", pt68k4_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WDFDC_TAG":1", pt68k_floppies, "525dd", pt68k4_state::floppy_formats) diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp index 68d2c46e03c..2280d8a42c3 100644 --- a/src/mame/drivers/pulsar.cpp +++ b/src/mame/drivers/pulsar.cpp @@ -213,7 +213,7 @@ void pulsar_state::init_pulsar() MACHINE_CONFIG_START(pulsar_state::pulsar) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000)) + MCFG_DEVICE_ADD("maincpu", Z80, 4_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(pulsar_mem) MCFG_DEVICE_IO_MAP(pulsar_io) MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) @@ -226,9 +226,9 @@ MACHINE_CONFIG_START(pulsar_state::pulsar) MCFG_I8255_IN_PORTC_CB(READ8(*this, pulsar_state, ppi_pc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pulsar_state, ppi_pc_w)) - MCFG_MSM5832_ADD("rtc", XTAL(32'768)) + MCFG_DEVICE_ADD("rtc", MSM5832, 32.768_kHz_XTAL) - MCFG_DEVICE_ADD("dart", Z80DART, XTAL(4'000'000)) + MCFG_DEVICE_ADD("dart", Z80DART, 4_MHz_XTAL) MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd)) MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr)) MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts)) @@ -239,14 +239,14 @@ MACHINE_CONFIG_START(pulsar_state::pulsar) MCFG_RS232_CTS_HANDLER(WRITELINE("dart", z80dart_device, ctsa_w)) MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal) - MCFG_DEVICE_ADD("brg", COM8116, XTAL(5'068'800)) + MCFG_DEVICE_ADD("brg", COM8116, 5.0688_MHz_XTAL) // Schematic has the labels for FT and FR the wrong way around, but the pin numbers are correct. MCFG_COM8116_FR_HANDLER(WRITELINE("dart", z80dart_device, txca_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart", z80dart_device, rxca_w)) MCFG_COM8116_FT_HANDLER(WRITELINE("dart", z80dart_device, txcb_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart", z80dart_device, rxcb_w)) - MCFG_FD1797_ADD("fdc", XTAL(4'000'000) / 2) + MCFG_DEVICE_ADD("fdc", FD1797, 4_MHz_XTAL / 2) MCFG_FLOPPY_DRIVE_ADD("fdc:0", pulsar_floppies, "525hd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", pulsar_floppies, "525hd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index bb7026014ad..0aa08238d59 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -3214,24 +3214,24 @@ MACHINE_CONFIG_START(rainbow_state::rainbow) MCFG_DEFAULT_LAYOUT(layout_rainbow) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", I8088, XTAL(24'073'400) / 5) // approximately 4.815 MHz + MCFG_DEVICE_ADD("maincpu", I8088, 24.0734_MHz_XTAL / 5) // approximately 4.815 MHz MCFG_DEVICE_PROGRAM_MAP(rainbow8088_map) MCFG_DEVICE_IO_MAP(rainbow8088_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(rainbow_state, irq_callback) - MCFG_DEVICE_ADD("subcpu", Z80, XTAL(24'073'400) / 6) + MCFG_DEVICE_ADD("subcpu", Z80, 24.0734_MHz_XTAL / 6) MCFG_DEVICE_PROGRAM_MAP(rainbowz80_mem) MCFG_DEVICE_IO_MAP(rainbowz80_io) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(24'073'400) / 6, 442, 0, 400, 264, 0, 240) // ~NTSC compatible video timing (?) + MCFG_SCREEN_RAW_PARAMS(24.0734_MHz_XTAL / 6, 442, 0, 400, 264, 0, 240) // ~NTSC compatible video timing (?) MCFG_SCREEN_UPDATE_DRIVER(rainbow_state, screen_update_rainbow) MCFG_SCREEN_PALETTE("vt100_video:palette") MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "vt100_video:palette", gfx_rainbow) - MCFG_DEVICE_ADD("vt100_video", RAINBOW_VIDEO, XTAL(24'073'400)) + MCFG_DEVICE_ADD("vt100_video", RAINBOW_VIDEO, 24.0734_MHz_XTAL) MCFG_VT_SET_SCREEN("screen") MCFG_VT_CHARGEN("chargen") @@ -3260,7 +3260,7 @@ MACHINE_CONFIG_START(rainbow_state::rainbow) MCFG_SCREEN_UPDATE_DEVICE("upd7220", upd7220_device, screen_update) - MCFG_FD1793_ADD(FD1793_TAG, XTAL(24'073'400) / 24) // no separate 1 Mhz quartz + MCFG_DEVICE_ADD(FD1793_TAG, FD1793, 24.0734_MHz_XTAL / 24) // no separate 1 Mhz quartz MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":0", rainbow_floppies, "525qd", rainbow_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":1", rainbow_floppies, "525qd", rainbow_state::floppy_formats) //MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":2", rainbow_floppies, "525qd", rainbow_state::floppy_formats) @@ -3305,11 +3305,11 @@ MACHINE_CONFIG_START(rainbow_state::rainbow) MCFG_DS1315_ADD("rtc") // DS1315 (ClikClok for DEC-100 B) * OPTIONAL * - MCFG_DEVICE_ADD("dbrg", COM8116_003, XTAL(24'073'400) / 4) // 6.01835 MHz (nominally 6 MHz) + MCFG_DEVICE_ADD("dbrg", COM8116_003, 24.0734_MHz_XTAL / 4) // 6.01835 MHz (nominally 6 MHz) MCFG_COM8116_FR_HANDLER(WRITELINE(*this, rainbow_state, dbrg_fr_w)) MCFG_COM8116_FT_HANDLER(WRITELINE(*this, rainbow_state, dbrg_ft_w)) - MCFG_DEVICE_ADD("mpsc", UPD7201_NEW, XTAL(24'073'400) / 5 / 2) // 2.4073 MHz (nominally 2.5 MHz) + MCFG_DEVICE_ADD("mpsc", UPD7201_NEW, 24.0734_MHz_XTAL / 5 / 2) // 2.4073 MHz (nominally 2.5 MHz) MCFG_Z80SIO_OUT_INT_CB(WRITELINE(*this, rainbow_state, mpsc_irq)) MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("comm", rs232_port_device, write_txd)) MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("printer", rs232_port_device, write_txd)) @@ -3332,7 +3332,7 @@ MACHINE_CONFIG_START(rainbow_state::rainbow) MCFG_DEVICE_MODIFY("printer") MCFG_SLOT_DEFAULT_OPTION("printer") - MCFG_DEVICE_ADD("kbdser", I8251, XTAL(24'073'400) / 5 / 2) + MCFG_DEVICE_ADD("kbdser", I8251, 24.0734_MHz_XTAL / 5 / 2) MCFG_I8251_TXD_HANDLER(WRITELINE(*this, rainbow_state, kbd_tx)) MCFG_I8251_DTR_HANDLER(WRITELINE(*this, rainbow_state, irq_hi_w)) MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, rainbow_state, kbd_rxready_w)) @@ -3341,7 +3341,7 @@ MACHINE_CONFIG_START(rainbow_state::rainbow) MCFG_DEVICE_ADD(LK201_TAG, LK201, 0) MCFG_LK201_TX_HANDLER(WRITELINE("kbdser", i8251_device, write_rxd)) - MCFG_DEVICE_ADD("prtbrg", RIPPLE_COUNTER, XTAL(24'073'400) / 6 / 13) // 74LS393 at E17 (both halves) + MCFG_DEVICE_ADD("prtbrg", RIPPLE_COUNTER, 24.0734_MHz_XTAL / 6 / 13) // 74LS393 at E17 (both halves) // divided clock should ideally be 307.2 kHz, but is actually approximately 308.6333 kHz MCFG_RIPPLE_COUNTER_STAGES(8) MCFG_RIPPLE_COUNTER_COUNT_OUT_CB(WRITE8(*this, rainbow_state, bitrate_counter_w)) diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp index 408e3ade9b8..11e0a6337ed 100644 --- a/src/mame/drivers/rc759.cpp +++ b/src/mame/drivers/rc759.cpp @@ -552,7 +552,7 @@ MACHINE_CONFIG_START(rc759_state::rc759) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, rc759_state, ppi_portc_w)) // rtc - MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768)) + MCFG_DEVICE_ADD("rtc", MM58167, 32.768_kHz_XTAL) MCFG_MM58167_IRQ_CALLBACK(WRITELINE("pic", pic8259_device, ir3_w)) // video @@ -577,7 +577,7 @@ MACHINE_CONFIG_START(rc759_state::rc759) SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MCFG_DEVICE_ADD("snd", SN76489A, XTAL(20'000'000) / 10) + MCFG_DEVICE_ADD("snd", SN76489A, 20_MHz_XTAL / 10) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) // internal centronics @@ -595,7 +595,7 @@ MACHINE_CONFIG_START(rc759_state::rc759) MCFG_ISBX_SLOT_MDRQT_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, drq0_w)) // floppy disk controller - MCFG_WD2797_ADD("fdc", 1000000) + MCFG_DEVICE_ADD("fdc", WD2797, 1000000) // MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("pic", pic8259_device, ir0_w)) // MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, drq1_w)) diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp index ce294a2e278..8f0360661ce 100644 --- a/src/mame/drivers/rm380z.cpp +++ b/src/mame/drivers/rm380z.cpp @@ -235,7 +235,7 @@ uint32_t rm380z_state::screen_update_rm380z(screen_device &screen, bitmap_ind16 MACHINE_CONFIG_START(rm380z_state::rm380z) /* basic machine hardware */ - MCFG_DEVICE_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD(RM380Z_MAINCPU_TAG, Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(rm380z_mem) MCFG_DEVICE_IO_MAP(rm380z_io) @@ -263,7 +263,7 @@ MACHINE_CONFIG_START(rm380z_state::rm380z) MCFG_RAM_DEFAULT_SIZE("56K") /* floppy disk */ - MCFG_FD1771_ADD("wd1771", XTAL(1'000'000)) + MCFG_DEVICE_ADD("wd1771", FD1771, 1_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD("wd1771:0", rm380z_floppies, "sssd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1771:1", rm380z_floppies, "sssd", floppy_image_device::default_floppy_formats) @@ -275,7 +275,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(rm380z_state::rm480z) /* basic machine hardware */ - MCFG_DEVICE_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD(RM380Z_MAINCPU_TAG, Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(rm480z_mem) MCFG_DEVICE_IO_MAP(rm480z_io) diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp index aea04582f1e..d891b6e84fe 100644 --- a/src/mame/drivers/rmnimbus.cpp +++ b/src/mame/drivers/rmnimbus.cpp @@ -124,7 +124,7 @@ MACHINE_CONFIG_START(rmnimbus_state::nimbus) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS( XTAL(4'433'619)*2,650,0,640,260,0,250) + MCFG_SCREEN_RAW_PARAMS(4.433619_MHz_XTAL * 2,650,0,640,260,0,250) MCFG_SCREEN_UPDATE_DRIVER(rmnimbus_state, screen_update_nimbus) //MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE) MCFG_SCREEN_PALETTE("palette") @@ -132,7 +132,7 @@ MACHINE_CONFIG_START(rmnimbus_state::nimbus) MCFG_PALETTE_ADD("palette", 16) /* Backing storage */ - MCFG_WD2793_ADD(FDC_TAG, 1000000) + MCFG_DEVICE_ADD(FDC_TAG, WD2793, 1000000) MCFG_WD_FDC_FORCE_READY MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, rmnimbus_state,nimbus_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, rmnimbus_state,nimbus_fdc_drq_w)) diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp index 71a6f8fb9d6..cda63d0fd61 100644 --- a/src/mame/drivers/samcoupe.cpp +++ b/src/mame/drivers/samcoupe.cpp @@ -43,8 +43,8 @@ CONSTANTS ***************************************************************************/ -#define SAMCOUPE_XTAL_X1 XTAL(24'000'000) -#define SAMCOUPE_XTAL_X2 XTAL(4'433'619) +#define SAMCOUPE_XTAL_X1 24_MHz_XTAL +#define SAMCOUPE_XTAL_X2 4.433619_MHz_XTAL /*************************************************************************** @@ -547,7 +547,7 @@ MACHINE_CONFIG_START(samcoupe_state::samcoupe) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("lpt2_data_out", "lpt2") - MCFG_DEVICE_ADD("sambus_clock", MSM6242, XTAL(32'768)) + MCFG_DEVICE_ADD("sambus_clock", MSM6242, 32.768_kHz_XTAL) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_FORMATS(tzx_cassette_formats) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED) @@ -555,7 +555,7 @@ MACHINE_CONFIG_START(samcoupe_state::samcoupe) MCFG_SOFTWARE_LIST_ADD("cass_list","samcoupe_cass") - MCFG_WD1772_ADD("wd1772", SAMCOUPE_XTAL_X1/3) + MCFG_DEVICE_ADD("wd1772", WD1772, SAMCOUPE_XTAL_X1/3) MCFG_FLOPPY_DRIVE_ADD("wd1772:0", samcoupe_floppies, "35dd", samcoupe_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1772:1", samcoupe_floppies, "35dd", samcoupe_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","samcoupe_flop") diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp index 85b9429f41e..241605b7dfc 100644 --- a/src/mame/drivers/sbrain.cpp +++ b/src/mame/drivers/sbrain.cpp @@ -539,12 +539,12 @@ u32 sbrain_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, con MACHINE_CONFIG_START(sbrain_state::sbrain) // basic machine hardware - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(sbrain_mem) MCFG_DEVICE_IO_MAP(sbrain_io) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sbrain_state, irq0_line_hold) - MCFG_DEVICE_ADD("subcpu", Z80, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("subcpu", Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(sbrain_submem) MCFG_DEVICE_IO_MAP(sbrain_subio) @@ -561,7 +561,7 @@ MACHINE_CONFIG_START(sbrain_state::sbrain) MCFG_PALETTE_ADD_MONOCHROME("palette") - //MCFG_DEVICE_ADD("crtc", DP8350, XTAL(10'920'000)) + //MCFG_DEVICE_ADD("crtc", DP8350, 10.92_MHz_XTAL) /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -581,13 +581,13 @@ MACHINE_CONFIG_START(sbrain_state::sbrain) MCFG_DEVICE_ADD("uart1", I8251, 0) - MCFG_DEVICE_ADD("brg", COM8116, XTAL(5'068'800)) // BR1941L + MCFG_DEVICE_ADD("brg", COM8116, 5.0688_MHz_XTAL) // BR1941L MCFG_COM8116_FR_HANDLER(WRITELINE("uart0", i8251_device, write_txc)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart0", i8251_device, write_rxc)) MCFG_COM8116_FT_HANDLER(WRITELINE("uart1", i8251_device, write_txc)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart1", i8251_device, write_rxc)) - MCFG_FD1791_ADD("fdc", XTAL(16'000'000) / 16) + MCFG_DEVICE_ADD("fdc", FD1791, 16_MHz_XTAL / 16) MCFG_FLOPPY_DRIVE_ADD("fdc:0", sbrain_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", sbrain_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/slicer.cpp b/src/mame/drivers/slicer.cpp index a6cb66532c9..86dc51d3885 100644 --- a/src/mame/drivers/slicer.cpp +++ b/src/mame/drivers/slicer.cpp @@ -90,11 +90,11 @@ static void slicer_floppies(device_slot_interface &device) } MACHINE_CONFIG_START(slicer_state::slicer) - MCFG_DEVICE_ADD("maincpu", I80186, XTAL(16'000'000) / 2) + MCFG_DEVICE_ADD("maincpu", I80186, 16_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(slicer_map) MCFG_DEVICE_IO_MAP(slicer_io) - MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400)) + MCFG_DEVICE_ADD("duart", SCN2681, 3.6864_MHz_XTAL) MCFG_MC68681_IRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, int0_w)) MCFG_MC68681_A_TX_CALLBACK(WRITELINE("rs232_1", rs232_port_device, write_txd)) MCFG_MC68681_B_TX_CALLBACK(WRITELINE("rs232_2", rs232_port_device, write_txd)) @@ -105,7 +105,7 @@ MACHINE_CONFIG_START(slicer_state::slicer) MCFG_DEVICE_ADD("rs232_2", RS232_PORT, default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(WRITELINE("duart", scn2681_device, rx_b_w)) - MCFG_FD1797_ADD("fdc", XTAL(16'000'000)/2/8) + MCFG_DEVICE_ADD("fdc", FD1797, 16_MHz_XTAL / 2 / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, int1_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, drq0_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", slicer_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp index 81f62afad98..e67cd563a6f 100644 --- a/src/mame/drivers/smc777.cpp +++ b/src/mame/drivers/smc777.cpp @@ -33,7 +33,7 @@ #include "speaker.h" -#define MASTER_CLOCK XTAL(4'028'000) +#define MASTER_CLOCK 4.028_MHz_XTAL #define mc6845_h_char_total (m_crtc_vreg[0]+1) #define mc6845_h_display (m_crtc_vreg[1]) @@ -1048,7 +1048,7 @@ MACHINE_CONFIG_START(smc777_state::smc777) MCFG_MC6845_CHAR_WIDTH(8) // floppy controller - MCFG_MB8876_ADD("fdc", XTAL(1'000'000)) + MCFG_DEVICE_ADD("fdc", MB8876, 1_MHz_XTAL) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, smc777_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, smc777_state, fdc_drq_w)) diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp index f331f040b79..a9b1199b5d3 100644 --- a/src/mame/drivers/special.cpp +++ b/src/mame/drivers/special.cpp @@ -462,8 +462,7 @@ MACHINE_CONFIG_START(special_state::specimx) MCFG_PIT8253_CLK2(2000000) MCFG_PIT8253_OUT2_HANDLER(WRITELINE("custom", specimx_sound_device, set_input_ch2)) - MCFG_DEVICE_REMOVE("ppi8255") - MCFG_DEVICE_ADD("ppi8255", I8255, 0) + MCFG_DEVICE_REPLACE("ppi8255", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(*this, special_state, specialist_8255_porta_r)) MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, special_state, specialist_8255_porta_w)) MCFG_I8255_IN_PORTB_CB(READ8(*this, special_state, specimx_8255_portb_r)) @@ -471,7 +470,7 @@ MACHINE_CONFIG_START(special_state::specimx) MCFG_I8255_IN_PORTC_CB(READ8(*this, special_state, specialist_8255_portc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, special_state, specialist_8255_portc_w)) - MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fd1793", FD1793, 8_MHz_XTAL / 8) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, special_state, fdc_drq)) MCFG_FLOPPY_DRIVE_ADD("fd0", specimx_floppies, "525qd", special_state::specimx_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", special_state::specimx_floppy_formats) @@ -525,7 +524,7 @@ MACHINE_CONFIG_START(special_state::erik) MCFG_I8255_IN_PORTC_CB(READ8(*this, special_state, specialist_8255_portc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, special_state, specialist_8255_portc_w)) - MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fd1793", FD1793, 8_MHz_XTAL / 8) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, special_state, fdc_drq)) MCFG_FLOPPY_DRIVE_ADD("fd0", specimx_floppies, "525qd", special_state::specimx_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", special_state::specimx_floppy_formats) diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp index 4e2ba0264f5..5879a1f0c94 100644 --- a/src/mame/drivers/squale.cpp +++ b/src/mame/drivers/squale.cpp @@ -71,7 +71,7 @@ #include "speaker.h" -#define MAIN_CLOCK XTAL(14'000'000) +#define MAIN_CLOCK 14_MHz_XTAL #define AY_CLOCK MAIN_CLOCK / 8 /* 1.75 Mhz */ #define VIDEO_CLOCK MAIN_CLOCK / 8 /* 1.75 Mhz */ #define CPU_CLOCK MAIN_CLOCK / 4 /* 3.50 Mhz */ @@ -828,7 +828,7 @@ MACHINE_CONFIG_START(squale_state::squale) MCFG_TIMER_DRIVER_ADD_SCANLINE("squale_sl", squale_state, squale_scanline, "screen", 0, 10) /* Floppy */ - MCFG_WD1770_ADD("wd1770", XTAL(8'000'000) ) + MCFG_DEVICE_ADD("wd1770", WD1770, 8_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD("wd1770:0", squale_floppies, "525qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1770:1", squale_floppies, "525qd", floppy_image_device::default_floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop525_list", "squale") diff --git a/src/mame/drivers/super6.cpp b/src/mame/drivers/super6.cpp index 3142c3d167a..2698e6923f7 100644 --- a/src/mame/drivers/super6.cpp +++ b/src/mame/drivers/super6.cpp @@ -480,18 +480,18 @@ void super6_state::machine_reset() MACHINE_CONFIG_START(super6_state::super6) // basic machine hardware - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(24'000'000)/4) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 24_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(super6_mem) MCFG_DEVICE_IO_MAP(super6_io) MCFG_Z80_DAISY_CHAIN(super6_daisy_chain) // devices - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(24'000'000)/4) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 24_MHz_XTAL / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", super6_state, ctc_tick, attotime::from_hz(XTAL(24'000'000)/16)) + MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", super6_state, ctc_tick, attotime::from_hz(24_MHz_XTAL / 16)) - MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(24'000'000)/6) + MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, 24_MHz_XTAL / 6) MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT)) MCFG_Z80DMA_OUT_INT_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg2)) MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, super6_state, memory_read_byte)) @@ -499,17 +499,17 @@ MACHINE_CONFIG_START(super6_state::super6) MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, super6_state, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, super6_state, io_write_byte)) - MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(24'000'000)/4) + MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 24_MHz_XTAL / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_WD2793_ADD(WD2793_TAG, 1000000) + MCFG_DEVICE_ADD(WD2793_TAG, WD2793, 1000000) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, super6_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, super6_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", super6_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":1", super6_floppies, nullptr, floppy_image_device::default_floppy_formats) - MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(24'000'000)/4) + MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, 24_MHz_XTAL / 4) MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) @@ -525,7 +525,7 @@ MACHINE_CONFIG_START(super6_state::super6) MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxb_w)) - MCFG_DEVICE_ADD(BR1945_TAG, COM8116, XTAL(5'068'800)) + MCFG_DEVICE_ADD(BR1945_TAG, COM8116, 5.0688_MHz_XTAL) MCFG_COM8116_FR_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, txca_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(Z80DART_TAG, z80dart_device, rxca_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(Z80CTC_TAG, z80ctc_device, trg1)) diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp index f6acb3ea1f4..6cce9be0343 100644 --- a/src/mame/drivers/super80.cpp +++ b/src/mame/drivers/super80.cpp @@ -226,7 +226,7 @@ ToDo: #include "super80.lh" -#define MASTER_CLOCK (XTAL(12'000'000)) +#define MASTER_CLOCK (12_MHz_XTAL) #define PIXEL_CLOCK (MASTER_CLOCK/2) #define HTOTAL (384) #define HBEND (0) @@ -865,7 +865,7 @@ MACHINE_CONFIG_START(super80_state::super80r) MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, super80_state, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, super80_state, io_write_byte)) - MCFG_WD2793_ADD("fdc", XTAL(2'000'000)) + MCFG_DEVICE_ADD("fdc", WD2793, 2_MHz_XTAL) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("dma", z80dma_device, rdy_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", super80_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) diff --git a/src/mame/drivers/swtpc09.cpp b/src/mame/drivers/swtpc09.cpp index 3ab6a6845e8..bc16e26432d 100644 --- a/src/mame/drivers/swtpc09.cpp +++ b/src/mame/drivers/swtpc09.cpp @@ -167,7 +167,7 @@ static void swtpc09_floppies(device_slot_interface &device) /* MPU09, MPID, MPS2 DMF2 */ MACHINE_CONFIG_START(swtpc09_state::swtpc09_base) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000)) + MCFG_DEVICE_ADD("maincpu", MC6809, 4_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(mp09_mem) MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0) @@ -196,11 +196,11 @@ MACHINE_CONFIG_START(swtpc09_state::swtpc09_base) MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts)) MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, swtpc09_state, acia_interrupt)) - MCFG_DEVICE_ADD("brg", MC14411, XTAL(1'843'200)) + MCFG_DEVICE_ADD("brg", MC14411, 1.8432_MHz_XTAL) MCFG_MC14411_F1_CB(WRITELINE("acia", acia6850_device, write_txc)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia", acia6850_device, write_rxc)) - MCFG_FD1793_ADD("fdc", XTAL(1'000'000)) + MCFG_DEVICE_ADD("fdc", FD1793, 1_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD("fdc:0", swtpc09_floppies, "dd", swtpc09_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", swtpc09_floppies, "dd", swtpc09_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:2", swtpc09_floppies, "dd", swtpc09_state::floppy_formats) @@ -242,7 +242,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(swtpc09_state::swtpc09d3) swtpc09_base(config); MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_CLOCK(XTAL(8'000'000)) + MCFG_DEVICE_CLOCK(8_MHz_XTAL) MCFG_DEVICE_MODIFY("pia") MCFG_DEVICE_CLOCK(2000000) @@ -254,7 +254,7 @@ MACHINE_CONFIG_START(swtpc09_state::swtpc09d3) MCFG_DEVICE_MODIFY("acia") MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE)) - MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 4) + MCFG_DEVICE_ADD("via", VIA6522, 4_MHz_XTAL / 4) MCFG_VIA6522_READPA_HANDLER(READ8(*this, swtpc09_state, dmf3_via_read_porta)) MCFG_VIA6522_READPB_HANDLER(READ8(*this, swtpc09_state, dmf3_via_read_portb)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, swtpc09_state, dmf3_via_write_porta)) diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp index db108e7a408..c3ae650b6f9 100644 --- a/src/mame/drivers/tandy2k.cpp +++ b/src/mame/drivers/tandy2k.cpp @@ -287,7 +287,7 @@ WRITE8_MEMBER( tandy2k_state::addr_ctrl_w ) if (m_clkspd != clkspd || m_clkcnt != clkcnt) { - const XTAL busdotclk = XTAL(16'000'000)*28 / (clkspd ? 16 : 20); + const XTAL busdotclk = 16_MHz_XTAL * 28 / (clkspd ? 16 : 20); const XTAL vidcclk = busdotclk / (clkcnt ? 8 : 10); m_vpac->set_character_width(clkcnt ? 8 : 10); @@ -771,7 +771,7 @@ void tandy2k_state::device_reset_after_children() MACHINE_CONFIG_START(tandy2k_state::tandy2k) // basic machine hardware - MCFG_DEVICE_ADD(I80186_TAG, I80186, XTAL(16'000'000)) + MCFG_DEVICE_ADD(I80186_TAG, I80186, 16_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(tandy2k_mem) MCFG_DEVICE_IO_MAP(tandy2k_io) MCFG_80186_IRQ_SLAVE_ACK(READ8(DEVICE_SELF, tandy2k_state, irq_callback)) @@ -787,7 +787,7 @@ MACHINE_CONFIG_START(tandy2k_state::tandy2k) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_DEVICE_ADD(CRT9007_TAG, CRT9007, XTAL(16'000'000)*28/20/8) + MCFG_DEVICE_ADD(CRT9007_TAG, CRT9007, 16_MHz_XTAL * 28 / 20 / 8) MCFG_DEVICE_ADDRESS_MAP(0, vpac_mem) MCFG_CRT9007_CHARACTER_WIDTH(8) MCFG_CRT9007_INT_CALLBACK(WRITELINE(I8259A_1_TAG, pic8259_device, ir1_w)) @@ -809,7 +809,7 @@ MACHINE_CONFIG_START(tandy2k_state::tandy2k) MCFG_CRT9212_WEN2_VCC() MCFG_CRT9212_DOUT_CALLBACK(WRITE8(*this, tandy2k_state, drb_attr_w)) - MCFG_DEVICE_ADD(CRT9021B_TAG, CRT9021, XTAL(16'000'000)*28/20) + MCFG_DEVICE_ADD(CRT9021B_TAG, CRT9021, 16_MHz_XTAL * 28 / 20) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) MCFG_TIMER_DRIVER_ADD("vidldsh", tandy2k_state, vidldsh_tick) @@ -839,11 +839,11 @@ MACHINE_CONFIG_START(tandy2k_state::tandy2k) // TODO pin 17 external receiver clock MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL(16'000'000)/16) + MCFG_PIT8253_CLK0(16_MHz_XTAL / 16) MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, tandy2k_state, outspkr_w)) - MCFG_PIT8253_CLK1(XTAL(16'000'000)/8) + MCFG_PIT8253_CLK1(16_MHz_XTAL / 8) MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, tandy2k_state, intbrclk_w)) - //MCFG_PIT8253_CLK2(XTAL(16'000'000)/8) + //MCFG_PIT8253_CLK2(16_MHz_XTAL / 8) //MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, tandy2k_state, rfrqpulse_w)) MCFG_DEVICE_ADD(I8259A_0_TAG, PIC8259, 0) diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp index c1ee4d059ee..42e0839e812 100644 --- a/src/mame/drivers/tavernie.cpp +++ b/src/mame/drivers/tavernie.cpp @@ -295,7 +295,7 @@ void tavernie_state::kbd_put(u8 data) MACHINE_CONFIG_START(tavernie_state::cpu09) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000)) + MCFG_DEVICE_ADD("maincpu", MC6809, 4_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(cpu09_mem) MCFG_MACHINE_RESET_OVERRIDE(tavernie_state, cpu09) @@ -314,7 +314,7 @@ MACHINE_CONFIG_START(tavernie_state::cpu09) MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE)) MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE)) - MCFG_DEVICE_ADD("ptm", PTM6840, XTAL(4'000'000) / 4) + MCFG_DEVICE_ADD("ptm", PTM6840, 4_MHz_XTAL / 4) // all i/o lines connect to the 40-pin expansion connector MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0) MCFG_PTM6840_O2_CB(INPUTLINE("maincpu", INPUT_LINE_NMI)) @@ -368,7 +368,7 @@ MACHINE_CONFIG_START(tavernie_state::ivg09) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, tavernie_state, pa_ivg_w)) MCFG_PIA_CB2_HANDLER(WRITELINE("beeper", beep_device, set_state)) - MCFG_FD1795_ADD("fdc", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("fdc", FD1795, 8_MHz_XTAL / 8) MCFG_FLOPPY_DRIVE_ADD("fdc:0", ifd09_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tdv2324.cpp b/src/mame/drivers/tdv2324.cpp index 3df6d7aa1ec..dbac7abf6c4 100644 --- a/src/mame/drivers/tdv2324.cpp +++ b/src/mame/drivers/tdv2324.cpp @@ -285,7 +285,7 @@ MACHINE_CONFIG_START(tdv2324_state::tdv2324) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_DEVICE_ADD(TMS9937NL_TAG, TMS9927, XTAL(25'398'360) / 8) + MCFG_DEVICE_ADD(TMS9937NL_TAG, TMS9927, 25.39836_MHz_XTAL / 8) MCFG_TMS9927_CHAR_WIDTH(8) // devices @@ -297,7 +297,7 @@ MACHINE_CONFIG_START(tdv2324_state::tdv2324) MCFG_DEVICE_ADD(MK3887N4_TAG, Z80SIO2, 8000000/2) - MCFG_FD1797_ADD(FD1797PL02_TAG, 8000000/4) + MCFG_DEVICE_ADD(FD1797PL02_TAG, FD1797, 8000000/4) MCFG_FLOPPY_DRIVE_ADD(FD1797PL02_TAG":0", tdv2324_floppies, "8dsdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FD1797PL02_TAG":1", tdv2324_floppies, "8dsdd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp index 4188d925cc4..de90724f246 100644 --- a/src/mame/drivers/thomson.cpp +++ b/src/mame/drivers/thomson.cpp @@ -690,13 +690,13 @@ MACHINE_CONFIG_START(thomson_state::to7) MCFG_LEGACY_FLOPPY_CONFIG(thomson_floppy_interface) MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(*this, thomson_state, fdc_index_3_w)) - MCFG_WD2793_ADD("wd2793", XTAL(1'000'000)) - MCFG_FLOPPY_DRIVE_ADD("wd2793:0", cd90_640_floppies, "dd", thomson_state::cd90_640_formats) - MCFG_FLOPPY_DRIVE_ADD("wd2793:1", cd90_640_floppies, "dd", thomson_state::cd90_640_formats) + MCFG_DEVICE_ADD("wd2793", WD2793, 1_MHz_XTAL) + MCFG_FLOPPY_DRIVE_ADD("wd2793:0", cd90_640_floppies, "dd", thomson_state::cd90_640_formats) + MCFG_FLOPPY_DRIVE_ADD("wd2793:1", cd90_640_floppies, "dd", thomson_state::cd90_640_formats) /* network */ - MCFG_DEVICE_ADD( "mc6854", MC6854, 0 ) + MCFG_DEVICE_ADD("mc6854", MC6854, 0) MCFG_MC6854_OUT_FRAME_CB(thomson_state, to7_network_got_frame) @@ -720,7 +720,7 @@ MACHINE_CONFIG_START(thomson_state::to7) /* TODO: CONVERT THIS TO A SLOT DEVICE (RF 57-932) */ MCFG_DEVICE_ADD("acia", MOS6551, 0) - MCFG_MOS6551_XTAL(XTAL(1'843'200)) + MCFG_MOS6551_XTAL(1.8432_MHz_XTAL) MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd)) /// 2400 7N2 diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp index f026716f5ab..93d1a3516ef 100644 --- a/src/mame/drivers/tiki100.cpp +++ b/src/mame/drivers/tiki100.cpp @@ -702,14 +702,14 @@ void tiki100_state::machine_reset() MACHINE_CONFIG_START(tiki100_state::tiki100) /* basic machine hardware */ - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 8_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(tiki100_mem) MCFG_DEVICE_IO_MAP(tiki100_io) MCFG_Z80_DAISY_CHAIN(tiki100_daisy_chain) /* video hardware */ MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(20'000'000), 1280, 0, 1024, 312, 0, 256) + MCFG_SCREEN_RAW_PARAMS(20_MHz_XTAL, 1280, 0, 1024, 312, 0, 256) MCFG_SCREEN_UPDATE_DRIVER(tiki100_state, screen_update) MCFG_PALETTE_ADD("palette", 16) @@ -724,7 +724,7 @@ MACHINE_CONFIG_START(tiki100_state::tiki100) MCFG_TIKI100_BUS_SLOT_ADD("slot3", nullptr) /* devices */ - MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, 8_MHz_XTAL / 4) MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) @@ -733,22 +733,22 @@ MACHINE_CONFIG_START(tiki100_state::tiki100) MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts)) MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 8_MHz_XTAL / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8("cent_data_in", input_buffer_device, read)) MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write)) MCFG_Z80PIO_IN_PB_CB(READ8(*this, tiki100_state, pio_pb_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, tiki100_state, pio_pb_w)) - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 8_MHz_XTAL / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, tiki100_state, bar0_w)) MCFG_Z80CTC_ZC1_CB(WRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, tiki100_state, bar2_w)) - MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", tiki100_state, ctc_tick, attotime::from_hz(XTAL(8'000'000)/4)) + MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", tiki100_state, ctc_tick, attotime::from_hz(8_MHz_XTAL / 4)) - MCFG_FD1797_ADD(FD1797_TAG, XTAL(8'000'000)/8) // FD1767PL-02 or FD1797-PL + MCFG_DEVICE_ADD(FD1797_TAG, FD1797, 8_MHz_XTAL / 8) // FD1767PL-02 or FD1797-PL MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", tiki100_floppies, "525qd", tiki100_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", tiki100_floppies, "525qd", tiki100_state::floppy_formats) @@ -774,7 +774,7 @@ MACHINE_CONFIG_START(tiki100_state::tiki100) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD(AY8912_TAG, AY8912, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD(AY8912_TAG, AY8912, 8_MHz_XTAL / 4) MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, tiki100_state, video_scroll_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp index b9e3d5c7c06..7dbd1251c56 100644 --- a/src/mame/drivers/trs80.cpp +++ b/src/mame/drivers/trs80.cpp @@ -645,7 +645,7 @@ MACHINE_CONFIG_START(trs80_state::model1) // model I, level II MCFG_QUICKLOAD_ADD("quickload", trs80_state, trs80_cmd, "cmd", 0.5) - MCFG_FD1793_ADD("fdc", 4_MHz_XTAL / 4) // todo: should be fd1771 + MCFG_DEVICE_ADD("fdc", FD1793, 4_MHz_XTAL / 4) // todo: should be fd1771 MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, trs80_state,trs80_fdc_intrq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", trs80_floppies, "sssd", trs80_state::floppy_formats) diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp index 7c9864c00f0..cce24b087e4 100644 --- a/src/mame/drivers/trs80m2.cpp +++ b/src/mame/drivers/trs80m2.cpp @@ -234,7 +234,7 @@ WRITE8_MEMBER( trs80m2_state::nmi_w ) // 80/40 character mode m_80_40_char_en = BIT(data, 4); - m_crtc->set_clock(m_80_40_char_en ? XTAL(12'480'000)/16 : XTAL(12'480'000)/8); + m_crtc->set_clock(12.48_MHz_XTAL / (m_80_40_char_en ? 16 : 8)); // RTC interrupt enable m_enable_rtc_int = BIT(data, 5); @@ -709,7 +709,7 @@ void trs80m2_state::machine_reset() MACHINE_CONFIG_START(trs80m2_state::trs80m2) // basic machine hardware - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 8_MHz_XTAL / 2) MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain) MCFG_DEVICE_PROGRAM_MAP(z80_mem) MCFG_DEVICE_IO_MAP(z80_io) @@ -724,7 +724,7 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(12'480'000)/8) + MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, 12.48_MHz_XTAL / 8) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(trs80m2_state, crtc_update_row) @@ -732,7 +732,7 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, trs80m2_state, vsync_w)) // devices - MCFG_FD1791_ADD(FD1791_TAG, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD(FD1791_TAG, FD1791, 8_MHz_XTAL / 4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITE8(Z80PIO_TAG, z80pio_device, pa_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(Z80DMA_TAG, z80dma_device, rdy_w)) MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8dsdd", floppy_image_device::default_floppy_formats) @@ -740,15 +740,15 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2) MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":2", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":3", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats) - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/2) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 8_MHz_XTAL / 2) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE(Z80SIO_TAG, z80dart_device, rxca_w)) MCFG_Z80CTC_ZC1_CB(WRITELINE(Z80SIO_TAG, z80dart_device, txca_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w)) - MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", trs80m2_state, ctc_tick, attotime::from_hz(XTAL(8'000'000)/2/2)) + MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", trs80m2_state, ctc_tick, attotime::from_hz(8_MHz_XTAL / 2 / 2)) - MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(8'000'000)/2) + MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, 8_MHz_XTAL / 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(*this, trs80m2_state, read)) @@ -756,14 +756,14 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2) MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, trs80m2_state, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, trs80m2_state, io_write_byte)) - MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(8'000'000)/2) + MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 8_MHz_XTAL / 2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(*this, trs80m2_state, pio_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, trs80m2_state, pio_pa_w)) MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, write)) MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, trs80m2_state, strobe_w)) - MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(8'000'000)/2) + MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, 8_MHz_XTAL / 2) MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") @@ -794,13 +794,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(trs80m16_state::trs80m16) // basic machine hardware - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 8_MHz_XTAL / 2) MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain) MCFG_DEVICE_PROGRAM_MAP(z80_mem) MCFG_DEVICE_IO_MAP(m16_z80_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(AM9519A_TAG, am9519_device, iack_cb) - MCFG_DEVICE_ADD(M68000_TAG, M68000, XTAL(24'000'000)/4) + MCFG_DEVICE_ADD(M68000_TAG, M68000, 24_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(m68000_mem) MCFG_DEVICE_DISABLE() @@ -814,7 +814,7 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(12'480'000)/8) + MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, 12.48_MHz_XTAL / 8) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(trs80m2_state, crtc_update_row) @@ -822,7 +822,7 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, trs80m2_state, vsync_w)) // devices - MCFG_FD1791_ADD(FD1791_TAG, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD(FD1791_TAG, FD1791, 8_MHz_XTAL / 4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITE8(Z80PIO_TAG, z80pio_device, pa_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(Z80DMA_TAG, z80dma_device, rdy_w)) MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8dsdd", floppy_image_device::default_floppy_formats) @@ -830,15 +830,15 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16) MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":2", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":3", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats) - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/2) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 8_MHz_XTAL / 2) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE(Z80SIO_TAG, z80dart_device, rxca_w)) MCFG_Z80CTC_ZC1_CB(WRITELINE(Z80SIO_TAG, z80dart_device, txca_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w)) - MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", trs80m2_state, ctc_tick, attotime::from_hz(XTAL(8'000'000)/2/2)) + MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", trs80m2_state, ctc_tick, attotime::from_hz(8_MHz_XTAL / 2 / 2)) - MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(8'000'000)/2) + MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, 8_MHz_XTAL / 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(*this, trs80m2_state, read)) @@ -846,14 +846,14 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16) MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, trs80m2_state, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, trs80m2_state, io_write_byte)) - MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(8'000'000)/2) + MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 8_MHz_XTAL / 2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(*this, trs80m2_state, pio_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, trs80m2_state, pio_pa_w)) MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, write)) MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, trs80m2_state, strobe_w)) - MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(8'000'000)/2) + MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, 8_MHz_XTAL / 2) MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_DEVICE_ADD(AM9519A_TAG, AM9519, 0) diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp index eab513a9b10..1ca2fd62428 100644 --- a/src/mame/drivers/ts802.cpp +++ b/src/mame/drivers/ts802.cpp @@ -187,7 +187,7 @@ void ts802_state::init_ts802() MACHINE_CONFIG_START(ts802_state::ts802) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(ts802_mem) MCFG_DEVICE_IO_MAP(ts802_io) //MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) // causes problems @@ -197,7 +197,7 @@ MACHINE_CONFIG_START(ts802_state::ts802) MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0) MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(ts802_state, kbd_put)) - MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("dma", Z80DMA, 16_MHz_XTAL / 4) MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE("maincpu", INPUT_LINE_HALT)) MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, ts802_state, memory_read_byte)) @@ -205,16 +205,16 @@ MACHINE_CONFIG_START(ts802_state::ts802) MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, ts802_state, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, ts802_state, io_write_byte)) - MCFG_DEVICE_ADD("dart1", Z80DART, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("dart1", Z80DART, 16_MHz_XTAL / 4) MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("dart2", Z80DART, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("dart2", Z80DART, 16_MHz_XTAL / 4) MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("ctc", Z80CTC, 16_MHz_XTAL / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_FD1793_ADD("fdc", XTAL(4'000'000) / 2) // unknown clock + MCFG_DEVICE_ADD("fdc", FD1793, 4'000'000 / 2) // unknown clock MCFG_FLOPPY_DRIVE_ADD("fdc:0", ts802_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp index fe5ca66fa87..7da58bb1246 100644 --- a/src/mame/drivers/ts803.cpp +++ b/src/mame/drivers/ts803.cpp @@ -418,7 +418,7 @@ static const z80_daisy_config daisy_chain[] = }; MACHINE_CONFIG_START(ts803_state::ts803) - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(ts803_mem) MCFG_DEVICE_IO_MAP(ts803_io) MCFG_Z80_DAISY_CHAIN(daisy_chain) @@ -438,19 +438,19 @@ MACHINE_CONFIG_START(ts803_state::ts803) MCFG_MC6845_UPDATE_ROW_CB(ts803_state, crtc_update_row) MCFG_MC6845_ADDR_CHANGED_CB(ts803_state, crtc_update_addr) - MCFG_DEVICE_ADD("sti_clock", CLOCK, XTAL(16'000'000) / 13) + MCFG_DEVICE_ADD("sti_clock", CLOCK, 16_MHz_XTAL / 13) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sti", z80sti_device, tc_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sti", z80sti_device, rc_w)) - MCFG_DEVICE_ADD("dart_clock", CLOCK, (XTAL(16'000'000) / 13) / 8) + MCFG_DEVICE_ADD("dart_clock", CLOCK, (16_MHz_XTAL / 13) / 8) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("dart", z80dart_device, txca_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart", z80dart_device, rxca_w)) - MCFG_DEVICE_ADD("sti", Z80STI, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD("sti", Z80STI, 16_MHz_XTAL / 4) MCFG_Z80STI_OUT_TBO_CB(WRITELINE("dart", z80dart_device, rxtxcb_w)) MCFG_Z80STI_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD("dart", Z80DART, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("dart", Z80DART, 16_MHz_XTAL / 4) MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd)) @@ -458,7 +458,7 @@ MACHINE_CONFIG_START(ts803_state::ts803) MCFG_RS232_RXD_HANDLER(WRITELINE("dart", z80dart_device, rxa_w)) /* floppy disk */ - MCFG_FD1793_ADD("fdc", XTAL(1'000'000)) + MCFG_DEVICE_ADD("fdc", FD1793, 1_MHz_XTAL) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("sti", z80sti_device, i7_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", ts803_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp index 6f396f2e73e..bb6d62bc553 100644 --- a/src/mame/drivers/v1050.cpp +++ b/src/mame/drivers/v1050.cpp @@ -1100,7 +1100,7 @@ MACHINE_CONFIG_START(v1050_state::v1050) MCFG_DEVICE_ADD(CLOCK_SIO_TAG, CLOCK, 16_MHz_XTAL/4) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, v1050_state, write_sio_clock)) - MCFG_MB8877_ADD(MB8877_TAG, 16_MHz_XTAL/16) + MCFG_DEVICE_ADD(MB8877_TAG, MB8877, 16_MHz_XTAL/16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, v1050_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, v1050_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", v1050_floppies, "525qd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp index adbb53f0897..2747457df2c 100644 --- a/src/mame/drivers/v6809.cpp +++ b/src/mame/drivers/v6809.cpp @@ -280,7 +280,7 @@ static void v6809_floppies(device_slot_interface &device) MACHINE_CONFIG_START(v6809_state::v6809) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(16'000'000) / 4) // divided by 4 again internally + MCFG_DEVICE_ADD("maincpu", MC6809, 16_MHz_XTAL / 4) // divided by 4 again internally MCFG_DEVICE_PROGRAM_MAP(v6809_mem) MCFG_MACHINE_RESET_OVERRIDE(v6809_state, v6809) @@ -300,7 +300,7 @@ MACHINE_CONFIG_START(v6809_state::v6809) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* devices */ - MCFG_MC6845_ADD("crtc", SY6545_1, "screen", XTAL(16'000'000) / 8) + MCFG_MC6845_ADD("crtc", SY6545_1, "screen", 16_MHz_XTAL / 8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(v6809_state, crtc_update_row) @@ -322,7 +322,7 @@ MACHINE_CONFIG_START(v6809_state::v6809) MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE)) MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE)) - MCFG_DEVICE_ADD("ptm", PTM6840, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("ptm", PTM6840, 16_MHz_XTAL / 4) MCFG_PTM6840_EXTERNAL_CLOCKS(4000000/14, 4000000/14, 4000000/14/8) MCFG_PTM6840_O1_CB(WRITELINE(*this, v6809_state, speaker_w)) MCFG_PTM6840_O2_CB(WRITELINE(*this, v6809_state, speaker_en_w)) @@ -343,7 +343,7 @@ MACHINE_CONFIG_START(v6809_state::v6809) MCFG_MM58274C_MODE24(0) // 12 hour MCFG_MM58274C_DAY1(1) // monday - MCFG_MB8876_ADD("fdc", XTAL(16'000'000) / 16) + MCFG_DEVICE_ADD("fdc", MB8876, 16_MHz_XTAL / 16) MCFG_FLOPPY_DRIVE_ADD("fdc:0", v6809_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END diff --git a/src/mame/drivers/vector06.cpp b/src/mame/drivers/vector06.cpp index 0d989d892c1..5e39fa2f3f7 100644 --- a/src/mame/drivers/vector06.cpp +++ b/src/mame/drivers/vector06.cpp @@ -199,7 +199,7 @@ MACHINE_CONFIG_START(vector06_state::vector06) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) - MCFG_KR1818VG93_ADD("wd1793", XTAL(1'000'000)) + MCFG_DEVICE_ADD("wd1793", KR1818VG93, 1_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD("wd1793:0", vector06_floppies, "qd", vector06_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1793:1", vector06_floppies, "qd", vector06_state::floppy_formats) diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp index 4769aaaa174..8462e307fa5 100644 --- a/src/mame/drivers/vixen.cpp +++ b/src/mame/drivers/vixen.cpp @@ -488,7 +488,7 @@ uint32_t vixen_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, static DISCRETE_SOUND_START( vixen_discrete ) DISCRETE_INPUT_LOGIC(NODE_01) - DISCRETE_SQUAREWAVE(NODE_02, NODE_01, (XTAL(23'961'600)/15360).dvalue(), 100, 50, 0, 90) + DISCRETE_SQUAREWAVE(NODE_02, NODE_01, (23.9616_MHz_XTAL / 15360).dvalue(), 100, 50, 0, 90) DISCRETE_OUTPUT(NODE_02, 2000) DISCRETE_SOUND_END @@ -743,7 +743,7 @@ void vixen_state::machine_reset() MACHINE_CONFIG_START(vixen_state::vixen) // basic machine hardware - MCFG_DEVICE_ADD(Z8400A_TAG, Z80, XTAL(23'961'600)/6) + MCFG_DEVICE_ADD(Z8400A_TAG, Z80, 23.9616_MHz_XTAL / 6) MCFG_DEVICE_PROGRAM_MAP(vixen_mem) MCFG_DEVICE_OPCODES_MAP(bios_mem) MCFG_DEVICE_IO_MAP(vixen_io) @@ -752,7 +752,7 @@ MACHINE_CONFIG_START(vixen_state::vixen) // video hardware MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber()) MCFG_SCREEN_UPDATE_DRIVER(vixen_state, screen_update) - MCFG_SCREEN_RAW_PARAMS(XTAL(23'961'600)/2, 96*8, 0*8, 81*8, 27*10, 0*10, 26*10) + MCFG_SCREEN_RAW_PARAMS(23.9616_MHz_XTAL / 2, 96*8, 0*8, 81*8, 27*10, 0*10, 26*10) MCFG_TIMER_DRIVER_ADD_SCANLINE("vsync", vixen_state, vsync_tick, SCREEN_TAG, 26*10, 27*10) @@ -764,12 +764,12 @@ MACHINE_CONFIG_START(vixen_state::vixen) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) // devices - MCFG_DEVICE_ADD(P8155H_TAG, I8155, XTAL(23'961'600)/6) + MCFG_DEVICE_ADD(P8155H_TAG, I8155, 23.9616_MHz_XTAL / 6) MCFG_I8155_IN_PORTA_CB(READ8(*this, vixen_state, i8155_pa_r)) MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, vixen_state, i8155_pb_w)) MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, vixen_state, i8155_pc_w)) - MCFG_DEVICE_ADD(P8155H_IO_TAG, I8155, XTAL(23'961'600)/6) + MCFG_DEVICE_ADD(P8155H_IO_TAG, I8155, 23.9616_MHz_XTAL / 6) MCFG_I8155_OUT_PORTA_CB(WRITE8(IEEE488_TAG, ieee488_device, dio_w)) MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, vixen_state, io_i8155_pb_w)) MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, vixen_state, io_i8155_pc_w)) @@ -786,7 +786,7 @@ MACHINE_CONFIG_START(vixen_state::vixen) MCFG_RS232_RXD_HANDLER(WRITELINE(P8251A_TAG, i8251_device, write_rxd)) MCFG_RS232_DSR_HANDLER(WRITELINE(P8251A_TAG, i8251_device, write_dsr)) - MCFG_FD1797_ADD(FDC1797_TAG, XTAL(23'961'600)/24) + MCFG_DEVICE_ADD(FDC1797_TAG, FD1797, 23.9616_MHz_XTAL / 24) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, vixen_state, fdc_intrq_w)) MCFG_FLOPPY_DRIVE_ADD(FDC1797_TAG":0", vixen_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp index aa344856ead..db550b28394 100644 --- a/src/mame/drivers/wicat.cpp +++ b/src/mame/drivers/wicat.cpp @@ -921,7 +921,8 @@ MACHINE_CONFIG_START(wicat_state::wicat) MCFG_DEVICE_ADD("wd1kcpu", N8X300, 8_MHz_XTAL) MCFG_DEVICE_PROGRAM_MAP(wicat_wd1000_mem) MCFG_DEVICE_IO_MAP(wicat_wd1000_io) - MCFG_FD1795_ADD("fdc", 8_MHz_XTAL) + + MCFG_DEVICE_ADD("fdc", FD1795, 8_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD("fdc:0", wicat_floppies, "525qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", wicat_floppies, nullptr, floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index c2cd9f511df..afd230a7660 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -2251,7 +2251,7 @@ MACHINE_CONFIG_START(x1_state::x1) MCFG_VIDEO_START_OVERRIDE(x1_state,x1) - MCFG_MB8877_ADD("fdc", MAIN_CLOCK / 16) + MCFG_DEVICE_ADD("fdc", MB8877, MAIN_CLOCK / 16) // TODO: guesswork, try to implicitily start the motor MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, x1_state, hdl_w)) diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp index 2ac2ae944a9..d6db2855d3a 100644 --- a/src/mame/drivers/x1twin.cpp +++ b/src/mame/drivers/x1twin.cpp @@ -42,9 +42,9 @@ public: }; -#define X1_MAIN_CLOCK XTAL(16'000'000) -#define VDP_CLOCK XTAL(42'954'545) -#define MCU_CLOCK XTAL(6'000'000) +#define X1_MAIN_CLOCK 16_MHz_XTAL +#define VDP_CLOCK 42.954545_MHz_XTAL +#define MCU_CLOCK 6_MHz_XTAL #define PCE_MAIN_CLOCK VDP_CLOCK / 2 uint32_t x1twin_state::screen_update_x1pce(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) @@ -477,7 +477,7 @@ MACHINE_CONFIG_START(x1twin_state::x1twin) MCFG_VIDEO_START_OVERRIDE(x1twin_state,x1) - MCFG_MB8877_ADD("fdc", MAIN_CLOCK / 16) + MCFG_DEVICE_ADD("fdc", MB8877, MAIN_CLOCK / 16) // TODO: guesswork, try to implicitily start the motor MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, x1_state, hdl_w)) diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp index ec2ca34bd70..4c424ab7f6a 100644 --- a/src/mame/drivers/xerox820.cpp +++ b/src/mame/drivers/xerox820.cpp @@ -291,7 +291,7 @@ WRITE8_MEMBER( xerox820_state::kbpio_pa_w ) { m_8n5 = _8n5; - m_fdc->set_unscaled_clock(m_8n5 ? XTAL(20'000'000)/10 : XTAL(20'000'000)/20); + m_fdc->set_unscaled_clock(m_8n5 ? 20_MHz_XTAL / 10 : 20_MHz_XTAL / 20); } m_400_460 = !floppy->twosid_r(); @@ -605,7 +605,7 @@ GFXDECODE_END MACHINE_CONFIG_START(xerox820_state::xerox820) /* basic machine hardware */ - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(20'000'000)/8) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 20_MHz_XTAL / 8) MCFG_DEVICE_PROGRAM_MAP(xerox820_mem) MCFG_DEVICE_IO_MAP(xerox820_io) MCFG_Z80_DAISY_CHAIN(xerox820_daisy_chain) @@ -613,34 +613,34 @@ MACHINE_CONFIG_START(xerox820_state::xerox820) /* video hardware */ MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(xerox820_state, screen_update) - MCFG_SCREEN_RAW_PARAMS(XTAL(10'694'250), 700, 0, 560, 260, 0, 240) + MCFG_SCREEN_RAW_PARAMS(10.69425_MHz_XTAL, 700, 0, 560, 260, 0, 240) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_xerox820) MCFG_PALETTE_ADD_MONOCHROME("palette") /* devices */ - MCFG_DEVICE_ADD(Z80PIO_KB_TAG, Z80PIO, XTAL(20'000'000)/8) + MCFG_DEVICE_ADD(Z80PIO_KB_TAG, Z80PIO, 20_MHz_XTAL / 8) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(*this, xerox820_state, kbpio_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, xerox820_state, kbpio_pa_w)) MCFG_Z80PIO_IN_PB_CB(READ8(*this, xerox820_state, kbpio_pb_r)) - MCFG_DEVICE_ADD(Z80PIO_GP_TAG, Z80PIO, XTAL(20'000'000)/8) + MCFG_DEVICE_ADD(Z80PIO_GP_TAG, Z80PIO, 20_MHz_XTAL / 8) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(20'000'000)/8) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 20_MHz_XTAL / 8) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg1)) MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg3)) - //MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(XTAL(20'000'000)/8)) + //MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(20_MHz_XTAL / 8)) - MCFG_FD1771_ADD(FD1771_TAG, XTAL(20'000'000)/20) + MCFG_DEVICE_ADD(FD1771_TAG, FD1771, 20_MHz_XTAL / 20) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, xerox820_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, xerox820_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":0", xerox820_floppies, "sa400l", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":1", xerox820_floppies, "sa400l", floppy_image_device::default_floppy_formats) - MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(20'000'000)/8) + MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, 20_MHz_XTAL / 8) MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) @@ -655,7 +655,7 @@ MACHINE_CONFIG_START(xerox820_state::xerox820) MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80sio0_device, rxb_w)) - MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800)) + MCFG_DEVICE_ADD(COM8116_TAG, COM8116, 5.0688_MHz_XTAL) MCFG_COM8116_FR_HANDLER(WRITELINE(*this, xerox820_state, fr_w)) MCFG_COM8116_FT_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w)) @@ -681,7 +681,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(xerox820ii_state::xerox820ii) /* basic machine hardware */ - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 16_MHz_XTAL / 4) MCFG_DEVICE_PROGRAM_MAP(xerox820ii_mem) MCFG_DEVICE_IO_MAP(xerox820ii_io) MCFG_Z80_DAISY_CHAIN(xerox820_daisy_chain) @@ -689,7 +689,7 @@ MACHINE_CONFIG_START(xerox820ii_state::xerox820ii) /* video hardware */ MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(xerox820ii_state, screen_update) - MCFG_SCREEN_RAW_PARAMS(XTAL(10'694'250), 700, 0, 560, 260, 0, 240) + MCFG_SCREEN_RAW_PARAMS(10.69425_MHz_XTAL, 700, 0, 560, 260, 0, 240) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_xerox820ii) MCFG_PALETTE_ADD_MONOCHROME("palette") @@ -700,16 +700,16 @@ MACHINE_CONFIG_START(xerox820ii_state::xerox820ii) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* devices */ - MCFG_DEVICE_ADD(Z80PIO_KB_TAG, Z80PIO, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80PIO_KB_TAG, Z80PIO, 16_MHz_XTAL / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(*this, xerox820_state, kbpio_pa_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, xerox820_state, kbpio_pa_w)) MCFG_Z80PIO_IN_PB_CB(READ8(*this, xerox820_state, kbpio_pb_r)) - MCFG_DEVICE_ADD(Z80PIO_GP_TAG, Z80PIO, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80PIO_GP_TAG, Z80PIO, 16_MHz_XTAL / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD(Z80PIO_RD_TAG, Z80PIO, XTAL(20'000'000)/8) + MCFG_DEVICE_ADD(Z80PIO_RD_TAG, Z80PIO, 20_MHz_XTAL / 8) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8("sasi_data_in", input_buffer_device, read)) MCFG_Z80PIO_OUT_PA_CB(WRITE8("sasi_data_out", output_latch_device, write)) @@ -717,19 +717,19 @@ MACHINE_CONFIG_START(xerox820ii_state::xerox820ii) MCFG_Z80PIO_IN_PB_CB(READ8("sasi_ctrl_in", input_buffer_device, read)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, xerox820ii_state, rdpio_pb_w)) - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 16_MHz_XTAL / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg1)) MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg3)) - //MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(XTAL(16'000'000)/4)) + //MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(16_MHz_XTAL / 4)) - MCFG_FD1797_ADD(FD1797_TAG, XTAL(16'000'000)/8) + MCFG_DEVICE_ADD(FD1797_TAG, FD1797, 16_MHz_XTAL / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, xerox820_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, xerox820_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", xerox820_floppies, "sa450", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", xerox820_floppies, "sa450", floppy_image_device::default_floppy_formats) - MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, 16_MHz_XTAL / 4) MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) @@ -744,7 +744,7 @@ MACHINE_CONFIG_START(xerox820ii_state::xerox820ii) MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80sio0_device, rxb_w)) - MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800)) + MCFG_DEVICE_ADD(COM8116_TAG, COM8116, 5.0688_MHz_XTAL) MCFG_COM8116_FR_HANDLER(WRITELINE(*this, xerox820_state, fr_w)) MCFG_COM8116_FT_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w)) diff --git a/src/mame/drivers/xor100.cpp b/src/mame/drivers/xor100.cpp index 33fc9e412ba..85cadc672ac 100644 --- a/src/mame/drivers/xor100.cpp +++ b/src/mame/drivers/xor100.cpp @@ -509,12 +509,12 @@ void xor100_state::post_load() MACHINE_CONFIG_START(xor100_state::xor100) /* basic machine hardware */ - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) + MCFG_DEVICE_ADD(Z80_TAG, Z80, 8_MHz_XTAL / 2) MCFG_DEVICE_PROGRAM_MAP(xor100_mem) MCFG_DEVICE_IO_MAP(xor100_io) /* devices */ - MCFG_DEVICE_ADD(I8251_A_TAG, I8251, 0/*XTAL(8'000'000)/2,*/) + MCFG_DEVICE_ADD(I8251_A_TAG, I8251, 0/*8_MHz_XTAL / 2,*/) MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) @@ -523,7 +523,7 @@ MACHINE_CONFIG_START(xor100_state::xor100) MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_A_TAG, i8251_device, write_rxd)) MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_A_TAG, i8251_device, write_dsr)) - MCFG_DEVICE_ADD(I8251_B_TAG, I8251, 0/*XTAL(8'000'000)/2,*/) + MCFG_DEVICE_ADD(I8251_B_TAG, I8251, 0/*8_MHz_XTAL / 2,*/) MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd)) MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr)) MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts)) @@ -534,7 +534,7 @@ MACHINE_CONFIG_START(xor100_state::xor100) MCFG_RS232_CTS_HANDLER(WRITELINE(I8251_B_TAG, i8251_device, write_cts)) MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal) - MCFG_DEVICE_ADD(COM5016_TAG, COM8116, XTAL(5'068'800)) + MCFG_DEVICE_ADD(COM5016_TAG, COM8116, 5.0688_MHz_XTAL) MCFG_COM8116_FR_HANDLER(WRITELINE(I8251_A_TAG, i8251_device, write_txc)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(I8251_A_TAG, i8251_device, write_rxc)) MCFG_COM8116_FT_HANDLER(WRITELINE(I8251_B_TAG, i8251_device, write_txc)) @@ -545,13 +545,13 @@ MACHINE_CONFIG_START(xor100_state::xor100) MCFG_I8255_OUT_PORTB_CB(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe)) MCFG_I8255_IN_PORTC_CB(READ8(*this, xor100_state, i8255_pc_r)) - MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/2) + MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 8_MHz_XTAL / 2) MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, xor100_state, ctc_z0_w)) MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, xor100_state, ctc_z1_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, xor100_state, ctc_z2_w)) - MCFG_FD1795_ADD(WD1795_TAG, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD(WD1795_TAG, FD1795, 8_MHz_XTAL / 4) MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":0", xor100_floppies, "8ssdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":1", xor100_floppies, "8ssdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":2", xor100_floppies, nullptr, floppy_image_device::default_floppy_formats) @@ -565,7 +565,7 @@ MACHINE_CONFIG_START(xor100_state::xor100) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") // S-100 - MCFG_DEVICE_ADD(S100_TAG, S100_BUS, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD(S100_TAG, S100_BUS, 8_MHz_XTAL / 4) MCFG_S100_RDY_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT)) MCFG_S100_SLOT_ADD(S100_TAG ":1", xor100_s100_cards, nullptr) MCFG_S100_SLOT_ADD(S100_TAG ":2", xor100_s100_cards, nullptr) diff --git a/src/mame/drivers/z100.cpp b/src/mame/drivers/z100.cpp index 4372fa31e9d..428cad62a85 100644 --- a/src/mame/drivers/z100.cpp +++ b/src/mame/drivers/z100.cpp @@ -673,7 +673,7 @@ static void z100_floppies(device_slot_interface &device) MACHINE_CONFIG_START(z100_state::z100) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu",I8088, XTAL(14'318'181)/3) + MCFG_DEVICE_ADD("maincpu", I8088, 14.318181_MHz_XTAL / 3) MCFG_DEVICE_PROGRAM_MAP(z100_mem) MCFG_DEVICE_IO_MAP(z100_io) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb) @@ -690,7 +690,7 @@ MACHINE_CONFIG_START(z100_state::z100) MCFG_PALETTE_ADD("palette", 8) /* devices */ - MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(14'318'181)/8) /* unknown clock, hand tuned to get ~50/~60 fps */ + MCFG_MC6845_ADD("crtc", MC6845, "screen", 14.318181_MHz_XTAL / 8) /* unknown clock, hand tuned to get ~50/~60 fps */ MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) @@ -711,7 +711,7 @@ MACHINE_CONFIG_START(z100_state::z100) MCFG_DEVICE_ADD("pia1", PIA6821, 0) - MCFG_FD1797_ADD("z207_fdc", XTAL(1'000'000)) + MCFG_DEVICE_ADD("z207_fdc", FD1797, 1_MHz_XTAL) MCFG_FLOPPY_DRIVE_ADD("z207_fdc:0", z100_floppies, "dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("z207_fdc:1", z100_floppies, "dd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp index ab1187cd790..4a176128d49 100644 --- a/src/mame/drivers/z80ne.cpp +++ b/src/mame/drivers/z80ne.cpp @@ -471,7 +471,7 @@ MACHINE_CONFIG_START(z80ne_state::z80net) /* video hardware */ MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847") - MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619)) + MCFG_DEVICE_ADD("mc6847", MC6847_PAL, 4.433619_MHz_XTAL) MCFG_MC6847_INPUT_CALLBACK(READ8(*this, z80ne_state, lx388_mc6847_videoram_r)) // AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND // other lines not connected @@ -522,7 +522,7 @@ MACHINE_CONFIG_START(z80ne_state::z80netb) /* video hardware */ MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847") - MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619)) + MCFG_DEVICE_ADD("mc6847", MC6847_PAL, 4.433619_MHz_XTAL) MCFG_MC6847_INPUT_CALLBACK(READ8(*this, z80ne_state, lx388_mc6847_videoram_r)) // AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND // other lines not connected @@ -563,12 +563,12 @@ MACHINE_CONFIG_START(z80netf_state::z80netf) /* video hardware */ MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847") - MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619)) + MCFG_DEVICE_ADD("mc6847", MC6847_PAL, 4.433619_MHz_XTAL) MCFG_MC6847_INPUT_CALLBACK(READ8(*this, z80ne_state, lx388_mc6847_videoram_r)) // AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND // other lines not connected - MCFG_FD1771_ADD("wd1771", XTAL(2'000'000) / 2) + MCFG_DEVICE_ADD("wd1771", FD1771, 2_MHz_XTAL / 2) MCFG_FLOPPY_DRIVE_ADD("wd1771:0", z80ne_floppies, "sssd", z80ne_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1771:1", z80ne_floppies, "sssd", z80ne_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1771:2", z80ne_floppies, nullptr, z80ne_state::floppy_formats) diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index 2d4e52bbedb..3d35a304b19 100644 --- a/src/mame/drivers/zorba.cpp +++ b/src/mame/drivers/zorba.cpp @@ -226,7 +226,7 @@ MACHINE_CONFIG_START(zorba_state::zorba) MCFG_VIDEO_SET_SCREEN("screen") // Floppies - MCFG_FD1793_ADD(m_fdc, 24_MHz_XTAL / 24) + MCFG_DEVICE_ADD(m_fdc, FD1793, 24_MHz_XTAL / 24) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("irq2", input_merger_device, in_w<0>)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("irq2", input_merger_device, in_w<1>)) MCFG_FLOPPY_DRIVE_ADD(m_floppy0, zorba_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/machine/beta.cpp b/src/mame/machine/beta.cpp index 575b7d23c52..15c7fc4a561 100644 --- a/src/mame/machine/beta.cpp +++ b/src/mame/machine/beta.cpp @@ -268,7 +268,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(beta_disk_device::device_add_mconfig) - MCFG_KR1818VG93_ADD("wd179x", XTAL(8'000'000) / 8) + MCFG_DEVICE_ADD("wd179x", KR1818VG93, 8_MHz_XTAL / 8) MCFG_FLOPPY_DRIVE_ADD("wd179x:0", beta_disk_floppies, "525qd", beta_disk_device::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("wd179x:1", beta_disk_floppies, "525qd", beta_disk_device::floppy_formats) |