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

Auto-enable all GPIOs during init().

Browse Source
This commit is contained in:
Bob McWhirter 2021-07-22 14:38:45 -04:00
parent e91c04a673
commit 13873df30b
4 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
embassy-stm32/src/gpio.rs
View File

@ -449,3 +449,13 @@ crate::pac::pins!(
} }
}; };
); );
pub(crate) unsafe fn init() {
crate::pac::gpio_rcc! {
($name:ident, $clock:ident, $en_reg:ident, $rst_reg:ident, $en_fn:ident, $rst_fn:ident) => {
crate::pac::RCC.$en_reg().modify(|reg| {
reg.$en_fn(true);
});
};
}
}

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

@ -89,6 +89,7 @@ pub fn init(config: Config) -> Peripherals {
let p = Peripherals::take(); let p = Peripherals::take();
unsafe { unsafe {
gpio::init();
dma::init(); dma::init();
#[cfg(exti)] #[cfg(exti)]
exti::init(); exti::init();

12
examples/stm32h7/src/bin/usart_dma.rs
View File

@ -71,22 +71,10 @@ fn main() -> ! {
.pll1_q_ck(48.mhz()) .pll1_q_ck(48.mhz())
.freeze(pwrcfg, &pp.SYSCFG); .freeze(pwrcfg, &pp.SYSCFG);
let pp = unsafe { pac::Peripherals::steal() };
unsafe { unsafe {
Dbgmcu::enable_all(); Dbgmcu::enable_all();
} }
pp.RCC.ahb4enr.modify(|_, w| {
w.gpioaen().set_bit();
w.gpioben().set_bit();
w.gpiocen().set_bit();
w.gpioden().set_bit();
w.gpioeen().set_bit();
w.gpiofen().set_bit();
w
});
unsafe { embassy::time::set_clock(&ZeroClock) }; unsafe { embassy::time::set_clock(&ZeroClock) };
let executor = EXECUTOR.put(Executor::new()); let executor = EXECUTOR.put(Executor::new());

47
stm32-metapac-gen/src/lib.rs
View File

@ -287,6 +287,7 @@ pub fn gen(options: Options) {
let mut peripheral_counts: HashMap<String, u8> = HashMap::new(); let mut peripheral_counts: HashMap<String, u8> = HashMap::new();
let mut dma_channel_counts: HashMap<String, u8> = HashMap::new(); let mut dma_channel_counts: HashMap<String, u8> = HashMap::new();
let mut dbgmcu_table: Vec<Vec<String>> = Vec::new(); let mut dbgmcu_table: Vec<Vec<String>> = Vec::new();
let mut gpio_rcc_table: Vec<Vec<String>> = Vec::new();
let gpio_base = core.peripherals.get(&"GPIOA".to_string()).unwrap().address; let gpio_base = core.peripherals.get(&"GPIOA".to_string()).unwrap().address;
let gpio_stride = 0x400; let gpio_stride = 0x400;
@ -465,29 +466,32 @@ pub fn gen(options: Options) {
clock.to_ascii_lowercase() clock.to_ascii_lowercase()
}; };
if !name.starts_with("GPIO") { let mut row = Vec::with_capacity(6);
let mut row = Vec::with_capacity(6); row.push(name.clone());
row.push(name.clone()); row.push(clock);
row.push(clock); row.push(enable_reg.to_ascii_lowercase());
row.push(enable_reg.to_ascii_lowercase());
if let Some((reset_reg, reset_field)) = reset_reg_field { if let Some((reset_reg, reset_field)) = reset_reg_field {
row.push(reset_reg.to_ascii_lowercase()); row.push(reset_reg.to_ascii_lowercase());
row.push(format!( row.push(format!(
"set_{}", "set_{}",
enable_field.to_ascii_lowercase() enable_field.to_ascii_lowercase()
)); ));
row.push(format!( row.push(format!(
"set_{}", "set_{}",
reset_field.to_ascii_lowercase() reset_field.to_ascii_lowercase()
)); ));
} else { } else {
row.push(format!( row.push(format!(
"set_{}", "set_{}",
enable_field.to_ascii_lowercase() enable_field.to_ascii_lowercase()
)); ));
} }
if !name.starts_with("GPIO") {
peripheral_rcc_table.push(row); peripheral_rcc_table.push(row);
} else {
gpio_rcc_table.push(row);
} }
} }
(None, Some(_)) => { (None, Some(_)) => {
@ -586,6 +590,7 @@ pub fn gen(options: Options) {
&peripheral_dma_channels_table, &peripheral_dma_channels_table,
); );
make_table(&mut extra, "peripheral_rcc", &peripheral_rcc_table); make_table(&mut extra, "peripheral_rcc", &peripheral_rcc_table);
make_table(&mut extra, "gpio_rcc", &gpio_rcc_table);
make_table(&mut extra, "dma_channels", &dma_channels_table); make_table(&mut extra, "dma_channels", &dma_channels_table);
make_table(&mut extra, "dbgmcu", &dbgmcu_table); make_table(&mut extra, "dbgmcu", &dbgmcu_table);
make_peripheral_counts(&mut extra, &peripheral_counts); make_peripheral_counts(&mut extra, &peripheral_counts);