Compare commits

...

9 Commits

Author SHA1 Message Date
Maschell
aed781e88d Fix exiting when running some payloads (like the nand dumper) 2024-05-07 19:11:21 +02:00
Maschell
88d25a79c3 Fix Makefile to be compatible with CLion 2024-04-26 10:33:05 +02:00
Maschell
a6bc48e987 Fix checking button combo 2024-04-26 10:33:05 +02:00
dependabot[bot]
3f71bb4d7f Bump softprops/action-gh-release from 1 to 2
Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-24 17:42:22 +02:00
Maschell
1dd3adff65 Update Dockerfile to use latest devkitPPC and wut version 2024-04-24 17:42:22 +02:00
dependabot[bot]
bd90e0ef1c Bump actions/checkout from 2 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-24 17:42:22 +02:00
Maschell
162119a289 Overwrite wuts __syscall_getreent 2024-04-24 17:42:22 +02:00
Maschell
8b6b5c3412 Update Dockerfile 2024-04-24 17:42:22 +02:00
Maschell
4c57a3d597 Create dependabot.yml 2023-07-23 10:38:20 +02:00
7 changed files with 33 additions and 12 deletions

10
.github/dependabot.yml vendored Normal file
View File

@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"

View File

@ -9,7 +9,7 @@ jobs:
clang-format:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: clang-format
run: |
docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./src
@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-22.04
needs: clang-format
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: build binary
run: |
docker build . -t builder
@ -42,7 +42,7 @@ jobs:
- name: zip artifact
run: zip -r ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip wiiu
- name: Create Release
uses: "softprops/action-gh-release@v1"
uses: "softprops/action-gh-release@v2"
with:
tag_name: ${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
draft: false

View File

@ -6,7 +6,7 @@ jobs:
clang-format:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: clang-format
run: |
docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./src
@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04
needs: clang-format
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: build binary
run: |
docker build . -t builder

View File

@ -1,3 +1,3 @@
FROM ghcr.io/wiiu-env/devkitppc:20230417
FROM ghcr.io/wiiu-env/devkitppc:20240505
WORKDIR project

View File

@ -127,7 +127,7 @@ export OUTPUT := $(CURDIR)/$(TARGET)
#---------------------------------------------------------------------------------
$(BUILD):
@[ -d $@ ] || mkdir -p $@
@$(shell [ ! -d $(BUILD) ] && mkdir -p $(BUILD))
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile

View File

@ -59,6 +59,7 @@ IMPORT(OSGetThreadSpecific);
IMPORT(OSSetThreadSpecific);
IMPORT(OSReport);
IMPORT(OSSwapAtomic);
IMPORT(OSIsDebuggerPresent);
IMPORT(exit);
IMPORT(_Exit);

View File

@ -57,11 +57,16 @@ extern "C" uint32_t start_wrapper(int argc, char **argv) {
DEBUG_FUNCTION_LINE_VERBOSE("Hello from payload.elf multiloader");
VPADReadError err;
VPADStatus vpad_data;
VPADRead(VPAD_CHAN_0, &vpad_data, 1, &err);
uint32_t btn = vpad_data.hold | vpad_data.trigger;
VPADStatus vpadStatus{};
VPADReadError vpadError = VPAD_READ_UNINITIALIZED;
int btn = 0;
do {
if (VPADRead(VPAD_CHAN_0, &vpadStatus, 1, &vpadError) > 0 && vpadError == VPAD_READ_SUCCESS) {
btn = vpadStatus.trigger | vpadStatus.hold;
} else {
OSSleepTicks(OSMillisecondsToTicks(1));
}
} while (vpadError == VPAD_READ_NO_SAMPLES);
std::map<std::string, std::string> payloads = get_all_payloads("wiiu/payloads");
@ -90,6 +95,10 @@ extern "C" uint32_t start_wrapper(int argc, char **argv) {
return entryPoint;
}
extern "C" struct _reent *__syscall_getreent(void) {
return _impure_ptr;
}
extern "C" int _start(int argc, char **argv) {
uint32_t entryPoint = start_wrapper(argc, argv);
@ -114,6 +123,7 @@ extern "C" int _start(int argc, char **argv) {
if (entryPoint != 0) {
res = ((int (*)(int, char **)) entryPoint)(argc, argv);
}
_Exit(0);
return res;
}