From 5bab1b22b435c2f9d0c17810c56f0799c4e3fa3a Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Sat, 23 Feb 2013 16:17:08 +0000 Subject: [PATCH] (MESS) PlayStation: Fix CD-ROM regression [R. Belmont] --- src/mess/drivers/psx.c | 10 ++++++---- src/mess/machine/psxcd.h | 6 ++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mess/drivers/psx.c b/src/mess/drivers/psx.c index 59993637147..e93753c2e6e 100644 --- a/src/mess/drivers/psx.c +++ b/src/mess/drivers/psx.c @@ -18,6 +18,8 @@ #include "machine/psxcd.h" #include "machine/psxcport.h" +#define PSXCD_TAG "psxcd" + class psx1_state : public driver_device { public: @@ -474,7 +476,7 @@ static QUICKLOAD_LOAD( psx_exe_load ) void psx1_state::cd_dma_read( UINT32 *p_n_psxram, UINT32 n_address, INT32 n_size ) { UINT8 *psxram = (UINT8 *) p_n_psxram; - psxcd_device *psxcd = machine().device("cdrom"); + psxcd_device *psxcd = machine().device(PSXCD_TAG); psxcd->start_dma(psxram + n_address, n_size*4); } @@ -530,7 +532,7 @@ static MACHINE_CONFIG_START( psxntsc, psx1_state ) MCFG_PSX_CD_READ_HANDLER( DEVREAD8( PSXCD_TAG, psxcd_device, read ) ) MCFG_PSX_CD_WRITE_HANDLER( DEVWRITE8( PSXCD_TAG, psxcd_device, write ) ) - MCFG_PSXCD_ADD("cdrom") + MCFG_PSXCD_ADD(PSXCD_TAG, "cdrom") MCFG_PSXCD_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin2)) MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psx_dma_read_delegate( FUNC( psx1_state::cd_dma_read ), (psx1_state *) owner ) ) MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psx_dma_write_delegate( FUNC( psx1_state::cd_dma_write ), (psx1_state *) owner ) ) @@ -558,14 +560,14 @@ static MACHINE_CONFIG_START( psxpal, psx1_state ) /* quickload */ MCFG_QUICKLOAD_ADD("quickload", psx_exe_load, "cpe,exe,psf,psx", 0) - MCFG_CDROM_ADD("cdrom",psx_cdrom) + MCFG_CDROM_ADD("cdrom", psx_cdrom) MCFG_SOFTWARE_LIST_ADD("cd_list","psx") MCFG_DEVICE_MODIFY( "maincpu" ) MCFG_PSX_CD_READ_HANDLER( DEVREAD8( PSXCD_TAG, psxcd_device, read ) ) MCFG_PSX_CD_WRITE_HANDLER( DEVWRITE8( PSXCD_TAG, psxcd_device, write ) ) - MCFG_PSXCD_ADD("cdrom") + MCFG_PSXCD_ADD(PSXCD_TAG, "cdrom") MCFG_PSXCD_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin2)) MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psx_dma_read_delegate( FUNC( psx1_state::cd_dma_read ), (psx1_state *) owner ) ) MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psx_dma_write_delegate( FUNC( psx1_state::cd_dma_write ), (psx1_state *) owner ) ) diff --git a/src/mess/machine/psxcd.h b/src/mess/machine/psxcd.h index 1b0ca52664d..b3ab73c958c 100644 --- a/src/mess/machine/psxcd.h +++ b/src/mess/machine/psxcd.h @@ -19,14 +19,12 @@ const int num_commands=0x20; // // -#define PSXCD_TAG "psxcd" - //************************************************************************** // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_PSXCD_ADD(_devname) \ - MCFG_DEVICE_ADD(PSXCD_TAG, PSXCD, 0) \ +#define MCFG_PSXCD_ADD(_tag, _devname) \ + MCFG_DEVICE_ADD(_tag, PSXCD, 0) \ MCFG_PSXCD_DEVNAME(_devname) #define MCFG_PSXCD_IRQ_HANDLER(_devcb) \