From add62d80c4849d5fd51cb7d717948b11b843462b Mon Sep 17 00:00:00 2001 From: Dirk Best Date: Sat, 17 May 2014 11:27:41 +0000 Subject: [PATCH] Oops, fix MAME --- src/mame/drivers/alg.c | 7 +++---- src/mame/drivers/arcadia.c | 7 +++---- src/mame/drivers/cubo.c | 6 +++--- src/mame/drivers/mquake.c | 7 +++---- src/mame/drivers/upscope.c | 7 +++---- src/mame/mame.mak | 1 - 6 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c index c8a0d0e4f93..6e77a765de0 100644 --- a/src/mame/drivers/alg.c +++ b/src/mame/drivers/alg.c @@ -27,7 +27,6 @@ #include "render.h" #include "includes/amiga.h" #include "machine/ldstub.h" -#include "machine/6526cia.h" #include "machine/nvram.h" #include "machine/amigafdc.h" @@ -398,16 +397,16 @@ static MACHINE_CONFIG_START( alg_r1, alg_state ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) /* cia */ - MCFG_DEVICE_ADD("cia_0", LEGACY_MOS8520, amiga_state::CLK_E_NTSC) + MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_NTSC) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq)) MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("FIRE")) MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write)) - MCFG_DEVICE_ADD("cia_1", LEGACY_MOS8520, amiga_state::CLK_E_NTSC) + MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_NTSC) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq)) /* fdc */ MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_NTSC) - MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", legacy_mos6526_device, flag_w)) + MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", mos8520_device, flag_w)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c index 1f22b2fa1f8..3ace4bfe815 100644 --- a/src/mame/drivers/arcadia.c +++ b/src/mame/drivers/arcadia.c @@ -51,7 +51,6 @@ #include "emu.h" #include "cpu/m68000/m68000.h" #include "includes/amiga.h" -#include "machine/6526cia.h" #include "machine/nvram.h" #include "machine/amigafdc.h" @@ -320,18 +319,18 @@ static MACHINE_CONFIG_START( arcadia, arcadia_amiga_state ) MCFG_SOUND_ROUTE(3, "lspeaker", 0.50) /* cia */ - MCFG_DEVICE_ADD("cia_0", LEGACY_MOS8520, amiga_state::CLK_E_NTSC) + MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_NTSC) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq)) MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("CIA0PORTA")) MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write)) MCFG_MOS6526_PB_INPUT_CALLBACK(IOPORT("CIA0PORTB")) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(arcadia_amiga_state,arcadia_cia_0_portb_w)) - MCFG_DEVICE_ADD("cia_1", LEGACY_MOS8520, amiga_state::CLK_E_NTSC) + MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_NTSC) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq)) /* fdc */ MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_NTSC) - MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", legacy_mos6526_device, flag_w)) + MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", mos8520_device, flag_w)) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( argh, arcadia ) diff --git a/src/mame/drivers/cubo.c b/src/mame/drivers/cubo.c index 4f04f342a3d..da292cc7dab 100644 --- a/src/mame/drivers/cubo.c +++ b/src/mame/drivers/cubo.c @@ -1063,11 +1063,11 @@ static MACHINE_CONFIG_START( cubo, cubo_state ) /* cia */ // these are setup differently on other amiga drivers (needed for floppy to work) which is correct / why? - MCFG_DEVICE_ADD("cia_0", LEGACY_MOS8520, amiga_state::CLK_E_PAL) + MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_PAL) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq)) MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("CIA0PORTA")) MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(cubo_state, akiko_cia_0_port_a_write)) - MCFG_DEVICE_ADD("cia_1", LEGACY_MOS8520, amiga_state::CLK_E_PAL) + MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_PAL) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq)) MCFG_MICROTOUCH_ADD("microtouch", WRITE8(cubo_state, microtouch_tx)) @@ -1077,7 +1077,7 @@ static MACHINE_CONFIG_START( cubo, cubo_state ) /* fdc */ MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_PAL) - MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", legacy_mos6526_device, flag_w)) + MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", mos8520_device, flag_w)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c index a16785a476d..e4cf51d4d15 100644 --- a/src/mame/drivers/mquake.c +++ b/src/mame/drivers/mquake.c @@ -36,7 +36,6 @@ #include "cpu/m68000/m68000.h" #include "includes/amiga.h" #include "sound/es5503.h" -#include "machine/6526cia.h" #include "machine/nvram.h" #include "machine/amigafdc.h" @@ -345,16 +344,16 @@ static MACHINE_CONFIG_START( mquake, mquake_state ) MCFG_SOUND_ROUTE(0, "rspeaker", 0.50) /* cia */ - MCFG_DEVICE_ADD("cia_0", LEGACY_MOS8520, amiga_state::CLK_E_NTSC) + MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_NTSC) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq)) MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("CIA0PORTA")) MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write)) - MCFG_DEVICE_ADD("cia_1", LEGACY_MOS8520, amiga_state::CLK_E_NTSC) + MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_NTSC) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq)) /* fdc */ MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_NTSC) - MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", legacy_mos6526_device, flag_w)) + MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", mos8520_device, flag_w)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c index 132ae5b8d15..27d7dd32299 100644 --- a/src/mame/drivers/upscope.c +++ b/src/mame/drivers/upscope.c @@ -26,7 +26,6 @@ #include "emu.h" #include "cpu/m68000/m68000.h" #include "includes/amiga.h" -#include "machine/6526cia.h" #include "machine/nvram.h" #include "machine/amigafdc.h" @@ -297,19 +296,19 @@ static MACHINE_CONFIG_START( upscope, upscope_state ) MCFG_SOUND_ROUTE(3, "rspeaker", 0.50) /* cia */ - MCFG_DEVICE_ADD("cia_0", LEGACY_MOS8520, amiga_state::CLK_E_NTSC) + MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_NTSC) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq)) MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write)) MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(upscope_state, upscope_cia_0_portb_r)) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(upscope_state, upscope_cia_0_portb_w)) - MCFG_DEVICE_ADD("cia_1", LEGACY_MOS8520, amiga_state::CLK_E_NTSC) + MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_NTSC) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq)) MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(upscope_state, upscope_cia_1_porta_r)) MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(upscope_state, upscope_cia_1_porta_w)) /* fdc */ MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_NTSC) - MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", legacy_mos6526_device, flag_w)) + MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", mos8520_device, flag_w)) MACHINE_CONFIG_END diff --git a/src/mame/mame.mak b/src/mame/mame.mak index 878934c76c6..2394f8bbe09 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -344,7 +344,6 @@ MACHINES += NCR53C7XX MACHINES += LSI53C810 MACHINES += 6522VIA MACHINES += TPI6525 -MACHINES += 6526CIA MACHINES += RIOT6532 MACHINES += 6821PIA MACHINES += 6840PTM