From 60eaf159b47a1dbb4caf0f0a93bf10d5089f1315 Mon Sep 17 00:00:00 2001
From: rozlette <uberpanzermensch@gmail.com>
Date: Sat, 7 Dec 2019 18:21:34 -0600
Subject: Generate all major headers from ghidra project

---
 src/boot_O2_g3/CIC6105.c         |  2 +-
 src/boot_O2_g3/boot_0x80080060.c |  6 +++---
 src/boot_O2_g3/z_std_dma.c       | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/boot_O2_g3')

diff --git a/src/boot_O2_g3/CIC6105.c b/src/boot_O2_g3/CIC6105.c
index 68977fd0d..6e0802ef1 100644
--- a/src/boot_O2_g3/CIC6105.c
+++ b/src/boot_O2_g3/CIC6105.c
@@ -12,7 +12,7 @@ void func_80081830(void) {
 }
 
 void func_8008189C(void) {
-    func_800819F0(&D_8009BE38, (void(*)(UNK_TYPE, UNK_TYPE))func_80081830, 0, 0);
+    func_800819F0(&D_8009BE38, (u32)(void(*)(UNK_TYPE, UNK_TYPE))func_80081830, 0, 0);
 }
 
 void func_800818D0(void) {
diff --git a/src/boot_O2_g3/boot_0x80080060.c b/src/boot_O2_g3/boot_0x80080060.c
index 946f76316..40e37377f 100644
--- a/src/boot_O2_g3/boot_0x80080060.c
+++ b/src/boot_O2_g3/boot_0x80080060.c
@@ -2,13 +2,13 @@
 #include <global.h>
 
 UNK_RET start(void) {
-    thread_info_init(&bootThreadInfo, &bootStack, &irqmgrContext, 0, -1, &bootThreadName);
+    thread_info_init(&bootThreadInfo, bootStack, &bootStack[1024], 0, -1, bootThreadName);
     osMemSize = func_8008D350();
     func_800818F4();
     osInitialize();
     osUnmapTLBAll();
     D_80096B40 = func_80092920();
-    thread_info_init(&idleTreadInfo, &idleStack, &idleStack[1024], 0, 256, &idleThreadName);
-    osCreateThread(&idleOSThread, 1, (void(*)(void*))Idle_ThreadEntry, 0, &idleTreadInfo, 12);
+    thread_info_init(&idleTreadInfo, idleStack, &idleStack[1024], 0, 256, idleThreadName);
+    osCreateThread(&idleOSThread, 1, (osCreateThread_func*)Idle_ThreadEntry, 0, &idleTreadInfo, 12);
     osStartThread(&idleOSThread);
 }
diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c
index 8fc35e290..3906ddede 100644
--- a/src/boot_O2_g3/z_std_dma.c
+++ b/src/boot_O2_g3/z_std_dma.c
@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include <global.h>
 
-s32 Dmamgr_DoDmaTransfer(void* a0, void* a1, s32 a2) {
+s32 Dmamgr_DoDmaTransfer(u32 a0, void* a1, u32 a2) {
     u32 spPad;
     OSIoMesg sp60;
     OSMesgQueue sp48;
@@ -24,7 +24,7 @@ s32 Dmamgr_DoDmaTransfer(void* a0, void* a1, s32 a2) {
 
             osRecvMesg(&sp48, NULL, 1);
             a2 -= s0;
-            a0 = (u8*)a0 + s0;
+            a0 = a0 + s0;
             a1 = (u8*)a1 + s0;
         }
     }
@@ -61,7 +61,7 @@ DmadataEntry* Dmamgr_FindDmaEntry(u32 a0) {
     return NULL;
 }
 
-s32 Dmamgr_TranslateVromToRom(u32 a0) {
+u32 Dmamgr_TranslateVromToRom(u32 a0) {
     DmadataEntry* v0 = Dmamgr_FindDmaEntry(a0);
 
     if (v0 != NULL) {
@@ -199,7 +199,7 @@ GLOBAL_ASM("./asm/nonmatching/z_std_dma/Dmamgr_SendRequest.asm")
 
 #endif
 
-s32 Dmamgr_SendRequestAndWait(UNK_TYPE a0, UNK_PTR a1, UNK_TYPE a2) {
+s32 Dmamgr_SendRequestAndWait(u32 a0, u32 a1, u32 a2) {
 	DmaRequest sp48;
     OSMesgQueue sp30;
     OSMesg sp2C;
@@ -207,7 +207,7 @@ s32 Dmamgr_SendRequestAndWait(UNK_TYPE a0, UNK_PTR a1, UNK_TYPE a2) {
 
     osCreateMesgQueue(&sp30, &sp2C, 1);
 
-	ret = Dmamgr_SendRequest(&sp48, (UNK_FUN_ARG)a0, a1, a2, 0, &sp30, 0);
+	ret = Dmamgr_SendRequest(&sp48, a0, a1, a2, 0, &sp30, 0);
 
 	if (ret == -1) {
 		return ret;
-- 
cgit v1.2.3