NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

stm32: Allow for RccPeripheral without reset field

Browse source 
This fix build on F0, since it doesn't have DMARST. This change makes
RccPeripheral::reset a no-op on peripherals where a reset field couldn't
be found
This commit is contained in:
Thales Fragoso 2021-07-15 13:25:51 -03:00
parent 8a172ac123
commit 2f08c7ced5
3 changed files with 77 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
embassy-stm32/src/bdma/mod.rs
View file

@ -177,7 +177,7 @@ pub(crate) unsafe fn init() {
} }
pac::peripherals! { pac::peripherals! {
(bdma, $peri:ident) => { (bdma, $peri:ident) => {
crate::peripherals::$peri::enable(); <crate::peripherals::$peri as RccPeripheral>::enable();
}; };
} }
} }

29
embassy-stm32/src/rcc/mod.rs
View file

@ -121,6 +121,35 @@ crate::pac::peripheral_rcc!(
} }
} }
impl RccPeripheral for peripherals::$inst {}
};
($inst:ident, $clk:ident, $enable:ident, $perien:ident) => {
impl sealed::RccPeripheral for peripherals::$inst {
fn frequency() -> crate::time::Hertz {
critical_section::with(|_| {
unsafe {
let freqs = get_freqs();
freqs.$clk
}
})
}
fn enable() {
critical_section::with(|_| {
unsafe {
crate::pac::RCC.$enable().modify(|w| w.$perien(true));
}
})
}
fn disable() {
critical_section::with(|_| {
unsafe {
crate::pac::RCC.$enable().modify(|w| w.$perien(false));
}
})
}
fn reset() {}
}
impl RccPeripheral for peripherals::$inst {} impl RccPeripheral for peripherals::$inst {}
}; };
); );

70
stm32-metapac-gen/src/lib.rs
View file

@ -142,18 +142,17 @@ macro_rules! peripheral_count {{
} }
fn make_dma_channel_counts(out: &mut String, data: &HashMap<String, u8>) { fn make_dma_channel_counts(out: &mut String, data: &HashMap<String, u8>) {
write!(out, write!(
"#[macro_export] out,
"#[macro_export]
macro_rules! dma_channels_count {{ macro_rules! dma_channels_count {{
").unwrap(); "
)
.unwrap();
for (name, count) in data { for (name, count) in data {
write!(out, write!(out, "({}) => ({});\n", name, count,).unwrap();
"({}) => ({});\n",
name, count,
).unwrap();
} }
write!(out, write!(out, " }}\n").unwrap();
" }}\n").unwrap();
} }
fn make_table(out: &mut String, name: &str, data: &Vec<Vec<String>>) { fn make_table(out: &mut String, name: &str, data: &Vec<Vec<String>>) {
@ -409,11 +408,25 @@ pub fn gen(options: Options) {
if let Some(clock_prefix) = clock_prefix { if let Some(clock_prefix) = clock_prefix {
// Workaround for clock registers being split on some chip families. Assume fields are // Workaround for clock registers being split on some chip families. Assume fields are
// named after peripheral and look for first field matching and use that register. // named after peripheral and look for first field matching and use that register.
let en = find_reg_for_field(&rcc, clock_prefix, &format!("{}EN", name)); let mut en = find_reg_for_field(&rcc, clock_prefix, &format!("{}EN", name));
let rst = find_reg_for_field(&rcc, clock_prefix, &format!("{}RST", name)); let mut rst =
find_reg_for_field(&rcc, clock_prefix, &format!("{}RST", name));
if en.is_none() && name.ends_with("1") {
en = find_reg_for_field(
&rcc,
clock_prefix,
&format!("{}EN", &name[..name.len() - 1]),
);
rst = find_reg_for_field(
&rcc,
clock_prefix,
&format!("{}RST", &name[..name.len() - 1]),
);
}
match (en, rst) { match (en, rst) {
(Some((enable_reg, enable_field)), Some((reset_reg, reset_field))) => { (Some((enable_reg, enable_field)), reset_reg_field) => {
let clock = if clock_prefix.is_empty() { let clock = if clock_prefix.is_empty() {
let re = Regex::new("([A-Z]+\\d*).*").unwrap(); let re = Regex::new("([A-Z]+\\d*).*").unwrap();
if !re.is_match(enable_reg) { if !re.is_match(enable_reg) {
@ -436,22 +449,33 @@ pub fn gen(options: Options) {
}; };
if !name.starts_with("GPIO") { if !name.starts_with("GPIO") {
peripheral_rcc_table.push(vec![ let mut row = Vec::with_capacity(6);
name.clone(), row.push(name.clone());
clock, row.push(clock);
enable_reg.to_ascii_lowercase(), row.push(enable_reg.to_ascii_lowercase());
reset_reg.to_ascii_lowercase(),
format!("set_{}", enable_field.to_ascii_lowercase()), if let Some((reset_reg, reset_field)) = reset_reg_field {
format!("set_{}", reset_field.to_ascii_lowercase()), row.push(reset_reg.to_ascii_lowercase());
]); row.push(format!(
"set_{}",
enable_field.to_ascii_lowercase()
));
row.push(format!(
"set_{}",
reset_field.to_ascii_lowercase()
));
} else {
row.push(format!(
"set_{}",
enable_field.to_ascii_lowercase()
));
}
peripheral_rcc_table.push(row);
} }
} }
(None, Some(_)) => { (None, Some(_)) => {
print!("Unable to find enable register for {}", name) print!("Unable to find enable register for {}", name)
} }
(Some(_), None) => {
print!("Unable to find reset register for {}", name)
}
(None, None) => { (None, None) => {
print!("Unable to find enable and reset register for {}", name) print!("Unable to find enable and reset register for {}", name)
} }