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

toki.c: don't know what happened with this, but thanks Haze for fixing compile (nw)

Browse Source
This commit is contained in:
Ivan Vangelista 2015-02-05 18:23:32 +01:00
parent e1469ee855
commit 62ecdbcbf9
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mame/drivers/toki.c
View File

@ -42,20 +42,20 @@ for now. Even at 12 this slowdown still happens a little.
#include "sound/3812intf.h"
#include "includes/toki.h"
WRITE16_MEMBER(toki_state::tokib_soundcommand16_w)
WRITE16_MEMBER(toki_state::tokib_soundcommand_w)
{
soundlatch_byte_w(space, 0, data & 0xff);
m_audiocpu->set_input_line(0, HOLD_LINE);
}
READ16_MEMBER(toki_state::pip16_r)
READ16_MEMBER(toki_state::pip_r)
{
return ~0;
}
WRITE_LINE_MEMBER(toki_state::toki_adpcm_int)
WRITE_LINE_MEMBER(toki_state::tokib_adpcm_int)
{
m_msm->data_w(m_msm5205next);
m_msm5205next >>= 4;
@ -65,7 +65,7 @@ WRITE_LINE_MEMBER(toki_state::toki_adpcm_int)
m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
WRITE8_MEMBER(toki_state::toki_adpcm_control_w)
WRITE8_MEMBER(toki_state::tokib_adpcm_control_w)
{
int bankaddress;
UINT8 *RAM = memregion("audiocpu")->base();
@ -78,7 +78,7 @@ WRITE8_MEMBER(toki_state::toki_adpcm_control_w)
m_msm->reset_w(data & 0x08);
}
WRITE8_MEMBER(toki_state::toki_adpcm_data_w)
WRITE8_MEMBER(toki_state::tokib_adpcm_data_w)
{
m_msm5205next = data;
}
@ -114,12 +114,12 @@ static ADDRESS_MAP_START( tokib_map, AS_PROGRAM, 16, toki_state )
AM_RANGE(0x071804, 0x071807) AM_WRITENOP /* sprite related, always 01be0100 */
AM_RANGE(0x07180e, 0x071e45) AM_WRITEONLY AM_SHARE("spriteram")
AM_RANGE(0x072000, 0x072001) AM_READ(watchdog_reset16_r) /* probably */
AM_RANGE(0x075000, 0x075001) AM_WRITE(tokib_soundcommand16_w)
AM_RANGE(0x075000, 0x075001) AM_WRITE(tokib_soundcommand_w)
AM_RANGE(0x075004, 0x07500b) AM_WRITEONLY AM_SHARE("scrollram")
AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("DSW")
AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("INPUTS")
AM_RANGE(0x0c0004, 0x0c0005) AM_READ_PORT("SYSTEM")
AM_RANGE(0x0c000e, 0x0c000f) AM_READ(pip16_r) /* sound related, if we return 0 the code writes */
AM_RANGE(0x0c000e, 0x0c000f) AM_READ(pip_r) /* sound related, if we return 0 the code writes */
/* the sound command quickly followed by 0 and the */
/* sound CPU often misses the command. */
ADDRESS_MAP_END
@ -129,8 +129,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( tokib_audio_map, AS_PROGRAM, 8, toki_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xe000, 0xe000) AM_WRITE(toki_adpcm_control_w) /* MSM5205 + ROM bank */
AM_RANGE(0xe400, 0xe400) AM_WRITE(toki_adpcm_data_w)
AM_RANGE(0xe000, 0xe000) AM_WRITE(tokib_adpcm_control_w) /* MSM5205 + ROM bank */
AM_RANGE(0xe400, 0xe400) AM_WRITE(tokib_adpcm_data_w)
AM_RANGE(0xec00, 0xec01) AM_MIRROR(0x0008) AM_DEVREADWRITE("ymsnd", ym3812_device, read, write)
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_byte_r)
@ -463,7 +463,7 @@ static MACHINE_CONFIG_START( tokib, toki_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(toki_state, toki_adpcm_int)) /* interrupt function */
MCFG_MSM5205_VCLK_CB(WRITELINE(toki_state, tokib_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END

10
src/mame/includes/toki.h
View File

@ -41,15 +41,15 @@ public:
tilemap_t *m_foreground_layer;
tilemap_t *m_text_layer;
DECLARE_WRITE16_MEMBER(tokib_soundcommand16_w);
DECLARE_READ16_MEMBER(pip16_r);
DECLARE_WRITE16_MEMBER(tokib_soundcommand_w);
DECLARE_READ16_MEMBER(pip_r);
DECLARE_WRITE16_MEMBER(toki_control_w);
DECLARE_WRITE16_MEMBER(foreground_videoram_w);
DECLARE_WRITE16_MEMBER(background1_videoram_w);
DECLARE_WRITE16_MEMBER(background2_videoram_w);
DECLARE_WRITE8_MEMBER(toki_adpcm_control_w);
DECLARE_WRITE8_MEMBER(toki_adpcm_data_w);
DECLARE_WRITE_LINE_MEMBER(toki_adpcm_int);
DECLARE_WRITE8_MEMBER(tokib_adpcm_control_w);
DECLARE_WRITE8_MEMBER(tokib_adpcm_data_w);
DECLARE_WRITE_LINE_MEMBER(tokib_adpcm_int);
DECLARE_DRIVER_INIT(tokib);
DECLARE_DRIVER_INIT(jujuba);