Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-28 16:43:04 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed some magic numbers from machine/psx.c, replaced with #defines [Harmony]

Browse Source
This commit is contained in:
Ryan Holtz 2009-11-02 02:00:49 +00:00
parent 15da834a97
commit fbb9053fc2
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mame/includes/psx.h
View File

@ -22,6 +22,18 @@ extern void psx_lightgun_set( int, int );
/*----------- defined in machine/psx.c -----------*/
#define PSX_IRQ_ROOTCOUNTER3 0x0001
#define PSX_IRQ_CDROM 0x0004
#define PSX_IRQ_DMA 0x0008
#define PSX_IRQ_ROOTCOUNTER2 0x0010
#define PSX_IRQ_ROOTCOUNTER1 0x0020
#define PSX_IRQ_ROOTCOUNTER0 0x0040
#define PSX_IRQ_SIO0 0x0080
#define PSX_IRQ_SIO1 0x0100
#define PSX_IRQ_SPU 0x0200
#define PSX_IRQ_EXTCD 0x0400
#define PSX_IRQ_MASK (PSX_IRQ_ROOTCOUNTER3 | PSX_IRQ_CDROM | PSX_IRQ_DMA | PSX_IRQ_ROOTCOUNTER2 | PSX_IRQ_ROOTCOUNTER1 | PSX_IRQ_ROOTCOUNTER0 | PSX_IRQ_SIO0 | PSX_IRQ_SIO1 | PSX_IRQ_SPU | PSX_IRQ_EXTCD)
extern UINT32 *g_p_n_psxram;
extern size_t g_n_psxramsize;
typedef void ( *psx_dma_read_handler )( running_machine *, UINT32, INT32 );

14
src/mame/machine/psx.c
View File

@ -25,6 +25,10 @@ INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level,
}
}
/******************
* DEFINES
*/
UINT32 *g_p_n_psxram;
size_t g_n_psxramsize;
@ -87,7 +91,7 @@ WRITE32_HANDLER( psx_irq_w )
case 0x01:
verboselog( machine, 2, "psx irq mask ( %08x, %08x ) %08x -> %08x\n", data, mem_mask, m_n_irqmask, ( m_n_irqmask & ~mem_mask ) | data );
m_n_irqmask = ( m_n_irqmask & ~mem_mask ) | data;
if( ( m_n_irqmask & ~( 0x1 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80 | 0x100 | 0x200 | 0x400 ) ) != 0 )
if( ( m_n_irqmask &~ PSX_IRQ_MASK ) != 0 )
{
verboselog( machine, 0, "psx_irq_w( %08x, %08x, %08x ) unknown irq\n", offset, data, mem_mask );
}
@ -175,7 +179,7 @@ static void dma_interrupt_update( running_machine *machine )
{
verboselog( machine, 2, "dma_interrupt_update( %02x, %02x ) interrupt triggered\n", n_int, n_mask );
m_n_dicr |= 0x80000000;
psx_irq_set( machine, 0x0008 );
psx_irq_set( machine, PSX_IRQ_DMA );
}
else if( ( m_n_dicr & 0x80000000 ) != 0 )
{
@ -578,7 +582,7 @@ static TIMER_CALLBACK( root_finished )
if( ( m_p_n_root_mode[ n_counter ] & RC_IRQOVERFLOW ) != 0 ||
( m_p_n_root_mode[ n_counter ] & RC_IRQTARGET ) != 0 )
{
psx_irq_set( machine, 0x10 << n_counter );
psx_irq_set( machine, (n_counter == 3) ? PSX_IRQ_ROOTCOUNTER3 : (PSX_IRQ_ROOTCOUNTER0 << n_counter) );
}
}
@ -692,11 +696,11 @@ static void sio_interrupt( running_machine *machine, int n_port )
m_p_n_sio_status[ n_port ] |= SIO_STATUS_IRQ;
if( n_port == 0 )
{
psx_irq_set( machine, 0x80 );
psx_irq_set( machine, PSX_IRQ_SIO0 );
}
else
{
psx_irq_set( machine, 0x100 );
psx_irq_set( machine, PSX_IRQ_SIO1 );
}
}