From 38b7f6b985330a1da88ffce1226cc848b273cc50 Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Thu, 1 Feb 2024 14:54:43 +0800 Subject: [PATCH] omit unused code --- df_datalink_sp/src/system_monitor.c | 282 +--------------------------- 1 file changed, 9 insertions(+), 273 deletions(-) diff --git a/df_datalink_sp/src/system_monitor.c b/df_datalink_sp/src/system_monitor.c index 84b9f19..86f9496 100644 --- a/df_datalink_sp/src/system_monitor.c +++ b/df_datalink_sp/src/system_monitor.c @@ -102,52 +102,6 @@ void SysMonitor_UpdateSysinfo(const SYSINFO *info) sysMonitorInst->sysInfoCtrl.wBusy = BUFF_NONE; } -/** - * Update system info by raw data. - */ -void SysMonitor_UpdateSysinfoRaw(const 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. */ @@ -165,60 +119,11 @@ void SysMonitor_GetSysinfo(SYSINFO *info) sysMonitorInst->sysInfoCtrl.rBusy = buffIndex_old; } -/** - * Get system info as raw data. - */ -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 payload by raw data. + * Update send payload by. */ -void SysMonitor_UpdateSendPayloadRaw(const uint8_t *buff, size_t len) +void SysMonitor_UpdateSendPayload(const uint8_t *buff, size_t len) { ASSERT(sysMonitorInst != NULL); uint8_t buffIndx; @@ -231,9 +136,9 @@ void SysMonitor_UpdateSendPayloadRaw(const uint8_t *buff, size_t len) } /** - * Get the latest send payload as raw data. + * Get the latest send payload. */ -void SysMonitor_GetSendPayloadRaw(uint8_t *buff, uint32_t *id, size_t len) +void SysMonitor_GetSendPayload(uint8_t *buff, uint32_t *id, size_t len) { ASSERT(sysMonitorInst != NULL); uint8_t buffIndx, buffIndex_old; @@ -253,9 +158,9 @@ void SysMonitor_GetSendPayloadRaw(uint8_t *buff, uint32_t *id, size_t len) // @Receive Payload /** - * Update receive payload by raw data. + * Update receive payload. */ -void SysMonitor_UpdateRecvPayloadRaw(const uint8_t *buff, size_t len) +void SysMonitor_UpdateRecvPayload(const uint8_t *buff, size_t len) { ASSERT(sysMonitorInst != NULL); uint8_t buffIndx; @@ -268,9 +173,9 @@ void SysMonitor_UpdateRecvPayloadRaw(const uint8_t *buff, size_t len) } /** - * Get the latest receive payload as raw data. + * Get the latest receive payload. */ -void SysMonitor_GetRecvPayloadRaw(uint8_t *buff, uint32_t *id, size_t len) +void SysMonitor_GetRecvPayload(uint8_t *buff, uint32_t *id, size_t len) { ASSERT(sysMonitorInst != NULL); uint8_t buffIndx, buffIndex_old; @@ -320,68 +225,6 @@ void SysMonitor_GetLinklayerLog(LINKLOG *log) sysMonitorInst->linkLogCtrl.rBusy = buffIndex_old; } -/** - * Get the latest link layer log as raw data - */ -void SysMonitor_GetLinklayerLogRaw(uint8_t *buff) -{ - ASSERT(sysMonitorInst != NULL); - uint8_t buffIndx, buffIndex_old; - buffIndex_old = sysMonitorInst->linkLogCtrl.rBusy; - if (buffIndex_old != BUFF_NONE) - buffIndx = buffIndex_old; // Keep it busy - else - buffIndx = GetReadable(sysMonitorInst->linkLogCtrl); - sysMonitorInst->linkLogCtrl.rBusy = buffIndx; - - // Encapsulate log - LINKLOG *logEntry = &(sysMonitorInst->linkLog[buffIndx]); - - memcpy(buff, &(logEntry->tuNum), sizeof(logEntry->tuNum)); - buff += sizeof(logEntry->tuNum); - memcpy(buff, &(logEntry->slotNum), sizeof(logEntry->slotNum)); - buff += sizeof(logEntry->slotNum); - memcpy(buff, &(logEntry->nodeType), sizeof(logEntry->nodeType)); - buff += sizeof(logEntry->nodeType); - memcpy(buff, &(logEntry->cxnStatus), sizeof(logEntry->cxnStatus)); - buff += sizeof(logEntry->cxnStatus); - memcpy(buff, &(logEntry->linkStage), sizeof(logEntry->linkStage)); - buff += sizeof(logEntry->linkStage); - memcpy(buff, &(logEntry->recxnCnt), sizeof(logEntry->recxnCnt)); - buff += sizeof(logEntry->recxnCnt); - memcpy(buff, &(logEntry->beamNo), sizeof(logEntry->beamNo)); - buff += sizeof(logEntry->beamNo); - memcpy(buff, &(logEntry->beamAz), sizeof(logEntry->beamAz)); - buff += sizeof(logEntry->beamAz); - memcpy(buff, &(logEntry->beamEl), sizeof(logEntry->beamEl)); - buff += sizeof(logEntry->beamEl); - memcpy(buff, &(logEntry->advTxCnt), sizeof(logEntry->advTxCnt)); - buff += sizeof(logEntry->advTxCnt); - memcpy(buff, &(logEntry->advRecvCnt), sizeof(logEntry->advRecvCnt)); - buff += sizeof(logEntry->advRecvCnt); - memcpy(buff, &(logEntry->advCorrectCnt), sizeof(logEntry->advCorrectCnt)); - buff += sizeof(logEntry->advCorrectCnt); - memcpy(buff, &(logEntry->cfmTxCnt), sizeof(logEntry->cfmTxCnt)); - buff += sizeof(logEntry->cfmTxCnt); - memcpy(buff, &(logEntry->cfmRecvCnt), sizeof(logEntry->cfmRecvCnt)); - buff += sizeof(logEntry->cfmRecvCnt); - memcpy(buff, &(logEntry->cfmCorrectCnt), sizeof(logEntry->cfmCorrectCnt)); - buff += sizeof(logEntry->cfmCorrectCnt); - memcpy(buff, &(logEntry->svcTxCnt), sizeof(logEntry->svcTxCnt)); - buff += sizeof(logEntry->svcTxCnt); - memcpy(buff, &(logEntry->svcRecvCnt), sizeof(logEntry->svcRecvCnt)); - buff += sizeof(logEntry->svcRecvCnt); - memcpy(buff, &(logEntry->svcCorrectCnt), sizeof(logEntry->svcCorrectCnt)); - buff += sizeof(logEntry->svcCorrectCnt); - memcpy(buff, &(logEntry->timeDev), sizeof(logEntry->timeDev)); - buff += sizeof(logEntry->timeDev); - memcpy(buff, &(logEntry->sendId), sizeof(logEntry->sendId)); - buff += sizeof(logEntry->sendId); - memcpy(buff, &(logEntry->recvId), sizeof(logEntry->recvId)); - - sysMonitorInst->linkLogCtrl.rBusy = buffIndex_old; -} - // @Physical layer log /** * Update physical layer log @@ -414,55 +257,6 @@ void SysMonitor_GetPhysicalLayerLog(PHYLOG *log) sysMonitorInst->phyLogCtrl.rBusy = buffIndex_old; } -/** - * Get the latest physical layer log as raw data - */ -void SysMonitor_GetPhysicalLayerLogRaw(uint8_t *buff) -{ - ASSERT(sysMonitorInst != NULL); - uint8_t buffIndx, buffIndex_old; - buffIndex_old = sysMonitorInst->phyLogCtrl.rBusy; - if (buffIndex_old != BUFF_NONE) - buffIndx = buffIndex_old; // Keep it busy - else - buffIndx = GetReadable(sysMonitorInst->phyLogCtrl); - sysMonitorInst->phyLogCtrl.rBusy = buffIndx; - - // Encapsulate log - PHYLOG *logEntry = &(sysMonitorInst->phyLog[buffIndx]); - - memcpy(buff, &(logEntry->acqCnt), sizeof(logEntry->acqCnt)); - buff += sizeof(logEntry->acqCnt); - memcpy(buff, &(logEntry->fsyncCnt), sizeof(logEntry->fsyncCnt)); - buff += sizeof(logEntry->fsyncCnt); - memcpy(buff, &(logEntry->decodeCnt), sizeof(logEntry->decodeCnt)); - buff += sizeof(logEntry->decodeCnt); - memcpy(buff, &(logEntry->crcCnt), sizeof(logEntry->crcCnt)); - buff += sizeof(logEntry->crcCnt); - memcpy(buff, &(logEntry->doppler), sizeof(logEntry->doppler)); - buff += sizeof(logEntry->doppler); - memcpy(buff, &(logEntry->recvStamp), sizeof(logEntry->recvStamp)); - buff += sizeof(logEntry->recvStamp); - memcpy(buff, &(logEntry->acqPeak), sizeof(logEntry->acqPeak)); - buff += sizeof(logEntry->acqPeak); - memcpy(buff, &(logEntry->acqMean), sizeof(logEntry->acqMean)); - buff += sizeof(logEntry->acqMean); - memcpy(buff, &(logEntry->acqPhase), sizeof(logEntry->acqPhase)); - buff += sizeof(logEntry->acqPhase); - memcpy(buff, &(logEntry->acqFreqCh), sizeof(logEntry->acqFreqCh)); - buff += sizeof(logEntry->acqFreqCh); - memcpy(buff, &(logEntry->fsyncPeak), sizeof(logEntry->fsyncPeak)); - buff += sizeof(logEntry->fsyncPeak); - memcpy(buff, &(logEntry->fsyncMean), sizeof(logEntry->fsyncMean)); - buff += sizeof(logEntry->fsyncMean); - memcpy(buff, &(logEntry->fsyncFreqCh), sizeof(logEntry->fsyncFreqCh)); - buff += sizeof(logEntry->fsyncFreqCh); - memcpy(buff, &(logEntry->deintlvAmpEst), sizeof(logEntry->deintlvAmpEst)); - buff += sizeof(logEntry->deintlvAmpEst); - memcpy(buff, &(logEntry->reserve), sizeof(logEntry->reserve)); - - sysMonitorInst->phyLogCtrl.rBusy = buffIndex_old; -} // @Hardware state /** @@ -496,50 +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 log - HWSTATE *logEntry = &(sysMonitorInst->hwState[buffIndx]); - - memcpy(buff, &(logEntry->spPsVolt), sizeof(logEntry->spPsVolt)); - buff += sizeof(logEntry->spPsVolt); - memcpy(buff, &(logEntry->spPsAuxVolt), sizeof(logEntry->spPsAuxVolt)); - buff += sizeof(logEntry->spPsAuxVolt); - memcpy(buff, &(logEntry->spDdrVolt), sizeof(logEntry->spDdrVolt)); - buff += sizeof(logEntry->spDdrVolt); - memcpy(buff, &(logEntry->spPlVolt), sizeof(logEntry->spPlVolt)); - buff += sizeof(logEntry->spPlVolt); - memcpy(buff, &(logEntry->spPlAuxVolt), sizeof(logEntry->spPlAuxVolt)); - buff += sizeof(logEntry->spPlAuxVolt); - memcpy(buff, &(logEntry->spBramVolt), sizeof(logEntry->spBramVolt)); - buff += sizeof(logEntry->spBramVolt); - memcpy(buff, &(logEntry->spTemp), sizeof(logEntry->spTemp)); - buff += sizeof(logEntry->spTemp); - memcpy(buff, &(logEntry->antVolt), sizeof(logEntry->antVolt)); - buff += sizeof(logEntry->antVolt); - memcpy(buff, &(logEntry->antTemp), sizeof(logEntry->antTemp)); - buff += sizeof(logEntry->antTemp); - memcpy(buff, &(logEntry->antPll), sizeof(logEntry->antPll)); - buff += sizeof(logEntry->antPll); - memcpy(buff, &(logEntry->antMgc0), sizeof(logEntry->antMgc0)); - buff += sizeof(logEntry->antMgc0); - memcpy(buff, &(logEntry->antMgc1), sizeof(logEntry->antMgc1)); - buff += sizeof(logEntry->antMgc1); - - sysMonitorInst->hwStateCtrl.rBusy = buffIndex_old; -} // @System log /** @@ -550,18 +300,4 @@ void SysMonitor_GetSyslog(SYSLOG *log) ASSERT(sysMonitorInst != NULL); SysMonitor_GetLinklayerLog(&(log->linkLog)); SysMonitor_GetPhysicalLayerLog(&(log->phyLog)); - SysMonitor_GetHardwareStatus(&(log->hwSate)); -} - -/** - * Get the latest system running log as raw data. - */ -void SysMonitor_GetSyslogRaw(uint8_t *buff) -{ - ASSERT(sysMonitorInst != NULL); - SysMonitor_GetLinklayerLogRaw(buff); - buff += SLOTLOG_PACK_LEN; - SysMonitor_GetPhysicalLayerLogRaw(buff); - buff += SLOTLOG_PACK_LEN; - SysMonitor_GetHardwareStatusRaw(buff); -} +} \ No newline at end of file