add missing remote test

*bugfix: correct memcpy offset
*bugfix: correct type definition
2024-02-01 17:09:59 +08:00 · 2024-02-01 17:09:37 +08:00 · 2024-02-01 17:08:51 +08:00 · 2024-02-01 15:12:34 +08:00 · 2024-02-01 15:09:26 +08:00 · 2024-02-01 15:07:48 +08:00
22 changed files with 1373 additions and 944 deletions
@@ -93,9 +93,6 @@
 #if !defined(DATALINK_ENABLE_AUTOTIMESYNC)
 	#warning To enbale bit error rate test, auto time-sync should be enabled...
 #endif
-#if defined(DATALINK_ENABLE_AUTORECONNECT)
-	#error Do not support auto reconnnect in bit error rate test mode...
-#endif
 #endif

 #endif
@@ -359,8 +359,8 @@ void ScuTimer_IntrHandler(void *context)
 	xdesc = (struct xil_timer_desc *)(logTmPtr->extra);
 	if (XScuTimer_IsExpired((XScuTimer *)xdesc->instance))
 	{
-		// Update log
-		Phy_UpdateHwSate(phyInstPtr);
+		// Refresh log
+		Phy_RefreshHwSate(phyInstPtr);
 		XScuTimer_ClearInterruptStatus((XScuTimer *)xdesc->instance);
 	}
 	else
@@ -190,9 +190,6 @@ typedef enum
 #if !defined(DATALINK_ENABLE_AUTOTIMESYNC)
 	#warning To enbale bit error rate test, auto time-sync should be enabled...
 #endif
-#if defined(DATALINK_ENABLE_AUTORECONNECT)
-	#error Do not support auto reconnnect in bit error rate test mode...
-#endif
 #endif

 #endif //__APP_CONFIG_H_
@@ -360,8 +360,8 @@ void ScuTimer_IntrHandler(void *context)
 	xdesc = (struct xil_timer_desc *)(logTmPtr->extra);
 	if (XScuTimer_IsExpired((XScuTimer *)xdesc->instance))
 	{
-		// Update log
-		Phy_UpdateHwSate(phyInstPtr);
+		// Refresh log
+		Phy_RefreshHwSate(phyInstPtr);
 		XScuTimer_ClearInterruptStatus((XScuTimer *)xdesc->instance);
 	}
 	else
@@ -374,7 +374,7 @@ void ScuTimer_IntrHandler(void *context)
 /**
 * @brief   Hardware_SwitchFreq
 *
- * @param   dev
+ * @param   devSysMonitor_UpdateHardwareStatus(newHwState);
 * @param   freq
 *
 * @return  None.
@@ -333,7 +333,6 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
 	PHY_INST *phyRef = instPtr->config.phyInstPtr;
 	bool isValid;
 	L2_FRAME_TYPE recvType = L2_GetLastOptFrameType(instPtr);
-	L2_FRAME_TYPE sendType = L2_GetNextFrameType(instPtr);
 	// Update frame state.
 	if (Phy_IsFrameValid(phyRef) == false)
 	{
@@ -347,7 +346,6 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
 	instPtr->log.frameRecv++;

 	// Update frame state.
-	// FIXME: add log
 	switch (recvType)
 	{
 	case L2_SCAN_FRAME:
@@ -385,54 +383,6 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
 		L2_DataAvailUpdate(instPtr, false);
 	}
 	}
-
-	// Logging status.
-	// -- send slot status
-	if (instPtr->tor.curr == L2_TOR_RX)
-	{
-		instPtr->rxSlotLog.tuNo = L2_GetCurrentFrameNum(instPtr);
-		instPtr->rxSlotLog.slotNo = L2_GetCurrentSlotNum(instPtr);
-		instPtr->rxSlotLog.frameType = recvType;
-		memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->rxSlotLog.payload));
-		if (isValid == true)
-		{
-			memcpy(instPtr->rxSlotLog.payload,
-					instPtr->recvPktData,
-					Phy_GetFrameLen(L2_L2frame2L1frame(recvType)));
-			TIME_WORD timeWrod;
-			Phy_GetLastReceivedFrameSyncTimeStamp(phyRef, &timeWrod);
-			instPtr->rxSlotLog.tmStamp = timeWrod.frac_part;
-			instPtr->rxSlotLog.tmStamp += (uint64_t)timeWrod.int_part * TIME_FRAC_MAX;
-
-			// Log time deviation.
-			instPtr->txSlotLog.tmDevi = 0; // TODO:
-			// Log frequency deviation
-			instPtr->rxSlotLog.freqDevi = (uint32_t)Phy_GetFreqEst(phyRef);
-		}
-		else
-		{
-			instPtr->rxSlotLog.tmStamp = 0;
-			instPtr->rxSlotLog.tmDevi = 0;
-			instPtr->rxSlotLog.freqDevi = 0;
-			memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->rxSlotLog.payload));
-		}
-		SysMonitor_UpdateRecvSlotLog(&(instPtr->rxSlotLog));
-	}
-	// -- send slot status
-	if (instPtr->tor.next == L2_TOR_TX)
-	{
-		instPtr->txSlotLog.tuNo = L2_GetCurrentFrameNum(instPtr);
-		instPtr->txSlotLog.slotNo = L2_GetCurrentSlotNum(instPtr);
-		instPtr->txSlotLog.frameType = sendType;
-		memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->txSlotLog.payload));
-		memcpy(instPtr->txSlotLog.payload,
-			   instPtr->sendPktData,
-			   Phy_GetFrameLen(L2_L2frame2L1frame(sendType)));
-		instPtr->txSlotLog.tmStamp = 0;
-		instPtr->txSlotLog.tmDevi = 0;
-		instPtr->txSlotLog.freqDevi = 0;
-		SysMonitor_UpdateSendSlotLog(&(instPtr->txSlotLog));
-	}
 }

 /*****************************************************************************/
@@ -1276,25 +1226,33 @@ int32_t Linklayer_Proc(L2_INST *instPtr)
 	// Check and execute scheduled event.
 	L2_EventPoolHandler(instPtr);

-	PHY_INST* phyRef = instPtr->config.phyInstPtr;
-	TMC_INST* tmcRef = instPtr->config.tmcInstPtr;
-
-	TIME_WORD timeWord;
-	// Update Protocol log
-	instPtr->prtcLog.tmSys = instPtr->frameNum.last * L2_SLOTS_PER_FRAME + instPtr->slotNum.last;
-	instPtr->prtcLog.phySt = 0; // TODO: Update physical state.
-	TimeCtrl_GetCurrentTime(tmcRef, &timeWord);
-	instPtr->prtcLog.tmLocal = timeWord.frac_part; // us
-	instPtr->prtcLog.tmLocal += (uint64_t)timeWord.int_part * TIME_FRAC_MAX; // us
-	instPtr->prtcLog.beamNo = phyRef->beamNo.last;
-	instPtr->prtcLog.beamNo = phyRef->beamWd.last;
-	instPtr->prtcLog.stage = instPtr->mainState;
-	instPtr->prtcLog.recvCnt = instPtr->log.frameRecv;
-	instPtr->prtcLog.recvCorrect = instPtr->log.frameCorrect;
-	SysMonitor_UpdateProtocolLog(&(instPtr->prtcLog));
-
-
 	// Update link layer state.
 	instPtr->mainState = instPtr->nextState;
+
+	instPtr->linkLog.tuNum = instPtr->frameNum.curr;
+	instPtr->linkLog.slotNum = (uint8_t)instPtr->slotNum.curr;
+	instPtr->linkLog.nodeType = (instPtr->config.myType == L2_NODE_HEAD) ? 0xAA : 0xCC;
+	instPtr->linkLog.cxnStatus = (instPtr->cxn2Net) ? 0x11 : 0x00;
+	instPtr->linkLog.linkStage = (instPtr->mainState == L2_INIT_STATE) ? 0x00 : 0x11;
+	// TODO:
+	// instPtr->linkLog.recxnCnt =
+	// instPtr->linkLog.beamNo =
+	// instPtr->linkLog.beamWidth =
+	// instPtr->linkLog.beamAz =
+	// instPtr->linkLog.beamEl =
+	instPtr->linkLog.advTxCnt = (uint16_t)instPtr->log.advTxCnt;
+	instPtr->linkLog.advRecvCnt = (uint16_t)instPtr->log.advRecvCnt;
+	instPtr->linkLog.advCorrectCnt = (uint16_t)instPtr->log.advCorrectCnt;
+	instPtr->linkLog.cfmTxCnt = instPtr->log.cfmTxCnt;
+	instPtr->linkLog.cfmRecvCnt = instPtr->log.cfmRecvCnt;
+	instPtr->linkLog.cfmCorrectCnt = instPtr->log.cfmCorrectCnt;
+	instPtr->linkLog.svcTxCnt = instPtr->log.svcTxCnt;
+	instPtr->linkLog.svcRecvCnt = instPtr->log.svcRecvCnt;
+	instPtr->linkLog.svcCorrectCnt = instPtr->log.svcCorrectCnt;
+	instPtr->linkLog.timeDev = instPtr->log.timeDev;
+	instPtr->linkLog.sendId = instPtr->serviceFSM->txLog.dataId;
+	instPtr->linkLog.recvId = instPtr->serviceFSM->rxLog.dataId;
+
+	SysMonitor_UpdateLinklayerLog(&(instPtr->linkLog));
 	return SUCCESS;
 }
@@ -64,6 +64,8 @@ typedef struct
 	uint32_t svcTxCnt;
 	uint32_t svcRecvCnt;
 	uint32_t svcCorrectCnt;
+
+	int64_t timeDev;
 } L2_LOG;

 typedef struct
@@ -90,9 +92,7 @@ typedef struct
 	L2_LOG log;
 	// for system log
 	SYSINFO sysInfo;
-	SLOTLOG txSlotLog;
-	SLOTLOG rxSlotLog;
-	PRTCLLOG prtcLog;
+	LINKLOG linkLog;
 } L2_INST;

 /************************** Variable Definitions *****************************/
@@ -166,7 +166,8 @@ L2_FRAME_TYPE L2_GetNextFrameType(L2_INST *instPtr);
 L2_TOR_TYPE L2_GetNextTor(L2_INST *instPtr);

 // Time syncronization
-int32_t L2_TimeAlign(L2_INST *instPtr, uint32_t frameNum, uint32_t slotNum, bool relative);
+int32_t L2_GetTimeDeviation(L2_INST *instPtr, uint32_t frameNum, uint32_t slotNum, bool relative, int64_t* timeDev);
+void L2_TimeAdjust(L2_INST *instPtr, const int64_t *timeDev);


 #endif /* __LINK_LAYER_H_ */
@@ -22,6 +22,9 @@
 #include "geometry/coord.h"
 #include "geometry/quaternion.h"
 #include "../phy_layer/phy_layer.h"
+#ifndef EMULATION
+#include "../config/app_config.h"
+#endif
 /************************** Constant Definitions *****************************/
 // Common node ID definition
 #define L2_BROADCAST_ID 0xFF
@@ -210,6 +213,8 @@ typedef struct
 #ifdef DATALINK_ENABLE_BERTEST
 	uint32_t bitTotal;
 	uint32_t bitError;
+	double lossRate;
+	double errorRate;
 #endif
 } L2_SVC_FSM;

@@ -16,6 +16,9 @@
 #include "link_layer.h"
 #include "link_layer_types.h"

+#define LINKLAYER_INSERT_EXTRGAP
+
+#ifndef LINKLAYER_INSERT_EXTRGAP
 L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 // SubFrame 0
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
@@ -38,6 +41,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+
 // SubFrame 1
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
@@ -59,6 +63,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+
 // SubFrame 2
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
@@ -80,6 +85,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+
 // SubFrame 3
 	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
 	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
@@ -122,6 +128,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+
 // SubFrame 5
 	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
@@ -143,6 +150,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+
 // SubFrame 6
 	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
 	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
@@ -164,6 +172,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
 	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
 	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+
 // SubFrame 7
 	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
 	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
@@ -185,6 +194,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
 	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
 	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+
 // SubFrame 8
 	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
@@ -206,6 +216,7 @@ L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+
 // SubFrame 9
 	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
 	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
@@ -450,6 +461,451 @@ L2_RTNE_TABLE_ENTRY normalSub[L2_SLOTS_PER_FRAME] = {
 	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
 	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
 };
+#else
+L2_RTNE_TABLE_ENTRY intraScanSubT[L2_SLOTS_PER_FRAME] = {
+// SubFrame 0
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+
+// SubFrame 1
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+
+// SubFrame 2
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+
+// SubFrame 3
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x00, 0x01, 0xFF},
+	{L2_SLOT_SCAN, 0x01, 0x01, 0xFF},
+	{L2_SLOT_ADVERTISE, 0x00, 0x01, 0xFF},
+	{L2_SLOT_ADVERTISE, 0x01, 0x01, 0xFF},
+	{L2_SLOT_ADVERTISE, 0x02, 0x01, 0xFF},
+	{L2_SLOT_ADVERTISE, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 4
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 5
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 6
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 7
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 8
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 9
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x01, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x02, 0x01, 0xFF},
+	{L2_SLOT_CONFIRM, 0x03, 0x01, 0xFF},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_CONFIRM, 0x00, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x01, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x02, 0xFF, 0x01},
+	{L2_SLOT_CONFIRM, 0x03, 0xFF, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+};
+
+L2_RTNE_TABLE_ENTRY normalSub[L2_SLOTS_PER_FRAME] = {
+// SubFrame 0
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 1
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 2
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 3
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 4
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 5
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 6
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 7
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 8
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+
+// SubFrame 9
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x01, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x02, 0x01, 0x02},
+	{L2_SLOT_SERVICE, 0x03, 0x01, 0x02},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+	{L2_SLOT_SERVICE, 0x00, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x01, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x02, 0x02, 0x01},
+	{L2_SLOT_SERVICE, 0x03, 0x02, 0x01},
+	{L2_SLOT_IDLE, 0x00, 0x00, 0x00},
+};
+#endif

 L2_RTNE_TABLE_ENTRY *initTable[L2_INIT_RTNE_PERIOD] =
 {
@@ -409,9 +409,7 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		// Reset node ttl
 		node->ttlCnt = 0;

-		if (L2_isCxn2Net(instPtr) == false)
-		{
-			uint32_t netstartTime, frameNum, slotNum = 0;
+		uint32_t netstartTime;
 		// Update net start time.
 		L2_FrameGetChunk(msg, L2_MSG_ADV_SRC_NETSTART_TIME, L2_MSG_ADV_SRC_NETSTART_TIME_LEN, &netstartTime);
 		L2_EVENT netSetupDoneEvent = {
@@ -419,12 +417,20 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 			.msg = &netstartTime};
 		AssertL2Event(instPtr, &netSetupDoneEvent);

-			// Time sync.
+		// Calculate time deviation
+		uint32_t frameNum, slotNum = 0;
 		L2_FrameGetChunk(msg, L2_MSG_FRAME_NUM, L2_MSG_FRAME_NUM_LEN, &frameNum);
 		L2_FrameGetChunk(msg, L2_MSG_SLOT_NUM, L2_MSG_SLOT_NUM_LEN, &slotNum);
-			// TODO: Check
-			L2_TimeAlign(instPtr, frameNum, slotNum, true);
+		Status = L2_GetTimeDeviation(instPtr, frameNum, slotNum, true, &(instPtr->log.timeDev));
+		if (Status != SUCCESS)
+		{
+			DBG_ERROR("Failed to compute time deviation.\n")
+			break;
 		}
+
+		// Time sync.
+		L2_TimeAdjust(instPtr, &(instPtr->log.timeDev));
+
 		// trigger flag
 		AdvRecvStateUpdate(scanFsmPtr, true);
 		Status = SUCCESS;
@@ -465,6 +471,17 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		// Reset node ttl
 		node->ttlCnt = 0;

+		// Calculate time deviation
+		uint32_t frameNum, slotNum = 0;
+		L2_FrameGetChunk(msg, L2_MSG_FRAME_NUM, L2_MSG_FRAME_NUM_LEN, &frameNum);
+		L2_FrameGetChunk(msg, L2_MSG_SLOT_NUM, L2_MSG_SLOT_NUM_LEN, &slotNum);
+		Status = L2_GetTimeDeviation(instPtr, frameNum, slotNum, true, &(instPtr->log.timeDev));
+		if (Status != SUCCESS)
+		{
+			DBG_ERROR("Failed to compute time deviation.\n")
+			break;
+		}
+
 		if (L2_GetNodeType(instPtr) != L2_NODE_HEAD)
 		{
 			// check if net setup finished.
@@ -501,6 +518,8 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 				l2Event.msg = &newState;
 				AssertL2Event(instPtr, &l2Event);
 			}
+			// Time sync.
+			L2_TimeAdjust(instPtr, &(instPtr->log.timeDev));
 		}
 		Status = SUCCESS;
 		break;
@@ -115,11 +115,11 @@ static int32_t Service_Packing(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t dst
 		uint32_t dataId;
 		if(L2_GetNodeType(instPtr) == L2_NODE_HEAD)
 		{
-			SysMonitor_GetSendPayloadFLJRaw(buff + L2_MSG_SVC_PAYLOAD, &dataId);
+			SysMonitor_GetSendPayload(buff + L2_MSG_SVC_PAYLOAD, &dataId, PAYLOAD_LEN_FLJ_TX);
 		}
 		else
 		{
-			SysMonitor_GetSendPayloadLJRaw(buff + L2_MSG_SVC_PAYLOAD, &dataId);
+			SysMonitor_GetSendPayload(buff + L2_MSG_SVC_PAYLOAD, &dataId, PAYLOAD_LEN_LJ_TX);
 		}

 		L2_FrameInsertChunk(buff, L2_MSG_SVC_PAYLOAD_ID, L2_MSG_SVC_PAYLOAD_ID_LEN, &dataId);
@@ -141,6 +141,9 @@ static int32_t Service_Packing(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t dst
 			DBG_ERROR("Fail to append CRC...\n");
 			return Status;
 		}
+
+		memcpy(instPtr->serviceFSM->txLog.data, buff, L2_SVC_PACK_LEN);
+		instPtr->serviceFSM->txLog.dataId = dataId;
 		break;
 	}
 	default:
@@ -227,8 +230,8 @@ int32_t L2_Service_PktHandler(L2_INST *instPtr, uint8_t *msg)
 {
 	ASSERT(instPtr != NULL);
 	ASSERT(msg != NULL);
-#ifndef DATALINK_ENABLE_BERTEST
 	int32_t Status;
+#ifndef DATALINK_ENABLE_BERTEST
 	uint8_t frameType;
 	L2_FrameGetChunk(msg, L2_MSG_TYPE, L2_MSG_TYPE_LEN, &frameType);
 	switch (frameType)
@@ -269,6 +272,17 @@ int32_t L2_Service_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		// Reset node ttl
 		node->ttlCnt = 0;

+		// Calculate time deviation
+		uint32_t frameNum, slotNum = 0;
+		L2_FrameGetChunk(msg, L2_MSG_FRAME_NUM, L2_MSG_FRAME_NUM_LEN, &frameNum);
+		L2_FrameGetChunk(msg, L2_MSG_SLOT_NUM, L2_MSG_SLOT_NUM_LEN, &slotNum);
+		Status = L2_GetTimeDeviation(instPtr, frameNum, slotNum, true, &(instPtr->log.timeDev));
+		if (Status != SUCCESS)
+		{
+			DBG_ERROR("Failed to compute time deviation.\n")
+			break;
+		}
+
 		uint32_t dataId;
 		L2_FrameGetChunk(msg, L2_MSG_SVC_PAYLOAD_ID, L2_MSG_SVC_PAYLOAD_ID_LEN, &dataId);

@@ -276,22 +290,24 @@ int32_t L2_Service_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		{
 			if(L2_GetNodeType(instPtr) == L2_NODE_HEAD)
 			{
-				SysMonitor_UpdateRecvPayloadFLJRaw(msg+L2_MSG_SVC_PAYLOAD);
+				SysMonitor_UpdateRecvPayload(msg+L2_MSG_SVC_PAYLOAD, PAYLOAD_LEN_FLJ_RX);
 			}
 			else
 			{
-				SysMonitor_UpdateRecvPayloadLJRaw(msg+L2_MSG_SVC_PAYLOAD);
+				SysMonitor_UpdateRecvPayload(msg+L2_MSG_SVC_PAYLOAD, PAYLOAD_LEN_LJ_RX);
 			}
 		}

+		// Logging
+		memcpy(instPtr->serviceFSM->rxLog.data, msg, L2_SVC_PACK_LEN);
+		instPtr->serviceFSM->rxLog.dataId = dataId;
+
 #ifdef DATALINK_ENABLE_AUTOTIMESYNC
 		// Implement a auto time sync.
 		if (L2_GetNodeType(instPtr) != L2_NODE_HEAD)
 		{
-			uint32_t frameNum, slotNum;
-			L2_FrameGetChunk(msg, L2_MSG_FRAME_NUM, L2_MSG_FRAME_NUM_LEN, &frameNum);
-			L2_FrameGetChunk(msg, L2_MSG_SLOT_NUM, L2_MSG_SLOT_NUM_LEN, &slotNum);
-			L2_TimeAlign(instPtr, frameNum, slotNum, true);
+			// Time sync.
+			L2_TimeAdjust(instPtr, &(instPtr->log.timeDev));
 		}
 #endif
 		break;
@@ -303,22 +319,31 @@ int32_t L2_Service_PktHandler(L2_INST *instPtr, uint8_t *msg)
 	return Status;
 #else
 	uint32_t errorBits = 0;
-	for (int i = 0; i < SVC_PACK_LEN; i++)
+	for (int i = 0; i < L2_SVC_PACK_LEN; i++)
 	{
 		errorBits += count_ones(msg[i] ^ testData[i]);
 	}

-	instPtr->serviceFsm.bitError += errorBits;
-	instPtr->serviceFsm.bitTotal += SVC_PACK_LEN * 8;
+	instPtr->serviceFSM->bitError += errorBits;
+	instPtr->serviceFSM->bitTotal += L2_SVC_PACK_LEN * 8;

+	// Calculate time deviation
+	uint32_t frameNum, slotNum = 0;
+	L2_FrameGetChunk(msg, L2_MSG_FRAME_NUM, L2_MSG_FRAME_NUM_LEN, &frameNum);
+	L2_FrameGetChunk(msg, L2_MSG_SLOT_NUM, L2_MSG_SLOT_NUM_LEN, &slotNum);
+	Status = L2_GetTimeDeviation(instPtr, frameNum, slotNum, true, &(instPtr->log.timeDev));
+	if (Status != SUCCESS)
+	{
+		DBG_ERROR("Failed to compute time deviation.\n")
+		return Status;
+	}
 	// Implement a auto time sync.
 	if (L2_GetNodeType(instPtr) != L2_NODE_HEAD)
 	{
-		uint32_t frameNum, slotNum;
-		L2_FrameGetChunk(msg, L2_MSG_FRAME_NUM, L2_MSG_FRAME_NUM_LEN, &frameNum);
-		L2_FrameGetChunk(msg, L2_MSG_SLOT_NUM, L2_MSG_SLOT_NUM_LEN, &slotNum);
-		L2_TimeAlign(instPtr, frameNum, slotNum, true);
+		// Time sync.
+		L2_TimeAdjust(instPtr, &(instPtr->log.timeDev));
 	}
+	return SUCCESS;
 #endif
 }

@@ -366,7 +391,7 @@ int32_t L2_Service_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntr
 			// Packing service data
 			Service_Packing(instPtr, L2_SVC_FRAME, rtneEntry->dst);
 #else
-			memcpy(instPtr->sendPktData, testData, SVC_PACK_LEN);
+			memcpy(instPtr->sendPktData, testData, L2_SVC_PACK_LEN);
 #endif
 		}
 		// FIXME: Steer antenna to point to destination.
@@ -380,12 +405,11 @@ int32_t L2_Service_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntr
 	}
 #ifdef DATALINK_ENABLE_BERTEST
 	uint32_t pktLoss;
-	double errorRate, lossRate;
 	pktLoss = instPtr->log.svcRecvCnt - instPtr->log.svcCorrectCnt;
-	lossRate = (instPtr->log.svcRecvCnt == 0) ? 0 : (double)pktLoss / (double)instPtr->serviceFsm.pktRecv;
-	errorRate = (instPtr->serviceFsm.bitTotal == 0) ? 0 : (double)instPtr->serviceFsm.bitError / (double)instPtr->serviceFsm.bitTotal;
-	DBG_PRINT("Packet Loss Rate -- Total: %lu, Loss: %lu.\n", instPtr->serviceFsm.pktRecv, pktLoss);
-	DBG_PRINT("Bit Error Rate -- Total:%lu, Error:%lu.\n", instPtr->serviceFsm.bitTotal, instPtr->serviceFsm.bitError);
+	instPtr->serviceFSM->lossRate = (instPtr->log.svcRecvCnt == 0) ? 0 : (double)pktLoss / (double)instPtr->serviceFSM->pktRecv;
+	instPtr->serviceFSM->errorRate = (instPtr->serviceFSM->bitTotal == 0) ? 0 : (double)instPtr->serviceFSM->bitError / (double)instPtr->serviceFSM->bitTotal;
+	DBG_PRINT("Packet Loss Rate -- Total: %lu, Loss: %lu.\n", instPtr->serviceFSM->pktRecv, pktLoss);
+	DBG_PRINT("Bit Error Rate -- Total:%lu, Error:%lu.\n", instPtr->serviceFSM->bitTotal, instPtr->serviceFSM->bitError);
 #endif
 	return SUCCESS;
 }
@@ -32,20 +32,22 @@

 /*****************************************************************************/
 /**
- * @brief    a slot alignment, base on physical layer information.
+ * @brief    Get time deviation to the specified frame and slot number.
 *
 * @param   instPtr	a pointer to linklayer layer instance
 * @param   frameNum
 * @param   slotNum
+ * @param   relative
+ * @param   timeDev
 *
- * @return  SUCCESS Initialize successfully.
- *          FAILURE Initialization failed, allocate memory fail or initial
- *          bram controller fail.
+ * @return  SUCCESS
+ * 			EIGNORE there is no received frame
 *
 ******************************************************************************/
-// TODO: Check
-int32_t L2_TimeAlign(L2_INST *instPtr, uint32_t frameNum, uint32_t slotNum, bool relative)
+int32_t L2_GetTimeDeviation(L2_INST *instPtr, uint32_t frameNum, uint32_t slotNum, bool relative, int64_t *timeDev)
 {
+	ASSERT(instPtr != NULL);
+	ASSERT(timeDev != NULL);
 	L1_FRAME_TYPE lastRecvdFrame;
 	lastRecvdFrame = Phy_GetLastRecvFrameType(instPtr->config.phyInstPtr);
 	if (lastRecvdFrame == L1_NONE_FRAME)
@@ -57,8 +59,7 @@ int32_t L2_TimeAlign(L2_INST *instPtr, uint32_t frameNum, uint32_t slotNum, bool
 	DBG_INFO("Starting TimeAlign operation...\n");
 	// read nextSendTime from physical layer
 	uint64_t currTime, expectTime;
-	int64_t timeDiff;
-	TIME_WORD timeStamp, slotTimerAdjmet;
+	TIME_WORD timeStamp;
 	expectTime = ((uint64_t)(frameNum * L2_SLOTS_PER_FRAME + slotNum)) * TIME_FRAC_MAX;
 	expectTime += Phy_GetTimeComp(lastRecvdFrame);

@@ -71,10 +72,27 @@ int32_t L2_TimeAlign(L2_INST *instPtr, uint32_t frameNum, uint32_t slotNum, bool
 	currTime = (uint64_t)timeStamp.frac_part;
 	currTime += ((uint64_t)timeStamp.int_part) * TIME_FRAC_MAX;

-	timeDiff = (int64_t)(expectTime - currTime);
-
-	slotTimerAdjmet.int_part = (uint32_t)(timeDiff / TIME_FRAC_MAX);
-	slotTimerAdjmet.frac_part = (uint32_t)(timeDiff % TIME_FRAC_MAX);
-	TimeCtrl_TimeAdjust(instPtr->config.tmcInstPtr, &slotTimerAdjmet, TM_ADJ_ADD);
+	*timeDev = (int64_t)(expectTime - currTime);
 	return SUCCESS;
 }
+
+
+/*****************************************************************************/
+/**
+ * @brief    Implement time adjustment by applying time deviation.
+ *
+ * @param   instPtr	a pointer to linklayer layer instance
+ * @param   timeDev
+ *
+ * @return  NONE
+ *
+ ******************************************************************************/
+void L2_TimeAdjust(L2_INST *instPtr, const int64_t *timeDev)
+{
+	ASSERT(instPtr != NULL);
+	ASSERT(timeDev != NULL);
+	TIME_WORD slotTimerAdjmet;
+	slotTimerAdjmet.int_part = (uint32_t)(*timeDev / TIME_FRAC_MAX);
+	slotTimerAdjmet.frac_part = (uint32_t)(*timeDev % TIME_FRAC_MAX);
+	TimeCtrl_TimeAdjust(instPtr->config.tmcInstPtr, &slotTimerAdjmet, TM_ADJ_ADD);
+}
@@ -311,6 +311,28 @@ void Phy_UpdateState(PHY_INST *instPtr)
 	instPtr->recvSlotTime.frac_part = PhyRead(instPtr, TM_TARGET_L);
 	instPtr->recvFsTime.int_part = PhyRead(instPtr, FSTIME_H);
 	instPtr->recvFsTime.frac_part = PhyRead(instPtr, FSTIME_L);
+
+	instPtr->phyLog.acqCnt = PhyRead(instPtr, PHY_ACQ_CNT);
+	instPtr->phyLog.fsyncCnt = PhyRead(instPtr, PHY_FRAME_SYNC_CNT);
+	instPtr->phyLog.decodeCnt = PhyRead(instPtr, PHY_DECODE_CNT);
+	instPtr->phyLog.crcCnt = PhyRead(instPtr, PHY_CRC_OK_CNT);
+	instPtr->phyLog.doppler = Phy_GetFreqEst(instPtr);
+	instPtr->phyLog.recvStamp = (uint64_t)instPtr->recvFsTime.int_part * TIME_FRAC_MAX + instPtr->recvFsTime.frac_part;
+	instPtr->phyLog.acqPeak = PhyRead(instPtr, PHY_ACQ_PEAK_L);
+	instPtr->phyLog.acqPeak |= ((uint64_t)PhyRead(instPtr, PHY_ACQ_PEAK_H)) << 32;
+	instPtr->phyLog.acqMean = PhyRead(instPtr, PHY_ACQ_MEAN_L);
+	instPtr->phyLog.acqMean |= ((uint64_t)PhyRead(instPtr, PHY_ACQ_MEAN_H)) << 32;
+	instPtr->phyLog.acqPhase = (PhyRead(instPtr, PHY_ACQ_FREQEST) & PHY_ACQ_FREQEST_PHASE_MASK) >> PHY_ACQ_FREQEST_PHASE_SHIFT;
+	instPtr->phyLog.acqFreqCh = (PhyRead(instPtr, PHY_ACQ_FREQEST) & PHY_ACQ_FREQEST_CHANNEL_MASK) >> PHY_ACQ_FREQEST_CHANNEL_SHIFT;
+	instPtr->phyLog.fsyncPeak = PhyRead(instPtr, PHY_FRAME_SYNC_PEAK_L);
+	instPtr->phyLog.fsyncPeak |= ((uint64_t)PhyRead(instPtr, PHY_FRAME_SYNC_PEAK_H)) << 32;
+	instPtr->phyLog.fsyncMean = PhyRead(instPtr, PHY_FRAME_SYNC_MEAN_L);
+	instPtr->phyLog.fsyncMean |= ((uint64_t)PhyRead(instPtr, PHY_FRAME_SYNC_MEAN_H)) << 32;
+	instPtr->phyLog.fsyncFreqCh = (PhyRead(instPtr, PHY_FRAME_SYNC_FREQEST) & PHY_FRAME_SYNC_FREQEST_CHANNEL_MASK) >> PHY_FRAME_SYNC_FREQEST_CHANNEL_SHIFT;
+	instPtr->phyLog.deintlvAmpEst = PhyRead(instPtr, PHY_DEINTLV_AMPEST) & PHY_DEINTLV_AMPEST_MASK;
+	instPtr->phyLog.reserve = 0;
+
+	SysMonitor_UpdatePhysicalLayerLog(&(instPtr->phyLog));
 }

 /*****************************************************************************/
@@ -357,6 +379,7 @@ int32_t Phy_InstInit(PHY_INST **instPtr, PHY_CONFIG *phyConfig)
 	memset(&((*instPtr)->beamNo), (int32_t)L1_INIT_ANT_NO, sizeof(PHY_RCD));
 	memset(&((*instPtr)->beamWd), (int32_t)L1_INIT_ANT_WD, sizeof(PHY_RCD));
 	memset(&((*instPtr)->hwSate), 0x00, sizeof(HWSTATE));
+	memset(&((*instPtr)->phyLog), 0x00, sizeof(PHYLOG));

 #ifndef EMULATION
 	XBram_Config *bramConfigPtr;
@@ -827,14 +850,6 @@ double Phy_GetFreqEst(PHY_INST *instPtr)
 	fineReg = PhyRead(instPtr, FINE_FREQEST);
 	estAbs = fineReg & FINE_FREQEST_VAL_MASK;
 	if (frameType >= L1_200KBPS_5MS_FRAME)
-	{
-		// 1.5M Rc
-		coarse = (double)(80 - acqFreqIdx) * (31.25e3 / 4);
-		coarse += (double)syncFreqIdx * 1.5e6 / 64 / 128;
-
-		fine = 12e6/2048*((double)estAbs)/8192.0;
-	}
-	else
 	{
 		// 12M Rc
 		coarse = (double)(8 - acqFreqIdx) * (250e3 / 4);
@@ -842,6 +857,14 @@ double Phy_GetFreqEst(PHY_INST *instPtr)

 		fine = 48e6/2048*((double)estAbs)/8192.0;
 	}
+	else
+	{
+		// 1.5M Rc
+		coarse = (double)(80 - acqFreqIdx) * (31.25e3 / 4);
+		coarse += (double)syncFreqIdx * 1.5e6 / 64 / 128;
+
+		fine = 12e6/2048*((double)estAbs)/8192.0;
+	}

 	fine = ((fineReg & FINE_FREQEST_SIGN_MASK) == FINE_FREQEST_SIGN_NEG) ? 
 			-fine : fine;
@@ -876,17 +899,17 @@ double Phy_GetCoarseFreqEst(PHY_INST *instPtr)
 	acqFreqIdx = (regValue & COASE_FREQEST_ACQ_MASK) >> COASE_FREQEST_ACQ_SHIFT;
 	syncFreqIdx = (regValue & COASE_FREQEST_SYNC_MASK) >> COASE_FREQEST_SYNC_SHIFT;
 	if (frameType >= L1_200KBPS_5MS_FRAME)
-	{
-		// 1.5M Rc
-		freqEst = (double)(80 - acqFreqIdx) * (31.25e3 / 4);
-		freqEst += (double)syncFreqIdx * 1.5e6 / 64 / 128;
-	}
-	else
 	{
 		// 12M Rc
 		freqEst = (double)(8 - acqFreqIdx) * (250e3 / 4);
 		freqEst += (double)syncFreqIdx * 12e6 / 64 / 128;
 	}
+	else
+	{
+		// 1.5M Rc
+		freqEst = (double)(80 - acqFreqIdx) * (31.25e3 / 4);
+		freqEst += (double)syncFreqIdx * 1.5e6 / 64 / 128;
+	}

 	return freqEst;
 }
@@ -915,13 +938,13 @@ double Phy_GetFineFreqEst(PHY_INST *instPtr)
 	estAbs = regValue & FINE_FREQEST_VAL_MASK;
 	if (frameType >= L1_200KBPS_5MS_FRAME)
 	{
-		// 1.5M Rc
-		freqEst = 12e6/2048*((double)estAbs)/8192.0;
+		// 12M Rc
+		freqEst = 48e6/2048*((double)estAbs)/8192.0;
 	}
 	else
 	{
-		// 12M Rc
-		freqEst = 48e6/2048*((double)estAbs)/8192.0;
+		// 1.5M Rc
+		freqEst = 12e6/2048*((double)estAbs)/8192.0;
 	}
 	freqEst = ((regValue & FINE_FREQEST_SIGN_MASK) == FINE_FREQEST_SIGN_NEG) ? 
 			-freqEst : freqEst;
@@ -1110,64 +1133,114 @@ void Phy_RetrieveRecvData(PHY_INST *instPtr, uint8_t *dataBuff)
 * @param   instPtr	a pointer to hopping pattern buffer
 * @param   patternLen	a integer indicate the length of hopping pattern.
 *
- * @return  SUCCESS
- * 			FAILURE	pattern length exceeds maximum length.
+ * @return  NONE
 *
 ******************************************************************************/
-void Phy_UpdateHwSate(PHY_INST *instPtr)
+void Phy_RefreshHwSate(PHY_INST *instPtr)
 {
 	ASSERT(instPtr != NULL);
 	uint32_t rawData;
 #ifndef EMULATION
-	// -- Update Chip voltage, unit mV
+	float evalData;
+	instPtr->hwSate.isSpOk = true;
+	// -- Update Ps voltage, unit mV
 	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_VCCPINT);
-	instPtr->hwSate.spVolt = (uint16_t)(XAdcPs_RawToVoltage(rawData) * 1000);
+	evalData = XAdcPs_RawToVoltage(rawData);
+	instPtr->hwSate.spPsVolt = (evalData > VOLTAGE_MAX) ? UINT8_MAX : (uint8_t) round(evalData/VOLTAGE_LSB);
+	instPtr->hwSate.isSpOk = instPtr->hwSate.isSpOk && IS_PS_VALID(evalData);
+
+	// -- Update Ps aux voltage, unit mV
+	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_VCCPAUX);
+	evalData = XAdcPs_RawToVoltage(rawData);
+	instPtr->hwSate.spPsAuxVolt = (evalData > VOLTAGE_MAX) ? UINT8_MAX : (uint8_t) round(evalData/VOLTAGE_LSB);
+	instPtr->hwSate.isSpOk = instPtr->hwSate.isSpOk && IS_PSAUX_VALID(evalData);
+
+	// -- Update DDR voltage, unit mV
+	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_VCCPDRO);
+	evalData = XAdcPs_RawToVoltage(rawData);
+	instPtr->hwSate.spDdrVolt = (evalData > VOLTAGE_MAX) ? UINT8_MAX : (uint8_t) round(evalData/VOLTAGE_LSB);
+	instPtr->hwSate.isSpOk = instPtr->hwSate.isSpOk && IS_DDR_VALID(evalData);
+
+	// -- Update PL voltage, unit mV
+	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_VCCINT);
+	evalData = XAdcPs_RawToVoltage(rawData);
+	instPtr->hwSate.spPlVolt = (evalData > VOLTAGE_MAX) ? UINT8_MAX : (uint8_t) round(evalData/VOLTAGE_LSB);
+	instPtr->hwSate.isSpOk = instPtr->hwSate.isSpOk && IS_PL_VALID(evalData);
+
+	// -- Update PL aux voltage, unit mV
+	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_VCCAUX);
+	evalData = XAdcPs_RawToVoltage(rawData);
+	instPtr->hwSate.spPlAuxVolt = (evalData > VOLTAGE_MAX) ? UINT8_MAX : (uint8_t) round(evalData/VOLTAGE_LSB);
+	instPtr->hwSate.isSpOk = instPtr->hwSate.isSpOk && IS_PLAUX_VALID(evalData);
+
+	// -- Update Bram voltage, unit mV
+	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_VBRAM);
+	evalData = XAdcPs_RawToVoltage(rawData);
+	instPtr->hwSate.spBramVolt = (evalData > VOLTAGE_MAX) ? UINT8_MAX : (uint8_t) round(evalData/VOLTAGE_LSB);
+	instPtr->hwSate.isSpOk = instPtr->hwSate.isSpOk && IS_BRAM_VALID(evalData);

 	// -- Update Chip temperature, unit 0.01 deg
 	rawData = XAdcPs_GetAdcData(&(instPtr->hwXadc), XADCPS_CH_TEMP);
-	instPtr->hwSate.spTemp = (uint16_t)(XAdcPs_RawToTemperature(rawData) * 100);
+	evalData = XAdcPs_RawToTemperature(rawData);
+	instPtr->hwSate.spTemp = (evalData > TEMPERATURE_MAX) 
+								? INT8_MAX 
+								: ((evalData < TEMPERATURE_MIN) ? INT8_MIN : (int8_t) round(evalData/TEMPERATURE_LSB));

-	// FIXME: Chip status determine.
-	instPtr->hwSate.chipSt = 0;
 #else
-	instPtr->hwSate.spVolt = 0;
-	instPtr->hwSate.spTemp = 0;
-	instPtr->hwSate.chipSt = 0;
+	instPtr->spPsVolt = 0;
+	instPtr->spPsAuxVolt = 0;
+	instPtr->spDdrVolt = 0;
+	instPtr->spPlVolt = 0;
+	instPtr->spPlAuxVolt = 0;
+	instPtr->spBramVolt = 0;
+	instPtr->spTemp = 0;
+	instPtr->isSpOk = true;
 #endif
 	/*** Voltage and Status ***/
 	rawData = PhyRead(instPtr, ANT_STATUS);
-	// -- Update Antenna Status Code: 0xAA - normal, 0x55 - error
-	instPtr->hwSate.antSt = ((rawData & ANT_STATUS_CODE_MASK) == 0) ? 0xAA : 0x55;
 	// -- Update Antenna Voltage Status: 1 - normal, 0 - error
 	//    [0] - ANT voltage status
 	//    [2] - RF voltage status
 	//    [4] - NIL voltage status
-	instPtr->hwSate.antVolt = (rawData & ANT_STATUS_ANT_VOLT_MASK) ? 0x01 : 0x00;
-	instPtr->hwSate.antVolt |= (rawData & ANT_STATUS_RF_VOLT_MASK) ? 0x04 : 0x00;
-	instPtr->hwSate.antVolt |= (rawData & ANT_STATUS_NIL_VOLT_MASK) ? 0x10 : 0x00;
+	//    [6] - Antenna status
+	instPtr->hwSate.antVolt = ((rawData & ANT_STATUS_ANT_VOLT_MASK) == ANT_STATUS_ANT_VOLT_OK) ? 0x01 : 0x00;
+	instPtr->hwSate.antVolt |= ((rawData & ANT_STATUS_RF_VOLT_MASK) == ANT_STATUS_RF_VOLT_OK) ? 0x04 : 0x00;
+	instPtr->hwSate.antVolt |= ((rawData & ANT_STATUS_NIL_VOLT_MASK) == ANT_STATUS_NIL_VOLT_OK) ? 0x10 : 0x00;
+	instPtr->hwSate.antVolt |= ((rawData & ANT_STATUS_CODE_MASK) == ANT_STATUS_CODE_OK) ? 0x40 : 0x00;

 	/*** Temperature and Lock Status ***/
-	rawData = PhyRead(instPtr, RF_STATUS);
+	rawData = PhyRead(instPtr, ANT_RF_STATUS);
 	//-- Update Antenna Temperature (signed 8bit integer, 1 centigrade per LSB)
-	instPtr->hwSate.antTemp = (uint8_t)(rawData & RF_STATUS_TEMP_MASK);
+	instPtr->hwSate.antTemp = (uint8_t)(rawData & ANT_RF_STATUS_TEMP_MASK);
 	// -- Update Antenna PLL Lock Status: 1 - normal, 0 - error
 	//    [0] - BASEBAND lock status
 	//    [2] - PLLA lock status
 	//    [4] - PLLB lock status
-	instPtr->hwSate.antPll = (rawData & RF_STATUS_BDLOCK_MASK) ? 0x01 : 0x00;
-	instPtr->hwSate.antPll |= (rawData & RF_STATUS_PLLA_MASK) ? 0x04 : 0x00;
-	instPtr->hwSate.antPll |= (rawData & RF_STATUS_PLLB_MASK) ? 0x10 : 0x00;
+	instPtr->hwSate.antPll = ((rawData & ANT_RF_STATUS_BBLOCK_MASK) == ANT_RF_STATUS_BBLOCK_OK) ? 0x01 : 0x00;
+	instPtr->hwSate.antPll |= ((rawData & ANT_RF_STATUS_PLLA_MASK) == ANT_RF_STATUS_PLLA_OK) ? 0x04 : 0x00;
+	instPtr->hwSate.antPll |= ((rawData & ANT_RF_STATUS_PLLB_MASK) == ANT_RF_STATUS_PLLB_OK) ? 0x10 : 0x00;

 	/*** MGCs ***/
-	rawData = PhyRead(instPtr, RF_MGC);
+	rawData = PhyRead(instPtr, ANT_RF_MGC);
 	// -- Update Antenna MGC (0~15 dB)
 	//    [3:0] - Channel 1 MGC
 	//    [7:4] - Channel 2 MGC
 	//    [11:8] - Channel 3 MGC
 	//    [15:12] - Channel 4 MGC
-	instPtr->hwSate.antMgc = (rawData & RF_MGC_CH1_MASK);
-	instPtr->hwSate.antMgc |= (rawData & RF_MGC_CH2_MASK) >> 4;
-	instPtr->hwSate.antMgc |= (rawData & RF_MGC_CH3_MASK) >> 8;
-	instPtr->hwSate.antMgc |= (rawData & RF_MGC_CH4_MASK) >> 12;
+	instPtr->hwSate.antMgc0 = (rawData & ANT_RF_MGC_CH1_MASK);
+	instPtr->hwSate.antMgc0 |= (rawData & ANT_RF_MGC_CH2_MASK) >> 4;
+	instPtr->hwSate.antMgc1 = (rawData & ANT_RF_MGC_CH3_MASK) >> 16;
+	instPtr->hwSate.antMgc1 |= (rawData & ANT_RF_MGC_CH4_MASK) >> 24;
+
+	// Determin if antenna is ok.
+	if(instPtr->hwSate.antVolt != 0x55 //01010101
+		||instPtr->hwSate.antPll != 0x15) // 00010101
+	{
+		instPtr->hwSate.isSpOk = false;
+	}
+	else 
+	{
+		instPtr->hwSate.isSpOk = true;
+	}
 	SysMonitor_UpdateHardwareStatus(&(instPtr->hwSate));
 }
@@ -218,6 +218,7 @@ typedef struct
 	XAdcPs hwXadc;
 #endif
 	HWSTATE hwSate;
+	PHYLOG phyLog;
 } PHY_INST;

 /************************** Variable Definitions *****************************/
@@ -240,7 +241,7 @@ int32_t Phy_InstInit(PHY_INST **instPtr, PHY_CONFIG *phyConfig);
 void Phy_Destroy(PHY_INST *instPtr);

 void Phy_UpdateState(PHY_INST *instPtr);
-void Phy_UpdateHwSate(PHY_INST *instPtr);
+void Phy_RefreshHwSate(PHY_INST *instPtr);

 void Phy_Start(PHY_INST *instPtr);
 void Phy_Halt(PHY_INST *instPtr);
@@ -10,7 +10,7 @@
 * History:
 * [2021-11-16]: Initial version.
 * [2022-06-18]: New branch for glink control purpose:
- *               -Add poll modephysical layer will start Tx/Rx procedure
+ *               -Add poll mode physical layer will start Tx/Rx procedure
 * 				  at specific time stamp.
 * [2023-04-24]: Porting for DUIFEI.
 *
@@ -33,7 +33,7 @@
 /**
 * Register: PHY_MAIN_CTRL
 */
-#define PHY_MAIN_CTRL 0X00000000U
+#define PHY_MAIN_CTRL 0x00000000U
 #define PHY_MAIN_CTRL_EN_SHIFT 0
 #define PHY_MAIN_CTRL_EN_WIDTH 1
 #define PHY_MAIN_CTRL_EN_MASK 0x00000001U
@@ -275,70 +275,216 @@
 #define BEAM_AXIS_AZ_MASK 0xFFFF0000U

 /**
- * Register: ANT_STATUS_0
+ * Register: ANT_STATUS
 */
-#define ANT_STATUS 0x00000048U
-#define ANT_STATUS_CODE_SHIFT 0
-#define ANT_STATUS_CODE_WIDTH 8
-#define ANT_STATUS_CODE_MASK 0x000000FFU
-#define ANT_STATUS_NIL_VOLT_SHIFT 8
-#define ANT_STATUS_NIL_VOLT_WIDTH 8
-#define ANT_STATUS_NIL_VOLT_MASK 0x0000FF00U
-#define ANT_STATUS_RF_VOLT_SHIFT 16
-#define ANT_STATUS_RF_VOLT_WIDTH 8
-#define ANT_STATUS_RF_VOLT_MASK 0x00FF0000U
-#define ANT_STATUS_ANT_VOLT_SHIFT 24
+#define ANT_STATUS 0x00000100U
+#define ANT_STATUS_ANT_VOLT_SHIFT 0
 #define ANT_STATUS_ANT_VOLT_WIDTH 8
-#define ANT_STATUS_ANT_VOLT_MASK 0xFF000000U
+#define ANT_STATUS_ANT_VOLT_MASK 0x000000FFU
+#define ANT_STATUS_ANT_VOLT_OK 0x00000001U
+
+#define ANT_STATUS_RF_VOLT_SHIFT 8
+#define ANT_STATUS_RF_VOLT_WIDTH 8
+#define ANT_STATUS_RF_VOLT_MASK 0x0000FF00U
+#define ANT_STATUS_RF_VOLT_OK 0x00000100U
+
+#define ANT_STATUS_NIL_VOLT_SHIFT 16
+#define ANT_STATUS_NIL_VOLT_WIDTH 8
+#define ANT_STATUS_NIL_VOLT_MASK 0x00FF0000U
+#define ANT_STATUS_NIL_VOLT_OK 0x00010000U
+
+#define ANT_STATUS_CODE_SHIFT 24
+#define ANT_STATUS_CODE_WIDTH 8
+#define ANT_STATUS_CODE_MASK 0xFF000000U
+#define ANT_STATUS_CODE_OK 0x00000000U

 /**
 * Register: ANT_FRAME_CNT
 */
-#define ANT_FRAME_CNT 0x0000004CU
+#define ANT_FRAME_CNT 0x00000104U
 #define ANT_FRAME_CNT_SHIFT 0
 #define ANT_FRAME_CNT_WIDTH 32
 #define ANT_FRAME_CNT_MASK 0xFFFFFFFFU

 /**
- * Register: RF_STATUS
+ * Register: ANT_RF_STATUS
 */
-#define RF_STATUS 0x00000050U
-#define RF_STATUS_TEMP_SHIFT 0
-#define RF_STATUS_TEMP_WIDTH 8
-#define RF_STATUS_TEMP_MASK 0x000000FFU
-#define RF_STATUS_BDLOCK_SHIFT 8
-#define RF_STATUS_BDLOCK_WIDTH 8
-#define RF_STATUS_BDLOCK_MASK 0x0000FF00U
-#define RF_STATUS_PLLA_SHIFT 16
-#define RF_STATUS_PLLA_WIDTH 8
-#define RF_STATUS_PLLA_MASK 0x00FF0000U
-#define RF_STATUS_PLLB_SHIFT 24
-#define RF_STATUS_PLLB_WIDTH 8
-#define RF_STATUS_PLLB_MASK 0xFF000000U
+#define ANT_RF_STATUS 0x00000108U
+#define ANT_RF_STATUS_TEMP_SHIFT 0
+#define ANT_RF_STATUS_TEMP_WIDTH 8
+#define ANT_RF_STATUS_TEMP_MASK 0x000000FFU
+
+#define ANT_RF_STATUS_BBLOCK_SHIFT 8
+#define ANT_RF_STATUS_BBLOCK_WIDTH 8
+#define ANT_RF_STATUS_BBLOCK_MASK 0x0000FF00U
+#define ANT_RF_STATUS_BBLOCK_OK 0x00000100U
+
+#define ANT_RF_STATUS_PLLA_SHIFT 16
+#define ANT_RF_STATUS_PLLA_WIDTH 8
+#define ANT_RF_STATUS_PLLA_MASK 0x00FF0000U
+#define ANT_RF_STATUS_PLLA_OK 0x00010000U
+
+#define ANT_RF_STATUS_PLLB_SHIFT 24
+#define ANT_RF_STATUS_PLLB_WIDTH 8
+#define ANT_RF_STATUS_PLLB_MASK 0xFF000000U
+#define ANT_RF_STATUS_PLLB_OK 0x01000000U

 /**
- * Register: RF_MGC
+ * Register: ANT_RF_MGC
 */
-#define RF_MGC 0x00000054U
-#define RF_MGC_CH1_SHIFT 0
-#define RF_MGC_CH1_WIDTH 4
-#define RF_MGC_CH1_MASK 0x0000000FU
-#define RF_MGC_CH2_SHIFT 8
-#define RF_MGC_CH2_WIDTH 4
-#define RF_MGC_CH2_MASK 0x00000F00U
-#define RF_MGC_CH3_SHIFT 16
-#define RF_MGC_CH3_WIDTH 4
-#define RF_MGC_CH3_MASK 0x000F0000U
-#define RF_MGC_CH4_SHIFT 24
-#define RF_MGC_CH4_WIDTH 4
-#define RF_MGC_CH4_MASK 0x0F000000U
+#define ANT_RF_MGC 0x0000010CU
+#define ANT_RF_MGC_CH1_SHIFT 0
+#define ANT_RF_MGC_CH1_WIDTH 4
+#define ANT_RF_MGC_CH1_MASK 0x0000000FU
+#define ANT_RF_MGC_CH2_SHIFT 8
+#define ANT_RF_MGC_CH2_WIDTH 4
+#define ANT_RF_MGC_CH2_MASK 0x00000F00U
+#define ANT_RF_MGC_CH3_SHIFT 16
+#define ANT_RF_MGC_CH3_WIDTH 4
+#define ANT_RF_MGC_CH3_MASK 0x000F0000U
+#define ANT_RF_MGC_CH4_SHIFT 24
+#define ANT_RF_MGC_CH4_WIDTH 4
+#define ANT_RF_MGC_CH4_MASK 0x0F000000U

 /**
- * Register: RF_FRAME_CNT
+ * Register: ANT_RF_FRAME_CNT
 */
-#define RF_FRAME_CNT 0x00000058U
-#define RF_FRAME_CNT_SHIFT 0
-#define RF_FRAME_CNT_WIDTH 32
-#define RF_FRAME_CNT_MASK 0xFFFFFFFFU
+#define ANT_RF_FRAME_CNT 0x00000110U
+#define ANT_RF_FRAME_CNT_SHIFT 0
+#define ANT_RF_FRAME_CNT_WIDTH 32
+#define ANT_RF_FRAME_CNT_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_ACQ_CNT
+ */
+#define PHY_ACQ_CNT 0x00000114U
+#define PHY_ACQ_CNT_SHIFT 0
+#define PHY_ACQ_CNT_WIDTH 32
+#define PHY_ACQ_CNT_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_FRAME_SYNC_CNT
+ */
+#define PHY_FRAME_SYNC_CNT 0x00000118U
+#define PHY_FRAME_SYNC_CNT_SHIFT 0
+#define PHY_FRAME_SYNC_CNT_WIDTH 32
+#define PHY_FRAME_SYNC_CNT_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_DECODE_CNT
+ */
+#define PHY_DECODE_CNT 0x0000011CU
+#define PHY_DECODE_CNT_SHIFT 0
+#define PHY_DECODE_CNT_WIDTH 32
+#define PHY_DECODE_CNT_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_CRC_OK_CNT
+ */
+#define PHY_CRC_OK_CNT 0x00000120U
+#define PHY_CRC_OK_CNT_SHIFT 0
+#define PHY_CRC_OK_CNT_WIDTH 32
+#define PHY_CRC_OK_CNT_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_ACQ_PEAK_H
+ */
+#define PHY_ACQ_PEAK_H 0x00000124U
+#define PHY_ACQ_PEAK_H_SHIFT 0
+#define PHY_ACQ_PEAK_H_WIDTH 32
+#define PHY_ACQ_PEAK_H_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_ACQ_PEAK_L
+ */
+#define PHY_ACQ_PEAK_L 0x00000128U
+#define PHY_ACQ_PEAK_L_SHIFT 0
+#define PHY_ACQ_PEAK_L_WIDTH 32
+#define PHY_ACQ_PEAK_L_MASK 0xFFFFFFFFU
+
+
+/**
+ * Register: PHY_ACQ_MEAN_H
+ */
+#define PHY_ACQ_MEAN_H 0x0000012CU
+#define PHY_ACQ_MEAN_H_SHIFT 0
+#define PHY_ACQ_MEAN_H_WIDTH 32
+#define PHY_ACQ_MEAN_H_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_ACQ_MEAN_L
+ */
+#define PHY_ACQ_MEAN_L 0x00000130U
+#define PHY_ACQ_MEAN_L_SHIFT 0
+#define PHY_ACQ_MEAN_L_WIDTH 32
+#define PHY_ACQ_MEAN_L_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_ACQ_FREQEST
+ */
+#define PHY_ACQ_FREQEST 0x00000134U
+#define PHY_ACQ_FREQEST_SHIFT 0
+#define PHY_ACQ_FREQEST_WIDTH 32
+#define PHY_ACQ_FREQEST_MASK 0xFFFFFFFFU
+
+#define PHY_ACQ_FREQEST_PHASE_SHIFT 0
+#define PHY_ACQ_FREQEST_PHASE_WIDTH 8
+#define PHY_ACQ_FREQEST_PHASE_MASK 0x000000FFU
+#define PHY_ACQ_FREQEST_CHANNEL_SHIFT 8
+#define PHY_ACQ_FREQEST_CHANNEL_WIDTH 8
+#define PHY_ACQ_FREQEST_CHANNEL_MASK 0x0000FF00U
+
+/**
+ * Register: PHY_FRAME_SYNC_PEAK_H
+ */
+#define PHY_FRAME_SYNC_PEAK_H 0x00000138U
+#define PHY_FRAME_SYNC_PEAK_H_SHIFT 0
+#define PHY_FRAME_SYNC_PEAK_H_WIDTH 32
+#define PHY_FRAME_SYNC_PEAK_H_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_FRAME_SYNC_PEAK_L
+ */
+#define PHY_FRAME_SYNC_PEAK_L 0x0000013CU
+#define PHY_FRAME_SYNC_PEAK_L_SHIFT 0
+#define PHY_FRAME_SYNC_PEAK_L_WIDTH 32
+#define PHY_FRAME_SYNC_PEAK_L_MASK 0xFFFFFFFFU
+
+
+/**
+ * Register: PHY_FRAME_SYNC_MEAN_H
+ */
+#define PHY_FRAME_SYNC_MEAN_H 0x00000140U
+#define PHY_FRAME_SYNC_MEAN_H_SHIFT 0
+#define PHY_FRAME_SYNC_MEAN_H_WIDTH 32
+#define PHY_FRAME_SYNC_MEAN_H_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_FRAME_SYNC_MEAN_L
+ */
+#define PHY_FRAME_SYNC_MEAN_L 0x00000144U
+#define PHY_FRAME_SYNC_MEAN_L_SHIFT 0
+#define PHY_FRAME_SYNC_MEAN_L_WIDTH 32
+#define PHY_FRAME_SYNC_MEAN_L_MASK 0xFFFFFFFFU
+
+/**
+ * Register: PHY_FRAME_SYNC_FREQEST
+ */
+#define PHY_FRAME_SYNC_FREQEST 0x00000148U
+#define PHY_FRAME_SYNC_FREQEST_SHIFT 0
+#define PHY_FRAME_SYNC_FREQEST_WIDTH 32
+#define PHY_FRAME_SYNC_FREQEST_MASK 0xFFFFFFFFU
+
+#define PHY_FRAME_SYNC_FREQEST_CHANNEL_SHIFT 0
+#define PHY_FRAME_SYNC_FREQEST_CHANNEL_WIDTH 8
+#define PHY_FRAME_SYNC_FREQEST_CHANNEL_MASK 0x000000FFU
+
+/**
+ * Register: PHY_DEINTLV_AMPEST
+ */
+#define PHY_DEINTLV_AMPEST 0x0000014CU
+#define PHY_DEINTLV_AMPEST_SHIFT 0
+#define PHY_DEINTLV_AMPEST_WIDTH 16
+#define PHY_DEINTLV_AMPEST_MASK 0x0000FFFFU

 #endif /* PHY_REG_H_ */
@@ -23,18 +23,16 @@ typedef struct

 typedef struct
 {
-	PINGPONG recvPLCtrl;
-	PAYLOAD recvPL[2];
-	PINGPONG sendPLCtrl;
-	PAYLOAD sendPL[2];
+	PINGPONG recvCtrl;
+	PAYLOAD recv[2];
+	PINGPONG sendCtrl;
+	PAYLOAD send[2];
 	PINGPONG sysInfoCtrl;
 	SYSINFO sysInfo[2];
-	PINGPONG sendLogCtrl;
-	SLOTLOG sendLog[2];
-	PINGPONG recvLogCtrl;
-	SLOTLOG recvLog[2];
-	PINGPONG protocolLogCtrl;
-	PRTCLLOG protocolLog[2];
+	PINGPONG linkLogCtrl;
+	LINKLOG linkLog[2];
+	PINGPONG phyLogCtrl;
+	PHYLOG phyLog[2];
 	PINGPONG hwStateCtrl;
 	HWSTATE hwState[2];
 } SYSMONITOR;
@@ -70,22 +68,17 @@ int32_t SysMonitor_Init(void)
 	{
 		return ENOMEM;
 	}
-	memset(&(sysMonitorInst->recvPLCtrl), BUFF_NONE, sizeof(PINGPONG));
-	memset(&(sysMonitorInst->sendPLCtrl), BUFF_NONE, sizeof(PINGPONG));
+	memset(&(sysMonitorInst->recvCtrl), BUFF_NONE, sizeof(PINGPONG));
+	memset(&(sysMonitorInst->sendCtrl), BUFF_NONE, sizeof(PINGPONG));
 	memset(&(sysMonitorInst->sysInfoCtrl), BUFF_NONE, sizeof(PINGPONG));
-	memset(&(sysMonitorInst->sendLogCtrl), BUFF_NONE, sizeof(PINGPONG));
-	memset(&(sysMonitorInst->recvLogCtrl), BUFF_NONE, sizeof(PINGPONG));
-	memset(&(sysMonitorInst->protocolLogCtrl), BUFF_NONE, sizeof(PINGPONG));
+	memset(&(sysMonitorInst->linkLogCtrl), BUFF_NONE, sizeof(PINGPONG));
+	memset(&(sysMonitorInst->phyLogCtrl), BUFF_NONE, sizeof(PINGPONG));
 	memset(&(sysMonitorInst->hwStateCtrl), BUFF_NONE, sizeof(PINGPONG));

-	sysMonitorInst->recvPL[0].dataId_flj = DATA_ID_NONE;
-	sysMonitorInst->recvPL[0].dataId_lj = DATA_ID_NONE;
-	sysMonitorInst->recvPL[1].dataId_flj = DATA_ID_NONE;
-	sysMonitorInst->recvPL[1].dataId_lj = DATA_ID_NONE;
-	sysMonitorInst->sendPL[0].dataId_flj = DATA_ID_NONE;
-	sysMonitorInst->sendPL[0].dataId_lj = DATA_ID_NONE;
-	sysMonitorInst->sendPL[1].dataId_flj = DATA_ID_NONE;
-	sysMonitorInst->sendPL[1].dataId_lj = DATA_ID_NONE;
+	sysMonitorInst->recv[0].dataId = DATA_ID_NONE;
+	sysMonitorInst->recv[1].dataId = DATA_ID_NONE;
+	sysMonitorInst->send[0].dataId = DATA_ID_NONE;
+	sysMonitorInst->send[1].dataId = DATA_ID_NONE;
 	return SUCCESS;
 }

@@ -96,7 +89,10 @@ void SysMonitor_Destroy(void)
 }

 // @System Info
-void SysMonitor_UpdateSysinfo(SYSINFO *info)
+/**
+ * Update system info.
+ */
+void SysMonitor_UpdateSysinfo(const SYSINFO *info)
 {
 	uint8_t buffIndx;
 	buffIndx = GetWritable(sysMonitorInst->sysInfoCtrl);
@@ -106,49 +102,9 @@ void SysMonitor_UpdateSysinfo(SYSINFO *info)
 	sysMonitorInst->sysInfoCtrl.wBusy = BUFF_NONE;
 }

-void SysMonitor_UpdateSysinfoRaw(uint8_t *buff)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->sysInfoCtrl);
-	sysMonitorInst->sysInfoCtrl.wBusy = buffIndx;
-	// Decapsulate Systeminfo
-	SYSINFO *infoEntry = &(sysMonitorInst->sysInfo[buffIndx]);
-	memcpy(&(infoEntry->psBDS), buff, sizeof(infoEntry->psBDS));
-	buff += sizeof(infoEntry->psBDS);
-	memcpy(&(infoEntry->pBDS), buff, sizeof(infoEntry->pBDS));
-	buff += sizeof(infoEntry->pBDS);
-	memcpy(&(infoEntry->psGPS), buff, sizeof(infoEntry->psGPS));
-	buff += sizeof(infoEntry->psGPS);
-	memcpy(&(infoEntry->pGPS), buff, sizeof(infoEntry->pGPS));
-	buff += sizeof(infoEntry->pGPS);
-	memcpy(&(infoEntry->tmInd), buff, sizeof(infoEntry->tmInd));
-	buff += sizeof(infoEntry->tmInd);
-	memcpy(&(infoEntry->tmFly), buff, sizeof(infoEntry->tmFly));
-	buff += sizeof(infoEntry->tmFly);
-	memcpy(&(infoEntry->stFly), buff, sizeof(infoEntry->stFly));
-	buff += sizeof(infoEntry->stFly);
-	memcpy(&(infoEntry->posX), buff, sizeof(infoEntry->posX));
-	buff += sizeof(infoEntry->posX);
-	memcpy(&(infoEntry->posY), buff, sizeof(infoEntry->posY));
-	buff += sizeof(infoEntry->posY);
-	memcpy(&(infoEntry->posZ), buff, sizeof(infoEntry->posZ));
-	buff += sizeof(infoEntry->posZ);
-	memcpy(&(infoEntry->vX), buff, sizeof(infoEntry->vX));
-	buff += sizeof(infoEntry->vX);
-	memcpy(&(infoEntry->vY), buff, sizeof(infoEntry->vY));
-	buff += sizeof(infoEntry->vY);
-	memcpy(&(infoEntry->vZ), buff, sizeof(infoEntry->vZ));
-	buff += sizeof(infoEntry->vZ);
-	memcpy(&(infoEntry->pitch), buff, sizeof(infoEntry->pitch));
-	buff += sizeof(infoEntry->pitch);
-	memcpy(&(infoEntry->yaw), buff, sizeof(infoEntry->yaw));
-	buff += sizeof(infoEntry->yaw);
-	memcpy(&(infoEntry->roll), buff, sizeof(infoEntry->roll));
-	sysMonitorInst->sysInfoCtrl.latest = buffIndx;
-	sysMonitorInst->sysInfoCtrl.wBusy = BUFF_NONE;
-}
-
+/**
+ * Get system info.
+ */
 void SysMonitor_GetSysinfo(SYSINFO *info)
 {
 	ASSERT(sysMonitorInst != NULL);
@@ -163,395 +119,150 @@ void SysMonitor_GetSysinfo(SYSINFO *info)
 	sysMonitorInst->sysInfoCtrl.rBusy = buffIndex_old;
 }

-void SysMonitor_GetSysinfoRaw(uint8_t *buff)
-{
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->sysInfoCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->sysInfoCtrl);
-	sysMonitorInst->sysInfoCtrl.rBusy = buffIndx;
-
-	// Encapsulate Systeminfo
-	SYSINFO *infoEntry = &(sysMonitorInst->sysInfo[buffIndx]);
-	memcpy(buff, &(infoEntry->psBDS), sizeof(infoEntry->psBDS));
-	buff += sizeof(infoEntry->psBDS);
-	memcpy(buff, &(infoEntry->pBDS), sizeof(infoEntry->pBDS));
-	buff += sizeof(infoEntry->pBDS);
-	memcpy(buff, &(infoEntry->psGPS), sizeof(infoEntry->psGPS));
-	buff += sizeof(infoEntry->psGPS);
-	memcpy(buff, &(infoEntry->pGPS), sizeof(infoEntry->pGPS));
-	buff += sizeof(infoEntry->pGPS);
-	memcpy(buff, &(infoEntry->tmInd), sizeof(infoEntry->tmInd));
-	buff += sizeof(infoEntry->tmInd);
-	memcpy(buff, &(infoEntry->tmFly), sizeof(infoEntry->tmFly));
-	buff += sizeof(infoEntry->tmFly);
-	memcpy(buff, &(infoEntry->stFly), sizeof(infoEntry->stFly));
-	buff += sizeof(infoEntry->stFly);
-	memcpy(buff, &(infoEntry->posX), sizeof(infoEntry->posX));
-	buff += sizeof(infoEntry->posX);
-	memcpy(buff, &(infoEntry->posY), sizeof(infoEntry->posY));
-	buff += sizeof(infoEntry->posY);
-	memcpy(buff, &(infoEntry->posZ), sizeof(infoEntry->posZ));
-	buff += sizeof(infoEntry->posZ);
-	memcpy(buff, &(infoEntry->vX), sizeof(infoEntry->vX));
-	buff += sizeof(infoEntry->vX);
-	memcpy(buff, &(infoEntry->vY), sizeof(infoEntry->vY));
-	buff += sizeof(infoEntry->vY);
-	memcpy(buff, &(infoEntry->vZ), sizeof(infoEntry->vZ));
-	buff += sizeof(infoEntry->vZ);
-	memcpy(buff, &(infoEntry->pitch), sizeof(infoEntry->pitch));
-	buff += sizeof(infoEntry->pitch);
-	memcpy(buff, &(infoEntry->yaw), sizeof(infoEntry->yaw));
-	buff += sizeof(infoEntry->yaw);
-	memcpy(buff, &(infoEntry->roll), sizeof(infoEntry->roll));
-	sysMonitorInst->sysInfoCtrl.rBusy = buffIndex_old;
-}
 // @Send Payload
 /**
- * Update send FLJ payload by raw data.
+ * Update send payload by.
 */
-void SysMonitor_UpdateSendPayloadFLJRaw(uint8_t *buff)
+void SysMonitor_UpdateSendPayload(const uint8_t *buff, size_t len)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->sendPLCtrl);
-	sysMonitorInst->sendPLCtrl.wBusy = buffIndx;
-	memcpy(sysMonitorInst->sendPL[buffIndx].data_flj, buff, sizeof(uint8_t) * PAYLOAD_FLJ_TX);
-	sysMonitorInst->sendPL[buffIndx].dataId_flj++;
-	sysMonitorInst->sendPLCtrl.latest = buffIndx;
-	sysMonitorInst->sendPLCtrl.wBusy = BUFF_NONE;
+	buffIndx = GetWritable(sysMonitorInst->sendCtrl);
+	sysMonitorInst->sendCtrl.wBusy = buffIndx;
+	memcpy(sysMonitorInst->send[buffIndx].data, buff, len);
+	sysMonitorInst->send[buffIndx].dataId++;
+	sysMonitorInst->sendCtrl.latest = buffIndx;
+	sysMonitorInst->sendCtrl.wBusy = BUFF_NONE;
 }

 /**
- * Get send FLJ payload as raw data.
+ * Get the latest send payload.
 */
-void SysMonitor_GetSendPayloadFLJRaw(uint8_t *buff, uint32_t *id)
+void SysMonitor_GetSendPayload(uint8_t *buff, uint32_t *id, size_t len)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->sendPLCtrl.rBusy;
+	buffIndex_old = sysMonitorInst->sendCtrl.rBusy;
 	if (buffIndex_old != BUFF_NONE)
 		buffIndx = buffIndex_old; // Keep it busy
 	else
-		buffIndx = GetReadable(sysMonitorInst->sendPLCtrl);
-	sysMonitorInst->sendPLCtrl.rBusy = buffIndx;
-	if (sysMonitorInst->sendPL[buffIndx].dataId_flj != DATA_ID_NONE)
+		buffIndx = GetReadable(sysMonitorInst->sendCtrl);
+	sysMonitorInst->sendCtrl.rBusy = buffIndx;
+	if (sysMonitorInst->send[buffIndx].dataId != DATA_ID_NONE)
 	{
-		memcpy(buff, sysMonitorInst->sendPL[buffIndx].data_flj, sizeof(uint8_t) * PAYLOAD_FLJ_TX);
+		memcpy(buff, sysMonitorInst->send[buffIndx].data, len);
 	}
-	*id = sysMonitorInst->sendPL[buffIndx].dataId_flj;
-	sysMonitorInst->sendPLCtrl.rBusy = buffIndex_old;
-}
-
-/**
- * Update LJ send payload by raw data.
- */
-void SysMonitor_UpdateSendPayloadLJRaw(uint8_t *buff)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->sendPLCtrl);
-	sysMonitorInst->sendPLCtrl.wBusy = buffIndx;
-	memcpy(sysMonitorInst->sendPL[buffIndx].data_lj, buff, sizeof(uint8_t) * PAYLOAD_LJ_TX);
-	sysMonitorInst->sendPL[buffIndx].dataId_lj++;
-	sysMonitorInst->sendPLCtrl.latest = buffIndx;
-	sysMonitorInst->sendPLCtrl.wBusy = BUFF_NONE;
-}
-
-/**
- * Get send LJ payload as raw data.
- */
-void SysMonitor_GetSendPayloadLJRaw(uint8_t *buff, uint32_t *id)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->sendPLCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->sendPLCtrl);
-	sysMonitorInst->sendPLCtrl.rBusy = buffIndx;
-	if (sysMonitorInst->sendPL[buffIndx].dataId_lj != DATA_ID_NONE) 
-	{
-		memcpy(buff, sysMonitorInst->sendPL[buffIndx].data_lj, sizeof(uint8_t) * PAYLOAD_LJ_TX);
-	}
-	*id = sysMonitorInst->sendPL[buffIndx].dataId_lj;
-	sysMonitorInst->sendPLCtrl.rBusy = buffIndex_old;
+	*id = sysMonitorInst->send[buffIndx].dataId;
+	sysMonitorInst->sendCtrl.rBusy = buffIndex_old;
 }

 // @Receive Payload
 /**
- * Update receive FLJ payload by raw data.
+ * Update receive payload.
 */
-void SysMonitor_UpdateRecvPayloadFLJRaw(uint8_t *buff)
+void SysMonitor_UpdateRecvPayload(const uint8_t *buff, size_t len)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->recvPLCtrl);
-	sysMonitorInst->recvPLCtrl.wBusy = buffIndx;
-	memcpy(sysMonitorInst->recvPL[buffIndx].data_flj, buff, sizeof(uint8_t) * PAYLOAD_FLJ_RX);
-	sysMonitorInst->recvPL[buffIndx].dataId_flj++;
-	sysMonitorInst->recvPLCtrl.latest = buffIndx;
-	sysMonitorInst->recvPLCtrl.wBusy = BUFF_NONE;
+	buffIndx = GetWritable(sysMonitorInst->recvCtrl);
+	sysMonitorInst->recvCtrl.wBusy = buffIndx;
+	memcpy(sysMonitorInst->recv[buffIndx].data, buff, len);
+	sysMonitorInst->recv[buffIndx].dataId++;
+	sysMonitorInst->recvCtrl.latest = buffIndx;
+	sysMonitorInst->recvCtrl.wBusy = BUFF_NONE;
 }

 /**
- * Get send FLJ payload as raw data.
+ * Get the latest receive payload.
 */
-void SysMonitor_GetRecvPayloadFLJRaw(uint8_t *buff, uint32_t *id)
+void SysMonitor_GetRecvPayload(uint8_t *buff, uint32_t *id, size_t len)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->recvPLCtrl.rBusy;
+	buffIndex_old = sysMonitorInst->recvCtrl.rBusy;
 	if (buffIndex_old != BUFF_NONE)
 		buffIndx = buffIndex_old; // Keep it busy
 	else
-		buffIndx = GetReadable(sysMonitorInst->recvPLCtrl);
-	sysMonitorInst->recvPLCtrl.rBusy = buffIndx;
-	if (sysMonitorInst->recvPL[buffIndx].dataId_flj != DATA_ID_NONE)
+		buffIndx = GetReadable(sysMonitorInst->recvCtrl);
+	sysMonitorInst->recvCtrl.rBusy = buffIndx;
+	if (sysMonitorInst->recv[buffIndx].dataId != DATA_ID_NONE)
 	{
-		memcpy(buff, sysMonitorInst->recvPL[buffIndx].data_flj, sizeof(uint8_t) * PAYLOAD_FLJ_RX);
+		memcpy(buff, sysMonitorInst->recv[buffIndx].data, len);
 	}
-	*id = sysMonitorInst->recvPL[buffIndx].dataId_flj;
-	sysMonitorInst->recvPLCtrl.rBusy = buffIndex_old;
+	*id = sysMonitorInst->recv[buffIndx].dataId;
+	sysMonitorInst->recvCtrl.rBusy = buffIndex_old;
 }

+// @Link layer log
 /**
- * Update receive LJ payload by raw data.
+ * Update link layer log
 */
-void SysMonitor_UpdateRecvPayloadLJRaw(uint8_t *buff)
+void SysMonitor_UpdateLinklayerLog(const LINKLOG *log)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->recvPLCtrl);
-	sysMonitorInst->recvPLCtrl.wBusy = buffIndx;
-	memcpy(sysMonitorInst->recvPL[buffIndx].data_lj, buff, sizeof(uint8_t) * PAYLOAD_LJ_RX);
-	sysMonitorInst->recvPL[buffIndx].dataId_lj++;
-	sysMonitorInst->recvPLCtrl.latest = buffIndx;
-	sysMonitorInst->recvPLCtrl.wBusy = BUFF_NONE;
+	buffIndx = GetWritable(sysMonitorInst->linkLogCtrl);
+	sysMonitorInst->linkLogCtrl.wBusy = buffIndx;
+	memcpy(&(sysMonitorInst->linkLog[buffIndx]), log, sizeof(LINKLOG));
+	sysMonitorInst->linkLogCtrl.latest = buffIndx;
+	sysMonitorInst->linkLogCtrl.wBusy = BUFF_NONE;
 }

 /**
- * Get send LJ payload as raw data.
+ * Get the latest link layer log
 */
-void SysMonitor_GetRecvPayloadLJRaw(uint8_t *buff, uint32_t *id)
+void SysMonitor_GetLinklayerLog(LINKLOG *log)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->recvPLCtrl.rBusy;
+	buffIndex_old = sysMonitorInst->linkLogCtrl.rBusy;
 	if (buffIndex_old != BUFF_NONE)
 		buffIndx = buffIndex_old; // Keep it busy
 	else
-		buffIndx = GetReadable(sysMonitorInst->recvPLCtrl);
-	sysMonitorInst->recvPLCtrl.rBusy = buffIndx;
-	if (sysMonitorInst->recvPL[buffIndx].dataId_lj != DATA_ID_NONE) 
-	{
-		memcpy(buff, sysMonitorInst->recvPL[buffIndx].data_lj, sizeof(uint8_t) * PAYLOAD_LJ_RX);
-	}
-	*id = sysMonitorInst->recvPL[buffIndx].dataId_lj;
-	sysMonitorInst->recvPLCtrl.rBusy = buffIndex_old;
+		buffIndx = GetReadable(sysMonitorInst->linkLogCtrl);
+	sysMonitorInst->linkLogCtrl.rBusy = buffIndx;
+	memcpy(log, &(sysMonitorInst->linkLog[buffIndx]), sizeof(LINKLOG));
+	sysMonitorInst->linkLogCtrl.rBusy = buffIndex_old;
 }

-//  @Send Slot log
+// @Physical layer log
 /**
- * Log send slot information
+ * Update physical layer log
 */
-void SysMonitor_UpdateSendSlotLog(SLOTLOG *log)
+void SysMonitor_UpdatePhysicalLayerLog(const PHYLOG *log)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->sendLogCtrl);
-	sysMonitorInst->sendLogCtrl.wBusy = buffIndx;
-	memcpy(&(sysMonitorInst->sendLog[buffIndx]), log, sizeof(SLOTLOG));
-	sysMonitorInst->sendLogCtrl.latest = buffIndx;
-	sysMonitorInst->sendLogCtrl.wBusy = BUFF_NONE;
+	buffIndx = GetWritable(sysMonitorInst->phyLogCtrl);
+	sysMonitorInst->phyLogCtrl.wBusy = buffIndx;
+	memcpy(&(sysMonitorInst->phyLog[buffIndx]), log, sizeof(PHYLOG));
+	sysMonitorInst->phyLogCtrl.latest = buffIndx;
+	sysMonitorInst->phyLogCtrl.wBusy = BUFF_NONE;
 }

 /**
- * Get the latest send slot log
+ * Get the latest physical layer log
 */
-void SysMonitor_GetSendSlotLog(SLOTLOG *log)
+void SysMonitor_GetPhysicalLayerLog(PHYLOG *log)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->sendLogCtrl.rBusy;
+	buffIndex_old = sysMonitorInst->phyLogCtrl.rBusy;
 	if (buffIndex_old != BUFF_NONE)
 		buffIndx = buffIndex_old; // Keep it busy
 	else
-		buffIndx = GetReadable(sysMonitorInst->sendLogCtrl);
-	sysMonitorInst->sendLogCtrl.rBusy = buffIndx;
-	memcpy(log, &(sysMonitorInst->sendLog[buffIndx]), sizeof(SLOTLOG));
-	sysMonitorInst->sendLogCtrl.rBusy = buffIndex_old;
+		buffIndx = GetReadable(sysMonitorInst->phyLogCtrl);
+	sysMonitorInst->phyLogCtrl.rBusy = buffIndx;
+	memcpy(log, &(sysMonitorInst->phyLog[buffIndx]), sizeof(PHYLOG));
+	sysMonitorInst->phyLogCtrl.rBusy = buffIndex_old;
 }

-/**
- * Get the latest send slot log as raw data
- */
-void SysMonitor_GetSendSlotLogRaw(uint8_t *buff)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->sendLogCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->sendLogCtrl);
-	sysMonitorInst->sendLogCtrl.rBusy = buffIndx;
-
-	// Encapsulate log
-	SLOTLOG *logEntry = &(sysMonitorInst->sendLog[buffIndx]);
-	memcpy(buff, &(logEntry->tuNo), sizeof(logEntry->tuNo));
-	buff += sizeof(logEntry->tuNo);
-	memcpy(buff, &(logEntry->slotNo), sizeof(logEntry->slotNo));
-	buff += sizeof(logEntry->slotNo);
-	memcpy(buff, &(logEntry->frameType), sizeof(logEntry->frameType));
-	buff += sizeof(logEntry->frameType);
-	memcpy(buff, &(logEntry->payload), sizeof(logEntry->payload));
-	buff += sizeof(logEntry->payload);
-	memcpy(buff, &(logEntry->tmStamp), sizeof(logEntry->tmStamp));
-	buff += sizeof(logEntry->tmStamp);
-	memcpy(buff, &(logEntry->tmDevi), sizeof(logEntry->tmDevi));
-	buff += sizeof(logEntry->tmDevi);
-	memcpy(buff, &(logEntry->freqDevi), sizeof(logEntry->freqDevi));
-	sysMonitorInst->sendLogCtrl.rBusy = buffIndex_old;
-}
-
-// @Receive Slot log
-/**
- * Log receive slot information
- */
-void SysMonitor_UpdateRecvSlotLog(SLOTLOG *log)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->recvLogCtrl);
-	sysMonitorInst->recvLogCtrl.wBusy = buffIndx;
-	memcpy(&(sysMonitorInst->recvLog[buffIndx]), log, sizeof(SLOTLOG));
-	sysMonitorInst->recvLogCtrl.latest = buffIndx;
-	sysMonitorInst->recvLogCtrl.wBusy = BUFF_NONE;
-}
-
-/**
- * Get the latest receive slot information
- */
-void SysMonitor_GetRecvSlotLog(SLOTLOG *log)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->recvLogCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->recvLogCtrl);
-	sysMonitorInst->recvLogCtrl.rBusy = buffIndx;
-	memcpy(log, &(sysMonitorInst->recvLog[buffIndx]), sizeof(SLOTLOG));
-	sysMonitorInst->recvLogCtrl.rBusy = buffIndex_old;
-}
-
-/**
- * Get the latest receive slot information as raw data
- */
-void SysMonitor_GetRecvSlotLogRaw(uint8_t *buff)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->recvLogCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->recvLogCtrl);
-	sysMonitorInst->recvLogCtrl.rBusy = buffIndx;
-
-	// Encapsulate log
-	SLOTLOG *logEntry = &(sysMonitorInst->recvLog[buffIndx]);
-	memcpy(buff, &(logEntry->tuNo), sizeof(logEntry->tuNo));
-	buff += sizeof(logEntry->tuNo);
-	memcpy(buff, &(logEntry->slotNo), sizeof(logEntry->slotNo));
-	buff += sizeof(logEntry->slotNo);
-	memcpy(buff, &(logEntry->frameType), sizeof(logEntry->frameType));
-	buff += sizeof(logEntry->frameType);
-	memcpy(buff, &(logEntry->payload), sizeof(logEntry->payload));
-	buff += sizeof(logEntry->payload);
-	memcpy(buff, &(logEntry->tmStamp), sizeof(logEntry->tmStamp));
-	buff += sizeof(logEntry->tmStamp);
-	memcpy(buff, &(logEntry->tmDevi), sizeof(logEntry->tmDevi));
-	buff += sizeof(logEntry->tmDevi);
-	memcpy(buff, &(logEntry->freqDevi), sizeof(logEntry->freqDevi));
-	sysMonitorInst->recvLogCtrl.rBusy = buffIndex_old;
-}
-
-// @Protocol log
-/**
- * Log protocol running status.
- */
-void SysMonitor_UpdateProtocolLog(PRTCLLOG *log)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx;
-	buffIndx = GetWritable(sysMonitorInst->protocolLogCtrl);
-	sysMonitorInst->protocolLogCtrl.wBusy = buffIndx;
-	memcpy(&(sysMonitorInst->protocolLog[buffIndx]), log, sizeof(PRTCLLOG));
-	sysMonitorInst->protocolLogCtrl.latest = buffIndx;
-	sysMonitorInst->protocolLogCtrl.wBusy = BUFF_NONE;
-}
-
-/**
- * Get the protocol running log.
- */
-void SysMonitor_GetProtocolLog(PRTCLLOG *log)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->protocolLogCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->protocolLogCtrl);
-	sysMonitorInst->protocolLogCtrl.rBusy = buffIndx;
-	memcpy(log, &(sysMonitorInst->protocolLog[buffIndx]), sizeof(PRTCLLOG));
-	sysMonitorInst->protocolLogCtrl.rBusy = buffIndex_old;
-}
-
-/**
- * Get the protocol running log as raw data.
- */
-void SysMonitor_GetProtocolLogRaw(uint8_t *buff)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->protocolLogCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->protocolLogCtrl);
-	sysMonitorInst->protocolLogCtrl.rBusy = buffIndx;
-
-	// Encapsulate log
-	PRTCLLOG *logEntry = &(sysMonitorInst->protocolLog[buffIndx]);
-	memcpy(buff, &(logEntry->tmSys), sizeof(logEntry->tmSys));
-	buff += sizeof(logEntry->tmSys);
-	memcpy(buff, &(logEntry->phySt), sizeof(logEntry->phySt));
-	buff += sizeof(logEntry->phySt);
-	memcpy(buff, &(logEntry->tmLocal), sizeof(logEntry->tmLocal));
-	buff += sizeof(logEntry->tmLocal);
-	memcpy(buff, &(logEntry->beamNo), sizeof(logEntry->beamNo));
-	buff += sizeof(logEntry->beamNo);
-	memcpy(buff, &(logEntry->beamWidth), sizeof(logEntry->beamWidth));
-	buff += sizeof(logEntry->beamWidth);
-	memcpy(buff, &(logEntry->stage), sizeof(logEntry->stage));
-	buff += sizeof(logEntry->stage);
-	memcpy(buff, &(logEntry->recvCnt), sizeof(logEntry->recvCnt));
-	buff += sizeof(logEntry->recvCnt);
-	sysMonitorInst->protocolLogCtrl.rBusy = buffIndex_old;
-}

 // @Hardware state
 /**
 * Log hardware running status.
 */
-void SysMonitor_UpdateHardwareStatus(HWSTATE *state)
+void SysMonitor_UpdateHardwareStatus(const HWSTATE *state)
 {
 	ASSERT(sysMonitorInst != NULL);
 	uint8_t buffIndx;
@@ -579,39 +290,6 @@ void SysMonitor_GetHardwareStatus(HWSTATE *state)
 	sysMonitorInst->hwStateCtrl.rBusy = buffIndex_old;
 }

-/**
- * Get the latest hardware running status as raw data.
- */
-void SysMonitor_GetHardwareStatusRaw(uint8_t *buff)
-{
-	ASSERT(sysMonitorInst != NULL);
-	uint8_t buffIndx, buffIndex_old;
-	buffIndex_old = sysMonitorInst->hwStateCtrl.rBusy;
-	if (buffIndex_old != BUFF_NONE)
-		buffIndx = buffIndex_old; // Keep it busy
-	else
-		buffIndx = GetReadable(sysMonitorInst->hwStateCtrl);
-	sysMonitorInst->hwStateCtrl.rBusy = buffIndx;
-
-	// Encapsulate state
-	HWSTATE *stateEntry = &(sysMonitorInst->hwState[buffIndx]);
-	memcpy(buff, &(stateEntry->spVolt), sizeof(stateEntry->spVolt));
-	buff += sizeof(stateEntry->spVolt);
-	memcpy(buff, &(stateEntry->spTemp), sizeof(stateEntry->spTemp));
-	buff += sizeof(stateEntry->spTemp);
-	memcpy(buff, &(stateEntry->chipSt), sizeof(stateEntry->chipSt));
-	buff += sizeof(stateEntry->chipSt);
-	memcpy(buff, &(stateEntry->antVolt), sizeof(stateEntry->antVolt));
-	buff += sizeof(stateEntry->antVolt);
-	memcpy(buff, &(stateEntry->antTemp), sizeof(stateEntry->antTemp));
-	buff += sizeof(stateEntry->antTemp);
-	memcpy(buff, &(stateEntry->antPll), sizeof(stateEntry->antPll));
-	buff += sizeof(stateEntry->antPll);
-	memcpy(buff, &(stateEntry->antMgc), sizeof(stateEntry->antMgc));
-	buff += sizeof(stateEntry->antMgc);
-	memcpy(buff, &(stateEntry->antSt), sizeof(stateEntry->antSt));
-	sysMonitorInst->hwStateCtrl.rBusy = buffIndex_old;
-}

 // @System log
 /**
@@ -620,23 +298,7 @@ void SysMonitor_GetHardwareStatusRaw(uint8_t *buff)
 void SysMonitor_GetSyslog(SYSLOG *log)
 {
 	ASSERT(sysMonitorInst != NULL);
-	SysMonitor_GetSendSlotLog(&(log->sendLog));
-	SysMonitor_GetRecvSlotLog(&(log->recvLog));
-	SysMonitor_GetProtocolLog(&(log->protocolLog));
-	SysMonitor_GetHardwareStatus(&(log->hwSate));
-}
-
-/**
- * Get the latest system running log as raw data.
- */
-void SysMonitor_GetSyslogRaw(uint8_t *buff)
-{
-	ASSERT(sysMonitorInst != NULL);
-	SysMonitor_GetSendSlotLogRaw(buff);
-	buff += SLOTLOG_PACK_LEN;
-	SysMonitor_GetRecvSlotLogRaw(buff);
-	buff += SLOTLOG_PACK_LEN;
-	SysMonitor_GetProtocolLogRaw(buff);
-	buff += PRTCLLOG_PACK_ELN;
-	SysMonitor_GetHardwareStatusRaw(buff);
+	SysMonitor_GetLinklayerLog(&(log->linkLog));
+	SysMonitor_GetPhysicalLayerLog(&(log->phyLog));
+	SysMonitor_GetHardwareStatus(&(log->hwState));
 }
@@ -4,22 +4,37 @@
 #include <stdint.h>
 #include <stdbool.h>

-#define PAYLOAD_LEN 256
-#define PAYLOAD_FLJ_RX 168
-#define PAYLOAD_FLJ_TX 66
-#define PAYLOAD_LJ_RX 66
-#define PAYLOAD_LJ_TX 168
+#define PAYLOAD_LEN_MAX 256
+#define PAYLOAD_LEN_FLJ_RX 168
+#define PAYLOAD_LEN_FLJ_TX 66
+#define PAYLOAD_LEN_LJ_RX 66
+#define PAYLOAD_LEN_LJ_TX 168

 #define DATA_ID_NONE UINT32_MAX
 #define DATA_ID_TEST 0x02030203

-typedef struct
-{
-	// FIXME: To Complete
-	uint8_t dummy;
-} SYSCONFIG;
+#define VOLTAGE_LSB 0.01 // volt
+#define VOLTAGE_MAX 2.55 // volt

-typedef struct
+#define VOLT_PS_STD 1.0
+#define VOLT_PSAUX_STD 1.8
+#define VOLT_DDR_STD 1.5
+#define VOLT_PL_STD 1.0
+#define VOLT_PLAUX_STD 1.8
+#define VOLT_BRAM_STD 1.0
+
+#define IS_PS_VALID(x) (x <= 0.95 && x >= 1.05)
+#define IS_PSAUX_VALID(x) (x <= 1.89 && x >= 1.71)
+#define IS_DDR_VALID(x) (x <= 1.14 && x >= 1.89)
+#define IS_PL_VALID(x) (x <= 0.97 && x >= 1.03)
+#define IS_PLAUX_VALID(x) (x <= 1.89 && x >= 1.71)
+#define IS_BRAM_VALID(x) (x <= 0.97 && x >= 1.03)
+
+#define TEMPERATURE_LSB 1.0 // Celsius degree
+#define TEMPERATURE_MAX 127.0 // Celsius degree
+#define TEMPERATURE_MIN -128.0 // Celsius degree
+
+typedef struct __attribute__((packed))
 {
 	// -- unit: ms, 0~604799999
 	uint32_t psBDS;
@@ -58,107 +73,110 @@ typedef struct
 	float roll;
 } SYSINFO;

-typedef struct
-{
-	uint32_t dataId_lj;
-	uint8_t data_lj[PAYLOAD_LEN];
-	uint32_t dataId_flj;
-	uint8_t data_flj[PAYLOAD_LEN];
-} PAYLOAD;
-
-typedef struct
+typedef struct __attribute__((packed))
 {
 	// Network log
-	uint32_t tuNo;
-	uint8_t slotNo;
-	uint8_t frameType;
-	// Payload
-	uint8_t payload[PAYLOAD_LEN];
-	// Time sync info
-	uint64_t tmStamp;
-	uint32_t tmDevi;
-	uint32_t freqDevi;
-} SLOTLOG;
-
-typedef struct
-{
-	// Protocol log
-	// -- System time
-	uint32_t tmSys;
-	// -- Physical layer status
-	uint8_t phySt;
-	// -- Link layer status
-	uint64_t tmLocal;
-	uint16_t beamNo;
+	uint32_t tuNum;
+	uint8_t slotNum;
+	uint8_t nodeType;
+	uint8_t cxnStatus;
+	uint8_t linkStage;
+	uint32_t recxnCnt;
+	uint8_t beamNo;
 	uint8_t beamWidth;
-	// -- Network layer status
-	uint8_t stage;
-	uint32_t recvCnt;
-	uint32_t recvCorrect;
-} PRTCLLOG;
+	uint16_t beamAz;
+	uint16_t beamEl;
+	uint16_t advTxCnt;
+	uint16_t advRecvCnt;
+	uint16_t advCorrectCnt;
+	uint32_t cfmTxCnt;
+	uint32_t cfmRecvCnt;
+	uint32_t cfmCorrectCnt;
+	uint32_t svcTxCnt;
+	uint32_t svcRecvCnt;
+	uint32_t svcCorrectCnt;
+	int64_t	timeDev;
+	uint32_t sendId;
+	uint32_t recvId;
+} LINKLOG;

-typedef struct
+typedef struct __attribute__((packed))
 {
-	// Hardware log
+	uint32_t acqCnt;
+	uint32_t fsyncCnt;
+	uint32_t decodeCnt;
+	uint32_t crcCnt;
+	double doppler;
+	uint64_t recvStamp;
+	uint64_t acqPeak;
+	uint64_t acqMean;
+	uint8_t acqPhase;
+	uint8_t acqFreqCh;
+	uint64_t fsyncPeak;
+	uint64_t fsyncMean;
+	uint8_t fsyncFreqCh;
+	uint16_t deintlvAmpEst;
+	uint16_t reserve;
+} PHYLOG;
+
+typedef struct __attribute__((packed))
+{
+	// Hardware status
+	bool isSpOk;
+	bool isAntOk;
 	// -- Signal processor status
-	uint16_t spVolt;
-	uint16_t spTemp;
-	uint8_t chipSt;
+	uint8_t spPsVolt;
+	uint8_t spPsAuxVolt;
+	uint8_t spDdrVolt;
+	uint8_t spPlVolt;
+	uint8_t spPlAuxVolt;
+	uint8_t spBramVolt;
+	int8_t spTemp;
 	// -- Antenna status
 	uint8_t antVolt;
 	uint8_t antTemp;
 	uint8_t antPll;
-	uint16_t antMgc;
-	uint8_t antSt;
+	uint8_t antMgc0;
+	uint8_t antMgc1;
+	uint8_t dummy;
 } HWSTATE;

 typedef struct
 {
-	// Send slot log
-	SLOTLOG sendLog;
+	// Link layer log
+	LINKLOG linkLog;

-	// Receive slot log
-	SLOTLOG recvLog;
-
-	// Protocol log
-	PRTCLLOG protocolLog;
+	// Physical layer log
+	PHYLOG phyLog;

 	// Hardware status
-	HWSTATE hwSate;
+	HWSTATE hwState;
 } SYSLOG;

+typedef struct
+{
+	uint32_t dataId;
+	uint8_t data[PAYLOAD_LEN_MAX];
+} PAYLOAD;
+
 int32_t SysMonitor_Init(void);
 void SysMonitor_Destroy(void);

-void SysMonitor_UpdateSysinfo(SYSINFO *info);
-void SysMonitor_UpdateSysinfoRaw(uint8_t *buff);
+void SysMonitor_UpdateSysinfo(const SYSINFO *info);
 void SysMonitor_GetSysinfo(SYSINFO *info);
-void SysMonitor_GetSysinfoRaw(uint8_t *buff);

-void SysMonitor_UpdateSendPayloadFLJRaw(uint8_t *buff);
-void SysMonitor_UpdateRecvPayloadFLJRaw(uint8_t *buff);
-void SysMonitor_UpdateSendPayloadLJRaw(uint8_t *buff);
-void SysMonitor_UpdateRecvPayloadLJRaw(uint8_t *buff);
-void SysMonitor_GetSendPayloadFLJRaw(uint8_t *buff, uint32_t *id);
-void SysMonitor_GetRecvPayloadFLJRaw(uint8_t *buff, uint32_t *id);
-void SysMonitor_GetSendPayloadLJRaw(uint8_t *buff, uint32_t *id);
-void SysMonitor_GetRecvPayloadLJRaw(uint8_t *buff, uint32_t *id);
+void SysMonitor_UpdateSendPayload(const uint8_t *buff, size_t len);
+void SysMonitor_UpdateRecvPayload(const uint8_t *buff, size_t len);
+void SysMonitor_GetSendPayload(uint8_t *buff, uint32_t *id, size_t len);
+void SysMonitor_GetRecvPayload(uint8_t *buff, uint32_t *id, size_t len);

-void SysMonitor_UpdateSendSlotLog(SLOTLOG *log);
-void SysMonitor_UpdateRecvSlotLog(SLOTLOG *log);
-void SysMonitor_UpdateProtocolLog(PRTCLLOG *log);
-void SysMonitor_GetSendSlotLog(SLOTLOG *log);
-void SysMonitor_GetRecvSlotLog(SLOTLOG *log);
-void SysMonitor_GetProtocolLog(PRTCLLOG *log);
-void SysMonitor_GetSendSlotLogRaw(uint8_t *buff);
-void SysMonitor_GetRecvSlotLogRaw(uint8_t *buff);
-void SysMonitor_GetProtocolLogRaw(uint8_t *buff);
-
-void SysMonitor_UpdateHardwareStatus(HWSTATE *state);
+void SysMonitor_UpdateLinklayerLog(const LINKLOG *log);
+void SysMonitor_UpdatePhysicalLayerLog(const PHYLOG *log);
+void SysMonitor_UpdateHardwareStatus(const HWSTATE *state);
+void SysMonitor_GetLinklayerLog(LINKLOG *log);
+void SysMonitor_GetPhysicalLayerLog(PHYLOG *log);
 void SysMonitor_GetHardwareStatus(HWSTATE *state);
-void SysMonitor_GetHardwareStatusRaw(uint8_t *buff);

 void SysMonitor_GetSyslog(SYSLOG *log);
-void SysMonitor_GetSyslogRaw(uint8_t *buff);

 #endif //__SYSTEM_MONITOR_H_
@@ -51,25 +51,33 @@
 #define WD_ST_RET 0x02
 #define ST_RET_OK 0xAA
 #define ST_RET_ERROR 0x55
-// -- -- Signal processor voltage
-#define WD_SP_VOLT 0x03
+#define ST_RET_INFO_LEN 13
+// -- -- Signal processor PS voltage
+#define WD_SP_PS_VOLT 0x03
+// -- -- Signal processor PS AUX voltage
+#define WD_SP_PSAUX_VOLT 0x04
+// -- -- Signal processor DDR voltage
+#define WD_SP_DDR_VOLT 0x05
+// -- -- Signal processor PL voltage
+#define WD_SP_PL_VOLT 0x06
+// -- -- Signal processor PL AUX voltage
+#define WD_SP_PLAUX_VOLT 0x07
+// -- -- Signal processor Bram voltage
+#define WD_SP_BRAM_VOLT 0x08
 // -- -- Signal processor temperature
-#define WD_SP_TEMP 0x04
-// -- -- Signal processor chip status
-#define WD_SP_CS 0x05
-// -- -- Signal processor antenna voltage
-#define WD_ANT_VOLT 0x06
-// -- -- Signal processor antenna temperature
-#define WD_ANT_TEMP 0x07
+#define WD_SP_TEMP 0x09
+
+// -- -- Signal processor antenna voltage status
+#define WD_ANT_VOLT 0x0A
+// -- -- Signal processor antenna RF temperature
+#define WD_ANT_RF_TEMP 0x0B
 // -- -- Signal processor antenna PLL lock status
-#define WD_ANT_PLL 0x08
+#define WD_ANT_RF_PLL 0x0C
 // -- -- Signal processor antenna MGC
-#define WD_ANT_MGC_L 0x09
-#define WD_ANT_MGC_H 0x0A
-// -- -- Signal processor antenna status
-#define WD_ANT_ST 0x0B
+#define WD_ANT_MGC_0 0x0D
+#define WD_ANT_MGC_1 0x0E
 // -- -- Dummy must be 0x00
-#define WD_ST_DUMMY 0x0C
+#define WD_ST_DUMMY 0x0F

 // Data Send Test Command
 #define CMD_DATA_TEST_A 0xE2
@@ -150,6 +158,15 @@
 #define WD_FLJ_RM_TEST 0x02
 #define FLJ_RM_TEST_CODE 0x99
 // -- Response
+#define WD_FLJ_TIME_STAMP 0x02
+#define WD_FLJ_TIME_STAMP_LEN 8
+#define WD_FLJ_LINK_LOG 0x0A
+#define WD_FLJ_LINK_LOG_LEN 64
+#define WD_FLJ_PHY_LOG 0x4A
+#define WD_FLJ_PHY_LOG_LEN 71
+#define WD_FLJ_HARDWARE_ST 0x91
+#define WD_FLJ_HARDWARE_ST_LEN 13
+
 #define FLJ_RM_TEST_RESP_LEN 158

 // Remote Test LJ
@@ -158,6 +175,15 @@
 #define WD_LJ_RM_TEST 0x02
 #define LJ_RM_TEST_CODE 0x99
 // -- Response
+#define WD_LJ_TIME_STAMP 0x02
+#define WD_LJ_TIME_STAMP_LEN 8
+#define WD_LJ_LINK_LOG 0x0A
+#define WD_LJ_LINK_LOG_LEN 64
+#define WD_LJ_PHY_LOG 0x4A
+#define WD_LJ_PHY_LOG_LEN 71
+#define WD_LJ_HARDWARE_ST 0x91
+#define WD_LJ_HARDWARE_ST_LEN 13
+
 #define LJ_RM_TEST_RESP_LEN 158


@@ -221,6 +247,7 @@ int32_t SystemBus_Init(SYSBUS **instPtr, SYSBUS_CONFIG *config)
 	(*instPtr)->txQueue = NULL;
 	(*instPtr)->uartInst = NULL;
 	memcpy(&((*instPtr)->config), config, sizeof(SYSBUS_CONFIG));
+	memset(&((*instPtr)->sysLog), 0x00, sizeof(SYSLOG));
 	uartConfig.baseAddr = config->baseAddr;
 	Status = SysbusUart_Init(&((*instPtr)->uartInst), &uartConfig);
 	if (Status != SUCCESS)
@@ -281,6 +308,7 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 	{
 	case CMD_SELF_TEST:
 	{
+		HWSTATE *hwStatsPtr = &(instPtr->sysLog.hwState);
 		sysbusRsp = malloc(sizeof(SYSBUS_UART_FRAME));
 		if (sysbusRsp == NULL) {
 			DBG_ERROR("Failed to allocate memory for SELF TEST Response!\n");
@@ -291,9 +319,18 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 		memset(sysbusRsp->data, 0x00, ST_RSP_LEN);
 		sysbusRsp->data[WD_CMD] = CMD_SELF_TEST;
 		sysbusRsp->data[WD_PRD] = MY_PRD_ID;
+		SysMonitor_GetHardwareStatus(hwStatsPtr);
+		if (linkInstPtr->isEnable == false)
+		{
+			sysbusRsp->data[WD_ST_RET] = (hwStatsPtr->isSpOk) ? ST_RET_OK : ST_RET_ERROR;
+		}
+		else
+		{
+			sysbusRsp->data[WD_ST_RET] = (hwStatsPtr->isSpOk && hwStatsPtr->isAntOk) ? ST_RET_OK : ST_RET_ERROR;
+		}
+		// apply status and omit 2 bytes of overhead.
+		memcpy(sysbusRsp->data + WD_SP_PS_VOLT, &(hwStatsPtr->spPsVolt), ST_RET_INFO_LEN);

-		// FIXME: run self-test and insert result
-		sysbusRsp->data[WD_ST_RET] = ST_RET_OK;
 		if (CircQueuePush(instPtr->txQueue, (void *)sysbusRsp) == false)
 		{
 			free(sysbusRsp);
@@ -350,44 +387,53 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 		TMC_INST *tmcRef = linkInstPtr->config.tmcInstPtr;

 		if (data[WD_MODE_CMD] == MODE_CMD_HEAD)
+		{
+			// omit unnecessary reconfiguration
+			if (L2_GetNodeType(linkInstPtr) != L2_NODE_HEAD)
 			{
 				// head node config
 				linkConfig.myType = L2_NODE_HEAD;
 				linkConfig.myId = 1;
 				Linklayer_Reconfig(linkInstPtr, &linkConfig);
 			}
-		else if (data[WD_MODE_CMD] == MODE_CMD_MEMBER) 
+		}
+
+		else if (data[WD_MODE_CMD] == MODE_CMD_MEMBER )
+		{
+			// omit unnecessary reconfiguration
+			if (L2_GetNodeType(linkInstPtr) != L2_NODE_MEMBER)
 			{
 				// member node config
 				linkConfig.myType = L2_NODE_MEMBER;
 				linkConfig.myId = 2;
 				Linklayer_Reconfig(linkInstPtr, &linkConfig);
 			}
+		}
 		else
 		{
-			// FIXME: 
+			// FIXME: to confirm
 			// Halt linklayer
 			Linklayer_Halt(linkInstPtr);
 			DBG_ERROR("Unexpected config command 0x%02X:0x%02X",
 				WD_MODE_CMD, data[WD_MODE_CMD]);
+			Status = EPARAM;
+			break;
 		}

 		if(data[WD_EN_CMD] == EN_CMD_ON_HIGH_POWER)
 		{
 			// high power config
 			Phy_AntConfigMode(phyRef, PHY_ANT_MODE_HIGH_POWER);
-			Linklayer_Start(linkInstPtr);
-
 		}
 		else if(data[WD_EN_CMD] == EN_CMD_ON_LOW_POWER)
 		{
 			// low power config
 			Phy_AntConfigMode(phyRef, PHY_ANT_MODE_LOW_POWER);
-			Linklayer_Start(linkInstPtr);
 		}
 		else
 		{
 			// silence config
+			// FIXME: confirm
 			// TODO: better approach?
 			Linklayer_Halt(linkInstPtr);
 			Phy_AntConfigMode(phyRef, PHY_ANT_MODE_SILENT);
@@ -399,27 +445,28 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 				DBG_ERROR("Physical set pull time failed, with error code: %" PRId32 ".\n", Status);
 			}
 			Phy_SetupNextSlot(phyRef, PHY_TOR_RX, L1_10KBPS_10MS_FRAME, NULL);
+			break;
 		}

-		_nop_(); // for debug
+		Linklayer_Start(linkInstPtr);
 		Status = SUCCESS;
 		break;
 	}
 	case CMD_SYS_INFO:
 	{
-		SysMonitor_UpdateSysinfoRaw(data + SYS_INFO_OFFSET);
+		SysMonitor_UpdateSysinfo((SYSINFO *)(data + SYS_INFO_OFFSET));
 		Status = SUCCESS;
 		break;
 	}
 	// TODO
 	case CMD_FLJ_SEND:
 	{
-		SysMonitor_UpdateSendPayloadFLJRaw(data + FLJ_DATA_OFFSET); // omit control info
+		SysMonitor_UpdateSendPayload(data + FLJ_DATA_OFFSET, PAYLOAD_LEN_FLJ_TX); // omit control info
 		break;
 	}
 	case CMD_LJ_SEND:
 	{
-		SysMonitor_UpdateSendPayloadLJRaw(data + LJ_DATA_OFFSET); // omit control info
+		SysMonitor_UpdateSendPayload(data + LJ_DATA_OFFSET, PAYLOAD_LEN_LJ_TX); // omit control info
 		break;
 	}
 	case CMD_FLJ_POLL:
@@ -440,7 +487,7 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 		sysbusRsp->data[WD_CMD] = CMD_FLJ_POLL;
 		sysbusRsp->data[WD_PRD] = MY_PRD_ID;
 		uint32_t dataId;
-		SysMonitor_GetRecvPayloadFLJRaw(sysbusRsp->data + FLJ_DATA_OFFSET, &dataId); // omit control info
+		SysMonitor_GetRecvPayload(sysbusRsp->data + FLJ_DATA_OFFSET, &dataId, PAYLOAD_LEN_FLJ_RX); // omit control info
 		if (dataId == DATA_ID_NONE)
 		{
 			free(sysbusRsp);
@@ -476,7 +523,7 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 		sysbusRsp->data[WD_CMD] = CMD_LJ_POLL;
 		sysbusRsp->data[WD_PRD] = MY_PRD_ID;
 		uint32_t dataId;
-		SysMonitor_GetRecvPayloadLJRaw(sysbusRsp->data + LJ_DATA_OFFSET, &dataId); // omit control info
+		SysMonitor_GetRecvPayload(sysbusRsp->data + LJ_DATA_OFFSET, &dataId, PAYLOAD_LEN_LJ_RX); // omit control info
 		if (dataId == DATA_ID_NONE)
 		{
 			free(sysbusRsp);
@@ -496,6 +543,7 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 	}
 	case CMD_FLJ_RM_TEST:
 	{
+		SYSLOG *sysLogPtr = &(instPtr->sysLog);
 		if (data[WD_FLJ_RM_TEST] != FLJ_RM_TEST_CODE)
 		{
 			DBG_WARNING("SystemBus::Invalid remote test code!\n");
@@ -514,6 +562,16 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 		sysbusRsp->data[WD_CMD] = CMD_FLJ_RM_TEST;
 		sysbusRsp->data[WD_PRD] = MY_PRD_ID;

+		TIME_WORD tmWord;
+		uint64_t time;
+		TimeCtrl_GetCurrentTime(linkInstPtr->config.tmcInstPtr, &tmWord);
+		time = tmWord.int_part * TIME_FRAC_MAX + tmWord.frac_part;
+		memcpy(sysbusRsp->data + WD_FLJ_TIME_STAMP, &time, WD_FLJ_TIME_STAMP_LEN);
+		SysMonitor_GetSyslog(sysLogPtr);
+		memcpy(sysbusRsp->data + WD_FLJ_LINK_LOG, &(sysLogPtr->linkLog), WD_FLJ_LINK_LOG_LEN);
+		memcpy(sysbusRsp->data + WD_FLJ_PHY_LOG, &(sysLogPtr->phyLog), WD_FLJ_PHY_LOG_LEN);
+		memcpy(sysbusRsp->data + WD_FLJ_HARDWARE_ST, &(sysLogPtr->hwState.spPsVolt), WD_FLJ_HARDWARE_ST_LEN);
+
 		if (CircQueuePush(instPtr->txQueue, (void *)sysbusRsp) == false){
 			free(sysbusRsp);
 			DBG_WARNING("SystemBus::TX Queue overflowed!\n");
@@ -525,6 +583,7 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 	}
 	case CMD_LJ_RM_TEST:
 	{
+		SYSLOG *sysLogPtr = &(instPtr->sysLog);
 		if (data[WD_LJ_RM_TEST] != LJ_RM_TEST_CODE)
 		{
 			DBG_WARNING("SystemBus::Invalid remote test code!\n");
@@ -543,6 +602,16 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 		sysbusRsp->data[WD_CMD] = CMD_LJ_RM_TEST;
 		sysbusRsp->data[WD_PRD] = MY_PRD_ID;

+		TIME_WORD tmWord;
+		uint64_t time;
+		TimeCtrl_GetCurrentTime(linkInstPtr->config.tmcInstPtr, &tmWord);
+		time = tmWord.int_part * TIME_FRAC_MAX + tmWord.frac_part;
+		memcpy(sysbusRsp->data + WD_LJ_TIME_STAMP, &time, WD_LJ_TIME_STAMP_LEN);
+		SysMonitor_GetSyslog(sysLogPtr);
+		memcpy(sysbusRsp->data + WD_LJ_LINK_LOG, &(sysLogPtr->linkLog), WD_LJ_LINK_LOG_LEN);
+		memcpy(sysbusRsp->data + WD_LJ_PHY_LOG, &(sysLogPtr->phyLog), WD_LJ_PHY_LOG_LEN);
+		memcpy(sysbusRsp->data + WD_LJ_HARDWARE_ST, &(sysLogPtr->hwState.spPsVolt), WD_LJ_HARDWARE_ST_LEN);
+
 		if (CircQueuePush(instPtr->txQueue, (void *)sysbusRsp) == false){
 			free(sysbusRsp);
 			DBG_WARNING("SystemBus::TX Queue overflowed!\n");
@@ -562,18 +631,6 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr)
 	return Status;
 }

-int32_t SystemBus_FLJ_PeriodUpdate(SYSBUS *instPtr)
-{
-	// TODO
-	return SUCCESS;
-}
-
-int32_t SystemBus_LJ_PeriodUpdate(SYSBUS *instPtr)
-{
-	// TODO
-	return SUCCESS;
-}
-
 /*****************************************************************************/
 /**
 * @brief   This function send a repose frame from system bus tx queue.
@@ -17,10 +17,11 @@
 #define __SYSTEMBUS_H_

 /***************************** Include Files *********************************/
-#include "systembus_uart.h" // SystemBus UART driver
-#include "circ_queue.h"
 #include <stdint.h>
 #include <stdbool.h>
+#include "systembus_uart.h" // SystemBus UART driver
+#include "circ_queue.h"
+#include "../system_monitor.h"

 /************************** Constant Definitions *****************************/
 /************************** Data Type Definitions ****************************/
@@ -35,6 +36,7 @@ typedef struct
 typedef struct
 {
    SYSBUS_CONFIG config;
+    SYSLOG sysLog;
    SYSBUS_UART *uartInst;
    CIRC_QUEUE *txQueue;
    CIRC_QUEUE *rxQueue;
@@ -47,10 +49,6 @@ typedef struct
 int32_t SystemBus_Init(SYSBUS **instPtr, SYSBUS_CONFIG *config);

 int32_t SystemBus_HandleCmd(SYSBUS *instPtr);
-
-int32_t SystemBus_FLJ_PeriodUpdate(SYSBUS *instPtr);
-int32_t SystemBus_LJ_PeriodUpdate(SYSBUS *instPtr);
-
 int32_t SystemBus_MakeResp(SYSBUS *instPtr);

 int32_t SystemBus_TxIntrHandler(SYSBUS *instPtr);
@@ -56,7 +56,6 @@ clist_new(void)

 void clist_clear(clist_t *self)
 {
-  uint32_t len = self->len;
  clist_node_t *next;
  clist_node_t *curr = self->head;
Author	SHA1	Message	Date
Gatsby Van	2c45d1e5b8	add missing remote test	2024-02-01 17:09:59 +08:00
Gatsby Van	9412f65c3c	*bugfix: correct memcpy offset	2024-02-01 17:09:37 +08:00
Gatsby Van	c0ebef41ee	*bugfix: correct type definition	2024-02-01 17:08:51 +08:00
Gatsby Van	a2c6ff83f7	missing semicolon	2024-02-01 15:12:34 +08:00
Gatsby Van	73b8ee8bc5	*bugfix: correct antenna status code	2024-02-01 15:09:26 +08:00
Gatsby Van	d8fbdfb8e6	*bugfix: add missing hardware status fetching	2024-02-01 15:07:48 +08:00
Gatsby Van	ff87644416	trim trailing white spaces	2024-02-01 15:05:53 +08:00
Gatsby Van	adcf7200bc	*add new routine mode	2024-02-01 15:05:14 +08:00
Gatsby Van	f71ce6bd94	add remote test response	2024-02-01 14:57:13 +08:00
Gatsby Van	c8b0ca74a3	adapted to new system monitor api	2024-02-01 14:56:58 +08:00
Gatsby Van	1a413e4d06	adapted to new system monitor api	2024-02-01 14:56:28 +08:00
Gatsby Van	b7a337f821	update hardware status refresh api	2024-02-01 14:55:16 +08:00
Gatsby Van	38b7f6b985	omit unused code	2024-02-01 14:54:43 +08:00
Gatsby Van	4457eb8bc1	*packed log structs	2024-02-01 14:54:13 +08:00
Gatsby Van	0248c185e4	change hardware status refresh api	2024-02-01 14:53:26 +08:00
Gatsby Van	e81be59bbb	omit unnecessary reconfiguration	2024-02-01 13:45:03 +08:00
Gatsby Van	d0aad73ce5	*bugfix: correct register address	2024-02-01 13:42:26 +08:00
Gatsby Van	c384bf9e9d	*bugfix: correct frequency estimation calculating process	2024-02-01 13:42:02 +08:00
Gatsby Van	752e9b3081	*add hardware status check	2024-02-01 13:41:17 +08:00
Gatsby Van	81fdd612ce	*bugfix: correct physical logging	2024-02-01 13:38:38 +08:00
Gatsby Van	ad3a6be9b1	add voltage validation check	2024-02-01 13:37:41 +08:00
Gatsby Van	6a680a1291	update voltage scale	2024-02-01 13:37:27 +08:00
Gatsby Van	1f98662ee8	implement api	2024-01-31 20:22:07 +08:00
Gatsby Van	73f236bbd3	*bugfix: correct register define	2024-01-31 20:13:23 +08:00
Gatsby Van	223a772582	add register status code	2024-01-31 20:10:15 +08:00
Gatsby Van	3a99da8b76	*bugfix: name error	2024-01-31 20:09:48 +08:00
Gatsby Van	d9ce3ae207	omit redundant code	2024-01-31 20:09:32 +08:00
Gatsby Van	29d5ec32cb	fix warnings	2024-01-31 20:09:14 +08:00
Gatsby Van	45080efd34	service FSM add bit error rate and packet loss rate log	2024-01-31 20:08:52 +08:00
Gatsby Van	b5acfcf827	add emulation option	2024-01-31 20:07:52 +08:00
Gatsby Van	bf2a199f79	update config check	2024-01-31 20:07:30 +08:00
Gatsby Van	15e0fc2e39	*add physical logging	2024-01-31 19:49:30 +08:00
Gatsby Van	bd51428bca	*new time sync api implementation	2024-01-31 19:48:58 +08:00
Gatsby Van	d15dd7ece5	*adapted to new time sync api	2024-01-31 19:47:29 +08:00
Gatsby Van	e308a61abc	*add service data logging	2024-01-31 19:47:11 +08:00
Gatsby Van	b9e055c039	naming enhance	2024-01-31 19:46:45 +08:00
Gatsby Van	2700e7442e	add new physical status registers	2024-01-31 19:46:16 +08:00
Gatsby Van	653483a68e	adapted to new time sync api	2024-01-31 19:45:22 +08:00
Gatsby Van	d310647fa6	*rewrite linklayer logging	2024-01-31 19:44:20 +08:00
Gatsby Van	d2eee6548f	redesign linklayer logging	2024-01-31 19:43:59 +08:00
Gatsby Van	28a2767efc	*update time sync api	2024-01-31 19:43:29 +08:00
Gatsby Van	3dbf893347	redesign logging process	2024-01-31 19:42:25 +08:00
Gatsby Van	070face8d3	redesign logging api	2024-01-31 19:41:25 +08:00
Gatsby Van	bfa0d40996	omit unused code	2024-01-31 19:41:06 +08:00
Gatsby Van	9fcfcce584	update logging content	2024-01-31 19:40:39 +08:00
Gatsby Van	f8dec485c5	miscellaneous update	2024-01-31 16:41:28 +08:00
Gatsby Van	b27bc16ab0	fix typo	2024-01-31 16:10:16 +08:00
Gatsby Van	99e564476b	miscellaneous update	2024-01-31 16:08:27 +08:00
Gatsby Van	4d5a4ec0da	adapted to new hardware status refresh api	2024-01-31 16:08:16 +08:00
Gatsby Van	2f63058882	omit redundant api	2024-01-31 16:07:41 +08:00
Gatsby Van	413c984e85	*update self test response (add full hardware status info)	2024-01-31 16:07:12 +08:00
Gatsby Van	448895866a	new hardware status refresh api	2024-01-31 16:06:31 +08:00
Gatsby Van	aba91e02b0	*update hardware status content.	2024-01-31 16:05:59 +08:00
Gatsby Van	56d0fd80d0	*safer api	2024-01-31 16:05:09 +08:00
Gatsby Van	6acd4b1ca0	*update hardware status logging content	2024-01-31 16:04:09 +08:00
Gatsby Van	f4175cd7b5	code simplify	2024-01-31 10:18:40 +08:00
Gatsby Van	678bb7f393	update error handling	2024-01-31 10:18:14 +08:00
Gatsby Van	085e5cea93	*bugfix: avoid unnecessary reconfiguration	2024-01-31 10:17:43 +08:00
Gatsby Van	3916b18a6f	remove blank line	2024-01-31 10:10:24 +08:00
Gatsby Van	74d20c1010	omit redundant code	2024-01-31 10:10:05 +08:00
Gatsby Van	25d89b30a1	omit redundant code	2024-01-31 10:06:32 +08:00
Gatsby Van	632b1ec636	*update system_monitor api (simplified)	2024-01-31 10:05:43 +08:00