[mupen64plus-core] 249/310: Don't insert a second interrupt event from same type

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit f2be9659f234126b8052bc57d9ff367d8ba77693
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Dec 13 15:20:11 2013 +0100

    Don't insert a second interrupt event from same type
---
 debian/changelog                          |  2 ++
 debian/patches/series                     |  1 +
 debian/patches/two_events_interrupt.patch | 17 +++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2c17354..853fb53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ mupen64plus-core (2.0-4) UNRELEASED; urgency=low
     - Add oot_subscreen_delay_fix.patch, Add Missing Subscreen Delay Fix for
       Ocarina of Time
     - Add counter_per_op.patch, Allow to overwrite the cycles per instruction
+    - Add two_events_interrupt.patch, Don't insert a second interrupt event
+      from same type
 
  -- Sven Eckelmann <sven at narfation.org>  Sat, 05 Oct 2013 22:52:30 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 7d59472..e6faace 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ sdl2_select_saveslot.patch
 sdl2_no_unicode.patch
 oot_subscreen_delay_fix.patch
 counter_per_op.patch
+two_events_interrupt.patch
diff --git a/debian/patches/two_events_interrupt.patch b/debian/patches/two_events_interrupt.patch
new file mode 100644
index 0000000..bf3c740
--- /dev/null
+++ b/debian/patches/two_events_interrupt.patch
@@ -0,0 +1,17 @@
+Description: Don't insert a second interrupt event from same type
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/r4300/interupt.c b/src/r4300/interupt.c
+index b7d2e5094c0bd01465dcbbce8ac6005761923ef1..208f7a8627574a0fa9cc2e94022b0cf181959789 100644
+--- a/src/r4300/interupt.c
++++ b/src/r4300/interupt.c
+@@ -127,6 +127,8 @@ void add_interupt_event(int type, unsigned int delay)
+    
+     if (get_event(type)) {
+         DebugMessage(M64MSG_WARNING, "two events of type 0x%x in interrupt queue", type);
++	/* Hack for Wipeout and Perfect Dark */
++	return;
+     }
+    
+     if (q == NULL)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git