summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/ksys573.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/ksys573.c')
-rw-r--r--src/mame/drivers/ksys573.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index 70df0fb2cbb..101388dfa83 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -1364,7 +1364,7 @@ static ADDRESS_MAP_START( konami573_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x1f801008, 0x1f80100b) AM_RAM /* ?? */
AM_RANGE(0x1f80100c, 0x1f80102f) AM_WRITENOP
AM_RANGE(0x1f801010, 0x1f801013) AM_READNOP
- AM_RANGE(0x1f801014, 0x1f801017) AM_READ(psx_spu_delay_r)
+ AM_RANGE(0x1f801014, 0x1f801017) AM_DEVREAD(SOUND, "spu", psx_spu_delay_r)
AM_RANGE(0x1f801040, 0x1f80105f) AM_READWRITE(psx_sio_r, psx_sio_w)
AM_RANGE(0x1f801060, 0x1f80106f) AM_WRITENOP
AM_RANGE(0x1f801070, 0x1f801077) AM_READWRITE(psx_irq_r, psx_irq_w)
@@ -1372,7 +1372,7 @@ static ADDRESS_MAP_START( konami573_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x1f801100, 0x1f80112f) AM_READWRITE(k573_counter_r, k573_counter_w)
AM_RANGE(0x1f801810, 0x1f801817) AM_READWRITE(psx_gpu_r, psx_gpu_w)
AM_RANGE(0x1f801820, 0x1f801827) AM_READWRITE(psx_mdec_r, psx_mdec_w)
- AM_RANGE(0x1f801c00, 0x1f801dff) AM_READWRITE(psx_spu_r, psx_spu_w)
+ AM_RANGE(0x1f801c00, 0x1f801dff) AM_DEVREADWRITE(SOUND, "spu", psx_spu_r, psx_spu_w)
AM_RANGE(0x1f802020, 0x1f802033) AM_RAM /* ?? */
AM_RANGE(0x1f802040, 0x1f802043) AM_WRITENOP
AM_RANGE(0x1fc00000, 0x1fc7ffff) AM_ROM AM_SHARE(2) AM_REGION("user1", 0) /* bios */
@@ -1587,10 +1587,15 @@ static MACHINE_RESET( konami573 )
flash_bank = -1;
}
+static void spu_irq(const device_config *device, UINT32 data)
+{
+ psx_irq_set(device->machine, data);
+}
+
static const psx_spu_interface konami573_psxspu_interface =
{
&g_p_n_psxram,
- psx_irq_set,
+ spu_irq,
psx_dma_install_read_handler,
psx_dma_install_write_handler
};
@@ -1622,7 +1627,7 @@ static void update_mode( running_machine *machine )
if( inserted_cdrom != new_cdrom )
{
inserted_cdrom = new_cdrom;
- cdda_set_cdrom(0, atapi_get_device());
+ cdda_set_cdrom(devtag_get_device(machine, SOUND, "cdda"), atapi_get_device());
}
}