X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage%2Fcan-message.cpp;h=5c3e0f0ef6d1f0f65c1671b3f9a41638069f1ed1;hb=45d94ded14cb99aafa8c93c5d1cce457551e48ea;hp=b274206b6e83ec4bbc7ef86611d758ddac868a4f;hpb=b8e8186c95f50e76aa4d88c3c751053568ab7cdf;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/can/message/can-message.cpp b/low-can-binding/can/message/can-message.cpp index b274206b..5c3e0f0e 100644 --- a/low-can-binding/can/message/can-message.cpp +++ b/low-can-binding/can/message/can-message.cpp @@ -114,12 +114,10 @@ std::shared_ptr can_message_t::convert_from_frame(const struct ca } else if (frame.can_id & CAN_EFF_FLAG) { - flags = flags|EXTENDED_ID; id = frame.can_id & CAN_EFF_MASK; } else { - flags = flags|STANDARD_ID; id = frame.can_id & CAN_SFF_MASK; } @@ -206,12 +204,12 @@ struct std::vector can_message_t::convert_to_canfd_frame_vector() std::vector data = get_data_vector((i*64),(i*64)+63); if(data.size()<64) { - ::memset(frame.data,0,sizeof(frame.data)); - ::memcpy(frame.data,data.data(),data.size()); + ::memset(frame.data, 0, sizeof(frame.data)); + ::memcpy(frame.data, data.data(), data.size()); } else { - ::memcpy(frame.data,data.data(),64); + ::memcpy(frame.data, data.data(), 64); } ret.push_back(frame); i++; @@ -228,13 +226,13 @@ struct std::vector can_message_t::convert_to_canfd_frame_vector() std::vector data = get_data_vector(i*8,(i*8)+7); if(data.size()<8) { - ::memset(frame.data,0,sizeof(frame.data)); - ::memcpy(frame.data,data.data(),data.size()); + ::memset(frame.data, 0, sizeof(frame.data)); + ::memcpy(frame.data, data.data(), data.size()); } else { - ::memset(frame.data,0,sizeof(frame.data)); - ::memcpy(frame.data,data.data(),8); + ::memset(frame.data, 0, sizeof(frame.data)); + ::memcpy(frame.data, data.data(), 8); } ret.push_back(frame); i++;