forked from gatsby/df_datalink
fix: 修改包处理函数传参, 删除帧类型参数, 改为从数据包中读取类型
This commit is contained in:
@@ -366,6 +366,7 @@ inline uint32_t L2_GetNextFrameNum(L2_INST *instPtr)
|
||||
ASSERT(instPtr != NULL);
|
||||
return instPtr->frameNum.next;
|
||||
}
|
||||
|
||||
/**
|
||||
* @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.
|
||||
*
|
||||
* @param instPtr a pointer to physical layer controller instance
|
||||
* @param frameType
|
||||
*
|
||||
* @return Status code.
|
||||
*
|
||||
******************************************************************************/
|
||||
int32_t Linklayer_PktHandler(L2_INST *instPtr, L2_FRAME_TYPE frameType)
|
||||
int32_t Linklayer_PktHandler(L2_INST *instPtr)
|
||||
{
|
||||
ASSERT(instPtr != NULL);
|
||||
int32_t Status;
|
||||
@@ -936,6 +936,9 @@ int32_t Linklayer_PktHandler(L2_INST *instPtr, L2_FRAME_TYPE frameType)
|
||||
return FAILURE;
|
||||
}
|
||||
|
||||
L2_MSG_COMMON *msg = (L2_MSG_COMMON *) instPtr->recvPktData;
|
||||
L2_FRAME_TYPE frameType = msg->msgType;
|
||||
|
||||
switch (frameType)
|
||||
{
|
||||
case L2_FRAME_ADV:
|
||||
@@ -1113,7 +1116,7 @@ int32_t Linklayer_Proc(L2_INST *instPtr)
|
||||
// Handle frame received in last slot.
|
||||
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));
|
||||
}
|
||||
|
||||
@@ -142,7 +142,7 @@ int32_t Linklayer_Start(L2_INST *instPtr);
|
||||
int32_t Linklayer_Halt(L2_INST *instPtr);
|
||||
int32_t Linklayer_Proc(L2_INST *instPtr);
|
||||
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);
|
||||
/** @} LinkLayer_Main*/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user