X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=0a9bed65db772670f1431e277678f74fbd1af779;hp=550242a9c08108bae6b5ab3469b22330ca718191;hb=76d1d09c1224af8d663ce63dc5b32425bd62cb29;hpb=e0c692d9417fdea51a1deebda1048d1a91f1270f diff --git a/frontend/main.c b/frontend/main.c index 550242a9..0a9bed65 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "main.h" #include "plugin.h" @@ -20,14 +21,24 @@ #include "pcnt.h" #include "menu.h" #include "../libpcsxcore/misc.h" +#include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "../plugins/cdrcimg/cdrcimg.h" #include "common/plat.h" #include "common/input.h" +#include "common/readpng.h" + +// don't include debug.h - it breaks ARM build (R1 redefined) +void StartDebugger(); +void StopDebugger(); int ready_to_go; unsigned long gpuDisp; char cfgfile_basename[MAXPATHLEN]; static char *(*real_getenv)(const char *name); +int state_slot; +enum sched_action emu_action, emu_action_old; +char hud_msg[64]; +int hud_new_msg; static void make_path(char *buf, size_t size, const char *dir, const char *fname) { @@ -58,6 +69,24 @@ static void CheckSubDir() { 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; + + strncpy(trimlabel, CdromLabel, 32); + trimlabel[32] = 0; + for (j = 31; j >= 0; j--) + if (trimlabel[j] == ' ') + trimlabel[j] = 0; + else + continue; + + snprintf(buf, size, fmt, trimlabel, CdromId, i); + + return 0; } void set_cd_image(const char *fname) @@ -69,7 +98,7 @@ void set_cd_image(const char *fname) if (ext && ( strcasecmp(ext, ".z") == 0 || strcasecmp(ext, ".bz") == 0 || - strcasecmp(ext, ".znx") == 0 || strcasecmp(ext, ".pbp") == 0)) { + strcasecmp(ext, ".znx") == 0 /*|| strcasecmp(ext, ".pbp") == 0*/)) { SetIsoFile(NULL); cdrcimg_set_fname(fname); strcpy(Config.Cdr, "builtin_cdrcimg"); @@ -92,11 +121,104 @@ static void set_default_paths(void) strcpy(Config.Pad1, "builtin_pad"); strcpy(Config.Pad2, "builtin_pad"); strcpy(Config.Net, "Disabled"); +#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX */ + strcpy(Config.Gpu, "gpuPCSX4ALL.so"); +#endif Config.PsxAuto = 1; snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR); } +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) +{ + char buf[MAXPATHLEN]; + int ret; + + emu_action_old = emu_action; + + switch (emu_action) { + case SACTION_ENTER_MENU: + menu_loop(); + return; + case SACTION_LOAD_STATE: + ret = emu_load_state(state_slot); + snprintf(hud_msg, sizeof(hud_msg), ret == 0 ? "LOADED" : "FAIL!"); + break; + case SACTION_SAVE_STATE: + ret = emu_save_state(state_slot); + snprintf(hud_msg, sizeof(hud_msg), ret == 0 ? "SAVED" : "FAIL!"); + break; + case SACTION_NEXT_SSLOT: + state_slot++; + if (state_slot > 9) + state_slot = 0; + goto do_state_slot; + case SACTION_PREV_SSLOT: + state_slot--; + if (state_slot < 0) + state_slot = 9; + goto do_state_slot; + case SACTION_TOGGLE_FSKIP: + pl_rearmed_cbs.fskip_advice = 0; + pl_rearmed_cbs.frameskip++; + if (pl_rearmed_cbs.frameskip > 1) + pl_rearmed_cbs.frameskip = -1; + snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP: %s", + pl_rearmed_cbs.frameskip == -1 ? "AUTO" : + pl_rearmed_cbs.frameskip == 0 ? "OFF" : "1" ); + plugin_call_rearmed_cbs(); + break; + case SACTION_SCREENSHOT: + { + void *scrbuf; + int w, h, bpp; + time_t t = time(NULL); + struct tm *tb = localtime(&t); + int ti = tb->tm_yday * 1000000 + tb->tm_hour * 10000 + + tb->tm_min * 100 + tb->tm_sec; + + scrbuf = pl_prepare_screenshot(&w, &h, &bpp); + get_gameid_filename(buf, sizeof(buf), + "screenshots/%.32s-%.9s.%d.png", ti); + ret = -1; + if (scrbuf != 0 && bpp == 16) + ret = writepng(buf, scrbuf, w, h); + if (ret == 0) + snprintf(hud_msg, sizeof(hud_msg), "SCREENSHOT TAKEN"); + break; + } + default: + return; + } + hud_new_msg = 3; + return; + +do_state_slot: + 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); +} + int main(int argc, char *argv[]) { void *tmp; @@ -123,6 +245,7 @@ int main(int argc, char *argv[]) CheckSubDir(); set_default_paths(); + check_memcards(); strcpy(Config.Bios, "HLE"); #ifdef MAEMO @@ -132,12 +255,14 @@ int main(int argc, char *argv[]) char file[MAXPATHLEN] = ""; char path[MAXPATHLEN]; const char *cdfile = NULL; + const char *loadst_f = NULL; + int psxout = 0; int loadst = 0; int i; // read command line options for (i = 1; i < argc; i++) { - if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1; + if (!strcmp(argv[i], "-psxout")) psxout = 1; else if (!strcmp(argv[i], "-load")) loadst = atol(argv[++i]); else if (!strcmp(argv[i], "-cfg")) { if (i+1 >= argc) break; @@ -161,6 +286,10 @@ int main(int argc, char *argv[]) cdfile = isofilename; } + else if (!strcmp(argv[i], "-loadf")) { + if (i+1 >= argc) break; + loadst_f = argv[++i]; + } else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "-help") || !strcmp(argv[i], "--help")) { @@ -198,9 +327,13 @@ int main(int argc, char *argv[]) // frontend stuff in_init(); - in_probe(); + //in_probe(); plat_init(); - menu_init(); + menu_init(); // loads config + pl_init(); + + if (psxout) + Config.PsxOut = 1; if (LoadPlugins() == -1) { // FIXME: this recovery doesn't work, just delete bad config and bail out @@ -235,17 +368,19 @@ int main(int argc, char *argv[]) } } - // If a state has been specified, then load that - if (loadst) { - char state_filename[MAXPATHLEN]; - int ret = get_state_filename(state_filename, sizeof(state_filename), loadst - 1); - if (ret == 0) - ret = LoadState(state_filename); - printf("%s state %s\n", ret ? "failed to load" : "loaded", state_filename); - } - - if (ready_to_go) + if (ready_to_go) { menu_prepare_emu(); + + // 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); + } + if (loadst_f) { + int ret = LoadState(loadst_f); + printf("%s state file: %s\n", ret ? "failed to load" : "loaded", loadst_f); + } + } else menu_loop(); @@ -253,8 +388,12 @@ int main(int argc, char *argv[]) while (1) { + stop = 0; + emu_action = SACTION_NONE; + psxCpu->Execute(); - menu_loop(); + if (emu_action != SACTION_NONE) + do_emu_action(); } return 0; @@ -267,7 +406,7 @@ int SysInit() { return -1; } - LoadMcds(Config.Mcd1, Config.Mcd2); /* TODO Do we need to have this here, or in the calling main() function?? */ + LoadMcds(Config.Mcd1, Config.Mcd2); if (Config.Debug) { StartDebugger(); @@ -320,27 +459,52 @@ void OnFile_Exit() { #ifndef MAEMO menu_finish(); #endif - plat_finish(); SysClose(); + plat_finish(); exit(0); } int get_state_filename(char *buf, int size, int i) { - char trimlabel[33]; - int j; + return get_gameid_filename(buf, size, + "." STATES_DIR "%.32s-%.9s.%3.3d", i); +} - strncpy(trimlabel, CdromLabel, 32); - trimlabel[32] = 0; - for (j = 31; j >= 0; j--) - if (trimlabel[j] == ' ') - trimlabel[j] = 0; - else - continue; +int emu_check_state(int slot) +{ + char fname[MAXPATHLEN]; + int ret; - snprintf(buf, size, "." STATES_DIR "%.32s-%.9s.%3.3d", - trimlabel, CdromId, i); + ret = get_state_filename(fname, sizeof(fname), slot); + if (ret != 0) + return ret; - return 0; + return CheckState(fname); +} + +int emu_save_state(int slot) +{ + char fname[MAXPATHLEN]; + int ret; + + ret = get_state_filename(fname, sizeof(fname), slot); + if (ret != 0) + return ret; + + ret = SaveState(fname); + printf("* %s \"%s\" [%d]\n", ret == 0 ? "saved" : "failed to save", fname, slot); + return ret; +} + +int emu_load_state(int slot) +{ + char fname[MAXPATHLEN]; + int ret; + + ret = get_state_filename(fname, sizeof(fname), slot); + if (ret != 0) + return ret; + + return LoadState(fname); } void SysPrintf(const char *fmt, ...) {