diff options
| author | xoviat <[email protected]> | 2023-09-29 00:25:55 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-09-29 00:25:55 +0000 |
| commit | aa14f18d3f19b47904454143d232bf4cd6c55ddf (patch) | |
| tree | d922b5566195ec63ff5061542469dc3b8f0011e0 | |
| parent | d6654bf8b5c8cb51ead5bc6172f076ee0588d290 (diff) | |
| parent | 39f1b26a3954a3ffbc2a0960a8c7fd952f928648 (diff) | |
Merge pull request #1968 from xoviat/sbs
update metapac and rename sbs
| -rw-r--r-- | embassy-stm32/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/eth/v2/mod.rs | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/lib.rs | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 08b9b3a38..1ef92430f 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -59,7 +59,7 @@ sdio-host = "0.5.0" | |||
| 59 | embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } | 59 | embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } |
| 60 | critical-section = "1.1" | 60 | critical-section = "1.1" |
| 61 | atomic-polyfill = "1.0.1" | 61 | atomic-polyfill = "1.0.1" |
| 62 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-bdbf126746919e1c07730d80f9345b1a494c72a6" } | 62 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-735cab337aad6161f3d6bcf3e49cd1f034bc3130" } |
| 63 | vcell = "0.1.3" | 63 | vcell = "0.1.3" |
| 64 | bxcan = "0.7.0" | 64 | bxcan = "0.7.0" |
| 65 | nb = "1.0.0" | 65 | nb = "1.0.0" |
| @@ -78,7 +78,7 @@ critical-section = { version = "1.1", features = ["std"] } | |||
| 78 | [build-dependencies] | 78 | [build-dependencies] |
| 79 | proc-macro2 = "1.0.36" | 79 | proc-macro2 = "1.0.36" |
| 80 | quote = "1.0.15" | 80 | quote = "1.0.15" |
| 81 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-bdbf126746919e1c07730d80f9345b1a494c72a6", default-features = false, features = ["metadata"]} | 81 | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-735cab337aad6161f3d6bcf3e49cd1f034bc3130", default-features = false, features = ["metadata"]} |
| 82 | 82 | ||
| 83 | [features] | 83 | [features] |
| 84 | default = ["rt"] | 84 | default = ["rt"] |
diff --git a/embassy-stm32/src/eth/v2/mod.rs b/embassy-stm32/src/eth/v2/mod.rs index b7fe4766c..6efd40e3e 100644 --- a/embassy-stm32/src/eth/v2/mod.rs +++ b/embassy-stm32/src/eth/v2/mod.rs | |||
| @@ -99,9 +99,9 @@ impl<'d, T: Instance, P: PHY> Ethernet<'d, T, P> { | |||
| 99 | }); | 99 | }); |
| 100 | 100 | ||
| 101 | // RMII | 101 | // RMII |
| 102 | crate::pac::SBS | 102 | crate::pac::SYSCFG |
| 103 | .pmcr() | 103 | .pmcr() |
| 104 | .modify(|w| w.set_eth_sel_phy(crate::pac::sbs::vals::EthSelPhy::B_0X4)); | 104 | .modify(|w| w.set_eth_sel_phy(crate::pac::syscfg::vals::EthSelPhy::B_0X4)); |
| 105 | }); | 105 | }); |
| 106 | 106 | ||
| 107 | config_pins!(ref_clk, mdio, mdc, crs, rx_d0, rx_d1, tx_d0, tx_d1, tx_en); | 107 | config_pins!(ref_clk, mdio, mdc, crs, rx_d0, rx_d1, tx_d0, tx_d1, tx_en); |
diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs index db79546ba..1e184f9d7 100644 --- a/embassy-stm32/src/lib.rs +++ b/embassy-stm32/src/lib.rs | |||
| @@ -181,10 +181,8 @@ pub fn init(config: Config) -> Peripherals { | |||
| 181 | }); | 181 | }); |
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | #[cfg(not(any(stm32f1, stm32h5, stm32wb, stm32wl)))] | 184 | #[cfg(not(any(stm32f1, stm32wb, stm32wl)))] |
| 185 | peripherals::SYSCFG::enable(); | 185 | peripherals::SYSCFG::enable(); |
| 186 | #[cfg(sbs)] | ||
| 187 | peripherals::SBS::enable(); | ||
| 188 | #[cfg(not(any(stm32h5, stm32h7, stm32wb, stm32wl)))] | 186 | #[cfg(not(any(stm32h5, stm32h7, stm32wb, stm32wl)))] |
| 189 | peripherals::PWR::enable(); | 187 | peripherals::PWR::enable(); |
| 190 | #[cfg(not(any(stm32f2, stm32f4, stm32f7, stm32l0, stm32h5, stm32h7)))] | 188 | #[cfg(not(any(stm32f2, stm32f4, stm32f7, stm32l0, stm32h5, stm32h7)))] |
