uf, and some more found (nw)

This commit is contained in:
Miodrag Milanovic 2013-04-13 17:28:09 +00:00
parent 52aade5b8c
commit 4e43366a53
6 changed files with 46 additions and 46 deletions

View File

@ -1285,8 +1285,8 @@ WRITE16_MEMBER(konamigx_state::tms57002_control_word_w)
static ADDRESS_MAP_START( gxsndmap, AS_PROGRAM, 16, konamigx_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x2004ff) AM_DEVREADWRITE8("konami1", k054539_device, read, write, 0xff00)
AM_RANGE(0x200000, 0x2004ff) AM_DEVREADWRITE8("konami2", k054539_device, read, write, 0x00ff)
AM_RANGE(0x200000, 0x2004ff) AM_DEVREADWRITE8("k054539_1", k054539_device, read, write, 0xff00)
AM_RANGE(0x200000, 0x2004ff) AM_DEVREADWRITE8("k054539_2", k054539_device, read, write, 0x00ff)
AM_RANGE(0x300000, 0x300001) AM_READWRITE(tms57002_data_word_r, tms57002_data_word_w)
AM_RANGE(0x400000, 0x40000f) AM_WRITE(sndcomm68k_w)
AM_RANGE(0x400010, 0x40001f) AM_READ(sndcomm68k_r)
@ -1800,11 +1800,11 @@ static MACHINE_CONFIG_START( konamigx, konamigx_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_K054539_ADD("konami1", 48000, k054539_config)
MCFG_K054539_ADD("k054539_1", 48000, k054539_config)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_K054539_ADD("konami2", 48000, k054539_config)
MCFG_K054539_ADD("k054539_2", 48000, k054539_config)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@ -3624,7 +3624,6 @@ MACHINE_START_MEMBER(konamigx_state,konamigx)
MACHINE_RESET_MEMBER(konamigx_state,konamigx)
{
k054539_device *k054539_2 = machine().device<k054539_device>("konami2");
int i;
konamigx_wrport1_0 = konamigx_wrport1_1 = 0;
@ -3649,15 +3648,15 @@ MACHINE_RESET_MEMBER(konamigx_state,konamigx)
if (!strcmp(machine().system().name, "tkmmpzdm"))
{
// boost voice(chip 1 channel 3-7)
for (i=3; i<=7; i++) k054539_2->set_gain(i, 2.0);
for (i=3; i<=7; i++) m_k054539_2->set_gain(i, 2.0);
}
else if ((!strcmp(machine().system().name, "dragoonj")) || (!strcmp(machine().system().name, "dragoona")))
{
// soften percussions(chip 1 channel 0-3), boost voice(chip 1 channel 4-7)
for (i=0; i<=3; i++)
{
k054539_2->set_gain(i, 0.8);
k054539_2->set_gain(i+4, 2.0);
m_k054539_2->set_gain(i, 0.8);
m_k054539_2->set_gain(i+4, 2.0);
}
}
}

View File

@ -575,9 +575,9 @@ static ADDRESS_MAP_START( mystwarr_sound_map, AS_PROGRAM, 8, mystwarr_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
AM_RANGE(0x0000, 0xbfff) AM_WRITENOP
AM_RANGE(0xc000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami1", k054539_device, read, write)
AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("k054539_1", k054539_device, read, write)
AM_RANGE(0xe230, 0xe3ff) AM_RAM
AM_RANGE(0xe400, 0xe62f) AM_DEVREADWRITE("konami2", k054539_device, read, write)
AM_RANGE(0xe400, 0xe62f) AM_DEVREADWRITE("k054539_2", k054539_device, read, write)
AM_RANGE(0xe630, 0xe7ff) AM_RAM
AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch3_byte_w)
AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_byte_r)
@ -848,73 +848,65 @@ MACHINE_START_MEMBER(mystwarr_state,mystwarr)
MACHINE_RESET_MEMBER(mystwarr_state,mystwarr)
{
k054539_device *k054539_1 = machine().device<k054539_device>("konami1");
k054539_device *k054539_2 = machine().device<k054539_device>("konami2");
int i;
// soften chorus(chip 0 channel 0-3), boost voice(chip 0 channel 4-7)
for (i=0; i<=3; i++)
{
k054539_1->set_gain(i, 0.8);
k054539_1->set_gain(i+4, 2.0);
m_k054539_1->set_gain(i, 0.8);
m_k054539_1->set_gain(i+4, 2.0);
}
// soften percussions(chip 1 channel 0-7)
for (i=0; i<=7; i++) k054539_2->set_gain(i, 0.5);
for (i=0; i<=7; i++) m_k054539_2->set_gain(i, 0.5);
}
MACHINE_RESET_MEMBER(mystwarr_state,dadandrn)
{
k054539_device *k054539_1 = machine().device<k054539_device>("konami1");
int i;
// boost voice(chip 0 channel 4-7)
for (i=4; i<=7; i++) k054539_1->set_gain(i, 2.0);
for (i=4; i<=7; i++) m_k054539_1->set_gain(i, 2.0);
}
MACHINE_RESET_MEMBER(mystwarr_state,viostorm)
{
k054539_device *k054539_1 = machine().device<k054539_device>("konami1");
int i;
// boost voice(chip 0 channel 4-7)
for (i=4; i<=7; i++) k054539_1->set_gain(i, 2.0);
for (i=4; i<=7; i++) m_k054539_1->set_gain(i, 2.0);
}
MACHINE_RESET_MEMBER(mystwarr_state,metamrph)
{
k054539_device *k054539_1 = machine().device<k054539_device>("konami1");
k054539_device *k054539_2 = machine().device<k054539_device>("konami2");
int i;
// boost voice(chip 0 channel 4-7) and soften other channels
for (i=0; i<=3; i++)
{
k054539_1->set_gain(i, 0.8);
k054539_1->set_gain(i+4, 1.8);
k054539_2->set_gain(i, 0.8);
k054539_2->set_gain(i+4, 0.8);
m_k054539_1->set_gain(i, 0.8);
m_k054539_1->set_gain(i+4, 1.8);
m_k054539_2->set_gain(i, 0.8);
m_k054539_2->set_gain(i+4, 0.8);
}
}
MACHINE_RESET_MEMBER(mystwarr_state,martchmp)
{
k054539_device *k054539_1 = machine().device<k054539_device>("konami1");
int i;
k054539_1->init_flags(k054539_device::REVERSE_STEREO);
m_k054539_1->init_flags(k054539_device::REVERSE_STEREO);
// boost voice(chip 0 channel 4-7)
for (i=4; i<=7; i++) k054539_1->set_gain(i, 1.4);
for (i=4; i<=7; i++) m_k054539_1->set_gain(i, 1.4);
}
MACHINE_RESET_MEMBER(mystwarr_state,gaiapols)
{
k054539_device *k054539_1 = machine().device<k054539_device>("konami1");
int i;
// boost voice(chip 0 channel 5-7)
for (i=5; i<=7; i++) k054539_1->set_gain(i, 2.0);
for (i=5; i<=7; i++) m_k054539_1->set_gain(i, 2.0);
}
static const k053252_interface mystwarr_k053252_intf =
@ -1014,11 +1006,11 @@ static MACHINE_CONFIG_START( mystwarr, mystwarr_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_K054539_ADD("konami1", 48000, k054539_config)
MCFG_K054539_ADD("k054539_1", 48000, k054539_config)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
MCFG_K054539_ADD("konami2", 48000, k054539_config)
MCFG_K054539_ADD("k054539_2", 48000, k054539_config)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
MACHINE_CONFIG_END

View File

@ -73,12 +73,11 @@ WRITE16_MEMBER(qdrmfgp_state::gp_control_w)
int vol = m_nvram[0x10] & 0xff;
if (vol)
{
k054539_device *k054539 = machine().device<k054539_device>("konami");
int i;
double gain = vol / 90.0;
for (i=0; i<8; i++)
k054539->set_gain(i, gain);
m_k054539->set_gain(i, gain);
}
}
}
@ -103,12 +102,11 @@ WRITE16_MEMBER(qdrmfgp_state::gp2_control_w)
int vol = m_nvram[0x8] & 0xff;
if (vol)
{
k054539_device *k054539 = machine().device<k054539_device>("konami");
int i;
double gain = vol / 90.0;
for (i=0; i<8; i++)
k054539->set_gain(i, gain);
m_k054539->set_gain(i, gain);
}
}
}
@ -331,7 +329,7 @@ static ADDRESS_MAP_START( qdrmfgp_map, AS_PROGRAM, 16, qdrmfgp_state )
AM_RANGE(0x360000, 0x360001) AM_WRITENOP /* unknown */
AM_RANGE(0x370000, 0x370001) AM_WRITE(gp_control_w) /* control reg */
AM_RANGE(0x380000, 0x380001) AM_WRITENOP /* Watchdog */
AM_RANGE(0x800000, 0x80045f) AM_DEVREADWRITE8("konami", k054539_device, read, write, 0x00ff) /* sound regs */
AM_RANGE(0x800000, 0x80045f) AM_DEVREADWRITE8("k054539", k054539_device, read, write, 0x00ff) /* sound regs */
AM_RANGE(0x880000, 0x881fff) AM_DEVREADWRITE_LEGACY("k056832", k056832_ram_word_r, k056832_ram_word_w) /* vram */
AM_RANGE(0x882000, 0x883fff) AM_DEVREADWRITE_LEGACY("k056832", k056832_ram_word_r, k056832_ram_word_w) /* vram (mirror) */
AM_RANGE(0x900000, 0x901fff) AM_READ(v_rom_r) /* gfxrom through */
@ -354,7 +352,7 @@ static ADDRESS_MAP_START( qdrmfgp2_map, AS_PROGRAM, 16, qdrmfgp_state )
AM_RANGE(0x360000, 0x360001) AM_WRITENOP /* unknown */
AM_RANGE(0x370000, 0x370001) AM_WRITE(gp2_control_w) /* control reg */
AM_RANGE(0x380000, 0x380001) AM_WRITENOP /* Watchdog */
AM_RANGE(0x800000, 0x80045f) AM_DEVREADWRITE8("konami", k054539_device, read, write, 0x00ff) /* sound regs */
AM_RANGE(0x800000, 0x80045f) AM_DEVREADWRITE8("k054539", k054539_device, read, write, 0x00ff) /* sound regs */
AM_RANGE(0x880000, 0x881fff) AM_READWRITE(gp2_vram_r, gp2_vram_w) /* vram */
AM_RANGE(0x89f000, 0x8a0fff) AM_READWRITE(gp2_vram_mirror_r, gp2_vram_mirror_w) /* vram (mirror) */
AM_RANGE(0x900000, 0x901fff) AM_READ(v_rom_r) /* gfxrom through */
@ -636,7 +634,7 @@ MACHINE_START_MEMBER(qdrmfgp_state,qdrmfgp2)
void qdrmfgp_state::machine_reset()
{
m_sndram = memregion("konami")->base() + 0x100000;
m_sndram = memregion("k054539")->base() + 0x100000;
/* reset the IDE controller */
m_gp2_irq_control = 0;
@ -680,7 +678,7 @@ static MACHINE_CONFIG_START( qdrmfgp, qdrmfgp_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_K054539_ADD("konami", 48000, k054539_config)
MCFG_K054539_ADD("k054539", 48000, k054539_config)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@ -716,7 +714,7 @@ static MACHINE_CONFIG_START( qdrmfgp2, qdrmfgp_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_K054539_ADD("konami", 48000, k054539_config)
MCFG_K054539_ADD("k054539", 48000, k054539_config)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@ -737,7 +735,7 @@ ROM_START( qdrmfgp )
ROM_LOAD( "gq_460_a01.15e", 0x000000, 0x80000, CRC(6536b700) SHA1(47ffe0cfbf80810179560150b23d825fe1a5c5ca) )
ROM_LOAD( "gq_460_a02.17e", 0x080000, 0x80000, CRC(ac01d675) SHA1(bf66433ace95f4ef14699d03add7cbc2e5d90eea) )
ROM_REGION( 0x460000, "konami", 0) /* SE SAMPLES + space for additional RAM */
ROM_REGION( 0x460000, "k054539", 0) /* SE SAMPLES + space for additional RAM */
ROM_LOAD( "gq_460_a07.14h", 0x000000, 0x80000, CRC(67d8ea6b) SHA1(11af1b5a33de2a6e24823964d210bef193ecefe4) )
ROM_LOAD( "gq_460_a06.12h", 0x080000, 0x80000, CRC(97ed5a77) SHA1(68600fd8d914451284cf181fb4bd5872860fb9ad) )
@ -754,7 +752,7 @@ ROM_START( qdrmfgp2 )
ROM_LOAD( "ge_557_a01.13e", 0x000000, 0x80000, CRC(c301d406) SHA1(5fad8cc611edd83380972abf37ec80561b9317a6) )
ROM_LOAD( "ge_557_a02.15e", 0x080000, 0x80000, CRC(3bfe1e56) SHA1(9e4df512a804a96fcb545d4e0eb58b5421d65ea4) )
ROM_REGION( 0x460000, "konami", 0) /* SE SAMPLES + space for additional RAM */
ROM_REGION( 0x460000, "k054539", 0) /* SE SAMPLES + space for additional RAM */
ROM_LOAD( "ge_557_a07.19h", 0x000000, 0x80000, CRC(7491e0c8) SHA1(6459ab5e7af052ef7a1c4ce01cd844c0f4319f2e) )
ROM_LOAD( "ge_557_a08.19k", 0x080000, 0x80000, CRC(3da2b20c) SHA1(fdc2cdc27f3299f541944a78ce36ed33a7926056) )

View File

@ -1,3 +1,5 @@
#include "sound/k054539.h"
class konamigx_state : public driver_device
{
public:
@ -12,6 +14,8 @@ public:
m_k053936_0_ctrl_16(*this,"k053936_0_ct16",16),
m_k053936_0_linectrl_16(*this,"k053936_0_li16",16),
m_konamigx_type3_psac2_bank(*this,"psac2_bank"),
m_k054539_1(*this,"k054539_1"),
m_k054539_2(*this,"k054539_2"),
m_soundcpu(*this, "soundcpu")
{ }
@ -24,6 +28,8 @@ public:
optional_shared_ptr<UINT16> m_k053936_0_ctrl_16;
optional_shared_ptr<UINT16> m_k053936_0_linectrl_16;
optional_shared_ptr<UINT32> m_konamigx_type3_psac2_bank;
optional_device<k054539_device> m_k054539_1;
optional_device<k054539_device> m_k054539_2;
DECLARE_WRITE32_MEMBER(esc_w);
DECLARE_WRITE32_MEMBER(eeprom_w);
DECLARE_WRITE32_MEMBER(control_w);

View File

@ -1,3 +1,5 @@
#include "sound/k054539.h"
class mystwarr_state : public konamigx_state
{
public:
@ -5,8 +7,7 @@ public:
: konamigx_state(mconfig, type, tag),
m_gx_workram(*this,"gx_workram"),
m_spriteram(*this,"spriteram"),
m_maincpu(*this,"maincpu")
{ }
m_maincpu(*this,"maincpu") { }
required_shared_ptr<UINT16> m_gx_workram;
UINT8 m_mw_irq_control;

View File

@ -1,3 +1,5 @@
#include "sound/k054539.h"
class qdrmfgp_state : public driver_device
{
public:
@ -6,13 +8,15 @@ public:
m_maincpu(*this, "maincpu"),
m_nvram(*this, "nvram"),
m_workram(*this, "workram"),
m_k056832(*this, "k056832") { }
m_k056832(*this, "k056832"),
m_k054539(*this, "k054539") { }
required_device<cpu_device> m_maincpu;
required_shared_ptr<UINT16> m_nvram;
UINT8 *m_sndram;
required_shared_ptr<UINT16> m_workram;
required_device<k056832_device> m_k056832;
required_device<k054539_device> m_k054539;
UINT16 m_control;
INT32 m_gp2_irq_control;
INT32 m_pal;