diff --git a/display/composer/v1_0/display_command/display_cmd_requester.h b/display/composer/v1_0/display_command/display_cmd_requester.h index fed5e7c5325d94fbd9e5fe8a2806c5ddc47ea02a..a70d0f2580979bdb501e9ef9f9ad1f2e629c65a2 100755 --- a/display/composer/v1_0/display_command/display_cmd_requester.h +++ b/display/composer/v1_0/display_command/display_cmd_requester.h @@ -987,13 +987,12 @@ protected: void ReqCmdDump() { - HDF_LOGW("@ DevId | count | len | cmdId \n"); - HDF_LOGW("@ -------+-------+-------+--------------------------------------------------\n"); + HDF_LOGW("@ DevId | cmdId | count | len \n"); + HDF_LOGW("@ -------+--------+-------+-------\n"); for (auto iterDev = reqCmdMaps.begin(); iterDev != reqCmdMaps.end(); iterDev++) { for (auto iterCmdInfo = iterDev->second.begin(); iterCmdInfo != iterDev->second.end(); iterCmdInfo++) { - HDF_LOGW("@ %{public}u | %{public}u | %{public}u | %{public}s \n", - iterDev->first, iterCmdInfo->second.count, iterCmdInfo->second.len, - CmdUtils::CommandToString(iterCmdInfo->first)); + HDF_LOGW("@ %{public}u | %{public}d | %{public}u | %{public}u \n", + iterDev->first, iterCmdInfo->first, iterCmdInfo->second.count, iterCmdInfo->second.len); } } } diff --git a/display/composer/v1_0/display_command/display_cmd_utils.h b/display/composer/v1_0/display_command/display_cmd_utils.h index bca209ad5a1e46f081ed7443c843469129d54bb2..f9c1f76362396c4114edbfce4539cd17447f6d4a 100644 --- a/display/composer/v1_0/display_command/display_cmd_utils.h +++ b/display/composer/v1_0/display_command/display_cmd_utils.h @@ -20,7 +20,7 @@ #include "command_pack/command_data_packer.h" #include "command_pack/command_data_unpacker.h" #include "common/include/display_interface_utils.h" -#include "v1_2/display_composer_type.h" +#include "v1_0/display_composer_type.h" #undef LOG_TAG #define LOG_TAG "DISP_CMD" @@ -69,10 +69,6 @@ public: SWITCHCASE(REQUEST_CMD_SET_LAYER_VISIBLE); SWITCHCASE(REQUEST_CMD_SET_LAYER_MASK_INFO); SWITCHCASE(REQUEST_CMD_SET_LAYER_COLOR); - SWITCHCASE(V1_2::REQUEST_CMD_COMMIT_AND_GET_RELEASE_FENCE); - SWITCHCASE(V1_2::REQUEST_CMD_SET_DISPLAY_CONSTRAINT); - SWITCHCASE(V1_2::REQUEST_CMD_SET_LAYER_PERFRAME_PARAM); - SWITCHCASE(V1_2::REQUEST_CMD_SET_DISPLAY_PERFRAME_PARAM); /* reply cmd */ SWITCHCASE(REPLY_CMD_SET_ERROR); SWITCHCASE(REPLY_CMD_PREPARE_DISPLAY_LAYERS);