From 37d421ba2afb774d5b9784935dc3eba1f2ee7e1a Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Wed, 24 Jan 2024 11:20:52 +0800 Subject: [PATCH] add new api L2_GetLastOptFrameType --- df_datalink_sp/src/networking/link_layer/link_layer.c | 4 ++-- df_datalink_sp/src/networking/link_layer/link_layer.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/df_datalink_sp/src/networking/link_layer/link_layer.c b/df_datalink_sp/src/networking/link_layer/link_layer.c index 7eba6cc..de30909 100644 --- a/df_datalink_sp/src/networking/link_layer/link_layer.c +++ b/df_datalink_sp/src/networking/link_layer/link_layer.c @@ -42,7 +42,6 @@ static void L2_SetSlotNum(L2_INST *instPtr, uint32_t newSlotNum); static void L2_SetFrameNum(L2_INST *instPtr, uint32_t newFrameNum); static void L2_UpdateSlotNum(L2_INST *instPtr); static void L2_DataAvailUpdate(L2_INST *instPtr, bool status); -static L2_FRAME_TYPE L2_GetReceiveFrameType(L2_INST *instPtr); /** * @brief helper function to update linkelayer state @@ -299,7 +298,7 @@ inline void L2_RcdShift(L2_RCD *rcd, int32_t netxVal) * @return L2_FRAME_TYPE. * ******************************************************************************/ -static L2_FRAME_TYPE L2_GetReceiveFrameType(L2_INST *instPtr) +L2_FRAME_TYPE L2_GetLastOptFrameType(L2_INST *instPtr) { if (instPtr->myInfo.nodeType == L2_NODE_HEAD || L2_isCxn2Net(instPtr)) { @@ -308,6 +307,7 @@ static L2_FRAME_TYPE L2_GetReceiveFrameType(L2_INST *instPtr) switch (instPtr->scanFSM->scanStage) { case L2_SCAN_INIT_STAGE: + return L2_SCAN_FRAME; case L2_SCAN_ADV_STAGE: return L2_ADV_FRAME; case L2_SCAN_CFM_STAGE: diff --git a/df_datalink_sp/src/networking/link_layer/link_layer.h b/df_datalink_sp/src/networking/link_layer/link_layer.h index ac95959..c6f5007 100644 --- a/df_datalink_sp/src/networking/link_layer/link_layer.h +++ b/df_datalink_sp/src/networking/link_layer/link_layer.h @@ -111,7 +111,7 @@ int32_t Linklayer_PktHandler(L2_INST *instPtr, L2_FRAME_TYPE frameType); int32_t L2_SteerBeam2Node(L2_INST *instPtr, uint8_t nodeId); int32_t L2_SetupNextSlot(L2_INST *instPtr, L2_TOR_TYPE txrxMode, L2_FRAME_TYPE frameType); void L2_FrameStateUpdate(L2_INST *instPtr); -L2_FRAME_TYPE L2_GetLastRcvFrameType(L2_INST *instPtr); +L2_FRAME_TYPE L2_GetLastOptFrameType(L2_INST *instPtr); L1_FRAME_TYPE L2_L2frame2L1frame(L2_FRAME_TYPE l2Frame); // Scheduling Event