Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55f21936 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Migrate CAN bus HAL to nested namespaces 

Test: it builds
Change-Id: I83d9ef4f1fff1585e6487c95f09b55b1aa5b3e63
parent 2a34cdb7

automotive/can/1.0/default/CanBus.cpp

+2 −12
Original line number Diff line number Diff line
@@ -25,12 +25,7 @@ 
#include <linux/can/error.h>

#include <linux/can/raw.h>



namespace android {

namespace hardware {

namespace automotive {

namespace can {

namespace V1_0 {

namespace implementation {

namespace android::hardware::automotive::can::V1_0::implementation {



/** Whether to log sent/received packets. */

static constexpr bool kSuperVerbose = false;
@@ -345,9 +340,4 @@ void CanBus::onError(int errnoVal) { 
    if (errcb != nullptr) errcb();

}



}  // namespace implementation

}  // namespace V1_0

}  // namespace can

}  // namespace automotive

}  // namespace hardware

}  // namespace android
 
}  // namespace android::hardware::automotive::can::V1_0::implementation

automotive/can/1.0/default/CanBus.h

+2 −12
Original line number Diff line number Diff line
@@ -26,12 +26,7 @@ 
#include <atomic>

#include <thread>



namespace android {

namespace hardware {

namespace automotive {

namespace can {

namespace V1_0 {

namespace implementation {

namespace android::hardware::automotive::can::V1_0::implementation {



struct CanBus : public ICanBus {

    using ErrorCallback = std::function<void()>;
@@ -114,9 +109,4 @@ struct CanBus : public ICanBus { 
    ErrorCallback mErrCb;

};



}  // namespace implementation

}  // namespace V1_0

}  // namespace can

}  // namespace automotive

}  // namespace hardware

}  // namespace android
 
}  // namespace android::hardware::automotive::can::V1_0::implementation

automotive/can/1.0/default/CanBusNative.cpp

+2 −12
Original line number Diff line number Diff line
@@ -20,12 +20,7 @@ 
#include <libnetdevice/can.h>

#include <libnetdevice/libnetdevice.h>



namespace android {

namespace hardware {

namespace automotive {

namespace can {

namespace V1_0 {

namespace implementation {

namespace android::hardware::automotive::can::V1_0::implementation {



CanBusNative::CanBusNative(const std::string& ifname, uint32_t baudrate)

    : CanBus(ifname), mBaudrate(baudrate) {}
@@ -49,9 +44,4 @@ ICanController::Result CanBusNative::preUp() { 
    return ICanController::Result::OK;

}



}  // namespace implementation

}  // namespace V1_0

}  // namespace can

}  // namespace automotive

}  // namespace hardware

}  // namespace android
 
}  // namespace android::hardware::automotive::can::V1_0::implementation

automotive/can/1.0/default/CanBusNative.h

+2 −12
Original line number Diff line number Diff line
@@ -18,12 +18,7 @@ 


#include "CanBus.h"



namespace android {

namespace hardware {

namespace automotive {

namespace can {

namespace V1_0 {

namespace implementation {

namespace android::hardware::automotive::can::V1_0::implementation {



struct CanBusNative : public CanBus {

    CanBusNative(const std::string& ifname, uint32_t baudrate);
@@ -35,9 +30,4 @@ struct CanBusNative : public CanBus { 
    const uint32_t mBaudrate;

};



}  // namespace implementation

}  // namespace V1_0

}  // namespace can

}  // namespace automotive

}  // namespace hardware

}  // namespace android
 
}  // namespace android::hardware::automotive::can::V1_0::implementation

automotive/can/1.0/default/CanBusSlcan.cpp

+2 −12
Original line number Diff line number Diff line
@@ -25,12 +25,7 @@ 
#include <sys/stat.h>

#include <termios.h>



namespace android {

namespace hardware {

namespace automotive {

namespace can {

namespace V1_0 {

namespace implementation {

namespace android::hardware::automotive::can::V1_0::implementation {



namespace slcanprotocol {

static const std::string kOpenCommand = "O\r";
@@ -158,9 +153,4 @@ bool CanBusSlcan::postDown() { 
    return true;

}



}  // namespace implementation

}  // namespace V1_0

}  // namespace can

}  // namespace automotive

}  // namespace hardware

}  // namespace android
 
}  // namespace android::hardware::automotive::can::V1_0::implementation