diff options
author | 2019-09-16 13:51:27 +0900 | |
---|---|---|
committer | 2019-09-16 14:51:27 +1000 | |
commit | fffed2ea0d0539c40e6b3ae76709cdf0d0ef0980 (patch) | |
tree | 55ff7df89cf48436bca2406f98eba122cb4b98dd | |
parent | 8f07788495dbf8dc3bdd18e9799f2ecca628b239 (diff) |
nmk16.cpp : Add on-board chip & XTAL verifications (#5630)
* nmk16.cpp : Add on-board chip & XTAL verifications
* nmk16.cpp : Add possiblity config
* nmk16.cpp : Add more cases
-rw-r--r-- | src/mame/drivers/nmk16.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp index 06df64835a7..cde064818b9 100644 --- a/src/mame/drivers/nmk16.cpp +++ b/src/mame/drivers/nmk16.cpp @@ -4693,11 +4693,11 @@ void nmk16_state::gunnailb(machine_config &config) void nmk16_state::macross2(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, 10000000); /* 10 MHz ? */ + M68000(config, m_maincpu, XTAL(10'000'000)); /* MC68000P12 10 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &nmk16_state::macross2_map); set_hacky_interrupt_timing(config); - Z80(config, m_audiocpu, 4000000); /* 4 MHz ? */ + Z80(config, m_audiocpu, 4000000); /* Z8400B PS 4 MHz ? */ m_audiocpu->set_addrmap(AS_PROGRAM, &nmk16_state::macross2_sound_map); m_audiocpu->set_addrmap(AS_IO, &nmk16_state::macross2_sound_io_map); @@ -4715,17 +4715,17 @@ void nmk16_state::macross2(machine_config &config) GENERIC_LATCH_8(config, m_soundlatch); GENERIC_LATCH_8(config, "soundlatch2"); - ym2203_device &ymsnd(YM2203(config, "ymsnd", 1500000)); + ym2203_device &ymsnd(YM2203(config, "ymsnd", XTAL(12'000'000) / 8)); ymsnd.irq_handler().set_inputline(m_audiocpu, 0); ymsnd.add_route(0, "mono", 0.50); ymsnd.add_route(1, "mono", 0.50); ymsnd.add_route(2, "mono", 0.50); ymsnd.add_route(3, "mono", 1.20); - OKIM6295(config, m_oki[0], 16000000/4, okim6295_device::PIN7_LOW); + OKIM6295(config, m_oki[0], XTAL(16'000'000) / 4, okim6295_device::PIN7_LOW); m_oki[0]->add_route(ALL_OUTPUTS, "mono", 0.10); - OKIM6295(config, m_oki[1], 16000000/4, okim6295_device::PIN7_LOW); + OKIM6295(config, m_oki[1], XTAL(16'000'000) / 4, okim6295_device::PIN7_LOW); m_oki[1]->add_route(ALL_OUTPUTS, "mono", 0.10); nmk112_device &nmk112(NMK112(config, "nmk112", 0)); @@ -4736,11 +4736,11 @@ void nmk16_state::macross2(machine_config &config) void nmk16_state::tdragon2(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, 10000000); /* 10 MHz */ + M68000(config, m_maincpu, XTAL(10'000'000)); /* TMP68000P-12 10 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &nmk16_state::tdragon2_map); set_hacky_interrupt_timing(config); - Z80(config, m_audiocpu, 4000000); /* 4 MHz */ + Z80(config, m_audiocpu, 4000000); /* Z0840006PSC 4 MHz */ m_audiocpu->set_addrmap(AS_PROGRAM, &nmk16_state::macross2_sound_map); m_audiocpu->set_addrmap(AS_IO, &nmk16_state::macross2_sound_io_map); @@ -4758,17 +4758,17 @@ void nmk16_state::tdragon2(machine_config &config) GENERIC_LATCH_8(config, m_soundlatch); GENERIC_LATCH_8(config, "soundlatch2"); - ym2203_device &ymsnd(YM2203(config, "ymsnd", 1500000)); + ym2203_device &ymsnd(YM2203(config, "ymsnd", XTAL(12'000'000) / 8)); ymsnd.irq_handler().set_inputline(m_audiocpu, 0); ymsnd.add_route(0, "mono", 0.50); ymsnd.add_route(1, "mono", 0.50); ymsnd.add_route(2, "mono", 0.50); ymsnd.add_route(3, "mono", 1.20); - OKIM6295(config, m_oki[0], 16000000/4, okim6295_device::PIN7_LOW); + OKIM6295(config, m_oki[0], XTAL(16'000'000) / 4, okim6295_device::PIN7_LOW); m_oki[0]->add_route(ALL_OUTPUTS, "mono", 0.10); - OKIM6295(config, m_oki[1], 16000000/4, okim6295_device::PIN7_LOW); + OKIM6295(config, m_oki[1], XTAL(16'000'000) / 4, okim6295_device::PIN7_LOW); m_oki[1]->add_route(ALL_OUTPUTS, "mono", 0.10); nmk112_device &nmk112(NMK112(config, "nmk112", 0)); @@ -4787,11 +4787,11 @@ void nmk16_state::tdragon3h(machine_config &config) void nmk16_state::raphero(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, 14000000); /* 14 MHz measured */ + M68000(config, m_maincpu, XTAL(14'000'000)); /* MC68HC000P12 or MC68000P12F or TMP68HC000P-16 14 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &nmk16_state::raphero_map); set_hacky_interrupt_timing(config); - TMP90841(config, m_audiocpu, 8000000); + TMP90841(config, m_audiocpu, XTAL(16'000'000) / 2); // TMP90C841AN 8 MHz m_audiocpu->set_addrmap(AS_PROGRAM, &nmk16_state::raphero_sound_mem_map); /* video hardware */ @@ -4808,17 +4808,17 @@ void nmk16_state::raphero(machine_config &config) GENERIC_LATCH_8(config, m_soundlatch); GENERIC_LATCH_8(config, "soundlatch2"); - ym2203_device &ymsnd(YM2203(config, "ymsnd", 1500000)); + ym2203_device &ymsnd(YM2203(config, "ymsnd", XTAL(12'000'000) / 8)); ymsnd.irq_handler().set_inputline(m_audiocpu, 0); ymsnd.add_route(0, "mono", 0.50); ymsnd.add_route(1, "mono", 0.50); ymsnd.add_route(2, "mono", 0.50); ymsnd.add_route(3, "mono", 1.20); - OKIM6295(config, m_oki[0], 16000000/4, okim6295_device::PIN7_LOW); + OKIM6295(config, m_oki[0], XTAL(16'000'000) / 4, okim6295_device::PIN7_LOW); m_oki[0]->add_route(ALL_OUTPUTS, "mono", 0.10); - OKIM6295(config, m_oki[1], 16000000/4, okim6295_device::PIN7_LOW); + OKIM6295(config, m_oki[1], XTAL(16'000'000) / 4, okim6295_device::PIN7_LOW); m_oki[1]->add_route(ALL_OUTPUTS, "mono", 0.10); nmk112_device &nmk112(NMK112(config, "nmk112", 0)); |