summaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authorrozlette <uberpanzermensch@gmail.com>2018-11-08 21:02:45 -0600
committerrozlette <uberpanzermensch@gmail.com>2018-11-08 21:02:45 -0600
commit00e3a8fcb7262afcdaba44228c87f52aab1b9a21 (patch)
tree0decc3772e5cb341f962d81b64e81c717577c9da /src/boot
parent5fcbe0a483123b30d3a59f0c27e6c85bbca87ae0 (diff)
Get boot_0x80080790 somewhat close to matching
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/boot_0x80080180.c2
-rw-r--r--src/boot/boot_0x80092920.c22
2 files changed, 12 insertions, 12 deletions
diff --git a/src/boot/boot_0x80080180.c b/src/boot/boot_0x80080180.c
index b889b27c4..7908c1263 100644
--- a/src/boot/boot_0x80080180.c
+++ b/src/boot/boot_0x80080180.c
@@ -43,7 +43,7 @@ UNK_RET func_80080250(void) {
sp40 = *v0;
*v0 = 0;
- func_80080C04(&sp72, (UNK_FUN_ARG)func_800A5AC0, v1, (u32)t7 - (u32)v1, 0, (UNK_TYPE*)&sp48, 0);
+ func_80080C04(&sp72, (UNK_FUN_ARG)func_800A5AC0, v1, (u32)t7 - (u32)v1, 0, &sp48, 0);
func_8008019C();
func_800801EC();
osRecvMesg(&sp48, 0, 1);
diff --git a/src/boot/boot_0x80092920.c b/src/boot/boot_0x80092920.c
index f39464411..27b343cb8 100644
--- a/src/boot/boot_0x80092920.c
+++ b/src/boot/boot_0x80092920.c
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include <global.h>
-struct s80092920* func_80092920(void) {
+OSPiHandle* func_80092920(void) {
u32 v0;
u32 temp;
u32 temp2;
@@ -18,10 +18,10 @@ struct s80092920* func_80092920(void) {
D_800980D0_ = 0;
- D_8009E610.unk4 = 0;
- D_8009E610.unk12 = 0xB0000000;
- D_8009E610.unk9 = 0;
- D_8009E610.unk16 = 0;
+ D_8009E610.type = 0;
+ D_8009E610.baseAddress = 0xB0000000;
+ D_8009E610.domain = 0;
+ D_8009E610.speed = 0;
func_80089630(&D_8009E624, 96);
@@ -37,11 +37,11 @@ struct s80092920* func_80092920(void) {
*(vu32*)0xA4600020 = 3;
*(vu32*)0xA4600018 = 255;
- v0 = *(u32*)(D_8009E610.unk12 | 0xA0000000);
- D_8009E610.unk6 = (v0 >> 16) & 0xF;
- D_8009E610.unk7 = (v0 >> 20) & 0xF;
- D_8009E610.unk8 = v0 >> 8;
- D_8009E610.unk5 = v0;
+ v0 = *(u32*)(D_8009E610.baseAddress | 0xA0000000);
+ D_8009E610.pageSize = (v0 >> 16) & 0xF;
+ D_8009E610.relDuration = (v0 >> 20) & 0xF;
+ D_8009E610.pulse = v0 >> 8;
+ D_8009E610.latency = v0;
*(vu32*)0xA4600014 = temp;
*(vu32*)0xA460001C = temp2;
@@ -50,7 +50,7 @@ struct s80092920* func_80092920(void) {
func_ret = func_80091A60();
- D_8009E610.unk0 = D_80097E8C;
+ D_8009E610.next = D_80097E8C;
D_80097E8C = &D_8009E610;
func_80091AD0(func_ret);