diff --git a/executables/referenceApp/application/include/systems/EthernetSystem.h b/executables/referenceApp/application/include/systems/EthernetSystem.h index eb8352e28fc..142b0674f2a 100644 --- a/executables/referenceApp/application/include/systems/EthernetSystem.h +++ b/executables/referenceApp/application/include/systems/EthernetSystem.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace systems { @@ -45,7 +45,7 @@ class EthernetSystem { public: explicit EthernetSystem( - ::async::ContextType context, ::ethernet::IEthernetDriverSystem& ethernetSystem); + ::async::ContextType context, ::ethernet::IEthernetSystem& ethernetSystem); EthernetSystem(EthernetSystem const&) = delete; EthernetSystem& operator=(EthernetSystem const&) = delete; @@ -56,7 +56,7 @@ class EthernetSystem void execute() override; - ::ethernet::IEthernetDriverSystem& ethernetDriverSystem; + ::ethernet::IEthernetSystem& ethernetDriverSystem; Netifs<::ethX::NUM_NETIFS> netifs; private: diff --git a/executables/referenceApp/application/src/app/app.cpp b/executables/referenceApp/application/src/app/app.cpp index 2397dd2076a..27437ac6e05 100644 --- a/executables/referenceApp/application/src/app/app.cpp +++ b/executables/referenceApp/application/src/app/app.cpp @@ -45,19 +45,25 @@ #ifdef PLATFORM_SUPPORT_CAN #include +namespace platform +{ namespace systems { extern ::can::ICanSystem& getCanSystem(); } // namespace systems +} // namespace platform #endif #ifdef PLATFORM_SUPPORT_ETHERNET -#include +#include +namespace platform +{ namespace systems { -extern ::ethernet::IEthernetDriverSystem& getEthernetSystem(); +extern ::ethernet::IEthernetSystem& getEthernetSystem(); } // namespace systems +} // namespace platform #endif #include @@ -212,12 +218,12 @@ void startApp() /* runlevel 5 */ #ifdef PLATFORM_SUPPORT_CAN lifecycleManager.addComponent( - "docan", doCanSystem.create(*transportSystem, ::systems::getCanSystem(), TASK_CAN), 5U); + "docan", doCanSystem.create(*transportSystem, ::platform::systems::getCanSystem(), TASK_CAN), 5U); #endif #ifdef PLATFORM_SUPPORT_ETHERNET lifecycleManager.addComponent( - "ethernet", ethernetSystem.create(TASK_ETHERNET, ::systems::getEthernetSystem()), 5U); + "ethernet", ethernetSystem.create(TASK_ETHERNET, ::platform::systems::getEthernetSystem()), 5U); #endif #ifdef PLATFORM_SUPPORT_STORAGE @@ -246,7 +252,7 @@ void startApp() TASK_DEMO, lifecycleManager #ifdef PLATFORM_SUPPORT_CAN - , ::systems::getCanSystem() + , ::platform::systems::getCanSystem() #endif #ifdef PLATFORM_SUPPORT_STORAGE , (*storageSystem).getStorage() diff --git a/executables/referenceApp/application/src/systems/EthernetSystem.cpp b/executables/referenceApp/application/src/systems/EthernetSystem.cpp index d0841f872df..983cca11e17 100644 --- a/executables/referenceApp/application/src/systems/EthernetSystem.cpp +++ b/executables/referenceApp/application/src/systems/EthernetSystem.cpp @@ -80,7 +80,7 @@ namespace systems { EthernetSystem::EthernetSystem( - ::async::ContextType const context, ::ethernet::IEthernetDriverSystem& ethernetSystem) + ::async::ContextType const context, ::ethernet::IEthernetSystem& ethernetSystem) : ethernetDriverSystem(ethernetSystem), _context(context), _executeCounter(0) { #if LWIP_NETIF_SPECIFIC_TTL diff --git a/executables/referenceApp/configuration/include/systems/IEthernetDriverSystem.h b/executables/referenceApp/configuration/include/systems/IEthernetDriverSystem.h index 2566b06c82e..102083bfd4d 100644 --- a/executables/referenceApp/configuration/include/systems/IEthernetDriverSystem.h +++ b/executables/referenceApp/configuration/include/systems/IEthernetDriverSystem.h @@ -8,10 +8,10 @@ namespace ethernet { -class IEthernetDriverSystem +class IEthernetSystem { protected: - ~IEthernetDriverSystem() = default; + ~IEthernetSystem() = default; public: virtual void setGroupcastAddressRecognition(::etl::array const mac) const = 0; diff --git a/executables/referenceApp/platforms/posix/main/include/systems/TapEthernetSystem.h b/executables/referenceApp/platforms/posix/main/include/systems/TapEthernetSystem.h index 55a8c2dcbc6..236640446b7 100644 --- a/executables/referenceApp/platforms/posix/main/include/systems/TapEthernetSystem.h +++ b/executables/referenceApp/platforms/posix/main/include/systems/TapEthernetSystem.h @@ -6,13 +6,13 @@ #include #include -#include +#include namespace systems { class TapEthernetSystem final -: public ::ethernet::IEthernetDriverSystem +: public ::ethernet::IEthernetSystem , public ::lifecycle::AsyncLifecycleComponent , public ::async::IRunnable { diff --git a/executables/referenceApp/platforms/posix/main/src/main.cpp b/executables/referenceApp/platforms/posix/main/src/main.cpp index d4e3453d655..b6adb4c4958 100644 --- a/executables/referenceApp/platforms/posix/main/src/main.cpp +++ b/executables/referenceApp/platforms/posix/main/src/main.cpp @@ -49,22 +49,20 @@ void platformLifecycleAdd(::lifecycle::LifecycleManager& lifecycleManager, uint8 } } -} // namespace platform - -#ifdef PLATFORM_SUPPORT_CAN namespace systems { + +#ifdef PLATFORM_SUPPORT_CAN ::can::ICanSystem& getCanSystem() { return *::platform::canSystem; } -} // namespace systems #endif // PLATFORM_SUPPORT_CAN - #ifdef PLATFORM_SUPPORT_ETHERNET -namespace systems -{ -::ethernet::IEthernetDriverSystem& getEthernetSystem() { return *::platform::tapEthernetSystem; } -} // namespace systems +::ethernet::IEthernetSystem& getEthernetSystem() { return *::platform::tapEthernetSystem; } #endif // PLATFORM_SUPPORT_ETHERNET +} // namespace systems + +} // namespace platform + extern "C" { void putchar_(char character) { putchar(character); } diff --git a/executables/referenceApp/platforms/s32k148evb/main/include/systems/S32K148EvbEthernetSystem.h b/executables/referenceApp/platforms/s32k148evb/main/include/systems/S32K148EvbEthernetSystem.h index a6b8bcb0ca8..baabf6dc0c8 100644 --- a/executables/referenceApp/platforms/s32k148evb/main/include/systems/S32K148EvbEthernetSystem.h +++ b/executables/referenceApp/platforms/s32k148evb/main/include/systems/S32K148EvbEthernetSystem.h @@ -11,13 +11,13 @@ #include "lifecycle/ILifecycleManager.h" #include "phy/Tja1101.h" #include "phy/Tja1101Tester.h" -#include "systems/IEthernetDriverSystem.h" +#include "systems/IEthernetSystem.h" namespace systems { class S32K148EvbEthernetSystem final -: public ::ethernet::IEthernetDriverSystem +: public ::ethernet::IEthernetSystem , private ::async::IRunnable , public ::lifecycle::AsyncLifecycleComponent { diff --git a/executables/referenceApp/platforms/s32k148evb/main/src/main.cpp b/executables/referenceApp/platforms/s32k148evb/main/src/main.cpp index 90f1685ba40..d2e11abf33a 100644 --- a/executables/referenceApp/platforms/s32k148evb/main/src/main.cpp +++ b/executables/referenceApp/platforms/s32k148evb/main/src/main.cpp @@ -16,7 +16,7 @@ #include "commonDebug.h" #include "interrupt_manager.h" #include "lifecycle/StaticBsp.h" -#include "systems/IEthernetDriverSystem.h" +#include "systems/IEthernetSystem.h" #include "watchdog/Watchdog.h" #include @@ -121,7 +121,7 @@ ::can::ICanSystem& getCanSystem() { return *::platform::canSystem; } #ifdef PLATFORM_SUPPORT_ETHERNET namespace systems { -::ethernet::IEthernetDriverSystem& getEthernetSystem() { return *::platform::s32kEthernetSystem; } +::ethernet::IEthernetSystem& getEthernetSystem() { return *::platform::s32kEthernetSystem; } } // namespace systems #endif // PLATFORM_SUPPORT_ETHERNET