From d16ab2cec57225c8abbb2d76f5bf1e83032ec1bf Mon Sep 17 00:00:00 2001
From: Ryan Myers <ryan.p.myers@gmail.com>
Date: Thu, 30 Sep 2021 22:24:16 -0400
Subject: [PATCH] More controller variables fixed up

---
 .../non_matchings/unknown_0CD820/osContInit.s |  8 +++---
 lib/src/os/controller.c                       | 28 ++++---------------
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/lib/asm/non_matchings/unknown_0CD820/osContInit.s b/lib/asm/non_matchings/unknown_0CD820/osContInit.s
index f124db18..57b210ea 100644
--- a/lib/asm/non_matchings/unknown_0CD820/osContInit.s
+++ b/lib/asm/non_matchings/unknown_0CD820/osContInit.s
@@ -117,10 +117,10 @@ glabel osContInit
 /* 0CD9E0 800CCDE0 3C018013 */  lui   $at, %hi(__osContLastCmd) # $at, 0x8013
 /* 0CD9E4 800CCDE4 0C033580 */  jal   __osSiCreateAccessQueue
 /* 0CD9E8 800CCDE8 A020CD90 */   sb    $zero, %lo(__osContLastCmd)($at)
-/* 0CD9EC 800CCDEC 3C048013 */  lui   $a0, %hi(D_8012CDB8) # $a0, 0x8013
-/* 0CD9F0 800CCDF0 3C058013 */  lui   $a1, %hi(D_8012CDD0) # $a1, 0x8013
-/* 0CD9F4 800CCDF4 24A5CDD0 */  addiu $a1, %lo(D_8012CDD0) # addiu $a1, $a1, -0x3230
-/* 0CD9F8 800CCDF8 2484CDB8 */  addiu $a0, %lo(D_8012CDB8) # addiu $a0, $a0, -0x3248
+/* 0CD9EC 800CCDEC 3C048013 */  lui   $a0, %hi(__osEepromTimerQ) # $a0, 0x8013
+/* 0CD9F0 800CCDF0 3C058013 */  lui   $a1, %hi(__osEepromTimerMsg) # $a1, 0x8013
+/* 0CD9F4 800CCDF4 24A5CDD0 */  addiu $a1, %lo(__osEepromTimerMsg) # addiu $a1, $a1, -0x3230
+/* 0CD9F8 800CCDF8 2484CDB8 */  addiu $a0, %lo(__osEepromTimerQ) # addiu $a0, $a0, -0x3248
 /* 0CD9FC 800CCDFC 0C032208 */  jal   osCreateMesgQueue
 /* 0CDA00 800CCE00 24060001 */   li    $a2, 1
 /* 0CDA04 800CCE04 8FA20078 */  lw    $v0, 0x78($sp)
diff --git a/lib/src/os/controller.c b/lib/src/os/controller.c
index 48842269..feacb2bf 100644
--- a/lib/src/os/controller.c
+++ b/lib/src/os/controller.c
@@ -8,31 +8,15 @@
 
 #define HALF_A_SECOND OS_USEC_TO_CYCLES(500000)
 
-// u32 __osContinitialized = 0;
-// OSPifRam __osContPifRam;
-// u8 __osContLastCmd;
-// u8 __osMaxControllers; // 8012CD91
-// s32 D_8012CD94;
-// s32 D_8012CD98[6];
-// s32 D_8012CDB0;
-// s32 D_8012CDB4;
-// OSMesgQueue __osEepromTimerQ;
-// OSMesg __osEepromTimerMsg;
-// OSPifRam __osPfsPifRam; // 8012CDE0
-
 u32 __osContinitialized = 0;
 OSPifRam __osContPifRam;
 u8 __osContLastCmd;
-u8 __osMaxControllers; // 8012CD91
-s32 D_8012CD94;
-s32 D_8012CD98[6];
-s32 D_8012CDB0;
-s32 D_8012CDB4;
-s32 D_8012CDB8;
-s32 D_8012CDBC;
-s32 D_8012CDC0[4];
-s32 D_8012CDD0[4];
-OSPifRam __osPfsPifRam; // 8012CDE0
+u8 __osMaxControllers;
+OSTimer __osEepromTimer;
+OSMesgQueue __osEepromTimerQ;
+OSMesg __osEepromTimerMsg;
+s32 D_8012CDD4[2]; //Padding?
+OSPifRam __osPfsPifRam;
 
 #if 1
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/osContInit.s")