document symbols

1 files changed, 147 insertions, 147 deletions

diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c
index 670692118..45abaa70b 100644
--- a/src/librfu_stwi.c
+++ b/src/librfu_stwi.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "librfu.h"
 
-struct RfuStruct *gRfuState;
+struct STWIStatus *gSTWIStatus;
 
 extern IntrFunc IntrSIO32(void);
 
@@ -22,34 +22,34 @@ int STWI_reset_ClockCounter(void);
 void STWI_init_all(struct RfuIntrStruct *interruptStruct, IntrFunc *interrupt, bool8 copyInterruptToRam)
 {
     // If we're copying our interrupt into RAM, DMA it to block1 and use
-    // block2 for our RfuStruct, otherwise block1 holds the RfuStruct.
+    // block2 for our STWIStatus, otherwise block1 holds the STWIStatus.
     // interrupt usually is a pointer to gIntrTable[1]
     if (copyInterruptToRam == TRUE)
     {
         *interrupt = (IntrFunc)interruptStruct->block1;
         DmaCopy16(3, &IntrSIO32, interruptStruct->block1, 0x960);
-        gRfuState = (struct RfuStruct*)interruptStruct->block2;
+        gSTWIStatus = (struct STWIStatus*)interruptStruct->block2;
     }
     else
     {
         *interrupt = (IntrFunc)IntrSIO32;
-        gRfuState = (struct RfuStruct*)interruptStruct->block1;
-    }
-
-    gRfuState->rxPacket = (union RfuPacket*)interruptStruct->rxPacketAlloc;
-    gRfuState->txPacket = (union RfuPacket*)interruptStruct->txPacketAlloc;
-    gRfuState->msMode = 1;
-    gRfuState->unk_0 = 0;
-    gRfuState->txParams = 0;
-    gRfuState->unk_5 = 0;
-    gRfuState->unk_7 = 0;
-    gRfuState->unk_8 = 0;
-    gRfuState->unk_9 = 0;
-    gRfuState->timerState = 0;
-    gRfuState->timerActive = 0;
-    gRfuState->unk_12 = 0;
-    gRfuState->unk_15 = 0;
-    gRfuState->unk_2c = 0;
+        gSTWIStatus = (struct STWIStatus*)interruptStruct->block1;
+    }
+
+    gSTWIStatus->rxPacket = (union RfuPacket*)interruptStruct->rxPacketAlloc;
+    gSTWIStatus->txPacket = (union RfuPacket*)interruptStruct->txPacketAlloc;
+    gSTWIStatus->msMode = 1;
+    gSTWIStatus->unk_0 = 0;
+    gSTWIStatus->txParams = 0;
+    gSTWIStatus->unk_5 = 0;
+    gSTWIStatus->unk_7 = 0;
+    gSTWIStatus->unk_8 = 0;
+    gSTWIStatus->unk_9 = 0;
+    gSTWIStatus->timerState = 0;
+    gSTWIStatus->timerActive = 0;
+    gSTWIStatus->unk_12 = 0;
+    gSTWIStatus->unk_15 = 0;
+    gSTWIStatus->unk_2c = 0;
 
     REG_RCNT = 0x100; //TODO: mystery bit?
     REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS;
@@ -62,9 +62,9 @@ void STWI_init_all(struct RfuIntrStruct *interruptStruct, IntrFunc *interrupt, b
 void STWI_init_timer(IntrFunc *interrupt, int timerSelect)
 {
     *interrupt = STWI_intr_timer;
-    gRfuState->timerSelect = timerSelect;
+    gSTWIStatus->timerSelect = timerSelect;
 
-    IntrEnable(INTR_FLAG_TIMER0 << gRfuState->timerSelect);
+    IntrEnable(INTR_FLAG_TIMER0 << gSTWIStatus->timerSelect);
 }
 
 void AgbRFU_SoftReset(void)
@@ -74,8 +74,8 @@ void AgbRFU_SoftReset(void)
 
     REG_RCNT = 0x8000;
     REG_RCNT = 0x80A0; // all these bits are undocumented
-    timerL = &REG_TMCNT_L(gRfuState->timerSelect);
-    timerH = &REG_TMCNT_H(gRfuState->timerSelect);
+    timerL = &REG_TMCNT_L(gSTWIStatus->timerSelect);
+    timerH = &REG_TMCNT_H(gSTWIStatus->timerSelect);
     *timerH = 0;
     *timerL = 0;
     *timerH = 0x83;
@@ -85,24 +85,24 @@ void AgbRFU_SoftReset(void)
     REG_RCNT = 0x80A0;
     REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS;
 
-    gRfuState->unk_0 = 0;
-    gRfuState->txParams = 0;
-    gRfuState->unk_5 = 0;
-    gRfuState->activeCommand = 0;
-    gRfuState->unk_7 = 0;
-    gRfuState->unk_8 = 0;
-    gRfuState->unk_9 = 0;
-    gRfuState->timerState = 0;
-    gRfuState->timerActive = 0;
-    gRfuState->unk_12 = 0;
-    gRfuState->msMode = 1;
-    gRfuState->unk_15 = 0;
-    gRfuState->unk_2c = 0;
+    gSTWIStatus->unk_0 = 0;
+    gSTWIStatus->txParams = 0;
+    gSTWIStatus->unk_5 = 0;
+    gSTWIStatus->activeCommand = 0;
+    gSTWIStatus->unk_7 = 0;
+    gSTWIStatus->unk_8 = 0;
+    gSTWIStatus->unk_9 = 0;
+    gSTWIStatus->timerState = 0;
+    gSTWIStatus->timerActive = 0;
+    gSTWIStatus->unk_12 = 0;
+    gSTWIStatus->msMode = 1;
+    gSTWIStatus->unk_15 = 0;
+    gSTWIStatus->unk_2c = 0;
 }
 
 void STWI_set_MS_mode(u8 mode)
 {
-    gRfuState->msMode = mode;
+    gSTWIStatus->msMode = mode;
 }
 
 u16 STWI_read_status(u8 index)
@@ -110,13 +110,13 @@ u16 STWI_read_status(u8 index)
     switch (index)
     {
     case 0:
-        return gRfuState->unk_12;
+        return gSTWIStatus->unk_12;
     case 1:
-        return gRfuState->msMode;
+        return gSTWIStatus->msMode;
     case 2:
-        return gRfuState->unk_0;
+        return gSTWIStatus->unk_0;
     case 3:
-        return gRfuState->activeCommand;
+        return gSTWIStatus->activeCommand;
     default:
         return 0xFFFF;
     }
@@ -134,31 +134,31 @@ void STWI_init_Callback_S(void)
 
 void STWI_set_Callback_M(void *callback)
 {
-    gRfuState->callbackM = callback;
+    gSTWIStatus->callbackM = callback;
 }
 
 void STWI_set_Callback_S(void *callback)
 {
-    gRfuState->callbackS = callback;
+    gSTWIStatus->callbackS = callback;
 }
 
 void STWI_set_Callback_ID(u32 id)
 {
-    gRfuState->callbackID = id;
+    gSTWIStatus->callbackID = id;
 }
 
 u16 STWI_poll_CommandEnd(void)
 {
-    while (gRfuState->unk_2c == TRUE)
+    while (gSTWIStatus->unk_2c == TRUE)
         ;
-    return gRfuState->unk_12;
+    return gSTWIStatus->unk_12;
 }
 
 void STWI_send_ResetREQ(void)
 {
     if (!STWI_init(RFU_RESET))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -167,7 +167,7 @@ void STWI_send_LinkStatusREQ(void)
 {
     if (!STWI_init(RFU_LINK_STATUS))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -176,7 +176,7 @@ void STWI_send_VersionStatusREQ(void)
 {
     if (!STWI_init(RFU_VERSION_STATUS))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -185,7 +185,7 @@ void STWI_send_SystemStatusREQ(void)
 {
     if (!STWI_init(RFU_SYSTEM_STATUS))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -194,7 +194,7 @@ void STWI_send_SlotStatusREQ(void)
 {
     if (!STWI_init(RFU_SLOT_STATUS))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -203,7 +203,7 @@ void STWI_send_ConfigStatusREQ(void)
 {
     if (!STWI_init(RFU_CONFIG_STATUS))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -215,10 +215,10 @@ void STWI_send_GameConfigREQ(u8 * unk1, u8 *data)
 
     if (!STWI_init(RFU_GAME_CONFIG))
     {
-        gRfuState->txParams = 6;
+        gSTWIStatus->txParams = 6;
 
         //TODO: what is unk1
-        packetBytes = gRfuState->txPacket->rfuPacket8.data;
+        packetBytes = gSTWIStatus->txPacket->rfuPacket8.data;
         packetBytes += sizeof(u32);
         *(u16*)packetBytes = *(u16*)unk1;
 
@@ -249,9 +249,9 @@ void STWI_send_SystemConfigREQ(u16 unk1, u8 unk2, u8 unk3)
     {
         u8 *packetBytes;
 
-        gRfuState->txParams = 1;
+        gSTWIStatus->txParams = 1;
 
-        packetBytes = gRfuState->txPacket->rfuPacket8.data;
+        packetBytes = gSTWIStatus->txPacket->rfuPacket8.data;
         packetBytes += sizeof(u32);
 
         *packetBytes++ = unk3;
@@ -265,7 +265,7 @@ void STWI_send_SC_StartREQ(void)
 {
     if (!STWI_init(RFU_SC_START))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -274,7 +274,7 @@ void STWI_send_SC_PollingREQ(void)
 {
     if (!STWI_init(RFU_SC_POLLING))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -283,7 +283,7 @@ void STWI_send_SC_EndREQ(void)
 {
     if (!STWI_init(RFU_SC_END))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -292,7 +292,7 @@ void STWI_send_SP_StartREQ(void)
 {
     if (!STWI_init(RFU_SP_START))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -301,7 +301,7 @@ void STWI_send_SP_PollingREQ(void)
 {
     if (!STWI_init(RFU_SP_POLLING))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -310,7 +310,7 @@ void STWI_send_SP_EndREQ(void)
 {
     if (!STWI_init(RFU_SP_END))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -319,8 +319,8 @@ void STWI_send_CP_StartREQ(u16 unk1)
 {
     if (!STWI_init(RFU_CP_START))
     {
-        gRfuState->txParams = 1;
-        gRfuState->txPacket->rfuPacket32.data[0] = unk1;
+        gSTWIStatus->txParams = 1;
+        gSTWIStatus->txPacket->rfuPacket32.data[0] = unk1;
         STWI_start_Command();
     }
 }
@@ -329,7 +329,7 @@ void STWI_send_CP_PollingREQ(void)
 {
     if (!STWI_init(RFU_CP_POLLING))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -338,7 +338,7 @@ void STWI_send_CP_EndREQ(void)
 {
     if (!STWI_init(RFU_CP_END))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -351,8 +351,8 @@ void STWI_send_DataTxREQ(void *in, u8 size)
         if (size & (sizeof(u32) - 1))
             txParams += 1;
 
-        gRfuState->txParams = txParams;
-        CpuCopy32(in, gRfuState->txPacket->rfuPacket32.data, gRfuState->txParams * sizeof(u32));
+        gSTWIStatus->txParams = txParams;
+        CpuCopy32(in, gSTWIStatus->txPacket->rfuPacket32.data, gSTWIStatus->txParams * sizeof(u32));
         STWI_start_Command();
     }
 }
@@ -365,8 +365,8 @@ void STWI_send_DataTxAndChangeREQ(void *in, u8 size)
         if (size & (sizeof(u32) - 1))
             txParams += 1;
 
-        gRfuState->txParams = txParams;
-        CpuCopy32(in, gRfuState->txPacket->rfuPacket32.data, gRfuState->txParams * sizeof(u32));
+        gSTWIStatus->txParams = txParams;
+        CpuCopy32(in, gSTWIStatus->txPacket->rfuPacket32.data, gSTWIStatus->txParams * sizeof(u32));
         STWI_start_Command();
     }
 }
@@ -375,7 +375,7 @@ void STWI_send_DataRxREQ(void)
 {
     if (!STWI_init(RFU_DATA_RX))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -384,7 +384,7 @@ void STWI_send_MS_ChangeREQ(void)
 {
     if (!STWI_init(RFU_MS_CHANGE))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -395,15 +395,15 @@ void STWI_send_DataReadyAndChangeREQ(u8 unk)
     {
         if (!unk)
         {
-            gRfuState->txParams = 0;
+            gSTWIStatus->txParams = 0;
         }
         else
         {
             u8 *packetBytes;
 
-            gRfuState->txParams = 1;
+            gSTWIStatus->txParams = 1;
 
-            packetBytes = gRfuState->txPacket->rfuPacket8.data;
+            packetBytes = gSTWIStatus->txPacket->rfuPacket8.data;
             packetBytes += sizeof(u32);
 
             *packetBytes++ = unk;
@@ -422,9 +422,9 @@ void STWI_send_DisconnectedAndChangeREQ(u8 unk0, u8 unk1)
     {
         u8 *packetBytes;
 
-        gRfuState->txParams = 1;
+        gSTWIStatus->txParams = 1;
 
-        packetBytes = gRfuState->txPacket->rfuPacket8.data;
+        packetBytes = gSTWIStatus->txPacket->rfuPacket8.data;
         packetBytes += sizeof(u32);
 
         *packetBytes++ = unk0;
@@ -440,7 +440,7 @@ void STWI_send_ResumeRetransmitAndChangeREQ(void)
 {
     if (!STWI_init(RFU_RESUME_RETRANSMIT_AND_CHANGE))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -449,8 +449,8 @@ void STWI_send_DisconnectREQ(u8 unk)
 {
     if (!STWI_init(RFU_DISCONNECT))
     {
-        gRfuState->txParams = 1;
-        gRfuState->txPacket->rfuPacket32.data[0] = unk;
+        gSTWIStatus->txParams = 1;
+        gSTWIStatus->txPacket->rfuPacket32.data[0] = unk;
 
         STWI_start_Command();
     }
@@ -460,8 +460,8 @@ void STWI_send_TestModeREQ(u8 unk0, u8 unk1)
 {
     if (!STWI_init(RFU_TEST_MODE))
     {
-        gRfuState->txParams = 1;
-        gRfuState->txPacket->rfuPacket32.data[0] = unk0 | (unk1 << 8);
+        gSTWIStatus->txParams = 1;
+        gSTWIStatus->txPacket->rfuPacket32.data[0] = unk0 | (unk1 << 8);
 
         STWI_start_Command();
     }
@@ -474,10 +474,10 @@ void STWI_send_CPR_StartREQ(u16 unk0, u16 unk1, u8 unk2)
 
     if (!STWI_init(RFU_CPR_START))
     {
-        gRfuState->txParams = 2;
+        gSTWIStatus->txParams = 2;
 
         arg1 = unk1 | (unk0 << 16);
-        packetData = gRfuState->txPacket->rfuPacket32.data;
+        packetData = gSTWIStatus->txPacket->rfuPacket32.data;
         packetData[0] = arg1;
         packetData[1] = unk2;
 
@@ -489,7 +489,7 @@ void STWI_send_CPR_PollingREQ(void)
 {
     if (!STWI_init(RFU_CPR_POLLING))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -498,7 +498,7 @@ void STWI_send_CPR_EndREQ(void)
 {
     if (!STWI_init(RFU_CPR_END))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
@@ -507,18 +507,18 @@ void STWI_send_StopModeREQ(void)
 {
     if (!STWI_init(RFU_STOP_MODE))
     {
-        gRfuState->txParams = 0;
+        gSTWIStatus->txParams = 0;
         STWI_start_Command();
     }
 }
 
 void STWI_intr_timer(void)
 {
-    switch (gRfuState->timerState)
+    switch (gSTWIStatus->timerState)
     {
         //TODO: Make an enum for these
         case 2:
-            gRfuState->timerActive = 1;
+            gSTWIStatus->timerActive = 1;
             STWI_set_timer(50);
             break;
         case 1:
@@ -527,11 +527,11 @@ void STWI_intr_timer(void)
             STWI_restart_Command();
             break;
         case 3:
-            gRfuState->timerActive = 1;
+            gSTWIStatus->timerActive = 1;
             STWI_stop_timer();
             STWI_reset_ClockCounter();
-            if (gRfuState->callbackM)
-                gRfuState->callbackM(255, 0);
+            if (gSTWIStatus->callbackM)
+                gSTWIStatus->callbackM(255, 0);
             break;
     }
 }
@@ -541,79 +541,79 @@ void STWI_set_timer(u8 unk)
     vu16 *timerL;
     vu16 *timerH;
 
-    timerL = &REG_TMCNT_L(gRfuState->timerSelect);
-    timerH = &REG_TMCNT_H(gRfuState->timerSelect);
+    timerL = &REG_TMCNT_L(gSTWIStatus->timerSelect);
+    timerH = &REG_TMCNT_H(gSTWIStatus->timerSelect);
     REG_IME = 0;
     switch (unk)
     {
         case 50:
             *timerL = 0xFCCB;
-            gRfuState->timerState = 1;
+            gSTWIStatus->timerState = 1;
             break;
         case 80:
             *timerL = 0xFAE0;
-            gRfuState->timerState = 2;
+            gSTWIStatus->timerState = 2;
             break;
         case 100:
             *timerL = 0xF996;
-            gRfuState->timerState = 3;
+            gSTWIStatus->timerState = 3;
             break;
         case 130:
             *timerL = 0xF7AD;
-            gRfuState->timerState = 4;
+            gSTWIStatus->timerState = 4;
             break;
     }
     *timerH = TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_1024CLK;
-    REG_IF = INTR_FLAG_TIMER0 << gRfuState->timerSelect;
+    REG_IF = INTR_FLAG_TIMER0 << gSTWIStatus->timerSelect;
     REG_IME = 1;
 }
 
 void STWI_stop_timer(void)
 {
-    gRfuState->timerState = 0;
+    gSTWIStatus->timerState = 0;
 
-    REG_TMCNT_L(gRfuState->timerSelect) = 0;
-    REG_TMCNT_H(gRfuState->timerSelect) = 0;
+    REG_TMCNT_L(gSTWIStatus->timerSelect) = 0;
+    REG_TMCNT_H(gSTWIStatus->timerSelect) = 0;
 }
 
 u16 STWI_init(u8 request)
 {
     if (!REG_IME)
     {
-        gRfuState->unk_12 = 6;
-        if (gRfuState->callbackM)
-            gRfuState->callbackM(request, gRfuState->unk_12);
+        gSTWIStatus->unk_12 = 6;
+        if (gSTWIStatus->callbackM)
+            gSTWIStatus->callbackM(request, gSTWIStatus->unk_12);
         return TRUE;
     }
-    else if (gRfuState->unk_2c == TRUE)
+    else if (gSTWIStatus->unk_2c == TRUE)
     {
-        gRfuState->unk_12 = 2;
-        gRfuState->unk_2c = FALSE;
-        if (gRfuState->callbackM)
-            gRfuState->callbackM(request, gRfuState->unk_12);
+        gSTWIStatus->unk_12 = 2;
+        gSTWIStatus->unk_2c = FALSE;
+        if (gSTWIStatus->callbackM)
+            gSTWIStatus->callbackM(request, gSTWIStatus->unk_12);
         return TRUE;
     }
-    else if(!gRfuState->msMode)
+    else if(!gSTWIStatus->msMode)
     {
-        gRfuState->unk_12 = 4;
-        if (gRfuState->callbackM)
-            gRfuState->callbackM(request, gRfuState->unk_12, gRfuState);
+        gSTWIStatus->unk_12 = 4;
+        if (gSTWIStatus->callbackM)
+            gSTWIStatus->callbackM(request, gSTWIStatus->unk_12, gSTWIStatus);
         return TRUE;
     }
     else
     {
-        gRfuState->unk_2c = TRUE;
-        gRfuState->activeCommand = request;
-        gRfuState->unk_0 = 0;
-        gRfuState->txParams = 0;
-        gRfuState->unk_5 = 0;
-        gRfuState->unk_7 = 0;
-        gRfuState->unk_8 = 0;
-        gRfuState->unk_9 = 0;
-        gRfuState->timerState = 0;
-        gRfuState->timerActive = 0;
-        gRfuState->unk_12 = 0;
-        gRfuState->unk_15 = 0;
+        gSTWIStatus->unk_2c = TRUE;
+        gSTWIStatus->activeCommand = request;
+        gSTWIStatus->unk_0 = 0;
+        gSTWIStatus->txParams = 0;
+        gSTWIStatus->unk_5 = 0;
+        gSTWIStatus->unk_7 = 0;
+        gSTWIStatus->unk_8 = 0;
+        gSTWIStatus->unk_9 = 0;
+        gSTWIStatus->timerState = 0;
+        gSTWIStatus->timerActive = 0;
+        gSTWIStatus->unk_12 = 0;
+        gSTWIStatus->unk_15 = 0;
 
         REG_RCNT = 0x100;
         REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS;
@@ -626,15 +626,15 @@ int STWI_start_Command()
     u16 imeTemp;
 
     // Yes, it matters that it's casted to a u32...
-    *(u32*)gRfuState->txPacket->rfuPacket8.data = 0x99660000 | (gRfuState->txParams << 8) | gRfuState->activeCommand;
-    REG_SIODATA32 = gRfuState->txPacket->rfuPacket32.command;
+    *(u32*)gSTWIStatus->txPacket->rfuPacket8.data = 0x99660000 | (gSTWIStatus->txParams << 8) | gSTWIStatus->activeCommand;
+    REG_SIODATA32 = gSTWIStatus->txPacket->rfuPacket32.command;
 
-    gRfuState->unk_0 = 0;
-    gRfuState->unk_5 = 1;
+    gSTWIStatus->unk_0 = 0;
+    gSTWIStatus->unk_5 = 1;
 
     imeTemp = REG_IME;
     REG_IME = 0;
-    REG_IE |= (INTR_FLAG_TIMER0 << gRfuState->timerSelect);
+    REG_IE |= (INTR_FLAG_TIMER0 << gSTWIStatus->timerSelect);
     REG_IE |= INTR_FLAG_SERIAL;
     REG_IME = imeTemp;
 
@@ -645,30 +645,30 @@ int STWI_start_Command()
 
 int STWI_restart_Command(void)
 {
-    if (gRfuState->unk_15 <= 1)
+    if (gSTWIStatus->unk_15 <= 1)
     {
-        gRfuState->unk_15++;
+        gSTWIStatus->unk_15++;
         STWI_start_Command();
     }
     else
     {
-        if (gRfuState->activeCommand == RFU_MS_CHANGE || gRfuState->activeCommand == RFU_DATA_TX_AND_CHANGE || gRfuState->activeCommand == RFU_UNK35 || gRfuState->activeCommand == RFU_RESUME_RETRANSMIT_AND_CHANGE)
+        if (gSTWIStatus->activeCommand == RFU_MS_CHANGE || gSTWIStatus->activeCommand == RFU_DATA_TX_AND_CHANGE || gSTWIStatus->activeCommand == RFU_UNK35 || gSTWIStatus->activeCommand == RFU_RESUME_RETRANSMIT_AND_CHANGE)
         {
-            gRfuState->unk_12 = 1;
-            gRfuState->unk_2c = 0;
+            gSTWIStatus->unk_12 = 1;
+            gSTWIStatus->unk_2c = 0;
 
-            if (gRfuState->callbackM)
-                gRfuState->callbackM(gRfuState->activeCommand, gRfuState->unk_12);
+            if (gSTWIStatus->callbackM)
+                gSTWIStatus->callbackM(gSTWIStatus->activeCommand, gSTWIStatus->unk_12);
         }
         else
         {
-            gRfuState->unk_12 = 1;
-            gRfuState->unk_2c = 0;
+            gSTWIStatus->unk_12 = 1;
+            gSTWIStatus->unk_2c = 0;
 
-            if (gRfuState->callbackM)
-                gRfuState->callbackM(gRfuState->activeCommand, gRfuState->unk_12);
+            if (gSTWIStatus->callbackM)
+                gSTWIStatus->callbackM(gSTWIStatus->activeCommand, gSTWIStatus->unk_12);
 
-            gRfuState->unk_0 = 4; //TODO: what's 4
+            gSTWIStatus->unk_0 = 4; //TODO: what's 4
         }
     }
 
@@ -677,9 +677,9 @@ int STWI_restart_Command(void)
 
 int STWI_reset_ClockCounter(void)
 {
-    gRfuState->unk_0 = 5; //TODO: what is 5
-    gRfuState->txParams = 0;
-    gRfuState->unk_5 = 0;
+    gSTWIStatus->unk_0 = 5; //TODO: what is 5
+    gSTWIStatus->txParams = 0;
+    gSTWIStatus->unk_5 = 0;
     REG_SIODATA32 = (1 << 31);
     REG_SIOCNT = 0;
     REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS;