omit redundant code

datalink814_ge/src/linklayer/linklayer814.c

@@ -39,7 +39,6 @@ static void L2_SetSlotNum(L2_INST *instPtr, uint32_t newSlotNum);
 static void L2_SetFrameNum(L2_INST *instPtr, uint32_t newFrameNum);
 static void L2_UpdateSlotNum(L2_INST *instPtr);
 static void L2_DataAvailUpdate(L2_INST *instPtr, bool status);
-static L2_FRAME_TYPE L2_GetReceiveFrameType(L2_INST *instPtr);
 
 /**
  * @brief	helper function to update linkelayer state
@@ -305,7 +304,7 @@ inline void L2_RcdShift(L2_RCD *rcd, int32_t netxVal)
  * @return  L2_FRAME_TYPE.
  *
  ******************************************************************************/
-static L2_FRAME_TYPE L2_GetReceiveFrameType(L2_INST *instPtr)
+L2_FRAME_TYPE L2_GetLastOptFrameType(L2_INST *instPtr)
 {
 	if (instPtr->myInfo.nodeType == L2_NODE_HEAD || L2_isCxn2Net(instPtr))
 	{
@@ -351,7 +350,7 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
 	instPtr->log.frameRecv++;
 
 	// Update frame state.
-	switch (L2_GetReceiveFrameType(instPtr))
+	switch (L2_GetLastOptFrameType(instPtr))
 	{
 	case L2_INTRA_SCAN_FRAME:
 	// INTRA_BM_FRAME could be received if current frame type is INTRA_BM_FRAME
@@ -1228,15 +1227,6 @@ static int32_t Linklayer_Routine(L2_INST *instPtr)
 	int32_t Status;
 	uint32_t tableIndx, entryIndx;
 
-	// FIXME: Consider time wrapping.
-	uint32_t nextTimeUnit = (TimeCtrl_GetIntCnt(instPtr->config.tmcInstPtr) + 1) / L2_SLOTS_PER_FRAME;
-	if (nextTimeUnit < instPtr->netStartTime)
-	{
-		DBG_WARNING("Linklayer not start yet, next time unit: %u, start time unit: %u.\n",
-					nextTimeUnit, instPtr->netStartTime);
-		return EIGNORE;
-	}
-
 	// Determine which routine entry is going to be performed.
 	tableIndx = L2_GetNextFrameNum(instPtr) % instPtr->rtneConfig.rtnePrd;
 	entryIndx = L2_GetNextSlotNum(instPtr);
@@ -1318,6 +1308,15 @@ int32_t Linklayer_Proc(L2_INST *instPtr)
 		return SUCCESS;
 	}
 
+	// FIXME: Consider time wrapping.
+	uint32_t nextTimeUnit = (TimeCtrl_GetIntCnt(instPtr->config.tmcInstPtr) + 1) / L2_SLOTS_PER_FRAME;
+	if (nextTimeUnit < instPtr->netStartTime)
+	{
+		DBG_WARNING("Linklayer not start yet, next time unit: %u, start time unit: %u.\n",
+					nextTimeUnit, instPtr->netStartTime);
+		return EIGNORE;
+	}
+
 	// Update slot number.
 	L2_UpdateSlotNum(instPtr);
 
@@ -1330,9 +1329,9 @@ int32_t Linklayer_Proc(L2_INST *instPtr)
 	// Handle frame received in last slot.
 	if (L2_isDataAvail(instPtr) == true)
 	{
-		if (Linklayer_PktHandler(instPtr, L2_GetLastFrameType(instPtr)) != SUCCESS)
+		if (Linklayer_PktHandler(instPtr, L2_GetLastOptFrameType(instPtr)) != SUCCESS)
 		{
-			DBG_ERROR("Failed to handle last received frame: %ld.\n", instPtr->frame.last);
+			DBG_ERROR("Failed to handle last received frame: %d.\n", instPtr->frame.last);
 		}
 	}
 

datalink814_ge/src/linklayer/linklayer814.h

@@ -152,7 +152,7 @@ int32_t L2_RescheduleEventAfter(L2_INST *instPtr, L2_SCHD_EVENT *schdEvent, uint
 
 // Framing
 void L2_FrameStateUpdate(L2_INST *instPtr);
-L2_FRAME_TYPE L2_GetLastRcvFrameType(L2_INST *instPtr);
+L2_FRAME_TYPE L2_GetLastOptFrameType(L2_INST *instPtr);
 L1_FRAME_TYPE L2_L2frame2L1frame(L2_FRAME_TYPE l2Frame);
 void FrameGetChunk(BIT_ARRAY *bitarr, uint32_t offset, uint32_t numBit, uint64_t *chunk);
 void FrameInsertChunk(BIT_ARRAY *bitarr, uint32_t offset, uint32_t numBit, uint64_t chunck);

datalink814_ge/src/linklayer/net_mgmt.c

@@ -641,7 +641,7 @@ int32_t L2_Mgmt_PktHandler(L2_INST *instPtr)
 		DBG_INFO("Failed to start handling process...\n");
 		return EALLOC;
 	}
-	switch (L2_GetLastFrameType(instPtr))
+	switch (L2_GetLastOptFrameType(instPtr))
 	{
 	case L2_INTER_MGMT_FRAME:
 	case L2_INTRA_MGMT_FRAME:

datalink814_ge/src/linklayer/net_scan.c

@@ -625,7 +625,7 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr)
 		DBG_INFO("Failed to start handling process...\n");
 		return EALLOC;
 	}
-	switch (L2_GetLastFrameType(instPtr))
+	switch (L2_GetLastOptFrameType(instPtr))
 	{
 	case L2_INTER_SCAN_FRAME:
 	case L2_INTRA_SCAN_FRAME:

datalink814_ge/src/linklayer/rtt.c

@@ -224,7 +224,7 @@ int32_t RTT_FsmUpdate(L2_INST *instPtr, L2_TOR_TYPE torType)
 					DBG_INFO("Preparing data for RTT REQ-2.\n");
 					rttFsmPtr->isR2Valid = true;
 					// Update doppler
-					rttRecord->dopplerR2 = (int32_t)Phy_GetCoarseFreqEst(phyRef);
+					rttRecord->dopplerR2 = (int32_t)Phy_GetFreqEst(phyRef);
 					// Update Tr2
 					RTT_GetFrameStart(instPtr, &(rttRecord->Tr2), torType);
 					// Calculate TroundA
@@ -292,7 +292,7 @@ int32_t RTT_FsmUpdate(L2_INST *instPtr, L2_TOR_TYPE torType)
 					DBG_INFO("RTT RSP-2 have been received.\n");
 					rttFsmPtr->isR4Valid = true;
 					// Update doppler
-					double doppler = Phy_GetCoarseFreqEst(phyRef);
+					double doppler = Phy_GetFreqEst(phyRef);
 					rttRecord->dopplerR2 = (int32_t)doppler;
 					// Update Tr4
 					RTT_GetFrameStart(instPtr, &(rttRecord->Tr4), torType);
@@ -340,7 +340,7 @@ int32_t RTT_FsmUpdate(L2_INST *instPtr, L2_TOR_TYPE torType)
 					DBG_INFO("Preparing data for RTT RSP-1.\n");
 					rttFsmPtr->isR2Valid = true;
 					// Update doppler
-					rttRecord->dopplerR2 = (int32_t)Phy_GetCoarseFreqEst(phyRef);
+					rttRecord->dopplerR2 = (int32_t)Phy_GetFreqEst(phyRef);
 					// Update Tr1
 					RTT_GetFrameStart(instPtr, &(rttRecord->Tr1), torType);
 				}
@@ -403,7 +403,7 @@ int32_t RTT_FsmUpdate(L2_INST *instPtr, L2_TOR_TYPE torType)
 					DBG_INFO("Preparing data for RTT RSP-2.\n");
 					rttFsmPtr->isR3Valid = true;
 					// Update doppler
-					rttRecord->dopplerR2 = (int32_t)Phy_GetCoarseFreqEst(phyRef);
+					rttRecord->dopplerR2 = (int32_t)Phy_GetFreqEst(phyRef);
 					// Update Tr3
 					RTT_GetFrameStart(instPtr, &(rttRecord->Tr3), torType);
 					// Calculate TroundB

datalink814_ge/src/linklayer/time_sync.c

@@ -51,9 +51,11 @@ int32_t L2_TimeAlign(L2_INST *instPtr, uint32_t frameNum, uint32_t slotNum, bool
 	lastRecvdFrame = Phy_GetLastRecvFrameType(instPtr->config.phyInstPtr);
 	if (lastRecvdFrame == L1_NONE_FRAME)
 	{
+		DBG_ERROR("Invalid TimeAlign operation, no frame was received.");
 		return EIGNORE;
 	}
 
+	DBG_INFO("Starting TimeAlign operation...\n");
 	// read nextSendTime from physical layer
 	uint64_t currTime, expctTime;
 	int64_t timeDiff;

datalink814_ge/src/main.c

@@ -223,7 +223,7 @@ void MPC_IntrHandler(void *callBackRef)
 void PhysicalIntr_Handler(void *callBackRef)
 {
 	Phy_UpdateState(phyInstPtr);
-	if (phyInstPtr->TOR.curr == PHY_TOR_TX)
+	if (phyInstPtr->tor.curr == PHY_TOR_TX)
 	{
 		switch (phyInstPtr->frameType.curr)
 		{
@@ -255,7 +255,7 @@ void PhysicalIntr_Handler(void *callBackRef)
 			break;
 		}
 	}
-	if (phyInstPtr->TOR.last == PHY_TOR_RX && phyInstPtr->isFrameSync)
+	if (phyInstPtr->tor.last == PHY_TOR_RX && phyInstPtr->isFrameSync)
 	{
 		switch (phyInstPtr->frameType.last)
 		{

datalink814_ge/src/phy_ctrl/phy_ctrl.c

@@ -32,6 +32,27 @@
 #endif
 
 /************************** Constant Definitions *****************************/
+#define L1_FRAME_LEN_MAX (8192 / 8)			// byte
+#define L1_FRAME_2KBPS_20MS_LEN 0			// byte
+#define L1_FRAME_2KBPS_100MS_LEN (312 / 8)	// byte
+#define L1_FRAME_10KBPS_10MS_LEN 0			// byte
+#define L1_FRAME_10KBPS_20MS_LEN (232 / 8)	// byte
+#define L1_FRAME_40KBPS_20MS_LEN (2152 / 8) // byte
+#define L1_FRAME_40KBPS_10MS_LEN (712 / 8)	// byte
+#define L1_FRAME_200KBPS_5MS_LEN (2040 / 8) // byte
+#define L1_FRAME_1M2BPS_5MS_LEN (8176 / 8)	// byte
+
+#define L1_FRAME_2KBPS_20MS_COMP 1841158  // *10ns(Timer_L)
+#define L1_FRAME_2KBPS_100MS_COMP 1841158 // *10ns(Timer_L)
+#define L1_FRAME_10KBPS_10MS_COMP 850950  // *10ns(Timer_L)
+#define L1_FRAME_10KBPS_20MS_COMP 850950  // *10ns(Timer_L)
+#define L1_FRAME_40KBPS_20MS_COMP 111485  // *10ns(Timer_L)
+#define L1_FRAME_40KBPS_10MS_COMP 111485  // *10ns(Timer_L)
+#define L1_FRAME_200KBPS_5MS_COMP 22493	  // *10ns(Timer_L)
+#define L1_FRAME_1M2BPS_5MS_COMP 22493	  // *10ns(Timer_L)
+
+#define L1_ANTCONFIG_MAX_LEN 8192
+
 /***************** Macros (Inline Functions) Definitions *********************/
 /************************** Function Prototypes ******************************/
 static void Phy_RcdShift(PHY_RCD *rcd, int32_t netxVal);
@@ -156,11 +177,27 @@ inline L1_FRAME_TYPE Phy_GetLastRecvFrameType(PHY_INST *instPtr)
 	{
 		return L1_NONE_FRAME;
 	}
-	int32_t frame_type = (PhyRead(instPtr, PHY_MODE_CTRL) & PHY_MODE_CTRL_FRAME_MASK) >> PHY_MODE_CTRL_FRAME_SHIFT;
-	if (frame_type < L1_1M2BPS_5MS_FRAME)
-		return frame_type;
-	else
+	int32_t frame_type = (PhyRead(instPtr, COASE_FREQEST) & COASE_TYPE_MASK);
+	switch (frame_type) {
+		case COASE_TYPE_2KBPS_20MS:
+		return L1_2KBPS_20MS_FRAME;
+		case COASE_TYPE_2KBPS_100MS:
+		return L1_2KBPS_100MS_FRAME;
+		case COASE_TYPE_10KBPS_10MS:
+		return L1_10KBPS_10MS_FRAME;
+		case COASE_TYPE_10KBPS_20MS:
+		return L1_10KBPS_20MS_FRAME;
+		case COASE_TYPE_40KBPS_20MS:
+		return L1_40KBPS_20MS_FRAME;
+		case COASE_TYPE_40KBPS_10MS:
+		return L1_40KBPS_10MS_FRAME;
+		case COASE_TYPE_200KBPS_5MS:
+		return L1_200KBPS_5MS_FRAME;
+		case COASE_TYPE_1M2BPS_5MS:
+		return L1_1M2BPS_5MS_FRAME;
+		default:
 		return L1_NONE_FRAME;
+	}
 }
 
 /*****************************************************************************/
@@ -175,7 +212,7 @@ inline L1_FRAME_TYPE Phy_GetLastRecvFrameType(PHY_INST *instPtr)
 inline L1_FRAME_TYPE Phy_GetLastSendFrameType(PHY_INST *instPtr)
 {
 	ASSERT(instPtr != NULL);
-	if (instPtr->TOR.last != PHY_TOR_TX)
+	if (instPtr->tor.last != PHY_TOR_TX)
 	{
 		return L1_NONE_FRAME;
 	}
@@ -308,7 +345,7 @@ int32_t Phy_InstInit(PHY_INST **instPtr, PHY_CONFIG *phyConfig)
 	(*instPtr)->sendDataOffset = 0;
 	Phy_AntConfigInit(&((*instPtr)->antConfig));
 
-	memset(&((*instPtr))->TOR, PHY_TOR_SUSPEND, sizeof(PHY_RCD));
+	memset(&((*instPtr))->tor, PHY_TOR_SUSPEND, sizeof(PHY_RCD));
 	memset(&((*instPtr)->frameType), L1_NONE_FRAME, sizeof(PHY_RCD));
 	memset(&((*instPtr)->antNo), (int32_t)L1_INIT_BEAM_NO, sizeof(PHY_RCD));
 	memset(&((*instPtr)->beamNo), (int32_t)L1_INIT_ANT_NO, sizeof(PHY_RCD));
@@ -539,9 +576,6 @@ int32_t Phy_SetupNextSlot(PHY_INST *instPtr, PHY_TOR_TYPE txrxMode,
 	instPtr->antConfigOffset = (L1_ANTCONFIG_MAX_LEN >> 1) - instPtr->antConfigOffset;
 	uint32_t antConfigAddr = instPtr->antConfigAddr + instPtr->antConfigOffset;
 
-	instPtr->TOR.next = txrxMode;
-	instPtr->frameType.next = frameType;
-
 	switch (txrxMode)
 	{
 	case PHY_TOR_SUSPEND:
@@ -643,7 +677,7 @@ int32_t Phy_SetupNextSlot(PHY_INST *instPtr, PHY_TOR_TYPE txrxMode,
 	// Indicate physical layer that all the configurations were done. 
 	PhyWrite(instPtr, SLOT_CMD, SLOT_CMD_KEY); 
 
-	Phy_RcdShift(&(instPtr->TOR), txrxMode);
+	Phy_RcdShift(&(instPtr->tor), txrxMode);
 	Phy_RcdShift(&(instPtr->frameType), frameType);
 	// TODO:
 	Phy_RcdShift(&(instPtr->antNo), L1_INIT_ANT_NO);
@@ -723,6 +757,59 @@ uint32_t Phy_GetTimeComp(L1_FRAME_TYPE frameType)
 	}
 }
 
+/*****************************************************************************/
+/**
+ * @brief   Get frequency estimation of last valid frame.
+ *
+ * @param   instPtr  a pointer to physical instance
+ *
+ * @return  frequency estimation
+ *
+ ******************************************************************************/
+double Phy_GetFreqEst(PHY_INST *instPtr)
+{
+	ASSERT(instPtr != NULL);
+	uint32_t coarseReg, fineReg, estAbs;
+	uint8_t acqFreqIdx;
+	int8_t syncFreqIdx;
+	L1_FRAME_TYPE frameType;
+	double coarse, fine;
+
+	
+	frameType = Phy_GetLastRecvFrameType(instPtr);
+	if (frameType > L1_1M2BPS_5MS_FRAME || frameType <= L1_NONE_FRAME)
+	{
+		return INFINITY; // FIXME
+	}
+
+	coarseReg = PhyRead(instPtr, COASE_FREQEST);
+	acqFreqIdx = (coarseReg & COASE_FREQEST_ACQ_MASK) >> COASE_FREQEST_ACQ_SHIFT;
+	syncFreqIdx = (coarseReg & COASE_FREQEST_SYNC_MASK) >> COASE_FREQEST_SYNC_SHIFT;
+	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);
+		coarse += (double)syncFreqIdx * 12e6 / 64 / 128;
+
+		fine = 48e6/2048*((double)estAbs)/8192.0;
+	}
+
+	fine = ((fineReg & FINE_FREQEST_SIGN_MASK) == FINE_FREQEST_SIGN_NEG) ? 
+			-fine : fine;
+	
+	return (coarse + fine);
+}
+
 /*****************************************************************************/
 /**
  * @brief   Get coarse frequency estimation of last valid frame.
@@ -742,7 +829,7 @@ double Phy_GetCoarseFreqEst(PHY_INST *instPtr)
 	double freqEst;
 
 	frameType = Phy_GetLastRecvFrameType(instPtr);
-	if (frameType > L1_1M2BPS_5MS_FRAME || frameType == L1_NONE_FRAME)
+	if (frameType > L1_1M2BPS_5MS_FRAME || frameType <= L1_NONE_FRAME)
 	{
 		return INFINITY; // FIXME
 	}
@@ -776,8 +863,30 @@ double Phy_GetCoarseFreqEst(PHY_INST *instPtr)
  ******************************************************************************/
 double Phy_GetFineFreqEst(PHY_INST *instPtr)
 {
-	// TODO:
-	return 0.0;
+	uint32_t regValue, estAbs;
+	double freqEst;
+	L1_FRAME_TYPE frameType;
+	frameType = Phy_GetLastRecvFrameType(instPtr);
+	if (frameType > L1_1M2BPS_5MS_FRAME || frameType <= L1_NONE_FRAME)
+	{
+		return INFINITY; // FIXME
+	}
+
+	regValue = PhyRead(instPtr, FINE_FREQEST);
+	estAbs = regValue & FINE_FREQEST_VAL_MASK;
+	if (frameType >= L1_200KBPS_5MS_FRAME)
+	{
+		// 1.5M Rc
+		freqEst = 12e6/2048*((double)estAbs)/8192.0;
+	}
+	else
+	{
+		// 12M Rc
+		freqEst = 48e6/2048*((double)estAbs)/8192.0;
+	}
+	freqEst = ((regValue & FINE_FREQEST_SIGN_MASK) == FINE_FREQEST_SIGN_NEG) ? 
+			-freqEst : freqEst;
+	return freqEst;
 }
 
 /*****************************************************************************/
@@ -817,7 +926,7 @@ int32_t Phy_SetHopPattern(void *patternBuff, uint32_t patternLen)
 int32_t Phy_SetTimeWord(PHY_INST *instPtr, const TIME_WORD *tmWord, PHY_TIME_WORD_TYPE tmType)
 {
 	ASSERT(instPtr != NULL);
-	if (tmWord->frac_part >= PHY_TIME_WORD_L_MAX)
+	if (tmWord->frac_part >= TIME_FRAC_MAX)
 	{
 		return EPARAM;
 	}

datalink814_ge/src/phy_ctrl/phy_ctrl.h

@@ -28,16 +28,16 @@
 #include "../common.h"
 #include "../time_ctrl/time_ctrl.h"
 /************************** Constant Definitions *****************************/
-#define L1_TMWORD_FRAC_MAX 500000
-#define L1_ANTCONFIG_MAX_LEN 8192
-#define L1_TXRXDATA_MAX_LEN 2048
 #define L1_NUM_ANT_SUBNRRW_PATTERN 37
 #define L1_NUM_ANT_NRRW_PATTERN 61
 #define L1_INIT_BEAM_NO 0
 #define L1_INIT_ANT_WD PHY_ANT_BEAM_120
 #define L1_INIT_ANT_NO 0
 
+#define L1_FRAME_NONE_LEN UINT32_MAX		// byte
+#define L1_FRAME_NONE_COMP UINT32_MAX	  // *10ns(Timer_L)
 #define L1_FRAME_NONE_HOPS UINT32_MAX
+#define L1_TXRXDATA_MAX_LEN 2048
 #define L1_FRAME_MAX_HOPS 81
 #define L1_FRAME_2KBPS_20MS_HOPS 1
 #define L1_FRAME_2KBPS_100MS_HOPS 81
@@ -48,30 +48,6 @@
 #define L1_FRAME_200KBPS_5MS_HOPS 20
 #define L1_FRAME_1M2BPS_5MS_HOPS 20
 
-#define L1_FRAME_NONE_LEN UINT32_MAX		// byte
-#define L1_FRAME_LEN_MAX (8192 / 8)			// byte
-#define L1_FRAME_2KBPS_20MS_LEN 0			// byte
-#define L1_FRAME_2KBPS_100MS_LEN 312 / 8	// byte
-#define L1_FRAME_10KBPS_10MS_LEN 0			// byte
-#define L1_FRAME_10KBPS_20MS_LEN (232 / 8)	// byte
-#define L1_FRAME_40KBPS_20MS_LEN (2152 / 8) // byte
-#define L1_FRAME_40KBPS_10MS_LEN (712 / 8)	// byte
-#define L1_FRAME_200KBPS_5MS_LEN (2040 / 8) // byte
-#define L1_FRAME_1M2BPS_5MS_LEN (8176 / 8)	// byte
-
-#define L1_FRAME_NONE_COMP UINT32_MAX	  // *10ns(Timer_L)
-#define L1_FRAME_2KBPS_20MS_COMP 1841158  // *10ns(Timer_L)
-#define L1_FRAME_2KBPS_100MS_COMP 1841158 // *10ns(Timer_L)
-#define L1_FRAME_10KBPS_10MS_COMP 850950  // *10ns(Timer_L)
-#define L1_FRAME_10KBPS_20MS_COMP 850950  // *10ns(Timer_L)
-#define L1_FRAME_40KBPS_20MS_COMP 110667  // *10ns(Timer_L)
-#define L1_FRAME_40KBPS_10MS_COMP 110667  // *10ns(Timer_L)
-#define L1_FRAME_200KBPS_5MS_COMP 22493	  // *10ns(Timer_L)
-#define L1_FRAME_1M2BPS_5MS_COMP 22493	  // *10ns(Timer_L)
-
-#define PHY_TIME_WORD_H_MAX UINT32_MAX
-#define PHY_TIME_WORD_L_MAX 0x0007A120 // 5ms/10ns
-
 /***************** Macros (Inline Functions) Definitions *********************/
 
 /**************************** Type Definitions *******************************/
@@ -221,7 +197,7 @@ typedef struct
 	PHY_RCD antNo;			  // antenna number record
 	PHY_RCD beamNo;			  // beam number record
 	PHY_RCD beamWd;			  // beam width record
-	PHY_RCD TOR;			  // tx rx state record
+	PHY_RCD tor;			  // tx rx state record
 	PHY_RCD frameType;		  // frame type record
 	uint32_t sendDataOffset;  // antenna configuration bram offset (to implement ping-pong data flow)
 	uint32_t antConfigOffset; // antenna configuration bram offset (to implement ping-pong data flow)
@@ -275,7 +251,9 @@ int32_t Phy_SetBeamNo(PHY_INST *instPtr, int32_t beamNo);
 int32_t Phy_SetBeamAngle(PHY_INST *phyInstPtr, double offAx, double rndAx);
 int32_t Phy_SetTimeWord(PHY_INST *instPtr, const TIME_WORD *tmWord, PHY_TIME_WORD_TYPE tmType);
 
+double Phy_GetFreqEst(PHY_INST *instPtr);
 double Phy_GetCoarseFreqEst(PHY_INST *instPtr);
+double Phy_GetFineFreqEst(PHY_INST *instPtr);
 void Phy_GetFrameSyncTimeStamp(PHY_INST *instPtr, TIME_WORD *frameSyncT);
 void Phy_GetLastReceivedFrameSyncTimeStamp(PHY_INST *instPtr, TIME_WORD *frameSyncT);
 void Phy_GetSlotStartTimeStamp(PHY_INST *instPtr, TIME_WORD *slotStart);

datalink814_ge/src/phy_ctrl/phy_reg.h

@@ -228,15 +228,31 @@
 #define COASE_FREQEST_ACQ_MASK 0x000000FFU
 #define COASE_FREQEST_SYNC_SHIFT 8
 #define COASE_FREQEST_SYNC_WIDTH 8
-#define COASE_FREQEST_SYNC_MASK 0x000FF00U
+#define COASE_FREQEST_SYNC_MASK 0x0000FF00U
+#define COASE_TYPE_SHIFT 16
+#define COASE_TYPE_WIDTH 8
+#define COASE_TYPE_MASK 0x00FF0000U
+#define COASE_TYPE_2KBPS_20MS  0x00010000U
+#define COASE_TYPE_2KBPS_100MS 0x00020000U
+#define COASE_TYPE_10KBPS_10MS 0x00030000U
+#define COASE_TYPE_10KBPS_20MS 0x00040000U
+#define COASE_TYPE_40KBPS_20MS 0x00050000U
+#define COASE_TYPE_40KBPS_10MS 0x00060000U
+#define COASE_TYPE_200KBPS_5MS 0x00070000U
+#define COASE_TYPE_1M2BPS_5MS  0x00080000U
 
 /**
  * Register: FINE_FREQEST
  */
 #define FINE_FREQEST 0x00000040U
-#define FINE_FREQEST_SHIFT 0
-#define FINE_FREQEST_WIDTH 32
-#define FINE_FREQEST_MASK 0xFFFFFFFFU
+#define FINE_FREQEST_VAL_SHIFT 0
+#define FINE_FREQEST_VAL_WIDTH 24
+#define FINE_FREQEST_VAL_MASK 0x00FFFFFFU
+#define FINE_FREQEST_SIGN_SHIFT 24
+#define FINE_FREQEST_SIGN_WIDTH 8
+#define FINE_FREQEST_SIGN_MASK 0xFF000000U
+#define FINE_FREQEST_SIGN_POS 0x00000000U
+#define FINE_FREQEST_SIGN_NEG 0x01000000U
 
 /**
  * Register: BEAM_SELECT

datalink814_ge/src/util/clist.c

@@ -56,19 +56,19 @@ clist_new(void)
 
 void clist_clear(clist_t *self)
 {
-  uint32_t len = self->len;
   clist_node_t *next;
   clist_node_t *curr = self->head;
 
-  while (len)
+  while (curr != NULL)
   {
     next = curr->next;
     if (self->free)
       self->free(curr->val);
     LIST_FREE(curr);
     curr = next;
-    len--;
   }
+  self->len = 0;
+  self->head = NULL;
 }
 
 /*

datalink814_sp/src/inter_comm/inter_comm.c

@@ -524,8 +524,8 @@ int32_t InterComm_MsgHandler(INTER_COMM_INST* instPtr){
 			else{
 				tmWord.frac_part += (uint32_t)(timeTemp);
 				tmWord.int_part += (uint32_t)(timeTemp>>32);
-				tmWord.int_part = (tmWord.frac_part >= L1_TMWORD_FRAC_MAX) ? tmWord.int_part + 1:tmWord.int_part;
-				tmWord.frac_part %= L1_TMWORD_FRAC_MAX;
+				tmWord.int_part = (tmWord.frac_part >= TIME_FRAC_MAX) ? tmWord.int_part + 1:tmWord.int_part;
+				tmWord.frac_part %= TIME_FRAC_MAX;
 				Status = Phy_SetTimeWord(instPtr->phyInstPtr, &tmWord, PHY_TIME_WORD_LISTEN_TIMEOUT);
 				if(Status != SUCCESS){
 					return EPARAM;
@@ -702,18 +702,18 @@ int32_t InterComm_PhyDataUpload(INTER_COMM_INST* instPtr){
 	instPtr->lastPhyTimeTag = fsTimeL;
 	instPtr->lastPhyTimeTag |= ((uint64_t)fsTimeH)<<32;
 	uint32_t timeComp = Phy_GetTimeComp(lastFrameType);
-	if(timeComp == L1_FRAME_NONE_COMP){
+	if(timeComp == TIME_FRAC_MAX){
 		return FAILURE;
 	}
-	fsTimeH -= timeComp/L1_TMWORD_FRAC_MAX;
-	timeComp %= L1_TMWORD_FRAC_MAX;
+	fsTimeH -= timeComp/TIME_FRAC_MAX;
+	timeComp %= TIME_FRAC_MAX;
 	fsTimeH = (fsTimeL < timeComp)?(fsTimeH - 1):fsTimeH;
-	fsTimeL = (fsTimeL < timeComp)?(L1_TMWORD_FRAC_MAX + fsTimeL - timeComp) : (fsTimeL - timeComp);
+	fsTimeL = (fsTimeL < timeComp)?(TIME_FRAC_MAX + fsTimeL - timeComp) : (fsTimeL - timeComp);
 	memcpy(txMsgBuff+DSEGRD_TIME_OFFSET, &fsTimeL, DSEGRD_TIME_LEN/2);
 	memcpy(txMsgBuff+DSEGRD_TIME_OFFSET + DSEGRD_TIME_LEN/2, &fsTimeH, DSEGRD_TIME_LEN/2);
 
 	// Doppler Estimate
-	double doppler = Phy_GetCoarseFreqEst(instPtr->phyInstPtr);
+	double doppler = Phy_GetFreqEst(instPtr->phyInstPtr);
 	// LSB = 0.001Hz
 	int64_t dopplerQnt = doppler*1000;
 	memcpy(txMsgBuff+DSEGRD_DPL_OFFSET, &dopplerQnt, DSEGRD_DPL_LEN);