X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage-definition.cpp;h=5977fb49c11f0dd2145900b6e998de5231254923;hb=24bb25c9f16ecace05b64142493dce596f5a9e37;hp=a875dafa567ba89e28250edeb52468ae560db8ff;hpb=b8e8186c95f50e76aa4d88c3c751053568ab7cdf;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 a875dafa..5977fb49 100644
--- a/low-can-binding/can/message-definition.cpp
+++ b/low-can-binding/can/message-definition.cpp
@@ -23,13 +23,15 @@ 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 std::vector<std::shared_ptr<signal_t> >& signals)
+	const vect_ptr_signal_t& signals)
 	:  parent_{nullptr},
 	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},
@@ -41,15 +43,17 @@ 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 std::vector<std::shared_ptr<signal_t> >& signals)
+	const vect_ptr_signal_t& signals)
 	: parent_{nullptr},
 	bus_{bus},
 	id_{id},
 	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},
@@ -62,27 +66,31 @@ const std::string message_definition_t::get_bus_device_name() const
 		.get_can_device_name(bus_);
 }
 
+const std::string message_definition_t::get_name() const{
+	return name_;
+}
+
 uint32_t message_definition_t::get_id() const
 {
-	return id_;
+	return ((id_ & CAN_SFF_MASK) != id_) ? id_ | CAN_EFF_FLAG : id_;
 }
 
 bool message_definition_t::is_fd() const
 {
-	return (flags_&FD_FRAME);
+	return (flags_ & CAN_PROTOCOL_WITH_FD_FRAME);
 }
 
 bool message_definition_t::is_j1939() const
 {
-	return (flags_&J1939_PROTOCOL);
+	return (flags_ & J1939_PROTOCOL);
 }
 
 bool message_definition_t::is_isotp() const
 {
-	return (flags_&ISOTP_PROTOCOL);
+	return (flags_ & ISOTP_PROTOCOL);
 }
 
-std::vector<std::shared_ptr<signal_t>>& message_definition_t::get_signals()
+vect_ptr_signal_t& message_definition_t::get_signals()
 {
 	return signals_;
 }
@@ -105,4 +113,8 @@ uint32_t message_definition_t::get_length() const
 uint32_t message_definition_t::get_flags() const
 {
 	return flags_;
-}
\ No newline at end of file
+}
+
+bool message_definition_t::frame_layout_is_little() const{
+	return frame_layout_is_little_;
+}