1 files changed, 16 insertions, 18 deletions

diff --git a/src/components/transport_manager/src/usb/usb_device_scanner.cc b/src/components/transport_manager/src/usb/usb_device_scanner.cc
index 51d521c1bf..b0749728a6 100644
--- a/src/components/transport_manager/src/usb/usb_device_scanner.cc
+++ b/src/components/transport_manager/src/usb/usb_device_scanner.cc
@@ -42,7 +42,7 @@
 namespace transport_manager {
 namespace transport_adapter {
 
-CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager")
+SDL_CREATE_LOG_VARIABLE("TransportManager")
 
 class AoaInitSequence : public UsbControlTransferSequence {
  public:
@@ -57,7 +57,7 @@ class AoaInitSequence : public UsbControlTransferSequence {
 };
 
 void UsbDeviceScanner::OnDeviceArrived(PlatformUsbDevice* device) {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   if (IsAppleDevice(device)) {
     SupportedDeviceFound(device);
   } else {
@@ -70,8 +70,8 @@ void UsbDeviceScanner::OnDeviceArrived(PlatformUsbDevice* device) {
 }
 
 void UsbDeviceScanner::OnDeviceLeft(PlatformUsbDevice* device) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  LOG4CXX_DEBUG(logger_, "PlatformUsbDevice " << device);
+  SDL_LOG_AUTO_TRACE();
+  SDL_LOG_DEBUG("PlatformUsbDevice " << device);
   bool list_changed = false;
   devices_mutex_.Acquire();
   for (Devices::iterator it = devices_.begin(); it != devices_.end(); ++it) {
@@ -112,7 +112,7 @@ class AoaInitSequence::AoaGetProtocolRequest : public UsbControlInTransfer {
   }
   virtual bool OnCompleted(unsigned char* data) const {
     const int protocol_version = data[1] << 8 | data[0];
-    LOG4CXX_DEBUG(logger_, "AOA protocol version " << protocol_version);
+    SDL_LOG_DEBUG("AOA protocol version " << protocol_version);
     if (protocol_version == 0) {
       // AOA protocol not supported
       return false;
@@ -192,26 +192,24 @@ AoaInitSequence::AoaInitSequence(const TransportManagerSettings& settings)
 }
 
 void UsbDeviceScanner::TurnIntoAccessoryMode(PlatformUsbDevice* device) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  LOG4CXX_DEBUG(logger_, "PlatformUsbDevice: " << device);
+  SDL_LOG_AUTO_TRACE();
+  SDL_LOG_DEBUG("PlatformUsbDevice: " << device);
   GetUsbHandler()->StartControlTransferSequence(new AoaInitSequence(settings_),
                                                 device);
 }
 
 void UsbDeviceScanner::SupportedDeviceFound(PlatformUsbDevice* device) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  LOG4CXX_TRACE(logger_, "PlatformUsbDevice: " << device);
+  SDL_LOG_AUTO_TRACE();
+  SDL_LOG_TRACE("PlatformUsbDevice: " << device);
 
   devices_mutex_.Acquire();
   devices_.push_back(device);
   devices_mutex_.Release();
-  LOG4CXX_DEBUG(logger_,
-                "USB device (bus number "
-                    << static_cast<int>(device->bus_number()) << ", address "
-                    << static_cast<int>(device->address())
-                    << ") identified as: " << device->GetManufacturer() << ", "
-                    << device->GetProductName()
-                    << ", serial: " << device->GetSerialNumber());
+  SDL_LOG_DEBUG("USB device (bus number "
+                << static_cast<int>(device->bus_number()) << ", address "
+                << static_cast<int>(device->address()) << ") identified as: "
+                << device->GetManufacturer() << ", " << device->GetProductName()
+                << ", serial: " << device->GetSerialNumber());
   UpdateList();
 }
 
@@ -224,7 +222,7 @@ TransportAdapter::Error UsbDeviceScanner::Scan() {
 }
 
 void UsbDeviceScanner::UpdateList() {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   DeviceVector device_vector;
   devices_mutex_.Acquire();
   for (Devices::const_iterator it = devices_.begin(); it != devices_.end();
@@ -240,7 +238,7 @@ void UsbDeviceScanner::UpdateList() {
   }
   devices_mutex_.Release();
 
-  LOG4CXX_DEBUG(logger_, "USB search done " << device_vector.size());
+  SDL_LOG_DEBUG("USB search done " << device_vector.size());
   controller_->SearchDeviceDone(device_vector);
 }