[mupen64plus-core] 240/310: Reset PIF_RAMb 46, 47 after the n64_cic_nus_6105 challenge

[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 7734d2fe0ff3ad42d7507075672ccdba381e6c8e
Author: Sven Eckelmann <sven at narfation.org>
Date:   Thu Jul 25 13:12:00 2013 +0200

    Reset PIF_RAMb 46,47 after the n64_cic_nus_6105 challenge
---
 debian/changelog                            |  8 ++++++++
 debian/patches/n64_cic_nus_6105_reset.patch | 19 +++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c47089b..527fe89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mupen64plus-core (2.0-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - n64_cic_nus_6105_reset.patch, Reset PIF_RAMb 46,47 after the
+      n64_cic_nus_6105 challenge
+
+ -- Sven Eckelmann <sven at narfation.org>  Thu, 25 Jul 2013 13:10:48 +0200
+
 mupen64plus-core (2.0-1) unstable; urgency=low
 
   * New Upstream Version
diff --git a/debian/patches/n64_cic_nus_6105_reset.patch b/debian/patches/n64_cic_nus_6105_reset.patch
new file mode 100644
index 0000000..52384d1
--- /dev/null
+++ b/debian/patches/n64_cic_nus_6105_reset.patch
@@ -0,0 +1,19 @@
+Description: Reset PIF_RAMb 46,47 after the n64_cic_nus_6105 challenge
+ Response check fails when the PIF RAM is is not set to zero for byte 46+47
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-core/commits/9b7c7758d2bf0b20ff7440659f26a8695fb7d1cb
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/memory/pif.c b/src/memory/pif.c
+index 529ce95c3f8c88552f92009b1b916859b16d1a2c..e5266ad023bd262e4786f2ee2c03dc3a9ff012ed 100644
+--- a/src/memory/pif.c
++++ b/src/memory/pif.c
+@@ -513,6 +513,8 @@ void update_pif_write(void)
+             }
+             // calculate the proper response for the given challenge (X-Scale's algorithm)
+             n64_cic_nus_6105(challenge, response, CHL_LEN - 2);
++            PIF_RAMb[46] = 0;
++            PIF_RAMb[47] = 0;
+             // re-format the 'response' into a byte stream
+             for (i = 0; i < 15; i++)
+             {
diff --git a/debian/patches/series b/debian/patches/series
index ba57ee0..701fae1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ printf_fixup.patch
 disable_recompiler_disassembler.patch
 sdl2_keysym.patch
 multiple_main.patch
+n64_cic_nus_6105_reset.patch

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