[mupen64plus] 148/262: Remove duplicated code in load_aidacrate.patch

[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 ee13a3bc5360632630c2273e461e37445a5a9bb8
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sat Oct 3 18:21:40 2009 +0200

    Remove duplicated code in load_aidacrate.patch
---
 debian/patches/load_aidacrate.patch | 86 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 85 insertions(+), 1 deletion(-)

diff --git a/debian/patches/load_aidacrate.patch b/debian/patches/load_aidacrate.patch
index 55cba60..ec8f13f 100644
--- a/debian/patches/load_aidacrate.patch
+++ b/debian/patches/load_aidacrate.patch
@@ -18,7 +18,7 @@ index b6264ece050fd964c83b245b562dfc42c7aa0e8d..016b6ca62493e774931cca6f57e1e5b2
      gzread(f, &dps_register, sizeof(DPS_register));
      gzread(f, rdram, 0x800000);
 diff --git a/memory/memory.c b/memory/memory.c
-index 68232c9d47d884d9611921e12cce38a03392d031..d423756262cf79bce60fefc4dfbe8c027f01102e 100644
+index 68232c9d47d884d9611921e12cce38a03392d031..7d090cabebd687e39db5fedc167f8992bbbcdbdf 100644
 --- a/memory/memory.c
 +++ b/memory/memory.c
 @@ -2778,26 +2778,7 @@ void write_ai()
@@ -80,6 +80,90 @@ index 68232c9d47d884d9611921e12cce38a03392d031..d423756262cf79bce60fefc4dfbe8c02
  void write_aib()
  {
     int temp;
+@@ -2875,26 +2880,7 @@ void write_aib()
+       + ((*address_low&3)^S8) ) = byte;
+     if (ai_register.ai_dacrate != temp)
+       {
+-         ai_register.ai_dacrate = temp;
+-         switch(ROM_HEADER->Country_code&0xFF)
+-           {
+-        case 0x44:
+-        case 0x46:
+-        case 0x49:
+-        case 0x50:
+-        case 0x53:
+-        case 0x55:
+-        case 0x58:
+-        case 0x59:
+-          aiDacrateChanged(SYSTEM_PAL);
+-          break;
+-        case 0x37:
+-        case 0x41:
+-        case 0x45:
+-        case 0x4a:
+-          aiDacrateChanged(SYSTEM_NTSC);
+-          break;
+-           }
++         update_ai_dacrate(temp);
+       }
+     return;
+     break;
+@@ -2966,26 +2952,7 @@ void write_aih()
+                 + ((*address_low&3)^S16) )) = hword;
+     if (ai_register.ai_dacrate != temp)
+       {
+-         ai_register.ai_dacrate = temp;
+-         switch(ROM_HEADER->Country_code&0xFF)
+-           {
+-        case 0x44:
+-        case 0x46:
+-        case 0x49:
+-        case 0x50:
+-        case 0x53:
+-        case 0x55:
+-        case 0x58:
+-        case 0x59:
+-          aiDacrateChanged(SYSTEM_PAL);
+-          break;
+-        case 0x37:
+-        case 0x41:
+-        case 0x45:
+-        case 0x4a:
+-          aiDacrateChanged(SYSTEM_NTSC);
+-          break;
+-           }
++         update_ai_dacrate(temp);
+       }
+     return;
+     break;
+@@ -3049,26 +3016,7 @@ void write_aid()
+       case 0x10:
+     if (ai_register.ai_dacrate != dword >> 32)
+       {
+-         ai_register.ai_dacrate = dword >> 32;
+-         switch(ROM_HEADER->Country_code&0xFF)
+-           {
+-        case 0x44:
+-        case 0x46:
+-        case 0x49:
+-        case 0x50:
+-        case 0x53:
+-        case 0x55:
+-        case 0x58:
+-        case 0x59:
+-          aiDacrateChanged(SYSTEM_PAL);
+-          break;
+-        case 0x37:
+-        case 0x41:
+-        case 0x45:
+-        case 0x4a:
+-          aiDacrateChanged(SYSTEM_NTSC);
+-          break;
+-           }
++         update_ai_dacrate(dword >> 32);
+       }
+     ai_register.ai_bitrate = dword & 0xFFFFFFFF;
+     return;
 diff --git a/memory/memory.h b/memory/memory.h
 index 8a914f028061400bf07cb85007b9ec570726c981..e3f5d3359466f90b375d7d662d0d0bb46e2a6d3c 100644
 --- a/memory/memory.h

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