Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Don't merge] Use sio2man/padman from ps2sdk #41

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[Don't merge] Use sio2man/padman from ps2sdk #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down Expand Up @@ -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

Expand Down
14 changes: 10 additions & 4 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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
Expand Down
Loading