Skip to content

Rewrite stm32f4 setup with svd generated registers #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Rewrite stm32f4 setup with svd generated registers #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d940d8b
Rewrite `stm32f4` setup with svd generated registers
mitchmindtree Jul 19, 2020
a116fde
Use modify rather than write in stm32f407 setup
mitchmindtree Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 13 additions & 20 deletions src/setup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#[cfg(feature = "stm32f4xx-hal")]
use stm32f4xx_hal::{
bb,
gpio::{
gpioa::{PA1, PA2, PA7},
gpiob::{PB11, PB12, PB13},
Expand Down Expand Up @@ -31,35 +30,29 @@ use stm32f7xx_hal::{
pub(crate) fn setup() {
#[cfg(feature = "stm32f4xx-hal")]
unsafe {
const SYSCFG_BIT: u8 = 14;
const ETH_MAC_BIT: u8 = 25;
const ETH_TX_BIT: u8 = 26;
const ETH_RX_BIT: u8 = 27;
const MII_RMII_BIT: u8 = 23;

//NOTE(unsafe) This will only be used for atomic writes with no side-effects
let rcc = &*RCC::ptr();
let syscfg = &*SYSCFG::ptr();

// Enable syscfg clock
bb::set(&rcc.apb2enr, SYSCFG_BIT);
// Enable syscfg clock.
rcc.apb2enr.modify(|_, w| w.syscfgen().set_bit());

if rcc.ahb1enr.read().ethmacen().bit_is_set() {
// pmc must be changed with the ethernet controller disabled or under reset
bb::clear(&rcc.ahb1enr, ETH_MAC_BIT);
rcc.ahb1enr.modify(|_, w| w.ethmacen().clear_bit());
}
// select MII or RMII mode
// 0 = MII, 1 = RMII
bb::set(&syscfg.pmc, MII_RMII_BIT);

// enable ethernet clocks
bb::set(&rcc.ahb1enr, ETH_MAC_BIT);
bb::set(&rcc.ahb1enr, ETH_TX_BIT);
bb::set(&rcc.ahb1enr, ETH_RX_BIT);
// 0 = MII, 1 = RMII.
syscfg.pmc.modify(|_, w| w.mii_rmii_sel().set_bit());

// Enable ethernet clocks.
rcc.ahb1enr.modify(|_, w| w.ethmacen().set_bit());
rcc.ahb1enr.modify(|_, w| w.ethmactxen().set_bit());
rcc.ahb1enr.modify(|_, w| w.ethmacrxen().set_bit());

// reset pulse
bb::set(&rcc.ahb1rstr, ETH_MAC_BIT);
bb::clear(&rcc.ahb1rstr, ETH_MAC_BIT);
// Reset pulse.
rcc.ahb1rstr.modify(|_, w| w.ethmacrst().set_bit());
rcc.ahb1rstr.modify(|_, w| w.ethmacrst().clear_bit());
}
#[cfg(feature = "stm32f7xx-hal")]
//stm32f7xx-hal does not currently have bitbanding
Expand Down