summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/cischeat.c
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-05-25 14:38:46 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-05-25 14:38:46 +0000
commit4bbba13b380087f621399c552d8ea80a6316b7c8 (patch)
treeb2836cdd5a17d711d55f1c0c0069fc04217177ba /src/mame/drivers/cischeat.c
parent70cd5297735e3022cdf7224e89f7f54838f0ff3f (diff)
Conversion of _DEVICE_HA​NDLER to _MEMBER methods - part 2 (no whatsnew)
Diffstat (limited to 'src/mame/drivers/cischeat.c')
-rw-r--r--src/mame/drivers/cischeat.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index 778184c75bd..58fc0ea0790 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -701,16 +701,23 @@ ADDRESS_MAP_END
Cisco Heat
**************************************************************************/
-static WRITE16_DEVICE_HANDLER( cischeat_soundbank_w )
+WRITE16_MEMBER(cischeat_state::cischeat_soundbank_1_w)
{
+ device_t *device = machine().device("oki1");
okim6295_device *oki = downcast<okim6295_device *>(device);
if (ACCESSING_BITS_0_7) oki->set_bank_base(0x40000 * (data & 1) );
}
+WRITE16_MEMBER(cischeat_state::cischeat_soundbank_2_w)
+{
+ device_t *device = machine().device("oki2");
+ okim6295_device *oki = downcast<okim6295_device *>(device);
+ if (ACCESSING_BITS_0_7) oki->set_bank_base(0x40000 * (data & 1) );
+}
static ADDRESS_MAP_START( cischeat_sound_map, AS_PROGRAM, 16, cischeat_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
- AM_RANGE(0x040002, 0x040003) AM_DEVWRITE_LEGACY("oki1", cischeat_soundbank_w) // Sample Banking
- AM_RANGE(0x040004, 0x040005) AM_DEVWRITE_LEGACY("oki2", cischeat_soundbank_w) // Sample Banking
+ AM_RANGE(0x040002, 0x040003) AM_WRITE(cischeat_soundbank_1_w) // Sample Banking
+ AM_RANGE(0x040004, 0x040005) AM_WRITE(cischeat_soundbank_2_w) // Sample Banking
AM_RANGE(0x060002, 0x060003) AM_WRITE(soundlatch2_word_w) // To Main CPU
AM_RANGE(0x060004, 0x060005) AM_READ(soundlatch_word_r) // From Main CPU
AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8_LEGACY("ymsnd", ym2151_r, ym2151_w, 0x00ff)
@@ -726,8 +733,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( f1gpstar_sound_map, AS_PROGRAM, 16, cischeat_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
- AM_RANGE(0x040004, 0x040005) AM_DEVWRITE_LEGACY("oki1", cischeat_soundbank_w) // Sample Banking (cischeat: 40002)
- AM_RANGE(0x040008, 0x040009) AM_DEVWRITE_LEGACY("oki2", cischeat_soundbank_w) // Sample Banking (cischeat: 40004)
+ AM_RANGE(0x040004, 0x040005) AM_WRITE(cischeat_soundbank_1_w) // Sample Banking (cischeat: 40002)
+ AM_RANGE(0x040008, 0x040009) AM_WRITE(cischeat_soundbank_2_w) // Sample Banking (cischeat: 40004)
AM_RANGE(0x060000, 0x060001) AM_READWRITE(soundlatch_word_r, soundlatch2_word_w) // From Main CPU (cischeat: 60004)
AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8_LEGACY("ymsnd", ym2151_r, ym2151_w, 0x00ff)
AM_RANGE(0x0a0000, 0x0a0003) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff)
@@ -742,8 +749,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( f1gpstr2_sound_map, AS_PROGRAM, 16, cischeat_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
- AM_RANGE(0x040004, 0x040005) AM_DEVWRITE_LEGACY("oki1", cischeat_soundbank_w) // Sample Banking
- AM_RANGE(0x040008, 0x040009) AM_DEVWRITE_LEGACY("oki2", cischeat_soundbank_w) // Sample Banking
+ AM_RANGE(0x040004, 0x040005) AM_WRITE(cischeat_soundbank_1_w) // Sample Banking
+ AM_RANGE(0x040008, 0x040009) AM_WRITE(cischeat_soundbank_2_w) // Sample Banking
AM_RANGE(0x04000e, 0x04000f) AM_WRITENOP // ? 0 (f1gpstar: no)
AM_RANGE(0x060004, 0x060005) AM_READWRITE(soundlatch_word_r, soundlatch2_word_w) // From Main CPU (f1gpstar: 60000)
AM_RANGE(0x080000, 0x080003) AM_DEVREADWRITE8_LEGACY("ymsnd", ym2151_r, ym2151_w, 0x00ff)