Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 17:08:28 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

missed some files from mess (nw)

Browse Source
This commit is contained in:
smf- 2013-05-12 15:31:18 +00:00
parent a9bd6ed0d1
commit c1c7afdf03
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mess/drivers/fmtowns.c
View File

@ -2242,7 +2242,7 @@ static ADDRESS_MAP_START( towns_io , AS_IO, 32, towns_state)
AM_RANGE(0x04d0,0x04d3) AM_READ8(towns_padport_r, 0x00ff00ff) AM_RANGE(0x04d0,0x04d3) AM_READ8(towns_padport_r, 0x00ff00ff)
AM_RANGE(0x04d4,0x04d7) AM_WRITE8(towns_pad_mask_w, 0x00ff0000) AM_RANGE(0x04d4,0x04d7) AM_WRITE8(towns_pad_mask_w, 0x00ff0000)
// Sound (YM3438 [FM], RF5c68 [PCM]) // Sound (YM3438 [FM], RF5c68 [PCM])
AM_RANGE(0x04d8,0x04df) AM_DEVREADWRITE8_LEGACY("fm",ym3438_r,ym3438_w,0x00ff00ff) AM_RANGE(0x04d8,0x04df) AM_DEVREADWRITE8("fm", ym3438_device, read, write, 0x00ff00ff)
AM_RANGE(0x04e0,0x04e3) AM_READWRITE8(towns_volume_r,towns_volume_w,0xffffffff) // R/W -- volume ports AM_RANGE(0x04e0,0x04e3) AM_READWRITE8(towns_volume_r,towns_volume_w,0xffffffff) // R/W -- volume ports
AM_RANGE(0x04e8,0x04ef) AM_READWRITE8(towns_sound_ctrl_r,towns_sound_ctrl_w,0xffffffff) AM_RANGE(0x04e8,0x04ef) AM_READWRITE8(towns_sound_ctrl_r,towns_sound_ctrl_w,0xffffffff)
AM_RANGE(0x04f0,0x04fb) AM_DEVWRITE8("pcm", rf5c68_device, rf5c68_w, 0xffffffff) AM_RANGE(0x04f0,0x04fb) AM_DEVWRITE8("pcm", rf5c68_device, rf5c68_w, 0xffffffff)
@ -2294,7 +2294,7 @@ static ADDRESS_MAP_START( towns16_io , AS_IO, 16, towns_state) // for the 386SX
AM_RANGE(0x04d0,0x04d3) AM_READ8(towns_padport_r, 0x00ff) AM_RANGE(0x04d0,0x04d3) AM_READ8(towns_padport_r, 0x00ff)
AM_RANGE(0x04d6,0x04d7) AM_WRITE8(towns_pad_mask_w, 0x00ff) AM_RANGE(0x04d6,0x04d7) AM_WRITE8(towns_pad_mask_w, 0x00ff)
// Sound (YM3438 [FM], RF5c68 [PCM]) // Sound (YM3438 [FM], RF5c68 [PCM])
AM_RANGE(0x04d8,0x04df) AM_DEVREADWRITE8_LEGACY("fm",ym3438_r,ym3438_w,0x00ff) AM_RANGE(0x04d8,0x04df) AM_DEVREADWRITE8("fm", ym3438_device, read, write, 0x00ff)
AM_RANGE(0x04e0,0x04e3) AM_READWRITE8(towns_volume_r,towns_volume_w,0xffff) // R/W -- volume ports AM_RANGE(0x04e0,0x04e3) AM_READWRITE8(towns_volume_r,towns_volume_w,0xffff) // R/W -- volume ports
AM_RANGE(0x04e8,0x04ef) AM_READWRITE8(towns_sound_ctrl_r,towns_sound_ctrl_w,0xffff) AM_RANGE(0x04e8,0x04ef) AM_READWRITE8(towns_sound_ctrl_r,towns_sound_ctrl_w,0xffff)
AM_RANGE(0x04f0,0x04fb) AM_DEVWRITE8("pcm", rf5c68_device, rf5c68_w, 0xffff) AM_RANGE(0x04f0,0x04fb) AM_DEVWRITE8("pcm", rf5c68_device, rf5c68_w, 0xffff)
@ -2748,11 +2748,6 @@ static const upd71071_intf towns_dma_config =
{ DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL } { DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL }
}; };
static const ym3438_interface ym3438_intf =
{
DEVCB_DRIVER_LINE_MEMBER(towns_state,towns_fm_irq)
};
static const rf5c68_interface rf5c68_intf = static const rf5c68_interface rf5c68_intf =
{ {
towns_pcm_irq towns_pcm_irq
@ -2813,7 +2808,7 @@ static MACHINE_CONFIG_FRAGMENT( towns_base )
/* sound hardware */ /* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("fm", YM3438, 53693100 / 7) // actual clock speed unknown MCFG_SOUND_ADD("fm", YM3438, 53693100 / 7) // actual clock speed unknown
MCFG_SOUND_CONFIG(ym3438_intf) MCFG_YM2612_IRQ_HANDLER(WRITELINE(towns_state, towns_fm_irq))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_RF5C68_ADD("pcm", 53693100 / 7) // actual clock speed unknown MCFG_RF5C68_ADD("pcm", 53693100 / 7) // actual clock speed unknown
MCFG_SOUND_CONFIG(rf5c68_intf) MCFG_SOUND_CONFIG(rf5c68_intf)

11
src/mess/machine/c64_sfx_sound_expander.c
View File

@ -35,11 +35,6 @@ WRITE_LINE_MEMBER( c64_sfx_sound_expander_cartridge_device::opl_irq_w )
m_slot->irq_w(state); m_slot->irq_w(state);
} }
static const ym3526_interface ym3526_config =
{
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_sfx_sound_expander_cartridge_device, opl_irq_w)
};
//------------------------------------------------- //-------------------------------------------------
// MACHINE_CONFIG_FRAGMENT( c64_sfx_sound_expander ) // MACHINE_CONFIG_FRAGMENT( c64_sfx_sound_expander )
@ -48,7 +43,7 @@ static const ym3526_interface ym3526_config =
static MACHINE_CONFIG_FRAGMENT( c64_sfx_sound_expander ) static MACHINE_CONFIG_FRAGMENT( c64_sfx_sound_expander )
MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(YM3526_TAG, YM3526, XTAL_3_579545MHz) MCFG_SOUND_ADD(YM3526_TAG, YM3526, XTAL_3_579545MHz)
MCFG_SOUND_CONFIG(ym3526_config) MCFG_YM3526_IRQ_HANDLER(WRITELINE(c64_sfx_sound_expander_cartridge_device, opl_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD() MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD()
@ -250,7 +245,7 @@ UINT8 c64_sfx_sound_expander_cartridge_device::c64_cd_r(address_space &space, of
} }
else if (BIT(offset, 5)) else if (BIT(offset, 5))
{ {
data = ym3526_r(m_opl, space, BIT(offset, 4)); data = m_opl->read(space, BIT(offset, 4));
} }
} }
@ -266,7 +261,7 @@ void c64_sfx_sound_expander_cartridge_device::c64_cd_w(address_space &space, off
{ {
if (!io2 && BIT(offset, 5)) if (!io2 && BIT(offset, 5))
{ {
ym3526_w(m_opl, space, BIT(offset, 4), data); m_opl->write(space, BIT(offset, 4), data);
} }
m_exp->cd_w(space, get_offset(offset, 0), data, sphi2, ba, roml, romh, io1, io2); m_exp->cd_w(space, get_offset(offset, 0), data, sphi2, ba, roml, romh, io1, io2);