From 72cdaf95ce631dbe1bb68f19e0743fb41c87368c Mon Sep 17 00:00:00 2001 From: Ron <45816308+rjaegers@users.noreply.github.com> Date: Tue, 30 Jan 2024 14:15:43 +0100 Subject: [PATCH] refactor: fix violations of Sonar cpp:S3471 (#253) --- .../ble_middleware/BondStorageSt.hpp | 16 +++---- hal_st/stm32fxxx/BackupRamStm.hpp | 2 +- hal_st/stm32fxxx/CanStm.hpp | 4 +- hal_st/stm32fxxx/DmaStm.hpp | 4 +- hal_st/stm32fxxx/EthernetMacStm.hpp | 8 ++-- hal_st/stm32fxxx/EthernetSmiStm.hpp | 2 +- hal_st/stm32fxxx/FlashInternalStm.hpp | 22 +++++----- hal_st/stm32fxxx/GpioStm.hpp | 44 +++++++++---------- hal_st/stm32fxxx/I2cStm.hpp | 4 +- hal_st/stm32fxxx/QuadSpiStm.hpp | 6 +-- hal_st/stm32fxxx/QuadSpiStmDma.hpp | 6 +-- hal_st/stm32fxxx/RandomDataGeneratorStm.hpp | 4 +- hal_st/stm32fxxx/ResetStm.hpp | 2 +- hal_st/stm32fxxx/SingleSpeedQuadSpiStmDma.hpp | 8 ++-- .../stm32fxxx/SpiDataSizeConfiguratorStm.hpp | 4 +- hal_st/stm32fxxx/SpiMasterStm.hpp | 8 ++-- hal_st/stm32fxxx/SpiMasterStmDma.hpp | 8 ++-- hal_st/stm32fxxx/SpiSlaveStmDma.hpp | 4 +- hal_st/stm32fxxx/SystemTickTimerService.hpp | 2 +- hal_st/stm32fxxx/UartStm.hpp | 6 +-- hal_st/stm32fxxx/UartStmDma.hpp | 6 +-- hal_st/stm32fxxx/UartStmDuplexDma.hpp | 6 +-- hal_st/stm32fxxx/UsbLinkLayerStm.hpp | 20 ++++----- .../SynchronousFlashInternalStm.hpp | 22 +++++----- .../SynchronousRandomDataGeneratorStm.hpp | 2 +- .../SynchronousUartStm.hpp | 2 +- .../synchronous_stm32fxxx/TimeKeeperStm.hpp | 4 +- .../EthernetSmiObserver.hpp | 4 +- services/st_util/FlashOnStUartProgrammer.hpp | 14 +++--- 29 files changed, 122 insertions(+), 122 deletions(-) diff --git a/hal_st/middlewares/ble_middleware/BondStorageSt.hpp b/hal_st/middlewares/ble_middleware/BondStorageSt.hpp index 6f246f94..63f3be22 100644 --- a/hal_st/middlewares/ble_middleware/BondStorageSt.hpp +++ b/hal_st/middlewares/ble_middleware/BondStorageSt.hpp @@ -17,14 +17,14 @@ namespace hal explicit BondStorageSt(uint32_t maxNumberOfBonds); // Implementation of BondStorage - virtual void BondStorageSynchronizerCreated(services::BondStorageSynchronizer& manager) override; - virtual void UpdateBondedDevice(hal::MacAddress address) override; - virtual void RemoveBond(hal::MacAddress address) override; - virtual void RemoveAllBonds() override; - virtual void RemoveBondIf(const infra::Function& onAddress) override; - virtual uint32_t GetMaxNumberOfBonds() const override; - virtual bool IsBondStored(hal::MacAddress address) const override; - virtual void IterateBondedDevices(const infra::Function& onAddress) override; + void BondStorageSynchronizerCreated(services::BondStorageSynchronizer& manager) override; + void UpdateBondedDevice(hal::MacAddress address) override; + void RemoveBond(hal::MacAddress address) override; + void RemoveAllBonds() override; + void RemoveBondIf(const infra::Function& onAddress) override; + uint32_t GetMaxNumberOfBonds() const override; + bool IsBondStored(hal::MacAddress address) const override; + void IterateBondedDevices(const infra::Function& onAddress) override; private: using BondStorageInternal = Bonded_Device_Entry_t[((BLE_EVT_MAX_PARAM_LEN - 3) - 2) / sizeof(Bonded_Device_Entry_t)]; diff --git a/hal_st/stm32fxxx/BackupRamStm.hpp b/hal_st/stm32fxxx/BackupRamStm.hpp index 4934534d..64e6377d 100644 --- a/hal_st/stm32fxxx/BackupRamStm.hpp +++ b/hal_st/stm32fxxx/BackupRamStm.hpp @@ -10,7 +10,7 @@ namespace hal : hal::BackupRam { public: - virtual infra::MemoryRange Get() const override; + infra::MemoryRange Get() const override; }; } diff --git a/hal_st/stm32fxxx/CanStm.hpp b/hal_st/stm32fxxx/CanStm.hpp index 8aff39e9..56594774 100644 --- a/hal_st/stm32fxxx/CanStm.hpp +++ b/hal_st/stm32fxxx/CanStm.hpp @@ -27,8 +27,8 @@ namespace hal ~CanStm(); public: - virtual void SendData(Id id, const Message& data, const infra::Function& actionOnCompletion = infra::emptyFunction) override; - virtual void ReceiveData(const infra::Function& receivedAction) override; + void SendData(Id id, const Message& data, const infra::Function& actionOnCompletion = infra::emptyFunction) override; + void ReceiveData(const infra::Function& receivedAction) override; private: void HandleTxInterrupt(); diff --git a/hal_st/stm32fxxx/DmaStm.hpp b/hal_st/stm32fxxx/DmaStm.hpp index 5267dd6e..8adb8446 100644 --- a/hal_st/stm32fxxx/DmaStm.hpp +++ b/hal_st/stm32fxxx/DmaStm.hpp @@ -83,7 +83,7 @@ namespace hal void StartReceiveDummy(uint16_t size); protected: - virtual void OnInterrupt() override; + void OnInterrupt() override; private: DispatchedInterruptHandler interruptHandler; @@ -100,7 +100,7 @@ namespace hal void StartReceive(infra::ByteRange data); protected: - virtual void OnInterrupt() override; + void OnInterrupt() override; private: ImmediateInterruptHandler interruptHandler; diff --git a/hal_st/stm32fxxx/EthernetMacStm.hpp b/hal_st/stm32fxxx/EthernetMacStm.hpp index 00912dfe..757b4f12 100644 --- a/hal_st/stm32fxxx/EthernetMacStm.hpp +++ b/hal_st/stm32fxxx/EthernetMacStm.hpp @@ -18,10 +18,10 @@ namespace hal EthernetMacStm(EthernetSmi& ethernetSmi, LinkSpeed linkSpeed, MacAddress macAddress); ~EthernetMacStm(); - virtual void SendBuffer(infra::ConstByteRange data, bool last) override; - virtual void RetryAllocation() override; - virtual void AddMacAddressFilter(MacAddress address) override; - virtual void RemoveMacAddressFilter(MacAddress address) override; + void SendBuffer(infra::ConstByteRange data, bool last) override; + void RetryAllocation() override; + void AddMacAddressFilter(MacAddress address) override; + void RemoveMacAddressFilter(MacAddress address) override; private: void ResetDma(); diff --git a/hal_st/stm32fxxx/EthernetSmiStm.hpp b/hal_st/stm32fxxx/EthernetSmiStm.hpp index 1e803fc3..5ce27a1b 100644 --- a/hal_st/stm32fxxx/EthernetSmiStm.hpp +++ b/hal_st/stm32fxxx/EthernetSmiStm.hpp @@ -18,7 +18,7 @@ namespace hal ~EthernetSmiStm(); public: - virtual uint16_t PhyAddress() const override; + uint16_t PhyAddress() const override; private: void RunPhy(); diff --git a/hal_st/stm32fxxx/FlashInternalStm.hpp b/hal_st/stm32fxxx/FlashInternalStm.hpp index 061761b1..6b65c1ab 100644 --- a/hal_st/stm32fxxx/FlashInternalStm.hpp +++ b/hal_st/stm32fxxx/FlashInternalStm.hpp @@ -14,9 +14,9 @@ namespace hal public: FlashInternalStmBase(infra::ConstByteRange flashMemory); - virtual void WriteBuffer(infra::ConstByteRange buffer, uint32_t address, infra::Function onDone) override; - virtual void ReadBuffer(infra::ByteRange buffer, uint32_t address, infra::Function onDone) override; - virtual void EraseSectors(uint32_t beginIndex, uint32_t endIndex, infra::Function onDone) override; + void WriteBuffer(infra::ConstByteRange buffer, uint32_t address, infra::Function onDone) override; + void ReadBuffer(infra::ByteRange buffer, uint32_t address, infra::Function onDone) override; + void EraseSectors(uint32_t beginIndex, uint32_t endIndex, infra::Function onDone) override; private: template @@ -32,10 +32,10 @@ namespace hal public: FlashInternalStm(infra::MemoryRange sectorSizes, infra::ConstByteRange flashMemory); - virtual uint32_t NumberOfSectors() const override; - virtual uint32_t SizeOfSector(uint32_t sectorIndex) const override; - virtual uint32_t SectorOfAddress(uint32_t address) const override; - virtual uint32_t AddressOfSector(uint32_t sectorIndex) const override; + uint32_t NumberOfSectors() const override; + uint32_t SizeOfSector(uint32_t sectorIndex) const override; + uint32_t SectorOfAddress(uint32_t address) const override; + uint32_t AddressOfSector(uint32_t sectorIndex) const override; private: infra::MemoryRange sectorSizes; @@ -47,10 +47,10 @@ namespace hal public: FlashHomogeneousInternalStm(uint32_t numberOfSectors, uint32_t sizeOfEachSector, infra::ConstByteRange flashMemory); - virtual uint32_t NumberOfSectors() const override; - virtual uint32_t SizeOfSector(uint32_t sectorIndex) const override; - virtual uint32_t SectorOfAddress(uint32_t address) const override; - virtual uint32_t AddressOfSector(uint32_t sectorIndex) const override; + uint32_t NumberOfSectors() const override; + uint32_t SizeOfSector(uint32_t sectorIndex) const override; + uint32_t SectorOfAddress(uint32_t address) const override; + uint32_t AddressOfSector(uint32_t sectorIndex) const override; private: uint32_t numberOfSectors; diff --git a/hal_st/stm32fxxx/GpioStm.hpp b/hal_st/stm32fxxx/GpioStm.hpp index 32400541..28e81d53 100644 --- a/hal_st/stm32fxxx/GpioStm.hpp +++ b/hal_st/stm32fxxx/GpioStm.hpp @@ -106,16 +106,16 @@ namespace hal public: GpioPinStm(Port port, uint8_t index, Drive drive = Drive::Default, Speed speed = Speed::Default, WeakPull weakPull = WeakPull::Default); - virtual bool Get() const override; - virtual void Set(bool value) override; - virtual bool GetOutputLatch() const override; - virtual void SetAsInput() override; - virtual bool IsInput() const override; - virtual void Config(PinConfigType config) override; - virtual void Config(PinConfigType config, bool startOutputState) override; - virtual void ResetConfig() override; - virtual void EnableInterrupt(const infra::Function& action, InterruptTrigger trigger) override; - virtual void DisableInterrupt() override; + bool Get() const override; + void Set(bool value) override; + bool GetOutputLatch() const override; + void SetAsInput() override; + bool IsInput() const override; + void Config(PinConfigType config) override; + void Config(PinConfigType config, bool startOutputState) override; + void ResetConfig() override; + void EnableInterrupt(const infra::Function& action, InterruptTrigger trigger) override; + void DisableInterrupt() override; virtual void ConfigAnalog(); virtual void ConfigPeripheral(PinConfigTypeStm pinConfigType, uint8_t peripheral); @@ -137,18 +137,18 @@ namespace hal public: DummyPinStm(); - virtual bool Get() const override; - virtual void Set(bool value) override; - virtual bool GetOutputLatch() const override; - virtual void SetAsInput() override; - virtual bool IsInput() const override; - virtual void Config(PinConfigType config) override; - virtual void Config(PinConfigType config, bool startOutputState) override; - virtual void ResetConfig() override; - virtual void EnableInterrupt(const infra::Function& action, InterruptTrigger trigger) override; - virtual void DisableInterrupt() override; - virtual void ConfigAnalog() override; - virtual void ConfigPeripheral(PinConfigTypeStm pinConfigType, uint8_t peripheral) override; + bool Get() const override; + void Set(bool value) override; + bool GetOutputLatch() const override; + void SetAsInput() override; + bool IsInput() const override; + void Config(PinConfigType config) override; + void Config(PinConfigType config, bool startOutputState) override; + void ResetConfig() override; + void EnableInterrupt(const infra::Function& action, InterruptTrigger trigger) override; + void DisableInterrupt() override; + void ConfigAnalog() override; + void ConfigPeripheral(PinConfigTypeStm pinConfigType, uint8_t peripheral) override; }; extern DummyPinStm dummyPinStm; diff --git a/hal_st/stm32fxxx/I2cStm.hpp b/hal_st/stm32fxxx/I2cStm.hpp index 09800c9d..46729c86 100644 --- a/hal_st/stm32fxxx/I2cStm.hpp +++ b/hal_st/stm32fxxx/I2cStm.hpp @@ -29,8 +29,8 @@ namespace hal I2cStm(uint8_t oneBasedI2cIndex, hal::GpioPinStm& scl, hal::GpioPinStm& sda, const Config& config = Config()); ~I2cStm(); - virtual void SendData(I2cAddress address, infra::ConstByteRange data, Action nextAction, infra::Function onSent) override; - virtual void ReceiveData(I2cAddress address, infra::ByteRange data, Action nextAction, infra::Function onReceived) override; + void SendData(I2cAddress address, infra::ConstByteRange data, Action nextAction, infra::Function onSent) override; + void ReceiveData(I2cAddress address, infra::ByteRange data, Action nextAction, infra::Function onReceived) override; protected: virtual void DeviceNotFound(); diff --git a/hal_st/stm32fxxx/QuadSpiStm.hpp b/hal_st/stm32fxxx/QuadSpiStm.hpp index a1a8f85a..3230e247 100644 --- a/hal_st/stm32fxxx/QuadSpiStm.hpp +++ b/hal_st/stm32fxxx/QuadSpiStm.hpp @@ -25,9 +25,9 @@ namespace hal QuadSpiStm(GpioPinStm& clock, GpioPinStm& slaveSelect, GpioPinStm& data0, GpioPinStm& data1, GpioPinStm& data2, GpioPinStm& data3, const Config& config = Config()); ~QuadSpiStm(); - virtual void SendData(const Header& header, infra::ConstByteRange data, Lines lines, const infra::Function& actionOnCompletion) override; - virtual void ReceiveData(const Header& header, infra::ByteRange data, Lines lines, const infra::Function& actionOnCompletion) override; - virtual void PollStatus(const Header& header, uint8_t nofBytes, uint32_t match, uint32_t mask, Lines lines, const infra::Function& actionOnCompletion) override; + void SendData(const Header& header, infra::ConstByteRange data, Lines lines, const infra::Function& actionOnCompletion) override; + void ReceiveData(const Header& header, infra::ByteRange data, Lines lines, const infra::Function& actionOnCompletion) override; + void PollStatus(const Header& header, uint8_t nofBytes, uint32_t match, uint32_t mask, Lines lines, const infra::Function& actionOnCompletion) override; private: QSPI_CommandTypeDef CreateConfig(const Header& header, uint32_t dataSize, Lines lines); diff --git a/hal_st/stm32fxxx/QuadSpiStmDma.hpp b/hal_st/stm32fxxx/QuadSpiStmDma.hpp index c0447438..9fbe7638 100644 --- a/hal_st/stm32fxxx/QuadSpiStmDma.hpp +++ b/hal_st/stm32fxxx/QuadSpiStmDma.hpp @@ -27,9 +27,9 @@ namespace hal QuadSpiStmDma(hal::DmaStm& dma, GpioPinStm& clock, GpioPinStm& slaveSelect, GpioPinStm& data0, GpioPinStm& data1, GpioPinStm& data2, GpioPinStm& data3, const Config& config = Config()); ~QuadSpiStmDma(); - virtual void SendData(const Header& header, infra::ConstByteRange data, Lines lines, const infra::Function& actionOnCompletion) override; - virtual void ReceiveData(const Header& header, infra::ByteRange data, Lines lines, const infra::Function& actionOnCompletion) override; - virtual void PollStatus(const Header& header, uint8_t nofBytes, uint32_t match, uint32_t mask, Lines lines, const infra::Function& actionOnCompletion) override; + void SendData(const Header& header, infra::ConstByteRange data, Lines lines, const infra::Function& actionOnCompletion) override; + void ReceiveData(const Header& header, infra::ByteRange data, Lines lines, const infra::Function& actionOnCompletion) override; + void PollStatus(const Header& header, uint8_t nofBytes, uint32_t match, uint32_t mask, Lines lines, const infra::Function& actionOnCompletion) override; private: enum class FunctionalMode diff --git a/hal_st/stm32fxxx/RandomDataGeneratorStm.hpp b/hal_st/stm32fxxx/RandomDataGeneratorStm.hpp index 1f4e79ba..a1434b46 100644 --- a/hal_st/stm32fxxx/RandomDataGeneratorStm.hpp +++ b/hal_st/stm32fxxx/RandomDataGeneratorStm.hpp @@ -16,10 +16,10 @@ namespace hal RandomDataGeneratorStm(); ~RandomDataGeneratorStm(); - virtual void GenerateRandomData(infra::ByteRange result, const infra::Function& onDone) override; + void GenerateRandomData(infra::ByteRange result, const infra::Function& onDone) override; private: - virtual void Invoke() override; + void Invoke() override; private: infra::ByteRange result; diff --git a/hal_st/stm32fxxx/ResetStm.hpp b/hal_st/stm32fxxx/ResetStm.hpp index 0b8d560d..c1032cc6 100644 --- a/hal_st/stm32fxxx/ResetStm.hpp +++ b/hal_st/stm32fxxx/ResetStm.hpp @@ -9,7 +9,7 @@ namespace hal : public Reset { public: - virtual void ResetModule(const char* resetReason) override; + void ResetModule(const char* resetReason) override; }; } diff --git a/hal_st/stm32fxxx/SingleSpeedQuadSpiStmDma.hpp b/hal_st/stm32fxxx/SingleSpeedQuadSpiStmDma.hpp index 2b743261..3291a975 100644 --- a/hal_st/stm32fxxx/SingleSpeedQuadSpiStmDma.hpp +++ b/hal_st/stm32fxxx/SingleSpeedQuadSpiStmDma.hpp @@ -14,10 +14,10 @@ namespace hal public: SingleSpeedQuadSpiStmDma(QuadSpiStmDma& quadSpi); - virtual void SendAndReceive(infra::ConstByteRange sendData, infra::ByteRange receiveData, SpiAction nextAction, const infra::Function& onDone) override; - virtual void SetChipSelectConfigurator(ChipSelectConfigurator& configurator) override; - virtual void SetCommunicationConfigurator(CommunicationConfigurator& configurator) override; - virtual void ResetCommunicationConfigurator() override; + void SendAndReceive(infra::ConstByteRange sendData, infra::ByteRange receiveData, SpiAction nextAction, const infra::Function& onDone) override; + void SetChipSelectConfigurator(ChipSelectConfigurator& configurator) override; + void SetCommunicationConfigurator(CommunicationConfigurator& configurator) override; + void ResetCommunicationConfigurator() override; private: void Done(); diff --git a/hal_st/stm32fxxx/SpiDataSizeConfiguratorStm.hpp b/hal_st/stm32fxxx/SpiDataSizeConfiguratorStm.hpp index 2d229421..ba6bfbec 100644 --- a/hal_st/stm32fxxx/SpiDataSizeConfiguratorStm.hpp +++ b/hal_st/stm32fxxx/SpiDataSizeConfiguratorStm.hpp @@ -11,8 +11,8 @@ namespace hal public: SpiDataSizeConfiguratorStm(SpiMasterStmDma& spi, uint32_t dataSize); // dataSize = SPI_DATASIZE_4BIT .. SPI_DATASIZE_16BIT - virtual void ActivateConfiguration() override; - virtual void DeactivateConfiguration() override; + void ActivateConfiguration() override; + void DeactivateConfiguration() override; private: SpiMasterStmDma& spi; diff --git a/hal_st/stm32fxxx/SpiMasterStm.hpp b/hal_st/stm32fxxx/SpiMasterStm.hpp index 33b6f09f..0917f6f2 100644 --- a/hal_st/stm32fxxx/SpiMasterStm.hpp +++ b/hal_st/stm32fxxx/SpiMasterStm.hpp @@ -25,10 +25,10 @@ namespace hal SpiMasterStm(uint8_t oneBasedSpiIndex, GpioPinStm& clock, GpioPinStm& miso, GpioPinStm& mosi, const Config& config = Config(), GpioPinStm& slaveSelect = dummyPinStm); - virtual void SendAndReceive(infra::ConstByteRange sendData, infra::ByteRange receiveData, SpiAction nextAction, const infra::Function& onDone) override; - virtual void SetChipSelectConfigurator(ChipSelectConfigurator& configurator) override; - virtual void SetCommunicationConfigurator(CommunicationConfigurator& configurator) override; - virtual void ResetCommunicationConfigurator() override; + void SendAndReceive(infra::ConstByteRange sendData, infra::ByteRange receiveData, SpiAction nextAction, const infra::Function& onDone) override; + void SetChipSelectConfigurator(ChipSelectConfigurator& configurator) override; + void SetCommunicationConfigurator(CommunicationConfigurator& configurator) override; + void ResetCommunicationConfigurator() override; private: void HandleInterrupt(); diff --git a/hal_st/stm32fxxx/SpiMasterStmDma.hpp b/hal_st/stm32fxxx/SpiMasterStmDma.hpp index 3be90cbf..f3c9d678 100644 --- a/hal_st/stm32fxxx/SpiMasterStmDma.hpp +++ b/hal_st/stm32fxxx/SpiMasterStmDma.hpp @@ -25,10 +25,10 @@ namespace hal SpiMasterStmDma(hal::DmaStm& dmaStm, uint8_t oneBasedSpiIndex, GpioPinStm& clock, GpioPinStm& miso, GpioPinStm& mosi, const Config& config = Config(), GpioPinStm& slaveSelect = dummyPinStm); - virtual void SendAndReceive(infra::ConstByteRange sendData, infra::ByteRange receiveData, SpiAction nextAction, const infra::Function& onDone) override; - virtual void SetChipSelectConfigurator(ChipSelectConfigurator& configurator) override; - virtual void SetCommunicationConfigurator(CommunicationConfigurator& configurator) override; - virtual void ResetCommunicationConfigurator() override; + void SendAndReceive(infra::ConstByteRange sendData, infra::ByteRange receiveData, SpiAction nextAction, const infra::Function& onDone) override; + void SetChipSelectConfigurator(ChipSelectConfigurator& configurator) override; + void SetCommunicationConfigurator(CommunicationConfigurator& configurator) override; + void ResetCommunicationConfigurator() override; void SetDataSize(uint8_t dataSizeInBits); uint8_t DataSize() const; diff --git a/hal_st/stm32fxxx/SpiSlaveStmDma.hpp b/hal_st/stm32fxxx/SpiSlaveStmDma.hpp index db16a027..c1f91878 100644 --- a/hal_st/stm32fxxx/SpiSlaveStmDma.hpp +++ b/hal_st/stm32fxxx/SpiSlaveStmDma.hpp @@ -23,8 +23,8 @@ namespace hal SpiSlaveStmDma(hal::DmaStm& dmaStm, uint8_t oneBasedSpiIndex, GpioPinStm& clock, GpioPinStm& miso, GpioPinStm& mosi, GpioPinStm& slaveSelect, const Config& config = Config()); - virtual void SendAndReceive(infra::ConstByteRange sendData, infra::ByteRange receiveData, const infra::Function& onDone) override; - virtual bool CancelTransmission() override; + void SendAndReceive(infra::ConstByteRange sendData, infra::ByteRange receiveData, const infra::Function& onDone) override; + bool CancelTransmission() override; private: void SendAndReceive(infra::ConstByteRange sendData, infra::ByteRange receiveData); diff --git a/hal_st/stm32fxxx/SystemTickTimerService.hpp b/hal_st/stm32fxxx/SystemTickTimerService.hpp index bb340609..b0965232 100644 --- a/hal_st/stm32fxxx/SystemTickTimerService.hpp +++ b/hal_st/stm32fxxx/SystemTickTimerService.hpp @@ -17,7 +17,7 @@ namespace hal public: SystemTickTimerService(infra::Duration tickDuration = std::chrono::milliseconds(1), uint32_t id = infra::systemTimerServiceId); - virtual infra::TimePoint Now() const override; + infra::TimePoint Now() const override; private: friend uint32_t ::HAL_GetTick(); diff --git a/hal_st/stm32fxxx/UartStm.hpp b/hal_st/stm32fxxx/UartStm.hpp index 531f3234..ee535c77 100644 --- a/hal_st/stm32fxxx/UartStm.hpp +++ b/hal_st/stm32fxxx/UartStm.hpp @@ -38,14 +38,14 @@ namespace hal #endif ~UartStm(); - virtual void SendData(infra::MemoryRange data, infra::Function actionOnCompletion = infra::emptyFunction) override; - virtual void ReceiveData(infra::Function dataReceived) override; + void SendData(infra::MemoryRange data, infra::Function actionOnCompletion = infra::emptyFunction) override; + void ReceiveData(infra::Function dataReceived) override; private: void UartStmHalInit(const Config& config); void RegisterInterrupt(const Config& config); void TransferComplete(); - virtual void Invoke() override; + void Invoke() override; private: uint8_t uartIndex; diff --git a/hal_st/stm32fxxx/UartStmDma.hpp b/hal_st/stm32fxxx/UartStmDma.hpp index 37812563..bb1ec5bf 100644 --- a/hal_st/stm32fxxx/UartStmDma.hpp +++ b/hal_st/stm32fxxx/UartStmDma.hpp @@ -29,13 +29,13 @@ namespace hal UartStmDma(hal::DmaStm& dmaStm, uint8_t uartIndex, GpioPinStm& uartTx, GpioPinStm& uartRx, GpioPinStm& uartRts, GpioPinStm& uartCts, const Config& config = Config()); ~UartStmDma(); - virtual void SendData(infra::MemoryRange data, infra::Function actionOnCompletion = infra::emptyFunction) override; - virtual void ReceiveData(infra::Function dataReceived) override; + void SendData(infra::MemoryRange data, infra::Function actionOnCompletion = infra::emptyFunction) override; + void ReceiveData(infra::Function dataReceived) override; private: void RegisterInterrupt(const Config& config); void TransferComplete(); - virtual void Invoke() override; + void Invoke() override; private: uint8_t uartIndex; diff --git a/hal_st/stm32fxxx/UartStmDuplexDma.hpp b/hal_st/stm32fxxx/UartStmDuplexDma.hpp index 7720b85a..ad6fa6b6 100644 --- a/hal_st/stm32fxxx/UartStmDuplexDma.hpp +++ b/hal_st/stm32fxxx/UartStmDuplexDma.hpp @@ -33,15 +33,15 @@ namespace hal UartStmDuplexDma(infra::MemoryRange rxBuffer, hal::DmaStm& dmaStm, uint8_t uartIndex, GpioPinStm& uartTx, GpioPinStm& uartRx, GpioPinStm& uartRts, GpioPinStm& uartCts, const Config& config = Config()); ~UartStmDuplexDma(); - virtual void SendData(infra::MemoryRange data, infra::Function actionOnCompletion = infra::emptyFunction) override; - virtual void ReceiveData(infra::Function dataReceived) override; + void SendData(infra::MemoryRange data, infra::Function actionOnCompletion = infra::emptyFunction) override; + void ReceiveData(infra::Function dataReceived) override; private: void Configure(const Config& config); void ReceiveComplete(size_t currentPosition); void RegisterInterrupt(const Config& config); void TransferComplete(); - virtual void Invoke() override; + void Invoke() override; private: infra::MemoryRange rxBuffer; diff --git a/hal_st/stm32fxxx/UsbLinkLayerStm.hpp b/hal_st/stm32fxxx/UsbLinkLayerStm.hpp index c2cd08a3..a30c8d07 100644 --- a/hal_st/stm32fxxx/UsbLinkLayerStm.hpp +++ b/hal_st/stm32fxxx/UsbLinkLayerStm.hpp @@ -21,16 +21,16 @@ namespace hal UsbLinkLayerStm(UsbDeviceFactory& deviceFactory, hal::GpioPin& powerSwitch, hal::GpioPin& vbus, hal::GpioPin& overCurrent, hal::GpioPinStm& id, hal::GpioPinStm& dm, hal::GpioPinStm& dp); ~UsbLinkLayerStm(); - virtual void OpenEndPoint(uint8_t ep_addr, UsbEndPointType type, uint16_t ep_mps) override; - virtual void CloseEndPoint(uint8_t ep_addr) override; - virtual void FlushEndPoint(uint8_t ep_addr) override; - virtual void StallEndPoint(uint8_t ep_addr) override; - virtual void ClearStallEndPoint(uint8_t ep_addr) override; - virtual bool IsStallEndPoint(uint8_t ep_addr) override; - virtual void SetUsbAddress(uint8_t dev_addr) override; - virtual void Transmit(uint8_t ep_addr, infra::ConstByteRange data) override; - virtual void PrepareReceive(uint8_t ep_addr, infra::ConstByteRange data) override; - virtual uint32_t GetReceiveDataSize(uint8_t ep_addr) override; + void OpenEndPoint(uint8_t ep_addr, UsbEndPointType type, uint16_t ep_mps) override; + void CloseEndPoint(uint8_t ep_addr) override; + void FlushEndPoint(uint8_t ep_addr) override; + void StallEndPoint(uint8_t ep_addr) override; + void ClearStallEndPoint(uint8_t ep_addr) override; + bool IsStallEndPoint(uint8_t ep_addr) override; + void SetUsbAddress(uint8_t dev_addr) override; + void Transmit(uint8_t ep_addr, infra::ConstByteRange data) override; + void PrepareReceive(uint8_t ep_addr, infra::ConstByteRange data) override; + uint32_t GetReceiveDataSize(uint8_t ep_addr) override; void SetupStageCallback(); void DataOutStageCallback(uint8_t epnum); diff --git a/hal_st/synchronous_stm32fxxx/SynchronousFlashInternalStm.hpp b/hal_st/synchronous_stm32fxxx/SynchronousFlashInternalStm.hpp index 518c8cca..60fad350 100644 --- a/hal_st/synchronous_stm32fxxx/SynchronousFlashInternalStm.hpp +++ b/hal_st/synchronous_stm32fxxx/SynchronousFlashInternalStm.hpp @@ -13,9 +13,9 @@ namespace hal public: SynchronousFlashInternalStmBase(infra::ConstByteRange flashMemory); - virtual void WriteBuffer(infra::ConstByteRange buffer, uint32_t address) override; - virtual void ReadBuffer(infra::ByteRange buffer, uint32_t address) override; - virtual void EraseSectors(uint32_t beginIndex, uint32_t endIndex) override; + void WriteBuffer(infra::ConstByteRange buffer, uint32_t address) override; + void ReadBuffer(infra::ByteRange buffer, uint32_t address) override; + void EraseSectors(uint32_t beginIndex, uint32_t endIndex) override; private: template @@ -31,10 +31,10 @@ namespace hal public: SynchronousFlashInternalStm(infra::MemoryRange sectorSizes, infra::ConstByteRange flashMemory); - virtual uint32_t NumberOfSectors() const override; - virtual uint32_t SizeOfSector(uint32_t sectorIndex) const override; - virtual uint32_t SectorOfAddress(uint32_t address) const override; - virtual uint32_t AddressOfSector(uint32_t sectorIndex) const override; + uint32_t NumberOfSectors() const override; + uint32_t SizeOfSector(uint32_t sectorIndex) const override; + uint32_t SectorOfAddress(uint32_t address) const override; + uint32_t AddressOfSector(uint32_t sectorIndex) const override; private: infra::MemoryRange sectorSizes; @@ -46,10 +46,10 @@ namespace hal public: SynchronousFlashHomogeneousInternalStm(uint32_t numberOfSectors, uint32_t sizeOfEachSector, infra::ConstByteRange flashMemory); - virtual uint32_t NumberOfSectors() const override; - virtual uint32_t SizeOfSector(uint32_t sectorIndex) const override; - virtual uint32_t SectorOfAddress(uint32_t address) const override; - virtual uint32_t AddressOfSector(uint32_t sectorIndex) const override; + uint32_t NumberOfSectors() const override; + uint32_t SizeOfSector(uint32_t sectorIndex) const override; + uint32_t SectorOfAddress(uint32_t address) const override; + uint32_t AddressOfSector(uint32_t sectorIndex) const override; private: uint32_t numberOfSectors; diff --git a/hal_st/synchronous_stm32fxxx/SynchronousRandomDataGeneratorStm.hpp b/hal_st/synchronous_stm32fxxx/SynchronousRandomDataGeneratorStm.hpp index fa6c105a..4eeebd23 100644 --- a/hal_st/synchronous_stm32fxxx/SynchronousRandomDataGeneratorStm.hpp +++ b/hal_st/synchronous_stm32fxxx/SynchronousRandomDataGeneratorStm.hpp @@ -15,7 +15,7 @@ namespace hal SynchronousRandomDataGeneratorStm(); ~SynchronousRandomDataGeneratorStm(); - virtual void GenerateRandomData(infra::ByteRange result) override; + void GenerateRandomData(infra::ByteRange result) override; }; } diff --git a/hal_st/synchronous_stm32fxxx/SynchronousUartStm.hpp b/hal_st/synchronous_stm32fxxx/SynchronousUartStm.hpp index a9f279c2..c2dbd127 100644 --- a/hal_st/synchronous_stm32fxxx/SynchronousUartStm.hpp +++ b/hal_st/synchronous_stm32fxxx/SynchronousUartStm.hpp @@ -42,7 +42,7 @@ namespace hal bool ReceiveData(infra::ByteRange data) override; private: - virtual void Invoke() override; + void Invoke() override; bool Full() const; bool Empty() const; diff --git a/hal_st/synchronous_stm32fxxx/TimeKeeperStm.hpp b/hal_st/synchronous_stm32fxxx/TimeKeeperStm.hpp index e7e39ce4..3980d3cc 100644 --- a/hal_st/synchronous_stm32fxxx/TimeKeeperStm.hpp +++ b/hal_st/synchronous_stm32fxxx/TimeKeeperStm.hpp @@ -13,8 +13,8 @@ namespace hal public: explicit TimeKeeperSt(infra::Duration duration, hal::SystemTickTimerService& timeService); - virtual bool Timeout() override; - virtual void Reset() override; + bool Timeout() override; + void Reset() override; private: const infra::Duration duration; diff --git a/hal_st_lwip/instantiations_lwip/EthernetSmiObserver.hpp b/hal_st_lwip/instantiations_lwip/EthernetSmiObserver.hpp index 278a113f..5b069968 100644 --- a/hal_st_lwip/instantiations_lwip/EthernetSmiObserver.hpp +++ b/hal_st_lwip/instantiations_lwip/EthernetSmiObserver.hpp @@ -77,8 +77,8 @@ namespace main_ EthernetSmiObserver(hal::EthernetSmi& ethernetSmi, services::LightweightIpOverEthernetFactory& lightweightIpOverEthernetFactory, hal::GpioPinStm& ethernetRmiiRefClk); ~EthernetSmiObserver(); - virtual void LinkUp(hal::LinkSpeed linkSpeed) override; - virtual void LinkDown() override; + void LinkUp(hal::LinkSpeed linkSpeed) override; + void LinkDown() override; private: services::LightweightIpOverEthernetFactory& lightweightIpOverEthernetFactory; diff --git a/services/st_util/FlashOnStUartProgrammer.hpp b/services/st_util/FlashOnStUartProgrammer.hpp index 215f4e7f..c41aeacd 100644 --- a/services/st_util/FlashOnStUartProgrammer.hpp +++ b/services/st_util/FlashOnStUartProgrammer.hpp @@ -12,13 +12,13 @@ namespace services public: FlashOnStUartProgrammer(infra::MemoryRange sectorSizes, StUartProgrammer& programmer); - virtual uint32_t NumberOfSectors() const override; - virtual uint32_t SizeOfSector(uint32_t sectorIndex) const override; - virtual uint32_t SectorOfAddress(uint32_t address) const override; - virtual uint32_t AddressOfSector(uint32_t sectorIndex) const override; - virtual void WriteBuffer(infra::ConstByteRange buffer, uint32_t address, infra::Function onDone) override; - virtual void ReadBuffer(infra::ByteRange buffer, uint32_t address, infra::Function onDone) override; - virtual void EraseSectors(uint32_t beginIndex, uint32_t endIndex, infra::Function onDone) override; + uint32_t NumberOfSectors() const override; + uint32_t SizeOfSector(uint32_t sectorIndex) const override; + uint32_t SectorOfAddress(uint32_t address) const override; + uint32_t AddressOfSector(uint32_t sectorIndex) const override; + void WriteBuffer(infra::ConstByteRange buffer, uint32_t address, infra::Function onDone) override; + void ReadBuffer(infra::ByteRange buffer, uint32_t address, infra::Function onDone) override; + void EraseSectors(uint32_t beginIndex, uint32_t endIndex, infra::Function onDone) override; private: infra::MemoryRange sectorSizes;