max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generate mod regs just once, so rustfmt is way faster.

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2021-05-21 19:34:41 +02:00
parent f96db3d9d2
commit 35f1f65670
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
embassy-stm32/gen.py
View File

@ -42,6 +42,7 @@ with open('src/pac/mod.rs', 'w') as f:
f'#[cfg_attr(feature="{chip["name"]}", path="{chip["name"]}.rs")]\n') f'#[cfg_attr(feature="{chip["name"]}", path="{chip["name"]}.rs")]\n')
f.write('mod chip;\n') f.write('mod chip;\n')
f.write('pub use chip::*;\n') f.write('pub use chip::*;\n')
f.write('pub(crate) mod regs;\n')
# ========= Generate pac/stm32xxx.rs # ========= Generate pac/stm32xxx.rs
@ -191,14 +192,9 @@ for chip in chips.values():
peripheral_names.append(name) peripheral_names.append(name)
for mod, version in peripheral_versions.items(): for mod, version in peripheral_versions.items():
f.write(f'pub use regs::{mod}_{version} as {mod};') f.write(f'pub use super::regs::{mod}_{version} as {mod};')
f.write(f""" f.write(f"embassy_extras::peripherals!({','.join(peripheral_names)});")
mod regs;
pub use regs::generic;
use embassy_extras::peripherals;
peripherals!({','.join(peripheral_names)});
""")
# ========= DMA peripherals # ========= DMA peripherals
if num_dmas > 0: if num_dmas > 0:
@ -216,9 +212,7 @@ for chip in chips.values():
# ========= exti interrupts # ========= exti interrupts
f.write(f""" f.write(f"impl_exti_irq!({','.join(exti_interrupts)});")
impl_exti_irq!({','.join(exti_interrupts)});
""")
# ========= interrupts # ========= interrupts

2
embassy-stm32/src/lib.rs
View File

@ -31,7 +31,7 @@ pub use embassy_macros::interrupt;
pub use pac::{interrupt, peripherals, Peripherals}; pub use pac::{interrupt, peripherals, Peripherals};
// workaround for svd2rust-generated code using `use crate::generic::*;` // workaround for svd2rust-generated code using `use crate::generic::*;`
pub(crate) use pac::generic; pub(crate) use pac::regs::generic;
#[non_exhaustive] #[non_exhaustive]
pub struct Config { pub struct Config {