diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2022-11-13 07:16:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-13 02:16:01 -0500 |
| commit | efe485f01720034ea9e844b3f385e3352bb63b20 (patch) | |
| tree | 40650cd20948aace578932bc1dafa402e814feaa /src/code | |
| parent | d8175501adac32dd10918f67f1a7ea278e2ed862 (diff) | |
Improve rcp.h, remove `HW_REG` macro (#1425)
* Real rcp.h
* Correction to comment in initialize.c
* Try fix R4300.h
* Adjust rcp.h formatting, remove defines in other headers that are now in rcp.h
* Suggested changes, document a bug in the modified osAiSetNextBuffer
* More rcp.h formatting changes
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/graph.c | 8 | ||||
| -rw-r--r-- | src/code/rcp_utils.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/code/graph.c b/src/code/graph.c index 0deb81fb8..bbd87434c 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -175,8 +175,8 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { osSyncPrintf("RCPが帰ってきませんでした。"); // "RCP did not return." osSyncPrintf(VT_RST); - LogUtils_LogHexDump((void*)&HW_REG(SP_MEM_ADDR_REG, u32), 0x20); - LogUtils_LogHexDump((void*)&DPC_START_REG, 0x20); + LogUtils_LogHexDump((void*)PHYS_TO_K1(SP_BASE_REG), 0x20); + LogUtils_LogHexDump((void*)PHYS_TO_K1(DPC_BASE_REG), 0x20); LogUtils_LogHexDump(gGfxSPTaskYieldBuffer, sizeof(gGfxSPTaskYieldBuffer)); SREG(6) = -1; @@ -321,8 +321,8 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { } if (HREG(81) < 0) { - LogUtils_LogHexDump((void*)&HW_REG(SP_MEM_ADDR_REG, u32), 0x20); - LogUtils_LogHexDump((void*)&DPC_START_REG, 0x20); + LogUtils_LogHexDump((void*)PHYS_TO_K1(SP_BASE_REG), 0x20); + LogUtils_LogHexDump((void*)PHYS_TO_K1(DPC_BASE_REG), 0x20); } if (HREG(81) < 0) { diff --git a/src/code/rcp_utils.c b/src/code/rcp_utils.c index 5c14c39f9..e258ab02f 100644 --- a/src/code/rcp_utils.c +++ b/src/code/rcp_utils.c @@ -50,6 +50,6 @@ void RcpUtils_Reset(void) { // Flush the RDP pipeline and freeze clock counter osDpSetStatus(DPC_SET_FREEZE | DPC_SET_FLUSH); // Halt the RSP, disable interrupt on break and set "task done" signal - __osSpSetStatus(SP_SET_HALT | SP_SET_SIG2 | SP_CLR_INTR_BREAK); + __osSpSetStatus(SP_SET_HALT | SP_SET_TASKDONE | SP_CLR_INTR_BREAK); RcpUtils_PrintRegisterStatus(); } |