clean uo & enhance coherence

This commit is contained in:
Gatsby Van
2024-03-12 20:49:24 +08:00
parent 2898bdfa15
commit c3e0c7a66a
+17 -46
View File
@@ -155,6 +155,11 @@
// Remote Test // Remote Test
#define RM_TEST_RESP_LEN 158 #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 WD_RM_TEST 0x02
#define RM_TEST_CODE 0x99 #define RM_TEST_CODE 0x99
// -- Response // -- Response
@@ -169,40 +174,6 @@
#define WD_HARDWARE_ST 0x91 #define WD_HARDWARE_ST 0x91
#define WD_HARDWARE_ST_LEN 13 #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 // My Production Type
#define MY_PRD_ID PRD_DL_K #define MY_PRD_ID PRD_DL_K
@@ -426,21 +397,21 @@ mpc_init_error:
******************************************************************************/ ******************************************************************************/
int32_t Mpc_PendRemoteTest(MPC *instPtr) int32_t Mpc_PendRemoteTest(MPC *instPtr)
{ {
MPC_HW_FRAME *sysbusRsp; MPC_HW_FRAME *mpcRsp;
uint8_t *msg; uint8_t *msg;
if (instPtr->isEnable == false) if (instPtr->isEnable == false)
{ {
DBG_ERROR("System is not enabled!\n"); DBG_ERROR("System is not enabled!\n");
return EIGNORE; return EIGNORE;
} }
sysbusRsp = malloc(sizeof(MPC_HW_FRAME)); mpcRsp = malloc(sizeof(MPC_HW_FRAME));
if (sysbusRsp == NULL) { if (mpcRsp == NULL) {
DBG_ERROR("Failed to allocate memory for LJ REMOTE TEST Response!\n"); DBG_ERROR("Failed to allocate memory for LJ REMOTE TEST Response!\n");
return ENOMEM; return ENOMEM;
} }
sysbusRsp = malloc(sizeof(MPC_HW_FRAME)); mpcRsp = malloc(sizeof(MPC_HW_FRAME));
msg = sysbusRsp->data + FRAME_PAYLOAD_POFFSET; msg = mpcRsp->data + FRAME_PAYLOAD_POFFSET;
sysbusRsp->len = RM_TEST_RESP_LEN; mpcRsp->len = RM_TEST_RESP_LEN;
if (L2_GetNodeType(linkInstPtr) == L2_NODE_HEAD) if (L2_GetNodeType(linkInstPtr) == L2_NODE_HEAD)
{ {
// head node config // 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_PHY_LOG, &(instPtr->phyLog), WD_PHY_LOG_LEN);
memcpy(msg + WD_HARDWARE_ST, &(instPtr->hwState.spFpgaVolt), WD_HARDWARE_ST_LEN); memcpy(msg + WD_HARDWARE_ST, &(instPtr->hwState.spFpgaVolt), WD_HARDWARE_ST_LEN);
if (CircQueuePush(instPtr->txQueue, (void *)sysbusRsp) == false){ if (CircQueuePush(instPtr->txQueue, (void *)mpcRsp) == false){
free(sysbusRsp); free(mpcRsp);
DBG_WARNING("SystemBus::TX Queue overflowed!\n"); DBG_WARNING("SystemBus::TX Queue overflowed!\n");
return EQUEUE; return EQUEUE;
} }
@@ -533,15 +504,15 @@ int32_t Mpc_MakeResp(MPC *instPtr)
{ {
ASSERT(instPtr != NULL); ASSERT(instPtr != NULL);
int32_t Status; int32_t Status;
MPC_HW_FRAME *sysbusRsp; MPC_HW_FRAME *mpcRsp;
if (CircQueuePop(instPtr->txQueue, (void **)(&sysbusRsp)) == false) if (CircQueuePop(instPtr->txQueue, (void **)(&mpcRsp)) == false)
{ {
DBG_WARNING("SystemBus::Nothing to be sent.\n"); DBG_WARNING("SystemBus::Nothing to be sent.\n");
return EIGNORE; return EIGNORE;
} }
instPtr->isTxDone = false; // A transmission procedure is started. instPtr->isTxDone = false; // A transmission procedure is started.
Status = MpcHw_Send(instPtr->mpchwDesc, sysbusRsp); Status = MpcHw_Send(instPtr->mpchwDesc, mpcRsp);
free(sysbusRsp); free(mpcRsp);
return Status; return Status;
} }