diff options
| author | xoviat <[email protected]> | 2023-10-03 16:44:44 -0500 |
|---|---|---|
| committer | xoviat <[email protected]> | 2023-10-03 16:44:44 -0500 |
| commit | 0c4cddfafbcb6be2b91ab54fbb71453c7e78afe1 (patch) | |
| tree | 33237210b0bd7e8b23bc968b42ad401e04924eef | |
| parent | e561e673c2ad6ef403f808ffa8ad33a6c74a86b7 (diff) | |
| parent | 09dfcd6b66597a31a5262ebf67f20a1a9e4641a3 (diff) | |
Merge branch 'main' of github.com:embassy-rs/embassy into opamp
| -rwxr-xr-x | ci.sh | 2 | ||||
| -rw-r--r-- | embassy-stm32/src/rcc/bd.rs | 4 |
2 files changed, 4 insertions, 2 deletions
| @@ -201,8 +201,6 @@ cargo batch \ | |||
| 201 | $BUILD_EXTRA | 201 | $BUILD_EXTRA |
| 202 | 202 | ||
| 203 | 203 | ||
| 204 | rm out/tests/stm32wb55rg/wpan_mac | ||
| 205 | rm out/tests/stm32wb55rg/wpan_ble | ||
| 206 | 204 | ||
| 207 | if [[ -z "${TELEPROBE_TOKEN-}" ]]; then | 205 | if [[ -z "${TELEPROBE_TOKEN-}" ]]; then |
| 208 | echo No teleprobe token found, skipping running HIL tests | 206 | echo No teleprobe token found, skipping running HIL tests |
diff --git a/embassy-stm32/src/rcc/bd.rs b/embassy-stm32/src/rcc/bd.rs index 026c89d6a..cec2ea010 100644 --- a/embassy-stm32/src/rcc/bd.rs +++ b/embassy-stm32/src/rcc/bd.rs | |||
| @@ -88,6 +88,8 @@ impl BackupDomain { | |||
| 88 | ))] | 88 | ))] |
| 89 | #[allow(dead_code, unused_variables)] | 89 | #[allow(dead_code, unused_variables)] |
| 90 | pub fn configure_ls(clock_source: RtcClockSource, lsi: bool, lse: Option<LseDrive>) { | 90 | pub fn configure_ls(clock_source: RtcClockSource, lsi: bool, lse: Option<LseDrive>) { |
| 91 | use atomic_polyfill::{compiler_fence, Ordering}; | ||
| 92 | |||
| 91 | match clock_source { | 93 | match clock_source { |
| 92 | RtcClockSource::LSI => assert!(lsi), | 94 | RtcClockSource::LSI => assert!(lsi), |
| 93 | RtcClockSource::LSE => assert!(&lse.is_some()), | 95 | RtcClockSource::LSE => assert!(&lse.is_some()), |
| @@ -173,5 +175,7 @@ impl BackupDomain { | |||
| 173 | } | 175 | } |
| 174 | 176 | ||
| 175 | trace!("BDCR configured: {:08x}", Self::read().0); | 177 | trace!("BDCR configured: {:08x}", Self::read().0); |
| 178 | |||
| 179 | compiler_fence(Ordering::SeqCst); | ||
| 176 | } | 180 | } |
| 177 | } | 181 | } |
