feat: replaced infra::Optional with std::optional

philips-software · May 6, 2024 · 41042cd · 41042cd
1 parent 66f95b6
commit 41042cd
Show file tree

Hide file tree

Showing 20 changed files with 75 additions and 64 deletions.
diff --git a/hal_st/cortex/InterruptCortex.cpp b/hal_st/cortex/InterruptCortex.cpp
@@ -60,7 +60,7 @@ namespace hal
         if (irq)
             InterruptTable::Instance().TakeOverHandler(*irq, *this, other);
 
-        other.irq = infra::none;
+        other.irq = std::nullopt;
     }
 
     InterruptHandler& InterruptHandler::operator=(InterruptHandler&& other)
@@ -73,7 +73,7 @@ namespace hal
         if (irq)
             InterruptTable::Instance().TakeOverHandler(*irq, *this, other);
 
-        other.irq = infra::none;
+        other.irq = std::nullopt;
 
         return *this;
     }
@@ -95,7 +95,7 @@ namespace hal
         if (irq)
             InterruptTable::Instance().DeregisterHandler(*irq, *this);
 
-        irq = infra::none;
+        irq = std::nullopt;
     }
 
     IRQn_Type InterruptHandler::Irq() const

diff --git a/hal_st/cortex/InterruptCortex.hpp b/hal_st/cortex/InterruptCortex.hpp
@@ -38,7 +38,7 @@ namespace hal
         void ClearPending();
 
     private:
-        infra::Optional<IRQn_Type> irq;
+        std::optional<IRQn_Type> irq;
     };
 
     class InterruptTable

diff --git a/hal_st/middlewares/ble_middleware/GapSt.cpp b/hal_st/middlewares/ble_middleware/GapSt.cpp
@@ -118,7 +118,7 @@ namespace hal
         // Write Encryption root key used to derive LTK and CSRK
         aci_hal_write_config_data(CONFIG_DATA_ER_OFFSET, CONFIG_DATA_ER_LEN, configuration.rootKeys.encryption.data());
 
-        bondStorageSynchronizer.Emplace(bleBondStorage.bondStorageSynchronizerCreator);
+        bondStorageSynchronizer.emplace(bleBondStorage.bondStorageSynchronizerCreator);
 
         aci_hal_set_tx_power_level(1, txPowerLevel);
         aci_gatt_init();

diff --git a/hal_st/middlewares/ble_middleware/GapSt.hpp b/hal_st/middlewares/ble_middleware/GapSt.hpp
@@ -129,7 +129,7 @@ namespace hal
     private:
         const uint8_t& txPowerLevel;
         uint16_t maxAttMtu = defaultMaxAttMtuSize;
-        infra::Optional<infra::ProxyCreator<services::BondStorageSynchronizer, void()>> bondStorageSynchronizer;
+        std::optional<infra::ProxyCreator<services::BondStorageSynchronizer, void()>> bondStorageSynchronizer;
     };
 }
 

diff --git a/hal_st/middlewares/ble_middleware/GattClientSt.cpp b/hal_st/middlewares/ble_middleware/GattClientSt.cpp
@@ -348,11 +348,11 @@ namespace hal
     {
         if (isUuid16)
         {
-            stream >> type.Emplace<services::AttAttribute::Uuid16>();
+            stream >> type.emplace<services::AttAttribute::Uuid16>();
         }
         else
         {
-            stream >> type.Emplace<services::AttAttribute::Uuid128>();
+            stream >> type.emplace<services::AttAttribute::Uuid128>();
         }
     }
 

diff --git a/hal_st/stm32fxxx/AdcDmaStm.cpp b/hal_st/stm32fxxx/AdcDmaStm.cpp
@@ -7,14 +7,14 @@ namespace hal
         : adc(adc)
         , buffer(buffer)
         , dmaStream(receiveStream, &adc.Handle().Instance->DR, sizeof(uint16_t), [this]()
-            {
-                TransferDone();
-            })
+              {
+                  TransferDone();
+              })
         , analogPin(pin)
 #if defined(STM32G0)
-        , timer(3, timing, { TimerBaseStm::CounterMode::up, infra::MakeOptional<TimerBaseStm::Trigger>({ TimerBaseStm::Trigger::TriggerOutput::update, false }) })
+        , timer(3, timing, { TimerBaseStm::CounterMode::up, std::make_optional<TimerBaseStm::Trigger>({ TimerBaseStm::Trigger::TriggerOutput::update, false }) })
 #else
-        , timer(2, timing, { TimerBaseStm::CounterMode::up, infra::MakeOptional<TimerBaseStm::Trigger>({ TimerBaseStm::Trigger::TriggerOutput::update, false }) })
+        , timer(2, timing, { TimerBaseStm::CounterMode::up, std::make_optional<TimerBaseStm::Trigger>({ TimerBaseStm::Trigger::TriggerOutput::update, false }) })
 #endif
     {
         ADC_ChannelConfTypeDef channelConfig;

diff --git a/hal_st/stm32fxxx/QuadSpiStm.cpp b/hal_st/stm32fxxx/QuadSpiStm.cpp
@@ -107,7 +107,7 @@ namespace hal
     {
         QSPI_CommandTypeDef command;
 
-        command.Instruction = header.instruction.ValueOr(0);
+        command.Instruction = header.instruction.value_or(0);
         command.Address = VectorToAddress(header.address);
         command.AddressSize = ((header.address.size() - 1) & 0x03) << 12;
         command.AlternateBytes = VectorToAddress(header.alternate);

diff --git a/hal_st/stm32fxxx/SingleSpeedQuadSpiStmDma.cpp b/hal_st/stm32fxxx/SingleSpeedQuadSpiStmDma.cpp
@@ -18,12 +18,12 @@ namespace hal
         continuedSession = nextAction == SpiAction::continueSession;
 
         if (!sendData.empty())
-            quadSpi.SendData(QuadSpi::Header{ infra::none, {}, {}, 0 }, sendData, QuadSpi::Lines::SingleSpeed(), [this]()
+            quadSpi.SendData(QuadSpi::Header{ std::nullopt, {}, {}, 0 }, sendData, QuadSpi::Lines::SingleSpeed(), [this]()
                 {
                     Done();
                 });
         else
-            quadSpi.ReceiveData(QuadSpi::Header{ infra::none, {}, {}, 0 }, receiveData, QuadSpi::Lines::SingleSpeed(), [this]()
+            quadSpi.ReceiveData(QuadSpi::Header{ std::nullopt, {}, {}, 0 }, receiveData, QuadSpi::Lines::SingleSpeed(), [this]()
                 {
                     Done();
                 });

diff --git a/hal_st/stm32fxxx/SpiMasterStm.cpp b/hal_st/stm32fxxx/SpiMasterStm.cpp
@@ -59,7 +59,7 @@ namespace hal
             dummyToReceive = sendData.size();
 
         really_assert(!spiInterruptRegistration);
-        spiInterruptRegistration.Emplace(peripheralSpiIrq[spiInstance], [this]()
+        spiInterruptRegistration.emplace(peripheralSpiIrq[spiInstance], [this]()
             {
                 HandleInterrupt();
             });
@@ -135,7 +135,7 @@ namespace hal
 
         if (!sending && !receiving && dummyToSend == 0 && dummyToReceive == 0)
         {
-            spiInterruptRegistration = infra::none;
+            spiInterruptRegistration = std::nullopt;
             if (chipSelectConfigurator && !continuedSession)
                 chipSelectConfigurator->EndSession();
             infra::EventDispatcher::Instance().Schedule([this]()

diff --git a/hal_st/stm32fxxx/SpiMasterStm.hpp b/hal_st/stm32fxxx/SpiMasterStm.hpp
@@ -43,7 +43,7 @@ namespace hal
         infra::AutoResetFunction<void()> onDone;
         ChipSelectConfigurator* chipSelectConfigurator = nullptr;
         CommunicationConfigurator* communicationConfigurator = nullptr;
-        infra::Optional<ImmediateInterruptHandler> spiInterruptRegistration;
+        std::optional<ImmediateInterruptHandler> spiInterruptRegistration;
         infra::ConstByteRange sendData;
         infra::ByteRange receiveData;
         bool sending;

diff --git a/hal_st/stm32fxxx/TimerStm.hpp b/hal_st/stm32fxxx/TimerStm.hpp
@@ -40,7 +40,7 @@ namespace hal
         struct Config
         {
             CounterMode counterMode;
-            infra::Optional<Trigger> trigger;
+            std::optional<Trigger> trigger;
         };
 
         TimerBaseStm(uint8_t aTimerIndex, Timing timing, const Config& config);

diff --git a/hal_st/synchronous_stm32fxxx/SynchronousSynchronizedRandomDataGeneratorStm.cpp b/hal_st/synchronous_stm32fxxx/SynchronousSynchronizedRandomDataGeneratorStm.cpp
@@ -14,9 +14,10 @@ namespace hal
 
         LL_RCC_HSI48_Enable();
         while (!LL_RCC_HSI48_IsReady())
-        {}
+        {
+        }
 
-        hwRngCreator.Emplace();
+        hwRngCreator.emplace();
         hwRngCreator->GenerateRandomData(result);
         hwRngCreator.Destroy();
 

diff --git a/hal_st/synchronous_stm32fxxx/SynchronousUartStm.cpp b/hal_st/synchronous_stm32fxxx/SynchronousUartStm.cpp
@@ -19,8 +19,8 @@ namespace hal
     {
         if (flowControl != HwFlowControl::hwControlDisable)
         {
-            this->uartRts.Emplace(uartRts, PinConfigTypeStm::uartRts, aUartIndex);
-            this->uartCts.Emplace(uartCts, PinConfigTypeStm::uartCts, aUartIndex);
+            this->uartRts.emplace(uartRts, PinConfigTypeStm::uartRts, aUartIndex);
+            this->uartCts.emplace(uartCts, PinConfigTypeStm::uartCts, aUartIndex);
         }
         Register(peripheralUartIrq[uartIndex]);
         EnableClockUart(uartIndex);
@@ -62,23 +62,27 @@ namespace hal
         {
 #if defined(STM32F0) || defined(STM32F3) || defined(STM32F7) || defined(STM32WB) || defined(STM32G4) || defined(STM32G0)
             while ((peripheralUart[uartIndex]->ISR & USART_ISR_TXE) == 0)
-            {}
+            {
+            }
 
             peripheralUart[uartIndex]->TDR = byte;
 #else
             while ((peripheralUart[uartIndex]->SR & USART_SR_TXE) == 0)
-            {}
+            {
+            }
 
             peripheralUart[uartIndex]->DR = byte;
 #endif
         }
 
 #if defined(STM32F0) || defined(STM32F3) || defined(STM32F7) || defined(STM32WB) || defined(STM32G4) || defined(STM32G0)
         while ((peripheralUart[uartIndex]->ISR & USART_ISR_TXE) == 0)
-        {}
+        {
+        }
 #else
         while ((peripheralUart[uartIndex]->SR & USART_SR_TXE) == 0)
-        {}
+        {
+        }
 #endif
     }
 
@@ -152,7 +156,7 @@ namespace hal
         EnableClockUart(aUartIndex - 1);
 
         if (flowControl != HwFlowControl::hwControlDisable)
-            this->uartRts.Emplace(uartRts, PinConfigTypeStm::uartRts, aUartIndex);
+            this->uartRts.emplace(uartRts, PinConfigTypeStm::uartRts, aUartIndex);
 
         UartStmHalInit(flowControl, baudrate);
     }
@@ -169,7 +173,7 @@ namespace hal
         EnableClockLpuart(aUartIndex - 1);
 
         if (flowControl != HwFlowControl::hwControlDisable)
-            this->uartRts.Emplace(uartRts, PinConfigTypeStm::lpuartRts, aUartIndex);
+            this->uartRts.emplace(uartRts, PinConfigTypeStm::lpuartRts, aUartIndex);
 
         UartStmHalInit(flowControl, baudrate);
     }
@@ -186,23 +190,27 @@ namespace hal
         {
 #if defined(STM32F0) || defined(STM32F3) || defined(STM32F7) || defined(STM32WB) || defined(STM32G4) || defined(STM32G0)
             while ((uartBase->ISR & USART_ISR_TXE) == 0)
-            {}
+            {
+            }
 
             uartBase->TDR = byte;
 #else
             while ((uartBase->SR & USART_SR_TXE) == 0)
-            {}
+            {
+            }
 
             uartBase->DR = byte;
 #endif
         }
 
 #if defined(STM32F0) || defined(STM32F3) || defined(STM32F7) || defined(STM32WB) || defined(STM32G4) || defined(STM32G0)
         while ((uartBase->ISR & USART_ISR_TXE) == 0)
-        {}
+        {
+        }
 #else
         while ((uartBase->SR & USART_SR_TXE) == 0)
-        {}
+        {
+        }
 #endif
     }
 

diff --git a/hal_st/synchronous_stm32fxxx/SynchronousUartStm.hpp b/hal_st/synchronous_stm32fxxx/SynchronousUartStm.hpp
@@ -51,8 +51,8 @@ namespace hal
         uint8_t uartIndex;
         PeripheralPinStm uartTx;
         PeripheralPinStm uartRx;
-        infra::Optional<PeripheralPinStm> uartRts;
-        infra::Optional<PeripheralPinStm> uartCts;
+        std::optional<PeripheralPinStm> uartRts;
+        std::optional<PeripheralPinStm> uartCts;
         TimeKeeper& timeKeeper;
         infra::ByteRange readBuffer;
         std::atomic<uint8_t*> contentsBegin;
@@ -88,7 +88,7 @@ namespace hal
 
         USART_TypeDef* const uartBase;
         PeripheralPinStm uartTx;
-        infra::Optional<PeripheralPinStm> uartRts;
+        std::optional<PeripheralPinStm> uartRts;
     };
 }
 

diff --git a/hal_st_lwip/instantiations_lwip/Ethernet.hpp b/hal_st_lwip/instantiations_lwip/Ethernet.hpp
@@ -48,25 +48,25 @@ namespace main_
                 : llmnrResponder(lightweightIp, lightweightIp, lightweightIp, hostName)
             {
                 if (connectedCreator != nullptr)
-                    connected.Emplace(*connectedCreator, lightweightIp);
+                    connected.emplace(*connectedCreator, lightweightIp);
             }
 
             void Stop(const infra::Function<void()>& onDone) override
             {
-                if (connected != infra::none)
+                if (connected != std::nullopt)
                     (*connected)->Stop(onDone);
                 else
                     onDone;
             }
 
             services::LlmnrResponder llmnrResponder;
-            infra::Optional<infra::ProxyCreator<services::Stoppable, void(services::LightweightIp& lightweightIp)>> connected;
+            std::optional<infra::ProxyCreator<services::Stoppable, void(services::LightweightIp& lightweightIp)>> connected;
         };
 
         infra::CreatorBase<services::Stoppable, void(services::LightweightIp& lightweightIp)>* connectedCreator = nullptr;
-        infra::Creator<services::Stoppable, Connected, void(services::LightweightIp& lightweightIp)> connected{ [this](infra::Optional<Connected>& value, services::LightweightIp& lightweightIp)
+        infra::Creator<services::Stoppable, Connected, void(services::LightweightIp& lightweightIp)> connected{ [this](std::optional<Connected>& value, services::LightweightIp& lightweightIp)
             {
-                value.Emplace(lightweightIp, hostName, connectedCreator);
+                value.emplace(lightweightIp, hostName, connectedCreator);
             } };
     };
 
@@ -79,7 +79,8 @@ namespace main_
               {
                   SYSCFG->CMPCR |= SYSCFG_CMPCR_CMP_PD;
                   while ((SYSCFG->CMPCR & SYSCFG_CMPCR_READY) == 0)
-                  {}
+                  {
+                  }
               })
         , mdio(pins[0].first, pins[0].second)
         , mdc(pins[1].first, pins[1].second)
@@ -105,7 +106,8 @@ namespace main_
               {
                   SYSCFG->CMPCR |= SYSCFG_CMPCR_CMP_PD;
                   while ((SYSCFG->CMPCR & SYSCFG_CMPCR_READY) == 0)
-                  {}
+                  {
+                  }
               })
         , mdio(pins[0].first, pins[0].second)
         , mdc(pins[1].first, pins[1].second)

diff --git a/hal_st_lwip/instantiations_lwip/EthernetSmiObserver.cpp b/hal_st_lwip/instantiations_lwip/EthernetSmiObserver.cpp
@@ -6,7 +6,7 @@ namespace main_
         : hal::EthernetSmiObserver(ethernetSmi)
         , lightweightIpOverEthernetFactory(lightweightIpOverEthernetFactory)
         , ethernetRmiiRefClk(ethernetRmiiRefClk)
-        , ethernetRmiiRefClkPeripheral(infra::inPlace, ethernetRmiiRefClk, hal::PinConfigTypeStm::ethernet, 0)
+        , ethernetRmiiRefClkPeripheral(std::in_place, ethernetRmiiRefClk, hal::PinConfigTypeStm::ethernet, 0)
     {}
 
     EthernetSmiObserver::~EthernetSmiObserver()
@@ -17,9 +17,9 @@ namespace main_
 
     void EthernetSmiObserver::LinkUp(hal::LinkSpeed linkSpeed)
     {
-        ethernetMac.Emplace(Subject(), linkSpeed, lightweightIpOverEthernetFactory.MacAddress());
+        ethernetMac.emplace(Subject(), linkSpeed, lightweightIpOverEthernetFactory.MacAddress());
 #if STM32F767xx
-        ethernetStm32f767Workaround.Emplace(*ethernetMac, ethernetRmiiRefClk, ethernetRmiiRefClkPeripheral);
+        ethernetStm32f767Workaround.emplace(*ethernetMac, ethernetRmiiRefClk, ethernetRmiiRefClkPeripheral);
         lightweightIpOverEthernetFactory.Create(*ethernetStm32f767Workaround);
 #else
         lightweightIpOverEthernetFactory.Create(*ethernetMac);
@@ -30,8 +30,8 @@ namespace main_
     {
         lightweightIpOverEthernetFactory.Destroy();
 #if STM32F767xx
-        ethernetStm32f767Workaround = infra::none;
+        ethernetStm32f767Workaround = std::nullopt;
 #endif
-        ethernetMac = infra::none;
+        ethernetMac = std::nullopt;
     }
 }