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

miscellaneous fix.

Browse Source
This commit is contained in:
Gatsby Van
2024-01-24 11:41:15 +08:00
parent 0a8b1297c0
commit 52a2e5a3bb
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
df_datalink_sp/src/networking/link_layer/link_layer.c
+5 -5
View File
@@ -391,7 +391,7 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
if (isValid == true) if (isValid == true)
{ {
memcpy(instPtr->rxSlotLog.payload, memcpy(instPtr->rxSlotLog.payload,
instPtr->recvPktData, instPtr->recvPktData,
Phy_GetFrameLen(L2_L2frame2L1frame(recvType))); Phy_GetFrameLen(L2_L2frame2L1frame(recvType)));
TIME_WORD timeWrod; TIME_WORD timeWrod;
Phy_GetLastReceivedFrameSyncTimeStamp(phyRef, &timeWrod); Phy_GetLastReceivedFrameSyncTimeStamp(phyRef, &timeWrod);
@@ -1220,7 +1220,7 @@ int32_t Linklayer_Proc(L2_INST *instPtr)
// Update slot number. // Update slot number.
L2_UpdateSlotNum(instPtr); L2_UpdateSlotNum(instPtr);
DBG_INFO("######## Current frameNum: %u, SlotNo: %u ########\n", DBG_INFO("######## Current frameNum: %u, SlotNum: %u ########\n",
instPtr->frameNum.curr, instPtr->slotNum.curr); instPtr->frameNum.curr, instPtr->slotNum.curr);
// Sync System info // Sync System info
@@ -1232,9 +1232,9 @@ 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, L2_GetLastOptFrameType(instPtr)) != SUCCESS)
{ {
DBG_ERROR("Failed to handle last received frame: %ld.\n", instPtr->frame.last); DBG_ERROR("Failed to handle last received frame: %d.\n", L2_GetLastOptFrameType(instPtr));
} }
} }
@@ -1268,7 +1268,7 @@ int32_t Linklayer_Proc(L2_INST *instPtr)
L2_EventPoolHandler(instPtr); L2_EventPoolHandler(instPtr);
PHY_INST* phyRef = instPtr->config.phyInstPtr; PHY_INST* phyRef = instPtr->config.phyInstPtr;
TIMECTRL_INST* tmcRef = instPtr->config.tmcInstPtr; TMC_INST* tmcRef = instPtr->config.tmcInstPtr;
TIME_WORD timeWord; TIME_WORD timeWord;
// Update Protocol log // Update Protocol log
df_datalink_sp/src/networking/link_layer/service.c
+12 -3
View File
@@ -113,7 +113,16 @@ static int32_t Service_Packing(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t dst
L2_FrameInsertChunk(buff, L2_MSG_SVC_SRC_SPEEDZ, L2_MSG_SVC_SRC_SPEEDZ_LEN, &(instPtr->sysInfo.vZ)); L2_FrameInsertChunk(buff, L2_MSG_SVC_SRC_SPEEDZ, L2_MSG_SVC_SRC_SPEEDZ_LEN, &(instPtr->sysInfo.vZ));
// packing payload // packing payload
L2_FrameInsertChunk(buff, L2_MSG_SVC_PAYLOAD, L2_MSG_SVC_PAYLOAD_LEN, testData); L2_FrameInsertChunk(buff, L2_MSG_SVC_PAYLOAD, L2_MSG_SVC_PAYLOAD_LEN, testData);
// if(L2_GetNodeType(instPtr) == L2_NODE_HEAD)
// {
// SysMonitor_GetSendPayloadLJRaw(buff+L2_MSG_SVC_PAYLOAD);
// }
// else
// {
// SysMonitor_GetSendPayloadFLJRaw(buff+L2_MSG_SVC_PAYLOAD);
// }
Status = L2_CrcAppend(buff, L2_SVC_PACK_LEN - L2_MSG_SVC_CRC_LEN, L2_MSG_SVC_CRC, L2_CRC16_1021); Status = L2_CrcAppend(buff, L2_SVC_PACK_LEN - L2_MSG_SVC_CRC_LEN, L2_MSG_SVC_CRC, L2_CRC16_1021);
if (Status != SUCCESS) if (Status != SUCCESS)
@@ -267,7 +276,7 @@ int32_t L2_Service_PktHandler(L2_INST *instPtr, uint8_t *msg)
break; break;
} }
default: default:
DBG_ERROR("Unsupported frame type: %ld.\n", instPtr->frame.last); DBG_ERROR("Unsupported frame type: %d.\n", instPtr->frame.last);
break; break;
} }
return Status; return Status;
@@ -339,7 +348,7 @@ int32_t L2_Service_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntr
L2_SetupNextSlot(instPtr, torState, L2_SVC_FRAME); L2_SetupNextSlot(instPtr, torState, L2_SVC_FRAME);
break; break;
default: default:
DBG_ERROR("UNKNOWN slot type [%d].\n", schedEntry->slotType); DBG_ERROR("UNKNOWN slot type [%d].\n", rtneEntry->slotType);
return FAILURE; return FAILURE;
} }
#ifdef DATALINK_ENABLE_BERTEST #ifdef DATALINK_ENABLE_BERTEST