Generate clock peripherals for all peripherals with register block
Infers clock for a peripheral using the selected clock as a prefix, in order to work with split registers
This commit is contained in:
parent
9d2f95c82f
commit
bd759510ba
@ -105,6 +105,30 @@ macro_rules! {} {{
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn find_reg_for_field<'c>(
|
||||||
|
rcc: &'c ir::IR,
|
||||||
|
reg_prefix: &str,
|
||||||
|
field_name: &str,
|
||||||
|
) -> Option<(&'c str, &'c str)> {
|
||||||
|
rcc.fieldsets.iter().find_map(|(name, fieldset)| {
|
||||||
|
if name.starts_with(reg_prefix) {
|
||||||
|
fieldset
|
||||||
|
.fields
|
||||||
|
.iter()
|
||||||
|
.find_map(|field| {
|
||||||
|
if field_name == field.name {
|
||||||
|
return Some(field.name.as_str());
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.map(|n| (name.as_str(), n))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let dir = "../stm32-data/data";
|
let dir = "../stm32-data/data";
|
||||||
|
|
||||||
@ -131,6 +155,16 @@ fn main() {
|
|||||||
peripherals: Vec::new(),
|
peripherals: Vec::new(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Load RCC register for chip
|
||||||
|
let chip_family = chip.family.to_ascii_lowercase().clone();
|
||||||
|
let rcc_family = chip_family.strip_prefix("stm32").unwrap();
|
||||||
|
//.strip_prefix("stm32")
|
||||||
|
//.unwrap();
|
||||||
|
let rcc_reg_path = Path::new(&dir)
|
||||||
|
.join("registers")
|
||||||
|
.join(&format!("rcc_{}.yaml", rcc_family));
|
||||||
|
let mut rcc: ir::IR = serde_yaml::from_reader(File::open(rcc_reg_path).unwrap()).unwrap();
|
||||||
|
|
||||||
let mut peripheral_versions: HashMap<String, String> = HashMap::new();
|
let mut peripheral_versions: HashMap<String, String> = HashMap::new();
|
||||||
let mut pin_table: Vec<Vec<String>> = Vec::new();
|
let mut pin_table: Vec<Vec<String>> = Vec::new();
|
||||||
let mut interrupt_table: Vec<Vec<String>> = Vec::new();
|
let mut interrupt_table: Vec<Vec<String>> = Vec::new();
|
||||||
@ -217,30 +251,36 @@ fn main() {
|
|||||||
};
|
};
|
||||||
assert_eq!(p.address, dma_base + dma_stride * dma_num);
|
assert_eq!(p.address, dma_base + dma_stride * dma_num);
|
||||||
}
|
}
|
||||||
"spi" => {
|
|
||||||
if let Some(clock) = &p.clock {
|
_ => {}
|
||||||
// Workaround for APB1 register being split on some chip families. Assume
|
}
|
||||||
// first register until we can find a way to hint which register is used
|
|
||||||
let reg = clock.to_ascii_lowercase();
|
if let Some(clock) = &p.clock {
|
||||||
let (enable_reg, reset_reg) = if chip.family == "STM32H7" && clock == "APB1"
|
// 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.
|
||||||
(format!("{}lenr", reg), format!("{}lrstr", reg))
|
let en = find_reg_for_field(&rcc, clock, &format!("{}EN", name));
|
||||||
} else if chip.family.starts_with("STM32L4") && clock == "APB1" {
|
let rst = find_reg_for_field(&rcc, clock, &format!("{}RST", name));
|
||||||
(format!("{}enr1", reg), format!("{}rstr1", reg))
|
|
||||||
} else {
|
match (en, rst) {
|
||||||
(format!("{}enr", reg), format!("{}rstr", reg))
|
(Some((enable_reg, enable_field)), Some((reset_reg, reset_field))) => {
|
||||||
};
|
|
||||||
let field = name.to_ascii_lowercase();
|
|
||||||
peripheral_rcc_table.push(vec![
|
peripheral_rcc_table.push(vec![
|
||||||
name.clone(),
|
name.clone(),
|
||||||
enable_reg,
|
enable_reg.to_ascii_lowercase(),
|
||||||
reset_reg,
|
reset_reg.to_ascii_lowercase(),
|
||||||
format!("set_{}en", field),
|
format!("set_{}", enable_field.to_ascii_lowercase()),
|
||||||
format!("set_{}rst", field),
|
format!("set_{}", reset_field.to_ascii_lowercase()),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
(None, Some(_)) => {
|
||||||
|
println!("Unable to find enable register for {}", name)
|
||||||
|
}
|
||||||
|
(Some(_), None) => {
|
||||||
|
println!("Unable to find reset register for {}", name)
|
||||||
|
}
|
||||||
|
(None, None) => {
|
||||||
|
println!("Unable to find enable and reset register for {}", name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user