X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage-definition.cpp;h=b761ad68ff56c37bb53aa0e12cbe8a364d8183d1;hb=8a4792aa20a7b8fa9efc0fce558ac341ee46486f;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..b761ad68 100644
--- a/low-can-binding/can/message-definition.cpp
+++ b/low-can-binding/can/message-definition.cpp
@@ -25,7 +25,7 @@ message_definition_t::message_definition_t(
 	uint32_t flags,
 	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},
@@ -43,7 +43,7 @@ message_definition_t::message_definition_t(const std::string bus,
 	uint32_t flags,
 	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},
@@ -64,7 +64,9 @@ const std::string message_definition_t::get_bus_device_name() const
 
 uint32_t message_definition_t::get_id() const
 {
-	return id_;
+	return id_ & CAN_EFF_MASK ?
+		id_ | CAN_EFF_FLAG :
+		id_;
 }
 
 bool message_definition_t::is_fd() const
@@ -82,7 +84,7 @@ bool message_definition_t::is_isotp() const
 	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 +107,4 @@ uint32_t message_definition_t::get_length() const
 uint32_t message_definition_t::get_flags() const
 {
 	return flags_;
-}
\ No newline at end of file
+}