X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdiagnostic%2Fdiagnostic-manager.hpp;h=71662ba1a8070ee18a06a2193c436cab42705d76;hb=a67c74b2f5e53e628f07846ca9c8acd42ac94794;hp=05752f6b35a03ff847ba72dee451e87f82b02046;hpb=a0b229d33eb8bf076bc40f9a31dbd3a689a335e1;p=apps%2Flow-level-can-service.git

diff --git a/src/diagnostic/diagnostic-manager.hpp b/src/diagnostic/diagnostic-manager.hpp
index 05752f6..71662ba 100644
--- a/src/diagnostic/diagnostic-manager.hpp
+++ b/src/diagnostic/diagnostic-manager.hpp
@@ -17,10 +17,11 @@
 
 #pragma once
 
-#include <queue>
+#include <systemd/sd-event.h>
 #include <vector>
 
 #include "uds/uds.h"
+#include "openxc.pb.h"
 #include "../can/can-bus-dev.hpp"
 #include "../can/can-message.hpp"
 #include "active-diagnostic-request.hpp"
@@ -31,6 +32,7 @@
  * match the maximum CAN controller count.
  */
 #define MAX_SHIM_COUNT can_bus_t.get_can_devices().size()
+#define DIAGNOSTIC_RESPONSE_ARBITRATION_ID_OFFSET 0x8
 
 class active_diagnostic_request_t;
 
@@ -49,39 +51,30 @@ protected:
 private:
 	DiagnosticShims shims_; /*!< shims_ - An array of shim functions for each CAN bus that plug the diagnostics
 							 * library (uds-c) into the VI's CAN peripheral.*/
-	can_bus_dev_t* bus_; /*!< bus_ - A pointer to the CAN bus that should be used for all standard OBD-II requests, if the bus is not
+	std::shared_ptr<can_bus_dev_t> bus_; /*!< bus_ - A pointer to the CAN bus that should be used for all standard OBD-II requests, if the bus is not
 						  * explicitly spcified in the request. If NULL, all requests require an explicit bus.*/
-	std::vector<active_diagnostic_request_t> recurring_requests_; /*!< recurringRequests - A queue of active, recurring diagnostic requests. When
-																  * a response is received for a recurring request or it times out, it is
-																  * popped from the queue and pushed onto the back. */
-	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 from this list and placed back in the free list.*/
-	std::vector<active_diagnostic_request_t> free_request_entries_; /*!< freeRequestEntries - A list of all available slots for active diagnostic
-																	 * requests. This free list is backed by statically allocated entries in
-																	 * the requestListEntries attribute.*/
-	std::vector<active_diagnostic_request_t> request_list_entries_; /*!< requestListEntries - Static allocation for all active diagnostic requests.*/
-
+	std::vector<active_diagnostic_request_t*> recurring_requests_; /*!< recurringRequests - A list of active recurring diagnostic requests.*/
+	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*/
 
+	void init_diagnostic_shims();
+	void reset();
 public:
 	diagnostic_manager_t();
-	diagnostic_manager_t(can_bus_dev_t& bus);
 
-	void init_diagnostic_shims();
+	bool initialize(std::shared_ptr<can_bus_dev_t> cbd);
 
-	can_bus_dev_t* get_can_bus_dev();
-	active_diagnostic_request_t& get_free_entry();
+	std::shared_ptr<can_bus_dev_t> get_can_bus_dev();
+	DiagnosticShims& get_shims();
 
-	void find_and_erase(active_diagnostic_request_t& entry, std::vector<active_diagnostic_request_t>& requests_list);
-	void cancel_request(active_diagnostic_request_t& entry);
-	void cleanup_request(active_diagnostic_request_t& entry, bool force);
+	void find_and_erase(active_diagnostic_request_t* entry, std::vector<active_diagnostic_request_t*>& requests_list);
+	void cancel_request(active_diagnostic_request_t* entry);
+	void cleanup_request(active_diagnostic_request_t* entry, bool force);
 	void cleanup_active_requests(bool force);
-	bool lookup_recurring_request(const DiagnosticRequest* request);
-
+	active_diagnostic_request_t* find_recurring_request(const DiagnosticRequest* request);
 
 	bool validate_optional_request_attributes(float frequencyHz);
-	void reset();
 
 	void checkSupportedPids(const active_diagnostic_request_t& request,
 		const DiagnosticResponse& response, float parsedPayload);
@@ -93,4 +86,13 @@ public:
 	bool add_recurring_request(DiagnosticRequest* request, const char* name,
 		bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
 		const DiagnosticResponseCallback callback, float frequencyHz);
+	
+	bool is_diagnostic_response(const active_diagnostic_request_t& adr, const can_message_t& cm) const;
+	active_diagnostic_request_t* is_diagnostic_response(const can_message_t& can_message);
+
+	openxc_VehicleMessage relay_diagnostic_response(active_diagnostic_request_t* adr, const DiagnosticResponse& response) const;
+
+	bool conflicting(active_diagnostic_request_t* request, active_diagnostic_request_t* candidate) const;
+	bool clear_to_send(active_diagnostic_request_t* request) const;
+	static int send_request(sd_event_source *s, uint64_t usec, void *userdata);
 };