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

adapted logging to new apis.

Browse Source
This commit is contained in:
Gatsby Van
2024-01-24 11:22:26 +08:00
parent 38500bbfbf
commit f026380402
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
df_datalink_sp/src/networking/link_layer/link_layer.c
+10 -9
View File
@@ -383,15 +383,15 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
// -- send slot status // -- send slot status
if (instPtr->tor.curr == L2_TOR_RX) if (instPtr->tor.curr == L2_TOR_RX)
{ {
instPtr->rxSlotLog.tuNo = instPtr->frameNum.last; instPtr->rxSlotLog.tuNo = L2_GetCurrentFrameNum(instPtr);
instPtr->rxSlotLog.slotNo = instPtr->slotNum.last; instPtr->rxSlotLog.slotNo = L2_GetCurrentSlotNum(instPtr);
instPtr->rxSlotLog.frameType = instPtr->frame.last; instPtr->rxSlotLog.frameType = recvType;
memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->rxSlotLog.payload)); memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->rxSlotLog.payload));
if (isValid == true) if (isValid == true)
{ {
memcpy(instPtr->rxSlotLog.payload, memcpy(instPtr->rxSlotLog.payload,
instPtr->recvPktData, instPtr->recvPktData,
Phy_GetFrameLen(L2_L2frame2L1frame(instPtr->frame.last))); Phy_GetFrameLen(L2_L2frame2L1frame(recvType)));
TIME_WORD timeWrod; TIME_WORD timeWrod;
Phy_GetLastReceivedFrameSyncTimeStamp(phyRef, &timeWrod); Phy_GetLastReceivedFrameSyncTimeStamp(phyRef, &timeWrod);
instPtr->rxSlotLog.tmStamp = timeWrod.frac_part; instPtr->rxSlotLog.tmStamp = timeWrod.frac_part;
@@ -407,19 +407,20 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
instPtr->rxSlotLog.tmStamp = 0; instPtr->rxSlotLog.tmStamp = 0;
instPtr->rxSlotLog.tmDevi = 0; instPtr->rxSlotLog.tmDevi = 0;
instPtr->rxSlotLog.freqDevi = 0; instPtr->rxSlotLog.freqDevi = 0;
memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->rxSlotLog.payload));
} }
SysMonitor_UpdateRecvSlotLog(&(instPtr->rxSlotLog)); SysMonitor_UpdateRecvSlotLog(&(instPtr->rxSlotLog));
} }
// -- send slot status // -- send slot status
if (instPtr->tor.next == L2_TOR_TX) if (instPtr->tor.next == L2_TOR_TX)
{ {
instPtr->txSlotLog.tuNo = instPtr->frameNum.curr; instPtr->txSlotLog.tuNo = L2_GetCurrentFrameNum(instPtr);
instPtr->txSlotLog.slotNo = instPtr->slotNum.curr; instPtr->txSlotLog.slotNo = L2_GetCurrentSlotNum(instPtr);
instPtr->txSlotLog.frameType = instPtr->frame.curr; instPtr->txSlotLog.frameType = sendType;
memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->txSlotLog.payload)); memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->txSlotLog.payload));
memcpy(instPtr->txSlotLog.payload, memcpy(instPtr->txSlotLog.payload,
instPtr->recvPktData, instPtr->sendPktData,
Phy_GetFrameLen(L2_L2frame2L1frame(instPtr->frame.curr))); Phy_GetFrameLen(L2_L2frame2L1frame(sendType)));
instPtr->txSlotLog.tmStamp = 0; instPtr->txSlotLog.tmStamp = 0;
instPtr->txSlotLog.tmDevi = 0; instPtr->txSlotLog.tmDevi = 0;
instPtr->txSlotLog.freqDevi = 0; instPtr->txSlotLog.freqDevi = 0;