From c1381356845dbd5665bf818f4818f33f8a0f5fab Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Fri, 15 Jan 2021 21:03:54 +0100 Subject: [PATCH] Removed not used poweroff library --- Makefile.ps2 | 2 +- Makefile.ps2.salamander | 4 ++-- frontend/drivers/platform_ps2.c | 12 +----------- ps2/include/ps2_irx_variables.h | 3 --- ps2/irx/Makefile | 2 +- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/Makefile.ps2 b/Makefile.ps2 index 787dd962f5..9de8f95123 100644 --- a/Makefile.ps2 +++ b/Makefile.ps2 @@ -37,7 +37,7 @@ RARCH_DEFINES += -DHAVE_VIDEO_FILTER LDFLAGS += -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ports/lib -L. # 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) RARCH_DEFINES += -DBUILD_FOR_PCSX2 diff --git a/Makefile.ps2.salamander b/Makefile.ps2.salamander index fc0591a1c9..b4c540946a 100644 --- a/Makefile.ps2.salamander +++ b/Makefile.ps2.salamander @@ -31,7 +31,7 @@ RARCH_DEFINES += -DPS2 -DIS_SALAMANDER -DRARCH_CONSOLE LIBDIR = LDFLAGS = -LIBS = -lelf-loader -lpatches -lpoweroff +LIBS = -lelf-loader -lpatches ifeq ($(BUILD_FOR_PCSX2), 1) RARCH_DEFINES += -DBUILD_FOR_PCSX2 @@ -67,7 +67,7 @@ EE_OBJS = frontend/frontend_salamander.o \ # Needed IRX objects 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)/poweroff_irx.o $(IRX_DIR)/cdfs_irx.o +EE_OBJS += $(IRX_DIR)/cdfs_irx.o EE_CFLAGS = $(CFLAGS) EE_CXXFLAGS = $(CFLAGS) diff --git a/frontend/drivers/platform_ps2.c b/frontend/drivers/platform_ps2.c index 44798c115b..73a7466856 100644 --- a/frontend/drivers/platform_ps2.c +++ b/frontend/drivers/platform_ps2.c @@ -21,10 +21,10 @@ #include #include #include -#include #include #include #include +#include #include #include @@ -34,7 +34,6 @@ #include "../../file_path_special.h" #include "../../verbosity.h" #include "../../paths.h" -#include 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)); } -static void poweroffCallback(void *arg) -{ - printf("Shutdown!"); - poweroffShutdown(); -} - static void reset_IOP() { 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) { - poweroffInit(); - /* Set callback function */ - poweroffSetCallback(&poweroffCallback, NULL); } static int frontend_ps2_get_rating(void) diff --git a/ps2/include/ps2_irx_variables.h b/ps2/include/ps2_irx_variables.h index 16dfa66779..ea32be1e9b 100644 --- a/ps2/include/ps2_irx_variables.h +++ b/ps2/include/ps2_irx_variables.h @@ -30,9 +30,6 @@ extern unsigned int size_freemtap_irx; extern unsigned char 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 int size_iomanX_irx; diff --git a/ps2/irx/Makefile b/ps2/irx/Makefile index cadb2ce4cf..8fac6db1b1 100644 --- a/ps2/irx/Makefile +++ b/ps2/irx/Makefile @@ -5,7 +5,7 @@ IRX_DIR = $(PS2SDK)/iop/irx #IRX modules # 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 += libsd.irx audsrv.irx poweroff.irx cdfs.irx +IRX_FILES += libsd.irx audsrv.irx cdfs.irx IRX_C_FILES = $(IRX_FILES:.irx=_irx.c) all: irxs