diff --git a/common/inc/pwrdata.h b/common/inc/pwrdata.h index 9f95c30b4a383560dd024cb4ee77b646f70a5b11..590473b87311a64a70eb9fa204cba36af31381a5 100644 --- a/common/inc/pwrdata.h +++ b/common/inc/pwrdata.h @@ -299,11 +299,11 @@ typedef struct PWR_PROC_SmartGridGov { } PWR_PROC_SmartGridGov; // HBM -typedef enum PWR_HBM_SysState { +typedef enum PWR_HBM_SYS_STATE { PWR_HBM_NOT_SUPPORT = 0, PWR_HBM_FLAT_MOD, PWR_HBM_CACHE_MOD, PWR_HBM_HYBRID_MOD, -} PWR_HBM_SysState; +} PWR_HBM_SYS_STATE; #endif \ No newline at end of file diff --git a/pwrapic/inc/powerapi.h b/pwrapic/inc/powerapi.h index a6233a8578c4b6f7c51fa10b91f082362a049088..d9dbf9b63286a8b32caada0e0f8a98e93fda4ca9 100644 --- a/pwrapic/inc/powerapi.h +++ b/pwrapic/inc/powerapi.h @@ -106,7 +106,7 @@ PWR_API int PWR_PROC_GetSmartGridGov(PWR_PROC_SmartGridGov *sgGov); PWR_API int PWR_PROC_SetSmartGridGov(const PWR_PROC_SmartGridGov *sgGov); // HBM -PWR_API int PWR_HBM_GetSysState(PWR_HBM_SysState *hbmState); +PWR_API int PWR_HBM_GetSysState(PWR_HBM_SYS_STATE *hbmState); PWR_API int PWR_HBM_SetAllPwrState(int state); #endif // #ifndef RELEASE_MODE diff --git a/pwrapic/inc/pwrhbm.h b/pwrapic/inc/pwrhbm.h index c757bebe543e5460768543c5a02b0830d6e6225c..2411b8062385ed86b858c39d9c827b6fd38a77c1 100644 --- a/pwrapic/inc/pwrhbm.h +++ b/pwrapic/inc/pwrhbm.h @@ -18,7 +18,7 @@ #include "pwrdata.h" -int GetHbmSysState(PWR_HBM_SysState *hmbState); +int GetHbmSysState(PWR_HBM_SYS_STATE *hmbState); int SetAllHbmPowerState(int state); #endif //!POWERAPI_HBM__H__ \ No newline at end of file diff --git a/pwrapic/src/powerapi.c b/pwrapic/src/powerapi.c index e5f642e7d581d43240e01eb65f268964e5e16ea6..c05ff7843da6d6ddb7f32e69639f2a3c04a8e14a 100644 --- a/pwrapic/src/powerapi.c +++ b/pwrapic/src/powerapi.c @@ -300,7 +300,7 @@ int PWR_CPU_DmaSetLatency(int latency) } // HBM -int PWR_HBM_GetSysState(PWR_HBM_SysState *hbmState) +int PWR_HBM_GetSysState(PWR_HBM_SYS_STATE *hbmState) { CHECK_STATUS(STATUS_REGISTERTED); diff --git a/pwrapic/src/pwrhbm.c b/pwrapic/src/pwrhbm.c index 90668086aee9388cb0558d2a37071be145ee1ea1..e5758948f46ad0b9635fdb9126588f2ed651b7b8 100644 --- a/pwrapic/src/pwrhbm.c +++ b/pwrapic/src/pwrhbm.c @@ -18,14 +18,14 @@ #include "pwrerr.h" #include "sockclient.h" -int GetHbmSysState(PWR_HBM_SysState *hmbState) +int GetHbmSysState(PWR_HBM_SYS_STATE *hmbState) { ReqInputParam input; input.optType = HBM_GET_SYS_STATE; input.dataLen = 0; input.data = NULL; - uint32_t size = sizeof(PWR_HBM_SysState); + uint32_t size = sizeof(PWR_HBM_SYS_STATE); RspOutputParam output; output.rspBuffSize = &size; output.rspData = (void *)hmbState; diff --git a/pwrapic/test/demo_main.c b/pwrapic/test/demo_main.c index 82f64da88b80bafe54cc4922eafa7bfe8763d99a..ba0f8d74a60e257b6c6d2382208e676d5dc892d0 100644 --- a/pwrapic/test/demo_main.c +++ b/pwrapic/test/demo_main.c @@ -593,7 +593,7 @@ static void TEST_PWR_DISK_GetList(void) static void TEST_PWR_HBM_GetSysState(void) { int ret = -1; - PWR_HBM_SysState state = PWR_HBM_HYBRID_MOD; + PWR_HBM_SYS_STATE state = PWR_HBM_HYBRID_MOD; ret = PWR_HBM_GetSysState(&state); PrintResult("TEST_PWR_HBM_GetSysState", ret); printf("hbm state is %d.\n", (int)state); diff --git a/pwrapis/src/hbmservice.c b/pwrapis/src/hbmservice.c index 443e1598cbe04733942a35bb47e66aa62247a4db..3d8f48b2d62f78fda8f7d13ccbabbcf02a2d9526 100644 --- a/pwrapis/src/hbmservice.c +++ b/pwrapis/src/hbmservice.c @@ -30,7 +30,7 @@ pclose(fp); \ } while (0) -static int GetHbmMode(PWR_HBM_SysState *state) +static int GetHbmMode(PWR_HBM_SYS_STATE *state) { char cache_mod_cmd[] = "find /sys/devices/LNXSYSTM* -name 'HISI04A1*'"; char flat_mod_cmd[] = "find /sys/devices/LNXSYSTM* -name 'PNP0C80*'"; @@ -61,7 +61,7 @@ static int GetHbmMode(PWR_HBM_SysState *state) void GetHbmSysState(PwrMsg *req) { - PWR_HBM_SysState *state = (PWR_HBM_SysState *)malloc(sizeof(PWR_HBM_SysState)); + PWR_HBM_SYS_STATE *state = (PWR_HBM_SYS_STATE *)malloc(sizeof(PWR_HBM_SYS_STATE)); if (!state) { SendRspToClient(req, PWR_ERR_SYS_EXCEPTION, NULL, 0); return; @@ -72,13 +72,13 @@ void GetHbmSysState(PwrMsg *req) free(state); SendRspToClient(req, rspCode, NULL, 0); } else { - SendRspToClient(req, rspCode, (char *)state, sizeof(PWR_HBM_SysState)); + SendRspToClient(req, rspCode, (char *)state, sizeof(PWR_HBM_SYS_STATE)); } } static int SetPowerState(int powerState) { - PWR_HBM_SysState hbmState = PWR_HBM_NOT_SUPPORT; + PWR_HBM_SYS_STATE hbmState = PWR_HBM_NOT_SUPPORT; if (GetHbmMode(&hbmState) != PWR_SUCCESS) { Logger(ERROR, MD_NM_SVR_HBM, "GetHbmMode failed"); return PWR_ERR_COMMON;