Added new features, fixes and optimizations.

Added following 7 commits from the master OPL branch:
- USBExtreme format extended
- Fixed USBExtreme issue
- Revert size calculation for USBExtreme (can take more then 5 minutes)
- "Pad macro" functionality
- Use usbd_mini.irx instead of usbd.irx
- ps2rd hook code detection
- Fix OSD language settings

Other changes:
- Replaced graphics in /gfx with better compressed PNGs
- Re-enabled PADEMU, RTL and IGS feature
- Added 'all-variants' in Makefile
- Removed some unnecessary files for this version

Author: SvenGDK

.github/ISSUE_TEMPLATE/feature_request.md

@@ -22,11 +22,11 @@ EXTRAVERSION = 0
 # You can also specify variables when executing make: "make RTL=1 IGS=1 PADEMU=1"
 
 #Enables/disables Right-To-Left (RTL) language support
-RTL = 0
+RTL ?= 0
 #Enables/disables In Game Screenshot (IGS). NB: It depends on GSM and IGR to work
-IGS = 0
+IGS ?= 0
 #Enables/disables pad emulator
-PADEMU = 0
+PADEMU ?= 0
 #Enables/disables building of an edition of OPL that will support the DTL-T10000 (SDK v2.3+)
 DTL_T10000 = 0
 #Nor stripping neither compressing binary ELF after compiling.
@@ -186,6 +186,57 @@ else
 	$(MAKE) $(EE_BIN)
 endif
 
+all-variants:
+	echo "Building Open PS2 Loader $(OPL_VERSION) with other variants."
+	
+ifneq ($(NOT_PACKED),1)	
+	$(MAKE) IGS=1 $(EE_BIN_PACKED)
+	mv $(EE_BIN_PACKED) OPNPS2LD-IGS.ELF
+	$(MAKE) clean
+	echo "IGS Variant created: OPNPS2LD-IGS.ELF"
+	
+	$(MAKE) RTL=1 $(EE_BIN_PACKED)
+	mv $(EE_BIN_PACKED) OPNPS2LD-RTL.ELF
+	$(MAKE) clean	
+	echo "RTL Variant created: OPNPS2LD-RTL.ELF"
+	
+	$(MAKE) PADEMU=1 $(EE_BIN_PACKED)
+	mv $(EE_BIN_PACKED) OPNPS2LD-PADEMU.ELF
+	$(MAKE) clean
+	echo "PADEMU Variant created: OPNPS2LD-PADEMU.ELF"
+	
+	$(MAKE) IGS=1 RTL=1 PADEMU=1 $(EE_BIN_PACKED)
+	mv $(EE_BIN_PACKED) OPNPS2LD-ALL.ELF
+	$(MAKE) clean
+	echo "ALL Variant created: OPNPS2LD-ALL.ELF"
+	
+	$(MAKE) $(EE_BIN_PACKED)
+	echo "Open PS2 Loader $(OPL_VERSION) build: OPNPS2LD.ELF"
+else
+	$(MAKE) IGS=1 $(EE_BIN)
+	mv $(EE_BIN) opl-IGS.elf
+	$(MAKE) clean
+	echo "IGS Variant created: opl-IGS.elf"
+	
+	$(MAKE) RTL=1 $(EE_BIN)
+	mv $(EE_BIN) opl-RTL.elf
+	$(MAKE) clean	
+	echo "RTL Variant created: opl-RTL.elf"
+	
+	$(MAKE) PADEMU=1 $(EE_BIN)
+	mv $(EE_BIN) opl-PADEMU.elf
+	$(MAKE) clean
+	echo "PADEMU Variant created: opl-PADEMU.elf"
+	
+	$(MAKE) IGS=1 RTL=1 PADEMU=1 $(EE_BIN)
+	mv $(EE_BIN) opl-ALL.elf
+	$(MAKE) clean	
+	echo "ALL Variant created: opl-ALL.elf"
+	
+	$(MAKE) $(EE_BIN)
+	echo "Open PS2 Loader $(OPL_VERSION) build: opl.elf"
+endif
+
 release:
 	echo "Building Open PS2 Loader $(OPL_VERSION)..."
 	echo "-Interface"
@@ -449,7 +500,7 @@ modules/isofs/isofs.irx: modules/isofs
 $(EE_ASM_DIR)isofs.s: modules/isofs/isofs.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ isofs_irx
 
-$(EE_ASM_DIR)usbd.s: $(PS2SDK)/iop/irx/usbd.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)usbd.s: $(PS2SDK)/iop/irx/usbd_mini.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ usbd_irx
 
 $(EE_ASM_DIR)libsd.s: $(PS2SDK)/iop/irx/libsd.irx | $(EE_ASM_DIR)

.github/ISSUE_TEMPLATE/issue-report.md

@@ -1,17 +1,17 @@
 # Open PS2 Loader
 
-Copyright 2013, Ifcaro & jimmikaelkael  
-Licenced under Academic Free License version 3.0  
-Review LICENSE file for further details.  
-
-Forked from https://github.com/ps2homebrew/Open-PS2-Loader v1.0.0 source code.
+Copyright © 2013-2022, Ifcaro & jimmikaelkael.
+Licenced under AFL v3.0 - Review the LICENSE file for further details.
 
 This updated version includes:
 - OPL-Launcher support
-- HDL server support
-- NBD server support
+- HDL & NBD server support
 - Controller Settings Menu
+- Gamepad Macros (Modification of Gamepads - Requires PADEMU)
 - OSD Language Configuration Menu
 - Apps Menu
 - Expanded SMB Ports
 - Various fixes + updates from the stable v1.1.0 Release + v1.2.0 Beta.
+
+Forked from https://github.com/ps2homebrew/Open-PS2-Loader v1.0.0 source code.
+Thanks to bignaux, ackmax, israpps, uyjulian, AKuHAK, ...!

.github/workflows/check-format.yml

@@ -83,6 +83,7 @@ extern int EnableCheatOp;
 #ifdef PADEMU
 extern int EnablePadEmuOp;
 extern int PadEmuSettings;
+extern int PadMacroSettings;
 #endif
 
 extern int DisableDebug;

.github/workflows/compilation.yml

@@ -25,7 +25,7 @@ int _toupper(int c);
 int _memcmp(const void *s1, const void *s2, unsigned int length);
 unsigned int _strtoui(const char *p);
 int _strtoi(const char *p);
-unsigned long int _strtoul(const char *p);
+u64 _strtoul(const char *p);
 void set_ipconfig(void);
 u32 *find_pattern_with_mask(u32 *buf, unsigned int bufsize, const u32 *pattern, const u32 *mask, unsigned int len);
 void CopyToIop(void *eedata, unsigned int size, void *iopptr);

Makefile

@@ -60,7 +60,7 @@ void SetupCheats()
             k++;
         }
         // Discard any false positives from being possible hooks
-        if ((code.addr & 0xf0000000) == 0x40000000 || 0x30000000) {
+        if ((code.addr & 0xf0000000) == 0x40000000 || (code.addr & 0xf0000000) == 0x30000000) {
             nextCodeCanBeHook = 0;
         } else {
             nextCodeCanBeHook = 1;

README.md

@@ -637,7 +637,7 @@ static u8 SaveBitmapFile(u16 width, u16 height, u8 pixel_size, void *buffer, u8
     if (ret != 2)
         BlinkColour(5, 0x0000FF, 1); //Red
     //(...then, write the remaining info!)
-    bh = buffer + image_size;
+    bh = (void *)((u8 *)buffer + image_size);
     bh->filesize = (u32)file_size;
     bh->reserved = (u32)0;
     bh->headersize = (u32)54;
@@ -663,7 +663,7 @@ static u8 SaveBitmapFile(u16 width, u16 height, u8 pixel_size, void *buffer, u8
     if (intffmd == 3) //Interlace Mode, FRAME Mode (Read every line)
         height >>= 1;
     for (i = 1; i <= height; i++) {
-        addr = buffer + ((height - i) * lenght);
+        addr = (void *)((u8 *)buffer + ((height - i) * lenght));
 
         // Ensure that all the data has indeed been written back to main memory
         FlushCache(GS_WRITEBACK_DCACHE);

ee_core/include/ee_core.h

@@ -170,7 +170,10 @@ int New_Reset_Iop(const char *arg, int arglen)
 
 #ifdef PADEMU
     if (iop_reboot_count >= 2 && EnablePadEmuOp) {
-        LoadOPLModule(OPL_MODULE_ID_PADEMU, 0, 4, (char *)&PadEmuSettings);
+        char args_for_pademu[8];
+        memcpy(args_for_pademu, &PadEmuSettings, 4);
+        memcpy(args_for_pademu + 4, &PadMacroSettings, 4);
+        LoadOPLModule(OPL_MODULE_ID_PADEMU, 0, sizeof(args_for_pademu), args_for_pademu);
     }
 #endif