Merge branch 'master' into udpbd

israpps · Jan 31, 2024 · 7250ac9 · 7250ac9
2 parents cc270a0 + 249b6e2
commit 7250ac9
Show file tree

Hide file tree

Showing 13 changed files with 136 additions and 154 deletions.
diff --git a/.github/ISSUE_TEMPLATE/issue.yml b/.github/ISSUE_TEMPLATE/issue.yml
@@ -0,0 +1,55 @@
+name: Issue report
+description: Report an issue on wLaunchELF 4.43x_isr
+title: "[ISSUE]: "
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ### __Disclaimer:__
+        Issue reports must be from wLaunchELF 4.43x_isr. issues with 4.43x_isr_hdd are expected [here](https://github.com/israpps/wLaunchELF_ISR_HDD/issues)
+        Issue reports for consoles with installed and enabled modchip are considered as incomplete reports (we won't ignore you, but confirmation that the issue can be reproduced on a virgin console will be appreciated).
+        ## Before posting the issue confirm that you meet the below requirements.
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Checks
+      description: "Check before posting"
+      options:
+        - label: I have checked existing [__Issue reports__](https://github.com/israpps/wLaunchELF_ISR/issues) for duplicates and found none
+        - label: I downloaded wLaunchELF from this repository or the [official download link](https://israpps.github.io/20210113_wLaunchELF_isr/)
+
+  - type: markdown
+    attributes:
+      value: |
+        ### Configuration
+        > (please complete the following information):
+
+  - type: input
+    id: console
+    attributes:
+      label: Console model
+      description: you can see it on the console sticker or inside OSDSYS (press triangle on main menú)
+      placeholder: SCPH-????? / DTL-H????? / DESR-????? / COH-H?????
+    validations:
+      required: true
+
+  - type: input
+    id: oplver
+    attributes:
+      label: "wLaunchELF commit code"
+      description: "you can see it on (Filebrowser > MISC > Debug Info)"
+      placeholder: "eg: commit 0a70367"
+    validations:
+      required: true
+
+  - type: textarea
+    id: explanation
+    attributes:
+      label: Describe the issue
+      description: A clear and concise description of what the issue is.
+      placeholder: My issue is...
+    validations:
+      required: true
+
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -30,11 +30,6 @@ jobs:
         git config --global --add safe.directory "$GITHUB_WORKSPACE"
         git fetch --prune --unshallow
 
-    - name: Install ps2eth
-      run: |
-        git clone https://github.com/ps2dev/ps2eth.git
-        cd ps2eth && make clean all install
-
     - name: Compile wLaunchELF
       run: |
         make rebuild ${{ matrix.eth }} ${{ matrix.sior }} ${{ matrix.bdmstuff }} ${{ matrix.ds34 }} ${{ matrix.xfrom }} ${{ github.event.inputs.make_args }}
@@ -45,49 +40,12 @@ jobs:
         name: WLE
         path: |
             BOOT*.ELF
-#######################################################
-  build_iso:
-    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
-    strategy:
-      fail-fast: false
-      matrix:
-        eth: ["ETH=0", "ETH=1", "ETH=1 UDPTTY=1", "ETH=1 UDPTTY=0 SIO_DEBUG=1"]
-        bdmstuff: ["EXFAT=0", "EXFAT=1"]
-        iopreset: ["IOP_RESET=0", "IOP_RESET=1"]
-    runs-on: ubuntu-latest
-    container: ps2dev/ps2dev:v1.0
-    steps:
-
-    - name: Install dependencies
-      run: |
-        apk add make git zip cdrkit
-  
-    - uses: actions/checkout@v3
-    - run: |
-        git config --global --add safe.directory "$GITHUB_WORKSPACE"
-        git fetch --prune --unshallow
-  
-    - name: Install ps2eth
-      run: |
-        git clone https://github.com/ps2dev/ps2eth.git
-        cd ps2eth && make clean all install
-  
-    - name: Compile wLaunchELF ISO Image
-      run: |
-        make rebuild isoclean iso ${{ matrix.eth }} ${{ matrix.bdmstuff }} ${{ matrix.iopreset }} PACK_ISO=YES ${{ github.event.inputs.make_args }}
 
-    - name: Upload variants artifact ELF
-      uses: actions/upload-artifact@v3
-      with:
-        name: WLE_ISO
-        path: |
-          wLE_ISR_ISO*.zip
-    
 ####################################################### 
   release:
     if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
-    needs: [build, build_iso]
+    needs: [build]
     steps:
 
     - uses: actions/checkout@v3
@@ -123,16 +81,6 @@ jobs:
         files: |
                Lang/*.LNG
 
-    - name: Create release
-      if: github.ref == 'refs/heads/master'
-      uses: marvinpinto/action-automatic-releases@latest
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "iso"
-        title: "wLaunchELF ISO Images"
-        files: |
-          WLE_ISO/*.zip
-
   trigger-auto-update:
     if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest

diff --git a/Makefile b/Makefile
@@ -14,13 +14,19 @@ UDPTTY ?= 0
 MX4SIO ?= 0
 SIO2MAN ?= 0
 TTY2SIOR ?= 0
+DEBUG ?= 0
 UDPBD ?= 0
 # ----------------------------- #
 .SILENT:
 
 BIN_NAME = $(HAS_EXFAT)$(HAS_DS34)$(HAS_ETH)$(HAS_SMB)$(HAS_DVRP)$(HAS_XFROM)$(HAS_MX4SIO)$(HAS_EESIO)$(HAS_UDPTTY)$(HAS_TTY2SIOR)$(HAS_IOP_RESET)$(HAS_UDPBD)
-EE_BIN = UNC-BOOT$(BIN_NAME).ELF
-EE_BIN_PKD = BOOT$(BIN_NAME).ELF
+ifeq ($(DEBUG), 0)
+  EE_BIN = UNC-BOOT$(BIN_NAME).ELF
+  EE_BIN_PKD = BOOT$(BIN_NAME).ELF
+else
+  EE_BIN = UNC-BOOT.ELF
+  EE_BIN_PKD = BOOT.ELF
+endif
 EE_OBJS = main.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 \
 	ps2hdd_irx.o ps2fs_irx.o usbd_irx.o mcman_irx.o mcserv_irx.o \
@@ -195,10 +201,10 @@ clean:
 	$(MAKE) -C iop/AllowDVDV clean
 	$(MAKE) -C iop/oldlibs/libcdvd clean
 	$(MAKE) -C iop/oldlibs/ps2ftpd clean
-	rm -f githash.h $(EE_BIN) $(EE_BIN_PKD)
-	rm -rf $(EE_OBJS_DIR)
-	rm -rf $(EE_ASM_DIR)
-	rm -f iop/*.irx
+	@rm -f githash.h $(EE_BIN) $(EE_BIN_PKD)
+	@rm -rf $(EE_OBJS_DIR)
+	@rm -rf $(EE_ASM_DIR)
+	@rm -f iop/*.irx
 
 rebuild: clean all
 
@@ -207,7 +213,9 @@ info:
 	$(info EE_BIN = $(EE_BIN))
 	$(info EE_BIN_PKD = $(EE_BIN_PKD))
 	$(info EE_OBJS = $(EE_OBJS))
-	$(info TMANIP = $(TMANIP))
+	$(info TMANIP=$(TMANIP), SIO_DEBUG=$(SIO_DEBUG), DS34=$(DS34), ETH=$(ETH))
+	$(info EXFAT=$(EXFAT), XFROM=$(XFROM), UDPTTY=$(UDPTTY), MX4SIO=$(MX4SIO))
+	$(info IOP_RESET=$(IOP_RESET))
 
 #special recipe for compiling and dumping obj to subfolder
 $(EE_OBJS_DIR)%.o: $(EE_SRC_DIR)%.c | $(EE_OBJS_DIR)

diff --git a/README.md b/README.md
@@ -1,8 +1,10 @@
+# __wLaunchELF 4.43x_isr__
 [![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)
-![GitHub all releases](https://img.shields.io/github/downloads/israpps/wLaunchELF_ISR/total?logo=github)
-# __About this mod__
-this uLaunchELF mod was my first PS2 project.
+
+[![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)
+
+_this uLaunchELF mod was my first PS2 project._
 
 It features:
 
@@ -14,14 +16,9 @@ It features:
 
 > this mod is already bundled on any mod/project/repack made by me (and it´s auto-updated if that project is hosted here on github)
 
-### DOWNLOAD:
-- [Normal version](https://github.com/israpps/wLaunchELF_ISR/releases/tag/latest)
-- [Hardcoded Spanish](https://github.com/israpps/wLaunchELF_ISR/releases/tag/espa%C3%B1ol)
-
 ### Explanation of download filenames
 
-> release filename changes according to the included features:
-
+> release filename change according to the enabled features:
 
 - `BOOT`: Base filename, means nothing
 - `UNC`: Executable is Uncompressed
@@ -32,5 +29,7 @@ It features:
 - `DS34`: Support for use of PlayStation 3 and PlayStation 4 controllers
 - `MX4SIO`: Support for browsing the contents of SD Cards connected via mx4sio
 
+> 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.
diff --git a/embed.make b/embed.make
@@ -69,7 +69,9 @@ $(EE_ASM_DIR)ps2ip_irx.s: $(PS2SDK)/iop/irx/ps2ip.irx | $(EE_ASM_DIR)
 $(EE_ASM_DIR)udptty.s: $(PS2SDK)/iop/irx/udptty.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ udptty_irx
 
-$(EE_ASM_DIR)ps2smap_irx.s: $(PS2DEV)/ps2eth/smap/ps2smap.irx | $(EE_ASM_DIR)
+vpath ps2smap.irx $(PS2DEV)/ps2eth/smap/
+vpath ps2smap.irx iop/__precompiled/
+$(EE_ASM_DIR)ps2smap_irx.s: ps2smap.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ ps2smap_irx
 
 $(EE_ASM_DIR)ps2ftpd_irx.s: iop/ps2ftpd.irx | $(EE_ASM_DIR)

diff --git a/include/launchelf.h b/include/launchelf.h
@@ -164,9 +164,7 @@ typedef struct
 	char Misc_About_uLE[64];
 	char Misc_Show_Build_Info[64];
 	char Misc_OSDSYS[64];
-	char usbd_file[MAX_PATH];
 	char usbkbd_file[MAX_PATH];
-	char usbmass_file[MAX_PATH];
 	char kbdmap_file[MAX_PATH];
 	char skin[MAX_PATH];
 	char GUI_skin[MAX_PATH];

diff --git a/iop/Rules.make b/iop/Rules.make
@@ -25,6 +25,8 @@ DEBUG ?= 0
 ifneq ($(DEBUG), 0)
   $(info -- $(IOP_BIN): compiling with debug level $(DEBUG))
   IOP_CFLAGS += -DDEBUG=$(DEBUG)
+else
+.SILENT:
 endif
 
 IOP_INCS := $(IOP_INCS) -I$(PS2SDK)/iop/include -I$(PS2SDK)/common/include -Iinclude
@@ -40,37 +42,45 @@ BIN2O = $(PS2SDK)/bin/bin2o
 # Externally defined variables: IOP_BIN, IOP_OBJS, IOP_LIB
 
 %.o : %.c
-	$(IOP_CC) $(IOP_CFLAGS) -c $< -o $@
+	@echo IOPCC $@
+	@$(IOP_CC) $(IOP_CFLAGS) -c $< -o $@
 
 %.o : %.S
-	$(IOP_CC) $(IOP_CFLAGS) $(IOP_INCS) -c $< -o $@
+	@echo IOPCC $@
+	@$(IOP_CC) $(IOP_CFLAGS) $(IOP_INCS) -c $< -o $@
 
 %.o : %.s
-	$(IOP_AS) $(IOP_ASFLAGS) $< -o $@
+	@echo IOPAS $@
+	@$(IOP_AS) $(IOP_ASFLAGS) $< -o $@
 
 #Rules for the PS2SDK-styled projects (objects in objs/, binary in bin/)
 $(IOP_OBJS_DIR)%.o : $(IOP_SRC_DIR)%.c
-	$(IOP_CC) $(IOP_CFLAGS) -c $< -o $@
+	@echo IOPCC $@
+	@$(IOP_CC) $(IOP_CFLAGS) -c $< -o $@
 
 $(IOP_OBJS_DIR)%.o : $(IOP_SRC_DIR)%.S
-	$(IOP_CC) $(IOP_CFLAGS) $(IOP_INCS) -c $< -o $@
+	@echo IOPCC $@
+	@$(IOP_CC) $(IOP_CFLAGS) $(IOP_INCS) -c $< -o $@
 
 $(IOP_OBJS_DIR)%.o : $(IOP_SRC_DIR)%.s
-	$(IOP_AS) $(IOP_ASFLAGS) $< -o $@
+	@echo IOPAS $@
+	@$(IOP_AS) $(IOP_ASFLAGS) $< -o $@
 
 # A rule to build imports.lst.
 $(IOP_OBJS_DIR)%.o : $(IOP_SRC_DIR)%.lst
-	$(ECHO) "#include \"irx_imports.h\"" > $(IOP_OBJS_DIR)build-imports.c
-	cat $< >> $(IOP_OBJS_DIR)build-imports.c
-	$(IOP_CC) $(IOP_CFLAGS) -I$(IOP_SRC_DIR) -c $(IOP_OBJS_DIR)build-imports.c -o $@
-	-rm -f $(IOP_OBJS_DIR)build-imports.c
+	@echo IMPORT LIST
+	@$(ECHO) "#include \"irx_imports.h\"" > $(IOP_OBJS_DIR)build-imports.c
+	@cat $< >> $(IOP_OBJS_DIR)build-imports.c
+	@$(IOP_CC) $(IOP_CFLAGS) -I$(IOP_SRC_DIR) -c $(IOP_OBJS_DIR)build-imports.c -o $@
+	@-rm -f $(IOP_OBJS_DIR)build-imports.c
 
 # A rule to build exports.tab.
 $(IOP_OBJS_DIR)%.o : $(IOP_SRC_DIR)%.tab
-	$(ECHO) "#include \"irx.h\"" > $(IOP_OBJS_DIR)build-exports.c
-	cat $< >> $(IOP_OBJS_DIR)build-exports.c
-	$(IOP_CC) $(IOP_CFLAGS) -I$(IOP_SRC_DIR) -c $(IOP_OBJS_DIR)build-exports.c -o $@
-	-rm -f $(IOP_OBJS_DIR)build-exports.c
+	@echo EXPORT TAB
+	@$(ECHO) "#include \"irx.h\"" > $(IOP_OBJS_DIR)build-exports.c
+	@cat $< >> $(IOP_OBJS_DIR)build-exports.c
+	@$(IOP_CC) $(IOP_CFLAGS) -I$(IOP_SRC_DIR) -c $(IOP_OBJS_DIR)build-exports.c -o $@
+	@-rm -f $(IOP_OBJS_DIR)build-exports.c
 
 $(IOP_OBJS_DIR):
 	$(MKDIR) -p $(IOP_OBJS_DIR)
@@ -83,17 +93,19 @@ $(IOP_LIB_DIR):
 
 # A rule to build imports.lst.
 %.o : %.lst
-	$(ECHO) "#include \"irx_imports.h\"" > build-imports.c
-	cat $< >> build-imports.c
-	$(IOP_CC) $(IOP_CFLAGS) -I. -c build-imports.c -o $@
-	-rm -f build-imports.c
+	@echo IMPORT LIST
+	@$(ECHO) "#include \"irx_imports.h\"" > build-imports.c
+	@cat $< >> build-imports.c
+	@$(IOP_CC) $(IOP_CFLAGS) -I. -c build-imports.c -o $@
+	@-rm -f build-imports.c
 
 # A rule to build exports.tab.
 %.o : %.tab
-	$(ECHO) "#include \"irx.h\"" > build-exports.c
-	cat $< >> build-exports.c
-	$(IOP_CC) $(IOP_CFLAGS) -I. -c build-exports.c -o $@
-	-rm -f build-exports.c
+	@echo EXPORT TAB
+	@$(ECHO) "#include \"irx.h\"" > build-exports.c
+	@cat $< >> build-exports.c
+	@$(IOP_CC) $(IOP_CFLAGS) -I. -c build-exports.c -o $@
+	@-rm -f build-exports.c
 
 $(IOP_BIN): $(IOP_OBJS)
 	$(IOP_CC) $(IOP_CFLAGS) -o $@ $(IOP_OBJS) $(IOP_LDFLAGS) $(IOP_LIBS)

diff --git a/iop/__precompiled/ps2smap.irx b/iop/__precompiled/ps2smap.irx
diff --git a/iop/ps2host/net_fsys.c b/iop/ps2host/net_fsys.c
@@ -234,9 +234,9 @@ static int fsysIoctl(iop_file_t *file, unsigned long request, void *data)
 	int remote_fd = ((struct filedesc_info *)file)->own_fd;
 	int ret;
 	dbgprintf("fsysioctl..\n");
-	dbgprintf("  fd: %x\n"
+	/*dbgprintf("  fd: %x\n"
 	          "  rq: %x\n"
-	          "  dp: %x\n\n", );
+	          "  dp: %x\n\n", );*/
 
 	remove_flag = 0;