funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-05-01 02:19:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

new USR1 shutdown function

Browse Source
This commit is contained in:
Vincent-FK
2021-01-11 18:50:17 +01:00
parent d07ca9c5e7
commit 473e9515ec
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RetroFE/Source/Menu/MenuMode.h
View File

@@ -54,6 +54,7 @@ typedef enum {ASPECT_RATIOS} ENUM_ASPECT_RATIOS_TYPES;
#define SHELL_CMD_USB_CHECK_IS_SHARING "share is_sharing" #define SHELL_CMD_USB_CHECK_IS_SHARING "share is_sharing"
#define SHELL_CMD_POWERDOWN "shutdown_funkey" #define SHELL_CMD_POWERDOWN "shutdown_funkey"
#define SHELL_CMD_SCHEDULE_POWERDOWN "sched_shutdown" #define SHELL_CMD_SCHEDULE_POWERDOWN "sched_shutdown"
#define SHELL_CMD_CANCEL_SCHED_POWERDOWN "cancel_sched_powerdown"
#define SHELL_CMD_SET_LAUNCHER_GMENU2X "set_launcher gmenu2x" #define SHELL_CMD_SET_LAUNCHER_GMENU2X "set_launcher gmenu2x"
#define SHELL_CMD_SET_LAUNCHER_RETROFE "set_launcher retrofe" #define SHELL_CMD_SET_LAUNCHER_RETROFE "set_launcher retrofe"

40
RetroFE/Source/RetroFE.cpp
View File

@@ -47,6 +47,7 @@
#if defined(__linux) || defined(__APPLE__) #if defined(__linux) || defined(__APPLE__)
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h>
#include <errno.h> #include <errno.h>
#include <cstring> #include <cstring>
#endif #endif
@@ -576,7 +577,8 @@ void RetroFE::run( )
config_.getProperty( "collectionInputClear", collectionInputClear ); config_.getProperty( "collectionInputClear", collectionInputClear );
if ( collectionInputClear ) if ( collectionInputClear )
{ {
// Empty event queue // Empty event queue
SDL_Event e; SDL_Event e;
while ( SDL_PollEvent( &e ) ); while ( SDL_PollEvent( &e ) );
input_.resetStates( ); input_.resetStates( );
@@ -1554,27 +1556,25 @@ void RetroFE::handle_sigusr1(int sig)
/* Quick save and turn off the console */ /* Quick save and turn off the console */
void RetroFE::quick_poweroff() void RetroFE::quick_poweroff()
{ {
{ /* Send command to cancel any previously scheduled powerdown */
/* Vars */ if (popen(SHELL_CMD_CANCEL_SCHED_POWERDOWN, "r") == NULL)
char shell_cmd[200]; {
FILE *fp; /* Countdown is still ticking, so better do nothing
than start writing and get interrupted!
/* Send command to kill any previously scheduled shutdown */ */
sprintf(shell_cmd, "pkill %s", SHELL_CMD_SCHEDULE_POWERDOWN); printf("Failed to cancel scheduled shutdown\n");
fp = popen(shell_cmd, "r");
if (fp == NULL) {
std::stringstream ss; std::stringstream ss;
std::stringstream ss; ss << "Failed to run command " << SHELL_CMD_CANCEL_SCHED_POWERDOWN;
Logger::write( Logger::ZONE_ERROR, "RetroFE", ss.str() ); Logger::write( Logger::ZONE_ERROR, "RetroFE", ss.str() );
exit(0);
} }
/* Perform Instant Play save and shutdown */
/* Clean Poweroff */ execlp(SHELL_CMD_POWERDOWN, SHELL_CMD_POWERDOWN);
sprintf(shell_cmd, "%s", SHELL_CMD_POWERDOWN);
fp = popen(shell_cmd, "r"); /* Should not be reached */
if (fp == NULL) { printf("Failed to perform shutdown\n");
printf("Failed to run command %s\n", shell_cmd);
std::stringstream ss; /* Exit Emulator */
ss << "Failed to run command " << shell_cmd; exit(0);
Logger::write( Logger::ZONE_ERROR, "RetroFE", ss.str() );
} }