From 4dc9c92d72f9674fa66f62b755aa19281774f371 Mon Sep 17 00:00:00 2001
From: Julian Uy <uyjulian@gmail.com>
Date: Fri, 8 Dec 2023 17:46:45 +0000
Subject: [PATCH] Use padman and sio2man from ps2sdk

---
 Makefile |  9 ++++++++-
 main.c   | 14 ++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index ccdcf7ed..9d9140b3 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@ EE_BIN = BOOT-UNC.ELF
 EE_BIN_PKD = BOOT.ELF
 EE_OBJS = main.o pad.o config.o elf.o draw.o loader_elf.o filer.o \
 	poweroff_irx.o iomanx_irx.o filexio_irx.o ps2atad_irx.o ps2dev9_irx.o ps2ip_irx.o netman_irx.o \
-	ps2smap_irx.o ps2hdd_irx.o ps2fs_irx.o ps2netfs_irx.o usbd_irx.o bdm_irx.o bdmfs_fatfs_irx.o usbmass_bd_irx.o mcman_irx.o mcserv_irx.o\
+	ps2smap_irx.o ps2hdd_irx.o ps2fs_irx.o ps2netfs_irx.o usbd_irx.o bdm_irx.o bdmfs_fatfs_irx.o usbmass_bd_irx.o \
+	sio2man_irx.o mcman_irx.o mcserv_irx.o padman_irx.o \
 	dvrdrv_irx.o dvrfile_irx.o \
 	cdfs_irx.o ps2ftpd_irx.o ps2host_irx.o vmc_fs_irx.o ps2kbd_irx.o\
 	hdd.o hdl_rpc.o hdl_info_irx.o editor.o timer.o jpgviewer.o icon.o lang.o\
@@ -66,12 +67,18 @@ githash.h:
 	git rev-parse --short HEAD | tr -d "\n" >> $@ && \
 	printf '"\n#endif\n' >> $@
 
+$(EE_ASM_DIR)sio2man_irx.s: $(PS2SDK)/iop/irx/sio2man-old.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ sio2man_irx
+
 $(EE_ASM_DIR)mcman_irx.s: $(PS2SDK)/iop/irx/mcman-old.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ mcman_irx
 
 $(EE_ASM_DIR)mcserv_irx.s: $(PS2SDK)/iop/irx/mcserv-old.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ mcserv_irx
 
+$(EE_ASM_DIR)padman_irx.s: $(PS2SDK)/iop/irx/padman-old.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ padman_irx
+
 $(EE_ASM_DIR)dvrdrv_irx.s: $(PS2SDK)/iop/irx/dvrdrv.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ dvrdrv_irx
 
diff --git a/main.c b/main.c
index 810afe33..4d6fccd2 100644
--- a/main.c
+++ b/main.c
@@ -57,10 +57,14 @@ extern u8 ps2kbd_irx[];
 extern int size_ps2kbd_irx;
 extern u8 hdl_info_irx[];
 extern int size_hdl_info_irx;
+extern u8 sio2man_irx[];
+extern int size_sio2man_irx;
 extern u8 mcman_irx[];
 extern int size_mcman_irx;
 extern u8 mcserv_irx[];
 extern int size_mcserv_irx;
+extern u8 padman_irx[];
+extern int size_padman_irx;
 #ifdef SIO_DEBUG
 extern u8 sior_irx[];
 extern int size_sior_irx;
@@ -964,7 +968,8 @@ static void loadBasicModules(void)
 
     SifExecModuleBuffer(allowdvdv_irx, size_allowdvdv_irx, 0, NULL, &ret);  // unlocks cdvd for reading on psx dvr
 
-    SifLoadModule("rom0:SIO2MAN", 0, NULL);
+    SifExecModuleBuffer(sio2man_irx, size_sio2man_irx, 0, NULL, &ret);  // Home
+    // SifLoadModule("rom0:SIO2MAN", 0, NULL); // Sony
 
 #ifdef SIO_DEBUG
     int id;
@@ -980,10 +985,11 @@ static void loadBasicModules(void)
 #endif
 
     SifExecModuleBuffer(mcman_irx, size_mcman_irx, 0, NULL, &ret);  // Home
-    // SifLoadModule("rom0:MCMAN", 0, NULL); //Sony
+    // SifLoadModule("rom0:MCMAN", 0, NULL); // Sony
     SifExecModuleBuffer(mcserv_irx, size_mcserv_irx, 0, NULL, &ret);  // Home
-    // SifLoadModule("rom0:MCSERV", 0, NULL); //Sony
-    SifLoadModule("rom0:PADMAN", 0, NULL);
+    // SifLoadModule("rom0:MCSERV", 0, NULL); // Sony
+    SifExecModuleBuffer(padman_irx, size_padman_irx, 0, NULL, &ret);  // Home
+    // SifLoadModule("rom0:PADMAN", 0, NULL); // Sony
 }
 //------------------------------
 // endfunc loadBasicModules