Updated Free Software Foundation address (Jem256).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@75156 e17a0e51-4ae3-4d35-97c3-1a29b211df97

52 files changed, 156 insertions, 156 deletions

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index 03baad3f..78f00bfb 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 #include "psxcommon.h"

diff --git a/libpcsxcore/cdriso.h b/libpcsxcore/cdriso.h
index 4fa81cbc..8c35445d 100644
--- a/libpcsxcore/cdriso.h
+++ b/libpcsxcore/cdriso.h
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 #ifndef CDRISO_H

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index d1605804..7b699248 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /*

diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h
index 7432ab03..512c3216 100644
--- a/libpcsxcore/cdrom.h
+++ b/libpcsxcore/cdrom.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 #ifndef __CDROM_H__

diff --git a/libpcsxcore/cheat.c b/libpcsxcore/cheat.c
index 21d88b8e..befaa39a 100644
--- a/libpcsxcore/cheat.c
+++ b/libpcsxcore/cheat.c
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "psxcommon.h"
diff --git a/libpcsxcore/cheat.h b/libpcsxcore/cheat.h
index d54f22c3..3668d972 100644
--- a/libpcsxcore/cheat.h
+++ b/libpcsxcore/cheat.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef CHEAT_H
diff --git a/libpcsxcore/debug.h b/libpcsxcore/debug.h
index fc906a8e..0551a7f9 100644
--- a/libpcsxcore/debug.h
+++ b/libpcsxcore/debug.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef __DEBUG_H__
diff --git a/libpcsxcore/decode_xa.c b/libpcsxcore/decode_xa.c
index 9198659e..96f7c958 100644
--- a/libpcsxcore/decode_xa.c
+++ b/libpcsxcore/decode_xa.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /* 

diff --git a/libpcsxcore/decode_xa.h b/libpcsxcore/decode_xa.h
index a5994e12..b9e9d325 100644
--- a/libpcsxcore/decode_xa.h
+++ b/libpcsxcore/decode_xa.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef __DECODE_XA_H__
diff --git a/libpcsxcore/disr3000a.c b/libpcsxcore/disr3000a.c
index d99fe982..28bbdc53 100644
--- a/libpcsxcore/disr3000a.c
+++ b/libpcsxcore/disr3000a.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /* 

diff --git a/libpcsxcore/gpu.c b/libpcsxcore/gpu.c
index 05137541..9ade94ad 100644
--- a/libpcsxcore/gpu.c
+++ b/libpcsxcore/gpu.c
@@ -13,7 +13,7 @@
  *

  *  You should have received a copy of the GNU General Public License

  *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

 

 #include "psxhw.h"

diff --git a/libpcsxcore/gte.c b/libpcsxcore/gte.c
index a27bd0f3..1ce8fecf 100644
--- a/libpcsxcore/gte.c
+++ b/libpcsxcore/gte.c
@@ -16,7 +16,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 /*
@@ -219,7 +219,7 @@ static inline float flimE(float result) {
 #define F(a) BOUNDS((a), 0x7fffffff, (1 << 31) | (1 << 16), -(s64)0x80000000, (1 << 31) | (1 << 15))
 #define limG1(a) LIM((a), 0x3ff, -0x400, (1 << 31) | (1 << 14))
 #define limG2(a) LIM((a), 0x3ff, -0x400, (1 << 31) | (1 << 13))
-#define limH(a) LIM((a), 0x1000, 0x0000, (1 << 12))

+#define limH(a) LIM((a), 0x1000, 0x0000, (1 << 12))
 
 #define limG1_ia(a) LIM((a), 0x3ffffff, -0x4000000, (1 << 31) | (1 << 14))
 #define limG2_ia(a) LIM((a), 0x3ffffff, -0x4000000, (1 << 31) | (1 << 13))
@@ -278,53 +278,53 @@ static inline void MTC2(u32 value, int reg) {
 
 		case 30:
 			{
-#if 1

-				int a;

-				gteLZCS = value;

-

-				// non-MAME code

-				a = gteLZCS;

-				if (a > 0) {

-					int i;

-					for (i = 31; (a & (1 << i)) == 0 && i >= 0; i--);

-					gteLZCR = 31 - i;

-				} else if (a < 0) {

-					int i;

-					a ^= 0xffffffff;

-					for (i = 31; (a & (1 << i)) == 0 && i >= 0; i--);

-					gteLZCR = 31 - i;

-				} else {

-					gteLZCR = 32;

-				}

-#else

-				// MAME

-				u32 lzcs = value;

-				u32 lzcr = 0;

-

-				gteLZCS = value;

-

-				if( ( lzcs & 0x80000000 ) == 0 )

-				{

-					lzcs = ~lzcs;

-				}

-				while( ( lzcs & 0x80000000 ) != 0 )

-				{

-					lzcr++;

-					lzcs <<= 1;

-				}

-				gteLZCR = lzcr;

-#endif

+#if 1
+				int a;
+				gteLZCS = value;
+
+				// non-MAME code
+				a = gteLZCS;
+				if (a > 0) {
+					int i;
+					for (i = 31; (a & (1 << i)) == 0 && i >= 0; i--);
+					gteLZCR = 31 - i;
+				} else if (a < 0) {
+					int i;
+					a ^= 0xffffffff;
+					for (i = 31; (a & (1 << i)) == 0 && i >= 0; i--);
+					gteLZCR = 31 - i;
+				} else {
+					gteLZCR = 32;
+				}
+#else
+				// MAME
+				u32 lzcs = value;
+				u32 lzcr = 0;
+
+				gteLZCS = value;
+
+				if( ( lzcs & 0x80000000 ) == 0 )
+				{
+					lzcs = ~lzcs;
+				}
+				while( ( lzcs & 0x80000000 ) != 0 )
+				{
+					lzcr++;
+					lzcs <<= 1;
+				}
+				gteLZCR = lzcr;
+#endif
 			}
 			break;
 
-#if 1

-		case 31:

-			return;

-#else

-		case 31:

-			value = psxRegs.CP2D.r[reg];

-			break;

-#endif

+#if 1
+		case 31:
+			return;
+#else
+		case 31:
+			value = psxRegs.CP2D.r[reg];
+			break;
+#endif
 
 		default:
 			psxRegs.CP2D.r[reg] = value;
@@ -521,9 +521,9 @@ void gteSQR() {
 	gteMAC1 = A1((gteIR1 * gteIR1) >> shift);
 	gteMAC2 = A2((gteIR2 * gteIR2) >> shift);
 	gteMAC3 = A3((gteIR3 * gteIR3) >> shift);
-	gteIR1 = limB1(gteMAC1, lm);

-	gteIR2 = limB2(gteMAC2, lm);

-	gteIR3 = limB3(gteMAC3, lm);

+	gteIR1 = limB1(gteMAC1, lm);
+	gteIR2 = limB2(gteMAC2, lm);
+	gteIR3 = limB3(gteMAC3, lm);
 }
 
 void gteNCCS() {
diff --git a/libpcsxcore/gte.h b/libpcsxcore/gte.h
index 2cea0264..4d008bb1 100644
--- a/libpcsxcore/gte.h
+++ b/libpcsxcore/gte.h
@@ -16,7 +16,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef __GTE_H__
diff --git a/libpcsxcore/ix86/iGte.h b/libpcsxcore/ix86/iGte.h
index d03705ec..421aa32c 100644
--- a/libpcsxcore/ix86/iGte.h
+++ b/libpcsxcore/ix86/iGte.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef __IGTE_H__
diff --git a/libpcsxcore/ix86/iR3000A.c b/libpcsxcore/ix86/iR3000A.c
index 7fe10b40..f1d74648 100644
--- a/libpcsxcore/ix86/iR3000A.c
+++ b/libpcsxcore/ix86/iR3000A.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /*

diff --git a/libpcsxcore/ix86/ix86.c b/libpcsxcore/ix86/ix86.c
index 3f8903ec..ef615820 100644
--- a/libpcsxcore/ix86/ix86.c
+++ b/libpcsxcore/ix86/ix86.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /*

diff --git a/libpcsxcore/ix86/ix86.h b/libpcsxcore/ix86/ix86.h
index 2b60dfff..816c6a1e 100644
--- a/libpcsxcore/ix86/ix86.h
+++ b/libpcsxcore/ix86/ix86.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 /*
diff --git a/libpcsxcore/ix86_64/iGte.h b/libpcsxcore/ix86_64/iGte.h
index bcb2f4be..d288f54f 100644
--- a/libpcsxcore/ix86_64/iGte.h
+++ b/libpcsxcore/ix86_64/iGte.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef __IGTE_H__
diff --git a/libpcsxcore/ix86_64/iR3000A-64.c b/libpcsxcore/ix86_64/iR3000A-64.c
index 8b3cfa6a..10dfd1ab 100644
--- a/libpcsxcore/ix86_64/iR3000A-64.c
+++ b/libpcsxcore/ix86_64/iR3000A-64.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /*

diff --git a/libpcsxcore/ix86_64/ix86_cpudetect.c b/libpcsxcore/ix86_64/ix86_cpudetect.c
index 664e6b7d..dfbde264 100644
--- a/libpcsxcore/ix86_64/ix86_cpudetect.c
+++ b/libpcsxcore/ix86_64/ix86_cpudetect.c
@@ -13,7 +13,7 @@
  *

  *  You should have received a copy of the GNU General Public License

  *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

 

 #ifdef __x86_64__

@@ -292,7 +292,7 @@ void cpudetectInit( void )
                switch( cpuinfo.x86Model )

                {

                case 4:

-               case 8:     // 0.25 µm

+               case 8:     // 0.25 �m

                   strcpy( cpuinfo.x86Fam, "Intel Pentium (MMX)");

                   break;

                default:

@@ -308,7 +308,7 @@ void cpudetectInit( void )
                   break;

 

                case 2:     // 66 MHz FSB

-               case 5:     // Xeon/Celeron (0.25 µm)

+               case 5:     // Xeon/Celeron (0.25 �m)

                case 6:     // Internal L2 cache

                   strcpy( cpuinfo.x86Fam, "Intel Pentium II" );

                   break;

@@ -432,7 +432,7 @@ void cpudetectInit( void )
                   break;

 

                case 6:     

-               case 7:     // (0.25 µm)

+               case 7:     // (0.25 �m)

                case 8:     // K6-2

                case 9:     // K6-III

                case 14:    // K6-2+ / K6-III+

diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c
index f8fa31b7..58d3c1e4 100644
--- a/libpcsxcore/mdec.c
+++ b/libpcsxcore/mdec.c
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 #include "mdec.h"

diff --git a/libpcsxcore/mdec.h b/libpcsxcore/mdec.h
index e191b4e5..b804d672 100644
--- a/libpcsxcore/mdec.h
+++ b/libpcsxcore/mdec.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef __MDEC_H__
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 90e8d0fa..1de0aff8 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /*

diff --git a/libpcsxcore/misc.h b/libpcsxcore/misc.h
index ae3fc81f..626cf5c5 100644
--- a/libpcsxcore/misc.h
+++ b/libpcsxcore/misc.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef __MISC_H__
diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 9db5421b..c8c01b8b 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /*

diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index bf55e65f..3247c752 100644
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 #ifndef __PLUGINS_H__

diff --git a/libpcsxcore/ppc/pGte.h b/libpcsxcore/ppc/pGte.h
index a968460b..51b4db45 100644
--- a/libpcsxcore/ppc/pGte.h
+++ b/libpcsxcore/ppc/pGte.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef PGET_H
diff --git a/libpcsxcore/ppc/pR3000A.c b/libpcsxcore/ppc/pR3000A.c
index 3d3bfc8b..4b890880 100644
--- a/libpcsxcore/ppc/pR3000A.c
+++ b/libpcsxcore/ppc/pR3000A.c
@@ -13,7 +13,7 @@
  *

  *  You should have received a copy of the GNU General Public License

  *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

 

 #if defined (__ppc__) || defined (__ppc64__) || defined (__powerpc__) || defined (__powerpc64__) || defined (__POWERPC__)

diff --git a/libpcsxcore/ppf.c b/libpcsxcore/ppf.c
index e5ccdfc3..a5caca5f 100644
--- a/libpcsxcore/ppf.c
+++ b/libpcsxcore/ppf.c
@@ -17,7 +17,7 @@
  *

  *  You should have received a copy of the GNU General Public License

  *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

 

 #include "psxcommon.h"

diff --git a/libpcsxcore/ppf.h b/libpcsxcore/ppf.h
index a8adecbb..4bd11b99 100644
--- a/libpcsxcore/ppf.h
+++ b/libpcsxcore/ppf.h
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef __PPF_H__
diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index 4be32620..88afba26 100644
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /*

diff --git a/libpcsxcore/psxbios.h b/libpcsxcore/psxbios.h
index 3038319c..a5630b19 100644
--- a/libpcsxcore/psxbios.h
+++ b/libpcsxcore/psxbios.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 #ifndef __PSXBIOS_H__

diff --git a/libpcsxcore/psxcommon.c b/libpcsxcore/psxcommon.c
index f118c2db..959b9a7d 100644
--- a/libpcsxcore/psxcommon.c
+++ b/libpcsxcore/psxcommon.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #include "psxcommon.h"
diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index 78be8dba..dbedc429 100644
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /* 

diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index 8ecb629f..d573d446 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /*

diff --git a/libpcsxcore/psxcounters.h b/libpcsxcore/psxcounters.h
index bccb2e4d..013fdbf4 100644
--- a/libpcsxcore/psxcounters.h
+++ b/libpcsxcore/psxcounters.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef __PSXCOUNTERS_H__
diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index 88eb7fa8..c6bc6eb0 100644
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 /*
@@ -48,8 +48,8 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
 				break;
 			}
 			SPU_writeDMAMem(ptr, (bcr >> 16) * (bcr & 0xffff) * 2);
-

-			// Jungle Book - 0-0.333x DMA

+
+			// Jungle Book - 0-0.333x DMA
 			SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 3);
 			return;
 
@@ -67,14 +67,14 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
 			size = (bcr >> 16) * (bcr & 0xffff) * 2;
 			SPU_readDMAMem(ptr, size);
 			psxCpu->Clear(madr, size);
-

-#if 1

-			SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 2);

-#else

-			// Experimental burst dma transfer (0.333x max)

-			SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 3);

-#endif

-			return;

+
+#if 1
+			SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 2);
+#else
+			// Experimental burst dma transfer (0.333x max)
+			SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 3);
+#endif
+			return;
 
 #ifdef PSXDMA_LOG
 		default:
@@ -87,8 +87,8 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
 	DMA_INTERRUPT(4);
 }
 
-

-void psxDma6(u32 madr, u32 bcr, u32 chcr) {

+
+void psxDma6(u32 madr, u32 bcr, u32 chcr) {
 	u32 size;
 	u32 *mem = (u32 *)PSXM(madr);
 
@@ -106,22 +106,22 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) {
 			return;
 		}
 
-		// already 32-bit size

-		size = bcr;

-

+		// already 32-bit size
+		size = bcr;
+
 		while (bcr--) {
 			*mem-- = SWAP32((madr - 4) & 0xffffff);
 			madr -= 4;
 		}
 		mem++; *mem = 0xffffff;
-

-#if 1

-	  GPUOTCDMA_INT( size );

-#else

-		// Experimental burst dma transfer (0.333x max)

-	  GPUOTCDMA_INT( size/3 );

-#endif

-		return;

+
+#if 1
+	  GPUOTCDMA_INT( size );
+#else
+		// Experimental burst dma transfer (0.333x max)
+	  GPUOTCDMA_INT( size/3 );
+#endif
+		return;
 	}
 #ifdef PSXDMA_LOG
 	else {
@@ -133,9 +133,9 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) {
 	HW_DMA6_CHCR &= SWAP32(~0x01000000);
 	DMA_INTERRUPT(6);
 }
-

-void gpuotcInterrupt()

-{

-	HW_DMA6_CHCR &= SWAP32(~0x01000000);

-	DMA_INTERRUPT(6);

-}

+
+void gpuotcInterrupt()
+{
+	HW_DMA6_CHCR &= SWAP32(~0x01000000);
+	DMA_INTERRUPT(6);
+}
diff --git a/libpcsxcore/psxdma.h b/libpcsxcore/psxdma.h
index 63618ada..fdd5cf99 100644
--- a/libpcsxcore/psxdma.h
+++ b/libpcsxcore/psxdma.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef __PSXDMA_H__
@@ -47,35 +47,35 @@ extern "C" {
 	psxRegs.intCycle[PSXINT_MDECOUTDMA].sCycle = psxRegs.cycle; \
 }
 
-#define MDECINDMA_INT(eCycle) { \

-	psxRegs.interrupt |= (1 << PSXINT_MDECINDMA); \

-	psxRegs.intCycle[PSXINT_MDECINDMA].cycle = eCycle; \

-	psxRegs.intCycle[PSXINT_MDECINDMA].sCycle = psxRegs.cycle; \

-}

-

-#define GPUOTCDMA_INT(eCycle) { \

-	psxRegs.interrupt |= (1 << PSXINT_GPUOTCDMA); \

-	psxRegs.intCycle[PSXINT_GPUOTCDMA].cycle = eCycle; \

-	psxRegs.intCycle[PSXINT_GPUOTCDMA].sCycle = psxRegs.cycle; \

-}

-

-#define CDRDMA_INT(eCycle) { \

-	psxRegs.interrupt |= (1 << PSXINT_CDRDMA); \

-	psxRegs.intCycle[PSXINT_CDRDMA].cycle = eCycle; \

-	psxRegs.intCycle[PSXINT_CDRDMA].sCycle = psxRegs.cycle; \

-}

-

-/*

-DMA5 = N/A (PIO)

-*/

+#define MDECINDMA_INT(eCycle) { \
+	psxRegs.interrupt |= (1 << PSXINT_MDECINDMA); \
+	psxRegs.intCycle[PSXINT_MDECINDMA].cycle = eCycle; \
+	psxRegs.intCycle[PSXINT_MDECINDMA].sCycle = psxRegs.cycle; \
+}
+
+#define GPUOTCDMA_INT(eCycle) { \
+	psxRegs.interrupt |= (1 << PSXINT_GPUOTCDMA); \
+	psxRegs.intCycle[PSXINT_GPUOTCDMA].cycle = eCycle; \
+	psxRegs.intCycle[PSXINT_GPUOTCDMA].sCycle = psxRegs.cycle; \
+}
+
+#define CDRDMA_INT(eCycle) { \
+	psxRegs.interrupt |= (1 << PSXINT_CDRDMA); \
+	psxRegs.intCycle[PSXINT_CDRDMA].cycle = eCycle; \
+	psxRegs.intCycle[PSXINT_CDRDMA].sCycle = psxRegs.cycle; \
+}
+
+/*
+DMA5 = N/A (PIO)
+*/
 
 void psxDma3(u32 madr, u32 bcr, u32 chcr);
 void psxDma4(u32 madr, u32 bcr, u32 chcr);
 void psxDma6(u32 madr, u32 bcr, u32 chcr);
 void spuInterrupt();
-void mdec0Interrupt();

-void gpuotcInterrupt();

-void cdrDmaInterrupt();

+void mdec0Interrupt();
+void gpuotcInterrupt();
+void cdrDmaInterrupt();
 
 #ifdef __cplusplus
 }
diff --git a/libpcsxcore/psxhle.c b/libpcsxcore/psxhle.c
index 83362ecd..9d1d0529 100644
--- a/libpcsxcore/psxhle.c
+++ b/libpcsxcore/psxhle.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 /*
diff --git a/libpcsxcore/psxhle.h b/libpcsxcore/psxhle.h
index eef78e80..6eae3415 100644
--- a/libpcsxcore/psxhle.h
+++ b/libpcsxcore/psxhle.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef __PSXHLE_H__
diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c
index 77e1fd02..a33bae08 100644
--- a/libpcsxcore/psxhw.c
+++ b/libpcsxcore/psxhw.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 /*
diff --git a/libpcsxcore/psxhw.h b/libpcsxcore/psxhw.h
index cd4e928c..eaae45b1 100644
--- a/libpcsxcore/psxhw.h
+++ b/libpcsxcore/psxhw.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef __PSXHW_H__
diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c
index b2954b4c..6b0d3e4c 100644
--- a/libpcsxcore/psxinterpreter.c
+++ b/libpcsxcore/psxinterpreter.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /*

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 6e615cfe..14e27305 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /*

diff --git a/libpcsxcore/psxmem.h b/libpcsxcore/psxmem.h
index 7efad2b4..24bc9e38 100644
--- a/libpcsxcore/psxmem.h
+++ b/libpcsxcore/psxmem.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 #ifndef __PSXMEMORY_H__

diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 9a37abe6..c7a2b09a 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /*

diff --git a/libpcsxcore/r3000a.h b/libpcsxcore/r3000a.h
index b34a30f2..c927d05a 100644
--- a/libpcsxcore/r3000a.h
+++ b/libpcsxcore/r3000a.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 #ifndef __R3000A_H__

diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c
index f4bb97e7..0dd01b39 100644
--- a/libpcsxcore/sio.c
+++ b/libpcsxcore/sio.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *

  *   along with this program; if not, write to the                         *

  *   Free Software Foundation, Inc.,                                       *

- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *

+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *

  ***************************************************************************/

 

 /*

diff --git a/libpcsxcore/sio.h b/libpcsxcore/sio.h
index cc8d925b..2514162b 100644
--- a/libpcsxcore/sio.h
+++ b/libpcsxcore/sio.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 
diff --git a/libpcsxcore/spu.c b/libpcsxcore/spu.c
index a60c0478..89d4b712 100644
--- a/libpcsxcore/spu.c
+++ b/libpcsxcore/spu.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 /*
diff --git a/libpcsxcore/spu.h b/libpcsxcore/spu.h
index 85010cbd..92160e3c 100644
--- a/libpcsxcore/spu.h
+++ b/libpcsxcore/spu.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef __SPU_H__
diff --git a/libpcsxcore/system.h b/libpcsxcore/system.h
index c869fdf1..a67c3a76 100644
--- a/libpcsxcore/system.h
+++ b/libpcsxcore/system.h
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef __SYSTEM_H__