Merge pull request #23 from jamsilva/master

Cleanups, fixes (including one for "Retroarch/RetroPie Super Mario Allstars")

1 files changed, 6 insertions, 106 deletions

diff --git a/source/cpuexec.c b/source/cpuexec.c
index 9c50add..6b1896c 100644
--- a/source/cpuexec.c
+++ b/source/cpuexec.c
@@ -1,96 +1,4 @@
-/*******************************************************************************
-  Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
-
-  (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com) and
-                            Jerremy Koot (jkoot@snes9x.com)
-
-  (c) Copyright 2001 - 2004 John Weidman (jweidman@slip.net)
-
-  (c) Copyright 2002 - 2004 Brad Jorsch (anomie@users.sourceforge.net),
-                            funkyass (funkyass@spam.shaw.ca),
-                            Joel Yliluoma (http://iki.fi/bisqwit/)
-                            Kris Bleakley (codeviolation@hotmail.com),
-                            Matthew Kendora,
-                            Nach (n-a-c-h@users.sourceforge.net),
-                            Peter Bortas (peter@bortas.org) and
-                            zones (kasumitokoduck@yahoo.com)
-
-  C4 x86 assembler and some C emulation code
-  (c) Copyright 2000 - 2003 zsKnight (zsknight@zsnes.com),
-                            _Demo_ (_demo_@zsnes.com), and Nach
-
-  C4 C++ code
-  (c) Copyright 2003 Brad Jorsch
-
-  DSP-1 emulator code
-  (c) Copyright 1998 - 2004 Ivar (ivar@snes9x.com), _Demo_, Gary Henderson,
-                            John Weidman, neviksti (neviksti@hotmail.com),
-                            Kris Bleakley, Andreas Naive
-
-  DSP-2 emulator code
-  (c) Copyright 2003 Kris Bleakley, John Weidman, neviksti, Matthew Kendora, and
-                     Lord Nightmare (lord_nightmare@users.sourceforge.net
-
-  OBC1 emulator code
-  (c) Copyright 2001 - 2004 zsKnight, pagefault (pagefault@zsnes.com) and
-                            Kris Bleakley
-  Ported from x86 assembler to C by sanmaiwashi
-
-  SPC7110 and RTC C++ emulator code
-  (c) Copyright 2002 Matthew Kendora with research by
-                     zsKnight, John Weidman, and Dark Force
-
-  S-DD1 C emulator code
-  (c) Copyright 2003 Brad Jorsch with research by
-                     Andreas Naive and John Weidman
-
-  S-RTC C emulator code
-  (c) Copyright 2001 John Weidman
-
-  ST010 C++ emulator code
-  (c) Copyright 2003 Feather, Kris Bleakley, John Weidman and Matthew Kendora
-
-  Super FX x86 assembler emulator code
-  (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault
-
-  Super FX C emulator code
-  (c) Copyright 1997 - 1999 Ivar, Gary Henderson and John Weidman
-
-
-  SH assembler code partly based on x86 assembler code
-  (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se)
-
-  (c) Copyright 2014 - 2016 Daniel De Matteis. (UNDER NO CIRCUMSTANCE 
-  WILL COMMERCIAL RIGHTS EVER BE APPROPRIATED TO ANY PARTY)
-
-  Specific ports contains the works of other authors. See headers in
-  individual files.
-
-  Snes9x homepage: http://www.snes9x.com
-
-  Permission to use, copy, modify and distribute Snes9x in both binary and
-  source form, for non-commercial purposes, is hereby granted without fee,
-  providing that this license information and copyright notice appear with
-  all copies and any derived work.
-
-  This software is provided 'as-is', without any express or implied
-  warranty. In no event shall the authors be held liable for any damages
-  arising from the use of this software.
-
-  Snes9x is freeware for PERSONAL USE only. Commercial users should
-  seek permission of the copyright holders first. Commercial use includes
-  charging money for Snes9x or software derived from Snes9x.
-
-  The copyright holders request that bug fixes and improvements to the code
-  should be forwarded to them so everyone can benefit from the modifications
-  in future versions.
-
-  Super NES and Super Nintendo Entertainment System are trademarks of
-  Nintendo Co., Limited and its subsidiary companies.
-*******************************************************************************/
-//#include "ds2_timer.h"
-//#include "ds2_cpu.h"
-//#include "ds2io.h"
+#include "../copyright"
 
 #include "snes9x.h"
 #include "memmap.h"
@@ -125,13 +33,13 @@ void S9xMainLoop(void)
 {
    if (Settings.SA1)
    {
-      if (Settings.SuperFX)             S9xMainLoop_SA1_SFX();
-      else /* if (!Settings.SuperFX) */ S9xMainLoop_SA1_NoSFX();
+      if (Settings.SuperFX) S9xMainLoop_SA1_SFX();
+      else                  S9xMainLoop_SA1_NoSFX();
    }
-   else /* if (!Settings.SA1) */
+   else
    {
-      if (Settings.SuperFX)             S9xMainLoop_NoSA1_SFX();
-      else /* if (!Settings.SuperFX) */ S9xMainLoop_NoSA1_NoSFX();
+      if (Settings.SuperFX) S9xMainLoop_NoSA1_SFX();
+      else                  S9xMainLoop_NoSA1_NoSFX();
    }
 }
 
@@ -598,10 +506,6 @@ void S9xDoHBlankProcessing_SFX()
       // once every emulated 63.5 microseconds, which coresponds to
       // 15.750KHz, but the SPC700 timers need to be updated at multiples
       // of 8KHz, hence the error correction.
-      // IAPU.TimerErrorCounter++;
-      // if (IAPU.TimerErrorCounter >= )
-      //     IAPU.TimerErrorCounter = 0;
-      // else
       {
          if (APU.TimerEnabled [2])
          {
@@ -778,10 +682,6 @@ void S9xDoHBlankProcessing_NoSFX()
       // once every emulated 63.5 microseconds, which coresponds to
       // 15.750KHz, but the SPC700 timers need to be updated at multiples
       // of 8KHz, hence the error correction.
-      // IAPU.TimerErrorCounter++;
-      // if (IAPU.TimerErrorCounter >= )
-      //     IAPU.TimerErrorCounter = 0;
-      // else
 #ifndef USE_BLARGG_APU
       {
          if (APU.TimerEnabled [2])