mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-22 16:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11889 from fjtrujy/FixQuitRA

Browse Source 
[PS2] Fix Quitting from RA
This commit is contained in:
Autechre 2021-01-15 21:22:44 +01:00 committed by GitHub
commit 39e7533ca9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.ps2
View File

@ -37,7 +37,7 @@ RARCH_DEFINES += -DHAVE_VIDEO_FILTER
LDFLAGS += -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ports/lib -L. LDFLAGS += -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ports/lib -L.
# Lib cdvd is needed to get proper time # Lib cdvd is needed to get proper time
LIBS += -lretro_ps2 -lpatches -lpoweroff -lgskit -ldmakit -laudsrv -lpadx -lmtap -lz -lcdvd -lelf-loader LIBS += -lretro_ps2 -lpatches -lgskit -ldmakit -laudsrv -lpadx -lmtap -lz -lcdvd -lelf-loader
ifeq ($(BUILD_FOR_PCSX2), 1) ifeq ($(BUILD_FOR_PCSX2), 1)
RARCH_DEFINES += -DBUILD_FOR_PCSX2 RARCH_DEFINES += -DBUILD_FOR_PCSX2

4
Makefile.ps2.salamander
View File

@ -31,7 +31,7 @@ RARCH_DEFINES += -DPS2 -DIS_SALAMANDER -DRARCH_CONSOLE
LIBDIR = LIBDIR =
LDFLAGS = LDFLAGS =
LIBS = -lelf-loader -lpatches -lpoweroff LIBS = -lelf-loader -lpatches
ifeq ($(BUILD_FOR_PCSX2), 1) ifeq ($(BUILD_FOR_PCSX2), 1)
RARCH_DEFINES += -DBUILD_FOR_PCSX2 RARCH_DEFINES += -DBUILD_FOR_PCSX2
@ -67,7 +67,7 @@ EE_OBJS = frontend/frontend_salamander.o \
# Needed IRX objects # Needed IRX objects
EE_OBJS += $(IRX_DIR)/sio2man_irx.o $ $(IRX_DIR)/iomanX_irx.o $(IRX_DIR)/fileXio_irx.o EE_OBJS += $(IRX_DIR)/sio2man_irx.o $ $(IRX_DIR)/iomanX_irx.o $(IRX_DIR)/fileXio_irx.o
EE_OBJS += $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o $(IRX_DIR)/usbd_irx.o $(IRX_DIR)/usbhdfsd_irx.o EE_OBJS += $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o $(IRX_DIR)/usbd_irx.o $(IRX_DIR)/usbhdfsd_irx.o
EE_OBJS += $(IRX_DIR)/poweroff_irx.o $(IRX_DIR)/cdfs_irx.o EE_OBJS += $(IRX_DIR)/cdfs_irx.o
EE_CFLAGS = $(CFLAGS) EE_CFLAGS = $(CFLAGS)
EE_CXXFLAGS = $(CFLAGS) EE_CXXFLAGS = $(CFLAGS)

12
frontend/drivers/platform_ps2.c
View File

@ -21,10 +21,10 @@
#include <sbv_patches.h> #include <sbv_patches.h>
#include <sifrpc.h> #include <sifrpc.h>
#include <iopcontrol.h> #include <iopcontrol.h>
#include <libpwroff.h>
#include <ps2_devices.h> #include <ps2_devices.h>
#include <ps2_irx_variables.h> #include <ps2_irx_variables.h>
#include <loadfile.h> #include <loadfile.h>
#include <elf-loader.h>
#include <file/file_path.h> #include <file/file_path.h>
#include <string/stdstring.h> #include <string/stdstring.h>
@ -34,7 +34,6 @@
#include "../../file_path_special.h" #include "../../file_path_special.h"
#include "../../verbosity.h" #include "../../verbosity.h"
#include "../../paths.h" #include "../../paths.h"
#include <elf-loader.h>
static enum frontend_fork ps2_fork_mode = FRONTEND_FORK_NONE; static enum frontend_fork ps2_fork_mode = FRONTEND_FORK_NONE;
@ -88,12 +87,6 @@ static void create_path_names(void)
FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config)); FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
} }
static void poweroffCallback(void *arg)
{
printf("Shutdown!");
poweroffShutdown();
}
static void reset_IOP() static void reset_IOP()
{ {
SifInitRpc(0); SifInitRpc(0);
@ -288,9 +281,6 @@ static void frontend_ps2_exitspawn(char *s, size_t len, char *args)
static void frontend_ps2_shutdown(bool unused) static void frontend_ps2_shutdown(bool unused)
{ {
poweroffInit();
/* Set callback function */
poweroffSetCallback(&poweroffCallback, NULL);
} }
static int frontend_ps2_get_rating(void) static int frontend_ps2_get_rating(void)

3
ps2/include/ps2_irx_variables.h
View File

@ -30,9 +30,6 @@ extern unsigned int size_freemtap_irx;
extern unsigned char padman_irx; extern unsigned char padman_irx;
extern unsigned int size_padman_irx; extern unsigned int size_padman_irx;
extern unsigned char poweroff_irx;
extern unsigned int size_poweroff_irx;
extern unsigned char iomanX_irx; extern unsigned char iomanX_irx;
extern unsigned int size_iomanX_irx; extern unsigned int size_iomanX_irx;

2
ps2/irx/Makefile
View File

@ -5,7 +5,7 @@ IRX_DIR = $(PS2SDK)/iop/irx
#IRX modules #IRX modules
# IRX modules - modules have to be in IRX_DIR # IRX modules - modules have to be in IRX_DIR
IRX_FILES += iomanX.irx fileXio.irx sio2man.irx padman.irx mcman.irx mcserv.irx usbd.irx usbhdfsd.irx IRX_FILES += iomanX.irx fileXio.irx sio2man.irx padman.irx mcman.irx mcserv.irx usbd.irx usbhdfsd.irx
IRX_FILES += libsd.irx audsrv.irx poweroff.irx cdfs.irx IRX_FILES += libsd.irx audsrv.irx cdfs.irx
IRX_C_FILES = $(IRX_FILES:.irx=_irx.c) IRX_C_FILES = $(IRX_FILES:.irx=_irx.c)
all: irxs all: irxs