X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fdiagnostic%2Fdiagnostic-manager.hpp;h=d942b47b5f152cbf40b084b2c36488372d722946;hb=7747851ca010a3dfe9ffee808376dd5a7af68b91;hp=3edb2b12ab13affa80030e7a23449bc3b32b20d2;hpb=f44a5b1549bc4c8a84d0dedf4a8b1e4220a34f42;p=apps%2Flow-level-can-service.git

diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
index 3edb2b1..d942b47 100644
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
@@ -21,6 +21,7 @@
 #include <map>
 #include <vector>
 
+#include "../utils/socketcan-bcm.hpp"
 #include "uds/uds.h"
 #include "openxc.pb.h"
 #include "../can/can-bus.hpp"
@@ -41,11 +42,6 @@ class active_diagnostic_request_t;
 /// the diagnostics library to the CAN device.
 ///
 class diagnostic_manager_t {
-protected:
-	static bool shims_send(const uint32_t arbitration_id, const uint8_t* data, const uint8_t size);
-	static void shims_logger(const char* m, ...);
-	static void shims_timer();
-
 private:
 	DiagnosticShims shims_; /*!< shims_ - Shim functions for each CAN bus that plug the diagnostics
 							 * library (uds-c) into the VI's CAN peripheral.*/
@@ -55,15 +51,25 @@ private:
 	std::vector<active_diagnostic_request_t*> non_recurring_requests_; /*!< nonrecurringRequests - A list of active one-time diagnostic requests. When a
 																	   * response is received for a non-recurring request or it times out, it is removed*/
 	bool initialized_; /*!< * initialized - True if the DiagnosticsManager has been initialized with shims. It will interface with the uds-c lib*/
+	utils::socketcan_bcm_t socket_; ///< socket_ - a BCM socket with 8 RX_SETUP jobs for the 8 CAN ID on which ECU could respond.
+	struct sd_event_source* event_source_;
 
 	void init_diagnostic_shims();
 	void reset();
+	int add_rx_filter(uint32_t can_id);
+
+	static bool shims_send(const uint32_t arbitration_id, const uint8_t* data, const uint8_t size);
+	static void shims_logger(const char* m, ...);
+	static void shims_timer();
 public:
 	diagnostic_manager_t();
 
 	bool initialize();
 
-	std::shared_ptr<can_bus_dev_t> get_can_bus_dev();
+	utils::socketcan_bcm_t& get_socket();
+	const std::string get_bus_name() const;
+	const std::string get_bus_device_name() const;
+	active_diagnostic_request_t* get_last_recurring_requests() const;
 	DiagnosticShims& get_shims();
 
 	void find_and_erase(active_diagnostic_request_t* entry, std::vector<active_diagnostic_request_t*>& requests_list);
@@ -72,28 +78,18 @@ public:
 	void cleanup_active_requests(bool force);
 	active_diagnostic_request_t* find_recurring_request(const DiagnosticRequest* request);
 
-	void checkSupportedPids(const active_diagnostic_request_t& request,
-		const DiagnosticResponse& response, float parsedPayload);
-
 	// Subscription parts
-	bool add_request(DiagnosticRequest* request, const std::string name,
+	active_diagnostic_request_t* add_request(DiagnosticRequest* request, const std::string& name,
 		bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
 		const DiagnosticResponseCallback callback);
 	bool validate_optional_request_attributes(float frequencyHz);
-	bool add_recurring_request(DiagnosticRequest* request, const char* name,
+	active_diagnostic_request_t* add_recurring_request(DiagnosticRequest* request, const char* name,
 		bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
 		const DiagnosticResponseCallback callback, float frequencyHz);
 
-	// Sendig requests part
-	bool conflicting(active_diagnostic_request_t* request, active_diagnostic_request_t* candidate) const;
-	bool clear_to_send(active_diagnostic_request_t* request) const;
-	int reschedule_request(sd_event_source *s, uint64_t usec, active_diagnostic_request_t* adr);
-	static int send_request(sd_event_source *s, uint64_t usec, void *userdata);
-
 	// Decoding part
 	openxc_VehicleMessage relay_diagnostic_response(active_diagnostic_request_t* adr, const DiagnosticResponse& response);
 	openxc_VehicleMessage relay_diagnostic_handle(active_diagnostic_request_t* entry, const can_message_t& cm);
 	openxc_VehicleMessage find_and_decode_adr(const can_message_t& cm);
 	bool is_diagnostic_response(const can_message_t& cm);
-
 };