Previous 199869 Revisions Next

r21400 Saturday 23rd February, 2013 at 16:17:08 UTC by R. Belmont
(MESS) PlayStation: Fix CD-ROM regression [R. Belmont]
[src/mess/drivers]psx.c
[src/mess/machine]psxcd.h

trunk/src/mess/machine/psxcd.h
r21399r21400
1919//
2020//
2121
22#define PSXCD_TAG   "psxcd"
23
2422//**************************************************************************
2523//  INTERFACE CONFIGURATION MACROS
2624//**************************************************************************
2725
28#define MCFG_PSXCD_ADD(_devname) \
29   MCFG_DEVICE_ADD(PSXCD_TAG, PSXCD, 0) \
26#define MCFG_PSXCD_ADD(_tag, _devname) \
27   MCFG_DEVICE_ADD(_tag, PSXCD, 0) \
3028   MCFG_PSXCD_DEVNAME(_devname)
3129
3230#define MCFG_PSXCD_IRQ_HANDLER(_devcb) \
trunk/src/mess/drivers/psx.c
r21399r21400
1818#include "machine/psxcd.h"
1919#include "machine/psxcport.h"
2020
21#define PSXCD_TAG   "psxcd"
22
2123class psx1_state : public driver_device
2224{
2325public:
r21399r21400
474476void psx1_state::cd_dma_read( UINT32 *p_n_psxram, UINT32 n_address, INT32 n_size )
475477{
476478   UINT8 *psxram = (UINT8 *) p_n_psxram;
477   psxcd_device *psxcd = machine().device<psxcd_device>("cdrom");
479   psxcd_device *psxcd = machine().device<psxcd_device>(PSXCD_TAG);
478480   psxcd->start_dma(psxram + n_address, n_size*4);
479481}
480482
r21399r21400
530532   MCFG_PSX_CD_READ_HANDLER( DEVREAD8( PSXCD_TAG, psxcd_device, read ) )
531533   MCFG_PSX_CD_WRITE_HANDLER( DEVWRITE8( PSXCD_TAG, psxcd_device, write ) )
532534
533   MCFG_PSXCD_ADD("cdrom")
535   MCFG_PSXCD_ADD(PSXCD_TAG, "cdrom")
534536   MCFG_PSXCD_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin2))
535537   MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psx_dma_read_delegate( FUNC( psx1_state::cd_dma_read ), (psx1_state *) owner ) )
536538   MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psx_dma_write_delegate( FUNC( psx1_state::cd_dma_write ), (psx1_state *) owner ) )
r21399r21400
558560   /* quickload */
559561   MCFG_QUICKLOAD_ADD("quickload", psx_exe_load, "cpe,exe,psf,psx", 0)
560562
561   MCFG_CDROM_ADD("cdrom",psx_cdrom)
563   MCFG_CDROM_ADD("cdrom", psx_cdrom)
562564   MCFG_SOFTWARE_LIST_ADD("cd_list","psx")
563565
564566   MCFG_DEVICE_MODIFY( "maincpu" )
565567   MCFG_PSX_CD_READ_HANDLER( DEVREAD8( PSXCD_TAG, psxcd_device, read ) )
566568   MCFG_PSX_CD_WRITE_HANDLER( DEVWRITE8( PSXCD_TAG, psxcd_device, write ) )
567569
568   MCFG_PSXCD_ADD("cdrom")
570   MCFG_PSXCD_ADD(PSXCD_TAG, "cdrom")
569571   MCFG_PSXCD_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin2))
570572   MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psx_dma_read_delegate( FUNC( psx1_state::cd_dma_read ), (psx1_state *) owner ) )
571573   MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psx_dma_write_delegate( FUNC( psx1_state::cd_dma_write ), (psx1_state *) owner ) )

Previous 199869 Revisions Next


© 1997-2024 The MAME Team