From 5bddd62098ecde8b32e4abdcdfb50f431e95742b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 6 Aug 2015 13:03:54 +0200 Subject: [PATCH] Merge general.c --- src/drivers/libretro/fceu/general.c | 162 --------------------- src/drivers/libretro/griffin.c | 2 +- src/general.c | 213 +++++++++++----------------- 3 files changed, 81 insertions(+), 296 deletions(-) delete mode 100644 src/drivers/libretro/fceu/general.c diff --git a/src/drivers/libretro/fceu/general.c b/src/drivers/libretro/fceu/general.c deleted file mode 100644 index 0cc96dd..0000000 --- a/src/drivers/libretro/fceu/general.c +++ /dev/null @@ -1,162 +0,0 @@ -/* FCE Ultra - NES/Famicom Emulator - * - * Copyright notice for this file: - * Copyright (C) 2002 Xodnizel - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include -#include -#include - -#include -#include -#ifdef _WIN32 -#include -#else -#include -#endif - -#include "fceu-types.h" -#include "fceu.h" - -#include "general.h" -#include "state.h" - -#include "driver.h" - -#include "md5.h" - -static char BaseDirectory[2048]; -static char FileBase[2048]; -static char FileExt[2048]; /* Includes the . character, as in ".nes" */ - -static char FileBaseDirectory[2048]; - -void FCEUI_SetBaseDirectory(char *dir) -{ - strncpy(BaseDirectory, dir, 2047); - BaseDirectory[2047] = 0; -} - -static char *odirs[FCEUIOD__COUNT] = { 0, 0, 0, 0, 0, 0 }; // odirs, odors. ^_^ - -void FCEUI_SetDirOverride(int which, char *n) -{ - odirs[which] = n; - - /* Rebuild cache of present states/movies. */ - if (GameInfo) - { - if (which == FCEUIOD_STATE) - FCEUSS_CheckStates(); - } -} - -#ifndef HAVE_ASPRINTF -static int asprintf(char **strp, const char *fmt, ...) { - va_list ap; - int ret; - - va_start(ap, fmt); - if (!(*strp = malloc(2048))) - return(0); - ret = vsnprintf(*strp, 2048, fmt, ap); - va_end(ap); - return(ret); -} -#endif - -char *FCEU_MakeFName(int type, int id1, char *cd1) -{ - char *ret = 0; - struct stat tmpstat; - - switch (type) - { - case FCEUMKF_GGROM: - asprintf(&ret, "%s"PSS "gg.rom", BaseDirectory); - break; - case FCEUMKF_FDSROM: - asprintf(&ret, "%s"PSS "disksys.rom", BaseDirectory); - break; - case FCEUMKF_PALETTE: - if (odirs[FCEUIOD_MISC]) - asprintf(&ret, "%s"PSS "%s.pal", odirs[FCEUIOD_MISC], FileBase); - else - asprintf(&ret, "%s"PSS "gameinfo"PSS "%s.pal", BaseDirectory, FileBase); - break; - default: - ret = malloc(1); - *ret = '\0'; - } - return(ret); -} - -void GetFileBase(const char *f) -{ - const char *tp1, *tp3; - -#if PSS_STYLE == 4 - tp1 = ((char*)strrchr(f, ':')); -#elif PSS_STYLE == 1 - tp1 = ((char*)strrchr(f, '/')); -#else - tp1 = ((char*)strrchr(f, '\\')); -#if PSS_STYLE != 3 - tp3 = ((char*)strrchr(f, '/')); - if (tp1 < tp3) tp1 = tp3; -#endif -#endif - if (!tp1) - { - tp1 = f; - strcpy(FileBaseDirectory, "."); - } - else - { - memcpy(FileBaseDirectory, f, tp1 - f); - FileBaseDirectory[tp1 - f] = 0; - tp1++; - } - - if (((tp3 = strrchr(f, '.')) != NULL) && (tp3 > tp1)) - { - memcpy(FileBase, tp1, tp3 - tp1); - FileBase[tp3 - tp1] = 0; - strcpy(FileExt, tp3); - } - else - { - strcpy(FileBase, tp1); - FileExt[0] = 0; - } -} - -uint32 uppow2(uint32 n) -{ - int x; - - for (x = 31; x >= 0; x--) - if (n & (1 << x)) - { - if ((1 << x) != n) - return(1 << (x + 1)); - break; - } - return n; -} diff --git a/src/drivers/libretro/griffin.c b/src/drivers/libretro/griffin.c index 6b2cfd7..0730b3b 100644 --- a/src/drivers/libretro/griffin.c +++ b/src/drivers/libretro/griffin.c @@ -16,7 +16,7 @@ #include "fds.c" #include "file.c" #include "filter.c" -#include "drivers/libretro/fceu/general.c" +#include "general.c" #include "drivers/libretro/fceu/input.c" #include "md5.c" //#include "movie.c" diff --git a/src/general.c b/src/general.c index aa115b3..0cc96dd 100644 --- a/src/general.c +++ b/src/general.c @@ -36,7 +36,6 @@ #include "general.h" #include "state.h" -#include "movie.h" #include "driver.h" @@ -48,22 +47,24 @@ static char FileExt[2048]; /* Includes the . character, as in ".nes" */ static char FileBaseDirectory[2048]; -void FCEUI_SetBaseDirectory(char *dir) { +void FCEUI_SetBaseDirectory(char *dir) +{ strncpy(BaseDirectory, dir, 2047); BaseDirectory[2047] = 0; } static char *odirs[FCEUIOD__COUNT] = { 0, 0, 0, 0, 0, 0 }; // odirs, odors. ^_^ -void FCEUI_SetDirOverride(int which, char *n) { +void FCEUI_SetDirOverride(int which, char *n) +{ odirs[which] = n; - if (GameInfo) { /* Rebuild cache of present states/movies. */ - if (which == FCEUIOD_STATE) - FCEUSS_CheckStates(); - else if (which == FCEUIOD_MOVIE) - FCEUMOV_CheckMovies(); - } + /* Rebuild cache of present states/movies. */ + if (GameInfo) + { + if (which == FCEUIOD_STATE) + FCEUSS_CheckStates(); + } } #ifndef HAVE_ASPRINTF @@ -80,136 +81,82 @@ static int asprintf(char **strp, const char *fmt, ...) { } #endif -char *FCEU_MakeFName(int type, int id1, char *cd1) { - char *ret = 0; - struct stat tmpstat; +char *FCEU_MakeFName(int type, int id1, char *cd1) +{ + char *ret = 0; + struct stat tmpstat; - switch (type) { - case FCEUMKF_NPTEMP: asprintf(&ret, "%s"PSS "m590plqd94fo.tmp", BaseDirectory); break; - case FCEUMKF_MOVIE: - if (odirs[FCEUIOD_STATE]) - asprintf(&ret, "%s"PSS "%s.%d.fcm", odirs[FCEUIOD_STATE], FileBase, id1); - else - asprintf(&ret, "%s"PSS "fcs"PSS "%s.%d.fcm", BaseDirectory, FileBase, id1); - if (stat(ret, &tmpstat) == -1) { - if (odirs[FCEUIOD_STATE]) - asprintf(&ret, "%s"PSS "%s.%s.%d.fcm", odirs[FCEUIOD_STATE], FileBase, md5_asciistr(GameInfo->MD5), id1); - else - asprintf(&ret, "%s"PSS "fcs"PSS "%s.%s.%d.fcm", BaseDirectory, FileBase, md5_asciistr(GameInfo->MD5), id1); - } - break; - case FCEUMKF_STATE: - if (odirs[FCEUIOD_STATE]) - asprintf(&ret, "%s"PSS "%s.fc%d", odirs[FCEUIOD_STATE], FileBase, id1); - else - asprintf(&ret, "%s"PSS "fcs"PSS "%s.fc%d", BaseDirectory, FileBase, id1); - if (stat(ret, &tmpstat) == -1) { -// if(odirs[FCEUIOD_STATE]) -// asprintf(&ret,"%s"PSS"%s.%s.fc%d",odirs[FCEUIOD_STATE],FileBase,md5_asciistr(GameInfo->MD5),id1); -// else -// asprintf(&ret,"%s"PSS"fcs"PSS"%s.%s.fc%d",BaseDirectory,FileBase,md5_asciistr(GameInfo->MD5),id1); - if (odirs[FCEUIOD_STATE]) - asprintf(&ret, "%s"PSS "%s.fc%d", odirs[FCEUIOD_STATE], FileBase, id1); - else - asprintf(&ret, "%s"PSS "fcs"PSS "%s.fc%d", BaseDirectory, FileBase, id1); - } - break; - case FCEUMKF_SNAP: - if (FSettings.SnapName) { - if (odirs[FCEUIOD_SNAPS]) - asprintf(&ret, "%s"PSS "%s-%d.%s", odirs[FCEUIOD_SNAPS], FileBase, id1, cd1); - else - asprintf(&ret, "%s"PSS "snaps"PSS "%s-%d.%s", BaseDirectory, FileBase, id1, cd1); - } else { - if (odirs[FCEUIOD_SNAPS]) - asprintf(&ret, "%s"PSS "%d.%s", odirs[FCEUIOD_SNAPS], id1, cd1); - else - asprintf(&ret, "%s"PSS "snaps"PSS "%d.%s", BaseDirectory, id1, cd1); - } - break; - case FCEUMKF_FDS: - if (odirs[FCEUIOD_NV]) - asprintf(&ret, "%s"PSS "%s.%s.fds", odirs[FCEUIOD_NV], FileBase, md5_asciistr(GameInfo->MD5)); - else - asprintf(&ret, "%s"PSS "sav"PSS "%s.%s.fds", BaseDirectory, FileBase, md5_asciistr(GameInfo->MD5)); - break; - case FCEUMKF_SAV: - if (odirs[FCEUIOD_NV]) - asprintf(&ret, "%s"PSS "%s.%s", odirs[FCEUIOD_NV], FileBase, cd1); - else - asprintf(&ret, "%s"PSS "sav"PSS "%s.%s", BaseDirectory, FileBase, cd1); - if (stat(ret, &tmpstat) == -1) { - if (odirs[FCEUIOD_NV]) - asprintf(&ret, "%s"PSS "%s.%s.%s", odirs[FCEUIOD_NV], FileBase, md5_asciistr(GameInfo->MD5), cd1); - else - asprintf(&ret, "%s"PSS "sav"PSS "%s.%s.%s", BaseDirectory, FileBase, md5_asciistr(GameInfo->MD5), cd1); - } - break; - case FCEUMKF_CHEAT: - if (odirs[FCEUIOD_CHEATS]) - asprintf(&ret, "%s"PSS "%s.cht", odirs[FCEUIOD_CHEATS], FileBase); - else - asprintf(&ret, "%s"PSS "cheats"PSS "%s.cht", BaseDirectory, FileBase); - break; - case FCEUMKF_IPS: asprintf(&ret, "%s"PSS "%s%s.ips", FileBaseDirectory, FileBase, FileExt); - break; - case FCEUMKF_GGROM: asprintf(&ret, "%s"PSS "gg.rom", BaseDirectory); break; - case FCEUMKF_FDSROM: asprintf(&ret, "%s"PSS "disksys.rom", BaseDirectory); break; - case FCEUMKF_PALETTE: - if (odirs[FCEUIOD_MISC]) - asprintf(&ret, "%s"PSS "%s.pal", odirs[FCEUIOD_MISC], FileBase); - else - asprintf(&ret, "%s"PSS "gameinfo"PSS "%s.pal", BaseDirectory, FileBase); - break; - default: - ret = malloc(1); - *ret = '\0'; - } - return(ret); + switch (type) + { + case FCEUMKF_GGROM: + asprintf(&ret, "%s"PSS "gg.rom", BaseDirectory); + break; + case FCEUMKF_FDSROM: + asprintf(&ret, "%s"PSS "disksys.rom", BaseDirectory); + break; + case FCEUMKF_PALETTE: + if (odirs[FCEUIOD_MISC]) + asprintf(&ret, "%s"PSS "%s.pal", odirs[FCEUIOD_MISC], FileBase); + else + asprintf(&ret, "%s"PSS "gameinfo"PSS "%s.pal", BaseDirectory, FileBase); + break; + default: + ret = malloc(1); + *ret = '\0'; + } + return(ret); } -void GetFileBase(const char *f) { - const char *tp1, *tp3; +void GetFileBase(const char *f) +{ + const char *tp1, *tp3; - #if PSS_STYLE == 4 - tp1 = ((char*)strrchr(f, ':')); - #elif PSS_STYLE == 1 - tp1 = ((char*)strrchr(f, '/')); - #else - tp1 = ((char*)strrchr(f, '\\')); - #if PSS_STYLE != 3 - tp3 = ((char*)strrchr(f, '/')); - if (tp1 < tp3) tp1 = tp3; - #endif - #endif - if (!tp1) { - tp1 = f; - strcpy(FileBaseDirectory, "."); - } else { - memcpy(FileBaseDirectory, f, tp1 - f); - FileBaseDirectory[tp1 - f] = 0; - tp1++; - } +#if PSS_STYLE == 4 + tp1 = ((char*)strrchr(f, ':')); +#elif PSS_STYLE == 1 + tp1 = ((char*)strrchr(f, '/')); +#else + tp1 = ((char*)strrchr(f, '\\')); +#if PSS_STYLE != 3 + tp3 = ((char*)strrchr(f, '/')); + if (tp1 < tp3) tp1 = tp3; +#endif +#endif + if (!tp1) + { + tp1 = f; + strcpy(FileBaseDirectory, "."); + } + else + { + memcpy(FileBaseDirectory, f, tp1 - f); + FileBaseDirectory[tp1 - f] = 0; + tp1++; + } - if (((tp3 = strrchr(f, '.')) != NULL) && (tp3 > tp1)) { - memcpy(FileBase, tp1, tp3 - tp1); - FileBase[tp3 - tp1] = 0; - strcpy(FileExt, tp3); - } else { - strcpy(FileBase, tp1); - FileExt[0] = 0; - } + if (((tp3 = strrchr(f, '.')) != NULL) && (tp3 > tp1)) + { + memcpy(FileBase, tp1, tp3 - tp1); + FileBase[tp3 - tp1] = 0; + strcpy(FileExt, tp3); + } + else + { + strcpy(FileBase, tp1); + FileExt[0] = 0; + } } -uint32 uppow2(uint32 n) { - int x; +uint32 uppow2(uint32 n) +{ + int x; - for (x = 31; x >= 0; x--) - if (n & (1 << x)) { - if ((1 << x) != n) - return(1 << (x + 1)); - break; - } - return n; + for (x = 31; x >= 0; x--) + if (n & (1 << x)) + { + if ((1 << x) != n) + return(1 << (x + 1)); + break; + } + return n; } -