Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

aerofgt.cpp: preliminary sound for spikes91. Needs verifying of the completeness of the sound latch hook up and hook up of the OKI M5205 (nw)

Browse Source 
rpunch.cpp: very preliminary sound for svolleybl. Needs correct sound latch hook up and hook up of the OKI M5205 (nw)
This commit is contained in:
Ivan Vangelista 2020-01-03 18:17:00 +01:00
parent fa18b5303c
commit 0a29d61060
4 changed files with 68 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/mame/drivers/aerofgt.cpp
View File

@ -69,6 +69,7 @@ Verification still needed for the other PCBs.
#include "machine/vs9209.h"
#include "sound/2610intf.h"
#include "sound/3812intf.h"
#include "sound/ym2151.h"
#include "video/vsystem_gga.h"
#include "screen.h"
#include "speaker.h"
@ -202,7 +203,7 @@ void aerofgt_state::spikes91_map(address_map &map)
map(0xfff002, 0xfff003).portr("IN1");
map(0xfff003, 0xfff003).w(FUNC(aerofgt_state::pspikes_gfxbank_w));
map(0xfff004, 0xfff005).portr("DSW").w(FUNC(aerofgt_state::scrolly_w<0>));
map(0xfff006, 0xfff007).noprw();
map(0xfff007, 0xfff007).r(FUNC(aerofgt_state::pending_command_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff);
map(0xfff008, 0xfff009).w(FUNC(aerofgt_state::spikes91_lookup_w));
}
@ -546,6 +547,15 @@ void aerofgt_state::kickball_sound_portmap(address_map &map)
map(0xc0, 0xc0).w(m_soundlatch, FUNC(generic_latch_8_device::acknowledge_w));
}
void aerofgt_state::spikes91_sound_map(address_map &map)
{
map(0x0000, 0xdfff).rom();
map(0xe000, 0xe001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0xe800, 0xe800).r(m_soundlatch, FUNC(generic_latch_8_device::read));
//map(0xf000, 0xf000) // OKI M5205?
//map(0xf400, 0xf400) // OKI M5205?
map(0xf800, 0xffff).ram();
}
void aerofgt_state::oki_map(address_map &map)
{ //only for aerfboot for now
@ -1520,11 +1530,15 @@ void aerofgt_state::spikes91(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &aerofgt_state::spikes91_map);
m_maincpu->set_vblank_int("screen", FUNC(aerofgt_state::irq1_line_hold)); /* all irq vectors are the same */
/* + Z80 for sound */
Z80(config, m_audiocpu, 24000000/8); // ?
m_audiocpu->set_addrmap(AS_PROGRAM, &aerofgt_state::spikes91_sound_map);
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
GENERIC_LATCH_8(config, m_soundlatch);
m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, 0);
/* video hardware */
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
screen.set_refresh_hz(60);
@ -1541,12 +1555,12 @@ void aerofgt_state::spikes91(machine_config &config)
MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes)
/* sound hardware */
/* the sound hardware is completely different on this:
1x YM2151 (sound)(ic150)
1x OKI M5205 (sound)(ic145)
2x LM324N (sound)(ic152, ic153)
*/
SPEAKER(config, "mono").front_center();
ym2151_device &ymsnd(YM2151(config, "ymsnd", 24000000/8));
ymsnd.add_route(ALL_OUTPUTS, "mono", 0.50);
// TODO: OKI M5205
}
void aerofgt_state::pspikesb(machine_config &config)
@ -2374,9 +2388,9 @@ ROM_START( spikes91 )
ROM_LOAD16_BYTE( "10.ic104", 0x00000, 0x10000, CRC(769ade77) SHA1(9cb581d02592c69f37d4b5a902d3515f40915ec4) )
ROM_LOAD16_BYTE( "9.ic103", 0x00001, 0x10000, CRC(201cb748) SHA1(f78d384e4e9c5996a278f76fb4d5f28812a27de5) )
ROM_REGION( 0x20000, "cpu1", 0 ) /* Z80 Sound CPU + M5205 Samples */
ROM_LOAD( "1.ic140", 0x00000, 0x10000, CRC(e3065b1d) SHA1(c4a3a95ba7f43cdf1b0c574f41de06d007ad2bd8) )
ROM_LOAD( "2.ic141", 0x10000, 0x10000, CRC(5dd8bf22) SHA1(d1a12894fe8ca47e47b4a1e911cabf20dd41eda4) )
ROM_REGION( 0x20000, "audiocpu", 0 ) /* Z80 Sound CPU + M5205 Samples */
ROM_LOAD( "1.ic140", 0x00000, 0x10000, CRC(e3065b1d) SHA1(c4a3a95ba7f43cdf1b0c574f41de06d007ad2bd8) ) // matches svolleybl in rpunch.cpp
ROM_LOAD( "2.ic141", 0x10000, 0x10000, CRC(5dd8bf22) SHA1(d1a12894fe8ca47e47b4a1e911cabf20dd41eda4) ) // 1ST AND 2ND HALF IDENTICAL, matches svolleybl in rpunch.cpp when halved
ROM_REGION( 0x1000, "user2", 0 ) /* ? */
ROM_LOAD( "ep910pc.ic7", 0x00000, 0x884, CRC(e7a3913a) SHA1(6f18f55ecdc94a416baecd16fe7c6698b1ec9d87) )
@ -2403,9 +2417,9 @@ ROM_START( spikes91b ) // todo, check how this differs, only 1 of the 68k pair a
ROM_LOAD16_BYTE( "10.ic104", 0x00000, 0x8000, CRC(b6fe4e57) SHA1(6b62936ff9d0f39fd02c3db488d53bc035c2272d) ) // sldh
ROM_LOAD16_BYTE( "9.ic103", 0x00001, 0x8000, CRC(5479ed35) SHA1(ca26289318352901841fcdf26d9b43e797ac39b6) ) // sldh
ROM_REGION( 0x20000, "cpu1", 0 ) /* Z80 Sound CPU + M5205 Samples */
ROM_LOAD( "1.ic140", 0x00000, 0x10000, CRC(e3065b1d) SHA1(c4a3a95ba7f43cdf1b0c574f41de06d007ad2bd8) )
ROM_LOAD( "2.ic141", 0x10000, 0x10000, CRC(5dd8bf22) SHA1(d1a12894fe8ca47e47b4a1e911cabf20dd41eda4) )
ROM_REGION( 0x20000, "audiocpu", 0 ) /* Z80 Sound CPU + M5205 Samples */
ROM_LOAD( "1.ic140", 0x00000, 0x10000, CRC(e3065b1d) SHA1(c4a3a95ba7f43cdf1b0c574f41de06d007ad2bd8) ) // matches svolleybl in rpunch.cpp
ROM_LOAD( "2.ic141", 0x10000, 0x10000, CRC(5dd8bf22) SHA1(d1a12894fe8ca47e47b4a1e911cabf20dd41eda4) ) // 1ST AND 2ND HALF IDENTICAL, matches svolleybl in rpunch.cpp when halved
ROM_REGION( 0x1000, "user2", 0 ) /* ? */
ROM_LOAD( "ep910pc.ic7", 0x00000, 0x884, CRC(e7a3913a) SHA1(6f18f55ecdc94a416baecd16fe7c6698b1ec9d87) )
@ -3159,8 +3173,8 @@ GAME( 1991, pspikesu, pspikes, pspikes, pspikes, aerofgt_state, empty_in
GAME( 1991, svolly91, pspikes, pspikes, pspikes, aerofgt_state, empty_init, ROT0, "Video System Co.", "Super Volley '91 (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
GAME( 1991, pspikesb, pspikes, pspikesb, pspikesb, aerofgt_state, empty_init, ROT0, "bootleg", "Power Spikes (bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
GAME( 1991, pspikesba, pspikes, pspikesb, pspikesb, aerofgt_state, empty_init, ROT0, "bootleg (Playmark?)", "Power Spikes (Italian bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
GAME( 1991, spikes91, pspikes, spikes91, pspikes, aerofgt_state, empty_init, ROT0, "bootleg", "1991 Spikes (Italian bootleg, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND | MACHINE_NO_COCKTAIL )
GAME( 1991, spikes91b, pspikes, spikes91, pspikes, aerofgt_state, empty_init, ROT0, "bootleg", "1991 Spikes (Italian bootleg, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND | MACHINE_NO_COCKTAIL )
GAME( 1991, spikes91, pspikes, spikes91, pspikes, aerofgt_state, empty_init, ROT0, "bootleg", "1991 Spikes (Italian bootleg, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL ) // OKI M5205 not hooked up yet
GAME( 1991, spikes91b, pspikes, spikes91, pspikes, aerofgt_state, empty_init, ROT0, "bootleg", "1991 Spikes (Italian bootleg, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL ) // OKI M5205 not hooked up yet
GAME( 1991, pspikesc, pspikes, pspikesc, pspikesc, aerofgt_state, empty_init, ROT0, "bootleg", "Power Spikes (China)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
GAME( 1997, wbbc97, 0, wbbc97, wbbc97, aerofgt_state, empty_init, ROT0, "Comad", "Beach Festival World Championship 1997", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL ) // based on power spikes codebase
GAME( 1998, kickball, 0, kickball, pspikes, aerofgt_state, init_kickball, ROT0, "Seoung Youn", "Kick Ball", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) // based on power spikes codebase, wrong priorities

54
src/mame/drivers/rpunch.cpp
View File

@ -138,8 +138,11 @@ void rpunch_state::machine_start()
void rpunch_state::machine_reset()
{
uint8_t *snd = memregion("upd")->base();
memcpy(snd, snd + 0x20000, 0x20000);
if (memregion("upd"))
{
uint8_t *snd = memregion("upd")->base();
memcpy(snd, snd + 0x20000, 0x20000);
}
}
@ -213,7 +216,7 @@ void rpunch_state::main_map(address_map &map)
map(0x0c0000, 0x0c0007).w(FUNC(rpunch_state::rpunch_scrollreg_w));
map(0x0c0009, 0x0c0009).select(0x20).w(FUNC(rpunch_state::rpunch_gga_w));
map(0x0c000c, 0x0c000d).w(FUNC(rpunch_state::rpunch_videoreg_w));
map(0x0c000f, 0x0c000f).w(m_soundlatch, FUNC(generic_latch_8_device::write));
map(0x0c000f, 0x0c000f).w(m_soundlatch, FUNC(generic_latch_8_device::write)).umask16(0x00ff);
map(0x0c0010, 0x0c0013).w(FUNC(rpunch_state::rpunch_ins_w));
map(0x0c0018, 0x0c0019).portr("P1");
map(0x0c001a, 0x0c001b).portr("P2");
@ -222,7 +225,16 @@ void rpunch_state::main_map(address_map &map)
map(0x0fc000, 0x0fffff).ram();
}
void rpunch_state::svolleybl_main_map(address_map &map)
{
main_map(map);
// TODO: sound latch hook up is incomplete
map(0x090000, 0x090fff).ram(); // ?
map(0x0c000e, 0x0c000f).unmapw();
map(0x0c001e, 0x0c001f).unmapr();
map(0x0b0001, 0x0b0001).w(m_soundlatch, FUNC(generic_latch_8_device::write));
}
/*************************************
*
@ -232,15 +244,23 @@ void rpunch_state::main_map(address_map &map)
void rpunch_state::sound_map(address_map &map)
{
map(0x0000, 0xefff).rom();
map(0xf000, 0xf001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0xf200, 0xf200).r(m_soundlatch, FUNC(generic_latch_8_device::read));
map(0x0000, 0xdfff).rom();
map(0xe000, 0xe001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0xe800, 0xe800).r(m_soundlatch, FUNC(generic_latch_8_device::read));
map(0xf400, 0xf400).w(FUNC(rpunch_state::upd_control_w));
map(0xf600, 0xf600).w(FUNC(rpunch_state::upd_data_w));
map(0xf800, 0xffff).ram();
}
void rpunch_state::svolleybl_sound_map(address_map &map)
{
map(0x0000, 0xdfff).rom();
map(0xe000, 0xe001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0xe800, 0xe800).r(m_soundlatch, FUNC(generic_latch_8_device::read));
//map(0xf000, 0xf000) // OKI M5205?
//map(0xf400, 0xf400) // OKI M5205?
map(0xf800, 0xffff).ram();
}
/*************************************
*
@ -510,15 +530,13 @@ void rpunch_state::svolleybl(machine_config &config)
{
/* basic machine hardware */
M68000(config, m_maincpu, MASTER_CLOCK/2);
m_maincpu->set_addrmap(AS_PROGRAM, &rpunch_state::main_map);
m_maincpu->set_addrmap(AS_PROGRAM, &rpunch_state::svolleybl_main_map);
Z80(config, m_audiocpu, MASTER_CLOCK/4);
m_audiocpu->set_addrmap(AS_PROGRAM, &rpunch_state::sound_map);
m_audiocpu->set_addrmap(AS_PROGRAM, &rpunch_state::svolleybl_sound_map);
GENERIC_LATCH_8(config, m_soundlatch);
m_soundlatch->data_pending_callback().set("soundirq", FUNC(input_merger_device::in_w<0>));
INPUT_MERGER_ANY_HIGH(config, "soundirq").output_handler().set_inputline(m_audiocpu, 0);
m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, 0);
/* video hardware */
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
@ -541,11 +559,9 @@ void rpunch_state::svolleybl(machine_config &config)
SPEAKER(config, "mono").front_center();
ym2151_device &ymsnd(YM2151(config, "ymsnd", MASTER_CLOCK/4));
ymsnd.irq_handler().set("soundirq", FUNC(input_merger_device::in_w<1>));
ymsnd.add_route(0, "mono", 0.50);
ymsnd.add_route(1, "mono", 0.50);
ymsnd.add_route(ALL_OUTPUTS, "mono", 0.50);
UPD7759(config, m_upd7759).add_route(ALL_OUTPUTS, "mono", 0.50);
// TODO: OKI M5205
}
@ -775,10 +791,8 @@ ROM_START( svolleybl )
ROM_REGION( 0x20000, "audiocpu", 0 ) /* Z80 Sound CPU */
ROM_LOAD( "2-snd.bin", 0x00000, 0x10000, CRC(e3065b1d) SHA1(c4a3a95ba7f43cdf1b0c574f41de06d007ad2bd8) ) // matches 1.ic140 from pspikes91
ROM_LOAD( "1-snd.bin", 0x10000, 0x08000, CRC(009d7157) SHA1(2cdda7094c7476289d75a78ee25b34fa3b3225c0) )
ROM_REGION( 0x60000, "upd", ROMREGION_ERASEFF )
ROM_LOAD( "2-snd.bin", 0x00000, 0x10000, CRC(e3065b1d) SHA1(c4a3a95ba7f43cdf1b0c574f41de06d007ad2bd8) ) // matches 1.ic140 from spikes91
ROM_LOAD( "1-snd.bin", 0x10000, 0x08000, CRC(009d7157) SHA1(2cdda7094c7476289d75a78ee25b34fa3b3225c0) ) // matches 2.ic141 from spikes91, when halved
ROM_END

1
src/mame/includes/aerofgt.h
View File

@ -170,6 +170,7 @@ public:
void pspikesc_map(address_map &map);
void sound_map(address_map &map);
void spikes91_map(address_map &map);
void spikes91_sound_map(address_map &map);
void spinlbrk_map(address_map &map);
void spinlbrk_sound_portmap(address_map &map);
void turbofrc_map(address_map &map);

4
src/mame/includes/rpunch.h
View File

@ -47,7 +47,7 @@ private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<generic_latch_8_device> m_soundlatch;
required_device<upd7759_device> m_upd7759;
optional_device<upd7759_device> m_upd7759;
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
@ -87,6 +87,8 @@ private:
void draw_bitmap(bitmap_ind16 &bitmap, const rectangle &cliprect);
void main_map(address_map &map);
void sound_map(address_map &map);
void svolleybl_main_map(address_map &map);
void svolleybl_sound_map(address_map &map);
};
#endif // MAME_INCLUDES_RPUNCH_H