josh/hj_datalink
1
0
Fork 0
forked from gatsby/df_datalink
Code Issues Pull Requests Releases Activity

formatted document

Browse Source
This commit is contained in:
Gatsby Van
2024-03-06 20:25:43 +08:00
parent 274ee8922e
commit 51b96825a3
1 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
df_datalink_sp/src/networking/link_layer/link_layer.c
+8 -7
View File
@@ -373,7 +373,7 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
isValid = false; isValid = false;
break; break;
} }
if(isValid) if (isValid)
{ {
instPtr->log.frameCorrect++; instPtr->log.frameCorrect++;
L2_DataAvailUpdate(instPtr, true); L2_DataAvailUpdate(instPtr, true);
@@ -686,7 +686,7 @@ int32_t Linklayer_Init(L2_INST **instPtr, const L2_CONFIG *config)
(*instPtr)->rtneConfig.curr = NULL; (*instPtr)->rtneConfig.curr = NULL;
(*instPtr)->rtneConfig.next = NULL; (*instPtr)->rtneConfig.next = NULL;
(*instPtr)->isEnable = false; (*instPtr)->isEnable = false;
(*instPtr)->cxn2Net = (config->myType == L2_NODE_HEAD) ? true : false;; (*instPtr)->cxn2Net = (config->myType == L2_NODE_HEAD) ? true : false;
(*instPtr)->dataAvail = false; (*instPtr)->dataAvail = false;
(*instPtr)->frameNum.last = 0; (*instPtr)->frameNum.last = 0;
(*instPtr)->frameNum.curr = 0; (*instPtr)->frameNum.curr = 0;
@@ -854,7 +854,8 @@ int32_t Linklayer_Start(L2_INST *instPtr)
{ {
ASSERT(instPtr != NULL); ASSERT(instPtr != NULL);
// Set netStartTime at first call. // Set netStartTime at first call.
if (instPtr->netStartTime == NET_START_TIME_INFTY) { if (instPtr->netStartTime == NET_START_TIME_INFTY)
{
instPtr->netStartTime = TimeCtrl_GetIntCnt(instPtr->config.tmcInstPtr) / L2_SLOTS_PER_FRAME + 1; instPtr->netStartTime = TimeCtrl_GetIntCnt(instPtr->config.tmcInstPtr) / L2_SLOTS_PER_FRAME + 1;
} }
instPtr->isEnable = true; instPtr->isEnable = true;
@@ -1137,7 +1138,8 @@ static int32_t Linklayer_Routine(L2_INST *instPtr)
L2_IterEditNode(instPtr->nodeList, &increment, IntcNodeTTL); L2_IterEditNode(instPtr->nodeList, &increment, IntcNodeTTL);
#ifdef DATALINK_ENABLE_AUTORECONNECT #ifdef DATALINK_ENABLE_AUTORECONNECT
if(L2_GetMainState(instPtr) != L2_INIT_STATE){ if (L2_GetMainState(instPtr) != L2_INIT_STATE)
{
L2_IterDeleteNode(instPtr->nodeList, IsNodeConnected); L2_IterDeleteNode(instPtr->nodeList, IsNodeConnected);
if (L2_GetNodeListLen(instPtr->nodeList) < instPtr->config.netScale - 1) if (L2_GetNodeListLen(instPtr->nodeList) < instPtr->config.netScale - 1)
{ {
@@ -1255,9 +1257,8 @@ int32_t Linklayer_Proc(L2_INST *instPtr)
instPtr->linkLog.svcTxCnt = instPtr->log.svcTxCnt; instPtr->linkLog.svcTxCnt = instPtr->log.svcTxCnt;
instPtr->linkLog.svcRecvCnt = instPtr->log.svcRecvCnt; instPtr->linkLog.svcRecvCnt = instPtr->log.svcRecvCnt;
instPtr->linkLog.svcCorrectCnt = instPtr->log.svcCorrectCnt; instPtr->linkLog.svcCorrectCnt = instPtr->log.svcCorrectCnt;
instPtr->linkLog.timeDev = (instPtr->log.timeDev > INT32_MAX) ? instPtr->linkLog.timeDev = (instPtr->log.timeDev > INT32_MAX)
INT32_MAX : ? INT32_MAX : ((instPtr->log.timeDev < INT32_MIN) ? INT32_MIN : (int32_t)instPtr->log.timeDev);
((instPtr->log.timeDev < INT32_MIN) ? INT32_MIN : (int32_t) instPtr->log.timeDev);
instPtr->linkLog.sendId = instPtr->serviceFSM->txLog.dataId; instPtr->linkLog.sendId = instPtr->serviceFSM->txLog.dataId;
instPtr->linkLog.recvId = instPtr->serviceFSM->rxLog.dataId; instPtr->linkLog.recvId = instPtr->serviceFSM->rxLog.dataId;