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.

Sign up for GitHub

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

Implement osViGetCurrentLine, osViGetCurrentField & osViGetStatus #51

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+29 −0
Draft

Implement osViGetCurrentLine, osViGetCurrentField & osViGetStatus #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8719abe
Implement osViGetCurrentLine and osViGetCurrentField
dcvz Jun 19, 2024
8b58002
Implement osViGetStatus
dcvz Jun 19, 2024
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
12 changes: 12 additions & 0 deletions librecomp/src/vi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@ extern "C" void osViRepeatLine_recomp(uint8_t* rdram, recomp_context* ctx) {
osViRepeatLine(_arg<0, u8>(rdram, ctx));
}

extern "C" void osViGetCurrentLine_recomp(uint8_t* rdram, recomp_context* ctx) {
ctx->r2 = (gpr)osViGetCurrentLine();
}

extern "C" void osViGetCurrentField_recomp(uint8_t* rdram, recomp_context* ctx) {
ctx->r2 = (gpr)osViGetCurrentField();
}

extern "C" void osViGetStatus_recomp(uint8_t* rdram, recomp_context* ctx) {
ctx->r2 = (gpr)osViGetStatus();
}

extern "C" void osViSetSpecialFeatures_recomp(uint8_t* rdram, recomp_context* ctx) {
osViSetSpecialFeatures((uint32_t)ctx->r4);
}
Expand Down
5 changes: 5 additions & 0 deletions ultramodern/include/ultramodern/ultra64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ typedef uint8_t u8;
# ifdef __cplusplus
# define NULLPTR (PTR(void))0
# endif
# define PHYS_TO_K1(x) ((x)|0xA0000000)
# define IO_READ(addr) (*(volatile uint32_t*)PHYS_TO_K1(addr))
#endif

#ifndef NULL
Expand Down Expand Up @@ -285,6 +287,9 @@ void osViSetMode(RDRAM_ARG PTR(OSViMode));
void osViSetSpecialFeatures(uint32_t func);
void osViBlack(uint8_t active);
void osViRepeatLine(uint8_t active);
u32 osViGetCurrentLine();
u32 osViGetCurrentField();
u32 osViGetStatus();
void osViSetXScale(float scale);
void osViSetYScale(float scale);
PTR(void) osViGetNextFramebuffer();
Expand Down
12 changes: 12 additions & 0 deletions ultramodern/src/events.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,18 @@ extern "C" void osViRepeatLine(uint8_t active) {
}
}

extern "C" u32 osViGetCurrentLine() {
return IO_READ(VI_V_CURRENT_LINE_REG);
}

extern "C" u32 osViGetCurrentField() {
return IO_READ(VI_V_CURRENT_LINE_REG) & 1;
}

extern "C" u32 osViGetStatus() {
return IO_READ(VI_STATUS_REG);
}

extern "C" void osViSetXScale(float scale) {
if (scale != 1.0f) {
assert(false);
Expand Down