Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-08 17:37:56 +03:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Oops, fix MAME

Browse Source
This commit is contained in:
Dirk Best 2014-05-17 11:27:41 +00:00
parent e7b7965ff9
commit add62d80c4
6 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mame/drivers/alg.c
View File

@ -27,7 +27,6 @@
#include "render.h" #include "render.h"
#include "includes/amiga.h" #include "includes/amiga.h"
#include "machine/ldstub.h" #include "machine/ldstub.h"
#include "machine/6526cia.h"
#include "machine/nvram.h" #include "machine/nvram.h"
#include "machine/amigafdc.h" #include "machine/amigafdc.h"
@ -398,16 +397,16 @@ static MACHINE_CONFIG_START( alg_r1, alg_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
/* cia */ /* 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_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq))
MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("FIRE")) MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("FIRE"))
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write)) 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)) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq))
/* fdc */ /* fdc */
MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_NTSC) 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 MACHINE_CONFIG_END

7
src/mame/drivers/arcadia.c
View File

@ -51,7 +51,6 @@
#include "emu.h" #include "emu.h"
#include "cpu/m68000/m68000.h" #include "cpu/m68000/m68000.h"
#include "includes/amiga.h" #include "includes/amiga.h"
#include "machine/6526cia.h"
#include "machine/nvram.h" #include "machine/nvram.h"
#include "machine/amigafdc.h" #include "machine/amigafdc.h"
@ -320,18 +319,18 @@ static MACHINE_CONFIG_START( arcadia, arcadia_amiga_state )
MCFG_SOUND_ROUTE(3, "lspeaker", 0.50) MCFG_SOUND_ROUTE(3, "lspeaker", 0.50)
/* cia */ /* 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_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq))
MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("CIA0PORTA")) MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("CIA0PORTA"))
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write)) MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write))
MCFG_MOS6526_PB_INPUT_CALLBACK(IOPORT("CIA0PORTB")) MCFG_MOS6526_PB_INPUT_CALLBACK(IOPORT("CIA0PORTB"))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(arcadia_amiga_state,arcadia_cia_0_portb_w)) 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)) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq))
/* fdc */ /* fdc */
MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_NTSC) 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 MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( argh, arcadia ) static MACHINE_CONFIG_DERIVED( argh, arcadia )

6
src/mame/drivers/cubo.c
View File

@ -1063,11 +1063,11 @@ static MACHINE_CONFIG_START( cubo, cubo_state )
/* cia */ /* cia */
// these are setup differently on other amiga drivers (needed for floppy to work) which is correct / why? // 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_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq))
MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("CIA0PORTA")) MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("CIA0PORTA"))
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(cubo_state, akiko_cia_0_port_a_write)) 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_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq))
MCFG_MICROTOUCH_ADD("microtouch", WRITE8(cubo_state, microtouch_tx)) MCFG_MICROTOUCH_ADD("microtouch", WRITE8(cubo_state, microtouch_tx))
@ -1077,7 +1077,7 @@ static MACHINE_CONFIG_START( cubo, cubo_state )
/* fdc */ /* fdc */
MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_PAL) 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 MACHINE_CONFIG_END

7
src/mame/drivers/mquake.c
View File

@ -36,7 +36,6 @@
#include "cpu/m68000/m68000.h" #include "cpu/m68000/m68000.h"
#include "includes/amiga.h" #include "includes/amiga.h"
#include "sound/es5503.h" #include "sound/es5503.h"
#include "machine/6526cia.h"
#include "machine/nvram.h" #include "machine/nvram.h"
#include "machine/amigafdc.h" #include "machine/amigafdc.h"
@ -345,16 +344,16 @@ static MACHINE_CONFIG_START( mquake, mquake_state )
MCFG_SOUND_ROUTE(0, "rspeaker", 0.50) MCFG_SOUND_ROUTE(0, "rspeaker", 0.50)
/* cia */ /* 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_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq))
MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("CIA0PORTA")) MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("CIA0PORTA"))
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write)) 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)) MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq))
/* fdc */ /* fdc */
MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_NTSC) 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 MACHINE_CONFIG_END

7
src/mame/drivers/upscope.c
View File

@ -26,7 +26,6 @@
#include "emu.h" #include "emu.h"
#include "cpu/m68000/m68000.h" #include "cpu/m68000/m68000.h"
#include "includes/amiga.h" #include "includes/amiga.h"
#include "machine/6526cia.h"
#include "machine/nvram.h" #include "machine/nvram.h"
#include "machine/amigafdc.h" #include "machine/amigafdc.h"
@ -297,19 +296,19 @@ static MACHINE_CONFIG_START( upscope, upscope_state )
MCFG_SOUND_ROUTE(3, "rspeaker", 0.50) MCFG_SOUND_ROUTE(3, "rspeaker", 0.50)
/* cia */ /* 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_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq))
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write)) 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_INPUT_CALLBACK(READ8(upscope_state, upscope_cia_0_portb_r))
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(upscope_state, upscope_cia_0_portb_w)) 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_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq))
MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(upscope_state, upscope_cia_1_porta_r)) 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)) MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(upscope_state, upscope_cia_1_porta_w))
/* fdc */ /* fdc */
MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_NTSC) 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 MACHINE_CONFIG_END

1
src/mame/mame.mak
View File

@ -344,7 +344,6 @@ MACHINES += NCR53C7XX
MACHINES += LSI53C810 MACHINES += LSI53C810
MACHINES += 6522VIA MACHINES += 6522VIA
MACHINES += TPI6525 MACHINES += TPI6525
MACHINES += 6526CIA
MACHINES += RIOT6532 MACHINES += RIOT6532
MACHINES += 6821PIA MACHINES += 6821PIA
MACHINES += 6840PTM MACHINES += 6840PTM