X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcan-utils.hpp;h=d945be4c6020dcc7e6467b52f8d6ac5e657f037c;hb=836feaecd602e86ea6d954ae018a2d7bbc04aa7a;hp=c6b23a29acd32ba400f8057bd08d00b848ce3356;hpb=94d2332db42c506a275a71f6741a8cddfa9c0d6f;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/can-utils.hpp b/src/can-utils.hpp
index c6b23a29..d945be4c 100644
--- a/src/can-utils.hpp
+++ b/src/can-utils.hpp
@@ -139,41 +139,6 @@ class can_message_t {
 		canfd_frame convert_to_canfd_frame();
 };
 
-/** 
- * @brief Object representing a can device. Handle opening, closing and reading on the
- * socket. This is the low level object to be use by can_bus_t.
- *
- * @params[in] std::string device_name_ - name of the linux device handling the can bus. Generally vcan0, can0, etc.
- */
-class can_bus_dev_t {
-	private:
-		std::string device_name_;
-		int can_socket_;
-		bool is_fdmode_on_;
-		struct sockaddr_can txAddress_;
-
-		bool has_can_message_;
-		std::queue <can_message_t> can_message_q_;
-
-		std::thread th_reading_;
-		bool is_running_;
-
-	public:
-		can_bus_dev_t(const std::string& dev_name);
-
-		int open(const struct afb_binding_interface* interface);
-		int close();
-		bool is_running();
-		void start_reading();
-		canfd_frame read(const struct afb_binding_interface *interface);
-		
-		can_message_t next_can_message(const struct afb_binding_interface* interface);
-		void push_new_can_message(const can_message_t& can_msg);		
-		bool has_can_message() const;
-
-		int send_can_message(can_message_t& can_msg, const struct afb_binding_interface* interface);
-};
-
 /** 
  * @brief Object used to handle decoding and manage event queue to be pushed.
  *
@@ -182,27 +147,63 @@ class can_bus_dev_t {
  */
 class can_bus_t {
 	private:
-		const struct afb_binding_interface *interface_;
 		int conf_file_;
 		
 		std::thread th_decoding_;
 		std::thread th_pushing_;
 
+		bool has_can_message_;
+		std::queue <can_message_t> can_message_q_;
+
 		bool has_vehicle_message_;
 		std::queue <openxc_VehicleMessage> vehicle_message_q_;
 
 	public:
+		const struct afb_binding_interface *interface_;
+
 		can_bus_t(const struct afb_binding_interface *itf, int& conf_file);
 		int init_can_dev();
 		std::vector<std::string> read_conf();
 		
 		void start_threads();
+
+		can_message_t next_can_message();
+		void push_new_can_message(const can_message_t& can_msg);		
+		bool has_can_message() const;
 		
 		openxc_VehicleMessage next_vehicle_message();
 		void push_new_vehicle_message(const openxc_VehicleMessage& v_msg);
 		bool has_vehicle_message() const;
 };
 
+/** 
+ * @brief Object representing a can device. Handle opening, closing and reading on the
+ * socket. This is the low level object to be use by can_bus_t.
+ *
+ * @params[in] std::string device_name_ - name of the linux device handling the can bus. Generally vcan0, can0, etc.
+ */
+class can_bus_dev_t {
+	private:
+		std::string device_name_;
+		int can_socket_;
+		bool is_fdmode_on_;
+		struct sockaddr_can txAddress_;
+
+		std::thread th_reading_;
+		bool is_running_;
+
+	public:
+		can_bus_dev_t(const std::string& dev_name);
+
+		int open(const struct afb_binding_interface* interface);
+		int close();
+		bool is_running();
+		void start_reading(can_bus_t& can_bus);
+		canfd_frame read(const struct afb_binding_interface *interface);
+		
+		int send_can_message(can_message_t& can_msg, const struct afb_binding_interface* interface);
+};
+
 /**
  * @brief A state encoded (SED) signal's mapping from numerical values to
  * OpenXC state names.
@@ -399,6 +400,6 @@ void logBusStatistics(can_bus_dev_t* buses, const int busCount);
 /**
  * @brief Function representing thread activated by can bus objects
  */
-void can_reader(can_bus_dev_t& can_bus);
+void can_reader(can_bus_dev_t& can_bus_dev, can_bus_t& can_bus);
 void can_decode_message(can_bus_t& can_bus);
 void can_event_push(can_bus_t& can_bus);
\ No newline at end of file