Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing component init() functions where unneeded #2893

Merged
merged 2 commits into from
Sep 24, 2024
Merged

Removing component init() functions where unneeded #2893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04670bb
Removing component init() functions where unneeded
LeStarch Sep 23, 2024
98b96a0
Removing spurious assert
LeStarch Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Drv/BlockDriver/BlockDriverImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ namespace Drv {

}

void BlockDriverImpl::init(NATIVE_INT_TYPE queueDepth, NATIVE_INT_TYPE instanceId) {
BlockDriverComponentBase::init(queueDepth, instanceId);
}

BlockDriverImpl::~BlockDriverImpl() {

}
Expand Down
1 change: 0 additions & 1 deletion Drv/BlockDriver/BlockDriverImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace Drv {
// Only called by derived class
BlockDriverImpl(const char* compName);

void init(NATIVE_INT_TYPE queueDepth, NATIVE_INT_TYPE instanceId = 0);
~BlockDriverImpl();
// a little hack to get the reference running
void callIsr();
Expand Down
6 changes: 0 additions & 6 deletions Drv/LinuxGpioDriver/LinuxGpioDriverComponentImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@ namespace Drv {
const char *const compName /*!< The component name*/
);

//! Initialize object LinuxGpioDriver
//!
void init(
const NATIVE_INT_TYPE instance = 0 /*!< The instance number*/
);

//! Destroy object LinuxGpioDriver
//!
~LinuxGpioDriverComponentImpl();
Expand Down
8 changes: 0 additions & 8 deletions Drv/LinuxGpioDriver/LinuxGpioDriverComponentImplCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,4 @@ namespace Drv {

}

void LinuxGpioDriverComponentImpl ::
init(
const NATIVE_INT_TYPE instance
)
{
LinuxGpioDriverComponentBase::init(instance);
}

} // end namespace Drv
8 changes: 0 additions & 8 deletions Drv/LinuxI2cDriver/LinuxI2cDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@ namespace Drv {

}

void LinuxI2cDriver ::
init(
const NATIVE_INT_TYPE instance
)
{
LinuxI2cDriverComponentBase::init(instance);
}

LinuxI2cDriver::
~LinuxI2cDriver()
{
Expand Down
6 changes: 0 additions & 6 deletions Drv/LinuxI2cDriver/LinuxI2cDriver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ namespace Drv {
//!
LinuxI2cDriver(const char *const compName);

//! Initialize object LinuxI2cDriver
//!
void init(
const NATIVE_INT_TYPE instance = 0 /*!< The instance number*/
);

bool open(const char* device);
//! Destroy object LinuxI2cDriver
//!
Expand Down
8 changes: 0 additions & 8 deletions Drv/LinuxI2cDriver/LinuxI2cDriverStub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,6 @@ LinuxI2cDriver ::LinuxI2cDriver(

}

void LinuxI2cDriver ::
init(
const NATIVE_INT_TYPE instance
)
{
LinuxI2cDriverComponentBase::init(instance);
}

LinuxI2cDriver ::
~LinuxI2cDriver()
{
Expand Down
5 changes: 0 additions & 5 deletions Drv/LinuxSpiDriver/LinuxSpiDriverComponentImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@ namespace Drv {
const char * const compName /*!< The component name*/
);

//! Initialize object LinuxSpiDriver
//!
void init(const NATIVE_INT_TYPE instance = 0 /*!< The instance number*/
);

//! Destroy object LinuxSpiDriver
//!
~LinuxSpiDriverComponentImpl();
Expand Down
5 changes: 0 additions & 5 deletions Drv/LinuxSpiDriver/LinuxSpiDriverComponentImplCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,4 @@ namespace Drv {

}

void LinuxSpiDriverComponentImpl::init(const NATIVE_INT_TYPE instance) {
LinuxSpiDriverComponentBase::init(instance);
}


} // end namespace Drv
4 changes: 0 additions & 4 deletions Drv/LinuxUartDriver/LinuxUartDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ LinuxUartDriver ::LinuxUartDriver(const char* const compName)
: LinuxUartDriverComponentBase(compName), m_fd(-1), m_allocationSize(0), m_device("NOT_EXIST"), m_quitReadThread(false) {
}

void LinuxUartDriver ::init(const NATIVE_INT_TYPE instance) {
LinuxUartDriverComponentBase::init(instance);
}

bool LinuxUartDriver::open(const char* const device,
UartBaudRate baud,
UartFlowControl fc,
Expand Down
5 changes: 0 additions & 5 deletions Drv/LinuxUartDriver/LinuxUartDriver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ class LinuxUartDriver : public LinuxUartDriverComponentBase {
LinuxUartDriver(const char* const compName /*!< The component name*/
);

//! Initialize object LinuxUartDriver
//!
void init(const NATIVE_INT_TYPE instance = 0 /*!< The instance number*/
);

//! Configure UART parameters
enum UartBaudRate {
BAUD_9600=9600,
Expand Down
10 changes: 0 additions & 10 deletions FppTest/component/active/ActiveTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,6 @@

}

void ActiveTest ::
init(
NATIVE_INT_TYPE queueDepth,
NATIVE_INT_TYPE msgSize,
NATIVE_INT_TYPE instance
)
{
ActiveTestComponentBase::init(queueDepth, msgSize, instance);
}

ActiveTest ::
~ActiveTest()
{
Expand Down
7 changes: 0 additions & 7 deletions FppTest/component/active/ActiveTest.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ class ActiveTest :
const char* const compName //!< The component name
);

//! Initialize ActiveTest object
void init(
NATIVE_INT_TYPE queueDepth, //!< The queue depth
NATIVE_INT_TYPE msgSize, //!< The message size
NATIVE_INT_TYPE instance = 0 //!< The instance number
);

//! Destroy ActiveTest object
~ActiveTest();

Expand Down
8 changes: 0 additions & 8 deletions FppTest/component/empty/Empty.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@ Empty ::

}

void Empty ::
init(
NATIVE_INT_TYPE instance
)
{
EmptyComponentBase::init(instance);
}

Empty ::
~Empty()
{
Expand Down
5 changes: 0 additions & 5 deletions FppTest/component/empty/Empty.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ class Empty :
const char* const compName //!< The component name
);

//! Initialize Empty object
void init(
NATIVE_INT_TYPE instance = 0 //!< The instance number
);

//! Destroy Empty object
~Empty();

Expand Down
8 changes: 0 additions & 8 deletions FppTest/component/passive/PassiveTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@

}

void PassiveTest ::
init(
NATIVE_INT_TYPE instance
)
{
PassiveTestComponentBase::init(instance);
}

PassiveTest ::
~PassiveTest()
{
Expand Down
5 changes: 0 additions & 5 deletions FppTest/component/passive/PassiveTest.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ class PassiveTest :
const char* const compName //!< The component name
);

//! Initialize PassiveTest object
void init(
NATIVE_INT_TYPE instance = 0 //!< The instance number
);

//! Destroy PassiveTest object
~PassiveTest();

Expand Down
10 changes: 0 additions & 10 deletions FppTest/component/queued/QueuedTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,6 @@

}

void QueuedTest ::
init(
NATIVE_INT_TYPE queueDepth,
NATIVE_INT_TYPE msgSize,
NATIVE_INT_TYPE instance
)
{
QueuedTestComponentBase::init(queueDepth, msgSize, instance);
}

QueuedTest ::
~QueuedTest()
{
Expand Down
7 changes: 0 additions & 7 deletions FppTest/component/queued/QueuedTest.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ class QueuedTest :
const char* const compName //!< The component name
);

//! Initialize QueuedTest object
void init(
NATIVE_INT_TYPE queueDepth, //!< The queue depth
NATIVE_INT_TYPE msgSize, //!< The message size
NATIVE_INT_TYPE instance = 0 //!< The instance number
);

//! Destroy QueuedTest object
~QueuedTest();

Expand Down
4 changes: 0 additions & 4 deletions FppTest/dp/DpTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ DpTest::DpTest(const char* const compName,
}
}

void DpTest ::init(const NATIVE_INT_TYPE queueDepth, const NATIVE_INT_TYPE instance) {
DpTestComponentBase::init(queueDepth, instance);
}

DpTest ::~DpTest() {}

// ----------------------------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions FppTest/dp/DpTest.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@ class DpTest : public DpTestComponentBase {
const Fw::StringBase& stringRecordData //!< The StringRecord data
);

//! Initialize object DpTest
void init(const NATIVE_INT_TYPE queueDepth, //!< The queue depth
const NATIVE_INT_TYPE instance = 0 //!< The instance number
);

//! Destroy object DpTest
~DpTest();

Expand Down
4 changes: 0 additions & 4 deletions FppTest/state_machine/SmTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ namespace FppTest {
SmTest::SmTest(const char* const compName):
SmTestComponentBase(compName) {}

void SmTest ::init(const NATIVE_INT_TYPE queueDepth, const NATIVE_INT_TYPE instance) {
SmTestComponentBase::init(queueDepth, instance);
}

SmTest ::~SmTest() {}

// ----------------------------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions FppTest/state_machine/SmTest.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ class SmTest :
//! Construct object SmTest
SmTest(const char* const compName); //!< The component name

//! Initialize object SmTest
void init(const NATIVE_INT_TYPE queueDepth, //!< The queue depth
const NATIVE_INT_TYPE instance = 0 //!< The instance number
);

//! Destroy object SmTest
~SmTest();

Expand Down
9 changes: 0 additions & 9 deletions RPI/RpiDemo/RpiDemoComponentImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,6 @@ namespace RPI {

}

void RpiDemoComponentImpl ::
init(
const NATIVE_INT_TYPE queueDepth,
const NATIVE_INT_TYPE instance
)
{
RpiDemoComponentBase::init(queueDepth, instance);
}

RpiDemoComponentImpl ::
~RpiDemoComponentImpl()
{
Expand Down
7 changes: 0 additions & 7 deletions RPI/RpiDemo/RpiDemoComponentImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,6 @@ namespace RPI {
const char *const compName /*!< The component name*/
);

//! Initialize object RpiDemo
//!
void init(
const NATIVE_INT_TYPE queueDepth, /*!< The queue depth*/
const NATIVE_INT_TYPE instance = 0 /*!< The instance number*/
);

//! Destroy object RpiDemo
//!
~RpiDemoComponentImpl();
Expand Down
9 changes: 0 additions & 9 deletions Ref/PingReceiver/PingReceiverComponentImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,6 @@ namespace Ref {

}

void PingReceiverComponentImpl ::
init(
const NATIVE_INT_TYPE queueDepth,
const NATIVE_INT_TYPE instance
)
{
PingReceiverComponentBase::init(queueDepth, instance);
}

PingReceiverComponentImpl ::
~PingReceiverComponentImpl()
{
Expand Down
7 changes: 0 additions & 7 deletions Ref/PingReceiver/PingReceiverComponentImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ namespace Ref {
const char *const compName /*!< The component name*/
);

//! Initialize object PingReceiver
//!
void init(
const NATIVE_INT_TYPE queueDepth, /*!< The queue depth*/
const NATIVE_INT_TYPE instance = 0 /*!< The instance number*/
);

//! Destroy object PingReceiver
//!
~PingReceiverComponentImpl();
Expand Down
5 changes: 0 additions & 5 deletions Ref/RecvBuffApp/RecvBuffComponentImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ namespace Ref {
this->m_stats.setPacketStatus(PacketRecvStatus::PACKET_STATE_NO_PACKETS);
}


void RecvBuffImpl::init(NATIVE_INT_TYPE instanceId) {
RecvBuffComponentBase::init(instanceId);
}

RecvBuffImpl::~RecvBuffImpl() {

}
Expand Down
1 change: 0 additions & 1 deletion Ref/RecvBuffApp/RecvBuffComponentImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace Ref {
// Only called by derived class
RecvBuffImpl(const char* compName);

void init(NATIVE_INT_TYPE instanceId = 0);
~RecvBuffImpl();

private:
Expand Down
4 changes: 0 additions & 4 deletions Ref/SendBuffApp/SendBuffComponentImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ namespace Ref {

}

void SendBuffImpl::init(NATIVE_INT_TYPE queueDepth, NATIVE_INT_TYPE instance) {
SendBuffComponentBase::init(queueDepth,instance);
}

void SendBuffImpl::SchedIn_handler(NATIVE_INT_TYPE portNum, U32 context) {

// first, dequeue any messages
Expand Down
1 change: 0 additions & 1 deletion Ref/SendBuffApp/SendBuffComponentImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace Ref {

// Only called by derived class
SendBuffImpl(const char* compName); //!< constructor
void init(NATIVE_INT_TYPE queueDepth, NATIVE_INT_TYPE instance = 0); //!< initialization function
~SendBuffImpl(); //!< destructor

private:
Expand Down
Loading
Loading