Merge pull request #23 from jamsilva/master

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

1 files changed, 1 insertions, 104 deletions

diff --git a/source/spc7110.c b/source/spc7110.c
index 49b8967..acc4666 100644
--- a/source/spc7110.c
+++ b/source/spc7110.c
@@ -1,93 +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 "../copyright"
 
 #include "spc7110.h"
 #include "memmap.h"
@@ -297,7 +208,6 @@ void MovePackData()
          FILE* fp = fopen("sp7err.out", "a");
 #endif
 
-         //       fprintf(fp, "Table Entry %06X:%02X not found\n", table, s7r.reg4804);
          fclose(fp);
          return;
       }
@@ -383,7 +293,6 @@ void ReadPackData()
       if (i == MAX_TABLES)
       {
          FILE* fp = fopen("sp7err.out", "a");
-         //       fprintf(fp, "Table Entry %06X:%02X not found\n", table, s7r.reg4804);
          fclose(fp);
          return;
       }
@@ -408,7 +317,6 @@ void ReadPackData()
 
          splitpath(Memory.ROMFilename, drive, dir, fname, ext);
          strcpy(name, drive);
-         //strcat(filename, "\\");
          strcat(name, dir);
 
          strcat(name, pfold);
@@ -509,7 +417,6 @@ void GetPackData()
       if (i == MAX_TABLES)
       {
          FILE* fp = fopen("sp7err.out", "a");
-         //       fprintf(fp, "Table Entry %06X:%02X not found\n", table, s7r.reg4804);
          fclose(fp);
          return;
       }
@@ -792,7 +699,6 @@ uint8_t S9xGetSPC7110(uint16_t Address)
          i %= s7r.DataRomSize;
          i += s7r.DataRomOffset;
          uint8_t tmp = Memory.ROM[i];
-         i = ((s7r.reg4813 << 16) | (s7r.reg4812 << 8) | s7r.reg4811);
          if (0x60 == (s7r.reg4818 & 0x60))
          {
             i = ((s7r.reg4813 << 16) | (s7r.reg4812 << 8) | s7r.reg4811);
@@ -1024,7 +930,6 @@ void S9xSetSPC7110(uint8_t data, uint16_t Address)
             break;
          }
       }
-      //       s7r.decomp_set=true;
    }
    break;
    //$4810 is probably read only.
@@ -1332,13 +1237,10 @@ void S9xSetSPC7110(uint8_t data, uint16_t Address)
       if (0 == data)
       {
          S9xUpdateRTC();
-         // rtc_f9.init=false;
-         // rtc_f9.index=-1;
       }
       if (data & 0x01)
       {
          s7r.reg4842 = 0x80;
-         //rtc_f9.last_used=time(NULL);//????
          rtc_f9.init = false;
          rtc_f9.index = -1;
       }
@@ -1427,7 +1329,6 @@ void S9xSetSPC7110(uint8_t data, uint16_t Address)
       break;
    //writes to RTC status register aren't expected to be meaningful
    default:
-      Address -= 0x4800;
       break;
       //16 BIT MULTIPLIER: ($FF00) high byte, defval:00
    }
@@ -1666,7 +1567,6 @@ bool Load7110Index(char* filename)
       return false;
 
    int f_len;
-   //do
    while (1)
    {
       i = 0;
@@ -1691,7 +1591,6 @@ bool Load7110Index(char* filename)
       decompack->tableEnts[i].location[index].used_offset = 0;
 
    }
-   //while(!feof(fp));
    fclose(fp);
    return true;
 }
@@ -2073,7 +1972,6 @@ void Do7110Logging()
          fseek(flog, 35, 0);
 
          int f_len;
-         //do
          while (1)
          {
             int i = 0;
@@ -2098,7 +1996,6 @@ void Do7110Logging()
                i++;
             }
          }
-         //while(!feof(flog));
          fclose(flog);
       }