From 729bbeb60ec5aa74882e7391107b1364c989bc12 Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Mon, 18 Mar 2024 11:02:20 +0800 Subject: [PATCH] format and cleanup --- .../src/networking/link_layer/scan.c | 50 +++++++++---------- .../src/networking/link_layer/service.c | 2 +- df_datalink_sp/src/systembus/systembus.c | 22 ++++---- 3 files changed, 39 insertions(+), 35 deletions(-) diff --git a/df_datalink_sp/src/networking/link_layer/scan.c b/df_datalink_sp/src/networking/link_layer/scan.c index c757dde..2e5ce52 100644 --- a/df_datalink_sp/src/networking/link_layer/scan.c +++ b/df_datalink_sp/src/networking/link_layer/scan.c @@ -36,7 +36,7 @@ /************************** Variable Definitions *****************************/ // Pair by regex // Regex: ((\{\.oaxis = [0-9]+[ ,]+\.raxis = [0-9]+[ ]*\}, ){2}) -PHY_ANT_ANGLE antNrrwPattern_0[L1_NUM_ANT_NRRW_PATTERN] = +PHY_ANT_ANGLE antNrrwPattern_0[L1_NUM_ANT_NRRW_PATTERN] = { {.oaxis = 0 , .raxis = 0 }, {.oaxis = 139, .raxis = 2225}, @@ -77,7 +77,7 @@ PHY_ANT_ANGLE antNrrwPattern_0[L1_NUM_ANT_NRRW_PATTERN] = {.oaxis = 450, .raxis = 897 } }; -PHY_ANT_ANGLE antNrrwPattern_1[L1_NUM_ANT_NRRW_PATTERN] = +PHY_ANT_ANGLE antNrrwPattern_1[L1_NUM_ANT_NRRW_PATTERN] = { {.oaxis = 0 , .raxis = 0 }, {.oaxis = 139, .raxis = 1155}, @@ -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); } @@ -474,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; @@ -484,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 @@ -530,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; @@ -540,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; @@ -581,10 +581,10 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg) // Assert update routine event... L2_RTNE_CONFIG newRtneConfig = {0}; L2_EVENT rtneUpEvent = - { - .event = L2_ROUTINE_UPDATE, - .msg = &newRtneConfig - }; + { + .event = L2_ROUTINE_UPDATE, + .msg = &newRtneConfig + }; newRtneConfig.rtneTable = initTable; newRtneConfig.rtnePrd = ARRAY_SIZE(initTable); AssertL2Event(instPtr, &rtneUpEvent); @@ -611,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... @@ -778,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"); diff --git a/df_datalink_sp/src/networking/link_layer/service.c b/df_datalink_sp/src/networking/link_layer/service.c index b396dda..a276ae0 100644 --- a/df_datalink_sp/src/networking/link_layer/service.c +++ b/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) { diff --git a/df_datalink_sp/src/systembus/systembus.c b/df_datalink_sp/src/systembus/systembus.c index 4662203..1a27673 100644 --- a/df_datalink_sp/src/systembus/systembus.c +++ b/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; } @@ -350,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; } @@ -375,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; @@ -388,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; @@ -428,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; } @@ -438,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); @@ -476,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;