delete some files

Makefile

@@ -227,7 +227,6 @@ CDROM_SOURCES += $(MEDNAFEN_DIR)/cdrom/crc32.cpp
 CDROM_SOURCES += $(MEDNAFEN_DIR)/cdrom/cdromif.cpp
 
 
-#MEDNAFEN_SOURCES := $(MEDNAFEN_DIR)/error.cpp
 MEDNAFEN_SOURCES += $(MEDNAFEN_DIR)/math_ops.cpp
 MEDNAFEN_SOURCES += $(MEDNAFEN_DIR)/settings.cpp
 MEDNAFEN_SOURCES += $(MEDNAFEN_DIR)/general.cpp
@@ -238,17 +237,15 @@ MEDNAFEN_SOURCES += $(MEDNAFEN_DIR)/Stream.cpp
 MEDNAFEN_SOURCES += $(MEDNAFEN_DIR)/state.cpp
 MEDNAFEN_SOURCES += $(MEDNAFEN_DIR)/endian.cpp
 MEDNAFEN_SOURCES += $(CDROM_SOURCES)
-#MEDNAFEN_SOURCES += $(MEDNAFEN_DIR)/mempatcher.cpp
 MEDNAFEN_SOURCES += $(MEDNAFEN_DIR)/video/surface.cpp
 MEDNAFEN_SOURCES += $(RESAMPLER_SOURCES)
 MEDNAFEN_SOURCES += $(MEDNAFEN_DIR)/file.cpp
 MEDNAFEN_SOURCES += $(OKIADPCM_SOURCES)
 MEDNAFEN_SOURCES += $(MEDNAFEN_DIR)/md5.cpp
 
-LIBRETRO_SOURCES += libretro.cpp 
-#TRIO_SOURCES += $(MEDNAFEN_DIR)/trio/trio.c $(MEDNAFEN_DIR)/trio/triostr.c
+LIBRETRO_SOURCES += libretro.cpp
 
-SOURCES_C := 	$(TREMOR_SRC) $(LIBRETRO_SOURCES_C) $(TRIO_SOURCES) $(THREAD_SOURCES)
+SOURCES_C := 	$(TREMOR_SRC) $(LIBRETRO_SOURCES_C) $(THREAD_SOURCES)
 SOURCES := $(LIBRETRO_SOURCES) $(CORE_SOURCES) $(MEDNAFEN_SOURCES) $(HW_CPU_SOURCES) $(HW_MISC_SOURCES) $(HW_VIDEO_SOURCES)
 
 FLAGS += -DNEED_TREMOR

jni/Android.mk

@@ -85,8 +85,7 @@ FLAGS += -DNEED_TREMOR
 endif
 
 
-MEDNAFEN_SOURCES := $(MEDNAFEN_DIR)/error.cpp \
-	$(MEDNAFEN_DIR)/math_ops.cpp \
+MEDNAFEN_SOURCES := $(MEDNAFEN_DIR)/math_ops.cpp \
 	$(MEDNAFEN_DIR)/settings.cpp \
 	$(MEDNAFEN_DIR)/general.cpp \
 	$(MEDNAFEN_DIR)/FileWrapper.cpp \
@@ -94,7 +93,6 @@ MEDNAFEN_SOURCES := $(MEDNAFEN_DIR)/error.cpp \
 	$(MEDNAFEN_DIR)/MemoryStream.cpp \
 	$(MEDNAFEN_DIR)/Stream.cpp \
 	$(MEDNAFEN_DIR)/state.cpp \
-	$(MEDNAFEN_DIR)/mempatcher.cpp \
 	$(MEDNAFEN_DIR)/video/surface.cpp \
 	$(MEDNAFEN_DIR)/sound/Blip_Buffer.cpp \
 	$(MEDNAFEN_DIR)/file.cpp \

mednafen/error.cpp

@@ -1,130 +0,0 @@
-/* Mednafen - Multi-system Emulator
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "mednafen.h"
-#include "error.h"
-#include <string.h>
-#include <stdarg.h>
-#include "include/trio/trio.h"
-#include "../libretro.h"
-
-extern retro_log_printf_t log_cb;
-
-MDFN_Error::MDFN_Error() throw()
-{
-   abort();
-}
-
-MDFN_Error::MDFN_Error(int errno_code_new, const char *format, ...) throw()
-{
-   errno_code = errno_code_new;
-
-   va_list ap;
-   va_start(ap, format);
-   error_message = trio_vaprintf(format, ap);
-   va_end(ap);
-
-   if (log_cb)
-      log_cb(RETRO_LOG_ERROR, "%s\n", error_message);
-}
-
-
-MDFN_Error::MDFN_Error(const ErrnoHolder &enh)
-{
-   errno_code = enh.Errno();
-
-   error_message = trio_aprintf("%s", enh.StrError());
-}
-
-
-MDFN_Error::~MDFN_Error() throw()
-{
-   if(error_message)
-   {
-      free(error_message);
-      error_message = NULL;
-   }
-}
-
-MDFN_Error::MDFN_Error(const MDFN_Error &ze_error) throw()
-{
-   if(ze_error.error_message)
-      error_message = strdup(ze_error.error_message);
-   else
-      error_message = NULL;
-
-   errno_code = ze_error.errno_code;
-}
-
-MDFN_Error& MDFN_Error::operator=(const MDFN_Error &ze_error) throw()
-{
-   char *new_error_message = ze_error.error_message ? strdup(ze_error.error_message) : NULL;
-   int new_errno_code = ze_error.errno_code;
-
-   if(error_message)
-      free(error_message);
-
-   error_message = new_error_message;
-   errno_code = new_errno_code;
-
-   return(*this);
-}
-
-
-const char * MDFN_Error::what(void) const throw()
-{
-   if(!error_message)
-      return("Error allocating memory for the error message!");
-
-   return(error_message);
-}
-
-int MDFN_Error::GetErrno(void) const throw()
-{
-   return(errno_code);
-}
-
-static const char *srr_wrap(int ret, const char *local_strerror)
-{
-   if(ret == -1)
-      return("ERROR IN strerror_r()!!!");
-
-   return(local_strerror);
-}
-
-static const char *srr_wrap(const char *ret, const char *local_strerror)
-{
-   if(ret == NULL)
-      return("ERROR IN strerror_r()!!!");
-
-   return(ret);
-}
-
-void ErrnoHolder::SetErrno(int the_errno)
-{
-   local_errno = the_errno;
-
-   if(the_errno == 0)
-      local_strerror[0] = 0;
-   else
-   {
-      strncpy(local_strerror, strerror(the_errno), 255);
-
-      local_strerror[255] = 0;
-   }
-}
-

mednafen/error.h

@@ -1,74 +0,0 @@
-#ifndef __MDFN_ERROR_H
-#define __MDFN_ERROR_H
-
-#include <errno.h>
-#include <string.h>
-#include <stdexcept>
-
-#ifdef __cplusplus
-
-class ErrnoHolder;
-class MDFN_Error : public std::exception
-{
- public:
-
- MDFN_Error() throw();
-
- MDFN_Error(int errno_code_new, const char *format, ...) throw();
- MDFN_Error(const ErrnoHolder &enh);
-
- ~MDFN_Error() throw();
-
- MDFN_Error(const MDFN_Error &ze_error) throw();
- MDFN_Error & operator=(const MDFN_Error &ze_error) throw();
-
- virtual const char *what(void) const throw();
- int GetErrno(void) const throw();
-
- private:
-
- int errno_code;
- char *error_message;
-};
-
-class ErrnoHolder
-{
- public:
-
- ErrnoHolder()
- {
-  local_errno = 0;
-  local_strerror[0] = 0;
- }
-
- ErrnoHolder(int the_errno)
- {
-  SetErrno(the_errno);
- }
-
- inline int Errno(void) const
- {
-  return(local_errno);
- }
-
- const char *StrError(void) const
- {
-  return(local_strerror);
- }
-
- void operator=(int the_errno)
- {
-  SetErrno(the_errno);
- }
-
- private:
-
- void SetErrno(int the_errno);
-
- int local_errno;
- char local_strerror[256];
-};
-
-#endif
-
-#endif

mednafen/mempatcher-driver.h

@@ -1,23 +0,0 @@
-#ifndef __MDFN_MEMPATCHER_DRIVER_H
-#define __MDFN_MEMPATCHER_DRIVER_H
-
-int MDFNI_DecodePAR(const char *code, uint32 *a, uint8 *v, uint8 *c, char *type);
-int MDFNI_DecodeGG(const char *str, uint32 *a, uint8 *v, uint8 *c, char *type);
-int MDFNI_AddCheat(const char *name, uint32 addr, uint64 val, uint64 compare, char type, unsigned int length, bool bigendian);
-int MDFNI_DelCheat(uint32 which);
-int MDFNI_ToggleCheat(uint32 which);
-
-int32 MDFNI_CheatSearchGetCount(void);
-void MDFNI_CheatSearchGetRange(uint32 first, uint32 last, int (*callb)(uint32 a, uint8 last, uint8 current));
-void MDFNI_CheatSearchGet(int (*callb)(uint32 a, uint64 last, uint64 current, void *data), void *data);
-void MDFNI_CheatSearchBegin(void);
-void MDFNI_CheatSearchEnd(int type, uint64 v1, uint64 v2, unsigned int bytelen, bool bigendian);
-void MDFNI_ListCheats(int (*callb)(char *name, uint32 a, uint64 v, uint64 compare, int s, char type, unsigned int length, bool bigendian, void *data), void *data);
-
-int MDFNI_GetCheat(uint32 which, char **name, uint32 *a, uint64 *v, uint64 *compare, int *s, char *type, unsigned int *length, bool *bigendian);
-int MDFNI_SetCheat(uint32 which, const char *name, uint32 a, uint64 v, uint64 compare, int s, char type, unsigned int length, bool bigendian);
-
-void MDFNI_CheatSearchShowExcluded(void);
-void MDFNI_CheatSearchSetCurrentAsOriginal(void);
-
-#endif

mednafen/mempatcher.h

@@ -1,29 +0,0 @@
-#ifndef __MDFN_MEMPATCHER_H
-#define __MDFN_MEMPATCHER_H
-
-#include "mempatcher-driver.h"
-#include <vector>
-
-typedef struct __SUBCHEAT
-{
-	uint32 addr;
-	uint8 value;
-	int compare; // < 0 on no compare
-} SUBCHEAT;
-
-extern std::vector<SUBCHEAT> SubCheats[8];
-extern bool SubCheatsOn;
-
-bool MDFNMP_Init(uint32 ps, uint32 numpages);
-void MDFNMP_AddRAM(uint32 size, uint32 address, uint8 *RAM);
-void MDFNMP_Kill(void);
-
-
-void MDFNMP_InstallReadPatches(void);
-void MDFNMP_RemoveReadPatches(void);
-
-void MDFNMP_ApplyPeriodicCheats(void);
-
-extern MDFNSetting MDFNMP_Settings[];
-
-#endif