Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libleo: leochk_err_reg match + add noppad #69

Merged
merged 1 commit into from
Aug 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions splat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ segments:
- [0x51BC0, c, libleo/readwrite]
- [0x51C50, c, libleo/leofunc]
- [0x520C0, c, libleo/leoint]
- [0x52AB0, bin, noppad_52AB0] # again with the weird nop padding.
- [0x52AC0, c, libleo/leocmdex]
- [0x53150, c, libleo/leoread]
- [0x53310, c, libleo/lbatobyte]
Expand Down
4 changes: 0 additions & 4 deletions src/libleo/leoint.c
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ void leosetup_BM(void) {
osEPiWriteIo(LEOPiInfo, 0x05000510U, LEOasic_bm_ctl_shadow);
}

#ifdef NON_MATCHING
u32 leochk_err_reg(void) {
u32 sense;
u32 index_status;
Expand Down Expand Up @@ -272,6 +271,3 @@ u32 leochk_err_reg(void) {
}
return 0x18;
}
#else
#pragma GLOBAL_ASM("asm/nonmatchings/libleo/leoint/leochk_err_reg.s")
#endif