aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnmanuel Parache <[email protected]>2024-11-07 15:24:23 -0400
committerDario Nieuwenhuis <[email protected]>2024-12-03 00:34:23 +0100
commit32a1b232cb74e61edc98aa5f499e58a1b13d055b (patch)
treecc1eef785204f839715d87ce4c83c6e01a024141
parent63298e2f7c5c31eecdf0f734e85e94ad5e423bcb (diff)
Fixed build error
-rw-r--r--embassy-stm32/src/usart/mod.rs18
1 files changed, 12 insertions, 6 deletions
diff --git a/embassy-stm32/src/usart/mod.rs b/embassy-stm32/src/usart/mod.rs
index 6bde827b9..2d801e6bf 100644
--- a/embassy-stm32/src/usart/mod.rs
+++ b/embassy-stm32/src/usart/mod.rs
@@ -1513,12 +1513,7 @@ fn set_baudrate(info: &Info, kernel_clock: Hertz, baudrate: u32) -> Result<(), C
1513 Ok(()) 1513 Ok(())
1514} 1514}
1515 1515
1516fn find_and_set_brr( 1516fn find_and_set_brr(r: Regs, kind: Kind, kernel_clock: Hertz, baudrate: u32) -> Result<bool, ConfigError> {
1517 r: stm32_metapac::usart::Usart,
1518 kind: Kind,
1519 kernel_clock: Hertz,
1520 baudrate: u32,
1521) -> Result<bool, ConfigError> {
1522 #[cfg(not(usart_v4))] 1517 #[cfg(not(usart_v4))]
1523 static DIVS: [(u16, ()); 1] = [(1, ())]; 1518 static DIVS: [(u16, ()); 1] = [(1, ())];
1524 1519
@@ -1551,7 +1546,11 @@ fn find_and_set_brr(
1551 }; 1546 };
1552 1547
1553 let mut found_brr = None; 1548 let mut found_brr = None;
1549 #[cfg(not(usart_v1))]
1554 let mut over8 = false; 1550 let mut over8 = false;
1551 #[cfg(usart_v1)]
1552 let over8 = false;
1553
1555 for &(presc, _presc_val) in &DIVS { 1554 for &(presc, _presc_val) in &DIVS {
1556 let brr = calculate_brr(baudrate, kernel_clock.0, presc as u32, mul); 1555 let brr = calculate_brr(baudrate, kernel_clock.0, presc as u32, mul);
1557 trace!( 1556 trace!(
@@ -1608,7 +1607,11 @@ fn set_usart_baudrate(info: &Info, kernel_clock: Hertz, baudrate: u32) -> Result
1608 // disable uart 1607 // disable uart
1609 w.set_ue(false); 1608 w.set_ue(false);
1610 }); 1609 });
1610
1611 #[cfg(not(usart_v1))]
1611 let over8 = find_and_set_brr(r, info.kind, kernel_clock, baudrate)?; 1612 let over8 = find_and_set_brr(r, info.kind, kernel_clock, baudrate)?;
1613 #[cfg(usart_v1)]
1614 let _over8 = find_and_set_brr(r, info.kind, kernel_clock, baudrate)?;
1612 1615
1613 r.cr1().modify(|w| { 1616 r.cr1().modify(|w| {
1614 // enable uart 1617 // enable uart
@@ -1640,7 +1643,10 @@ fn configure(
1640 w.set_ue(false); 1643 w.set_ue(false);
1641 }); 1644 });
1642 1645
1646 #[cfg(not(usart_v1))]
1643 let over8 = find_and_set_brr(r, kind, kernel_clock, config.baudrate)?; 1647 let over8 = find_and_set_brr(r, kind, kernel_clock, config.baudrate)?;
1648 #[cfg(usart_v1)]
1649 let _over8 = find_and_set_brr(r, kind, kernel_clock, config.baudrate)?;
1644 1650
1645 r.cr2().write(|w| { 1651 r.cr2().write(|w| {
1646 w.set_stop(match config.stop_bits { 1652 w.set_stop(match config.stop_bits {