summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/apricot.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/apricot.cpp')
-rw-r--r--src/mame/drivers/apricot.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp
index cc4ffc38c85..774d48d7058 100644
--- a/src/mame/drivers/apricot.cpp
+++ b/src/mame/drivers/apricot.cpp
@@ -188,7 +188,7 @@ WRITE8_MEMBER( apricot_state::i8255_portb_w )
floppy->mon_w(0);
// switch video modes
- m_crtc->set_clock(m_video_mode ? XTAL_15MHz / 10 : XTAL_15MHz / 16);
+ m_crtc->set_clock(m_video_mode ? XTAL(15'000'000) / 10 : XTAL(15'000'000) / 16);
m_crtc->set_hpixels_per_column(m_video_mode ? 10 : 16);
// PB7 Centronics transceiver direction. 0 = output, 1 = input
@@ -352,14 +352,14 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(apricot_state::apricot)
// main cpu
- MCFG_CPU_ADD("ic91", I8086, XTAL_15MHz / 3)
+ MCFG_CPU_ADD("ic91", I8086, XTAL(15'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(apricot_mem)
MCFG_CPU_IO_MAP(apricot_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("ic31", pic8259_device, inta_cb)
MCFG_I8086_LOCK_HANDLER(WRITELINE(apricot_state, i8086_lock_w))
// i/o cpu
- MCFG_CPU_ADD("ic71", I8089, XTAL_15MHz / 3)
+ MCFG_CPU_ADD("ic71", I8089, XTAL(15'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(apricot_mem)
MCFG_CPU_IO_MAP(apricot_io)
MCFG_I8089_DATA_WIDTH(16)
@@ -379,7 +379,7 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
- MCFG_MC6845_ADD("ic30", HD6845, "screen", XTAL_15MHz / 10)
+ MCFG_MC6845_ADD("ic30", HD6845, "screen", XTAL(15'000'000) / 10)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(10)
MCFG_MC6845_UPDATE_ROW_CB(apricot_state, crtc_update_row)
@@ -387,7 +387,7 @@ MACHINE_CONFIG_START(apricot_state::apricot)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ic7", SN76489, XTAL_4MHz / 2)
+ MCFG_SOUND_ADD("ic7", SN76489, XTAL(4'000'000) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
// devices
@@ -402,11 +402,11 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("ic91", 0))
MCFG_DEVICE_ADD("ic16", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_4MHz / 16)
+ MCFG_PIT8253_CLK0(XTAL(4'000'000) / 16)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("ic31", pic8259_device, ir6_w))
- MCFG_PIT8253_CLK1(XTAL_4MHz / 2)
+ MCFG_PIT8253_CLK1(XTAL(4'000'000) / 2)
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("ic14", ttl153_device, i0a_w))
- MCFG_PIT8253_CLK2(XTAL_4MHz / 2)
+ MCFG_PIT8253_CLK2(XTAL(4'000'000) / 2)
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("ic14", ttl153_device, i0b_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ic14", ttl153_device, i2a_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ic14", ttl153_device, i2b_w))
@@ -415,10 +415,10 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_TTL153_ZA_CB(DEVWRITELINE("ic15", z80sio_device, rxca_w))
MCFG_TTL153_ZB_CB(DEVWRITELINE("ic15", z80sio_device, txca_w))
- MCFG_CLOCK_ADD("ic15_rxtxcb", XTAL_4MHz / 16)
+ MCFG_CLOCK_ADD("ic15_rxtxcb", XTAL(4'000'000) / 16)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ic15", z80sio_device, rxtxcb_w))
- MCFG_DEVICE_ADD("ic15", Z80SIO, XTAL_15MHz / 6)
+ MCFG_DEVICE_ADD("ic15", Z80SIO, XTAL(15'000'000) / 6)
MCFG_Z80SIO_CPU("ic91")
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
@@ -454,7 +454,7 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
// floppy
- MCFG_WD2797_ADD("ic68", XTAL_4MHz / 2)
+ MCFG_WD2797_ADD("ic68", XTAL(4'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(apricot_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("ic71", i8089_device, drq1_w))
MCFG_FLOPPY_DRIVE_ADD("ic68:0", apricot_floppies, "d32w", apricot_state::floppy_formats)