diff --git a/src/mame/nichibutsu/nichild.cpp b/src/mame/nichibutsu/nichild.cpp index f3a18d82676..f953acd8922 100644 --- a/src/mame/nichibutsu/nichild.cpp +++ b/src/mame/nichibutsu/nichild.cpp @@ -1,21 +1,19 @@ // license:LGPL-2.1+ // copyright-holders:Angelo Salese -/*************************************************************************** +/************************************************************************************************** - 'Nichibutsu LD' HW (c) 199? Nichibutsu +'Nichibutsu LD' HW (c) 199? Nichibutsu - TODO: - - Understand how MMU works (both games jumps to invalid areas, probably - port A remaps memory for the whole space); - - (if ld check patched) memory error printed by ldquiz4, most likely - related to above; - - Unknown LaserDisc type; - - Verify irq vector for vblank irq, and make it work with daisy chain; - - Unknown irq vector for LaserDisc strobe (ldquiz4 sets a flag at $f014, - the only place it clears it is at snippet 0x0ED6); - - hookup audio CPU (same as niyanpai HW?) +TODO: +- ldquiz4: spins on "memory test error 13", implying a missing ROM dump (other GFXs will return further errors if missing, returning the label there); +- Unknown LaserDisc type; +- Unknown irq vector for LaserDisc strobe (ldquiz4 sets a flag at $f014, + the only place it clears it is at snippet 0x0ED6); +- V9938 has issues with layer clears, implicitly cleared by superimposing or irq timing? +- Complete audio section, SFXs keeps ringing; +- DIP Switches, flip-flop driven; -============================================================================= +=================================================================================================== 1 x TMPZ84C011AF-6 main CPU 1 x 21.47727MHz OSC @@ -26,11 +24,15 @@ 1 x Yamaha YM3812 2 x 8 dip switch banks -***************************************************************************/ +**************************************************************************************************/ #include "emu.h" + #include "cpu/z80/tmpz84c011.h" +#include "machine/gen_latch.h" +#include "sound/dac.h" +#include "sound/ymopl.h" #include "video/v9938.h" #include "screen.h" @@ -48,10 +50,14 @@ public: nichild_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") + , m_audiocpu(*this, "audiocpu") , m_v9938(*this, "v9938") , m_gfxrom(*this, "gfx") , m_p1_keymatrix(*this, { "P1_KEY0", "P1_KEY1", "P1_KEY2", "P1_KEY3", "P1_KEY4" }) , m_p2_keymatrix(*this, { "P2_KEY0", "P2_KEY1", "P2_KEY2", "P2_KEY3", "P2_KEY4" }) + , m_sound_rom(*this, "audiorom") + , m_soundbank(*this, "soundbank") + , m_soundlatch(*this, "soundlatch") { } @@ -59,11 +65,17 @@ public: private: required_device m_maincpu; + required_device m_audiocpu; required_device m_v9938; required_region_ptr m_gfxrom; + required_ioport_array<5> m_p1_keymatrix; required_ioport_array<5> m_p2_keymatrix; + required_region_ptr m_sound_rom; + required_memory_bank m_soundbank; + required_device m_soundlatch; + uint8_t gfx_r(offs_t offset); uint8_t p1_keymatrix_r(); uint8_t p2_keymatrix_r(); @@ -74,8 +86,13 @@ private: void portd_w(uint8_t data); void gfxbank_w(uint8_t data); - void nichild_io(address_map &map); - void nichild_map(address_map &map); + void main_map(address_map &map); + void main_io(address_map &map); + + void soundbank_w(uint8_t data); + + void audio_map(address_map &map); + void audio_io(address_map &map); // driver_device overrides virtual void machine_start() override; @@ -99,12 +116,13 @@ uint8_t nichild_state::gfx_r(offs_t offset) return m_gfxrom[gfx_offset]; } -//#include "debugger.h" - +/* + * -x-- ---- 1 -> 0 clock DIPSW (moves to the next bit) + * --x- ---- 0 -> 1 reset DIPSW + */ void nichild_state::porta_w(uint8_t data) { logerror("PORTA %02x\n",data); -// machine().debug_break(); } void nichild_state::portb_w(uint8_t data) @@ -155,29 +173,50 @@ void nichild_state::key_select_w(uint8_t data) m_key_select = (data & 0x1f); } -void nichild_state::nichild_map(address_map &map) +void nichild_state::main_map(address_map &map) { - // TODO: identify ROM banks - map(0x0000, 0x1fff).rom().region("ipl", 0x0000); - map(0x2000, 0x3fff).rom().region("ipl", 0x2000); - map(0x4000, 0x5fff).rom().region("ipl", 0x4000); - map(0x6000, 0x7fff).rom().region("ipl", 0x6000); + map(0x0000, 0x7fff).rom().region("ipl", 0x0000); map(0x8000, 0x9fff).rom().region("ipl", 0x8000); - map(0xc000, 0xdfff).rom().region("ipl", 0x0000); map(0xe000, 0xffff).ram(); } -void nichild_state::nichild_io(address_map &map) +void nichild_state::main_io(address_map &map) { // map.global_mask(0xff); map(0x60, 0x60).mirror(0xff00).w(FUNC(nichild_state::key_select_w)); - // Not nichisnd? -// map(0x64, 0x64).mirror(0xff00).w(m_nichisnd, FUNC(nichisnd_device::sound_host_command_w)); + map(0x64, 0x64).mirror(0xff00).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // shabdama accesses 0x70-0x73, ldquiz4 0x7c-0x7f map(0x70, 0x73).mirror(0xff0c).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write)); map(0x80, 0xff).select(0xff00).r(FUNC(nichild_state::gfx_r)); } +void nichild_state::soundbank_w(uint8_t data) +{ + m_soundbank->set_entry(data & 0x03); + // TODO: bit 7 used often with 0 -> 1 transitions + if (data & 0x7c) + logerror("soundbank_w: %02x\n", data); +} + +// Sound design looks a link between armedf.cpp and nichisnd +void nichild_state::audio_map(address_map &map) +{ + map(0x0000, 0x77ff).rom().region("audiorom", 0); + map(0x7800, 0x7fff).ram(); + map(0x8000, 0xffff).bankr(m_soundbank); +} + +void nichild_state::audio_io(address_map &map) +{ + map.global_mask(0xff); + map(0x00, 0x00).r(m_soundlatch, FUNC(generic_latch_8_device::read)).nopw(); + map(0x02, 0x02).w("dac", FUNC(dac_byte_interface::data_w)); + map(0x04, 0x04).w(FUNC(nichild_state::soundbank_w)); + map(0x06, 0x06).nopw(); // irq ack + map(0x80, 0x81).w("ymsnd", FUNC(ym3812_device::write)); +} + + static INPUT_PORTS_START( nichild ) // mahjong panels are virtually identical to nb1413m3 PORT_START("P1_KEY0") @@ -306,6 +345,8 @@ INPUT_PORTS_END void nichild_state::machine_start() { + m_soundbank->configure_entries(0, 3, m_sound_rom + 0x8000, 0x8000); + m_soundbank->set_entry(0); } void nichild_state::machine_reset() @@ -323,8 +364,9 @@ void nichild_state::nichild(machine_config &config) { TMPZ84C011(config, m_maincpu, MAIN_CLOCK/4); m_maincpu->set_daisy_config(daisy_chain_main); - m_maincpu->set_addrmap(AS_PROGRAM, &nichild_state::nichild_map); - m_maincpu->set_addrmap(AS_IO, &nichild_state::nichild_io); + m_maincpu->set_addrmap(AS_PROGRAM, &nichild_state::main_map); + m_maincpu->set_addrmap(AS_IO, &nichild_state::main_io); +// m_maincpu->in_pa_callback() DIPSW f/f read (bit 7) m_maincpu->in_pb_callback().set(FUNC(nichild_state::p1_keymatrix_r)); m_maincpu->in_pc_callback().set(FUNC(nichild_state::p2_keymatrix_r)); m_maincpu->in_pd_callback().set_ioport("PORTD"); @@ -334,6 +376,11 @@ void nichild_state::nichild(machine_config &config) m_maincpu->out_pd_callback().set(FUNC(nichild_state::portd_w)); m_maincpu->out_pe_callback().set(FUNC(nichild_state::gfxbank_w)); + Z80(config, m_audiocpu, SOUND_CLOCK); + m_audiocpu->set_addrmap(AS_PROGRAM, &nichild_state::audio_map); + m_audiocpu->set_addrmap(AS_IO, &nichild_state::audio_io); + m_audiocpu->set_periodic_int(FUNC(nichild_state::irq0_line_hold), attotime::from_hz(XTAL(SOUND_CLOCK)/512)); // ? + V9938(config, m_v9938, MAIN_CLOCK); m_v9938->set_screen_ntsc("screen"); m_v9938->set_vram_size(0x40000); @@ -341,10 +388,14 @@ void nichild_state::nichild(machine_config &config) SCREEN(config, "screen", SCREEN_TYPE_RASTER); -// NICHISND(config, m_nichisnd, 0); + // TODO: mixing with LD player + SPEAKER(config, "speaker").front_center(); - SPEAKER(config, "lspeaker").front_left(); - SPEAKER(config, "rspeaker").front_right(); + GENERIC_LATCH_8(config, m_soundlatch); + + YM3812(config, "ymsnd", SOUND_CLOCK).add_route(ALL_OUTPUTS, "speaker", 0.5); + + DAC_8BIT_R2R(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 1.0); // unknown DAC } @@ -358,18 +409,18 @@ ROM_START( shabdama ) ROM_REGION( 0x10000, "ipl", ROMREGION_ERASE00 ) ROM_LOAD( "1.bin", 0x000000, 0x010000, CRC(e49e3d73) SHA1(6d17d60e1b6f8aee96f7a09f45113030064d3bdb) ) - ROM_REGION( 0x20000, "audiocpu", ROMREGION_ERASE00 ) + ROM_REGION( 0x20000, "audiorom", ROMREGION_ERASE00 ) ROM_LOAD( "3.bin", 0x000000, 0x010000, CRC(e8233c6e) SHA1(fbfdb03dc9f4e3e80e161b8522b676485ffb1c95) ) ROM_LOAD( "2.bin", 0x010000, 0x010000, CRC(3e0b5344) SHA1(eeae36fc4fca091065c1d51f05c2d11f44fe6d13) ) ROM_REGION( 0x200000, "gfx", ROMREGION_ERASE00 ) - ROM_LOAD( "10.bin", 0x060000, 0x010000, CRC(5da10b82) SHA1(72974d083110fc6c583bfa1c22ce3abe02ba86f6) ) - ROM_LOAD( "9.bin", 0x050000, 0x010000, CRC(1afdc5bf) SHA1(b07b32656ffc96b7f7d4bd242b2a6e0e105ab67a) ) - ROM_LOAD( "8.bin", 0x040000, 0x010000, CRC(3e75423e) SHA1(62e24849ddeb004ed8570d2884afa4ab257cdf07) ) - ROM_LOAD( "7.bin", 0x030000, 0x010000, CRC(7f08e3a6) SHA1(127018442183332175c9e1f558274cd2cb5f0147) ) - ROM_LOAD( "6.bin", 0x020000, 0x010000, CRC(0fece809) SHA1(1fe8436af8ead02a3b517b6306f9824cd64b2d26) ) - ROM_LOAD( "5.bin", 0x010000, 0x010000, CRC(0706386a) SHA1(29eee363775869dcc9c46285632e8bf745c9110b) ) ROM_LOAD( "4.bin", 0x000000, 0x010000, CRC(199e2127) SHA1(2514d51cb06438b312d1f328c72baa739280416a) ) + ROM_LOAD( "5.bin", 0x010000, 0x010000, CRC(0706386a) SHA1(29eee363775869dcc9c46285632e8bf745c9110b) ) + ROM_LOAD( "6.bin", 0x020000, 0x010000, CRC(0fece809) SHA1(1fe8436af8ead02a3b517b6306f9824cd64b2d26) ) + ROM_LOAD( "7.bin", 0x030000, 0x010000, CRC(7f08e3a6) SHA1(127018442183332175c9e1f558274cd2cb5f0147) ) + ROM_LOAD( "8.bin", 0x040000, 0x010000, CRC(3e75423e) SHA1(62e24849ddeb004ed8570d2884afa4ab257cdf07) ) + ROM_LOAD( "9.bin", 0x050000, 0x010000, CRC(1afdc5bf) SHA1(b07b32656ffc96b7f7d4bd242b2a6e0e105ab67a) ) + ROM_LOAD( "10.bin", 0x060000, 0x010000, CRC(5da10b82) SHA1(72974d083110fc6c583bfa1c22ce3abe02ba86f6) ) DISK_REGION( "laserdisc" ) DISK_IMAGE_READONLY( "shabdama", 0, NO_DUMP ) @@ -382,7 +433,7 @@ ROM_START( ldquiz4 ) ROM_REGION( 0x10000, "ipl", 0 ) // 27512 ROM_LOAD( "1.e3", 0x00000, 0x10000, CRC(49255f66) SHA1(bdd01987331c2aadea7f588d39c48c70cd43fc71) ) - ROM_REGION( 0x20000, "audiocpu", 0 ) // 27512 + ROM_REGION( 0x20000, "audiorom", 0 ) // 27512 ROM_LOAD( "3.e7", 0x00000, 0x10000, CRC(b033eb6a) SHA1(2c11b2b998117f68a1fbbd110d3f67ab472e133d) ) ROM_LOAD( "2.e6", 0x10000, 0x10000, CRC(6c83cad6) SHA1(c38f60fb4fdbda76ea3459644bf491cc305a7ae6) ) @@ -396,6 +447,7 @@ ROM_START( ldquiz4 ) ROM_LOAD( "10.k8", 0x0c0000, 0x20000, CRC(c7437125) SHA1(55b161ce2432d04531ed0afab973f892b571ef88) ) ROM_LOAD( "11.k9", 0x0e0000, 0x20000, CRC(6feeab93) SHA1(d77325c1eecb677c48d11bf8d5f73b238f2896e6) ) ROM_LOAD( "12.k10", 0x100000, 0x20000, CRC(c7f9bf98) SHA1(103b78b0e126ea4249982bf114010f57e5ffa70a) ) + ROM_LOAD( "13", 0x120000, 0x20000, NO_DUMP ) ROM_REGION( 0x800, "plds", 0 ) // all protected ROM_LOAD( "pal16l8.0", 0x000, 0x104, NO_DUMP ) @@ -410,5 +462,5 @@ ROM_END } // anonymous namespace -GAME( 1991, shabdama, 0, nichild, nichild, nichild_state, empty_init, ROT0, "Nichibutsu / AV Japan", "LD Mahjong #4 Shabon-Dama (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 1992, ldquiz4, 0, nichild, nichild, nichild_state, empty_init, ROT0, "Nichibutsu", "LD Quiz dai 4-dan - Kotaetamon Gachi! (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) +GAME( 1991, shabdama, 0, nichild, nichild, nichild_state, empty_init, ROT0, "Nichibutsu / AV Japan", "LD Mahjong #4 Shabon-Dama (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) +GAME( 1992, ldquiz4, 0, nichild, nichild, nichild_state, empty_init, ROT0, "Nichibutsu", "LD Quiz dai 4-dan - Kotaetamon Gachi! (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )