Matched some controller files (#178)

* osPfsIsPlug.c and osContSetCh.c OK

* update

* __osPfsGetStatus.c OK

* removed unused asm

* Updated all libultra controller files to use new structs instead of the temporary structs. Added os_pfs.h

* controller updates

* fixed header guard

* Made suggested changes

8 files changed, 16 insertions, 18 deletions

diff --git a/src/code/fault.c b/src/code/fault.c
index e5c625965..e4e27fb17 100644
--- a/src/code/fault.c
+++ b/src/code/fault.c
@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include <ultra64/controller.h>
 #include <global.h>
 #include <alloca.h>
 #include <vt.h>
-#include <PR/os_cont.h>
 
 // data
 const char* sExceptionNames[] = {
diff --git a/src/code/flg_set.c b/src/code/flg_set.c
index 941c6f803..170d14455 100644
--- a/src/code/flg_set.c
+++ b/src/code/flg_set.c
@@ -1,5 +1,5 @@
 #include <global.h>
-#include <PR/os_cont.h>
+#include <ultra64/controller.h>
 
 void FlagSet_Update(GlobalContext* globalCtx) {
     static s32 entryIdx = 0;
diff --git a/src/code/graph.c b/src/code/graph.c
index 169134fb1..06b257f78 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -1,7 +1,7 @@
 #include <global.h>
 #include <ultra64/hardware.h>
+#include <ultra64/controller.h>
 #include <vt.h>
-#include <PR/os_cont.h>
 
 #define GFXPOOL_HEAD_MAGIC 0x1234
 #define GFXPOOL_TAIL_MAGIC 0x5678
diff --git a/src/code/padmgr.c b/src/code/padmgr.c
index 132fde97d..33da52e95 100644
--- a/src/code/padmgr.c
+++ b/src/code/padmgr.c
@@ -1,10 +1,8 @@
 #include <ultra64.h>
+#include <ultra64/controller.h>
 #include <global.h>
 #include <vt.h>
 
-#include <PR/os_cont.h>
-#include <ultra64/controller.h>
-
 s32 D_8012D280 = 1;
 
 OSMesgQueue* PadMgr_LockSerialMesgQueue(PadMgr* padmgr) {
@@ -78,7 +76,7 @@ void PadMgr_RumbleControl(PadMgr* padmgr) {
                             osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パック ぶるぶるぶるぶる");
                             osSyncPrintf(VT_RST);
 
-                            if (osSetRumble(&padmgr->unk_controller[i], temp) != 0) {
+                            if (osSetRumble(&padmgr->pfs[i], temp) != 0) {
                                 padmgr->pakType[i] = 0;
                                 osSyncPrintf(VT_FGCOL(YELLOW));
                                 // "A communication error has occurred with the vibraton pack"
@@ -100,7 +98,7 @@ void PadMgr_RumbleControl(PadMgr* padmgr) {
                             osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パック 停止");
                             osSyncPrintf(VT_RST);
 
-                            if (osSetRumble(&padmgr->unk_controller[i], 0) != 0) {
+                            if (osSetRumble(&padmgr->pfs[i], 0) != 0) {
                                 padmgr->pakType[i] = 0;
                                 osSyncPrintf(VT_FGCOL(YELLOW));
                                 // "A communication error has occurred with the vibration pack"
@@ -139,12 +137,12 @@ void PadMgr_RumbleControl(PadMgr* padmgr) {
         i = frame % 4;
 
         if (padmgr->ctrlrIsConnected[i] && (padmgr->padStatus[i].status & 1) && (padmgr->pakType[i] != 1)) {
-            var4 = osProbeRumblePak(ctrlrQ, &padmgr->unk_controller[i], i);
+            var4 = osProbeRumblePak(ctrlrQ, &padmgr->pfs[i], i);
 
             if (var4 == 0) {
                 padmgr->pakType[i] = 1;
-                osSetRumble(&padmgr->unk_controller[i], 1);
-                osSetRumble(&padmgr->unk_controller[i], 0);
+                osSetRumble(&padmgr->pfs[i], 1);
+                osSetRumble(&padmgr->pfs[i], 0);
                 osSyncPrintf(VT_FGCOL(YELLOW));
                 // "Recognized vibration pack"
                 osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パックを認識しました");
@@ -172,14 +170,14 @@ void PadMgr_RumbleStop(PadMgr* padmgr) {
     ctrlrQ = PadMgr_LockSerialMesgQueue(padmgr);
 
     for (i = 0; i < 4; i++) {
-        if (osProbeRumblePak(ctrlrQ, &padmgr->unk_controller[i], i) == 0) {
+        if (osProbeRumblePak(ctrlrQ, &padmgr->pfs[i], i) == 0) {
             if ((gFaultStruct.msgId == 0) && (padmgr->rumbleOnFrames != 0)) {
                 osSyncPrintf(VT_FGCOL(YELLOW));
                 osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パック 停止"); // "Stop vibration pack"
                 osSyncPrintf(VT_RST);
             }
 
-            osSetRumble(&padmgr->unk_controller[i], 0);
+            osSetRumble(&padmgr->pfs[i], 0);
         }
     }
 
@@ -417,7 +415,7 @@ void PadMgr_Init(PadMgr* padmgr, OSMesgQueue* siIntMsgQ, IrqMgr* irqMgr, OSId id
     func_800FCD40(siIntMsgQ, &padmgr->validCtrlrsMask, padmgr);
 
     padmgr->ncontrollers = 4;
-    func_80104D00(padmgr->ncontrollers);
+    osContSetCh(padmgr->ncontrollers);
 
     osCreateThread(&padmgr->thread, id, PadMgr_ThreadEntry, padmgr, stack, priority);
     osStartThread(&padmgr->thread);
diff --git a/src/code/z_debug.c b/src/code/z_debug.c
index 287c83ea2..a595de5a6 100644
--- a/src/code/z_debug.c
+++ b/src/code/z_debug.c
@@ -1,6 +1,6 @@
 #include <ultra64.h>
+#include <ultra64/controller.h>
 #include <global.h>
-#include <PR/os_cont.h>
 
 typedef struct {
     u8 x;
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index a5f5867d1..df0f8c227 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -1,6 +1,6 @@
 #include <ultra64.h>
+#include <ultra64/controller.h>
 #include <global.h>
-#include <PR/os_cont.h>
 
 u16 D_8011E1C0 = 0;
 u16 D_8011E1C4 = 0;
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index c47971f4e..4caee3394 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include <ultra64/controller.h>
 #include <global.h>
 #include <vt.h>
-#include <PR/os_cont.h>
 
 typedef struct {
     /* 0x00 */ u8 scene;
diff --git a/src/code/z_sample.c b/src/code/z_sample.c
index 3805e4414..a6bed1e3c 100644
--- a/src/code/z_sample.c
+++ b/src/code/z_sample.c
@@ -1,6 +1,6 @@
 #include <ultra64.h>
+#include <ultra64/controller.h>
 #include <global.h>
-#include <PR/os_cont.h>
 
 void Sample_HandleStateChange(SampleContext* this) {
     if (CHECK_PAD(this->state.input[0].press, START_BUTTON)) {