diff --git a/Examples/minimum_user_for_s2e/src/src_user/TlmCmd/common_tlm_cmd_packet.c b/Examples/minimum_user_for_s2e/src/src_user/TlmCmd/common_tlm_cmd_packet.c index 66fb52d21..a12023053 100644 --- a/Examples/minimum_user_for_s2e/src/src_user/TlmCmd/common_tlm_cmd_packet.c +++ b/Examples/minimum_user_for_s2e/src/src_user/TlmCmd/common_tlm_cmd_packet.c @@ -9,9 +9,9 @@ #include -CTCP_PACKET_TYPE CTCP_get_tc_dsc(const CommonTlmCmdPacket* packet) +CTCP_PACKET_TYPE CTCP_get_packet_type(const CommonTlmCmdPacket* packet) { - switch (CTCP_get_packet_type(packet)) + switch (TCP_get_type(packet)) { case TCP_TYPE_TLM: return CTCP_PACKET_TYPE_TLM; diff --git a/TlmCmd/packet_handler.c b/TlmCmd/packet_handler.c index 4ce50425e..21fbba4ad 100644 --- a/TlmCmd/packet_handler.c +++ b/TlmCmd/packet_handler.c @@ -66,12 +66,12 @@ void PH_init(void) // Cmd_GENERATE_TLMとかも. PH_ACK PH_analyze_packet(const CTCP* packet) { - switch (CTCP_get_tc_dsc(packet)) + switch (CTCP_get_packet_type(packet)) { - case CTCP_TC_DSC_CMD: + case CTCP_PACKET_TYPE_CMD: return PH_analyze_cmd_(packet); - case CTCP_TC_DSC_TLM: + case CTCP_PACKET_TYPE_TLM: return PH_analyze_tlm_(packet); default: @@ -166,7 +166,7 @@ static PH_ACK PH_analyze_tlm_(const CTCP* packet) CCP_EXEC_STS PH_dispatch_command(const CTCP* packet) { - if (CTCP_get_tc_dsc(packet) != CTCP_PACKET_TYPE_CMD) + if (CTCP_get_packet_type(packet) != CTCP_PACKET_TYPE_CMD) { // CMD以外のパケットが来たら異常判定。 return CCP_EXEC_PACKET_FMT_ERR;