1 files changed, 9 insertions, 18 deletions
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
index f66f1c6bb9..2c27e0d20f 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
@@ -39,8 +39,6 @@
 #include <memory>
 #include <string>
 
-#include "utils/lock.h"
-#include "utils/rwlock.h"
 #include "transport_manager/transport_adapter/transport_adapter.h"
 #include "transport_manager/transport_adapter/transport_adapter_controller.h"
 #include "transport_manager/transport_adapter/connection.h"
@@ -101,12 +99,6 @@ class TransportAdapterImpl : public TransportAdapter,
   virtual TransportAdapter::Error Init();
 
   /**
-   * @brief Stops device adapter
-   * Called from transport manager to stop device adapter
-   */
-  virtual void Terminate();
-
-  /**
    * @brief Add listener to the container(list) of device adapter listeners.
    *
    * @param listener Pointer to the device adapter listener.
@@ -501,7 +493,7 @@ class TransportAdapterImpl : public TransportAdapter,
   /**
    * @brief Mutex restricting access to device map.
    **/
-  mutable sync_primitives::Lock devices_mutex_;
+  mutable pthread_mutex_t devices_mutex_;
 
   /**
    * @brief Container(map) of connections.
@@ -511,16 +503,9 @@ class TransportAdapterImpl : public TransportAdapter,
   /**
    * @brief Mutex restricting access to connections map.
    **/
-  mutable sync_primitives::RWLock connections_lock_;
+  mutable pthread_mutex_t connections_mutex_;
 
  protected:
-#ifdef TIME_TESTER
-  /**
-   * @brief Pointer to time metric observer
-   */
-  TMMetricObserver* metric_observer_;
-#endif  // TIME_TESTER
-
   /**
    * @brief Pointer to the device scanner.
    */
@@ -535,8 +520,14 @@ class TransportAdapterImpl : public TransportAdapter,
    * @brief Pointer to the factory of connections initiated from client.
    */
   ClientConnectionListener* client_connection_listener_;
-};
 
+#ifdef TIME_TESTER
+  /**
+   * @brief Pointer to time metric observer
+   */
+  TMMetricObserver* metric_observer_;
+#endif  // TIME_TESTER
+};
 }  // namespace transport_adapter
 }  // namespace transport_manager