diff options
| author | 2009-04-23 05:08:30 +0000 | |
|---|---|---|
| committer | 2009-04-23 05:08:30 +0000 | |
| commit | 83f91c7bf6dc4751c95a0e57f64ec93785a14f0c (patch) | |
| tree | cbbc579a2a65cfa6704d2b70b84894469bdab3be | |
| parent | 788cd0cb804d654452d34e10b86441c0b5ab6e55 (diff) | |
From: Luigi30 [mailto:luigi30@gmail.com]
Sent: Monday, April 20, 2009 4:22 PM
To: submit@mamedev.org
Subject: 4/20 diff
Crystallized 1945kiii.c, maygay1b.c, maygayv1.c, mwarr.c, n8080.c
(20.16MHz crystal confirmed with schematics), pacman.c, panicr.c,
rallyx.c
[2399] Changed qmhayaku's sound CPU back to 4MHz, sounds work now
| -rw-r--r-- | src/emu/drivers/xtal.h | 1 | ||||
| -rw-r--r-- | src/mame/drivers/1945kiii.c | 8 | ||||
| -rw-r--r-- | src/mame/drivers/maygay1b.c | 4 | ||||
| -rw-r--r-- | src/mame/drivers/maygayv1.c | 10 | ||||
| -rw-r--r-- | src/mame/drivers/meritm.c | 1 | ||||
| -rw-r--r-- | src/mame/drivers/mwarr.c | 9 | ||||
| -rw-r--r-- | src/mame/drivers/n8080.c | 8 | ||||
| -rw-r--r-- | src/mame/drivers/nbmj8991.c | 2 | ||||
| -rw-r--r-- | src/mame/drivers/onetwo.c | 8 | ||||
| -rw-r--r-- | src/mame/drivers/pacman.c | 2 | ||||
| -rw-r--r-- | src/mame/drivers/panicr.c | 10 | ||||
| -rw-r--r-- | src/mame/drivers/rallyx.c | 7 |
12 files changed, 44 insertions, 26 deletions
diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h index b27e44113db..b8f88c5d30d 100644 --- a/src/emu/drivers/xtal.h +++ b/src/emu/drivers/xtal.h @@ -108,6 +108,7 @@ enum XTAL_19_923MHz = 19923000, /* Cinematronics vectors */ XTAL_19_968MHz = 19968000, /* Used mostly by some Taito games */ XTAL_20MHz = 20000000, + XTAL_20_16MHz = 20160000, /* Nintendo 8080 */ XTAL_20_079MHz = 20790000, /* Blockade-hardware Gremlin games */ XTAL_21MHz = 21000000, /* Lock-On pixel clock */ XTAL_21_3MHz = 21300000, diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index 41f3a9013a6..d43a234026f 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -57,6 +57,8 @@ There are no static local variables. #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" +#define MASTER_CLOCK XTAL_16MHz + static UINT16* k3_spriteram_1; static UINT16* k3_spriteram_2; static UINT16* k3_bgram; @@ -233,7 +235,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( k3 ) - MDRV_CPU_ADD("maincpu", M68000, 16000000) + MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(k3_map,0) MDRV_CPU_VBLANK_INT("screen", irq4_line_hold) @@ -253,11 +255,11 @@ static MACHINE_DRIVER_START( k3 ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("oki1", OKIM6295, 1000000) + MDRV_SOUND_ADD("oki1", OKIM6295, MASTER_CLOCK/16) /* dividers? */ MDRV_SOUND_CONFIG(okim6295_interface_pin7high) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MDRV_SOUND_ADD("oki2", OKIM6295, 1000000) + MDRV_SOUND_ADD("oki2", OKIM6295, MASTER_CLOCK/16) /* dividers? */ MDRV_SOUND_CONFIG(okim6295_interface_pin7high) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c index 01568711183..5c97c27e85c 100644 --- a/src/mame/drivers/maygay1b.c +++ b/src/mame/drivers/maygay1b.c @@ -26,8 +26,8 @@ #define VERBOSE 1 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -#define M1_MASTER_CLOCK (8000000) -#define M1_DUART_CLOCK (3680000) +#define M1_MASTER_CLOCK (XTAL_8MHz) +#define M1_DUART_CLOCK (XTAL_3_6864MHz) static struct { diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c index 668b6899adc..c39bb7d2b21 100644 --- a/src/mame/drivers/maygayv1.c +++ b/src/mame/drivers/maygayv1.c @@ -141,8 +141,10 @@ Find lamps/reels after UPD changes. * *************************************/ -#define DUART_CLOCK 3686400 +#define DUART_CLOCK XTAL_3_6864MHz #define PIXEL_CLOCK 0 +#define MASTER_CLOCK XTAL_16MHz +#define SOUND_CLOCK XTAL_11_0592MHz /************************************* * @@ -988,11 +990,11 @@ static INTERRUPT_GEN( vsync_interrupt ) static MACHINE_DRIVER_START( maygayv1 ) - MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz / 2) + MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2) MDRV_CPU_PROGRAM_MAP(main_map, 0) MDRV_CPU_VBLANK_INT("screen", vsync_interrupt) - MDRV_CPU_ADD("soundcpu", I8052, XTAL_11_0592MHz) + MDRV_CPU_ADD("soundcpu", I8052, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_prg, 0) MDRV_CPU_DATA_MAP(sound_data, 0) MDRV_CPU_IO_MAP(sound_io, 0) @@ -1022,7 +1024,7 @@ static MACHINE_DRIVER_START( maygayv1 ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym",YM2413, XTAL_16MHz / 4) + MDRV_SOUND_ADD("ym",YM2413, MASTER_CLOCK / 4) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) MDRV_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK) diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index 09160461d3c..3cf3c87c1a2 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -70,6 +70,7 @@ PROGRAM# Program Version Program Differences - finish inputs, dsw, outputs (lamps) - problem with registering touches on the bottom of the screen (currently hacked to work) - megat5: has jmp $0000 in the initialization code causing infinite loop, is rom bad? + - megat4st doesn't boot, protection problem? */ #include "driver.h" diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index 5dac8b0cb39..3fc02bcd8fa 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -42,6 +42,9 @@ Notes: #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" +#define MASTER_CLOCK XTAL_12MHz +#define SOUND_CLOCK XTAL_45MHz + static tilemap *bg_tilemap, *mlow_tilemap, *mhigh_tilemap, *tx_tilemap; static UINT16 *bg_videoram, *mlow_videoram, *mhigh_videoram, *tx_videoram, *sprites_buffer; static UINT16 *bg_scrollram, *mlow_scrollram, *mhigh_scrollram, *vidattrram; @@ -451,7 +454,7 @@ static VIDEO_UPDATE( mwarr ) } static MACHINE_DRIVER_START( mwarr ) - MDRV_CPU_ADD("maincpu", M68000, 12000000) + MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(mwarr_map,0) MDRV_CPU_VBLANK_INT("screen", irq4_line_hold) @@ -472,11 +475,11 @@ static MACHINE_DRIVER_START( mwarr ) MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("oki1", OKIM6295, 937500 ) + MDRV_SOUND_ADD("oki1", OKIM6295, SOUND_CLOCK/48 ) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MDRV_SOUND_ADD("oki2", OKIM6295, 937500 ) + MDRV_SOUND_ADD("oki2", OKIM6295, SOUND_CLOCK/48 ) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c index 234b56425d6..d35ac16b217 100644 --- a/src/mame/drivers/n8080.c +++ b/src/mame/drivers/n8080.c @@ -14,6 +14,8 @@ #include "cpu/i8085/i8085.h" #include "includes/n8080.h" +#define MASTER_CLOCK XTAL_20_16MHz + static unsigned shift_data; static unsigned shift_bits; static int inte; @@ -104,7 +106,7 @@ static const i8085_config n8080_cpu_config = static MACHINE_DRIVER_START( spacefev ) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", 8080, 20160000 / 10) + MDRV_CPU_ADD("maincpu", 8080, MASTER_CLOCK / 10) MDRV_CPU_CONFIG(n8080_cpu_config) MDRV_CPU_PROGRAM_MAP(main_cpu_map, 0) MDRV_CPU_IO_MAP(main_io_map, 0) @@ -132,7 +134,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sheriff ) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", 8080, 20160000 / 10) + MDRV_CPU_ADD("maincpu", 8080, MASTER_CLOCK / 10) MDRV_CPU_CONFIG(n8080_cpu_config) MDRV_CPU_PROGRAM_MAP(main_cpu_map, 0) MDRV_CPU_IO_MAP(main_io_map, 0) @@ -160,7 +162,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( helifire ) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", 8080, 20160000 / 10) + MDRV_CPU_ADD("maincpu", 8080, MASTER_CLOCK / 10) MDRV_CPU_CONFIG(n8080_cpu_config) MDRV_CPU_PROGRAM_MAP(helifire_main_cpu_map, 0) MDRV_CPU_IO_MAP(main_io_map, 0) diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c index 25bbaa3f87b..2ffa91eb2b8 100644 --- a/src/mame/drivers/nbmj8991.c +++ b/src/mame/drivers/nbmj8991.c @@ -1615,7 +1615,7 @@ static MACHINE_DRIVER_START( nbmjdrv2 ) // pstadium MDRV_CPU_IO_MAP(readport_pstadium, writeport_pstadium) MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt) - MDRV_CPU_ADD("audiocpu", Z80, 3900000) /* 4.00 MHz */ + MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4.00 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem_nbmj8991, sound_writemem_nbmj8991) MDRV_CPU_IO_MAP(sound_readport_nbmj8991, sound_writeport_nbmj8991) MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 128) diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 1d1f8778c72..49e1cc3a765 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -47,6 +47,8 @@ Note: this is quite clearly a 'Korean bootleg' of Shisensho - Joshiryo-Hen / Mat static tilemap *fg_tilemap; static UINT8 *fgram; +#define MASTER_CLOCK (XTAL_4MHz) + static TILE_GET_INFO( get_fg_tile_info ) { int code = (fgram[tile_index*2+1]<<8) | fgram[tile_index*2]; @@ -276,12 +278,12 @@ static const ym3812_interface ym3812_config = static MACHINE_DRIVER_START( onetwo ) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz */ + MDRV_CPU_ADD("maincpu", Z80,MASTER_CLOCK) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(main_cpu,0) MDRV_CPU_IO_MAP(main_cpu_io,0) MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) - MDRV_CPU_ADD("audiocpu", Z80,4000000) /* 4 MHz */ + MDRV_CPU_ADD("audiocpu", Z80,MASTER_CLOCK) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_cpu,0) MDRV_CPU_IO_MAP(sound_cpu_io,0) @@ -302,7 +304,7 @@ static MACHINE_DRIVER_START( onetwo ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM3812, 4000000) + MDRV_SOUND_ADD("ym", YM3812, MASTER_CLOCK) MDRV_SOUND_CONFIG(ym3812_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index f971e96e969..16993178290 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -352,7 +352,7 @@ Boards: * *************************************/ -#define MASTER_CLOCK (18432000) +#define MASTER_CLOCK (XTAL_18_432MHz) #define PIXEL_CLOCK (MASTER_CLOCK/3) diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index 1d77ba16765..23d39c3fdc9 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -65,6 +65,10 @@ D.9B [f99cac4b] / #include "deprecat.h" #include "audio/t5182.h" +#define MASTER_CLOCK XTAL_16MHz +#define SOUND_CLOCK XTAL_14_31818MHz +#define TC15_CLOCK XTAL_12MHz + static tilemap *bgtilemap, *txttilemap; static UINT8 *scrollram; static UINT8 *mainram; @@ -358,11 +362,11 @@ static GFXDECODE_START( panicr ) GFXDECODE_END static MACHINE_DRIVER_START( panicr ) - MDRV_CPU_ADD("maincpu", V20,16000000/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */ + MDRV_CPU_ADD("maincpu", V20,MASTER_CLOCK/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */ MDRV_CPU_PROGRAM_MAP(panicr_map,0) MDRV_CPU_VBLANK_INT_HACK(panicr_interrupt,2) - MDRV_CPU_ADD(CPUTAG_T5182,Z80,14318180/4) /* 3.579545 MHz */ + MDRV_CPU_ADD(CPUTAG_T5182,Z80,SOUND_CLOCK/4) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(t5182_map, 0) MDRV_CPU_IO_MAP(t5182_io, 0) @@ -383,7 +387,7 @@ static MACHINE_DRIVER_START( panicr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ym", YM2151, 14318180/4) /* 3.579545 MHz */ + MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK/4) /* 3.579545 MHz */ MDRV_SOUND_CONFIG(t5182_ym2151_interface) MDRV_SOUND_ROUTE(0, "mono", 1.0) MDRV_SOUND_ROUTE(1, "mono", 1.0) diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c index 203a3ee9b97..e5fbc8fa55c 100644 --- a/src/mame/drivers/rallyx.c +++ b/src/mame/drivers/rallyx.c @@ -194,6 +194,7 @@ TODO: #include "sound/namco.h" #include "sound/samples.h" +#define MASTER_CLOCK XTAL_18_432MHz extern UINT8 *rallyx_videoram,*rallyx_radarattr; WRITE8_HANDLER( rallyx_videoram_w ); @@ -855,7 +856,7 @@ static const samples_interface rallyx_samples_interface = static MACHINE_DRIVER_START( rallyx ) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(rallyx_map,0) MDRV_CPU_IO_MAP(io_map,0) MDRV_CPU_VBLANK_INT("screen", irq0_line_assert) @@ -880,7 +881,7 @@ static MACHINE_DRIVER_START( rallyx ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("namco", NAMCO, 18432000/6/32) + MDRV_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32) /* 96 KHz */ MDRV_SOUND_CONFIG(namco_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -893,7 +894,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( jungler ) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(jungler_map,0) MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) |
