summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/bbc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/bbc.cpp')
-rw-r--r--src/mame/drivers/bbc.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp
index f3c4ce2d070..220ef2fce6b 100644
--- a/src/mame/drivers/bbc.cpp
+++ b/src/mame/drivers/bbc.cpp
@@ -853,7 +853,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::bbca)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_16MHz/8) /* 2.00 MHz */
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(16'000'000)/8) /* 2.00 MHz */
MCFG_CPU_PROGRAM_MAP(bbca_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bbc_state, bbcb_vsync) /* screen refresh interrupts */
MCFG_CPU_PERIODIC_INT_DRIVER(bbc_state, bbcb_keyscan, 1000) /* scan keyboard */
@@ -873,7 +873,7 @@ MACHINE_CONFIG_START(bbc_state::bbca)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- //MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz, 1024, 0, 640, 312, 0, 256)
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000), 1024, 0, 640, 312, 0, 256)
MCFG_SCREEN_SIZE(640, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -883,11 +883,11 @@ MACHINE_CONFIG_START(bbc_state::bbca)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(bbc_state,bbc)
- MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL_12MHz/2)
+ MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL(12'000'000)/2)
MCFG_SAA5050_SCREEN_SIZE(40, 25, 40)
/* crtc */
- MCFG_MC6845_ADD("hd6845", HD6845, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD("hd6845", HD6845, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(12)
MCFG_MC6845_UPDATE_ROW_CB(bbc_state, crtc_update_row)
@@ -901,7 +901,7 @@ MACHINE_CONFIG_START(bbc_state::bbca)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489", SN76489, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_SOUND_ADD("sn76489", SN76489, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* cassette */
@@ -924,11 +924,11 @@ MACHINE_CONFIG_START(bbc_state::bbca)
MCFG_RS232_DCD_HANDLER(WRITELINE(bbc_state, write_dcd_serial))
MCFG_RS232_CTS_HANDLER(WRITELINE(bbc_state, write_cts_serial))
- MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL_16MHz / 13)
+ MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(16'000'000) / 13)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(bbc_state, write_acia_clock))
/* system via */
- MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_READPA_HANDLER(READ8(bbc_state, bbcb_via_system_read_porta))
MCFG_VIA6522_READPB_HANDLER(READ8(bbc_state, bbcb_via_system_read_portb))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(bbc_state, bbcb_via_system_write_porta))
@@ -960,7 +960,7 @@ MACHINE_CONFIG_DERIVED(bbc_state::bbcb, bbca)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* user via */
- MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_VIA6522_READPB_HANDLER(DEVREAD8("userport", bbc_userport_slot_device, pb_r))
MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8("userport", bbc_userport_slot_device, pb_w))
@@ -1073,7 +1073,7 @@ MACHINE_CONFIG_DERIVED(bbc_state::bbcbp, bbcb)
/* fdc */
MCFG_DEVICE_REMOVE("fdc")
- MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2)
+ MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, fdc_drq_w))
@@ -1299,7 +1299,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::bbcm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65SC02, XTAL_16MHz/8) /* 2.00 MHz */
+ MCFG_CPU_ADD("maincpu", M65SC02, XTAL(16'000'000)/8) /* 2.00 MHz */
MCFG_CPU_PROGRAM_MAP(bbcm_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bbc_state, bbcb_vsync) /* screen refresh interrupts */
MCFG_CPU_PERIODIC_INT_DRIVER(bbc_state, bbcb_keyscan, 1000) /* scan keyboard */
@@ -1329,11 +1329,11 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(bbc_state, bbc)
- MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL_12MHz / 2)
+ MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL(12'000'000) / 2)
MCFG_SAA5050_SCREEN_SIZE(40, 25, 40)
/* crtc */
- MCFG_MC6845_ADD("hd6845", HD6845, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD("hd6845", HD6845, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(12)
MCFG_MC6845_UPDATE_ROW_CB(bbc_state, crtc_update_row)
@@ -1345,11 +1345,11 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489", SN76489, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_SOUND_ADD("sn76489", SN76489, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* rtc and cmos */
- MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz )
+ MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
@@ -1389,7 +1389,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_RS232_DCD_HANDLER(WRITELINE(bbc_state, write_dcd_serial))
MCFG_RS232_CTS_HANDLER(WRITELINE(bbc_state, write_cts_serial))
- MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL_16MHz / 13)
+ MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(16'000'000) / 13)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(bbc_state, write_acia_clock))
/* adc */
@@ -1398,7 +1398,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_UPD7002_EOC_CB(bbc_state, BBC_uPD7002_EOC)
/* system via */
- MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_READPA_HANDLER(READ8(bbc_state, bbcb_via_system_read_porta))
MCFG_VIA6522_READPB_HANDLER(READ8(bbc_state, bbcb_via_system_read_portb))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(bbc_state, bbcb_via_system_write_porta))
@@ -1406,7 +1406,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<1>))
/* user via */
- MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_VIA6522_READPB_HANDLER(DEVREAD8("userport", bbc_userport_slot_device, pb_r))
MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8("userport", bbc_userport_slot_device, pb_w))
@@ -1414,7 +1414,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<2>))
/* fdc */
- MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2)
+ MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, fdc_drq_w))
@@ -1586,7 +1586,7 @@ MACHINE_CONFIG_DERIVED(bbc_state::bbcmc, bbcm)
/* fdc */
MCFG_DEVICE_REMOVE("wd1770")
- MCFG_WD1772_ADD("wd1772", XTAL_16MHz / 2)
+ MCFG_WD1772_ADD("wd1772", XTAL(16'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, fdc_drq_w))