Fix volatile compound assignments being deprecated in C++20
This commit is contained in:
12
hardware.hpp
12
hardware.hpp
@@ -68,9 +68,11 @@ class Hardware {
|
||||
constexpr uint8_t ControlRegC = DataBitsValues.regCVal | ParityVal | StopBitsVal | ModeVal;
|
||||
|
||||
if constexpr (UseDoubleSpeed)
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_A_ADDR>() |= (1 << CtrlFlagsA::SPEED_2X);
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_A_ADDR>() =
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_A_ADDR>() | (1 << CtrlFlagsA::SPEED_2X);
|
||||
else
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_A_ADDR>() &= ~(1 << CtrlFlagsA::SPEED_2X);
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_A_ADDR>() =
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_A_ADDR>() & ~(1 << CtrlFlagsA::SPEED_2X);
|
||||
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() = ControlRegB;
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_C_ADDR>() = ControlRegC;
|
||||
@@ -130,12 +132,14 @@ class Hardware {
|
||||
|
||||
static void enableDataRegEmptyInt() FORCE_INLINE
|
||||
{
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() |= (1 << CtrlFlagsB::DATA_REG_EMPTY_INT_ENABLE);
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() =
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() | (1 << CtrlFlagsB::DATA_REG_EMPTY_INT_ENABLE);
|
||||
}
|
||||
|
||||
static void disableDataRegEmptyInt() FORCE_INLINE
|
||||
{
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() &= ~(1 << CtrlFlagsB::DATA_REG_EMPTY_INT_ENABLE);
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() =
|
||||
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() & ~(1 << CtrlFlagsB::DATA_REG_EMPTY_INT_ENABLE);
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
@@ -158,3 +158,4 @@ void USART1_UDRE_vect() __attribute__((signal));
|
||||
#endif
|
||||
|
||||
#undef FORCE_INLINE
|
||||
|
||||
|
||||
Reference in New Issue
Block a user