diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-15 16:27:36 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-15 16:27:36 -0500 |
commit | 153858af6035015ca8aae24f44640ce7f25679bc (patch) | |
tree | 66e6c438d0bb15348d0016195e17e19389cf6f99 /src/librfu_rfu.c | |
parent | 04d176334ad590d3462e3c1eb75c1313705ae183 (diff) | |
parent | 3170b753442da34dbdff6f141f0d2223973c0e83 (diff) |
Merge master into doc-questlog
Diffstat (limited to 'src/librfu_rfu.c')
-rw-r--r-- | src/librfu_rfu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c index 96de99c2a..dccd342f2 100644 --- a/src/librfu_rfu.c +++ b/src/librfu_rfu.c @@ -1533,11 +1533,11 @@ void rfu_UNI_clearRecvNewDataFlag(u8 slotStatusIndex) gRfuSlotStatusUNI[slotStatusIndex]->recv.newDataFlag = 0; } -void rfu_REQ_sendData(u8 clockChangeFlag) +void rfu_REQ_sendData(bool8 clockChangeFlag) { if (gRfuLinkStatus->parentChild != MODE_NEUTRAL) { - if (gRfuLinkStatus->parentChild == 1 + if (gRfuLinkStatus->parentChild == MODE_PARENT && !(gRfuLinkStatus->sendSlotNIFlag | gRfuLinkStatus->recvSlotNIFlag | gRfuLinkStatus->sendSlotUNIFlag)) { if (gRfuStatic->commExistFlag) @@ -1555,7 +1555,7 @@ void rfu_REQ_sendData(u8 clockChangeFlag) gRfuFixed->LLFBuffer[0] = 1; gRfuFixed->LLFBuffer[4] = 0xFF; STWI_set_Callback_M(rfu_CB_sendData3); - if (clockChangeFlag == 0) + if (!clockChangeFlag) STWI_send_DataTxREQ(gRfuFixed->LLFBuffer, 1); else STWI_send_DataTxAndChangeREQ(gRfuFixed->LLFBuffer, 1); @@ -1569,7 +1569,7 @@ void rfu_REQ_sendData(u8 clockChangeFlag) if (gRfuLinkStatus->LLFReadyFlag) { STWI_set_Callback_M(rfu_CB_sendData); - if (clockChangeFlag != 0) + if (clockChangeFlag) { STWI_send_DataTxAndChangeREQ(gRfuFixed->LLFBuffer, gRfuStatic->totalPacketSize + 4); return; @@ -1577,7 +1577,7 @@ void rfu_REQ_sendData(u8 clockChangeFlag) STWI_send_DataTxREQ(gRfuFixed->LLFBuffer, gRfuStatic->totalPacketSize + 4); } } - if (clockChangeFlag != 0) + if (clockChangeFlag) { if (gRfuLinkStatus->parentChild == MODE_PARENT) { |