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

steal matching from #1333

Browse source
This commit is contained in:
Kurausukun 2021-03-03 23:35:03 -05:00 committed by huderlem
parent 55a40b901f
commit dec5e8eee5
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/librfu_rfu.c
View file

@ -1411,8 +1411,12 @@ static u16 rfu_STC_setSendData_org(u8 ni_or_uni, u8 bmSendSlot, u8 subFrameSize,
sendSlotFlag = gRfuLinkStatus->sendSlotNIFlag; sendSlotFlag = gRfuLinkStatus->sendSlotNIFlag;
if (sendSlotFlag & bmSendSlot) if (sendSlotFlag & bmSendSlot)
return ERR_SLOT_BUSY; return ERR_SLOT_BUSY;
for (bm_slot_id = 0; bm_slot_id < RFU_CHILD_MAX && !((bmSendSlot >> bm_slot_id) & 1); ++bm_slot_id) for (bm_slot_id = 0; bm_slot_id < RFU_CHILD_MAX; ++bm_slot_id)
; {
if ((bmSendSlot >> bm_slot_id) & 1)
break;
}
if (gRfuLinkStatus->parentChild == MODE_PARENT) if (gRfuLinkStatus->parentChild == MODE_PARENT)
llFrameSize_p = &gRfuLinkStatus->remainLLFrameSizeParent; llFrameSize_p = &gRfuLinkStatus->remainLLFrameSizeParent;
else if (gRfuLinkStatus->parentChild == MODE_CHILD) else if (gRfuLinkStatus->parentChild == MODE_CHILD)
@ -1425,35 +1429,36 @@ static u16 rfu_STC_setSendData_org(u8 ni_or_uni, u8 bmSendSlot, u8 subFrameSize,
sending = ni_or_uni & 0x20; sending = ni_or_uni & 0x20;
if (sending || ni_or_uni == 0x40) if (sending || ni_or_uni == 0x40)
{ {
u8 *dataType_p; // a hack to swap instructions
slotStatus_NI = gRfuSlotStatusNI[bm_slot_id]; slotStatus_NI = gRfuSlotStatusNI[bm_slot_id];
slotStatus_UNI = NULL; slotStatus_UNI = NULL;
slotStatus_NI->send.errorCode = 0; slotStatus_NI->send.errorCode = 0;
*slotStatus_NI->send.now_p = dataType_p = &slotStatus_NI->send.dataType; slotStatus_NI->send.now_p[0] = &slotStatus_NI->send.dataType;
slotStatus_NI->send.remainSize = 7; slotStatus_NI->send.remainSize = 7;
slotStatus_NI->send.bmSlotOrg = bmSendSlot; slotStatus_NI->send.bmSlotOrg = bmSendSlot;
slotStatus_NI->send.bmSlot = bmSendSlot; slotStatus_NI->send.bmSlot = bmSendSlot;
slotStatus_NI->send.payloadSize = subFrameSize - frameSize; slotStatus_NI->send.payloadSize = subFrameSize - frameSize;
if (sending != 0) if (sending)
*dataType_p = 0; slotStatus_NI->send.dataType = 0;
else else
*dataType_p = 1; slotStatus_NI->send.dataType = 1;
slotStatus_NI->send.dataSize = dataSize; slotStatus_NI->send.dataSize = dataSize;
slotStatus_NI->send.src = src; slotStatus_NI->send.src = src;
slotStatus_NI->send.ack = 0; slotStatus_NI->send.ack = 0;
slotStatus_NI->send.phase = 0; slotStatus_NI->send.phase = 0;
#ifndef NONMATCHING // to fix r2, r3, r4, r5 register roulette
asm("":::"r2");
#endif
for (i = 0; i < WINDOW_COUNT; ++i) for (i = 0; i < WINDOW_COUNT; ++i)
{ {
slotStatus_NI->send.recvAckFlag[i] = 0; slotStatus_NI->send.recvAckFlag[i] = 0;
slotStatus_NI->send.n[i] = 1; slotStatus_NI->send.n[i] = 1;
} }
for (bm_slot_id = 0; bm_slot_id < RFU_CHILD_MAX; ++bm_slot_id) for (bm_slot_id = 0; bm_slot_id < RFU_CHILD_MAX; ++bm_slot_id)
if ((bmSendSlot >> bm_slot_id) & 1) {
gRfuSlotStatusNI[bm_slot_id]->send.failCounter = 0; do
{
if ((bmSendSlot >> bm_slot_id) & 1)
gRfuSlotStatusNI[bm_slot_id]->send.failCounter = 0;
} while (0);
}
gRfuLinkStatus->sendSlotNIFlag |= bmSendSlot; gRfuLinkStatus->sendSlotNIFlag |= bmSendSlot;
*llFrameSize_p -= subFrameSize; *llFrameSize_p -= subFrameSize;
slotStatus_NI->send.state = SLOT_STATE_SEND_START; slotStatus_NI->send.state = SLOT_STATE_SEND_START;