#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, g_resetting;
+int ready_to_go, g_emu_want_quit, g_emu_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)
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) {
- SysPrintf("Creating memcard: %s\n", buf);
- CreateMcd(buf);
- }
- else
- fclose(f);
- }
-}
-
void do_emu_action(void)
{
int ret;
}
case SACTION_VOLUME_UP:
case SACTION_VOLUME_DOWN:
- plat_target_step_volume(emu_action == SACTION_VOLUME_UP);
+ {
+ static int volume;
+ plat_target_step_volume(&volume,
+ emu_action == SACTION_VOLUME_UP ? 1 : -1);
+ }
return;
case SACTION_MINIMIZE:
if (GPU_close != NULL)
// it may be redefined by -cfg on the command line
strcpy(cfgfile_basename, "pcsx.cfg");
+#ifdef IOS
+ emuLog = fopen("/User/Documents/pcsxr.log", "w");
+ if (emuLog == NULL)
+ emuLog = fopen("pcsxr.log", "w");
+ if (emuLog == NULL)
+#endif
emuLog = stdout;
+
SetIsoFile(NULL);
memset(&Config, 0, sizeof(Config));
{
SysPrintf("Starting PCSX-ReARMed " REV "\n");
- CheckSubDir();
+#ifndef NO_FRONTEND
+ check_profile();
check_memcards();
+#endif
if (EmuInit() == -1) {
SysPrintf("PSX emulator couldn't be initialized.\n");
return 0;
}
+void emu_core_ask_exit(void)
+{
+ stop = 1;
+ g_emu_want_quit = 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] = "";
pl_start_watchdog();
- while (1)
+ while (!g_emu_want_quit)
{
stop = 0;
emu_action = SACTION_NONE;
do_emu_action();
}
+ printf("Exit..\n");
+ ClosePlugins();
+ SysClose();
+ menu_finish();
+ plat_finish();
+
return 0;
}
snprintf(hud_msg, sizeof(hud_msg), "FAST FORWARD %s",
fast_forward ? "ON" : "OFF");
}
+
+static void SignalExit(int sig) {
+ // only to restore framebuffer/resolution on some devices
+ plat_finish();
+ exit(1);
+}
#endif
void SysRunGui() {
// so we need to prevent updateLace() call..
void *real_lace = GPU_updateLace;
GPU_updateLace = dummy_lace;
- g_resetting = 1;
+ g_emu_resetting = 1;
// reset can run code, timing must be set
pl_timing_prepare(Config.PsxType);
CDR_stop();
GPU_updateLace = real_lace;
- g_resetting = 0;
+ g_emu_resetting = 0;
}
void SysClose() {
StopDebugger();
- if (emuLog != NULL) fclose(emuLog);
+ if (emuLog != NULL && emuLog != stdout && emuLog != stderr) {
+ fclose(emuLog);
+ emuLog = NULL;
+ }
}
void SysUpdate() {
}
-void OnFile_Exit() {
- printf("OnFile_Exit\n");
- SysClose();
-#ifndef NO_FRONTEND
- menu_finish();
- plat_finish();
- exit(0);
-#endif
-}
-
int get_state_filename(char *buf, int size, int i) {
return get_gameid_filename(buf, size,
"." STATES_DIR "%.32s-%.9s.%3.3d", i);
va_start(list, fmt);
vfprintf(emuLog, fmt, list);
va_end(list);
+ fflush(emuLog);
}
#else
SysPrintf("%s\n", msg);
}
-static void SignalExit(int sig) {
- ClosePlugins();
- OnFile_Exit();
-}
-
#define PARSEPATH(dst, src) \
ptr = src + strlen(src); \
while (*ptr != '\\' && ptr != src) ptr--; \
static int _OpenPlugins(void) {
int ret;
+#ifndef NO_FRONTEND
signal(SIGINT, SignalExit);
signal(SIGPIPE, SignalExit);
+#endif
GPU_clearDynarec(clearDynarec);
void ClosePlugins() {
int ret;
+#ifndef NO_FRONTEND
signal(SIGINT, SIG_DFL);
signal(SIGPIPE, SIG_DFL);
+#endif
+
ret = CDR_close();
if (ret < 0) { SysMessage(_("Error closing CD-ROM plugin!")); return; }
ret = SPU_close();
notaz.gp2x.de / pcsx_rearmed.git / blobdiff