diff options
Diffstat (limited to 'src/mame/drivers/gstream.c')
-rw-r--r-- | src/mame/drivers/gstream.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index a4c02fb34b2..08e225d67a4 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -195,11 +195,6 @@ static ADDRESS_MAP_START( gstream_32bit_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xFFF80000, 0xFFFFFFFF) AM_ROM AM_REGION("user1",0) // boot rom ADDRESS_MAP_END -static READ32_HANDLER( gstream_oki_0_r ) { return okim6295_status_0_r(space, 0); } -static READ32_HANDLER( gstream_oki_1_r ) { return okim6295_status_1_r(space, 0); } -static WRITE32_HANDLER( gstream_oki_0_w ) { okim6295_data_0_w(space, 0, data & 0xff); } -static WRITE32_HANDLER( gstream_oki_1_w ) { okim6295_data_1_w(space, 0, data & 0xff); } - static WRITE32_HANDLER( gstream_oki_banking_w ) { /* OKI BANKING (still far from perfect, based on game behaviour) @@ -263,8 +258,8 @@ static WRITE32_HANDLER( gstream_oki_banking_w ) bank_1 = 3; // end sequence music } - okim6295_set_bank_base(0, bank_0 * 0x40000); - okim6295_set_bank_base(1, bank_1 * 0x40000); + okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki1"), bank_0 * 0x40000); + okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki2"), bank_1 * 0x40000); } static WRITE32_HANDLER( gstream_oki_4040_w ) @@ -278,8 +273,8 @@ static ADDRESS_MAP_START( gstream_io, ADDRESS_SPACE_IO, 32 ) AM_RANGE(0x4020, 0x4023) AM_READ_PORT("IN2") // extra coin switches etc AM_RANGE(0x4030, 0x4033) AM_WRITE(gstream_oki_banking_w) // oki banking AM_RANGE(0x4040, 0x4043) AM_WRITE(gstream_oki_4040_w) // ?? - AM_RANGE(0x4050, 0x4053) AM_READWRITE(gstream_oki_1_r, gstream_oki_1_w) // music and samples - AM_RANGE(0x4060, 0x4063) AM_READWRITE(gstream_oki_0_r, gstream_oki_0_w) // music and samples + AM_RANGE(0x4050, 0x4053) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x000000ff) // music and samples + AM_RANGE(0x4060, 0x4063) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x000000ff) // music and samples ADDRESS_MAP_END static INPUT_PORTS_START( gstream ) |