X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage-definition.cpp;h=b761ad68ff56c37bb53aa0e12cbe8a364d8183d1;hb=refs%2Fchanges%2F87%2F23187%2F6;hp=efc72f0737989a4aa27df6126a6c2a9b0e4d3aa1;hpb=2f60d294b3fa4e243fa67a738f9b82a0b428a7fc;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 efc72f07..b761ad68 100644
--- a/low-can-binding/can/message-definition.cpp
+++ b/low-can-binding/can/message-definition.cpp
@@ -22,16 +22,14 @@
 message_definition_t::message_definition_t(
 	const std::string bus,
 	uint32_t id,
-	bool is_fd,
-	message_format_t format,
+	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},
-	is_fd_(is_fd),
-	format_{format},
+	flags_{flags},
 	frequency_clock_{frequency_clock},
 	force_send_changed_{force_send_changed},
 	last_value_{CAN_MESSAGE_SIZE},
@@ -42,18 +40,16 @@ message_definition_t::message_definition_t(const std::string bus,
 	uint32_t id,
 	const std::string name,
 	uint32_t length,
-	bool is_fd,
-	message_format_t format,
+	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},
 	name_{name},
 	length_{length},
-	is_fd_(is_fd),
-	format_{format},
+	flags_{flags},
 	frequency_clock_{frequency_clock},
 	force_send_changed_{force_send_changed},
 	last_value_{CAN_MESSAGE_SIZE},
@@ -68,27 +64,27 @@ 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
 {
-	return is_fd_;
+	return (flags_&FD_FRAME);
 }
 
 bool message_definition_t::is_j1939() const
 {
-	if(format_ == message_format_t::J1939)
-	{
-		return true;
-	}
-	else
-	{
-		return false;
-	}
+	return (flags_&J1939_PROTOCOL);
 }
 
-std::vector<std::shared_ptr<signal_t>>& message_definition_t::get_signals()
+bool message_definition_t::is_isotp() const
+{
+	return (flags_&ISOTP_PROTOCOL);
+}
+
+vect_ptr_signal_t& message_definition_t::get_signals()
 {
 	return signals_;
 }
@@ -102,3 +98,13 @@ void message_definition_t::set_last_value(std::shared_ptr<message_t> m)
 {
 	last_value_= m->get_data_vector();
 }
+
+uint32_t message_definition_t::get_length() const
+{
+	return length_;
+}
+
+uint32_t message_definition_t::get_flags() const
+{
+	return flags_;
+}