#include "libpicofe/readpng.h"
static void toggle_fast_forward(int force_off);
+static void check_profile(void);
+static void check_memcards(void);
#endif
#ifndef BOOT_MSG
#define BOOT_MSG "Booting up..."
extern int iXAPitch;
extern int iVolume;
-int ready_to_go;
+int ready_to_go, g_resetting;
unsigned long gpuDisp;
char cfgfile_basename[MAXPATHLEN];
int state_slot;
#define MAKE_PATH(buf, dir, fname) \
make_path(buf, sizeof(buf), dir, fname)
-static void create_profile_dir(const char *directory) {
- char path[MAXPATHLEN];
-
- MAKE_PATH(path, directory, NULL);
- mkdir(path, S_IRWXU | S_IRWXG);
-}
-
-static void CheckSubDir() {
- // make sure that ~/.pcsx exists
- create_profile_dir(PCSX_DOT_DIR);
-
- create_profile_dir(BIOS_DIR);
- create_profile_dir(MEMCARD_DIR);
- create_profile_dir(STATES_DIR);
- create_profile_dir(PLUGINS_DIR);
- create_profile_dir(PLUGINS_CFG_DIR);
- create_profile_dir(CHEATS_DIR);
- create_profile_dir(PATCHES_DIR);
- create_profile_dir(PCSX_DOT_DIR "cfg");
- create_profile_dir("/screenshots/");
-}
-
static int get_gameid_filename(char *buf, int size, const char *fmt, int i) {
char trimlabel[33];
int j;
static void set_default_paths(void)
{
+#ifndef NO_FRONTEND
+ snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
strcpy(Config.BiosDir, "bios");
+#endif
strcpy(Config.PluginsDir, "plugins");
strcpy(Config.Gpu, "builtin_gpu");
strcpy(Config.Pad1, "builtin_pad");
strcpy(Config.Pad2, "builtin_pad");
strcpy(Config.Net, "Disabled");
-
- snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
}
void emu_set_default_config(void)
// try to set sane config on which most games work
Config.Xa = Config.Cdda = Config.Sio =
Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
- Config.CdrReschedule = 0;
Config.PsxAuto = 1;
pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto
in_type2 = PSE_PAD_TYPE_STANDARD;
}
-static void check_memcards(void)
-{
- char buf[MAXPATHLEN];
- FILE *f;
- int i;
-
- for (i = 1; i <= 9; i++) {
- snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i);
-
- f = fopen(buf, "rb");
- if (f == NULL) {
- printf("Creating memcard: %s\n", buf);
- CreateMcd(buf);
- }
- else
- fclose(f);
- }
-}
-
void do_emu_action(void)
{
int ret;
snprintf(hud_msg, sizeof(hud_msg), "STATE SLOT %d [%s]", state_slot,
emu_check_state(state_slot) == 0 ? "USED" : "FREE");
hud_new_msg = 3;
- printf("* %s\n", hud_msg);
+ SysPrintf("* %s\n", hud_msg);
break;
case SACTION_TOGGLE_FSKIP:
pl_rearmed_cbs.fskip_advice = 0;
g_opts |= OPT_SHOWFPS;
break;
case SACTION_TOGGLE_FULLSCREEN:
- g_fullscreen = !g_fullscreen;
+ plat_target.vout_fullscreen = !plat_target.vout_fullscreen;
if (GPU_open != NULL && GPU_close != NULL) {
GPU_close();
GPU_open(&gpuDisp, "PCSX", NULL);
if (GPU_open != NULL) {
ret = GPU_open(&gpuDisp, "PCSX", NULL);
if (ret)
- fprintf(stderr, "GPU_open returned %d\n", ret);
+ SysMessage("GPU_open returned %d", ret);
}
return;
#endif
hud_new_msg = 3;
}
+static char basic_lcase(char c)
+{
+ if ('A' <= c && c <= 'Z')
+ return c - 'A' + 'a';
+ return c;
+}
+
static int cdidcmp(const char *id1, const char *id2)
{
while (*id1 != 0 && *id2 != 0) {
if (*id1 == '_') { id1++; continue; }
if (*id2 == '_') { id2++; continue; }
- if (*id1 != *id2)
+ if (basic_lcase(*id1) != basic_lcase(*id2))
break;
id1++;
id2++;
if (feof(f))
goto out;
- printf("cwcheat section found for %s\n", CdromId);
+ SysPrintf("cwcheat section found for %s\n", CdromId);
while (fgets(line, sizeof(line), f))
{
p = line + strlen(line);
if (strncmp(line, "_S", 2) == 0)
break;
if (strncmp(line, "_G", 2) == 0) {
- printf(" cwcheat game name: '%s'\n", line + 3);
+ SysPrintf(" cwcheat game name: '%s'\n", line + 3);
continue;
}
if (strncmp(line, "_C0", 3) == 0) {
if (!newcheat && Cheats[NumCheats - 1].n == 0) {
- printf("cheat '%s' failed to parse\n", name);
+ SysPrintf("cheat '%s' failed to parse\n", name);
free(Cheats[NumCheats - 1].Descr);
NumCheats--;
}
continue;
}
if (sscanf(line, "_L %x %x", &a, &v) != 2) {
- printf("line failed to parse: '%s'\n", line);
+ SysPrintf("line failed to parse: '%s'\n", line);
continue;
}
parse_cwcheat();
if (Config.HLE) {
- printf("note: running with HLE BIOS, expect compatibility problems\n");
- printf("----------------------------------------------------------\n");
+ SysPrintf("note: running with HLE BIOS, expect compatibility problems\n");
+ SysPrintf("----------------------------------------------------------\n");
}
if (show_hud_msg) {
int emu_core_init(void)
{
- CheckSubDir();
+ SysPrintf("Starting PCSX-ReARMed " REV "\n");
+
+#ifndef NO_FRONTEND
+ check_profile();
check_memcards();
+#endif
if (EmuInit() == -1) {
- printf("PSX emulator couldn't be initialized.\n");
+ SysPrintf("PSX emulator couldn't be initialized.\n");
return -1;
}
}
#ifndef NO_FRONTEND
+static void create_profile_dir(const char *directory) {
+ char path[MAXPATHLEN];
+
+ MAKE_PATH(path, directory, NULL);
+ mkdir(path, S_IRWXU | S_IRWXG);
+}
+
+static void check_profile(void) {
+ // make sure that ~/.pcsx exists
+ create_profile_dir(PCSX_DOT_DIR);
+
+ create_profile_dir(BIOS_DIR);
+ create_profile_dir(MEMCARD_DIR);
+ create_profile_dir(STATES_DIR);
+ create_profile_dir(PLUGINS_DIR);
+ create_profile_dir(PLUGINS_CFG_DIR);
+ create_profile_dir(CHEATS_DIR);
+ create_profile_dir(PATCHES_DIR);
+ create_profile_dir(PCSX_DOT_DIR "cfg");
+ create_profile_dir("/screenshots/");
+}
+
+static void check_memcards(void)
+{
+ char buf[MAXPATHLEN];
+ FILE *f;
+ int i;
+
+ for (i = 1; i <= 9; i++) {
+ snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i);
+
+ f = fopen(buf, "rb");
+ if (f == NULL) {
+ SysPrintf("Creating memcard: %s\n", buf);
+ CreateMcd(buf);
+ }
+ else
+ fclose(f);
+ }
+}
+
int main(int argc, char *argv[])
{
char file[MAXPATHLEN] = "";
else if (!strcmp(argv[i], "-cfg")) {
if (i+1 >= argc) break;
strncpy(cfgfile_basename, argv[++i], MAXPATHLEN-100); /* TODO buffer overruns */
- printf("Using config file %s.\n", cfgfile_basename);
+ SysPrintf("Using config file %s.\n", cfgfile_basename);
}
else if (!strcmp(argv[i], "-cdfile")) {
char isofilename[MAXPATHLEN];
plat_init();
menu_init(); // loads config
- emu_core_init();
+ if (emu_core_init() != 0)
+ return 1;
if (psxout)
Config.PsxOut = 1;
if (cdfile) {
if (LoadCdrom() == -1) {
ClosePlugins();
- printf(_("Could not load CD-ROM!\n"));
+ SysPrintf(_("Could not load CD-ROM!\n"));
return -1;
}
emu_on_new_cd(!loadst);
if (loadst_f) {
int ret = LoadState(loadst_f);
- printf("%s state file: %s\n", ret ? "failed to load" : "loaded", loadst_f);
+ SysPrintf("%s state file: %s\n",
+ ret ? "failed to load" : "loaded", loadst_f);
ready_to_go |= ret == 0;
}
// If a state has been specified, then load that
if (loadst) {
int ret = emu_load_state(loadst - 1);
- printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst);
+ SysPrintf("%s state %d\n",
+ ret ? "failed to load" : "loaded", loadst);
}
}
else
// so we need to prevent updateLace() call..
void *real_lace = GPU_updateLace;
GPU_updateLace = dummy_lace;
+ g_resetting = 1;
// reset can run code, timing must be set
pl_timing_prepare(Config.PsxType);
CDR_stop();
GPU_updateLace = real_lace;
+ g_resetting = 0;
}
void SysClose() {
#ifndef __ARM_ARCH_7A__ /* XXX */
sync();
#endif
- printf("* %s \"%s\" [%d]\n", ret == 0 ? "saved" : "failed to save", fname, slot);
+ SysPrintf("* %s \"%s\" [%d]\n",
+ ret == 0 ? "saved" : "failed to save", fname, slot);
return ret;
}
return LoadState(fname);
}
+#ifndef ANDROID
+
void SysPrintf(const char *fmt, ...) {
va_list list;
- char msg[512];
va_start(list, fmt);
- vsprintf(msg, fmt, list);
+ vfprintf(emuLog, fmt, list);
va_end(list);
+}
+
+#else
- fprintf(emuLog, "%s", msg);
+#include <android/log.h>
+
+void SysPrintf(const char *fmt, ...) {
+ va_list list;
+
+ va_start(list, fmt);
+ __android_log_vprint(ANDROID_LOG_INFO, "PCSX", fmt, list);
+ va_end(list);
}
+#endif
+
void SysMessage(const char *fmt, ...) {
- va_list list;
- char msg[512];
+ va_list list;
+ char msg[512];
+ int ret;
- va_start(list, fmt);
- vsprintf(msg, fmt, list);
- va_end(list);
+ va_start(list, fmt);
+ ret = vsnprintf(msg, sizeof(msg), fmt, list);
+ va_end(list);
- if (msg[strlen(msg) - 1] == '\n')
- msg[strlen(msg) - 1] = 0;
+ if (ret < sizeof(msg) && msg[ret - 1] == '\n')
+ msg[ret - 1] = 0;
- fprintf(stderr, "%s\n", msg);
+ SysPrintf("%s\n", msg);
}
static void SignalExit(int sig) {
void *ret;
int i;
- printf("plugin: %s\n", lib);
+ SysPrintf("plugin: %s\n", lib);
if (tmp != NULL) {
tmp++;
ret = dlopen(lib, RTLD_NOW);
if (ret == NULL)
- fprintf(stderr, "dlopen: %s\n", dlerror());
+ SysMessage("dlopen: %s", dlerror());
return ret;
}
notaz.gp2x.de / pcsx_rearmed.git / blobdiff