From 0f5526736d7258f2c635a0d2ab904dbc7dbf7465 Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Tue, 23 Jan 2024 15:28:28 +0800 Subject: [PATCH] bugfix: net start check should apply at the beginning of linklayer proc. --- datalink814_ge/src/linklayer/linklayer814.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/datalink814_ge/src/linklayer/linklayer814.c b/datalink814_ge/src/linklayer/linklayer814.c index 0ca6ba9..4ef2830 100644 --- a/datalink814_ge/src/linklayer/linklayer814.c +++ b/datalink814_ge/src/linklayer/linklayer814.c @@ -1227,15 +1227,6 @@ static int32_t Linklayer_Routine(L2_INST *instPtr) int32_t Status; uint32_t tableIndx, entryIndx; - // FIXME: Consider time wrapping. - uint32_t nextTimeUnit = (TimeCtrl_GetIntCnt(instPtr->config.tmcInstPtr) + 1) / L2_SLOTS_PER_FRAME; - if (nextTimeUnit < instPtr->netStartTime) - { - DBG_WARNING("Linklayer not start yet, next time unit: %u, start time unit: %u.\n", - nextTimeUnit, instPtr->netStartTime); - return EIGNORE; - } - // Determine which routine entry is going to be performed. tableIndx = L2_GetNextFrameNum(instPtr) % instPtr->rtneConfig.rtnePrd; entryIndx = L2_GetNextSlotNum(instPtr); @@ -1317,6 +1308,15 @@ int32_t Linklayer_Proc(L2_INST *instPtr) return SUCCESS; } + // FIXME: Consider time wrapping. + uint32_t nextTimeUnit = (TimeCtrl_GetIntCnt(instPtr->config.tmcInstPtr) + 1) / L2_SLOTS_PER_FRAME; + if (nextTimeUnit < instPtr->netStartTime) + { + DBG_WARNING("Linklayer not start yet, next time unit: %u, start time unit: %u.\n", + nextTimeUnit, instPtr->netStartTime); + return EIGNORE; + } + // Update slot number. L2_UpdateSlotNum(instPtr);