From 6344358559492ba71c36c69d517de04c6c8f1625 Mon Sep 17 00:00:00 2001
From: Ryan Myers <ryan.p.myers@gmail.com>
Date: Thu, 30 Sep 2021 22:12:11 -0400
Subject: [PATCH] Fix __osPfsPifRam declaration

---
 lib/src/os/contramread.c  |  3 +--
 lib/src/os/contramwrite.c |  3 +--
 lib/src/os/controller.c   | 11 ++++-------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/src/os/contramread.c b/lib/src/os/contramread.c
index f9e329a1..28c41d94 100644
--- a/lib/src/os/contramread.c
+++ b/lib/src/os/contramread.c
@@ -5,7 +5,6 @@
 #include "controller.h"
 #include "siint.h"
 
-extern s32 D_8012CE1C;
 static void __osPackRamReadData(int channel, u16 address);
 s32 __osContRamRead(OSMesgQueue *mq, int channel, u16 address, u8 *buffer) {
     s32 ret;
@@ -25,7 +24,7 @@ s32 __osContRamRead(OSMesgQueue *mq, int channel, u16 address, u8 *buffer) {
         for (i = 0; i < ARRLEN(__osPfsPifRam.ramarray) + 1; i++) { // also clear pifstatus
             __osPfsPifRam.ramarray[i] = 0xFFU;
         }
-        D_8012CE1C = 0;
+        __osPfsPifRam.pifstatus = 0;
         ret = __osSiRawStartDma(OS_READ, &__osPfsPifRam);
         osRecvMesg(mq, NULL, OS_MESG_BLOCK);
         ptr = (u8 *)&__osPfsPifRam;
diff --git a/lib/src/os/contramwrite.c b/lib/src/os/contramwrite.c
index 4a5bdc8f..8bae742b 100644
--- a/lib/src/os/contramwrite.c
+++ b/lib/src/os/contramwrite.c
@@ -5,7 +5,6 @@
 #include "controller.h"
 #include "siint.h"
 
-extern s32 D_8012CE1C;
 static void __osPackRamWriteData(int channel, u16 address, u8 *buffer);
 
 s32 __osContRamWrite(OSMesgQueue *mq, int channel, u16 address, u8 *buffer, int force) {
@@ -29,7 +28,7 @@ s32 __osContRamWrite(OSMesgQueue *mq, int channel, u16 address, u8 *buffer, int
         for (i = 0; i < ARRLEN(__osPfsPifRam.ramarray) + 1; i++) { // also clear pifstatus
             __osPfsPifRam.ramarray[i] = 0xFFU;
         }
-        D_8012CE1C = 0;
+        __osPfsPifRam.pifstatus = 0;
         ret = __osSiRawStartDma(OS_READ, &__osPfsPifRam);
         osRecvMesg(mq, NULL, OS_MESG_BLOCK);
         ptr = (u8 *)&__osPfsPifRam;
diff --git a/lib/src/os/controller.c b/lib/src/os/controller.c
index 0d663a4b..2b70199b 100644
--- a/lib/src/os/controller.c
+++ b/lib/src/os/controller.c
@@ -4,6 +4,7 @@
 #include "types.h"
 #include "macros.h"
 #include "libultra_internal.h"
+#include "controller.h"
 
 #define HALF_A_SECOND OS_USEC_TO_CYCLES(500000)
 
@@ -23,8 +24,8 @@ s32 D_800E38C0 = 0;
 
 s32 D_8012CD50[15];
 s32 D_8012CD8C;
-s8 __osContLastCmd;
-s8 __osMaxControllers; // 8012CD91
+u8 __osContLastCmd;
+u8 __osMaxControllers; // 8012CD91
 s32 D_8012CD94;
 s32 D_8012CD98[6];
 s32 D_8012CDB0;
@@ -33,11 +34,7 @@ s32 D_8012CDB8;
 s32 D_8012CDBC;
 s32 D_8012CDC0[4];
 s32 D_8012CDD0[4];
-s32 __osPfsPifRam; // 8012CDE0
-s32 D_8012CDE4;
-s32 D_8012CDE8[12];
-s32 D_8012CE18;
-s32 D_8012CE1C;
+OSPifRam __osPfsPifRam; // 8012CDE0
 
 #if 1
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/osContInit.s")