From 30710d7da271e9578bb34da546c4a1f31a8664df Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Sat, 2 Sep 2023 16:10:34 -0400
Subject: [PATCH] os symbols

---
 include/PR/os_system.h       | 22 ++++++++++++++++++++++
 include/PR/os_vi.h           |  3 ---
 include/variables.h          |  8 --------
 src/code/z_nmi_buff.c        |  2 +-
 src/libultra/os/initialize.c |  2 +-
 tools/disasm/variables.txt   |  2 +-
 undefined_syms.txt           |  2 +-
 7 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/include/PR/os_system.h b/include/PR/os_system.h
index 21f06f1642..adc2990a4e 100644
--- a/include/PR/os_system.h
+++ b/include/PR/os_system.h
@@ -3,6 +3,28 @@
 
 #include "ultratypes.h"
 
+/*
+ * Values for osTvType
+ */
+#define	OS_TV_PAL		0
+#define	OS_TV_NTSC		1
+#define	OS_TV_MPAL		2
+
+/*
+ * Size of buffer the retains contents after NMI
+ */
+#define OS_APP_NMI_BUFSIZE	64
+
+
+extern s32 osTvType;
+extern s32 osRomType;
+extern void* osRomBase;
+extern s32 osResetType;
+extern s32 osCicId;
+extern s32 osVersion;
+extern u32 osMemSize;
+extern s32 osAppNMIBuffer[];
+
 
 u32 osGetMemSize(void);
 s32 osAfterPreNMI(void);
diff --git a/include/PR/os_vi.h b/include/PR/os_vi.h
index e4098e97e4..33de7d14f5 100644
--- a/include/PR/os_vi.h
+++ b/include/PR/os_vi.h
@@ -113,9 +113,6 @@ typedef struct {
 #define OS_VI_FPAL_HPN2     54
 #define OS_VI_FPAL_HPF2     55
 
-#define OS_TV_PAL           0
-#define OS_TV_NTSC          1
-#define OS_TV_MPAL          2
 #define OS_VI_UNK28         28
 
 
diff --git a/include/variables.h b/include/variables.h
index 0f499fde43..1efcc2e900 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -6,14 +6,6 @@
 #include "macros.h"
 
 // pre-boot variables
-extern u32 osTvType;
-extern u32 osRomType;
-extern uintptr_t osRomBase;
-extern u32 osResetType;
-extern u32 osCicId;
-extern u32 osVersion;
-extern size_t osMemSize;
-extern s32 osAppNmiBuffer[0x10];
 extern u16 gFramebuffer1[SCREEN_HEIGHT][SCREEN_WIDTH]; // at 0x80000500
 extern u8 D_80025D00[];
 
diff --git a/src/code/z_nmi_buff.c b/src/code/z_nmi_buff.c
index eacfc5f469..8403459322 100644
--- a/src/code/z_nmi_buff.c
+++ b/src/code/z_nmi_buff.c
@@ -13,7 +13,7 @@ typedef struct {
 NmiBuff* gNMIBuffer;
 
 void Nmi_Init(void) {
-    gNMIBuffer = (NmiBuff*)osAppNmiBuffer;
+    gNMIBuffer = (NmiBuff*)osAppNMIBuffer;
     gNMIBuffer->resetting = false;
 
     if (osResetType == COLD_RESET) {
diff --git a/src/libultra/os/initialize.c b/src/libultra/os/initialize.c
index 8eb97c28c9..241c0346eb 100644
--- a/src/libultra/os/initialize.c
+++ b/src/libultra/os/initialize.c
@@ -59,7 +59,7 @@ void __osInitialize_common(void) {
     osClockRate = (u64)((osClockRate * 3LL) / 4ULL);
 
     if (osResetType == COLD_RESET) {
-        bzero(osAppNmiBuffer, 64);
+        bzero(osAppNMIBuffer, OS_APP_NMI_BUFSIZE);
     }
 
     if (osTvType == OS_TV_PAL) {
diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt
index 5047e9804a..344a3ef65d 100644
--- a/tools/disasm/variables.txt
+++ b/tools/disasm/variables.txt
@@ -7,7 +7,7 @@
     0x80000310:("osCicId","UNK_TYPE","",0x4),
     0x80000314:("osVersion","UNK_TYPE","",0x4),
     0x80000318:("osMemSize","UNK_TYPE","",0x4),
-    0x8000031C:("osAppNmiBuffer","s32","[0x10]",0x40),
+    0x8000031C:("osAppNMIBuffer","s32","[0x10]",0x40),
     0x80000500:("gFramebuffer1","u16","[SCREEN_HEIGHT][SCREEN_WIDTH]",0x25800),
     0x80025D00:("D_80025D00","u8","[]",0x1), # TODO size
     0x800969C0:("rspbootTextStart","u64","[]",0x160),
diff --git a/undefined_syms.txt b/undefined_syms.txt
index 81f14ced86..5a971b85d7 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -14,7 +14,7 @@ osResetType    = 0x8000030C;
 osCicId        = 0x80000310;
 osVersion      = 0x80000314;
 osMemSize      = 0x80000318;
-osAppNmiBuffer = 0x8000031C;
+osAppNMIBuffer = 0x8000031C;
 
 /// OS hardware registers