From bdf0d8c5c615da6c5457ca6787a588ece4e4c1cb Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Thu, 1 Sep 2022 16:32:36 +0900 Subject: [PATCH] add more info to bct err conv fn --- TlmCmd/block_command_table.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/TlmCmd/block_command_table.c b/TlmCmd/block_command_table.c index 8d1a7f5d3..9ce1bcf7f 100644 --- a/TlmCmd/block_command_table.c +++ b/TlmCmd/block_command_table.c @@ -388,30 +388,30 @@ CCP_CmdRet BCT_convert_bct_ack_to_ccp_cmd_ret(BCT_ACK ack) switch (ack) { case BCT_SUCCESS: - return CCP_make_cmd_ret_without_err_code(CCP_EXEC_SUCCESS); + return CCP_make_cmd_ret(CCP_EXEC_SUCCESS, (uint32_t)ack); // FIXME: これだめじゃん？ case BCT_INVALID_BLOCK_NO: - return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_PARAMETER); + return CCP_make_cmd_ret(CCP_EXEC_ILLEGAL_PARAMETER, (uint32_t)ack); case BCT_INVALID_CMD_NO: - return CCP_make_cmd_ret_without_err_code(CCP_EXEC_CMD_NOT_DEFINED); + return CCP_make_cmd_ret(CCP_EXEC_CMD_NOT_DEFINED, (uint32_t)ack); case BCT_DEFECTIVE_BLOCK: - return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_CONTEXT); + return CCP_make_cmd_ret(CCP_EXEC_ILLEGAL_CONTEXT, (uint32_t)ack); case BCT_CMD_TOO_LONG: - return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_PARAMETER); + return CCP_make_cmd_ret(CCP_EXEC_ILLEGAL_PARAMETER, (uint32_t)ack); case BCT_BC_FULL: - return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_CONTEXT); + return CCP_make_cmd_ret(CCP_EXEC_ILLEGAL_CONTEXT, (uint32_t)ack); case BCT_ZERO_PERIOD: - return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_PARAMETER); + return CCP_make_cmd_ret(CCP_EXEC_ILLEGAL_PARAMETER, (uint32_t)ack); // FIXME: これだめじゃん？ default: - return CCP_make_cmd_ret_without_err_code(CCP_EXEC_UNKNOWN); + return CCP_make_cmd_ret(CCP_EXEC_UNKNOWN, (uint32_t)ack); } }