head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.8
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.6
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.4
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.2
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2010Q4:1.2.0.10
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.8
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.6
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.4
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.1.0.2
	pkgsrc-2009Q3-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2011.02.03.22.24.45;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2009.11.13.14.45.25;	author wiz;	state Exp;
branches;
next	1.1;

1.1
date	2009.09.01.15.20.06;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove sdlmame and sdlmess, replaced by mame and mess, respectively.
Add mame+mess to category Makefile.
@
text
@$NetBSD: patch-ad,v 1.2 2009/11/13 14:45:25 wiz Exp $

--- src/mame/machine/n64.c.orig	2009-11-01 00:44:54.000000000 +0000
+++ src/mame/machine/n64.c
@@@@ -1474,7 +1474,7 @@@@ static UINT32 si_dram_addr = 0;
 static UINT32 si_pif_addr = 0;
 static UINT32 si_pif_addr_rd64b = 0;
 static UINT32 si_pif_addr_wr64b = 0;
-static UINT32 si_status = 0;
+static UINT32 mame_si_status = 0;
 
 static UINT8 eeprom[512];
 static UINT8 mempack[0x8000];
@@@@ -1884,7 +1884,7 @@@@ static void pif_dma(running_machine *mac
 		}
 	}
 
-	si_status |= 0x1000;
+	mame_si_status |= 0x1000;
 	signal_rcp_interrupt(machine, SI_INTERRUPT);
 }
 
@@@@ -1896,7 +1896,7 @@@@ READ32_HANDLER( n64_si_reg_r )
 			//return si_dram_addr;
 
 		case 0x18/4:		// SI_STATUS_REG
-			return si_status;
+			return mame_si_status;
 	}
 	return 0;
 }
@@@@ -1925,7 +1925,7 @@@@ WRITE32_HANDLER( n64_si_reg_w )
 			break;
 
 		case 0x18/4:		// SI_STATUS_REG
-			si_status &= ~0x1000;
+			mame_si_status &= ~0x1000;
 			clear_rcp_interrupt(space->machine, SI_INTERRUPT);
 			break;
 
@@@@ -2036,7 +2036,7 @@@@ MACHINE_RESET( n64 )
 	memset(pif_cmd, 0, sizeof(pif_cmd));
 	si_dram_addr = 0;
 	si_pif_addr = 0;
-	si_status = 0;
+	mame_si_status = 0;
 
 	memset(eeprom, 0, sizeof(eeprom));
 	memset(mempack, 0, sizeof(mempack));
@


1.2
log
@Update to 0.135: All the best new stuff from MAME 0.135!
@
text
@d1 1
a1 1
$NetBSD: patch-ad,v 1.1 2009/09/01 15:20:06 wiz Exp $
@


1.1
log
@NetBSD has a si_status symbol in its headers, rename local variable
to mame_si_status.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- src/mame/machine/n64.c.orig	2009-07-20 12:03:20.000000000 +0000
d5 1
a5 3
@@@@ -1065,7 +1065,7 @@@@ static UINT8 pif_ram[0x40];
 static UINT8 pif_cmd[0x40];
 static UINT32 si_dram_addr = 0;
d7 2
d14 1
a14 1
@@@@ -1475,7 +1475,7 @@@@ static void pif_dma(running_machine *mac
d23 2
a24 2
@@@@ -1487,7 +1487,7 @@@@ READ32_HANDLER( n64_si_reg_r )
 			return si_dram_addr;
d32 1
a32 1
@@@@ -1514,7 +1514,7 @@@@ WRITE32_HANDLER( n64_si_reg_w )
d41 1
a41 1
@@@@ -1624,7 +1624,7 @@@@ MACHINE_RESET( n64 )
@