diff --git a/src/modules/syslink/syslink_bridge.cpp b/src/modules/syslink/syslink_bridge.cpp index 7912fb90b2..7c7ac1e21a 100644 --- a/src/modules/syslink/syslink_bridge.cpp +++ b/src/modules/syslink/syslink_bridge.cpp @@ -44,7 +44,7 @@ SyslinkBridge::SyslinkBridge(Syslink *link) : - CDev("SyslinkBridge", "/dev/bridge0"), + CDev("/dev/bridge0"), _link(link), _readbuffer(16, sizeof(crtp_message_t)) { @@ -55,12 +55,6 @@ SyslinkBridge::SyslinkBridge(Syslink *link) : //ideally _msg_to_send.data size should be CRTP_MAX_DATA_SIZE but cfbridge does not receive 31 bytes of data due to a bug somewhere } -SyslinkBridge::~SyslinkBridge() -{ - -} - - int SyslinkBridge::init() { @@ -68,7 +62,7 @@ SyslinkBridge::init() /* if init failed, bail now */ if (ret != OK) { - DEVICE_DEBUG("CDev init failed"); + PX4_DEBUG("CDev init failed"); return ret; } diff --git a/src/modules/syslink/syslink_main.h b/src/modules/syslink/syslink_main.h index c71bc4ff8d..cc3665dead 100644 --- a/src/modules/syslink/syslink_main.h +++ b/src/modules/syslink/syslink_main.h @@ -154,12 +154,12 @@ private: }; -class SyslinkBridge : public device::CDev +class SyslinkBridge : public cdev::CDev { public: SyslinkBridge(Syslink *link); - virtual ~SyslinkBridge(); + virtual ~SyslinkBridge() = default; virtual int init(); @@ -187,12 +187,12 @@ private: }; -class SyslinkMemory : public device::CDev +class SyslinkMemory : public cdev::CDev { public: SyslinkMemory(Syslink *link); - virtual ~SyslinkMemory(); + virtual ~SyslinkMemory() = default; virtual int init(); diff --git a/src/modules/syslink/syslink_memory.cpp b/src/modules/syslink/syslink_memory.cpp index 337bc63834..4473339557 100644 --- a/src/modules/syslink/syslink_memory.cpp +++ b/src/modules/syslink/syslink_memory.cpp @@ -40,17 +40,10 @@ SyslinkMemory::SyslinkMemory(Syslink *link) : - CDev("SyslinkMemory", DECK_DEVICE_PATH), + CDev(DECK_DEVICE_PATH), _link(link), _activeI(0) { - - -} - -SyslinkMemory::~SyslinkMemory() -{ - } @@ -61,7 +54,7 @@ SyslinkMemory::init() /* if init failed, bail now */ if (ret != OK) { - DEVICE_DEBUG("CDev init failed"); + PX4_DEBUG("CDev init failed"); return ret; }