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
2026-01-21 10:37:37 -08:00 · 2022-11-13 07:16:01 +00:00
parent d8175501ad
commit efe485f017
62 changed files with 1058 additions and 477 deletions
--- a/include/libc/math.h
+++ b/include/libc/math.h
@@ -1,7 +1,7 @@
 #ifndef MATH_H
 #define MATH_H

-#include "ultra64/types.h"
+#include "ultra64/ultratypes.h"

 #define M_PI 3.14159265358979323846f
 #define M_SQRT2 1.41421356237309504880f
--- a/include/ultra64.h
+++ b/include/ultra64.h
@@ -1,7 +1,7 @@
 #ifndef ULTRA64_H
 #define ULTRA64_H

-#include "ultra64/types.h"
+#include "ultra64/ultratypes.h"
 #include "unk.h"

 #include "libc/stdarg.h"
@@ -13,8 +13,6 @@

 #include "ultra64/exception.h"
 #include "ultra64/rcp.h"
-#include "ultra64/rdp.h"
-#include "ultra64/rsp.h"
 #include "ultra64/thread.h"
 #include "ultra64/convert.h"
 #include "ultra64/time.h"
@@ -28,7 +26,7 @@
 #include "ultra64/mbi.h"
 #include "ultra64/pfs.h"
 #include "ultra64/motor.h"
-#include "ultra64/r4300.h"
+#include "ultra64/R4300.h"
 #include "ultra64/ucode.h"

 #endif
--- a/include/ultra64/R4300.h
+++ b/include/ultra64/R4300.h
@@ -2,7 +2,7 @@
 #define ULTRA64_R4300_H

 #ifdef _LANGUAGE_C
-#include "types.h"
+#include "ultratypes.h"
 #define U32(x) ((u32)x)
 #define C_REG(x) (x)
 #else
--- a/include/ultra64/controller.h
+++ b/include/ultra64/controller.h
@@ -3,19 +3,6 @@

 #include "message.h"

-/**
- * Controller channel
- * Each game controller channel has 4 error bits that are defined in bit 6-7 of
- * the Rx and Tx data size area bytes. Programmers need to clear these bits
- * when setting the Tx/Rx size area values for a channel
- */
-#define CHNL_ERR_NORESP     0x80    /* Bit 7 (Rx): No response error */
-#define CHNL_ERR_OVERRUN    0x40    /* Bit 6 (Rx): Overrun error */
-#define CHNL_ERR_FRAME      0x80    /* Bit 7 (Tx): Frame error */
-#define CHNL_ERR_COLLISION  0x40    /* Bit 6 (Tx): Collision error */
-
-#define CHNL_ERR_MASK       0xC0    /* Bit 6-7: channel errors */
-
 #define CHNL_ERR(readFormat) (((readFormat).rxsize & CHNL_ERR_MASK) >> 4)

 #define BLOCKSIZE 32
--- a/include/ultra64/exception.h
+++ b/include/ultra64/exception.h
@@ -28,7 +28,7 @@

 #ifdef _LANGUAGE_C

-#include "types.h"
+#include "ultratypes.h"

 typedef u32 OSIntMask;
 typedef u32 OSHWIntr;
--- a/include/ultra64/pi.h
+++ b/include/ultra64/pi.h
@@ -74,10 +74,4 @@ typedef struct {
 #define OS_MESG_PRI_NORMAL  0
 #define OS_MESG_PRI_HIGH    1

-#define DEVICE_TYPE_CART    0   /* ROM cartridge */
-#define DEVICE_TYPE_BULK    1   /* ROM bulk */
-#define DEVICE_TYPE_64DD    2   /* 64 Disk Drive */
-#define DEVICE_TYPE_SRAM    3   /* SRAM */
-#define DEVICE_TYPE_INIT    7   /* initial value */
-
 #endif
--- a/include/ultra64/printf.h
+++ b/include/ultra64/printf.h
@@ -1,7 +1,7 @@
 #ifndef ULTRA64_PRINTF_H
 #define ULTRA64_PRINTF_H

-#include "types.h"
+#include "ultratypes.h"

 typedef struct {
    /* 0x0 */ union {
--- a/include/ultra64/rcp.h
+++ b/include/ultra64/rcp.h
--- a/include/ultra64/rdb.h
+++ b/include/ultra64/rdb.h
@@ -68,7 +68,7 @@

 #if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS)

-#include "types.h"
+#include "ultratypes.h"

 /* Structure for debug port */
 typedef struct {
--- a/include/ultra64/rdp.h
+++ b/include/ultra64/rdp.h
@@ -1,51 +0,0 @@
-#ifndef ULTRA64_RDP_H
-#define ULTRA64_RDP_H
-
-/* DP Command Registers */
-
-#define DPC_REG_BASE 0xA4100000
-
-#define DPC_START_REG       (*(vu32*)(DPC_REG_BASE + 0x00))
-#define DPC_END_REG         (*(vu32*)(DPC_REG_BASE + 0x04))
-#define DPC_CURRENT_REG     (*(vu32*)(DPC_REG_BASE + 0x08))
-#define DPC_STATUS_REG      (*(vu32*)(DPC_REG_BASE + 0x0C))
-#define DPC_CLOCK_REG       (*(vu32*)(DPC_REG_BASE + 0x10))
-#define DPC_BUFBUSY_REG     (*(vu32*)(DPC_REG_BASE + 0x14))
-#define DPC_PIPEBUSY_REG    (*(vu32*)(DPC_REG_BASE + 0x18))
-#define DPC_TMEM_REG        (*(vu32*)(DPC_REG_BASE + 0x1C))
-
-/* DP Span Registers */
-
-#define DPS_REG_BASE        0xA4200000
-
-#define DPS_TBIST_REG        (*(vu32*)(DPS_REG_BASE + 0x00))
-#define DPS_TEST_MODE_REG    (*(vu32*)(DPS_REG_BASE + 0x04))
-#define DPS_BUFTEST_ADDR_REG (*(vu32*)(DPS_REG_BASE + 0x08))
-#define DPS_BUFTEST_DATA_REG (*(vu32*)(DPS_REG_BASE + 0x0C))
-
-/* DP Status Read Flags */
-#define DPC_STATUS_XBUS_DMEM_DMA    0x001
-#define DPC_STATUS_FREEZE           0x002
-#define DPC_STATUS_FLUSH            0x004
-#define DPC_STATUS_START_GCLK       0x008
-#define DPC_STATUS_TMEM_BUSY        0x010
-#define DPC_STATUS_PIPE_BUSY        0x020
-#define DPC_STATUS_CMD_BUSY         0x040
-#define DPC_STATUS_CBUF_READY       0x080
-#define DPC_STATUS_DMA_BUSY         0x100
-#define DPC_STATUS_END_VALID        0x200
-#define DPC_STATUS_START_VALID      0x400
-
-/* DP Status Write Flags */
-#define DPC_CLR_XBUS_DMEM_DMA   0x0001
-#define DPC_SET_XBUS_DMEM_DMA   0x0002
-#define DPC_CLR_FREEZE          0x0004
-#define DPC_SET_FREEZE          0x0008
-#define DPC_CLR_FLUSH           0x0010
-#define DPC_SET_FLUSH           0x0020
-#define DPC_CLR_TMEM_CTR        0x0040
-#define DPC_CLR_PIPE_CTR        0x0080
-#define DPC_CLR_CMD_CTR         0x0100
-#define DPC_CLR_CLOCK_CTR       0x0200
-
-#endif
--- a/include/ultra64/rsp.h
+++ b/include/ultra64/rsp.h
@@ -1,50 +0,0 @@
-#ifndef ULTRA64_RSP_H
-#define ULTRA64_RSP_H
-
-/* SP Status Flags */
-#define SP_STATUS_HALT          0x001
-#define SP_STATUS_BROKE         0x002
-#define SP_STATUS_DMA_BUSY      0x004
-#define SP_STATUS_DMA_FULL      0x008
-#define SP_STATUS_IO_FULL       0x010
-#define SP_STATUS_SSTEP         0x020
-#define SP_STATUS_INTR_BREAK    0x040
-#define SP_STATUS_YIELD         0x080
-#define SP_STATUS_YIELDED       0x100
-#define SP_STATUS_TASKDONE      0x200
-//#define SP_STATUS_SIG0        0x080
-//#define SP_STATUS_SIG1        0x100
-//#define SP_STATUS_SIG2        0x200
-#define SP_STATUS_SIG3          0x400
-#define SP_STATUS_SIG4          0x800
-#define SP_STATUS_SIG5          0x1000
-#define SP_STATUS_SIG6          0x2000
-#define SP_STATUS_SIG7          0x4000
-
-#define SP_CLR_HALT         0x00001
-#define SP_SET_HALT         0x00002
-#define SP_CLR_BROKE        0x00004
-#define SP_CLR_INTR         0x00008
-#define SP_SET_INTR         0x00010
-#define SP_CLR_SSTEP        0x00020
-#define SP_SET_SSTEP        0x00040
-#define SP_CLR_INTR_BREAK   0x00080
-#define SP_SET_INTR_BREAK   0x00100
-#define SP_CLR_SIG0         0x00200
-#define SP_SET_SIG0         0x00400
-#define SP_CLR_SIG1         0x00800
-#define SP_SET_SIG1         0x01000
-#define SP_CLR_SIG2         0x02000
-#define SP_SET_SIG2         0x04000
-#define SP_CLR_SIG3         0x08000
-#define SP_SET_SIG3         0x10000
-#define SP_CLR_SIG4         0x20000
-#define SP_SET_SIG4         0x40000
-#define SP_CLR_SIG5         0x80000
-#define SP_SET_SIG5         0x100000
-#define SP_CLR_SIG6         0x200000
-#define SP_SET_SIG6         0x400000
-#define SP_CLR_SIG7         0x800000
-#define SP_SET_SIG7         0x1000000
-
-#endif
--- a/include/ultra64/sptask.h
+++ b/include/ultra64/sptask.h
@@ -1,7 +1,7 @@
 #ifndef ULTRA64_SPTASK_H
 #define ULTRA64_SPTASK_H

-#include "types.h"
+#include "ultratypes.h"

 /* Task Types */
 #define M_NULTASK   0
--- a/include/ultra64/thread.h
+++ b/include/ultra64/thread.h
@@ -22,7 +22,7 @@

 #ifdef _LANGUAGE_C

-#include "types.h"
+#include "ultratypes.h"

 typedef s32 OSPri;
 typedef s32 OSId;
--- a/include/ultra64/ucode.h
+++ b/include/ultra64/ucode.h
@@ -1,7 +1,7 @@
 #ifndef ULTRA64_UCODE_H
 #define ULTRA64_UCODE_H

-#include "types.h"
+#include "ultratypes.h"

 #define SP_DRAM_STACK_SIZE8     (0x400)
 #define SP_DRAM_STACK_SIZE64    (SP_DRAM_STACK_SIZE8 >> 3)
--- a/include/ultra64/ultratypes.h
+++ b/include/ultra64/ultratypes.h
@@ -1,5 +1,7 @@
-#ifndef ULTRA64_TYPES_H
-#define ULTRA64_TYPES_H
+#ifndef ULTRA64_ULTRATYPES_H
+#define ULTRA64_ULTRATYPES_H
+
+#ifdef _LANGUAGE_C

 typedef signed char            s8;
 typedef unsigned char          u8;
@@ -37,3 +39,5 @@ typedef union {
 } MtxF;

 #endif
+
+#endif
--- a/include/z64curve.h
+++ b/include/z64curve.h
@@ -1,7 +1,7 @@
 #ifndef Z64_CURVE_H
 #define Z64_CURVE_H

-#include "ultra64/types.h"
+#include "ultra64/ultratypes.h"
 #include "z64math.h"

 struct PlayState;
--- 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) {
--- 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();
 }
--- a/src/libultra/gu/sintable.inc.c
+++ b/src/libultra/gu/sintable.inc.c
@@ -1,4 +1,4 @@
-#include "ultra64/types.h"
+#include "ultra64/ultratypes.h"

 static s16 sintable[0x400] = {
    0x0000, 0x0032, 0x0064, 0x0096, 0x00C9, 0x00FB, 0x012D, 0x0160, 0x0192, 0x01C4, 0x01F7, 0x0229, 0x025B, 0x028E,
--- a/src/libultra/io/aigetlen.c
+++ b/src/libultra/io/aigetlen.c
@@ -1,5 +1,11 @@
 #include "global.h"

+/**
+ * Returns the number of bytes remaining in a currently ongoing audio DMA.
+ *
+ * Note that audio DMA is double-buffered, a DMA can be queued while another is in-progress. This only returns
+ * information about the currently in-progress DMA.
+ */
 u32 osAiGetLength(void) {
-    return HW_REG(AI_LEN_REG, u32);
+    return IO_READ(AI_LEN_REG);
 }
--- a/Show More
+++ b/Show More