LailaTheElf/embassy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #1197

Browse Source 
1197: fix(stm32): Align FMC with new versions from stm32-data r=lulf a=rmja



Co-authored-by: Rasmus Melchior Jacobsen <rmja@laesoe.org>
This commit is contained in:
bors[bot] 2023-02-07 14:48:26 +00:00 committed by GitHub
commit dadd6aafe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
embassy-stm32/src/fmc/mod.rs
View File

@ -27,9 +27,13 @@ where
} }
fn memory_controller_enable(&mut self) { fn memory_controller_enable(&mut self) {
// The FMCEN bit of the FMC_BCR2..4 registers is don’t // fmc v1 and v2 does not have the fmcen bit
// care. It is only enabled through the FMC_BCR1 register. // fsmc v1, v2 and v3 does not have the fmcen bit
unsafe { T::regs().bcr1().modify(|r| r.set_fmcen(true)) }; // This is a "not" because it is expected that all future versions have this bit
#[cfg(not(any(fmc_v1x3, fmc_v2x1, fsmc_v1x0, fsmc_v1x3, fsmc_v2x3, fsmc_v3x1)))]
unsafe {
T::regs().bcr1().modify(|r| r.set_fmcen(true))
};
} }
fn source_clock_hz(&self) -> u32 { fn source_clock_hz(&self) -> u32 {

2
stm32-data

@ -1 +1 @@
Subproject commit 96decdd6114d78813c1f748fb878a45e1b03bf73 Subproject commit cc93f9d10395077770bebefb6b9488e06b0e5811