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

fix: 修改包处理函数传参, 删除帧类型参数, 改为从数据包中读取类型

Browse Source
This commit is contained in:
josh
2025-05-28 14:35:24 +08:00
parent 1df3228db2
commit cf58160c35
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/networking/link_layer/link_layer.c
+6 -3
View File
@@ -366,6 +366,7 @@ inline uint32_t L2_GetNextFrameNum(L2_INST *instPtr)
ASSERT(instPtr != NULL); ASSERT(instPtr != NULL);
return instPtr->frameNum.next; return instPtr->frameNum.next;
} }
/** /**
* @brief Get next slot number. * @brief Get next slot number.
*/ */
@@ -921,12 +922,11 @@ int32_t Linklayer_EventHandler(L2_INST *instPtr, const L2_EVENT *l2Event)
* @brief Handle l2 packet correctly received. * @brief Handle l2 packet correctly received.
* *
* @param instPtr a pointer to physical layer controller instance * @param instPtr a pointer to physical layer controller instance
* @param frameType
* *
* @return Status code. * @return Status code.
* *
******************************************************************************/ ******************************************************************************/
int32_t Linklayer_PktHandler(L2_INST *instPtr, L2_FRAME_TYPE frameType) int32_t Linklayer_PktHandler(L2_INST *instPtr)
{ {
ASSERT(instPtr != NULL); ASSERT(instPtr != NULL);
int32_t Status; int32_t Status;
@@ -936,6 +936,9 @@ int32_t Linklayer_PktHandler(L2_INST *instPtr, L2_FRAME_TYPE frameType)
return FAILURE; return FAILURE;
} }
L2_MSG_COMMON *msg = (L2_MSG_COMMON *) instPtr->recvPktData;
L2_FRAME_TYPE frameType = msg->msgType;
switch (frameType) switch (frameType)
{ {
case L2_FRAME_ADV: case L2_FRAME_ADV:
@@ -1113,7 +1116,7 @@ int32_t Linklayer_Proc(L2_INST *instPtr)
// Handle frame received in last slot. // Handle frame received in last slot.
if (L2_isDataAvail(instPtr) == true) if (L2_isDataAvail(instPtr) == true)
{ {
if (Linklayer_PktHandler(instPtr, L2_GetLastFrameType(instPtr)) != SUCCESS) if (Linklayer_PktHandler(instPtr) != SUCCESS)
{ {
DBG_ERROR("Failed to handle last received frame: %" PRId8 ".\n", L2_GetLastFrameType(instPtr)); DBG_ERROR("Failed to handle last received frame: %" PRId8 ".\n", L2_GetLastFrameType(instPtr));
} }
src/networking/link_layer/link_layer.h
+1 -1
View File
@@ -142,7 +142,7 @@ int32_t Linklayer_Start(L2_INST *instPtr);
int32_t Linklayer_Halt(L2_INST *instPtr); int32_t Linklayer_Halt(L2_INST *instPtr);
int32_t Linklayer_Proc(L2_INST *instPtr); int32_t Linklayer_Proc(L2_INST *instPtr);
int32_t Linklayer_EventHandler(L2_INST *instPtr, const L2_EVENT *l2Event); int32_t Linklayer_EventHandler(L2_INST *instPtr, const L2_EVENT *l2Event);
int32_t Linklayer_PktHandler(L2_INST *instPtr, L2_FRAME_TYPE frameType); int32_t Linklayer_PktHandler(L2_INST *instPtr);
int32_t L2_SetupNextSlot(L2_INST *instPtr, L2_TOR_TYPE txrxMode, L2_FRAME_TYPE frameType); int32_t L2_SetupNextSlot(L2_INST *instPtr, L2_TOR_TYPE txrxMode, L2_FRAME_TYPE frameType);
/** @} LinkLayer_Main*/ /** @} LinkLayer_Main*/