diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index 4a7f53aa876..b394ddd14d8 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -4362,7 +4362,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( gunnail, nmk16_state ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz? */ + MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(gunnail_map) NMK_HACKY_INTERRUPT_TIMING @@ -4370,9 +4370,6 @@ static MACHINE_CONFIG_START( gunnail, nmk16_state ) NMK_HACKY_SCREEN_HIRES MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_gunnail) - - - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4382,19 +4379,19 @@ static MACHINE_CONFIG_START( gunnail, nmk16_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_NMK004_ADD("nmk004", 8000000) + MCFG_NMK004_ADD("nmk004", XTAL_16MHz/2) /* verified on pcb */ - MCFG_SOUND_ADD("ymsnd", YM2203, 1500000) + MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */ MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) MCFG_SOUND_ROUTE(2, "mono", 0.50) MCFG_SOUND_ROUTE(3, "mono", 1.20) - MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW) + MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/4, OKIM6295_PIN7_LOW) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) - MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW) + MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/4, OKIM6295_PIN7_LOW) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_CONFIG_END @@ -6175,7 +6172,7 @@ PCB Layout AK92077 |-------------------------------------------------------------| -| LA4460 VOL YM2203 6116 92077-2.U10 62256 62256 | +| LA4460 VOL YM2203 6116 92077-2.U101 62256 62256 | |-| 16MHz |------| 62256 62256 | | 4558 6295 92077-6.U57 |NMK004| 62256 62256 | |-| 12MHz | | 62256 62256 | @@ -6203,22 +6200,24 @@ AK92077 | 6264 10MHz | |-------------------------------------------------------------| Notes: - 68000 - Motorola MC68000P12 CPU running at 10.000MHz (DIP64) - 6116 - 2K x8 SRAM (x9, DIP24) - 6264 - 8K x8 SRAM (x2, DIP28) - 62256 - 32K x8 SRAM (x10, DIP28) - YM2203- Yamaha YM2203 (DIP40) + 68000 - Motorola MC68000P12 CPU running at 10MHz (DIP64) + 6116 - 2Kb x8 SRAM (x9, DIP24) + 6264 - 8Kb x8 SRAM (x2, DIP28) + 62256 - 32Kb x8 SRAM (x10, DIP28) + YM2203- Yamaha YM2203 running at 1.5MHz [12/8] (DIP40) YM3014- Yamaha YM3014 (DIP8) + 6295 - OKI M6295 running at 4MHz, pin 7 low [16/4] (x2, QFP44) 4558 - BA4558 Op Amp (DIP8) LA4460- Power Amplifier - 6295 - Oki M6295, running at MHz, sample rate (x2, QFP44) - DIP1/2- 8 position Dip Switches + DIP1/2- 8 position DIP Switches VOL - Volume Potentiometer + OSC - 12MHz, 16MHz, 10MHz + HSync - 15.367kHz + VSync - 56.205Hz NMK CUSTOM IC'S - - NMK004; Actually a TLCS90-based Toshiba TMP91P640F-10 MCU - with 16K internal OTP PROM, running at 8.000MHz [16 / 2] (QFP64) - Note that the internal ROM is secured :( + - NMK004 marked "NMK004 0840-1324". Actually a TLCS90-based Toshiba TMP90C840AF + Microcontroller with 256 bytes RAM & 8Kb ROM, running at 8.000MHz [16/2] (QFP64) - NMK005 (x1, Square QFP64) - NMK008 (x1, Square QFP84) - NMK009 (x2, Square QFP100) @@ -6228,40 +6227,37 @@ Notes: - NMK214 (x2, SDIP64) - NMK215 (x1, SDIP64) -Sound:YM2203C,OKI M6295 x2 -OSC :12.0000MHz,16.0000MHz,10.0000MHz -Other:NMK 111 x3,214 x2,901,903 x2,902,005,004,215,008,009 x2 */ ROM_START( gunnail ) ROM_REGION( 0x80000, "maincpu", 0 ) /* 68000 code */ - ROM_LOAD16_BYTE( "3e.bin", 0x00000, 0x40000, CRC(61d985b2) SHA1(96daca603f18accb47f98a3e584b2c84fc5a2ca4) ) - ROM_LOAD16_BYTE( "3o.bin", 0x00001, 0x40000, CRC(f114e89c) SHA1(a12f5278167f446bb5277e87289c41b5aa365c86) ) + ROM_LOAD16_BYTE( "3e.u131", 0x00000, 0x40000, CRC(61d985b2) SHA1(96daca603f18accb47f98a3e584b2c84fc5a2ca4) ) + ROM_LOAD16_BYTE( "3o.u133", 0x00001, 0x40000, CRC(f114e89c) SHA1(a12f5278167f446bb5277e87289c41b5aa365c86) ) - ROM_REGION( 0x10000, "audiocpu", 0 ) /* Code for (unknown?) CPU */ - ROM_LOAD( "92077_2.bin", 0x00000, 0x10000, CRC(cd4e55f8) SHA1(92182767ca0ec37ec4949bd1a88c2efdcdcb60ed) ) + ROM_REGION( 0x10000, "audiocpu", 0 ) /* Code for NMK004 CPU */ + ROM_LOAD( "92077_2.u101", 0x00000, 0x10000, CRC(cd4e55f8) SHA1(92182767ca0ec37ec4949bd1a88c2efdcdcb60ed) ) ROM_REGION( 0x020000, "fgtile", 0 ) - ROM_LOAD( "1.bin", 0x000000, 0x020000, CRC(3d00a9f4) SHA1(91a82e3e74c8774d7f8b2adceb228b97010facfd) ) /* 8x8 tiles */ + ROM_LOAD( "1.u21", 0x000000, 0x020000, CRC(3d00a9f4) SHA1(91a82e3e74c8774d7f8b2adceb228b97010facfd) ) /* 8x8 tiles */ ROM_REGION( 0x100000, "bgtile", 0 ) - ROM_LOAD( "92077-4.bin", 0x000000, 0x100000, CRC(a9ea2804) SHA1(14dbdb3c7986db5e44dc7c5be6fcf39f3d1e50b0) ) /* 16x16 tiles */ + ROM_LOAD( "92077-4.u19", 0x000000, 0x100000, CRC(a9ea2804) SHA1(14dbdb3c7986db5e44dc7c5be6fcf39f3d1e50b0) ) /* 16x16 tiles */ ROM_REGION( 0x200000, "sprites", 0 ) - ROM_LOAD16_WORD_SWAP( "92077-7.bin", 0x000000, 0x200000, CRC(d49169b3) SHA1(565ff7725dd6ace79b55706114132d8d867e81a9) ) /* Sprites */ + ROM_LOAD16_WORD_SWAP( "92077-7.u134", 0x000000, 0x200000, CRC(d49169b3) SHA1(565ff7725dd6ace79b55706114132d8d867e81a9) ) /* Sprites */ ROM_REGION( 0x0a0000, "oki1", 0 ) /* OKIM6295 samples */ - ROM_LOAD( "92077-5.bin", 0x00000, 0x20000, CRC(feb83c73) SHA1(b44e9d20b4af02e218c4bc875d66a7d6b8551cae) ) + ROM_LOAD( "92077-5.u56", 0x00000, 0x20000, CRC(feb83c73) SHA1(b44e9d20b4af02e218c4bc875d66a7d6b8551cae) ) ROM_CONTINUE( 0x40000, 0x60000 ) /* banked */ ROM_REGION( 0x0a0000, "oki2", 0 ) /* OKIM6295 samples */ - ROM_LOAD( "92077-6.bin", 0x00000, 0x20000, CRC(6d133f0d) SHA1(8a5e6e27a297196f20e4de0d060f1188115809bb) ) + ROM_LOAD( "92077-6.u57", 0x00000, 0x20000, CRC(6d133f0d) SHA1(8a5e6e27a297196f20e4de0d060f1188115809bb) ) ROM_CONTINUE( 0x40000, 0x60000 ) /* banked */ ROM_REGION( 0x0220, "proms", 0 ) - ROM_LOAD( "8.bpr", 0x0000, 0x0100, CRC(4299776e) SHA1(683d14d2ace14965f0fcfe0f0540c1b77d2cece5) ) /* unknown */ - ROM_LOAD( "9.bpr", 0x0100, 0x0100, CRC(633ab1c9) SHA1(acd99fcca41eaab7948ca84988352f1d7d519c61) ) /* unknown */ - ROM_LOAD( "10.bpr", 0x0200, 0x0020, CRC(c60103c8) SHA1(dfb05b704bb5e1f75f5aaa4fa36e8ddcc905f8b6) ) /* unknown */ + ROM_LOAD( "8_82s129.u35", 0x0000, 0x0100, CRC(4299776e) SHA1(683d14d2ace14965f0fcfe0f0540c1b77d2cece5) ) /* unknown */ + ROM_LOAD( "9_82s135.u72", 0x0100, 0x0100, CRC(633ab1c9) SHA1(acd99fcca41eaab7948ca84988352f1d7d519c61) ) /* unknown */ + ROM_LOAD( "10_82s123.u96", 0x0200, 0x0020, CRC(c60103c8) SHA1(dfb05b704bb5e1f75f5aaa4fa36e8ddcc905f8b6) ) /* unknown */ ROM_END ROM_START( macross2 )