ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove some IRX modules not used, and use original name instead of symbolic links

This commit is contained in:
Francisco Javier Trujillo Mata 2020-12-10 15:44:30 +01:00
parent cb087656dd
commit 330f5d6b4a
4 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.ps2
View File

@ -54,10 +54,10 @@ endif
CFLAGS += $(RARCH_DEFINES) CFLAGS += $(RARCH_DEFINES)
# All the IRX objects # All the IRX objects
EE_OBJS += $(IRX_DIR)/freemtap_irx.o $(IRX_DIR)/freepad_irx.o $(IRX_DIR)/freesio2_irx.o $(IRX_DIR)/iomanX_irx.o EE_OBJS += $(IRX_DIR)/sio2man_irx.o $ $(IRX_DIR)/iomanX_irx.o $(IRX_DIR)/fileXio_irx.o
EE_OBJS += $(IRX_DIR)/fileXio_irx.o $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o $(IRX_DIR)/usbd_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)/usbhdfsd_irx.o $(IRX_DIR)/freesd_irx.o $(IRX_DIR)/audsrv_irx.o $(IRX_DIR)/poweroff_irx.o EE_OBJS += $(IRX_DIR)/libsd_irx.o $(IRX_DIR)/audsrv_irx.o $(IRX_DIR)/poweroff_irx.o
EE_OBJS += $(IRX_DIR)/cdfs_irx.o EE_OBJS += $(IRX_DIR)/cdfs_irx.o $(IRX_DIR)/padman_irx.o
# Missing objecst on the PS2SDK # Missing objecst on the PS2SDK
EE_OBJS += ps2/compat_files/ps2_devices.o EE_OBJS += ps2/compat_files/ps2_devices.o

20
frontend/drivers/platform_ps2.c
View File

@ -154,7 +154,7 @@ static void frontend_ps2_init(void *data)
/* I/O Files */ /* I/O Files */
SifExecModuleBuffer(&iomanX_irx, size_iomanX_irx, 0, NULL, NULL); SifExecModuleBuffer(&iomanX_irx, size_iomanX_irx, 0, NULL, NULL);
SifExecModuleBuffer(&fileXio_irx, size_fileXio_irx, 0, NULL, NULL); SifExecModuleBuffer(&fileXio_irx, size_fileXio_irx, 0, NULL, NULL);
SifExecModuleBuffer(&freesio2_irx, size_freesio2_irx, 0, NULL, NULL); SifExecModuleBuffer(&sio2man_irx, size_sio2man_irx, 0, NULL, NULL);
/* Memory Card */ /* Memory Card */
SifExecModuleBuffer(&mcman_irx, size_mcman_irx, 0, NULL, NULL); SifExecModuleBuffer(&mcman_irx, size_mcman_irx, 0, NULL, NULL);
@ -165,15 +165,14 @@ static void frontend_ps2_init(void *data)
SifExecModuleBuffer(&usbhdfsd_irx, size_usbhdfsd_irx, 0, NULL, NULL); SifExecModuleBuffer(&usbhdfsd_irx, size_usbhdfsd_irx, 0, NULL, NULL);
/* CDFS */ /* CDFS */
SifExecModuleBuffer(&cdfs_irx, size_cdfs_irx, 0, NULL, NULL); // SifExecModuleBuffer(&cdfs_irx, size_cdfs_irx, 0, NULL, NULL);
#ifndef IS_SALAMANDER #ifndef IS_SALAMANDER
/* Controllers */ /* Controllers */
SifExecModuleBuffer(&freemtap_irx, size_freemtap_irx, 0, NULL, NULL); SifExecModuleBuffer(&padman_irx, size_padman_irx, 0, NULL, NULL);
SifExecModuleBuffer(&freepad_irx, size_freepad_irx, 0, NULL, NULL);
/* Audio */ /* Audio */
SifExecModuleBuffer(&freesd_irx, size_freesd_irx, 0, NULL, NULL); SifExecModuleBuffer(&libsd_irx, size_libsd_irx, 0, NULL, NULL);
SifExecModuleBuffer(&audsrv_irx, size_audsrv_irx, 0, NULL, NULL); SifExecModuleBuffer(&audsrv_irx, size_audsrv_irx, 0, NULL, NULL);
/* Initializes audsrv library */ /* Initializes audsrv library */
@ -182,20 +181,11 @@ static void frontend_ps2_init(void *data)
RARCH_ERR("audsrv library not initalizated\n"); RARCH_ERR("audsrv library not initalizated\n");
} }
/* Initializes pad libraries /* Initializes pad library */
Must be init with 0 as parameter*/
if (mtapInit() != 1)
{
RARCH_ERR("mtapInit library not initalizated\n");
}
if (padInit(0) != 1) if (padInit(0) != 1)
{ {
RARCH_ERR("padInit library not initalizated\n"); RARCH_ERR("padInit library not initalizated\n");
} }
if (mtapPortOpen(0) != 1)
{
RARCH_ERR("mtapPortOpen library not initalizated\n");
}
#endif #endif
#if defined(BUILD_FOR_PCSX2) #if defined(BUILD_FOR_PCSX2)

14
ps2/include/ps2_irx_variables.h
View File

@ -15,8 +15,8 @@
#ifndef PS2_IRX_VARIABLES_H #ifndef PS2_IRX_VARIABLES_H
#define PS2_IRX_VARIABLES_H #define PS2_IRX_VARIABLES_H
extern unsigned char freesio2_irx; extern unsigned char sio2man_irx;
extern unsigned int size_freesio2_irx; extern unsigned int size_sio2man_irx;
extern unsigned char mcman_irx; extern unsigned char mcman_irx;
extern unsigned int size_mcman_irx; extern unsigned int size_mcman_irx;
@ -27,8 +27,8 @@ extern unsigned int size_mcserv_irx;
extern unsigned char freemtap_irx; extern unsigned char freemtap_irx;
extern unsigned int size_freemtap_irx; extern unsigned int size_freemtap_irx;
extern unsigned char freepad_irx; extern unsigned char padman_irx;
extern unsigned int size_freepad_irx; extern unsigned int size_padman_irx;
extern unsigned char poweroff_irx; extern unsigned char poweroff_irx;
extern unsigned int size_poweroff_irx; extern unsigned int size_poweroff_irx;
@ -60,10 +60,10 @@ extern unsigned int size_usbhdfsd_irx;
extern unsigned char cdfs_irx; extern unsigned char cdfs_irx;
extern unsigned int size_cdfs_irx; extern unsigned int size_cdfs_irx;
extern unsigned char libsd_irx;
extern unsigned int size_libsd_irx;
extern unsigned char audsrv_irx; extern unsigned char audsrv_irx;
extern unsigned int size_audsrv_irx; extern unsigned int size_audsrv_irx;
extern unsigned char freesd_irx;
extern unsigned int size_freesd_irx;
#endif /* PS2_IRX_VARIABLES_H */ #endif /* PS2_IRX_VARIABLES_H */

4
ps2/irx/Makefile
View File

@ -4,8 +4,8 @@ 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 += freemtap.irx freepad.irx freesio2.irx iomanX.irx fileXio.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 += freesd.irx audsrv.irx poweroff.irx cdfs.irx IRX_FILES += libsd.irx audsrv.irx poweroff.irx cdfs.irx
IRX_C_FILES = $(IRX_FILES:.irx=_irx.c) IRX_C_FILES = $(IRX_FILES:.irx=_irx.c)
all: irxs all: irxs