From 26a912dcc0e476da19712883355d07fe0f992cc6 Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Fri, 22 Dec 2023 13:14:21 +0800 Subject: [PATCH] bugfix: correct record shift mechanism. --- datalink814_ge/src/linklayer/linklayer814.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/datalink814_ge/src/linklayer/linklayer814.c b/datalink814_ge/src/linklayer/linklayer814.c index 5c7e6d0..e855765 100644 --- a/datalink814_ge/src/linklayer/linklayer814.c +++ b/datalink814_ge/src/linklayer/linklayer814.c @@ -299,10 +299,6 @@ void L2_FrameStateUpdate(L2_INST* instPtr) { // Update physical layer status. // Phy_UpdateState(phyRef); - // Frame types shift (last <- curr <- next) - L2_RcdShift(&(instPtr->frame), L2_NONE_FRAME); - L2_RcdShift(&(instPtr->tor), L2_TOR_SUSPEND); - // Update frame state. if (Phy_IsFrameValid(phyRef) == false) { L2_DataAvailUpdate(instPtr, false); @@ -949,7 +945,6 @@ int mgmtFrameRecv = 0; int svcFrameRecv = 0; int32_t Linklayer_PktHandler(L2_INST* instPtr, L2_FRAME_TYPE frameType) { ASSERT(instPtr != NULL); - DBG_INFO("Link layer handling packet...\n"); int32_t Status = SUCCESS; if (instPtr->dataAvail == false) { @@ -1147,6 +1142,10 @@ int32_t Linklayer_Proc(L2_INST* instPtr) { // Update slot number. L2_UpdateSlotNum(instPtr); + + // Frame types shift (last <- curr <- next) + L2_RcdShift(&(instPtr->frame), L2_NONE_FRAME); + L2_RcdShift(&(instPtr->tor), L2_TOR_SUSPEND); // Update link layer state. instPtr->mainState = instPtr->nextState;