summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/amstrad.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/amstrad.cpp')
-rw-r--r--src/mame/drivers/amstrad.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp
index af49931da6e..37e268f7466 100644
--- a/src/mame/drivers/amstrad.cpp
+++ b/src/mame/drivers/amstrad.cpp
@@ -900,7 +900,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(amstrad_state::amstrad_base)
/* Machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(amstrad_mem)
MCFG_CPU_IO_MAP(amstrad_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
@@ -918,7 +918,7 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( XTAL_16MHz, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
+ MCFG_SCREEN_RAW_PARAMS( XTAL(16'000'000), 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(amstrad_state, screen_vblank_amstrad))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
@@ -927,7 +927,7 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_cpc)
- MCFG_MC6845_ADD("mc6845", HD6845, nullptr, XTAL_16MHz / 16)
+ MCFG_MC6845_ADD("mc6845", HD6845, nullptr, XTAL(16'000'000) / 16)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_de_changed))
@@ -941,7 +941,7 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay", AY8912, XTAL_16MHz / 16)
+ MCFG_SOUND_ADD("ay", AY8912, XTAL(16'000'000) / 16)
MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -1025,7 +1025,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(amstrad_state::cpcplus)
/* Machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_40MHz / 10)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(40'000'000) / 10)
MCFG_CPU_PROGRAM_MAP(amstrad_mem)
MCFG_CPU_IO_MAP(amstrad_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
@@ -1043,7 +1043,7 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( ( XTAL_40MHz * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
+ MCFG_SCREEN_RAW_PARAMS( ( XTAL(40'000'000) * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(amstrad_state, screen_vblank_amstrad))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
@@ -1052,7 +1052,7 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_plus)
- MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL_40MHz / 40)
+ MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL(40'000'000) / 40)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_plus_de_changed))
@@ -1065,7 +1065,7 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay", AY8912, XTAL_40MHz / 40)
+ MCFG_SOUND_ADD("ay", AY8912, XTAL(40'000'000) / 40)
MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -1104,7 +1104,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(amstrad_state::gx4000)
/* Machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_40MHz / 10)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(40'000'000) / 10)
MCFG_CPU_PROGRAM_MAP(amstrad_mem)
MCFG_CPU_IO_MAP(amstrad_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
@@ -1122,7 +1122,7 @@ MACHINE_CONFIG_START(amstrad_state::gx4000)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( ( XTAL_40MHz * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
+ MCFG_SCREEN_RAW_PARAMS( ( XTAL(40'000'000) * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(amstrad_state, screen_vblank_amstrad))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
@@ -1131,7 +1131,7 @@ MACHINE_CONFIG_START(amstrad_state::gx4000)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_plus)
- MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL_40MHz / 40)
+ MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL(40'000'000) / 40)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_plus_de_changed))
@@ -1142,7 +1142,7 @@ MACHINE_CONFIG_START(amstrad_state::gx4000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay", AY8912, XTAL_40MHz / 40)
+ MCFG_SOUND_ADD("ay", AY8912, XTAL(40'000'000) / 40)
MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -1158,14 +1158,14 @@ MACHINE_CONFIG_DERIVED(amstrad_state::aleste, cpc6128)
MCFG_MACHINE_START_OVERRIDE(amstrad_state,aleste)
MCFG_MACHINE_RESET_OVERRIDE(amstrad_state,aleste)
- MCFG_SOUND_REPLACE("ay", AY8912, XTAL_16MHz / 16)
+ MCFG_SOUND_REPLACE("ay", AY8912, XTAL(16'000'000) / 16)
MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(32+64)
MCFG_PALETTE_INIT_OWNER(amstrad_state,aleste)
- MCFG_MC146818_ADD( "rtc", XTAL_4_194304Mhz )
+ MCFG_MC146818_ADD( "rtc", XTAL(4'194'304) )
MCFG_DEVICE_REMOVE("upd765")
MCFG_I8272A_ADD("upd765", true)