Merge branch 'master' of ssh://mess.org/mame

This commit is contained in:
Dirk Best 2014-05-14 23:11:59 +00:00
commit fc15e17922

View File

@ -1548,6 +1548,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED_CLASS( a600n, a600, a600_state )
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MCFG_DEVICE_MODIFY("gayle")
MCFG_DEVICE_CLOCK(amiga_state::CLK_28M_NTSC / 2)
MCFG_DEVICE_MODIFY("screen")
MCFG_SCREEN_RAW_PARAMS(amiga_state::CLK_28M_NTSC / 4 * 2, 910, 186, 910, 262, 21, 262)
MCFG_DEVICE_MODIFY("amiga")
@ -1595,6 +1597,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED_CLASS( a1200n, a1200, a1200_state )
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(amiga_state::CLK_28M_NTSC / 2)
MCFG_DEVICE_MODIFY("gayle")
MCFG_DEVICE_CLOCK(amiga_state::CLK_28M_NTSC / 2)
MCFG_DEVICE_MODIFY("screen")
MCFG_SCREEN_RAW_PARAMS(amiga_state::CLK_28M_NTSC / 4 * 2, 910, 186, 910, 262, 21, 262)
MCFG_DEVICE_MODIFY("amiga")