diff options
| author | wiz <wiz> | 2009-09-01 15:20:06 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2009-09-01 15:20:06 +0000 |
| commit | 24cdbd8c3936b961282f1fc64f8b7d96d31cacb2 (patch) | |
| tree | b2aeedfb8999031e7c316261cc2b6d74a7af0d43 /emulators | |
| parent | cd847fcd0f7c021db081d7c3c92b92b7f0fc6fb0 (diff) | |
| download | pkgsrc-24cdbd8c3936b961282f1fc64f8b7d96d31cacb2.tar.gz | |
NetBSD has a si_status symbol in its headers, rename local variable
to mame_si_status.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/sdlmame/patches/patch-ad | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/emulators/sdlmame/patches/patch-ad b/emulators/sdlmame/patches/patch-ad new file mode 100644 index 00000000000..2410d6af771 --- /dev/null +++ b/emulators/sdlmame/patches/patch-ad @@ -0,0 +1,49 @@ +$NetBSD: patch-ad,v 1.1 2009/09/01 15:20:06 wiz Exp $ + +--- src/mame/machine/n64.c.orig 2009-07-20 12:03:20.000000000 +0000 ++++ src/mame/machine/n64.c +@@ -1065,7 +1065,7 @@ static UINT8 pif_ram[0x40]; + static UINT8 pif_cmd[0x40]; + static UINT32 si_dram_addr = 0; + static UINT32 si_pif_addr = 0; +-static UINT32 si_status = 0; ++static UINT32 mame_si_status = 0; + + static UINT8 eeprom[512]; + static UINT8 mempack[0x8000]; +@@ -1475,7 +1475,7 @@ static void pif_dma(running_machine *mac + } + } + +- si_status |= 0x1000; ++ mame_si_status |= 0x1000; + signal_rcp_interrupt(machine, SI_INTERRUPT); + } + +@@ -1487,7 +1487,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; + } +@@ -1514,7 +1514,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; + +@@ -1624,7 +1624,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)); |