diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp index 2f711ff6816..146b8f0bc15 100644 --- a/src/mame/drivers/bladestl.cpp +++ b/src/mame/drivers/bladestl.cpp @@ -302,11 +302,11 @@ void bladestl_state::machine_reset() static MACHINE_CONFIG_START( bladestl ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", HD6309, 24000000/2) /* 24MHz/2 (?) */ + MCFG_CPU_ADD("maincpu", HD6309E, XTAL_24MHz / 8) // divider not verified (from 007342 custom) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bladestl_state, bladestl_scanline, "screen", 0, 1) - MCFG_CPU_ADD("audiocpu", M6809, 2000000) + MCFG_CPU_ADD("audiocpu", MC6809E, XTAL_24MHz / 16) MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -347,10 +347,10 @@ static MACHINE_CONFIG_START( bladestl ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK) + MCFG_SOUND_ADD("upd", UPD7759, XTAL_640kHz) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) - MCFG_SOUND_ADD("ymsnd", YM2203, 3579545) + MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_24MHz / 8) MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("upd", upd775x_device, port_w)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(bladestl_state, bladestl_port_B_w)) MCFG_SOUND_ROUTE(0, "filter1", 0.45) diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp index 1c5e800ccf1..e46d5f5de2f 100644 --- a/src/mame/drivers/bottom9.cpp +++ b/src/mame/drivers/bottom9.cpp @@ -19,7 +19,7 @@ #include "includes/konamipt.h" #include "cpu/z80/z80.h" -#include "cpu/m6809/m6809.h" +#include "cpu/m6809/hd6309.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "speaker.h" @@ -301,11 +301,11 @@ void bottom9_state::machine_reset() static MACHINE_CONFIG_START( bottom9 ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ? */ + MCFG_CPU_ADD("maincpu", HD6309E, XTAL_24MHz / 8) // 63C09E MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", bottom9_state, bottom9_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, 3579545) + MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) MCFG_CPU_PROGRAM_MAP(audio_map) MCFG_CPU_PERIODIC_INT_DRIVER(bottom9_state, bottom9_sound_interrupt, 8*60) /* irq is triggered by the main CPU */ @@ -324,7 +324,7 @@ static MACHINE_CONFIG_START( bottom9 ) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_DEVICE_ADD("k052109", K052109, 0) + MCFG_DEVICE_ADD("k052109", K052109, 0) // 051961 on schematics MCFG_GFX_PALETTE("palette") MCFG_K052109_CB(bottom9_state, tile_callback) @@ -342,12 +342,12 @@ static MACHINE_CONFIG_START( bottom9 ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("k007232_1", K007232, 3579545) + MCFG_SOUND_ADD("k007232_1", K007232, XTAL_3_579545MHz) MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(bottom9_state, volume_callback0)) MCFG_SOUND_ROUTE(0, "mono", 0.40) MCFG_SOUND_ROUTE(1, "mono", 0.40) - MCFG_SOUND_ADD("k007232_2", K007232, 3579545) + MCFG_SOUND_ADD("k007232_2", K007232, XTAL_3_579545MHz) MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(bottom9_state, volume_callback1)) MCFG_SOUND_ROUTE(0, "mono", 0.40) MCFG_SOUND_ROUTE(1, "mono", 0.40) diff --git a/src/mame/drivers/contra.cpp b/src/mame/drivers/contra.cpp index 449bf162341..e40f76793c0 100644 --- a/src/mame/drivers/contra.cpp +++ b/src/mame/drivers/contra.cpp @@ -198,11 +198,11 @@ void contra_state::machine_start() static MACHINE_CONFIG_START( contra ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", HD6309, XTAL_24MHz / 2 /* 3000000*4? */) + MCFG_CPU_ADD("maincpu", HD6309E, XTAL_24MHz / 8) /* 3000000? (HD63C09EP) */ MCFG_CPU_PROGRAM_MAP(contra_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", contra_state, contra_interrupt) - MCFG_CPU_ADD("audiocpu", MC6809E, XTAL_24MHz/8) /* 3000000? */ + MCFG_CPU_ADD("audiocpu", MC6809E, XTAL_24MHz/8) /* 3000000? (HD68B09EP) */ MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* enough for the sound CPU to read all commands */ diff --git a/src/mame/drivers/jackal.cpp b/src/mame/drivers/jackal.cpp index d619c1d3c79..da0d6e28541 100644 --- a/src/mame/drivers/jackal.cpp +++ b/src/mame/drivers/jackal.cpp @@ -358,11 +358,11 @@ void jackal_state::machine_reset() static MACHINE_CONFIG_START( jackal ) /* basic machine hardware */ - MCFG_CPU_ADD("master", M6809, MASTER_CLOCK/12) // verified on pcb + MCFG_CPU_ADD("master", MC6809E, MASTER_CLOCK/12) // verified on pcb MCFG_CPU_PROGRAM_MAP(master_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", jackal_state, jackal_interrupt) - MCFG_CPU_ADD("slave", M6809, MASTER_CLOCK/12) // verified on pcb + MCFG_CPU_ADD("slave", MC6809E, MASTER_CLOCK/12) // verified on pcb MCFG_CPU_PROGRAM_MAP(slave_map) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp index fd83e47ceeb..6daf63ceecd 100644 --- a/src/mame/drivers/rockrage.cpp +++ b/src/mame/drivers/rockrage.cpp @@ -248,11 +248,11 @@ void rockrage_state::machine_reset() static MACHINE_CONFIG_START( rockrage ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8 */ + MCFG_CPU_ADD("maincpu", HD6309E, XTAL_24MHz / 8) MCFG_CPU_PROGRAM_MAP(rockrage_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", rockrage_state, rockrage_interrupt) - MCFG_CPU_ADD("audiocpu", M6809, 1500000) /* 24MHz/16 */ + MCFG_CPU_ADD("audiocpu", MC6809E, XTAL_24MHz / 16) MCFG_CPU_PROGRAM_MAP(rockrage_sound_map) MCFG_WATCHDOG_ADD("watchdog") diff --git a/src/mame/drivers/sbasketb.cpp b/src/mame/drivers/sbasketb.cpp index ea0c5c1ebb9..86194b70412 100644 --- a/src/mame/drivers/sbasketb.cpp +++ b/src/mame/drivers/sbasketb.cpp @@ -247,7 +247,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(sbasketbu, sbasketb) MCFG_DEVICE_REMOVE("maincpu") - MCFG_CPU_ADD("maincpu", M6809, 1400000) /* 1.400 MHz ??? */ + MCFG_CPU_ADD("maincpu", MC6809E, 1400000) /* 6809E at 1.400 MHz ??? */ MCFG_CPU_PROGRAM_MAP(sbasketb_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", sbasketb_state, vblank_irq) MACHINE_CONFIG_END diff --git a/src/mame/drivers/scotrsht.cpp b/src/mame/drivers/scotrsht.cpp index 51b929d20cd..27da006843f 100644 --- a/src/mame/drivers/scotrsht.cpp +++ b/src/mame/drivers/scotrsht.cpp @@ -187,7 +187,7 @@ GFXDECODE_END static MACHINE_CONFIG_START( scotrsht ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6809, 18432000/6) /* 3.072 MHz */ + MCFG_CPU_ADD("maincpu", MC6809E, 18432000/6) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(scotrsht_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", scotrsht_state, interrupt) diff --git a/src/mame/drivers/shaolins.cpp b/src/mame/drivers/shaolins.cpp index 8b4fb99dd07..00ef4091e34 100644 --- a/src/mame/drivers/shaolins.cpp +++ b/src/mame/drivers/shaolins.cpp @@ -195,7 +195,7 @@ GFXDECODE_END static MACHINE_CONFIG_START( shaolins ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/12) /* verified on pcb */ + MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/12) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(shaolins_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", shaolins_state, interrupt, "screen", 0, 1) MCFG_WATCHDOG_ADD("watchdog")