diff options
author | Olivier Galibert <galibert@pobox.com> | 2018-01-21 23:42:41 +0100 |
---|---|---|
committer | Olivier Galibert <galibert@pobox.com> | 2018-01-23 10:25:25 +0100 |
commit | 03ba80e0ef3e021f6ff89ef91ae5cdce4e24b994 (patch) | |
tree | f127b7f533d36df2484f82fcb05cef5f4c04f232 /src/devices/bus/isa | |
parent | f61a64ea29bf46bf2deb2e1fbace5b24f3d7b0aa (diff) |
xtal.h is dead, long live to xtal.cpp [O. Galibert]
Diffstat (limited to 'src/devices/bus/isa')
26 files changed, 76 insertions, 76 deletions
diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp index 6a536b69f1f..51c9e1679c9 100644 --- a/src/devices/bus/isa/aga.cpp +++ b/src/devices/bus/isa/aga.cpp @@ -9,8 +9,8 @@ #include "aga.h" #include "video/cgapal.h" -#define CGA_HCLK (XTAL_14_31818MHz/8) -#define CGA_LCLK (XTAL_14_31818MHz/16) +#define CGA_HCLK (XTAL(14'318'181)/8) +#define CGA_LCLK (XTAL(14'318'181)/16) #define AGA_SCREEN_NAME "screen" #define AGA_MC6845_NAME "mc6845_aga" @@ -275,12 +275,12 @@ MC6845_UPDATE_ROW( isa8_aga_device::aga_update_row ) MACHINE_CONFIG_START(isa8_aga_device::device_add_mconfig) MCFG_SCREEN_ADD( AGA_SCREEN_NAME, RASTER ) - MCFG_SCREEN_RAW_PARAMS( XTAL_14_31818MHz,912,0,640,262,0,200 ) + MCFG_SCREEN_RAW_PARAMS( XTAL(14'318'181),912,0,640,262,0,200 ) MCFG_SCREEN_UPDATE_DEVICE( AGA_MC6845_NAME, mc6845_device, screen_update ) MCFG_PALETTE_ADD( "palette", /* CGA_PALETTE_SETS * 16*/ 65536 ) - MCFG_MC6845_ADD(AGA_MC6845_NAME, MC6845, AGA_SCREEN_NAME, XTAL_14_31818MHz/8) + MCFG_MC6845_ADD(AGA_MC6845_NAME, MC6845, AGA_SCREEN_NAME, XTAL(14'318'181)/8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(isa8_aga_device, aga_update_row) @@ -863,7 +863,7 @@ void isa8_aga_device::pc_aga_set_mode( AGA_MODE mode) switch (m_mode) { case AGA_COLOR: - m_mc6845->set_clock( XTAL_14_31818MHz/8 ); + m_mc6845->set_clock( XTAL(14'318'181)/8 ); break; case AGA_MONO: m_mc6845->set_clock( 16257000/9 ); diff --git a/src/devices/bus/isa/aha1542.cpp b/src/devices/bus/isa/aha1542.cpp index 9b633c5717a..5be4b1de3cb 100644 --- a/src/devices/bus/isa/aha1542.cpp +++ b/src/devices/bus/isa/aha1542.cpp @@ -175,7 +175,7 @@ const tiny_rom_entry *aha1542_device::device_rom_region() const } MACHINE_CONFIG_START(aha1542_device::device_add_mconfig) - MCFG_CPU_ADD(Z84C0010_TAG, Z80, XTAL_12MHz) + MCFG_CPU_ADD(Z84C0010_TAG, Z80, XTAL(12'000'000)) MCFG_CPU_PROGRAM_MAP( z84c0010_mem ) MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp index 0609d9ce7a3..7d87ae853bf 100644 --- a/src/devices/bus/isa/cga.cpp +++ b/src/devices/bus/isa/cga.cpp @@ -240,8 +240,8 @@ MC6845_UPDATE_ROW( isa8_cga_pc1512_device::crtc_update_row ) } -#define CGA_HCLK (XTAL_14_31818MHz/8) -#define CGA_LCLK (XTAL_14_31818MHz/16) +#define CGA_HCLK (XTAL(14'318'181)/8) +#define CGA_LCLK (XTAL(14'318'181)/16) ROM_START( cga ) @@ -263,12 +263,12 @@ DEFINE_DEVICE_TYPE(ISA8_CGA, isa8_cga_device, "cga", "IBM Color/Graphics Monitor MACHINE_CONFIG_START(isa8_cga_device::device_add_mconfig) MCFG_SCREEN_ADD(CGA_SCREEN_NAME, RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,262,0,200) + MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181),912,0,640,262,0,200) MCFG_SCREEN_UPDATE_DEVICE( DEVICE_SELF, isa8_cga_device, screen_update ) MCFG_PALETTE_ADD("palette", /* CGA_PALETTE_SETS * 16*/ 65536 ) - MCFG_MC6845_ADD(CGA_MC6845_NAME, MC6845, CGA_SCREEN_NAME, XTAL_14_31818MHz/8) + MCFG_MC6845_ADD(CGA_MC6845_NAME, MC6845, CGA_SCREEN_NAME, XTAL(14'318'181)/8) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(isa8_cga_device, crtc_update_row) @@ -1705,7 +1705,7 @@ MACHINE_CONFIG_START(isa8_cga_m24_device::device_add_mconfig) isa8_cga_device::device_add_mconfig(config); MCFG_DEVICE_MODIFY(CGA_SCREEN_NAME) - MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,462,0,400) + MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181),912,0,640,462,0,400) MCFG_DEVICE_MODIFY(CGA_MC6845_NAME) MCFG_MC6845_RECONFIGURE_CB(isa8_cga_m24_device, reconfigure) MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp index 86d0ff8e6ab..3fa3a9b3ffb 100644 --- a/src/devices/bus/isa/com.cpp +++ b/src/devices/bus/isa/com.cpp @@ -33,22 +33,22 @@ DEFINE_DEVICE_TYPE(ISA8_COM, isa8_com_device, "isa_com", "Communications Adapter //------------------------------------------------- MACHINE_CONFIG_START(isa8_com_device::device_add_mconfig) - MCFG_DEVICE_ADD( "uart_0", INS8250, XTAL_1_8432MHz ) + MCFG_DEVICE_ADD( "uart_0", INS8250, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport0", rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1)) - MCFG_DEVICE_ADD( "uart_1", INS8250, XTAL_1_8432MHz ) + MCFG_DEVICE_ADD( "uart_1", INS8250, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport1", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport1", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport1", rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_2)) - /*MCFG_DEVICE_ADD( "uart_2", INS8250, XTAL_1_8432MHz ) + /*MCFG_DEVICE_ADD( "uart_2", INS8250, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport2", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport2", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport2", rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1)) - MCFG_DEVICE_ADD( "uart_3", INS8250, XTAL_1_8432MHz ) + MCFG_DEVICE_ADD( "uart_3", INS8250, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport3", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport3", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport3", rs232_port_device, write_rts)) @@ -135,22 +135,22 @@ DEFINE_DEVICE_TYPE(ISA8_COM_AT, isa8_com_at_device, "isa_com_at", "Communication //------------------------------------------------- MACHINE_CONFIG_START(isa8_com_at_device::device_add_mconfig) - MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL_1_8432MHz ) /* Verified: IBM P/N 6320947 Serial/Parallel card uses an NS16450N */ + MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL(1'843'200) ) /* Verified: IBM P/N 6320947 Serial/Parallel card uses an NS16450N */ MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport0", rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1)) - MCFG_DEVICE_ADD( "uart_1", NS16450, XTAL_1_8432MHz ) + MCFG_DEVICE_ADD( "uart_1", NS16450, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport1", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport1", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport1", rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_2)) - /*MCFG_DEVICE_ADD( "uart_2", NS16450, XTAL_1_8432MHz ) + /*MCFG_DEVICE_ADD( "uart_2", NS16450, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport2", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport2", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport2", rs232_port_device, write_rts)) MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1)) - MCFG_DEVICE_ADD( "uart_3", NS16450, XTAL_1_8432MHz ) + MCFG_DEVICE_ADD( "uart_3", NS16450, XTAL(1'843'200) ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport3", rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport3", rs232_port_device, write_dtr)) MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport3", rs232_port_device, write_rts)) diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp index 38477e648ab..7cb022c0a19 100644 --- a/src/devices/bus/isa/dectalk.cpp +++ b/src/devices/bus/isa/dectalk.cpp @@ -154,12 +154,12 @@ const tiny_rom_entry* dectalk_isa_device::device_rom_region() const } MACHINE_CONFIG_START(dectalk_isa_device::device_add_mconfig) - MCFG_CPU_ADD("dectalk_cpu", I80186, XTAL_20MHz) + MCFG_CPU_ADD("dectalk_cpu", I80186, XTAL(20'000'000)) MCFG_CPU_IO_MAP(dectalk_cpu_io) MCFG_CPU_PROGRAM_MAP(dectalk_cpu_map) MCFG_80186_TMROUT0_HANDLER(WRITELINE(dectalk_isa_device, clock_w)); - MCFG_CPU_ADD("dectalk_dsp", TMS32015, XTAL_20MHz) + MCFG_CPU_ADD("dectalk_dsp", TMS32015, XTAL(20'000'000)) MCFG_CPU_IO_MAP(dectalk_dsp_io) MCFG_TMS32010_BIO_IN_CB(READLINE(dectalk_isa_device, bio_line_r)) MCFG_CPU_PROGRAM_MAP(dectalk_dsp_map) diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp index ceb8b9ddc5d..12ca0086531 100644 --- a/src/devices/bus/isa/ega.cpp +++ b/src/devices/bus/isa/ega.cpp @@ -940,7 +940,7 @@ void isa8_ega_device::change_mode() } /* Check for changes to the crtc input clock and number of pixels per clock */ - clock = ( ( m_misc_output & 0x0c ) ? 16257000 : XTAL_14_31818MHz ); + clock = ( ( m_misc_output & 0x0c ) ? 16257000 : 14318181 ); pixels = ( ( m_sequencer.data[0x01] & 0x01 ) ? 8 : 9 ); if ( m_sequencer.data[0x01] & 0x08 ) diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp index a0ac2dd5177..d98d404451c 100644 --- a/src/devices/bus/isa/ibm_mfc.cpp +++ b/src/devices/bus/isa/ibm_mfc.cpp @@ -373,7 +373,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(isa8_ibm_mfc_device::device_add_mconfig) - MCFG_CPU_ADD("ibm_mfc", Z80, XTAL_11_8MHz / 2) + MCFG_CPU_ADD("ibm_mfc", Z80, XTAL(11'800'000) / 2) MCFG_CPU_PROGRAM_MAP(prg_map) MCFG_CPU_IO_MAP(io_map) @@ -390,19 +390,19 @@ MACHINE_CONFIG_START(isa8_ibm_mfc_device::device_add_mconfig) MCFG_DEVICE_ADD("d71051", I8251, 0) - MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL_4MHz / 8) // 500KHz + MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL(4'000'000) / 8) // 500KHz MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(isa8_ibm_mfc_device, write_usart_clock)) MCFG_DEVICE_ADD("d8253", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL_4MHz / 8) + MCFG_PIT8253_CLK0(XTAL(4'000'000) / 8) MCFG_PIT8253_OUT0_HANDLER(WRITELINE(isa8_ibm_mfc_device, d8253_out0)) MCFG_PIT8253_CLK1(0) MCFG_PIT8253_OUT1_HANDLER(WRITELINE(isa8_ibm_mfc_device, d8253_out1)) - MCFG_PIT8253_CLK2(XTAL_4MHz / 2) + MCFG_PIT8253_CLK2(XTAL(4'000'000) / 2) MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("d8253", pit8253_device, write_clk1)) MCFG_SPEAKER_STANDARD_STEREO("ymleft", "ymright") - MCFG_YM2151_ADD("ym2151", XTAL_4MHz) + MCFG_YM2151_ADD("ym2151", XTAL(4'000'000)) MCFG_YM2151_IRQ_HANDLER(WRITELINE(isa8_ibm_mfc_device, ibm_mfc_ym_irq)) MCFG_SOUND_ROUTE(0, "ymleft", 1.00) MCFG_SOUND_ROUTE(1, "ymright", 1.00) diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp index 6209473b467..d97985550f7 100644 --- a/src/devices/bus/isa/mc1502_fdc.cpp +++ b/src/devices/bus/isa/mc1502_fdc.cpp @@ -52,7 +52,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(mc1502_fdc_device::device_add_mconfig) - MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16) + MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", mc1502_floppies, "525qd", mc1502_fdc_device::floppy_formats) diff --git a/src/devices/bus/isa/myb3k_com.cpp b/src/devices/bus/isa/myb3k_com.cpp index fbbaa39d8c1..61a79abe6f2 100644 --- a/src/devices/bus/isa/myb3k_com.cpp +++ b/src/devices/bus/isa/myb3k_com.cpp @@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(ISA8_MYB3K_COM, isa8_myb3k_com_device, "isa8_myb3k_com", "ADP // device_add_mconfig - add device configuration //------------------------------------------------- MACHINE_CONFIG_START(isa8_myb3k_com_device::device_add_mconfig) - MCFG_DEVICE_ADD( "usart", I8251, XTAL_15_9744MHz / 8 ) + MCFG_DEVICE_ADD( "usart", I8251, XTAL(15'974'400) / 8 ) MCFG_I8251_TXD_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_txd)) MCFG_I8251_DTR_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_dtr)) MCFG_I8251_RTS_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_rts)) @@ -48,9 +48,9 @@ MACHINE_CONFIG_START(isa8_myb3k_com_device::device_add_mconfig) /* Timer chip */ MCFG_DEVICE_ADD("pit", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL_15_9744MHz / 8 ) /* TxC */ + MCFG_PIT8253_CLK0(XTAL(15'974'400) / 8 ) /* TxC */ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(isa8_myb3k_com_device, pit_txc)) - MCFG_PIT8253_CLK1(XTAL_15_9744MHz / 8 ) /* RxC */ + MCFG_PIT8253_CLK1(XTAL(15'974'400) / 8 ) /* RxC */ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(isa8_myb3k_com_device, pit_rxc)) // Timer 2 is not used/connected to anything on the schematics MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/myb3k_fdc.cpp b/src/devices/bus/isa/myb3k_fdc.cpp index b23fe5258bc..2f4db748450 100644 --- a/src/devices/bus/isa/myb3k_fdc.cpp +++ b/src/devices/bus/isa/myb3k_fdc.cpp @@ -93,7 +93,7 @@ SLOT_INTERFACE_END //------------------------------------------------- /* */ MACHINE_CONFIG_START(isa8_myb3k_fdc4710_device::device_add_mconfig) - MCFG_DEVICE_ADD("fdc", MB8876, XTAL_15_9744MHz / 8) /* From StepOne schematics */ + MCFG_DEVICE_ADD("fdc", MB8876, XTAL(15'974'400) / 8) /* From StepOne schematics */ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4710_device, irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4710_device, drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_sd_floppies, "525sd", isa8_myb3k_fdc4710_device::myb3k_floppy_formats) @@ -102,7 +102,7 @@ MACHINE_CONFIG_END /* Main difference from fdc4710 is that a Hitachi HA16632AP has replaced the descrete VFO enabling 720Kb disks */ MACHINE_CONFIG_START(isa8_myb3k_fdc4711_device::device_add_mconfig) - MCFG_DEVICE_ADD("fdc", FD1791, XTAL_15_9744MHz / 16) + MCFG_DEVICE_ADD("fdc", FD1791, XTAL(15'974'400) / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4711_device, irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4711_device, drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_qd_floppies, "525qd", isa8_myb3k_fdc4711_device::myb3k_floppy_formats) @@ -113,7 +113,7 @@ MACHINE_CONFIG_END #if 0 MACHINE_CONFIG_START(isa8_myb3k_fdc4712_device::device_add_mconfig) - MCFG_DEVICE_ADD("fdc", FD1791, XTAL_15_9744MHz / 8) + MCFG_DEVICE_ADD("fdc", FD1791, XTAL(15'974'400) / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4712_device, irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(isa8_myb3k_fdc4712_device, drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_8inch_floppies, "8dsdd", isa8_myb3k_fdc4712_device::myb3k_floppy_formats) diff --git a/src/devices/bus/isa/num9rev.cpp b/src/devices/bus/isa/num9rev.cpp index ebdd5b7e4cb..5ec78ab8399 100644 --- a/src/devices/bus/isa/num9rev.cpp +++ b/src/devices/bus/isa/num9rev.cpp @@ -60,7 +60,7 @@ MACHINE_CONFIG_START(isa8_number_9_rev_device::device_add_mconfig) MCFG_SCREEN_UPDATE_DRIVER(isa8_number_9_rev_device, screen_update) MCFG_PALETTE_ADD("palette", 4096) - MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL_4_433619MHz/2) // unknown clock + MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL(4'433'619)/2) // unknown clock MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map) MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(isa8_number_9_rev_device, hgdc_display_pixels) MCFG_VIDEO_SET_SCREEN("screen") diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp index d9a0e3d86a0..5d47a021d94 100644 --- a/src/devices/bus/isa/p1_fdc.cpp +++ b/src/devices/bus/isa/p1_fdc.cpp @@ -62,7 +62,7 @@ ROM_END //------------------------------------------------- MACHINE_CONFIG_START(p1_fdc_device::device_add_mconfig) - MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16) + MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", poisk1_floppies, "525qd", p1_fdc_device::floppy_formats) diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp index e9a12df010b..9fa6ea3852e 100644 --- a/src/devices/bus/isa/p1_sound.cpp +++ b/src/devices/bus/isa/p1_sound.cpp @@ -40,28 +40,28 @@ MACHINE_CONFIG_START(p1_sound_device::device_add_mconfig) MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout") MCFG_DEVICE_ADD("d14", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK0(XTAL(12'500'000)/10) // sampler at 10 KHz MCFG_PIT8253_OUT0_HANDLER(WRITELINE(p1_sound_device, sampler_sync)) - MCFG_PIT8253_CLK1(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK1(XTAL(12'500'000)/10) MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("midi", i8251_device, write_txc)) - MCFG_PIT8253_CLK2(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK2(XTAL(12'500'000)/10) MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("midi", i8251_device, write_rxc)) MCFG_DEVICE_ADD("d16", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK0(XTAL(12'500'000)/10) // MCFG_PIT8253_OUT0_HANDLER(XXX) - MCFG_PIT8253_CLK1(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK1(XTAL(12'500'000)/10) // MCFG_PIT8253_OUT1_HANDLER(XXX) - MCFG_PIT8253_CLK2(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK2(XTAL(12'500'000)/10) // MCFG_PIT8253_OUT2_HANDLER(XXX) MCFG_DEVICE_ADD("d17", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK0(XTAL(12'500'000)/10) // MCFG_PIT8253_OUT0_HANDLER(XXX) - MCFG_PIT8253_CLK1(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK1(XTAL(12'500'000)/10) // MCFG_PIT8253_OUT1_HANDLER(XXX) - MCFG_PIT8253_CLK2(XTAL_12_5MHz/10) + MCFG_PIT8253_CLK2(XTAL(12'500'000)/10) // MCFG_PIT8253_OUT2_HANDLER(XXX) MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp index 5caced97de5..6c49434e456 100644 --- a/src/devices/bus/isa/pgc.cpp +++ b/src/devices/bus/isa/pgc.cpp @@ -151,7 +151,7 @@ DEFINE_DEVICE_TYPE(ISA8_PGC, isa8_pgc_device, "isa_ibm_pgc", "IBM Professional G //------------------------------------------------- MACHINE_CONFIG_START(isa8_pgc_device::device_add_mconfig) - MCFG_CPU_ADD("maincpu", I8088, XTAL_24MHz/3) + MCFG_CPU_ADD("maincpu", I8088, XTAL(24'000'000)/3) MCFG_CPU_PROGRAM_MAP(pgc_map) MCFG_CPU_IO_MAP(pgc_io) #if 0 @@ -161,10 +161,10 @@ MACHINE_CONFIG_START(isa8_pgc_device::device_add_mconfig) MCFG_TIMER_DRIVER_ADD_PERIODIC("scantimer", isa8_pgc_device, scanline_callback, attotime::from_hz(60*PGC_TOTAL_VERT)) - MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL_50MHz/(2*PGC_HORZ_START))) + MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL(50'000'000)/(2*PGC_HORZ_START))) MCFG_SCREEN_ADD(PGC_SCREEN_NAME, RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_50MHz/2, + MCFG_SCREEN_RAW_PARAMS(XTAL(50'000'000)/2, PGC_TOTAL_HORZ, PGC_HORZ_START, PGC_HORZ_START+PGC_DISP_HORZ, PGC_TOTAL_VERT, PGC_VERT_START, PGC_VERT_START+PGC_DISP_VERT) MCFG_SCREEN_UPDATE_DRIVER(isa8_pgc_device, screen_update) diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp index 27c142036bf..7fbc8be6aff 100644 --- a/src/devices/bus/isa/s3virge.cpp +++ b/src/devices/bus/isa/s3virge.cpp @@ -260,15 +260,15 @@ uint8_t s3virge_vga_device::s3_crtc_reg_read(uint8_t index) void s3virge_vga_device::s3_define_video_mode() { int divisor = 1; - int xtal = (vga.miscellaneous_output & 0xc) ? XTAL_28_63636MHz : XTAL_25_1748MHz; - double freq; + const XTAL base_xtal = XTAL(14'318'181); + XTAL xtal = (vga.miscellaneous_output & 0xc) ? base_xtal*2 : base_xtal*1.75; if((vga.miscellaneous_output & 0xc) == 0x0c) { // Dot clock is set via SR12 and SR13 // DCLK calculation - freq = ((double)(s3.clk_pll_m+2) / (double)((s3.clk_pll_n+2)*(pow(2.0,s3.clk_pll_r)))) * 14.318; // clock between XIN and XOUT - xtal = freq * 1000000; + double ratio = (double)(s3.clk_pll_m+2) / (double)((s3.clk_pll_n+2)*(pow(2.0,s3.clk_pll_r))); // clock between XIN and XOUT + xtal = base_xtal * ratio; //printf("DCLK set to %dHz M=%i N=%i R=%i\n",xtal,s3.clk_pll_m,s3.clk_pll_n,s3.clk_pll_r); } @@ -296,7 +296,7 @@ void s3virge_vga_device::s3_define_video_mode() } if(s3.cr43 & 0x80) // Horizontal clock doubling (techincally, doubles horizontal CRT parameters) divisor *= 2; - recompute_params_clock(divisor, xtal); + recompute_params_clock(divisor, xtal.value()); } void s3virge_vga_device::s3_crtc_reg_write(uint8_t index, uint8_t data) diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp index 7f0f2d52b12..4d2fb059c2e 100644 --- a/src/devices/bus/isa/sb16.cpp +++ b/src/devices/bus/isa/sb16.cpp @@ -411,11 +411,11 @@ const tiny_rom_entry *sb16_lle_device::device_rom_region() const } MACHINE_CONFIG_START(sb16_lle_device::device_add_mconfig) - MCFG_CPU_ADD("sb16_cpu", I80C52, XTAL_24MHz) + MCFG_CPU_ADD("sb16_cpu", I80C52, XTAL(24'000'000)) MCFG_CPU_IO_MAP(sb16_io) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ymf262", YMF262, XTAL_14_31818MHz) + MCFG_SOUND_ADD("ymf262", YMF262, XTAL(14'318'181)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp index c693e4648c9..9e1260fa25b 100644 --- a/src/devices/bus/isa/sblaster.cpp +++ b/src/devices/bus/isa/sblaster.cpp @@ -52,8 +52,8 @@ jumperable? normally 0x220 */ -#define ym3812_StdClock XTAL_3_579545MHz -#define ymf262_StdClock XTAL_14_31818MHz +#define ym3812_StdClock XTAL(3'579'545) +#define ymf262_StdClock XTAL(14'318'181) static const int m_cmd_fifo_length[256] = { diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp index 4f8568032e4..45adc68b34b 100644 --- a/src/devices/bus/isa/ssi2001.cpp +++ b/src/devices/bus/isa/ssi2001.cpp @@ -12,7 +12,7 @@ DEFINE_DEVICE_TYPE(ISA8_SSI2001, ssi2001_device, "ssi2001", "Innovation SSI-2001 MACHINE_CONFIG_START(ssi2001_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sid6581", MOS6581, XTAL_14_31818MHz/16) + MCFG_SOUND_ADD("sid6581", MOS6581, XTAL(14'318'181)/16) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_PC_JOY_ADD("pc_joy") MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp index 5b9b05033b1..93b397fb703 100644 --- a/src/devices/bus/isa/stereo_fx.cpp +++ b/src/devices/bus/isa/stereo_fx.cpp @@ -115,12 +115,12 @@ const tiny_rom_entry *stereo_fx_device::device_rom_region() const } MACHINE_CONFIG_START(stereo_fx_device::device_add_mconfig) - MCFG_CPU_ADD("stereo_fx_cpu", I80C31, XTAL_30MHz) + MCFG_CPU_ADD("stereo_fx_cpu", I80C31, XTAL(30'000'000)) MCFG_CPU_IO_MAP(stereo_fx_io) MCFG_CPU_PROGRAM_MAP(stereo_fx_rom) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ym3812", YM3812, XTAL_3_579545MHz) + MCFG_SOUND_ADD("ym3812", YM3812, XTAL(3'579'545)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) /* no CM/S support (empty sockets) */ diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp index a28ef5876e2..a7204ce8457 100644 --- a/src/devices/bus/isa/svga_cirrus.cpp +++ b/src/devices/bus/isa/svga_cirrus.cpp @@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_CIRRUS_GD542X, isa16_svga_cirrus_gd542x_device, "c MACHINE_CONFIG_START(isa16_svga_cirrus_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5430_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) @@ -113,7 +113,7 @@ ROM_END MACHINE_CONFIG_START(isa16_svga_cirrus_gd542x_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp index ee5df928b97..353316e1891 100644 --- a/src/devices/bus/isa/svga_s3.cpp +++ b/src/devices/bus/isa/svga_s3.cpp @@ -42,7 +42,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_S3, isa16_svga_s3_device, "s3_764", "Number Nine 9 MACHINE_CONFIG_START(isa16_svga_s3_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) @@ -149,7 +149,7 @@ DEFINE_DEVICE_TYPE(ISA16_S3VIRGE, isa16_s3virge_device, "s3virge", "S3 ViRGE Gra MACHINE_CONFIG_START(isa16_s3virge_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3virge_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) @@ -231,7 +231,7 @@ DEFINE_DEVICE_TYPE(ISA16_S3VIRGEDX, isa16_s3virgedx_device, "s3virgedx", "S3 ViR MACHINE_CONFIG_START(isa16_s3virgedx_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3virgedx_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) @@ -314,7 +314,7 @@ DEFINE_DEVICE_TYPE(ISA16_DMS3D2KPRO, isa16_stealth3d2kpro_device, "dms3d2kp", "D MACHINE_CONFIG_START(isa16_stealth3d2kpro_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3virgedx_rev1_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp index 22b307cd6ad..55c01884f63 100644 --- a/src/devices/bus/isa/svga_trident.cpp +++ b/src/devices/bus/isa/svga_trident.cpp @@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_TGUI9680, isa16_svga_tgui9680_device, "tgui9680", MACHINE_CONFIG_START(isa16_svga_tgui9680_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", trident_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp index 8d60d1a2400..16c76e169b7 100644 --- a/src/devices/bus/isa/svga_tseng.cpp +++ b/src/devices/bus/isa/svga_tseng.cpp @@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(ISA8_SVGA_ET4K, isa8_svga_et4k_device, "et4000", "SVGA Tseng MACHINE_CONFIG_START(isa8_svga_et4k_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", tseng_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) diff --git a/src/devices/bus/isa/trident.cpp b/src/devices/bus/isa/trident.cpp index 287ef49b40a..2357f0cdfbc 100644 --- a/src/devices/bus/isa/trident.cpp +++ b/src/devices/bus/isa/trident.cpp @@ -346,8 +346,8 @@ void trident_vga_device::trident_define_video_mode() switch(tri.clock) { case 0: - default: xtal = XTAL_25_1748MHz; break; - case 1: xtal = XTAL_28_63636MHz; break; + default: xtal = 25174800; break; + case 1: xtal = 28636363; break; case 2: xtal = 44900000; break; case 3: xtal = 36000000; break; case 4: xtal = 57272000; break; @@ -378,8 +378,8 @@ void trident_vga_device::trident_define_video_mode() switch((vga.miscellaneous_output & 0x0c) >> 2) { case 0: - default: xtal = XTAL_25_1748MHz; break; - case 1: xtal = XTAL_28_63636MHz; break; + default: xtal = 25174800; break; + case 1: xtal = 28636363; break; case 2: xtal = calculate_clock(); break; } diff --git a/src/devices/bus/isa/vga.cpp b/src/devices/bus/isa/vga.cpp index 88c38cd1543..280108cb5b3 100644 --- a/src/devices/bus/isa/vga.cpp +++ b/src/devices/bus/isa/vga.cpp @@ -29,7 +29,7 @@ DEFINE_DEVICE_TYPE(ISA8_VGA, isa8_vga_device, "ibm_vga", "IBM VGA Graphics Card" MACHINE_CONFIG_START(isa8_vga_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp index 25f4202cd89..ff1bd656b9b 100644 --- a/src/devices/bus/isa/vga_ati.cpp +++ b/src/devices/bus/isa/vga_ati.cpp @@ -78,7 +78,7 @@ DEFINE_DEVICE_TYPE(ISA16_SVGA_MACH64, isa16_vga_mach64_device, "mach64 MACHINE_CONFIG_START(isa16_vga_gfxultra_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", ati_vga_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) @@ -88,7 +88,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(isa16_vga_gfxultrapro_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", mach32_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) @@ -98,7 +98,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(isa16_vga_mach64_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", mach64_device, screen_update) MCFG_PALETTE_ADD("palette", 0x100) |