format and cleanup

df_datalink_sp/src/networking/link_layer/link_layer.c

@@ -31,7 +31,7 @@
 #endif
 /************************** Constant Definitions *****************************/
 #define NET_START_TIME_INFTY UINT32_MAX
-#define LINK_BROCK_THRESHOLD (3 * 200) // 3 secods
+#define LINK_BROCK_THRESHOLD L2_SLOTS_PER_FRAME // 0.5 secods
 
 /************************** Variable Definitions *****************************/
 /***************** Macros (Inline Functions) Definitions *********************/
@@ -147,6 +147,15 @@ inline L2_NODE_STATE L2_GetMainState(L2_INST *instPtr)
 	return instPtr->mainState;
 }
 
+/**
+ * @brief   Check if there is a valid l2 frame.
+ */
+inline bool L2_isStarted(L2_INST *instPtr)
+{
+	ASSERT(instPtr != NULL);
+	return instPtr->isEnable;
+}
+
 /**
  * @brief   Check if there is a valid l2 frame.
  */

df_datalink_sp/src/networking/link_layer/link_layer.h

@@ -155,6 +155,7 @@ uint8_t L2_GetClusterId(L2_INST *instPtr);
 uint8_t L2_GetHeadId(L2_INST *instPtr);
 L2_NODE_TYPE L2_GetNodeType(L2_INST *instPtr);
 L2_NODE_STATE L2_GetMainState(L2_INST *instPtr);
+bool L2_isStarted(L2_INST *instPtr);
 bool L2_isDataAvail(L2_INST *instPtr);
 bool L2_isCxn2Net(L2_INST *instPtr);
 uint32_t L2_GetFrameLen(L2_FRAME_TYPE l2FrameType);

df_datalink_sp/src/networking/link_layer/scan.c

@@ -198,12 +198,12 @@ static int32_t Scan_InitScanHandler(L2_INST *instPtr)
 	L2_SCAN_FSM *scanFsmPtr = instPtr->scanFSM;
 	DBG_INFO("** Net-Setup - InitScan Procedure (Attempts: %" PRIu8 ")**\n", scanFsmPtr->scanCnt);
 
-	if(scanFsmPtr->scanCnt == 0)
+	if (scanFsmPtr->scanCnt == 0)
 	{
 		// Update scan beam table
 		L2_Scan_RefreashScanTable(instPtr);
 	}
-	else if(Phy_IsFrameDetected(phyRef))
+	else if (Phy_IsFrameDetected(phyRef))
 	{
 		// last scan beam number
 		scanFsmPtr->beamNo = Phy_LastScanBeamNo(phyRef);
@@ -340,7 +340,7 @@ static int32_t ScanMsg_Packing(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t dst
 	int32_t Status;
 	uint32_t dataChunk;
 	uint8_t *buff = instPtr->sendPktData;
-	if(type < L2_ADV_FRAME || type > L2_CFM_FRAME)
+	if (type < L2_ADV_FRAME || type > L2_CFM_FRAME)
 	{
 		DBG_ERROR("Unexpected frame type: %" PRId8 ".\n", type);
 		return EPARAM;
@@ -396,7 +396,7 @@ static int32_t ScanMsg_Packing(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t dst
 
 		// Packing extra payload
 		uint32_t dataId;
-		if(L2_GetNodeType(instPtr) == L2_NODE_HEAD)
+		if (L2_GetNodeType(instPtr) == L2_NODE_HEAD)
 		{
 			SysMonitor_GetSendPayload(buff + L2_MSG_CFM_PAYLOAD, &dataId, PAYLOAD_LEN_FLJ_TX);
 		}
@@ -449,14 +449,18 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 	ASSERT(msg != NULL);
 	int32_t Status;
 	L2_SCAN_FSM *scanFsmPtr = instPtr->scanFSM;
-	L2_FRAME_TYPE frameType = L2_GetLastOptFrameType(instPtr);
+	L2_FRAME_TYPE frameType = L2_NONE_FRAME;
+	L2_FrameGetChunk(msg, L2_MSG_TYPE, L2_MSG_TYPE_LEN, &frameType);
 	switch (frameType)
 	{
 	case L2_SCAN_FRAME:
-		LockStateUpdate(scanFsmPtr, true);
-		StageUpdate(scanFsmPtr, L2_SCAN_ADV_STAGE);
 	case L2_ADV_FRAME:
 	{
+		if (L2_GetLastOptFrameType(instPtr) == L2_SCAN_FRAME)
+		{
+			LockStateUpdate(scanFsmPtr, true);
+			StageUpdate(scanFsmPtr, L2_SCAN_ADV_STAGE);
+		}
 		if (L2_GetNodeType(instPtr) == L2_NODE_HEAD)
 		{
 			DBG_ERROR("Unexpected call from head node, only member Node can handle L2_SCAN_FRAME and L2_ADV_FRAME.\n");
@@ -470,7 +474,7 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		if (node == NULL)
 		{
 			node = L2_AppendNode(instPtr->nodeList, nodeId, L2_NODE_MEMBER);
-			if(node == NULL)
+			if (node == NULL)
 			{
 				DBG_ERROR("Failed to append new node [id: %" PRId8 "]", nodeId);
 				Status = ENOMEM;
@@ -480,11 +484,11 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		// Update node info.
 		float nodePos;
 		L2_FrameGetChunk(msg, L2_MSG_ADV_SRC_POSX, L2_MSG_ADV_SRC_POSX_LEN, &nodePos);
-		node->nodeInfo.pos.x = (double) nodePos;
+		node->nodeInfo.pos.x = (double)nodePos;
 		L2_FrameGetChunk(msg, L2_MSG_ADV_SRC_POSY, L2_MSG_ADV_SRC_POSY_LEN, &nodePos);
-		node->nodeInfo.pos.y = (double) nodePos;
+		node->nodeInfo.pos.y = (double)nodePos;
 		L2_FrameGetChunk(msg, L2_MSG_ADV_SRC_POSZ, L2_MSG_ADV_SRC_POSZ_LEN, &nodePos);
-		node->nodeInfo.pos.z = (double) nodePos;
+		node->nodeInfo.pos.z = (double)nodePos;
 		node->nodeInfo.beamNo = Phy_LastScanBeamNo(instPtr->config.phyInstPtr);
 
 		// Reset node ttl
@@ -526,7 +530,7 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		if (node == NULL)
 		{
 			node = L2_AppendNode(instPtr->nodeList, nodeId, L2_NODE_MEMBER);
-			if(node == NULL)
+			if (node == NULL)
 			{
 				DBG_ERROR("Failed to append new node [id: %" PRId8 "]", nodeId);
 				Status = ENOMEM;
@@ -536,18 +540,18 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		// Update node info.
 		float nodePos;
 		L2_FrameGetChunk(msg, L2_MSG_CFM_SRC_POSX, L2_MSG_CFM_SRC_POSX_LEN, &nodePos);
-		node->nodeInfo.pos.x = (double) nodePos;
+		node->nodeInfo.pos.x = (double)nodePos;
 		L2_FrameGetChunk(msg, L2_MSG_CFM_SRC_POSY, L2_MSG_CFM_SRC_POSY_LEN, &nodePos);
-		node->nodeInfo.pos.y = (double) nodePos;
+		node->nodeInfo.pos.y = (double)nodePos;
 		L2_FrameGetChunk(msg, L2_MSG_CFM_SRC_POSZ, L2_MSG_CFM_SRC_POSZ_LEN, &nodePos);
-		node->nodeInfo.pos.z = (double) nodePos;
+		node->nodeInfo.pos.z = (double)nodePos;
 		float nodeSpeed;
 		L2_FrameGetChunk(msg, L2_MSG_CFM_SRC_SPEEDX, L2_MSG_CFM_SRC_SPEEDX_LEN, &nodeSpeed);
-		node->nodeInfo.speed.x = (double) nodePos;
+		node->nodeInfo.speed.x = (double)nodePos;
 		L2_FrameGetChunk(msg, L2_MSG_CFM_SRC_SPEEDY, L2_MSG_CFM_SRC_SPEEDY_LEN, &nodeSpeed);
-		node->nodeInfo.speed.y = (double) nodePos;
+		node->nodeInfo.speed.y = (double)nodePos;
 		L2_FrameGetChunk(msg, L2_MSG_CFM_SRC_SPEEDZ, L2_MSG_CFM_SRC_SPEEDZ_LEN, &nodeSpeed);
-		node->nodeInfo.speed.z = (double) nodePos;
+		node->nodeInfo.speed.z = (double)nodePos;
 
 		// Reset node ttl
 		node->ttlCnt = 0;
@@ -607,13 +611,13 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		uint32_t dataId;
 		L2_FrameGetChunk(msg, L2_MSG_CFM_PAYLOAD_ID, L2_MSG_CFM_PAYLOAD_ID_LEN, &dataId);
 
-		if(L2_GetNodeType(instPtr) == L2_NODE_HEAD)
+		if (L2_GetNodeType(instPtr) == L2_NODE_HEAD)
 		{
-			SysMonitor_UpdateRecvPayload(msg+L2_MSG_CFM_PAYLOAD, dataId, PAYLOAD_LEN_FLJ_RX);
+			SysMonitor_UpdateRecvPayload(msg + L2_MSG_CFM_PAYLOAD, dataId, PAYLOAD_LEN_FLJ_RX);
 		}
 		else
 		{
-			SysMonitor_UpdateRecvPayload(msg+L2_MSG_CFM_PAYLOAD, dataId, PAYLOAD_LEN_LJ_RX);
+			SysMonitor_UpdateRecvPayload(msg + L2_MSG_CFM_PAYLOAD, dataId, PAYLOAD_LEN_LJ_RX);
 		}
 
 		// Logging...
@@ -774,7 +778,7 @@ int32_t L2_Scan_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntry)
 	ASSERT(instPtr != NULL);
 	L2_TOR_TYPE torState;
 	int32_t Status;
-	const NODE_ENTRY* commNode;
+	const NODE_ENTRY *commNode;
 	PHY_INST *phyRef = instPtr->config.phyInstPtr;
 	DBG_INFO("-------- Scan Routine --------\n");
 

df_datalink_sp/src/networking/link_layer/service.c

@@ -170,7 +170,7 @@ int32_t L2_Service_PktHandler(L2_INST *instPtr, uint8_t *msg)
 	ASSERT(msg != NULL);
 	int32_t Status;
 #ifndef DATALINK_ENABLE_BERTEST
-	uint8_t frameType;
+	L2_FRAME_TYPE frameType = L2_NONE_FRAME;
 	L2_FrameGetChunk(msg, L2_MSG_TYPE, L2_MSG_TYPE_LEN, &frameType);
 	switch (frameType)
 	{

df_datalink_sp/src/systembus/systembus.c

@@ -190,7 +190,6 @@
 
 #define LJ_RM_TEST_RESP_LEN 158
 
-
 // My Production Type
 #define MY_PRD_ID PRD_DL_K
 
@@ -238,7 +237,8 @@ static int32_t SystemBus_GenSelfTestRsp(SYSBUS *instPtr)
 {
 	ASSERT(instPtr != NULL);
 	SYSBUS_UART_FRAME *sysbusRsp = malloc(sizeof(SYSBUS_UART_FRAME));
-	if (sysbusRsp == NULL) {
+	if (sysbusRsp == NULL)
+	{
 		DBG_ERROR("Failed to allocate memory for SELF TEST Response!\n");
 		return ENOMEM;
 	}
@@ -278,30 +278,21 @@ static int32_t SystemBus_SystemConfig(SYSBUS *instPtr, uint8_t *msg)
 	PHY_INST *phyRef = linkInstPtr->config.phyInstPtr;
 	TMC_INST *tmcRef = linkInstPtr->config.tmcInstPtr;
 	bool reconfig = false;
-	bool start = false;
 
 	if (msg[WD_MODE_CMD] == MODE_CMD_HEAD)
-	{
-		// omit unnecessary reconfiguration
-		if (L2_GetNodeType(linkInstPtr) != L2_NODE_HEAD)
 	{
 		// head node config
+		reconfig = (L2_NODE_HEAD != linkConfig.myType);
 		linkConfig.myType = L2_NODE_HEAD;
 		linkConfig.myId = 1;
-			reconfig = true;
-		}
 	}
 
-	else if (msg[WD_MODE_CMD] == MODE_CMD_MEMBER )
-	{
-		// omit unnecessary reconfiguration
-		if (L2_GetNodeType(linkInstPtr) != L2_NODE_MEMBER)
+	else if (msg[WD_MODE_CMD] == MODE_CMD_MEMBER)
 	{
 		// member node config
+		reconfig = (L2_NODE_MEMBER != linkConfig.myType);
 		linkConfig.myType = L2_NODE_MEMBER;
 		linkConfig.myId = 2;
-			reconfig = true;
-		}
 	}
 	else
 	{
@@ -311,23 +302,31 @@ static int32_t SystemBus_SystemConfig(SYSBUS *instPtr, uint8_t *msg)
 		return EPARAM;
 	}
 
-	if(msg[WD_EN_CMD] == EN_CMD_ON_HIGH_POWER)
+	if (msg[WD_EN_CMD] == EN_CMD_ON_HIGH_POWER)
 	{
-		// high power config
+		// full power config
 		Phy_AntConfigMode(phyRef, PHY_ANT_MODE_POWER_FULL);
-		start = true;
+		if (reconfig || !L2_isStarted(linkInstPtr))
+		{
+			Linklayer_Reconfig(linkInstPtr, &linkConfig);
 		}
-	else if(msg[WD_EN_CMD] == EN_CMD_ON_LOW_POWER)
+		Linklayer_Start(linkInstPtr);
+	}
+	else if (msg[WD_EN_CMD] == EN_CMD_ON_LOW_POWER)
 	{
 		// low power config
 		Phy_AntConfigMode(phyRef, PHY_ANT_MODE_POWER_LOW);
-		start = true;
+		reconfig = reconfig || (true != L2_isStarted(linkInstPtr));
+		if (reconfig || !L2_isStarted(linkInstPtr))
+		{
+			Linklayer_Reconfig(linkInstPtr, &linkConfig);
 		}
-	else if(msg[WD_EN_CMD] == EN_CMD_SILENT)
+		Linklayer_Start(linkInstPtr);
+	}
+	else if (msg[WD_EN_CMD] == EN_CMD_SILENT)
 	{
 		// silence config
 		// TODO: better approach?
-		start = false;
 		Linklayer_Halt(linkInstPtr);
 		Phy_AntConfigMode(phyRef, PHY_ANT_MODE_STANDBY);
 		TIME_WORD pullTime = {0, 0};
@@ -338,14 +337,6 @@ static int32_t SystemBus_SystemConfig(SYSBUS *instPtr, uint8_t *msg)
 		}
 		Phy_SetupNextSlot(phyRef, PHY_TOR_RX, L1_10KBPS_10MS_FRAME, NULL);
 	}
-	if (reconfig == true)
-	{
-		Linklayer_Reconfig(linkInstPtr, &linkConfig);
-	}
-	if (start == true)
-	{
-		Linklayer_Start(linkInstPtr);
-	}
 	instPtr->sysbusLog.lastConfig[0] = msg[WD_MODE_CMD];
 	instPtr->sysbusLog.lastConfig[1] = msg[WD_EN_CMD];
 	return SUCCESS;
@@ -359,7 +350,8 @@ static int32_t SystemBus_Echo(SYSBUS *instPtr, SYSBUS_UART_FRAME *frame)
 	ASSERT(instPtr != NULL);
 	ASSERT(frame != NULL);
 	SYSBUS_UART_FRAME *sysbusRsp = malloc(sizeof(SYSBUS_UART_FRAME));
-	if (sysbusRsp == NULL) {
+	if (sysbusRsp == NULL)
+	{
 		DBG_ERROR("Failed to allocate memory for DATA TEST A Response!\n");
 		return ENOMEM;
 	}
@@ -384,12 +376,13 @@ static int32_t SystemBus_GenPollRsp(SYSBUS *instPtr, uint8_t *msg)
 	size_t dataLen;
 	uint8_t *payload;
 	SYSBUS_UART_FRAME *sysbusRsp = malloc(sizeof(SYSBUS_UART_FRAME));
-	if (sysbusRsp == NULL) {
+	if (sysbusRsp == NULL)
+	{
 		DBG_ERROR("Failed to allocate memory for FLJ POLL Response!\n");
 		return ENOMEM;
 	}
 
-	if(msg[WD_CMD] == CMD_FLJ_POLL)
+	if (msg[WD_CMD] == CMD_FLJ_POLL)
 	{
 		sysbusRsp->len = FLJ_POLL_RESP_LEN;
 		sysbusRsp->data[WD_CMD] = CMD_FLJ_POLL;
@@ -397,7 +390,7 @@ static int32_t SystemBus_GenPollRsp(SYSBUS *instPtr, uint8_t *msg)
 		dataLen = PAYLOAD_LEN_FLJ_RX;
 		payload = sysbusRsp->data + FLJ_DATA_OFFSET;
 	}
-	else if(msg[WD_CMD] == CMD_LJ_POLL)
+	else if (msg[WD_CMD] == CMD_LJ_POLL)
 	{
 		sysbusRsp->len = LJ_POLL_RESP_LEN;
 		sysbusRsp->data[WD_CMD] = CMD_LJ_POLL;
@@ -437,7 +430,8 @@ static int32_t SystemBus_GenRemoteTestRsp(SYSBUS *instPtr, uint8_t *msg)
 	ASSERT(instPtr != NULL);
 	ASSERT(msg != NULL);
 	SYSBUS_UART_FRAME *sysbusRsp = malloc(sizeof(SYSBUS_UART_FRAME));
-	if (sysbusRsp == NULL) {
+	if (sysbusRsp == NULL)
+	{
 		DBG_ERROR("Failed to allocate memory for LJ REMOTE TEST Response!\n");
 		return ENOMEM;
 	}
@@ -447,7 +441,7 @@ static int32_t SystemBus_GenRemoteTestRsp(SYSBUS *instPtr, uint8_t *msg)
 	TimeCtrl_GetCurrentTime(linkInstPtr->config.tmcInstPtr, &tmWord);
 	time = (uint64_t)tmWord.int_part * TIME_FRAC_MAX + tmWord.frac_part;
 
-	if(msg[WD_CMD] == CMD_FLJ_RM_TEST)
+	if (msg[WD_CMD] == CMD_FLJ_RM_TEST)
 	{
 		sysbusRsp->len = FLJ_RM_TEST_RESP_LEN;
 		memset(sysbusRsp->data, 0x00, FLJ_RM_TEST_RESP_LEN);
@@ -485,7 +479,8 @@ static int32_t SystemBus_GenRemoteTestRsp(SYSBUS *instPtr, uint8_t *msg)
 		return EUNEXP;
 	}
 
-	if (CircQueuePush(instPtr->txQueue, (void *)sysbusRsp) == false){
+	if (CircQueuePush(instPtr->txQueue, (void *)sysbusRsp) == false)
+	{
 		free(sysbusRsp);
 		DBG_WARNING("SystemBus::TX Queue overflowed!\n");
 		return EQUEUE;