atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a union to differentiate between 8-bit and 32-bit operations on packets

Browse source
This commit is contained in:
shinyquagsire23 2017-09-10 21:58:47 -06:00
parent 9218c2ce16
commit e26e1f1275
1 changed files with 41 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/librfu.c
View file

@ -45,12 +45,23 @@ enum
RFU_RESUME_RETRANSMIT_AND_CHANGE RFU_RESUME_RETRANSMIT_AND_CHANGE
}; };
struct RfuPacket struct RfuPacket8
{ {
u32 unk_0; u8 data[0x74];
};
struct RfuPacket32
{
u32 command;
u32 data[0x1C]; u32 data[0x1C];
}; };
union RfuPacket
{
struct RfuPacket32 rfuPacket32;
struct RfuPacket8 rfuPacket8;
};
struct RfuStruct struct RfuStruct
{ {
vs32 unk_0; vs32 unk_0;
@ -73,8 +84,8 @@ struct RfuStruct
void *callbackM; void *callbackM;
void *callbackS; void *callbackS;
u32 callbackID; u32 callbackID;
struct RfuPacket *txPacket; union RfuPacket *txPacket;
struct RfuPacket *rxPacket; union RfuPacket *rxPacket;
vu8 unk_2c; vu8 unk_2c;
u8 padding[3]; u8 padding[3];
}; };
@ -114,8 +125,8 @@ void STWI_init_all(struct RfuIntrStruct *interruptStruct, IntrFunc *interrupt, b
gRfuState = (struct RfuStruct*)interruptStruct->block1; gRfuState = (struct RfuStruct*)interruptStruct->block1;
} }
gRfuState->rxPacket = (struct RfuPacket*)interruptStruct->rxPacketAlloc; gRfuState->rxPacket = (union RfuPacket*)interruptStruct->rxPacketAlloc;
gRfuState->txPacket = (struct RfuPacket*)interruptStruct->txPacketAlloc; gRfuState->txPacket = (union RfuPacket*)interruptStruct->txPacketAlloc;
gRfuState->msMode = 1; gRfuState->msMode = 1;
gRfuState->unk_0 = 0; gRfuState->unk_0 = 0;
gRfuState->txParams = 0; gRfuState->txParams = 0;
@ -288,32 +299,32 @@ void STWI_send_ConfigStatusREQ(void)
void STWI_send_GameConfigREQ(u8 * unk1, u8 *data) void STWI_send_GameConfigREQ(u8 * unk1, u8 *data)
{ {
u8 *v5; u8 *packetBytes;
int i; int i;
if (!STWI_init(RFU_GAME_CONFIG)) if (!STWI_init(RFU_GAME_CONFIG))
{ {
gRfuState->txParams = 6; gRfuState->txParams = 6;
//TODO: kinda gross but it was probably written weird //TODO: what is unk1
v5 = (u8*)gRfuState->txPacket; packetBytes = gRfuState->txPacket->rfuPacket8.data;
v5 += sizeof(u32); packetBytes += sizeof(u32);
*(u16*)v5 = *(u16*)unk1; *(u16*)packetBytes = *(u16*)unk1;
v5 += sizeof(u16); packetBytes += sizeof(u16);
unk1 += sizeof(u16); unk1 += sizeof(u16);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
{ {
*v5 = *unk1; *packetBytes = *unk1;
v5++; packetBytes++;
unk1++; unk1++;
} }
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
{ {
*v5 = *data; *packetBytes = *data;
v5++; packetBytes++;
data++; data++;
} }
@ -323,19 +334,18 @@ void STWI_send_GameConfigREQ(u8 * unk1, u8 *data)
void STWI_send_SystemConfigREQ(u16 unk1, u8 unk2, u8 unk3) void STWI_send_SystemConfigREQ(u16 unk1, u8 unk2, u8 unk3)
{ {
u8 *v5;
if (!STWI_init(RFU_SYSTEM_CONFIG)) if (!STWI_init(RFU_SYSTEM_CONFIG))
{ {
u8 *packetBytes;
gRfuState->txParams = 1; gRfuState->txParams = 1;
//TODO: kinda weird but I think it was written weird packetBytes = gRfuState->txPacket->rfuPacket8.data;
v5 = (u8*)gRfuState->txPacket; packetBytes += sizeof(u32);
v5 += sizeof(u32);
*v5++ = unk3; *packetBytes++ = unk3;
*v5++ = unk2; *packetBytes++ = unk2;
*(u16*)v5 = unk1; *(u16*)packetBytes = unk1;
STWI_start_Command(); STWI_start_Command();
} }
} }
@ -399,7 +409,7 @@ void STWI_send_CP_StartREQ(u16 unk1)
if (!STWI_init(RFU_CP_START)) if (!STWI_init(RFU_CP_START))
{ {
gRfuState->txParams = 1; gRfuState->txParams = 1;
gRfuState->txPacket->data[0] = unk1; gRfuState->txPacket->rfuPacket32.data[0] = unk1;
STWI_start_Command(); STWI_start_Command();
} }
} }
@ -431,7 +441,7 @@ void STWI_send_DataTxREQ(void *in, u8 size)
txParams += 1; txParams += 1;
gRfuState->txParams = txParams; gRfuState->txParams = txParams;
CpuCopy32(in, gRfuState->txPacket->data, gRfuState->txParams * sizeof(u32)); CpuCopy32(in, gRfuState->txPacket->rfuPacket32.data, gRfuState->txParams * sizeof(u32));
STWI_start_Command(); STWI_start_Command();
} }
} }
@ -445,7 +455,7 @@ void STWI_send_DataTxAndChangeREQ(void *in, u8 size)
txParams += 1; txParams += 1;
gRfuState->txParams = txParams; gRfuState->txParams = txParams;
CpuCopy32(in, gRfuState->txPacket->data, gRfuState->txParams * sizeof(u32)); CpuCopy32(in, gRfuState->txPacket->rfuPacket32.data, gRfuState->txParams * sizeof(u32));
STWI_start_Command(); STWI_start_Command();
} }
} }
@ -482,7 +492,7 @@ void STWI_send_DataReadyAndChangeREQ(u8 unk)
gRfuState->txParams = 1; gRfuState->txParams = 1;
packetBytes = (u8*)gRfuState->txPacket; packetBytes = gRfuState->txPacket->rfuPacket8.data;
packetBytes += sizeof(u32); packetBytes += sizeof(u32);
*packetBytes++ = unk; *packetBytes++ = unk;
@ -503,7 +513,7 @@ void STWI_send_DisconnectedAndChangeREQ(u8 unk0, u8 unk1)
gRfuState->txParams = 1; gRfuState->txParams = 1;
packetBytes = (u8*)gRfuState->txPacket; packetBytes = gRfuState->txPacket->rfuPacket8.data;
packetBytes += sizeof(u32); packetBytes += sizeof(u32);
*packetBytes++ = unk0; *packetBytes++ = unk0;
@ -529,7 +539,7 @@ void STWI_send_DisconnectREQ(u8 unk)
if (!STWI_init(RFU_DISCONNECT)) if (!STWI_init(RFU_DISCONNECT))
{ {
gRfuState->txParams = 1; gRfuState->txParams = 1;
gRfuState->txPacket->data[0] = unk; gRfuState->txPacket->rfuPacket32.data[0] = unk;
STWI_start_Command(); STWI_start_Command();
} }
@ -540,7 +550,7 @@ void STWI_send_TestModeREQ(u8 unk0, u8 unk1)
if (!STWI_init(RFU_TEST_MODE)) if (!STWI_init(RFU_TEST_MODE))
{ {
gRfuState->txParams = 1; gRfuState->txParams = 1;
gRfuState->txPacket->data[0] = unk0 | (unk1 << 8); gRfuState->txPacket->rfuPacket32.data[0] = unk0 | (unk1 << 8);
STWI_start_Command(); STWI_start_Command();
} }