Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ps2homebrew/wLaunchELF
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: israpps/wLaunchELF_ISR
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
Loading
Showing with 10,520 additions and 1,352 deletions.
  1. +55 −0 .github/ISSUE_TEMPLATE/issue.yml
  2. +0 −22 .github/workflows/check-format.yml
  3. +0 −49 .github/workflows/compilation.yml
  4. +108 −0 .github/workflows/compile.yml
  5. +10 −2 .gitignore
  6. +6 −0 .vscode/settings.json
  7. +332 −0 Lang/ENG.LNG
  8. +333 −0 Lang/SPA.LNG
  9. +198 −119 Makefile
  10. +33 −2 README.md
  11. +0 −96 Rules.make
  12. +7 −7 docs/LAUNCHELF.CNF
  13. +1 −1 docs/SMB.CNF
  14. +209 −0 embed.make
  15. 0 { → include}/SMB_test.h
  16. +15 −0 include/cdvd_macro.h
  17. 0 { → include}/hdl_rpc.h
  18. +12 −0 include/lang.h
  19. +38 −15 { → include}/launchelf.h
  20. 0 { → include}/ps2smb.h
  21. +49 −0 include/snippets/readCD.h
  22. +0 −2 { → iop}/AllowDVDV/AllowDVDV.c
  23. +2 −1 { → iop}/AllowDVDV/Makefile
  24. 0 { → iop}/AllowDVDV/imports.lst
  25. 0 { → iop}/AllowDVDV/irx_imports.h
  26. +117 −0 iop/Rules.make
  27. BIN iop/__precompiled/bdm.irx
  28. BIN iop/__precompiled/bdmfs_fatfs.irx
  29. BIN iop/__precompiled/cdfs.irx
  30. BIN iop/__precompiled/mcman.irx
  31. BIN iop/__precompiled/mcserv.irx
  32. BIN iop/__precompiled/mx4sio_bd.irx
  33. BIN iop/__precompiled/ppctty.irx
  34. BIN iop/__precompiled/ps2smap.irx
  35. BIN iop/__precompiled/sio2man.irx
  36. BIN iop/__precompiled/tty2sior.irx
  37. BIN iop/__precompiled/usbmass_bd.irx
  38. +11 −0 iop/ds34bt/Makefile
  39. +15 −0 iop/ds34bt/ee/Makefile
  40. +173 −0 iop/ds34bt/ee/libds34bt.c
  41. +33 −0 iop/ds34bt/ee/libds34bt.h
  42. +11 −0 iop/ds34bt/iop/Makefile
  43. +1,719 −0 iop/ds34bt/iop/ds34bt.c
  44. +376 −0 iop/ds34bt/iop/ds34bt.h
  45. +34 −0 iop/ds34bt/iop/imports.lst
  46. +37 −0 iop/ds34bt/iop/irx_imports.h
  47. +180 −0 iop/ds34bt/iop/smsutils.S
  48. +11 −0 iop/ds34usb/Makefile
  49. +15 −0 iop/ds34usb/ee/Makefile
  50. +145 −0 iop/ds34usb/ee/libds34usb.c
  51. +19 −0 iop/ds34usb/ee/libds34usb.h
  52. +11 −0 iop/ds34usb/iop/Makefile
  53. +806 −0 iop/ds34usb/iop/ds34usb.c
  54. +188 −0 iop/ds34usb/iop/ds34usb.h
  55. +33 −0 iop/ds34usb/iop/imports.lst
  56. +37 −0 iop/ds34usb/iop/irx_imports.h
  57. +180 −0 iop/ds34usb/iop/smsutils.S
  58. +4 −1 { → iop}/hdl_info/Makefile
  59. +2 −4 { → iop}/hdl_info/apa.c
  60. 0 { → iop}/hdl_info/apa.h
  61. 0 { → iop}/hdl_info/exports.tab
  62. 0 { → iop}/hdl_info/hdd.c
  63. 0 { → iop}/hdl_info/hdd.h
  64. 0 { → iop}/hdl_info/hdl.c
  65. 0 { → iop}/hdl_info/hdl.h
  66. 0 { → iop}/hdl_info/imports.lst
  67. 0 { → iop}/hdl_info/irx_imports.h
  68. +1 −0 { → iop}/hdl_info/main.c
  69. 0 { → iop}/hdl_info/main.h
  70. 0 { → iop}/hdl_info/ps2_hdd.h
  71. +19 −0 iop/oldlibs/libcdvd/Makefile
  72. +45 −0 iop/oldlibs/libcdvd/common/cdvd.h
  73. BIN iop/oldlibs/libcdvd/docs/libcdvd_ref.pdf
  74. +10 −0 iop/oldlibs/libcdvd/ee/Makefile
  75. +135 −0 iop/oldlibs/libcdvd/ee/cdvd_rpc.c
  76. +28 −0 iop/oldlibs/libcdvd/ee/cdvd_rpc.h
  77. +17 −0 iop/oldlibs/libcdvd/example/Makefile
  78. +425 −0 iop/oldlibs/libcdvd/example/example.cpp
  79. BIN iop/oldlibs/libcdvd/example/font.fnt
  80. +12 −0 iop/oldlibs/libcdvd/iop/Makefile
  81. +54 −0 iop/oldlibs/libcdvd/iop/Rules.make
  82. +1,843 −0 iop/oldlibs/libcdvd/iop/cdvd_iop.c
  83. +84 −0 iop/oldlibs/libcdvd/iop/cdvd_iop.h
  84. +58 −0 iop/oldlibs/libcdvd/iop/imports.lst
  85. +8 −0 iop/oldlibs/libcdvd/iop/irx_imports.h
  86. +45 −0 iop/oldlibs/libcdvd/license.txt
  87. 0 { → iop}/oldlibs/ps2ftpd/LICENSE
  88. +4 −4 { → iop}/oldlibs/ps2ftpd/Makefile
  89. 0 { → iop}/oldlibs/ps2ftpd/README
  90. +3 −23 { → iop}/oldlibs/ps2ftpd/Rules.make
  91. 0 { → iop}/oldlibs/ps2ftpd/changes.txt
  92. 0 { → iop}/oldlibs/ps2ftpd/src/FileSystem.c
  93. 0 { → iop}/oldlibs/ps2ftpd/src/FileSystem.h
  94. +2 −2 { → iop}/oldlibs/ps2ftpd/src/FtpClient.c
  95. 0 { → iop}/oldlibs/ps2ftpd/src/FtpClient.h
  96. 0 { → iop}/oldlibs/ps2ftpd/src/FtpCommands.c
  97. 0 { → iop}/oldlibs/ps2ftpd/src/FtpMessages.c
  98. 0 { → iop}/oldlibs/ps2ftpd/src/FtpMessages.h
  99. +1 −1 { → iop}/oldlibs/ps2ftpd/src/FtpServer.c
  100. 0 { → iop}/oldlibs/ps2ftpd/src/FtpServer.h
  101. 0 { → iop}/oldlibs/ps2ftpd/src/Makefile.linux
  102. 0 { → iop}/oldlibs/ps2ftpd/src/imports.lst
  103. 0 { → iop}/oldlibs/ps2ftpd/src/irx_imports.h
  104. 0 { → iop}/oldlibs/ps2ftpd/src/main.c
  105. +2 −2 { → iop}/ps2host/Makefile
  106. 0 { → iop}/ps2host/hostlink.h
  107. 0 { → iop}/ps2host/imports.lst
  108. 0 { → iop}/ps2host/irx_imports.h
  109. +2 −2 { → iop}/ps2host/net_fio.c
  110. 0 { → iop}/ps2host/net_fio.h
  111. +2 −2 { → iop}/ps2host/net_fsys.c
  112. 0 { → iop}/ps2host/ps2host.c
  113. +7 −2 { → iop}/vmc_fs/Makefile
  114. 0 { → iop}/vmc_fs/imports.lst
  115. 0 { → iop}/vmc_fs/irx_imports.h
  116. +11 −19 { → iop}/vmc_fs/vmc.h
  117. 0 { → iop}/vmc_fs/vmc_fat.c
  118. +8 −9 { → iop}/vmc_fs/vmc_fs.c
  119. +166 −166 { → iop}/vmc_fs/vmc_io.c
  120. +45 −47 { → iop}/vmc_fs/vmc_misc.c
  121. 0 { → iop}/vmc_fs/vmc_ps2.c
  122. +0 −379 lang.h
  123. +22 −3 loader/Rules.make
  124. +6 −6 { → src}/SMB_test.c
  125. 0 { → src}/chkesr.c
  126. +35 −55 { → src}/config.c
  127. +21 −17 { → src}/draw.c
  128. +1 −1 { → src}/editor.c
  129. +32 −0 { → src}/elf.c
  130. +651 −58 { → src}/filer.c
  131. +1 −1 { → src}/font_uLE.c
  132. +19 −19 { → src}/hdd.c
  133. +2 −2 { → src}/hdl_rpc.c
  134. 0 { → src}/icon.c
  135. +10 −10 { → src}/jpgviewer.c
  136. +3 −0 { → src}/lang.c
  137. +639 −201 { → src}/main.c
  138. 0 { → src}/makeicon.c
  139. 0 { → src}/pad.c
  140. +476 −0 src/pad_ds34.c
  141. 0 { → src}/timer.c
55 changes: 55 additions & 0 deletions .github/ISSUE_TEMPLATE/issue.yml
Original file line number Diff line number Diff line change
@@ -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

22 changes: 0 additions & 22 deletions .github/workflows/check-format.yml

This file was deleted.

49 changes: 0 additions & 49 deletions .github/workflows/compilation.yml

This file was deleted.

108 changes: 108 additions & 0 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
name: Automated-Build

on:
workflow_dispatch:
inputs:
make_args:
description: pass extra make argumments to control features not explicitly handled by CI
push:
repository_dispatch:
types: [run_build]

jobs:
build:
strategy:
fail-fast: false
matrix:
eth: ["ETH=0", "ETH=1"]
bdmstuff: ["EXFAT=0", "EXFAT=1", "EXFAT=1 MX4SIO=1"]
ds34: ["DS34=0", "DS34=1"]
runs-on: ubuntu-latest
container: ps2dev/ps2dev:v1.0
steps:

- name: Install dependencies
run: |
apk add make git zip
- uses: actions/checkout@v3
- run: |
git config --global --add safe.directory "$GITHUB_WORKSPACE"
git fetch --prune --unshallow
- name: Compile wLaunchELF
run: |
make rebuild ${{ matrix.eth }} ${{ matrix.sior }} ${{ matrix.bdmstuff }} ${{ matrix.ds34 }} ${{ matrix.xfrom }} ${{ github.event.inputs.make_args }}
- name: Upload variants artifact ELF
uses: actions/upload-artifact@v3
with:
name: WLE
path: |
BOOT*.ELF
#######################################################
release:
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
needs: [build]
steps:

- uses: actions/checkout@v3
- run: |
git config --global --add safe.directory "$GITHUB_WORKSPACE"
git fetch --prune --unshallow
- name: Download all artifacts
uses: actions/download-artifact@v3

- name: list
run: |
ls -R
- name: Create release
if: github.ref == 'refs/heads/master'
uses: marvinpinto/action-automatic-releases@latest
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "latest"
title: "Latest automated build"
prerelease: false
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
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "language-files"
title: "Translations"
files: |
Lang/*.LNG
trigger-auto-update:
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
needs: [release]
strategy:
matrix:
repos: [israpps/FreeMcBoot-Installer, israpps/Funtuna-Fork , israpps/PlayStation2-Basic-BootLoader]
steps:
- name: trigger israpps auto-update system
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
uses: peter-evans/repository-dispatch@v1
with:
token: ${{ secrets.IUS }}
repository: ${{ matrix.repos }}
event-type: Component_update
client-payload: '{"sha": "${{ github.sha }}"}'
12 changes: 10 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -7,5 +7,13 @@
*.swp
*.tmp
*.irx
*.s
githash.h

asm/*
obj/*

githash.h
!iop/__precompiled/*
iop/vmc_fs.irx
iso/
*.iso
*.zip
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"files.associations": {
"*.make": "makefile",
"libds34bt.h": "c"
}
}
Loading