From 66937f116051f5d88025df4b8cdfa9f471e6f219 Mon Sep 17 00:00:00 2001 From: lh <3191213465@qq.com> Date: Mon, 20 Jul 2026 17:59:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=BC=9A=E5=90=8E=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=88=A0=E9=99=A4=E9=87=8D=E5=90=AF=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E6=BA=90id=E7=9A=842=E5=8F=96=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TSCP/src/MSCP/PFM/PFM_Cfg.c | 2 +- TSCP/src/MSCP/PFM/PFM_InputOutput.c | 3 +-- TSCP/src/MSCP/PFM/PFM_RemoteUpdate.c | 7 ------- TSCP/src/MSCP/PFM/PFM_RemoteUpdate.h | 2 -- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/TSCP/src/MSCP/PFM/PFM_Cfg.c b/TSCP/src/MSCP/PFM/PFM_Cfg.c index 7d7ef72..af59875 100644 --- a/TSCP/src/MSCP/PFM/PFM_Cfg.c +++ b/TSCP/src/MSCP/PFM/PFM_Cfg.c @@ -44,7 +44,7 @@ const CM_UINT8 MSCP_SW_VERION[4] = { 93u, 1u, 1u, 64u }; /** 驱动软件版本号 */ CM_UINT8 MSCP_DRV_VERION[4] = {0}; /** 与维护一体机接口文档版本号(接口文档发生改变时升级版本号) */ -CM_UINT16 TSCP_DOC_VERION[2] = {38u,0u}; +CM_UINT16 TSCP_DOC_VERION[2] = {39u,0u}; /** 操作系统版本号 */ CM_UINT8 TSCP_QNX_VERION[10] = {0u}; diff --git a/TSCP/src/MSCP/PFM/PFM_InputOutput.c b/TSCP/src/MSCP/PFM/PFM_InputOutput.c index d8c0081..7d1f057 100644 --- a/TSCP/src/MSCP/PFM/PFM_InputOutput.c +++ b/TSCP/src/MSCP/PFM/PFM_InputOutput.c @@ -997,8 +997,7 @@ static CM_INT32 s_2oo2OutputCheckFrame_Pack(OUT CM_UINT8 buf[], IN CM_UINT32 Buf } /*二取表决加入硬重启标志*/ buf[i++] = PFM_GetBoardRebootState(); - buf[i++] = PFM_GetHardRebootSrcID(); - MSCP_LOG_MSG("PFM_GetBoardState = %d, PFM_GetBoardRebootState = %d, PFM_GetHardRebootSrcID = %04x\n",PFM_GetBoardState(), PFM_GetBoardRebootState(), PFM_GetHardRebootSrcID()); + MSCP_LOG_MSG("PFM_GetBoardState = %d, PFM_GetBoardRebootState = %d\n",PFM_GetBoardState(), PFM_GetBoardRebootState()); /*- 返回输出校验报文长度 */ return i; } diff --git a/TSCP/src/MSCP/PFM/PFM_RemoteUpdate.c b/TSCP/src/MSCP/PFM/PFM_RemoteUpdate.c index 02c464f..27f7754 100644 --- a/TSCP/src/MSCP/PFM/PFM_RemoteUpdate.c +++ b/TSCP/src/MSCP/PFM/PFM_RemoteUpdate.c @@ -965,13 +965,6 @@ CM_UINT8 PFM_GetBoardRebootState(void) /*- 获取重启状态 */ return reboottype; } -/** - * @brief 获取硬重启命令的源ID - */ -CM_UINT16 PFM_GetHardRebootSrcID(void) -{ - return s_rebootSrcid; -} /** * @brief 获取板卡运行状态 * @return 板卡运行状态 diff --git a/TSCP/src/MSCP/PFM/PFM_RemoteUpdate.h b/TSCP/src/MSCP/PFM/PFM_RemoteUpdate.h index 3a2e35e..a49b66b 100644 --- a/TSCP/src/MSCP/PFM/PFM_RemoteUpdate.h +++ b/TSCP/src/MSCP/PFM/PFM_RemoteUpdate.h @@ -132,8 +132,6 @@ void PFM_HardWareBoot_OutPut(void); CM_UINT8 PFM_GetBoardRebootState(void); -CM_UINT16 PFM_GetHardRebootSrcID(void); - /** * @brief 硬重启自检状态机 * @param level 待输出IO 取值范围:0x00~0x0F