Merge branch 'master' into system-2x6-support

Author: israpps

.github/workflows/compile.yml

@@ -15,12 +15,15 @@ jobs:
       fail-fast: false
       matrix:
         eth: ["ETH=0", "ETH=1"]
-        bdmstuff: ["EXFAT=1", "EXFAT=1 MX4SIO=1"] #"EXFAT=0", 
-        #ds34: ["DS34=0", "DS34=1"]
-        coh: ["COH=1", "COH=1 ACUART=1"] #"COH=0",
+        bdmstuff: ["EXFAT=0", "EXFAT=1", "EXFAT=1 MX4SIO=1"]
+        ds34: ["DS34=0", "DS34=1"]
+        mmce: ["MMCE=0", "MMCE=1"]
+        coh: ["COH=0", "COH=1"]
         exclude:
           - bdmstuff: "EXFAT=1 MX4SIO=1"
             coh: "COH=1"
+          - bdmstuff: "EXFAT=1 MX4SIO=1"
+            mmce: "MMCE=1"
     runs-on: ubuntu-latest
     container: ps2dev/ps2dev:v1.0
     steps:
@@ -36,12 +39,13 @@ jobs:
 
     - name: Compile wLaunchELF
       run: |
-        make rebuild SIO_DEBUG=1 ${{ matrix.coh }} ${{ matrix.eth }} ${{ matrix.bdmstuff }} ${{ matrix.ds34 }} ${{ matrix.xfrom }} ${{ github.event.inputs.make_args }}
+        make rebuild ${{ matrix.eth }} ${{ matrix.mmce }} ${{ matrix.bdmstuff }} ${{ matrix.ds34 }} ${{ matrix.xfrom }} ${{ matrix.coh }} ${{ github.event.inputs.make_args }}
+
 
     - name: Upload variants artifact ELF
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: WLE
+        name: "WLE-${{ matrix.eth }}-${{ matrix.mmce }}-${{ matrix.bdmstuff }}-${{ matrix.ds34 }}-${{ matrix.xfrom }}"
         path: |
             BOOT*.ELF
 
@@ -59,6 +63,10 @@ jobs:
 
     - name: Download all artifacts
       uses: actions/download-artifact@v4
+      with:
+        path: WLE/
+        pattern: "WLE-*"
+        merge-multiple: true
 
     - name: list
       run: |
@@ -75,6 +83,15 @@ jobs:
         files: |
                WLE/*.ELF
 
+    - name: notify on discord
+      if: github.ref == 'refs/heads/master'
+      uses: tsickert/discord-webhook@v5.3.0
+      with:
+        webhook-url: ${{ secrets.DISCORD_FEED }}
+        content: |
+          ## wLaunchELF 4.43x_isr has been updated!
+          ### [Download Page](https://israpps.github.io/projects/wlaunchelf-isr)
+
     - name: Create release
       if: github.ref == 'refs/heads/master'
       uses: marvinpinto/action-automatic-releases@latest

Makefile

@@ -1,7 +1,7 @@
 #.SILENT:
 
 # ---{ BUILD CONFIGURATION }--- #
-SIO_DEBUG ?= 0
+MMCE ?= 0
 DS34 ?= 0
 SMB ?= 0
 TMANIP ?= 1
@@ -12,18 +12,16 @@ IOP_RESET ?= 1
 XFROM ?= 0
 UDPTTY ?= 0
 MX4SIO ?= 0
-TTY2SIOR ?= 0
+SIO2MAN ?= 0
+PPC_UART ?= 0
+SIO_DEBUG ?= 0
 DEBUG ?= 0
 COH ?= 0
-
-# 0: on-board version, 1: homebrew version
-SIO2MAN ?= 0
-MCMAN ?= 1
-CDVDFSV ?= 1
+LCDVD ?= LEGACY#or LATEST
 # ----------------------------- #
 .SILENT:
 
-BIN_NAME = $(HAS_EXFAT)$(HAS_DS34)$(HAS_ETH)$(HAS_SMB)$(HAS_DVRP)$(HAS_XFROM)$(HAS_MX4SIO)$(HAS_COH)$(HAS_EESIO)$(HAS_UDPTTY)$(HAS_ACUART)$(HAS_IOP_RESET)
+BIN_NAME = $(HAS_COH)$(HAS_EXFAT)$(HAS_DS34)$(HAS_ETH)$(HAS_MX4SIO)$(HAS_MMCE)$(HAS_SMB)$(HAS_DVRP)$(HAS_XFROM)$(HAS_EESIO)$(HAS_UDPTTY)$(HAS_PPCTTY)$(HAS_IOP_RESET)
 ifeq ($(DEBUG), 0)
   EE_BIN = UNC-BOOT$(BIN_NAME).ELF
   EE_BIN_PKD = BOOT$(BIN_NAME).ELF
@@ -38,10 +36,10 @@ EE_OBJS = main.o config.o elf.o draw.o loader_elf.o filer.o \
 	hdd.o hdl_rpc.o hdl_info_irx.o editor.o timer.o jpgviewer.o icon.o lang.o \
 	font_uLE.o makeicon.o chkesr.o allowdvdv_irx.o
 
-EE_INCS := -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include -Iiop/oldlibs/libcdvd/ee -Iinclude
+EE_INCS := -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include -Iinclude
 
 EE_LDFLAGS := -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ports/lib -Liop/oldlibs/libcdvd/lib -s
-EE_LIBS = -lgskit -ldmakit -ljpeg -lmc -lhdd -lcdvdfs -lkbd -lmf \
+EE_LIBS = -lgskit -ldmakit -ljpeg -lmc -lhdd -lkbd -lmf \
 	-lcdvd -lc -lfileXio -lpatches -lpoweroff -ldebug
 EE_CFLAGS := -mgpopt -G10240 -G0 -DNEWLIB_PORT_AWARE -D_EE
 
@@ -73,6 +71,17 @@ ifeq ($(COH), 1)
   endif
 endif
 
+ifeq ($(LCDVD),LEGACY)
+  $(info -- Building with legacy libcdvd)
+  EE_CFLAGS += -DLIBCDVD_LEGACY
+  CDVD_SOURCE = iop/cdvd.irx
+  EE_INCS += -Iiop/oldlibs/libcdvd/ee
+  EE_LIBS += -lcdvdfs
+else
+  EE_CFLAGS += -DLIBCDVD_LATEST
+  CDVD_SOURCE = iop/__precompiled/cdfs.irx
+endif
+
 ifeq ($(XFROM),1)
   HAS_XFROM = -XFROM
   EE_CFLAGS += -DXFROM
@@ -92,6 +101,13 @@ ifeq ($(DVRP),1)
   HAS_DVRP = -DVRP
 endif
 
+ifeq ($(MMCE),1)
+    EE_OBJS += mmceman_irx.o
+    EE_CFLAGS += -DMMCE
+    HAS_MMCE = -MMCE
+    SIO2MAN = 1
+endif
+
 ifeq ($(MX4SIO),1)
   ifneq ($(EXFAT),1)
     $(error MX4SIO Requested on build without BDM)
@@ -136,11 +152,13 @@ ifeq ($(SIO_DEBUG),1)
   HAS_EESIO = -SIO_DEBUG
 endif
 
-ifeq ($(TTY2SIOR),1)
-  EE_LIBS += -lsior
-  EE_CFLAGS += -DTTY2SIOR
-  HAS_TTY2SIOR = -TTY2SIOR
-  EE_OBJS += tty2sior_irx.o
+ifeq ($(PPC_UART),1)
+    EE_CFLAGS += -DPOWERPC_UART
+    HAS_PPCTTY = -PPCTTY
+    EE_OBJS += ppctty.o
+    ifeq ($(UDPTTY),1)
+    $(error Both PPCTTY and UDPTTY enabled simultaneously)
+    endif
 endif
 
 ifeq ($(IOP_RESET),0)
@@ -188,15 +206,33 @@ else
   EE_CFLAGS += -DCUSTOM_COLORS
 endif
 
+ifeq ($(IOPTRAP),1)
+    EE_OBJS += ioptrap_irx.o
+    EE_CFLAGS += -DIOPTRAP
+endif
+
 
 EE_OBJS_DIR = obj/
 EE_ASM_DIR = asm/
 EE_SRC_DIR = src/
 EE_OBJS := $(EE_OBJS:%=$(EE_OBJS_DIR)%) # remap all EE_OBJ to obj subdir
 
-.PHONY: all run reset clean rebuild isoclean iso
+all: githash.h $(EE_BIN_PKD)
 
-all: githash.h iop/cdvd.irx $(EE_BIN_PKD)
+info:
+	$(info available build options:)
+	$(info   EXFAT		enable BDM and EXFAT support for it)
+	$(info   ETH		include network features?)
+	$(info   DS34		include PS3/PS4 controller support)
+	$(info   MX4SIO		support for SDCard connected to memory card slot 2)
+	$(info   MMCE		support for direct SDCard access on SD2PSX or memcardpro2)
+	$(info ----------)
+	$(info   IOPTRAP		load exception handler module to IOP)
+	$(info   UDPTTY		transfer stdout to UDP broadcast)
+	$(info   PPC_UART	transfer stdout to DECKARD UART)
+	$(info   SIO_DEBUG 	transfer EE stdout to EE UART)
+
+.PHONY: all run reset clean rebuild isoclean iso
 
 $(EE_BIN_PKD): $(EE_BIN)
 	ps2-packer $< $@
@@ -241,14 +277,14 @@ clean:
 
 rebuild: clean all
 
-info:
+info2:
 	$(info -------- wLaunchELF 4.43x_isr --------)
 	$(info EE_BIN = $(EE_BIN))
 	$(info EE_BIN_PKD = $(EE_BIN_PKD))
 	$(info TMANIP=$(TMANIP), SIO_DEBUG=$(SIO_DEBUG), DS34=$(DS34), ETH=$(ETH))
-	$(info EXFAT=$(EXFAT), XFROM=$(XFROM), UDPTTY=$(UDPTTY), MX4SIO=$(MX4SIO) COH=$(COH))
-	$(info SIO2MAN=$(SIO2MAN), MCMAN=$(MCMAN))
-	$(info IOP_RESET=$(IOP_RESET))
+	$(info EXFAT=$(EXFAT), XFROM=$(XFROM), UDPTTY=$(UDPTTY), MX4SIO=$(MX4SIO))
+	$(info MMCE=$(MMCE), COH=$(COH), IOP_RESET=$(IOP_RESET))
+
 
 #special recipe for compiling and dumping obj to subfolder
 $(EE_OBJS_DIR)%.o: $(EE_SRC_DIR)%.c | $(EE_OBJS_DIR)

README.md

@@ -2,7 +2,7 @@
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/5e07db76c668493d888a7f9b97d79821)](https://app.codacy.com/gh/israpps/wLaunchELF_ISR?utm_source=github.com&utm_medium=referral&utm_content=israpps/wLaunchELF_ISR&utm_campaign=Badge_Grade_Settings)
 [![Automated-Build](https://github.com/israpps/wLaunchELF_ISR/actions/workflows/compile.yml/badge.svg)](https://github.com/israpps/wLaunchELF_ISR/actions/workflows/compile.yml)
 
-[![Static Badge](https://img.shields.io/github/downloads/israpps/wLaunchELF_ISR/total?style=for-the-badge&logo=protondrive&logoColor=00CCFF&label=DOWNLOAD&labelColor=000000)](https://israpps.github.io/20210113_wLaunchELF_isr/#download)
+[![Static Badge](https://img.shields.io/github/downloads/israpps/wLaunchELF_ISR/total?style=for-the-badge&logo=protondrive&logoColor=00CCFF&label=DOWNLOAD&labelColor=000000)](https://israpps.github.io/projects/wlaunchelf-isr)
 
 _this uLaunchELF mod was my first PS2 project._
 
@@ -18,18 +18,19 @@ It features:
 
 ### Explanation of download filenames
 
-> release filename change according to the enabled features:
+> release filename change according to the enabled features, you may find the following words separated by `-` identifying with features that build has.
+> you may also check this inside `MISC/BuildInfo` in case you have to rename the binary
 
 - `BOOT`: Base filename, means nothing
 - `UNC`: Executable is Uncompressed
-- `SIO_DEBUG`: Supports printing debug information via the EmotionEngine serial port (useless unless your PS2 has serial port attached)
-- `NO_NETWORK`: Network features are disabled and network IRX drivers stripped away, with the purpose of making a smaller wLaunchELF for users who don't use network
-- `XFROM`: Support for accessing the [PSX-DESR](https://upload.wikimedia.org/wikipedia/commons/f/fa/Console_psx.jpg) internal flash memory
+- `COH`: Special version for PS2 `COH-H` Models (Namco System 246/256 specifically)
+- `NO_NETWORK`: Network features are disabled and network IRX drivers stripped away, with the purpose of making app smaller
+- `XFROM`: Support for accessing the [PSX-DESR](https://upload.wikimedia.org/wikipedia/commons/f/fa/Console_psx.jpg) internal flash memory.
 - `EXFAT`: Support for accessing EXFAT filesystems from BDM devices (USB & MX4SIO)
-- `DS34`: Support for use of PlayStation 3 and PlayStation 4 controllers
-- `MX4SIO`: Support for browsing the contents of SD Cards connected via mx4sio
+- `DS34`: Support for PlayStation 3 and PlayStation 4 controllers over USB
+- `MX4SIO`: Support for browsing the contents of SD Cards connected via [mx4sio](https://www.google.com/search?q=mx4sio)
+- `MMCE`: Support for browsing the contents of the SDCard connected to MemcardPro2 or SD2PSX and their variants (make sure firmware of device is new enough to support the protocol)
 
-> to see the enabled features on an already downloaded version of this mod, please go to `Filebrowser > MISC/ > BuildInfo`
 
 # **original readme**
 wLaunchELF, formerly known as uLaunchELF, also known as wLE or uLE (abbreviated), is an open source file manager and executable launcher for the Playstation 2 console based off of the original LaunchELF. It contains many different features, including a text editor, hard drive manager, as well as network support, and much more.

embed.make

@@ -27,10 +27,12 @@ $(EE_ASM_DIR)mcserv_irx.s: $(MCSERV_SOURCE) | $(EE_ASM_DIR)
 
 $(EE_ASM_DIR)sio2man.s: $(SIO2MAN_SOURCE) | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ sio2man_irx
-
 
 $(EE_ASM_DIR)mx4sio_bd.s: iop/__precompiled/mx4sio_bd.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ mx4sio_bd_irx
+	
+$(EE_ASM_DIR)mmceman_irx.s: iop/__precompiled/mmceman.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ mmceman_irx
 #---{ USB }---#
 
 $(EE_ASM_DIR)usbd_irx.s: $(PS2SDK)/iop/irx/usbd.irx | $(EE_ASM_DIR)
@@ -55,8 +57,12 @@ endif
 iop/cdvd.irx: iop/oldlibs/libcdvd
 	$(MAKE) -C $<
 
-$(EE_ASM_DIR)cdvd_irx.s: iop/cdvd.irx | $(EE_ASM_DIR)
+$(EE_ASM_DIR)cdvd_irx.s: $(CDVD_SOURCE) | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ cdvd_irx
+	$(MAKE) -C iop/oldlibs/libcdvd
+
+$(EE_ASM_DIR)ioptrap_irx.s: $(PS2SDK)/iop/irx/ioptrap.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ ioptrap_irx
 
 $(EE_ASM_DIR)poweroff_irx.s: $(PS2SDK)/iop/irx/poweroff.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ poweroff_irx
@@ -171,11 +177,8 @@ $(EE_ASM_DIR)ps2kbd_irx.s: $(PS2SDK)/iop/irx/ps2kbd.irx | $(EE_ASM_DIR)
 $(EE_ASM_DIR)sior_irx.s: $(PS2SDK)/iop/irx/sior.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ sior_irx
 
-$(EE_ASM_DIR)acuart_tty_irx.s: iop/__precompiled/acuart_tty.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ acuart_tty_irx
-	
-$(EE_ASM_DIR)accore_irx.s: iop/__precompiled/accore.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ accore_irx
+$(EE_ASM_DIR)ppctty.s:iop/__precompiled/ppctty.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ ppctty_irx
 
 iop/AllowDVDV.irx: iop/AllowDVDV
 	$(MAKE) -C $<

include/cdvd_macro.h

@@ -0,0 +1,15 @@
+#ifndef __CDVD_COMPAT_MACRO
+#define __CDVD_COMPAT_MACRO
+
+#ifdef LIBCDVD_LEGACY
+#define LCDVD_FLUSHCACHE() CDVD_FlushCache()
+#define LCDVD_INIT() CDVD_Init()
+#define LCDVD_STOP() CDVD_Stop()
+#define LCDVD_DISKREADY(x) CDVD_DiskReady(x)
+#else
+#define LCDVD_FLUSHCACHE() // TO-DO / IMPLEMENT ME
+#define LCDVD_INIT() // does not exist on sdk libcdvd
+#define LCDVD_STOP() sceCdStop()
+#define LCDVD_DISKREADY(x) sceCdDiskReady(x)
+#endif
+#endif

include/launchelf.h

@@ -45,20 +45,21 @@
 #include <floatlib.h>
 #include <usbhdfsd-common.h>
 #include "hdl_rpc.h"
+#include "cdvd_macro.h"
 #include "iop/ds34usb/ee/libds34usb.h"
 #include "iop/ds34bt/ee/libds34bt.h"
 
 #include <sio.h>
 #include <sior_rpc.h>
 
-#ifdef SIO_DEBUG
+#ifdef SIO_DEBUG //EE SIO will be printed separated. no need for diferentiation
 	#define DPRINTF(format, args...) \
     	sio_printf(format, ##args)
-#elif defined(TTY2SIOR) || defined(COMMON_PRINTF) || defined(UDPTTY)
+#elif defined(POWERPC_UART) || defined(COMMON_PRINTF) || defined(UDPTTY) //printf has to travel to IOP, add color escape to make up the diff
 	#define DPRINTF(format, args...) \
     	printf("\033[1;94;40m"format"\033[m", ##args)
 #else
-	#define DPRINTF(format, args...) // strip away printf from consumer builds
+	#define DPRINTF(format, args...)// strip away printf from consumer builds
 #endif
 
 #define TRUE 1
@@ -186,6 +187,7 @@ typedef struct
 	int Popup_Opaque;
 	int Init_Delay;
 	int usbkbd_used;
+	int reboot_iop_elf_load;
 	int Show_Titles;
 	int PathPad_Lock;
 	int JpgView_Timer;
@@ -213,6 +215,10 @@ extern int GUI_active;  // Skin and Main Skin switch
 extern int cdmode;      //Last detected disc type
 extern u8 console_is_PSX;
 
+#ifdef MX4SIO
+extern u8 mx4sio_driver_running;
+#endif
+
 void load_vmc_fs(void);
 #ifdef ETH
 void load_ps2host(void);