From 8860fe1c56f6d49a96c2617802a98b22ae4b69aa Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Sun, 6 Jan 2008 01:27:10 +0000 Subject: [PATCH] (From Dirk Best) attached is an update for xtal.h and the Amiga include file. --- src/emu/drivers/xtal.h | 5 ++++- src/mame/includes/amiga.h | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h index 84ebe0093a2..13bd422dccb 100644 --- a/src/emu/drivers/xtal.h +++ b/src/emu/drivers/xtal.h @@ -49,6 +49,7 @@ enum XTAL_3_6864MHz = 3686400, /* CPS3 */ XTAL_4MHz = 4000000, XTAL_4_224MHz = 4224000, /* Used to drive OKI M6295 chips, usually with /4 divider */ + XTAL_4_433619MHz = 4433619, /* PAL subcarrier */ XTAL_4_9152MHz = 4915200, XTAL_6MHz = 6000000, XTAL_7_3728MHz = 7372800, @@ -69,6 +70,7 @@ enum XTAL_15_468MHz = 15468000, /* Bank Panic h/w, Sega G80 */ XTAL_16MHz = 16000000, XTAL_16_9344MHz = 16934400, /* Usually used to drive 90's Yamaha OPL/FM chips */ + XTAL_17_73447MHz = 17734470, /* 4 times the PAL subcarrier */ XTAL_18MHz = 18000000, XTAL_18_432MHz = 18432000, XTAL_19_968MHz = 19968000, /* Used mostly by Space Invaders games by Taito/Midway and clones */ @@ -85,7 +87,8 @@ enum XTAL_27MHz = 27000000, /* Some Banpresto games macrossp and Irem M92 */ XTAL_27_164MHz = 27164000, /* Typically used on 90's Taito PCBs to drive the custom chips */ XTAL_28MHz = 28000000, - XTAL_28_63636MHz = 28636360, /* later Leland games and Atari GT */ + XTAL_28_37516MHz = 28375160, /* Amiga PAL systems */ + XTAL_28_63636MHz = 28636360, /* later Leland games and Atari GT, Amiga NTSC */ XTAL_30_4761MHz = 30476100, /* Taito JC */ XTAL_32MHz = 32000000, XTAL_32_22MHz = 32220000, /* Typically used on 90's Data East PCBs */ diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 3d3121dba95..58facc41b01 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -289,12 +289,12 @@ Ernesto Corvi & Mariusz Wojcieszek #define MAX_PLANES 6 /* 0 to 6, inclusive ( but we count from 0 to 5 ) */ /* Clock speeds */ -#define AMIGA_68000_NTSC_CLOCK 7159090 /* Hz */ -#define AMIGA_68000_PAL_CLOCK 7093790 /* Hz */ -#define AMIGA_68EC020_NTSC_CLOCK 14318180 /* Hz */ -#define AMIGA_68EC020_PAL_CLOCK 14187580 /* Hz */ -#define CDTV_CLOCK_X1 28636363 /* Hz */ -#define CDTV_CLOCK_X5 28375160 /* Hz */ +#define AMIGA_68000_NTSC_CLOCK XTAL_28_63636MHz/4 +#define AMIGA_68000_PAL_CLOCK XTAL_28_37516MHz/4 +#define AMIGA_68EC020_NTSC_CLOCK XTAL_28_63636MHz/2 +#define AMIGA_68EC020_PAL_CLOCK XTAL_28_37516MHz/2 +#define CDTV_CLOCK_X1 XTAL_28_63636MHz +#define CDTV_CLOCK_X5 XTAL_28_37516MHz #define ANGUS_CHIP_RAM_MASK 0x07fffe