avr/uart
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix volatile compound assignments being deprecated in C++20

Browse Source
This commit is contained in:
BlackMark
2026-08-05 22:02:16 +02:00
parent 8f88cdccea
commit 430ad479fc
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hardware.hpp
View File

@@ -68,9 +68,11 @@ class Hardware {
constexpr uint8_t ControlRegC = DataBitsValues.regCVal | ParityVal | StopBitsVal | ModeVal; constexpr uint8_t ControlRegC = DataBitsValues.regCVal | ParityVal | StopBitsVal | ModeVal;
if constexpr (UseDoubleSpeed) 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 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_B_ADDR>() = ControlRegB;
*getRegPtr<Registers::CTRL_STAT_REG_C_ADDR>() = ControlRegC; *getRegPtr<Registers::CTRL_STAT_REG_C_ADDR>() = ControlRegC;
@@ -130,12 +132,14 @@ class Hardware {
static void enableDataRegEmptyInt() FORCE_INLINE 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 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: private:

1
hardware1.hpp
View File

@@ -158,3 +158,4 @@ void USART1_UDRE_vect() __attribute__((signal));
#endif #endif
#undef FORCE_INLINE #undef FORCE_INLINE