[mupen64plus] 176/262: Reset status of specific ucode2 hacks after starting again

[Sven Eckelmann]

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

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

commit d3d93b2f1f34d02ba85f85c9baf0aee6d9225335
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Mon Apr 26 23:08:10 2010 +0200

    Reset status of specific ucode2 hacks after starting again
---
 debian/changelog                      |  8 +++++
 debian/patches/rsp_ucode2_reset.patch | 57 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 66 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ec9d019..470f560 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mupen64plus (1.5+dfsg1-10) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - Add rsp_ucode2_reset.patch, Reset status of specific ucode2 hacks after
+      starting again
+
+ -- Sven Eckelmann <sven.eckelmann at gmx.de>  Mon, 26 Apr 2010 23:06:55 +0200
+
 mupen64plus (1.5+dfsg1-9) unstable; urgency=low
 
   * debian/patches:
diff --git a/debian/patches/rsp_ucode2_reset.patch b/debian/patches/rsp_ucode2_reset.patch
new file mode 100644
index 0000000..c5dac86
--- /dev/null
+++ b/debian/patches/rsp_ucode2_reset.patch
@@ -0,0 +1,57 @@
+Description: Reset status of specific ucode2 hacks after starting again
+Origin: backport, http://bitbucket.org/richard42/mupen64plus-rsp-hle/changeset/390bc62f59c4
+
+---
+diff --git a/rsp_hle/hle.h b/rsp_hle/hle.h
+index c452765e098ec0e56d73c69b0d730aeec0156181..79ece2577c0cbf7b671257cdb5d20fa9241295d1 100644
+--- a/rsp_hle/hle.h
++++ b/rsp_hle/hle.h
+@@ -94,8 +94,8 @@ void jpg_uncompress(OSTask_t *task);
+ /*void ucode1(OSTask_t *task);
+ void ucode2(OSTask_t *task);
+ void ucode3(OSTask_t *task);
+-void init_ucode1();
+-void init_ucode2();*/
++void init_ucode1();*/
++void init_ucode2();
+ 
+ extern u32 inst1, inst2;
+ extern u16 AudioInBuffer, AudioOutBuffer, AudioCount;
+diff --git a/rsp_hle/main.c b/rsp_hle/main.c
+index 52ecebe146217544a8199e3187199c3b9fd871da..6874220336b15c54700da9586f1ea5e19f5b753a 100644
+--- a/rsp_hle/main.c
++++ b/rsp_hle/main.c
+@@ -341,8 +341,8 @@ __declspec(dllexport) void RomClosed (void)
+      {
+     rsp.DMEM[i] = rsp.IMEM[i] = 0;
+      }
+-/*   init_ucode1();
+-   init_ucode2();*/
++   //init_ucode1();
++   init_ucode2();
+ #ifdef __WIN32__
+    firstTime = TRUE;
+ #endif
+diff --git a/rsp_hle/ucode2.cpp b/rsp_hle/ucode2.cpp
+index a906507f5a4b085864c73089a3b3416bfa338c25..aa53d2f298bc32186f8188a752db7825b27a8093 100644
+--- a/rsp_hle/ucode2.cpp
++++ b/rsp_hle/ucode2.cpp
+@@ -28,7 +28,9 @@
+ # include <stdio.h>
+ #endif
+ 
++extern "C" {
+ #include "hle.h"
++}
+ 
+ extern u8 BufferSpace[0x10000];
+ 
+@@ -54,6 +56,8 @@ extern u16 ResampleLUT [0x200];
+ bool isMKABI = false;
+ bool isZeldaABI = false;
+ 
++void init_ucode2() { isMKABI = isZeldaABI = false; }
++
+ static void LOADADPCM2 () { // Loads an ADPCM table - Works 100% Now 03-13-01
+     u32 v0;
+     v0 = (inst2 & 0xffffff);// + SEGMENTS[(inst2>>24)&0xf];
diff --git a/debian/patches/series b/debian/patches/series
index 0f3bc3e..74f863c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,3 +37,4 @@ system-liblzma.patch
 rice_fog.patch
 ftbfs-gvariant-type-conflicts.path
 dont-install-unneeded.patch
+rsp_ucode2_reset.patch

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