Cleanup and formatting fixes from camthesaxman

This commit is contained in:
shinyquagsire23 2017-09-10 12:04:48 -06:00
parent b420fb3962
commit f4a21e5789

View File

@ -1,5 +1,4 @@
#include "global.h"
#include "main.h"
enum
@ -24,9 +23,9 @@ enum
RFU_CP_END
};
typedef struct RfuStruct
struct RfuStruct
{
s32 unk_0;
vs32 unk_0;
u8 unk_4;
u8 unk_5;
u8 unk_6;
@ -50,74 +49,57 @@ typedef struct RfuStruct
void *unk_28;
vu8 unk_2c;
u8 padding[3];
} RfuStruct;
};
typedef struct RfuIntrStruct
struct RfuIntrStruct
{
u8 unk28Data[0x74];
u8 unk24Data[0x74];
u8 block1[0x960];
u8 block2[0x30];
} RfuIntrStruct;
};
typedef struct RfuState
{
RfuStruct *rfuStruct;
} RfuState;
extern IntrFunc IntrSIO32();
extern struct RfuState gRfuState;
void STWI_init_Callback_M();
void STWI_init_Callback_S();
extern IntrFunc IntrSIO32(void);
extern struct RfuStruct *gRfuState;
void STWI_init_Callback_M(void);
void STWI_init_Callback_S(void);
void STWI_set_Callback_M(void * callback);
void STWI_set_Callback_S(void * callback);
u16 STWI_init(u8 request);
int STWI_start_Command();
extern void STWI_intr_timer();
int STWI_start_Command(void);
extern void STWI_intr_timer(void);
void STWI_init_all(RfuIntrStruct *interruptStruct, IntrFunc *interrupt, bool8 copyInterruptToRam)
void STWI_init_all(struct RfuIntrStruct *interruptStruct, IntrFunc *interrupt, bool8 copyInterruptToRam)
{
struct RfuStruct *rfuStructTemp;
struct RfuStruct **rfuStructPtr;
u16 ime_temp;
int ret;
// If we're copying our interrupt into RAM, DMA it to block1 and use
// block2 for our RfuStruct, otherwise block1 holds the RfuStruct.
// interrupt usually is a pointer to gIntrTable[1]
if (copyInterruptToRam == TRUE)
{
*interrupt = (IntrFunc)(&interruptStruct->block1);
DmaCopy16(3, &IntrSIO32, (void*)(&interruptStruct->block1), 0x960);
gRfuState.rfuStruct = (struct RfuStruct*)(&interruptStruct->block2);
*interrupt = (IntrFunc)interruptStruct->block1;
DmaCopy16(3, &IntrSIO32, interruptStruct->block1, 0x960);
gRfuState = (struct RfuStruct*)interruptStruct->block2;
}
else
{
*interrupt = (IntrFunc)&IntrSIO32;
gRfuState.rfuStruct = (struct RfuStruct*)(&interruptStruct->block1);
*interrupt = (IntrFunc)IntrSIO32;
gRfuState = (struct RfuStruct*)interruptStruct->block1;
}
rfuStructPtr = (struct RfuStruct**)&gRfuState.rfuStruct;
(*rfuStructPtr)->unk_28 = (void*)&interruptStruct->unk28Data;
(*rfuStructPtr)->unk_24 = (u8*)(&interruptStruct->unk24Data);
(*rfuStructPtr)->msMode = 1;
(*rfuStructPtr)->unk_0 = 0;
(*rfuStructPtr)->unk_4 = 0;
(*rfuStructPtr)->unk_5 = 0;
(*rfuStructPtr)->unk_7 = 0;
(*rfuStructPtr)->unk_8 = 0;
(*rfuStructPtr)->unk_9 = 0;
(*rfuStructPtr)->unk_c = 0;
(*rfuStructPtr)->unk_10 = 0;
// Don't @ me
rfuStructTemp = *rfuStructPtr;
rfuStructTemp->unk_12 = 0;
rfuStructTemp->unk_15 = 0;
(*rfuStructPtr)->unk_2c = 0;
gRfuState->unk_28 = interruptStruct->unk28Data;
gRfuState->unk_24 = interruptStruct->unk24Data;
gRfuState->msMode = 1;
gRfuState->unk_0 = 0;
gRfuState->unk_4 = 0;
gRfuState->unk_5 = 0;
gRfuState->unk_7 = 0;
gRfuState->unk_8 = 0;
gRfuState->unk_9 = 0;
gRfuState->unk_c = 0;
gRfuState->unk_10 = 0;
gRfuState->unk_12 = 0;
gRfuState->unk_15 = 0;
gRfuState->unk_2c = 0;
REG_RCNT = 0x100; //TODO: mystery bit?
REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS;
@ -129,173 +111,149 @@ void STWI_init_all(RfuIntrStruct *interruptStruct, IntrFunc *interrupt, bool8 co
void STWI_init_timer(IntrFunc *interrupt, int timerSelect)
{
*interrupt = &STWI_intr_timer;
gRfuState.rfuStruct->timerSelect = timerSelect;
*interrupt = STWI_intr_timer;
gRfuState->timerSelect = timerSelect;
IntrEnable(INTR_FLAG_TIMER0 << gRfuState.rfuStruct->timerSelect);
IntrEnable(INTR_FLAG_TIMER0 << gRfuState->timerSelect);
}
void AgbRFU_SoftReset()
void AgbRFU_SoftReset(void)
{
struct RfuStruct **rfuStructPtr;
struct RfuStruct *rfuStructTemp;
vu16 *timerL;
vu16 *timerH;
REG_RCNT = 0x8000;
REG_RCNT = 0x80A0; // all these bits are undocumented
{
vu16 *timerL = &REG_TMCNT_L(gRfuState.rfuStruct->timerSelect);
vu16 *timerH = &REG_TMCNT_H(gRfuState.rfuStruct->timerSelect);
timerL = &REG_TMCNT_L(gRfuState->timerSelect);
timerH = &REG_TMCNT_H(gRfuState->timerSelect);
*timerH = 0;
*timerL = 0;
*timerH = 0x83;
while (*timerL <= 0x11)
{
REG_RCNT = 0x80A2;
}
*timerH = 3;
}
REG_RCNT = 0x80A0;
REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS;
rfuStructPtr = (struct RfuStruct**)&gRfuState.rfuStruct;
(*rfuStructPtr)->unk_0 = 0;
(*rfuStructPtr)->unk_4 = 0;
(*rfuStructPtr)->unk_5 = 0;
(*rfuStructPtr)->unk_6 = 0;
(*rfuStructPtr)->unk_7 = 0;
(*rfuStructPtr)->unk_8 = 0;
(*rfuStructPtr)->unk_9 = 0;
(*rfuStructPtr)->unk_c = 0;
(*rfuStructPtr)->unk_10 = 0;
// Yeah this is the second time, there's probably something in the struct that I'm missing
rfuStructTemp = *rfuStructPtr;
rfuStructTemp->unk_12 = 0;
rfuStructTemp->msMode = 1;
(*rfuStructPtr)->unk_15 = 0;
(*rfuStructPtr)->unk_2c = 0;
gRfuState->unk_0 = 0;
gRfuState->unk_4 = 0;
gRfuState->unk_5 = 0;
gRfuState->unk_6 = 0;
gRfuState->unk_7 = 0;
gRfuState->unk_8 = 0;
gRfuState->unk_9 = 0;
gRfuState->unk_c = 0;
gRfuState->unk_10 = 0;
gRfuState->unk_12 = 0;
gRfuState->msMode = 1;
gRfuState->unk_15 = 0;
gRfuState->unk_2c = 0;
}
void STWI_set_MS_mode(u8 mode)
{
gRfuState.rfuStruct->msMode = mode;
gRfuState->msMode = mode;
}
u32 STWI_read_status(u8 index)
u16 STWI_read_status(u8 index)
{
int result;
switch (index)
{
case 0:
return gRfuState.rfuStruct->unk_12;
return gRfuState->unk_12;
case 1:
return gRfuState.rfuStruct->msMode;
return gRfuState->msMode;
case 2:
// something got inlined here?
//TODO: figure this one out
result = (gRfuState.rfuStruct->unk_0);
__asm__("lsl r0, r0, #16");
__asm__("lsr r0, r0, #16");
break;
return gRfuState->unk_0;
case 3:
return gRfuState.rfuStruct->unk_6;
break;
return gRfuState->unk_6;
default:
return 0xFFFF;
break;
}
return result;
}
void STWI_init_Callback_M()
void STWI_init_Callback_M(void)
{
STWI_set_Callback_M(0);
}
void STWI_init_Callback_S()
void STWI_init_Callback_S(void)
{
STWI_set_Callback_S(0);
}
void STWI_set_Callback_M(void *callback)
{
gRfuState.rfuStruct->callbackM = callback;
gRfuState->callbackM = callback;
}
void STWI_set_Callback_S(void *callback)
{
gRfuState.rfuStruct->callbackS = callback;
gRfuState->callbackS = callback;
}
void STWI_set_Callback_ID(u32 id)
{
gRfuState.rfuStruct->callbackID = id;
gRfuState->callbackID = id;
}
u16 STWI_poll_CommandEnd()
u16 STWI_poll_CommandEnd(void)
{
while ( gRfuState.rfuStruct->unk_2c == TRUE );
return gRfuState.rfuStruct->unk_12;
while (gRfuState->unk_2c == TRUE)
;
return gRfuState->unk_12;
}
void STWI_send_ResetREQ()
void STWI_send_ResetREQ(void)
{
if (!STWI_init(RFU_RESET))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}
void STWI_send_LinkStatusREQ()
void STWI_send_LinkStatusREQ(void)
{
if (!STWI_init(RFU_LINK_STATUS))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}
void STWI_send_VersionStatusREQ()
void STWI_send_VersionStatusREQ(void)
{
if (!STWI_init(RFU_VERSION_STATUS))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}
void STWI_send_SystemStatusREQ()
void STWI_send_SystemStatusREQ(void)
{
if (!STWI_init(RFU_SYSTEM_STATUS))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}
void STWI_send_SlotStatusREQ()
void STWI_send_SlotStatusREQ(void)
{
if (!STWI_init(RFU_SLOT_STATUS))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}
void STWI_send_ConfigStatusREQ()
void STWI_send_ConfigStatusREQ(void)
{
if (!STWI_init(RFU_CONFIG_STATUS))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}
@ -307,34 +265,29 @@ void STWI_send_GameConfigREQ(u8 * unk1, u8 *data)
if (!STWI_init(RFU_GAME_CONFIG))
{
gRfuState.rfuStruct->unk_4 = 6; //TODO: what is 6
gRfuState->unk_4 = 6; //TODO: what is 6
//TODO: kinda gross but idk what's going on here
v5 = (u8*)gRfuState.rfuStruct->unk_24;
v5 = (u8*)gRfuState->unk_24;
v5 += 4;
*(u16*)v5 = *(u16*)unk1;
v5 += 2;
unk1 += 2;
i = 13;
do
for (i = 0; i < 14; i++)
{
*v5 = *unk1;
v5++;
unk1++;
i--;
}
while(i >= 0);
i = 7;
do
for (i = 0; i < 8; i++)
{
*v5 = *data;
v5++;
data++;
i--;
}
while(i >= 0);
STWI_start_Command();
}
@ -346,10 +299,10 @@ void STWI_send_SystemConfigREQ(u16 unk1, u8 unk2, u8 unk3)
if (!STWI_init(RFU_SYSTEM_CONFIG))
{
gRfuState.rfuStruct->unk_4 = 1; //TODO: what is 1
gRfuState->unk_4 = 1; //TODO: what is 1
//TODO: kinda weird but idk what's going on here
v5 = (u8*)gRfuState.rfuStruct->unk_24;
v5 = (u8*)gRfuState->unk_24;
v5 += 4;
*v5++ = unk3;
@ -359,56 +312,56 @@ void STWI_send_SystemConfigREQ(u16 unk1, u8 unk2, u8 unk3)
}
}
void STWI_send_SC_StartREQ()
void STWI_send_SC_StartREQ(void)
{
if (!STWI_init(RFU_SC_START))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}
void STWI_send_SC_PollingREQ()
void STWI_send_SC_PollingREQ(void)
{
if (!STWI_init(RFU_SC_POLLING))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}
void STWI_send_SC_EndREQ()
void STWI_send_SC_EndREQ(void)
{
if (!STWI_init(RFU_SC_END))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}
void STWI_send_SP_StartREQ()
void STWI_send_SP_StartREQ(void)
{
if (!STWI_init(RFU_SP_START))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}
void STWI_send_SP_PollingREQ()
void STWI_send_SP_PollingREQ(void)
{
if (!STWI_init(RFU_SP_POLLING))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}
void STWI_send_SP_EndREQ()
void STWI_send_SP_EndREQ(void)
{
if (!STWI_init(RFU_SP_END))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}
@ -417,27 +370,26 @@ void STWI_send_CP_StartREQ(u16 unk1)
{
if (!STWI_init(RFU_CP_START))
{
gRfuState.rfuStruct->unk_4 = 1;
*(u32*)(gRfuState.rfuStruct->unk_24 + 4) = unk1;
gRfuState->unk_4 = 1;
*(u32*)(gRfuState->unk_24 + 4) = unk1;
STWI_start_Command();
}
}
void STWI_send_CP_PollingREQ()
void STWI_send_CP_PollingREQ(void)
{
if (!STWI_init(RFU_CP_POLLING))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}
void STWI_send_CP_EndREQ()
void STWI_send_CP_EndREQ(void)
{
if (!STWI_init(RFU_CP_END))
{
gRfuState.rfuStruct->unk_4 = 0;
gRfuState->unk_4 = 0;
STWI_start_Command();
}
}