X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=low-can-binding%2Fbinding%2Flow-can-subscription.hpp;h=61c354d10a00b626d82c31beafe8dfabd341cb7f;hb=c88f115014d9e75e4d1cc0db9762f11ca8532afb;hp=ded600c5140c7e8af79a1326997a408c33ffc6e5;hpb=9f0d5da859bfe7778394f35baf48fbe77f1ed7d9;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/binding/low-can-subscription.hpp b/low-can-binding/binding/low-can-subscription.hpp
index ded600c5..61c354d1 100644
--- a/low-can-binding/binding/low-can-subscription.hpp
+++ b/low-can-binding/binding/low-can-subscription.hpp
@@ -15,15 +15,16 @@
  * limitations under the License.
  */
 
-  #pragma once
+#pragma once
 
 #include <string>
 #include <cmath>
 #include <utility>
 
-#include "../can/can-signals.hpp"
+#include "../can/signals.hpp"
 #include "../diagnostic/diagnostic-message.hpp"
-#include "../utils/socketcan-bcm.hpp"
+#include "../utils/socketcan.hpp"
+
 
 #define OBDII_MAX_SIMULTANEOUS_RESPONSES 8
 
@@ -51,10 +52,10 @@ private:
 	afb_event_t event_; ///< event_ - application framework event used to push on client
 
 	/// Signal part
-	std::shared_ptr<can_signal_t> can_signal_; ///< can_signal_ - the CAN signal subscribed
+	std::shared_ptr<signal_t> signal_; ///< signal_ - the CAN signal subscribed
 	std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_message_; ///< diagnostic_message_ - diagnostic messages meant to receive OBD2
 										 /// responses. Normal diagnostic request and response are not tested for now.
-	std::shared_ptr<utils::socketcan_bcm_t> socket_; ///< socket_ - socket_ that receives CAN messages.
+	std::shared_ptr<utils::socketcan_t> socket_; ///< socket_ - socket_ that receives CAN messages.
 
 	int set_event();
 
@@ -73,8 +74,8 @@ public:
 	int unsubscribe(afb_req_t request);
 
 	int get_index() const;
-	const std::shared_ptr<can_signal_t> get_can_signal() const;
-	bool is_signal_subscription_corresponding(const std::shared_ptr<can_signal_t>, const struct event_filter_t& event_filter) const;
+	const std::shared_ptr<signal_t> get_signal() const;
+	bool is_signal_subscription_corresponding(const std::shared_ptr<signal_t>, const struct event_filter_t& event_filter) const;
 	const std::shared_ptr<diagnostic_message_t> get_diagnostic_message(uint32_t pid) const;
 	const std::vector<std::shared_ptr<diagnostic_message_t> > get_diagnostic_message() const;
 	const std::shared_ptr<diagnostic_message_t> get_diagnostic_message(const std::string& name) const;
@@ -89,14 +90,16 @@ public:
 	void set_min(float min);
 	void set_max(float max);
 
-	struct utils::bcm_msg make_bcm_head(uint32_t opcode, uint32_t can_id = 0, uint32_t flags = 0, const struct timeval& timeout = {0,0}, const struct timeval& frequency_thinning = {0,0}) const;
-	void add_one_bcm_frame(struct canfd_frame& cfd, struct utils::bcm_msg& bcm_msg) const;
+	static struct bcm_msg make_bcm_head(uint32_t opcode, uint32_t can_id = 0, uint32_t flags = 0, const struct timeval& timeout = {0,0}, const struct timeval& frequency_thinning = {0,0});
+	static void add_one_bcm_frame(struct canfd_frame& cfd, struct bcm_msg& bcm_msg);
 
-	int open_socket(const std::string& bus_name = "");
+	static int open_socket(low_can_subscription_t &subscription, const std::string& bus_name = "");
 
-	int create_rx_filter(std::shared_ptr<can_signal_t> sig);
+	int create_rx_filter(std::shared_ptr<signal_t> sig);
 	int create_rx_filter(std::shared_ptr<diagnostic_message_t> sig);
-	int create_rx_filter(utils::bcm_msg& bcm_msg);
+	static int create_rx_filter_can(low_can_subscription_t &subscription, std::shared_ptr<signal_t> sig);
+	static int create_rx_filter_j1939(low_can_subscription_t &subscription, std::shared_ptr<signal_t> sig);
+	static int create_rx_filter_bcm(low_can_subscription_t &subscription, bcm_msg& bcm_msg);
 
-	int tx_send(struct canfd_frame& cfd, const std::string& bus_name);
+	static int tx_send(low_can_subscription_t &subscription, struct canfd_frame& cfd, const std::string& bus_name);
 };