Rename method to have same everywhere

[apps/agl-service-can-low-level.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 f9f2018..bb7fbfa 100644 (file)
--- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
+++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp
@@ -56,7 +56,7 @@ private:
 
        void init_diagnostic_shims();
        void reset();
-       int add_rx_filter(uint32_t can_id);
+       int create_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,11 +66,12 @@ 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();
+       bool socket_close();
 
        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);
@@ -78,11 +79,8 @@ 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
-       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);
@@ -90,12 +88,6 @@ public:
                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);