X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=low-can-binding%2Fcan%2Fmessage-definition.cpp;h=dab502afe9e1fcaf870e7e5f77796e8ea31c57c6;hb=466fa12ede042ea273828f801fbcab24196c4d60;hp=63541277c759d5974f1e37eccb5fd7411bbbdf9b;hpb=779da0a54b29db5dd4c12387970026a264d2e6cb;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/can/message-definition.cpp b/low-can-binding/can/message-definition.cpp
index 63541277..dab502af 100644
--- a/low-can-binding/can/message-definition.cpp
+++ b/low-can-binding/can/message-definition.cpp
@@ -23,7 +23,6 @@ message_definition_t::message_definition_t(
 	const std::string bus,
 	uint32_t id,
 	uint32_t flags,
-	bool frame_layout_is_little,
 	frequency_clock_t frequency_clock,
 	bool force_send_changed,
 	const vect_ptr_signal_t& signals)
@@ -31,7 +30,6 @@ message_definition_t::message_definition_t(
 	bus_{bus},
 	id_{id},
 	flags_{flags},
-	frame_layout_is_little_{frame_layout_is_little},
 	frequency_clock_{frequency_clock},
 	force_send_changed_{force_send_changed},
 	last_value_{CAN_MESSAGE_SIZE},
@@ -43,7 +41,6 @@ message_definition_t::message_definition_t(const std::string bus,
 	const std::string name,
 	uint32_t length,
 	uint32_t flags,
-	bool frame_layout_is_little,
 	frequency_clock_t frequency_clock,
 	bool force_send_changed,
 	const vect_ptr_signal_t& signals)
@@ -53,7 +50,6 @@ message_definition_t::message_definition_t(const std::string bus,
 	name_{name},
 	length_{length},
 	flags_{flags},
-	frame_layout_is_little_{frame_layout_is_little},
 	frequency_clock_{frequency_clock},
 	force_send_changed_{force_send_changed},
 	last_value_{CAN_MESSAGE_SIZE},
@@ -72,9 +68,8 @@ const std::string message_definition_t::get_name() const{
 
 uint32_t message_definition_t::get_id() const
 {
-	return id_ & CAN_EFF_MASK ?
-		id_ | CAN_EFF_FLAG :
-		id_;
+	return is_j1939() || ((id_ & CAN_SFF_MASK) == id_) ?
+		id_ : id_ | CAN_EFF_FLAG ;
 }
 
 bool message_definition_t::is_fd() const
@@ -89,7 +84,7 @@ bool message_definition_t::is_j1939() const
 
 bool message_definition_t::is_isotp() const
 {
-	return (flags_&ISOTP_PROTOCOL);
+	return (flags_ & ISOTP_PROTOCOL);
 }
 
 vect_ptr_signal_t& message_definition_t::get_signals()
@@ -117,6 +112,6 @@ uint32_t message_definition_t::get_flags() const
 	return flags_;
 }
 
-bool message_definition_t::frame_layout_is_little() const{
-	return frame_layout_is_little_;
+bool message_definition_t::frame_layout_is_bigendian() const{
+	return (flags_ & BYTE_FRAME_IS_BIG_ENDIAN);
 }