summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/bishi.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/bishi.c')
-rw-r--r--src/mame/drivers/bishi.c25
1 files changed, 4 insertions, 21 deletions
diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c
index 926cea642ef..85e7093d230 100644
--- a/src/mame/drivers/bishi.c
+++ b/src/mame/drivers/bishi.c
@@ -144,23 +144,6 @@ static READ16_HANDLER( bishi_mirror_r )
return paletteram16[offset];
}
-static READ16_HANDLER( bishi_sound_r )
-{
- return ymz280b_status_0_r(space, offset)<<8;
-}
-
-static WRITE16_HANDLER( bishi_sound_w )
-{
- if (offset)
- {
- ymz280b_data_0_w(space, offset, data>>8);
- }
- else
- {
- ymz280b_register_0_w(space, offset, data>>8);
- }
-}
-
static READ16_HANDLER( bishi_K056832_rom_r )
{
UINT16 ouroffs;
@@ -192,7 +175,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x840000, 0x840007) AM_WRITE(K056832_b_word_w) // VSCCS
AM_RANGE(0x850000, 0x85001f) AM_WRITE(K054338_word_w) // CLTC
AM_RANGE(0x870000, 0x8700ff) AM_WRITE(K055555_word_w) // PCU2
- AM_RANGE(0x880000, 0x880003) AM_READWRITE(bishi_sound_r, bishi_sound_w)
+ AM_RANGE(0x880000, 0x880003) AM_DEVREADWRITE8(SOUND, "ymz", ymz280b_r, ymz280b_w, 0xff00)
AM_RANGE(0xa00000, 0xa01fff) AM_READWRITE(K056832_ram_word_r, K056832_ram_word_w) // Graphic planes
AM_RANGE(0xb00000, 0xb03fff) AM_RAM_WRITE(paletteram16_xbgr_word_be_w) AM_BASE(&paletteram16)
AM_RANGE(0xb04000, 0xb047ff) AM_READ(bishi_mirror_r) // bug in the ram/rom test?
@@ -299,12 +282,12 @@ static MACHINE_RESET( bishi )
{
}
-static void sound_irq_gen(running_machine *machine, int state)
+static void sound_irq_gen(const device_config *device, int state)
{
if (state)
- cpu_set_input_line(machine->cpu[0], M68K_IRQ_1, ASSERT_LINE);
+ cpu_set_input_line(device->machine->cpu[0], M68K_IRQ_1, ASSERT_LINE);
else
- cpu_set_input_line(machine->cpu[0], M68K_IRQ_1, CLEAR_LINE);
+ cpu_set_input_line(device->machine->cpu[0], M68K_IRQ_1, CLEAR_LINE);
}
static const ymz280b_interface ymz280b_intf =