diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
| commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
| tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /src/link_rfu_2.c | |
| parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
| parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) | |
Merge branch 'master' into doc-union
Diffstat (limited to 'src/link_rfu_2.c')
| -rw-r--r-- | src/link_rfu_2.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index 657d90074..63c54587a 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -118,7 +118,7 @@ static void Debug_PrintEmpty(void); static void Task_Idle(u8); static const INIT_PARAM sRfuReqConfigTemplate = { - .maxMFrame = 4, + .maxMFrame = 4, .MC_TimerCount = 32, .availSlot_flag = 0, .mboot_flag = 0, @@ -127,7 +127,7 @@ static const INIT_PARAM sRfuReqConfigTemplate = { .userName = gHostRfuUsername, .fastSearchParent_flag = TRUE, .linkRecovery_enable = FALSE, - .linkRecovery_period = 600, + .linkRecovery_period = 600, .NI_failCounter_limit = 300 }; @@ -226,7 +226,7 @@ static const struct BlockRequest sBlockRequests[] = { static const u16 sAcceptedSerialNos[] = { RFU_SERIAL_GAME, - RFU_SERIAL_WONDER_DISTRIBUTOR, + RFU_SERIAL_WONDER_DISTRIBUTOR, RFU_SERIAL_UNKNOWN, RFU_SERIAL_END }; @@ -1613,10 +1613,10 @@ static bool8 CheckForLeavingGroupMembers(void) bool8 memberLeft = FALSE; for (i = 0; i < RFU_CHILD_MAX; i++) { - if (gRfu.partnerSendStatuses[i] < RFU_STATUS_JOIN_GROUP_OK + if (gRfu.partnerSendStatuses[i] < RFU_STATUS_JOIN_GROUP_OK || gRfu.partnerSendStatuses[i] > RFU_STATUS_JOIN_GROUP_NO) { - if (gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS + if (gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS || gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS_AND_SENDSIDE_UNKNOWN) { if (gRfu.partnerRecvStatuses[i] == RFU_STATUS_LEAVE_GROUP_NOTICE) @@ -1664,7 +1664,7 @@ bool32 RfuTryDisconnectLeavingChildren(void) // Return true if any children have left or are still waiting to leave for (i = 0; i < RFU_CHILD_MAX; i++) { - if (gRfu.partnerRecvStatuses[i] == RFU_STATUS_CHILD_LEAVE_READY + if (gRfu.partnerRecvStatuses[i] == RFU_STATUS_CHILD_LEAVE_READY || gRfu.partnerRecvStatuses[i] == RFU_STATUS_CHILD_LEAVE) return TRUE; } @@ -1713,7 +1713,7 @@ static void UpdateChildStatuses(void) CheckForLeavingGroupMembers(); for (i = 0; i < RFU_CHILD_MAX; i++) { - if (gRfuSlotStatusNI[i]->send.state == SLOT_STATE_SEND_SUCCESS + if (gRfuSlotStatusNI[i]->send.state == SLOT_STATE_SEND_SUCCESS || gRfuSlotStatusNI[i]->send.state == SLOT_STATE_SEND_FAILED) { if (gRfu.partnerRecvStatuses[i] == RFU_STATUS_CHILD_LEAVE_READY) @@ -1728,7 +1728,7 @@ static s32 GetJoinGroupStatus(void) s32 status = RFU_STATUS_OK; if (gRfu.leaveGroupStatus == RFU_STATUS_LEAVE_GROUP_NOTICE) { - if (gRfuSlotStatusNI[gRfu.childSlot]->send.state == SLOT_STATE_SEND_SUCCESS + if (gRfuSlotStatusNI[gRfu.childSlot]->send.state == SLOT_STATE_SEND_SUCCESS || gRfuSlotStatusNI[gRfu.childSlot]->send.state == SLOT_STATE_SEND_FAILED) rfu_clearSlot(TYPE_NI_SEND, gRfu.childSlot); } @@ -2756,7 +2756,7 @@ static void Task_RfuReconnectWithParent(u8 taskId) if (TryReconnectParent()) DestroyTask(taskId); } - else if (GetHostRfuGameData()->activity == ACTIVITY_WONDER_CARD + else if (GetHostRfuGameData()->activity == ACTIVITY_WONDER_CARD || GetHostRfuGameData()->activity == ACTIVITY_WONDER_NEWS) { tTime++; |