From c3e0c7a66a42b5ddbc037ac83b9103004e98d210 Mon Sep 17 00:00:00 2001
From: Gatsby Van <mail.gatsby.icu>
Date: Tue, 12 Mar 2024 20:49:24 +0800
Subject: [PATCH] clean uo & enhance coherence

---
 df_datalink_ge/src/mpc/mpc.c | 63 ++++++++++--------------------------
 1 file changed, 17 insertions(+), 46 deletions(-)

diff --git a/df_datalink_ge/src/mpc/mpc.c b/df_datalink_ge/src/mpc/mpc.c
index 2aacd40..02c83a0 100644
--- a/df_datalink_ge/src/mpc/mpc.c
+++ b/df_datalink_ge/src/mpc/mpc.c
@@ -155,6 +155,11 @@
 
 // Remote Test
 #define RM_TEST_RESP_LEN 158
+// -- Request
+// Remote Test FLJ
+#define CMD_FLJ_RM_TEST 0xE6
+// Remote Test LJ
+#define CMD_LJ_RM_TEST 0xF6
 #define WD_RM_TEST 0x02
 #define RM_TEST_CODE 0x99
 // -- Response
@@ -169,40 +174,6 @@
 #define WD_HARDWARE_ST 0x91
 #define WD_HARDWARE_ST_LEN 13
 
-// Remote Test FLJ
-#define CMD_FLJ_RM_TEST 0xE6
-// -- Request
-#define WD_FLJ_RM_TEST 0x02
-#define FLJ_RM_TEST_CODE 0x99
-// -- Response
-#define WD_FLJ_TIME_STAMP 0x02
-#define WD_FLJ_TIME_STAMP_LEN 8
-#define WD_FLJ_SYSBUS_LOG 0x0A
-#define WD_FLJ_SYSBUS_LOG_LEN 14
-#define WD_FLJ_LINK_LOG 0x18
-#define WD_FLJ_LINK_LOG_LEN 64
-#define WD_FLJ_PHY_LOG 0x58
-#define WD_FLJ_PHY_LOG_LEN 57
-#define WD_FLJ_HARDWARE_ST 0x91
-#define WD_FLJ_HARDWARE_ST_LEN 13
-
-// Remote Test LJ
-#define CMD_LJ_RM_TEST 0xF6
-// -- Request
-#define WD_LJ_RM_TEST 0x02
-#define LJ_RM_TEST_CODE 0x99
-// -- Response
-#define WD_LJ_TIME_STAMP 0x02
-#define WD_LJ_TIME_STAMP_LEN 8
-#define WD_LJ_SYSBUS_LOG 0x0A
-#define WD_LJ_SYSBUS_LOG_LEN 14
-#define WD_LJ_LINK_LOG 0x18
-#define WD_LJ_LINK_LOG_LEN 64
-#define WD_LJ_PHY_LOG 0x58
-#define WD_LJ_PHY_LOG_LEN 57
-#define WD_LJ_HARDWARE_ST 0x91
-#define WD_LJ_HARDWARE_ST_LEN 13
-
 // My Production Type
 #define MY_PRD_ID PRD_DL_K
 
@@ -426,21 +397,21 @@ mpc_init_error:
  ******************************************************************************/
 int32_t Mpc_PendRemoteTest(MPC *instPtr)
 {
-	MPC_HW_FRAME *sysbusRsp;
+	MPC_HW_FRAME *mpcRsp;
 	uint8_t *msg;
 	if (instPtr->isEnable == false)
 	{
 		DBG_ERROR("System is not enabled!\n");
 		return EIGNORE;
 	}
-	sysbusRsp = malloc(sizeof(MPC_HW_FRAME));
-	if (sysbusRsp == NULL) {
+	mpcRsp = malloc(sizeof(MPC_HW_FRAME));
+	if (mpcRsp == NULL) {
 		DBG_ERROR("Failed to allocate memory for LJ REMOTE TEST Response!\n");
 		return ENOMEM;
 	}
-	sysbusRsp = malloc(sizeof(MPC_HW_FRAME));
-	msg = sysbusRsp->data + FRAME_PAYLOAD_POFFSET;
-	sysbusRsp->len = RM_TEST_RESP_LEN;
+	mpcRsp = malloc(sizeof(MPC_HW_FRAME));
+	msg = mpcRsp->data + FRAME_PAYLOAD_POFFSET;
+	mpcRsp->len = RM_TEST_RESP_LEN;
 	if (L2_GetNodeType(linkInstPtr) == L2_NODE_HEAD)
 	{
 		// head node config
@@ -465,8 +436,8 @@ int32_t Mpc_PendRemoteTest(MPC *instPtr)
 	memcpy(msg + WD_PHY_LOG, &(instPtr->phyLog), WD_PHY_LOG_LEN);
 	memcpy(msg + WD_HARDWARE_ST, &(instPtr->hwState.spFpgaVolt), WD_HARDWARE_ST_LEN);
 
-	if (CircQueuePush(instPtr->txQueue, (void *)sysbusRsp) == false){
-		free(sysbusRsp);
+	if (CircQueuePush(instPtr->txQueue, (void *)mpcRsp) == false){
+		free(mpcRsp);
 		DBG_WARNING("SystemBus::TX Queue overflowed!\n");
 		return EQUEUE;
 	}
@@ -533,15 +504,15 @@ int32_t Mpc_MakeResp(MPC *instPtr)
 {
 	ASSERT(instPtr != NULL);
 	int32_t Status;
-	MPC_HW_FRAME *sysbusRsp;
-	if (CircQueuePop(instPtr->txQueue, (void **)(&sysbusRsp)) == false)
+	MPC_HW_FRAME *mpcRsp;
+	if (CircQueuePop(instPtr->txQueue, (void **)(&mpcRsp)) == false)
 	{
 		DBG_WARNING("SystemBus::Nothing to be sent.\n");
 		return EIGNORE;
 	}
 	instPtr->isTxDone = false; // A transmission procedure is started.
-	Status = MpcHw_Send(instPtr->mpchwDesc, sysbusRsp);
-	free(sysbusRsp);
+	Status = MpcHw_Send(instPtr->mpchwDesc, mpcRsp);
+	free(mpcRsp);
 	return Status;
 }