quick save at exit and at poweroff, save files in rom folder

Signed-off-by: Vincent-FK <[email protected]>

Author: Vincent-FK

platform/common/emu.c

@@ -58,9 +58,9 @@ int need_screen_cleared = 0;
 static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
 
 /* tmp buff to reduce stack usage for plats with small stack */
-static char static_buff[512];
+static char static_buff[1024];
 const char *rom_fname_reload;
-char rom_fname_loaded[512];
+char rom_fname_loaded[1024];
 int reset_timing = 0;
 static unsigned int notice_msg_time;	/* when started showing */
 static char noticeMsg[40];
@@ -113,9 +113,13 @@ static void fname_ext(char *dst, int dstlen, const char *prefix, const char *ext
 
 	*dst = 0;
 	if (prefix) {
-		int len = plat_get_root_dir(dst, dstlen);
+		/*int len = plat_get_root_dir(dst, dstlen);
 		strcpy(dst + len, prefix);
-		prefix_len = len + strlen(prefix);
+		prefix_len = len + strlen(prefix);*/
+
+		/* Saves are in ROM folder */
+		prefix_len = strlen(mRomPath)+1;
+		sprintf(dst, "%s/", mRomPath);
 	}
 
 	p = fname + strlen(fname) - 1;
@@ -879,6 +883,22 @@ int emu_check_save_file(int slot, int *time)
 	return emu_get_save_fname(1, 0, slot, time) ? 1 : 0;
 }
 
+int emu_save_load_game_from_file(int load, char *saveFname){
+	int ret = PicoState(saveFname, !load);
+	if (!ret) {
+#ifdef __GP2X__
+		if (!load) sync();
+#endif
+		//emu_status_msg(load ? "STATE LOADED" : "STATE SAVED");
+	} else {
+		//emu_status_msg(load ? "LOAD FAILED" : "SAVE FAILED");
+		ret = -1;
+	}
+
+	return ret;
+}
+
+
 int emu_save_load_game(int load, int sram)
 {
 	int ret = 0;
@@ -1387,6 +1407,47 @@ void emu_cmn_forced_frame(int no_scale, int do_emu)
 	PicoIn.opt = po_old;
 }
 
+
+
+
+/* Quick save and turn off the console */
+void quick_save_and_poweroff()
+{
+    /* Vars */
+    char shell_cmd[1024];
+    FILE *fp;
+
+    /* Send command to kill any previously scheduled shutdown */
+    sprintf(shell_cmd, "pkill %s", SHELL_CMD_SCHEDULE_POWERDOWN);
+    fp = popen(shell_cmd, "r");
+    if (fp == NULL) {
+      printf("Failed to run command %s\n", shell_cmd);
+    }
+
+    /* Save  */
+    emu_save_load_game_from_file(0, quick_save_file);
+
+    /* Write quick load file */
+    sprintf(shell_cmd, "%s SDL_NOMOUSE=1 \"%s\" -loadStateFile \"%s\" \"%s\"",
+      SHELL_CMD_WRITE_QUICK_LOAD_CMD, prog_name, quick_save_file, mRomName);
+    printf("Cmd write quick load file:\n  %s\n", shell_cmd);
+    fp = popen(shell_cmd, "r");
+    if (fp == NULL) {
+      printf("Failed to run command %s\n", shell_cmd);
+    }
+
+    /* Clean Poweroff */
+    sprintf(shell_cmd, "%s", SHELL_CMD_POWERDOWN);
+    fp = popen(shell_cmd, "r");
+    if (fp == NULL) {
+      printf("Failed to run command %s\n", shell_cmd);
+    }
+
+    /* Exit Emulator */
+    engineState = PGS_Quit;
+}
+
+
 void emu_init(void)
 {
 	char path[512];
@@ -1643,6 +1704,12 @@ void emu_loop(void)
 			diff = timestamp_aim_x3 - timestamp_x3;
 		}
 
+        /* Quick save and poweroff */
+        if(mQuickSaveAndPoweroff){
+		quick_save_and_poweroff();
+		mQuickSaveAndPoweroff = 0;
+        }
+
 		emu_update_input();
 		if (skip) {
 			int do_audio = diff > -target_frametime_x3 * 2;

platform/common/emu.h

@@ -87,14 +87,20 @@ extern int reset_timing;
 extern int flip_after_sync;
 extern int show_fps_bypass;
 extern int need_screen_cleared;
+extern int mQuickSaveAndPoweroff;
+
+extern char *prog_name;
+extern char *mRomName;
+extern char *mRomPath;
+extern char *quick_save_file;
 
 #define PICO_PEN_ADJUST_X 4
 #define PICO_PEN_ADJUST_Y 2
 extern int pico_pen_x, pico_pen_y;
 extern int pico_inp_mode;
 
 extern const char *rom_fname_reload;		// ROM to try loading on next PGS_ReloadRom
-extern char rom_fname_loaded[512];		// currently loaded ROM filename
+extern char rom_fname_loaded[1024];		// currently loaded ROM filename
 
 // engine states
 extern int engineState;
@@ -118,6 +124,7 @@ void  emu_loop(void);
 int   emu_reload_rom(const char *rom_fname_in);
 int   emu_swap_cd(const char *fname);
 int   emu_save_load_game(int load, int sram);
+int   emu_save_load_game_from_file(int load, char *saveFname);
 void  emu_reset_game(void);
 
 void  emu_prep_defconfig(void);

platform/common/main.c

@@ -8,8 +8,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <string.h>
 #include <strings.h>
+#include <signal.h>
 
 #include "../libpicofe/input.h"
 #include "../libpicofe/plat.h"
@@ -19,8 +21,39 @@
 #include <cpu/debug.h>
 
 
-static int load_state_slot = -1;
 char **g_argv;
+char *prog_name;
+static char *load_state_file = NULL;
+static int load_state_slot = -1;
+static char *quick_save_file_extension = "quicksave";
+char *mRomName = NULL;
+char *mRomPath = NULL;
+char *quick_save_file = NULL;
+int mQuickSaveAndPoweroff=0;
+
+
+void usage(){
+	printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006-2009,2013\n");
+	printf("usage: PicoDriveBin [options] [romfile]\n");
+	printf("options:\n"
+		" -config <file>    use specified config file instead of default 'config.cfg'\n"
+		" -fps				use to show fps\n"
+		" -loadStateSlot <num>  if ROM is specified, try loading savestate slot <num>\n"
+		" -loadStateFile <filePath>  if ROM is specified, try loading savestate file <filePath>\n");
+  exit(1);
+}
+
+/* Handler for SIGUSR1, caused by closing the console */
+void handle_sigusr1(int sig)
+{
+    //printf("Caught signal USR1 %d\n", sig);
+
+    /* Exit menu if it was launched */
+    stop_menu_loop = 1;
+
+    /* Signal to quick save and poweoff after next loop */
+    mQuickSaveAndPoweroff = 1;
+}
 
 void parse_cmd_line(int argc, char *argv[])
 {
@@ -33,11 +66,15 @@ void parse_cmd_line(int argc, char *argv[])
 			if (strcasecmp(argv[x], "-config") == 0) {
 				if (x+1 < argc) { ++x; PicoConfigFile = argv[x]; }
 			}
-			else if (strcasecmp(argv[x], "-loadstate") == 0
+			else if (strcasecmp(argv[x], "-loadStateSlot") == 0
 				 || strcasecmp(argv[x], "-load") == 0)
 			{
 				if (x+1 < argc) { ++x; load_state_slot = atoi(argv[x]); }
 			}
+			else if (strcasecmp(argv[x], "-loadStateFile") == 0)
+			{
+				if (x+1 < argc) { ++x; load_state_file = argv[x]; }
+			}
 			else if (strcasecmp(argv[x], "-fps") == 0) {
 				currentConfig.EmuOpt |= EOPT_SHOW_FPS;
 				show_fps_bypass = 1;
@@ -52,27 +89,44 @@ void parse_cmd_line(int argc, char *argv[])
 				unrecognized = 1;
 				break;
 			}
-		} else {
+		}
+		/* Check if file exists, Save ROM name, and ROM path */
+		else {
+			mRomName = argv[x];
 			FILE *f = fopen(argv[x], "rb");
 			if (f) {
+				/* Save Rom path */
+		        mRomPath = (char *)malloc(strlen(mRomName)+1);
+		        strcpy(mRomPath, mRomName);
+		        char *slash = strrchr ((char*)mRomPath, '/');
+		        *slash = 0;
+
+		        /* Rom name without extension */
+		        char *point = strrchr ((char*)slash+1, '.');
+		        *point = 0;
+
+		        /* Set quicksave filename */
+		        quick_save_file = (char *)malloc(strlen(mRomPath) + strlen(slash+1) +
+		          strlen(quick_save_file_extension) + 2 + 1);
+		        sprintf(quick_save_file, "%s/%s.%s",
+		          mRomPath, slash+1, quick_save_file_extension);
+		        printf("Quick_save_file: %s\n", quick_save_file);
+
+		        /* Close file*/
 				fclose(f);
 				rom_fname_reload = argv[x];
 				engineState = PGS_ReloadRom;
 			}
-			else
+			else{
+				printf("Rom %s not found \n", mRomName);
 				unrecognized = 1;
+			}
 			break;
 		}
 	}
 
 	if (unrecognized) {
-		printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006-2009,2013\n");
-		printf("usage: %s [options] [romfile]\n", argv[0]);
-		printf("options:\n"
-			" -config <file>    use specified config file instead of default 'config.cfg'\n"
-			" -fps				use to show fps\n"
-			" -loadstate <num>  if ROM is specified, try loading savestate slot <num>\n");
-		exit(1);
+		usage();
 	}
 }
 
@@ -81,6 +135,23 @@ int main(int argc, char *argv[])
 {
 	g_argv = argv;
 
+	/* Save program name */
+	prog_name = argv[0];
+
+	/* Engine initial state */
+	engineState = PGS_Menu;
+
+	/* Parse arguments */
+	if (argc > 1){
+		parse_cmd_line(argc, argv);
+	}
+	else{
+    		usage();
+	}
+
+	/* Init Signals */
+	signal(SIGUSR1, handle_sigusr1);
+
 	plat_early_init();
 
 	in_init();
@@ -95,19 +166,47 @@ int main(int argc, char *argv[])
 	emu_init();
 	menu_init();
 
-	engineState = PGS_Menu;
-
-	if (argc > 1)
-		parse_cmd_line(argc, argv);
-
 	if (engineState == PGS_ReloadRom)
 	{
 		if (emu_reload_rom(rom_fname_reload)) {
 			engineState = PGS_Running;
-			if (load_state_slot >= 0) {
-				state_slot = load_state_slot;
-				emu_save_load_game(1, 0);
-			}
+
+		    /* Load slot */
+		    if(load_state_slot != -1){
+		      printf("LOADING FROM SLOT %d...\n", load_state_slot+1);
+		      char fname[1024];
+		      emu_save_load_game(1, 0);
+		      printf("LOADED FROM SLOT %d\n", load_state_slot+1);
+		      load_state_slot = -1;
+		    }
+		    /* Load file */
+		    else if(load_state_file != NULL){
+		      printf("LOADING FROM FILE %s...\n", load_state_file);
+		      emu_save_load_game_from_file(1, load_state_file);
+		      printf("LOADED FROM SLOT %s\n", load_state_file);
+		      load_state_file = NULL;
+		    }
+		    /* Load quick save file */
+		    else if(access( quick_save_file, F_OK ) != -1){
+		      printf("Found quick save file: %s\n", quick_save_file);
+
+		      int resume = launch_resume_menu_loop();
+		      if(resume == RESUME_YES){
+		        printf("Resume game from quick save file: %s\n", quick_save_file);
+		        emu_save_load_game_from_file(1, quick_save_file);
+		      }
+		      else{
+		        printf("Reset game\n");
+		      }
+		    }
+
+		    /* Remove quicksave file if present */
+		    if (remove(quick_save_file) == 0){
+		          printf("Deleted successfully: %s\n", quick_save_file);
+		    }
+		    else{
+		        printf("Unable to delete the file: %s\n", quick_save_file);
+		    }
 		}
 	}