Comments, Cleanup, format

[apps/low-level-can-service.git] / CAN-binder / low-can-binding / diagnostic / diagnostic-manager.hpp

diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
index bcee3dc..05a67c8 100644 (file)
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
@@ -51,12 +51,9 @@ 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, ...);
@@ -66,9 +63,8 @@ public:
 
        bool initialize();
 
-       void read_socket();
-       utils::socketcan_bcm_t& get_socket();
-       std::string get_can_bus();
+       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();
 
@@ -76,10 +72,10 @@ public:
        void cancel_request(active_diagnostic_request_t* entry);
        void cleanup_request(active_diagnostic_request_t* entry, bool force);
        void cleanup_active_requests(bool force);
-       active_diagnostic_request_t* find_recurring_request(const DiagnosticRequest* request);
+       active_diagnostic_request_t* find_recurring_request(DiagnosticRequest& request);
 
        // Subscription parts
-       active_diagnostic_request_t* 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);