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

stm32: move pin trait impls from macrotables to build.rs

Browse Source
This commit is contained in:
Dario Nieuwenhuis
2022-02-23 19:43:32 +01:00
parent f14cacbf93
commit 1e69a8c484
13 changed files with 214 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
embassy-stm32/src/can/bxcan.rs
View File

@ -112,18 +112,3 @@ crate::pac::peripherals!(
pin_trait!(RxPin, Instance);
pin_trait!(TxPin, Instance);
crate::pac::peripheral_pins!(
($inst:ident, can, CAN, $pin:ident, TX, $af:expr) => {
pin_trait_impl!(TxPin, $inst, $pin, $af);
};
($inst:ident, can, CAN, $pin:ident, RX, $af:expr) => {
pin_trait_impl!(RxPin, $inst, $pin, $af);
};
($inst:ident, can, CAN, $pin:ident, TX) => {
pin_trait_impl!(TxPin, $inst, $pin, 0);
};
($inst:ident, can, CAN, $pin:ident, RX) => {
pin_trait_impl!(RxPin, $inst, $pin, 0);
};
);

54
embassy-stm32/src/dcmi.rs
View File

@ -481,57 +481,3 @@ crate::pac::interrupts! {
}
dma_trait!(FrameDma, Instance);
crate::pac::peripheral_pins!(
($inst:ident, dcmi, DCMI, $pin:ident, D0, $af:expr) => {
pin_trait_impl!(D0Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, D1, $af:expr) => {
pin_trait_impl!(D1Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, D2, $af:expr) => {
pin_trait_impl!(D2Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, D3, $af:expr) => {
pin_trait_impl!(D3Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, D4, $af:expr) => {
pin_trait_impl!(D4Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, D5, $af:expr) => {
pin_trait_impl!(D5Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, D6, $af:expr) => {
pin_trait_impl!(D6Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, D7, $af:expr) => {
pin_trait_impl!(D7Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, D8, $af:expr) => {
pin_trait_impl!(D8Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, D9, $af:expr) => {
pin_trait_impl!(D9Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, D10, $af:expr) => {
pin_trait_impl!(D10Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, D11, $af:expr) => {
pin_trait_impl!(D11Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, D12, $af:expr) => {
pin_trait_impl!(D12Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, D13, $af:expr) => {
pin_trait_impl!(D13Pin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, HSYNC, $af:expr) => {
pin_trait_impl!(HSyncPin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, VSYNC, $af:expr) => {
pin_trait_impl!(VSyncPin, $inst, $pin, $af);
};
($inst:ident, dcmi, DCMI, $pin:ident, PIXCLK, $af:expr) => {
pin_trait_impl!(PixClkPin, $inst, $pin, $af);
};
);

30
embassy-stm32/src/eth/mod.rs
View File

@ -58,33 +58,3 @@ pin_trait!(RXD1Pin, Instance);
pin_trait!(TXD0Pin, Instance);
pin_trait!(TXD1Pin, Instance);
pin_trait!(TXEnPin, Instance);
crate::pac::peripheral_pins!(
($inst:ident, eth, ETH, $pin:ident, REF_CLK, $af:expr) => {
pin_trait_impl!(RefClkPin, $inst, $pin, $af);
};
($inst:ident, eth, ETH, $pin:ident, MDIO, $af:expr) => {
pin_trait_impl!(MDIOPin, $inst, $pin, $af);
};
($inst:ident, eth, ETH, $pin:ident, MDC, $af:expr) => {
pin_trait_impl!(MDCPin, $inst, $pin, $af);
};
($inst:ident, eth, ETH, $pin:ident, CRS_DV, $af:expr) => {
pin_trait_impl!(CRSPin, $inst, $pin, $af);
};
($inst:ident, eth, ETH, $pin:ident, RXD0, $af:expr) => {
pin_trait_impl!(RXD0Pin, $inst, $pin, $af);
};
($inst:ident, eth, ETH, $pin:ident, RXD1, $af:expr) => {
pin_trait_impl!(RXD1Pin, $inst, $pin, $af);
};
($inst:ident, eth, ETH, $pin:ident, TXD0, $af:expr) => {
pin_trait_impl!(TXD0Pin, $inst, $pin, $af);
};
($inst:ident, eth, ETH, $pin:ident, TXD1, $af:expr) => {
pin_trait_impl!(TXD1Pin, $inst, $pin, $af);
};
($inst:ident, eth, ETH, $pin:ident, TX_EN, $af:expr) => {
pin_trait_impl!(TXEnPin, $inst, $pin, $af);
};
);

300
embassy-stm32/src/fmc/pins.rs
View File

@ -116,303 +116,3 @@ pin_trait!(A22Pin, Instance);
pin_trait!(A23Pin, Instance);
pin_trait!(A24Pin, Instance);
pin_trait!(A25Pin, Instance);
crate::pac::peripheral_pins!(
($inst:ident, fmc, FMC, $pin:ident, A0, $af:expr) => {
pin_trait_impl!(A0Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A1, $af:expr) => {
pin_trait_impl!(A1Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A2, $af:expr) => {
pin_trait_impl!(A2Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A3, $af:expr) => {
pin_trait_impl!(A3Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A4, $af:expr) => {
pin_trait_impl!(A4Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A5, $af:expr) => {
pin_trait_impl!(A5Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A6, $af:expr) => {
pin_trait_impl!(A6Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A7, $af:expr) => {
pin_trait_impl!(A7Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A8, $af:expr) => {
pin_trait_impl!(A8Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A9, $af:expr) => {
pin_trait_impl!(A9Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A10, $af:expr) => {
pin_trait_impl!(A10Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A11, $af:expr) => {
pin_trait_impl!(A11Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A12, $af:expr) => {
pin_trait_impl!(A12Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A13, $af:expr) => {
pin_trait_impl!(A13Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A14, $af:expr) => {
pin_trait_impl!(A14Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A15, $af:expr) => {
pin_trait_impl!(A15Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A16, $af:expr) => {
pin_trait_impl!(A16Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A17, $af:expr) => {
pin_trait_impl!(A17Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A18, $af:expr) => {
pin_trait_impl!(A18Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A19, $af:expr) => {
pin_trait_impl!(A19Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A20, $af:expr) => {
pin_trait_impl!(A20Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A21, $af:expr) => {
pin_trait_impl!(A21Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A22, $af:expr) => {
pin_trait_impl!(A22Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A23, $af:expr) => {
pin_trait_impl!(A23Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A24, $af:expr) => {
pin_trait_impl!(A24Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, A25, $af:expr) => {
pin_trait_impl!(A25Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D0, $af:expr) => {
pin_trait_impl!(D0Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D1, $af:expr) => {
pin_trait_impl!(D1Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D2, $af:expr) => {
pin_trait_impl!(D2Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D3, $af:expr) => {
pin_trait_impl!(D3Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D4, $af:expr) => {
pin_trait_impl!(D4Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D5, $af:expr) => {
pin_trait_impl!(D5Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D6, $af:expr) => {
pin_trait_impl!(D6Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D7, $af:expr) => {
pin_trait_impl!(D7Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D8, $af:expr) => {
pin_trait_impl!(D8Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D9, $af:expr) => {
pin_trait_impl!(D9Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D10, $af:expr) => {
pin_trait_impl!(D10Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D11, $af:expr) => {
pin_trait_impl!(D11Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D12, $af:expr) => {
pin_trait_impl!(D12Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D13, $af:expr) => {
pin_trait_impl!(D13Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D14, $af:expr) => {
pin_trait_impl!(D14Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D15, $af:expr) => {
pin_trait_impl!(D15Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D16, $af:expr) => {
pin_trait_impl!(D16Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D17, $af:expr) => {
pin_trait_impl!(D17Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D18, $af:expr) => {
pin_trait_impl!(D18Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D19, $af:expr) => {
pin_trait_impl!(D19Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D20, $af:expr) => {
pin_trait_impl!(D20Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D21, $af:expr) => {
pin_trait_impl!(D21Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D22, $af:expr) => {
pin_trait_impl!(D22Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D23, $af:expr) => {
pin_trait_impl!(D23Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D24, $af:expr) => {
pin_trait_impl!(D24Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D25, $af:expr) => {
pin_trait_impl!(D25Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D26, $af:expr) => {
pin_trait_impl!(D26Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D27, $af:expr) => {
pin_trait_impl!(D27Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D28, $af:expr) => {
pin_trait_impl!(D28Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D29, $af:expr) => {
pin_trait_impl!(D29Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D30, $af:expr) => {
pin_trait_impl!(D30Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, D31, $af:expr) => {
pin_trait_impl!(D31Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA0, $af:expr) => {
pin_trait_impl!(DA0Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA1, $af:expr) => {
pin_trait_impl!(DA1Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA2, $af:expr) => {
pin_trait_impl!(DA2Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA3, $af:expr) => {
pin_trait_impl!(DA3Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA4, $af:expr) => {
pin_trait_impl!(DA4Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA5, $af:expr) => {
pin_trait_impl!(DA5Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA6, $af:expr) => {
pin_trait_impl!(DA6Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA7, $af:expr) => {
pin_trait_impl!(DA7Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA8, $af:expr) => {
pin_trait_impl!(DA8Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA9, $af:expr) => {
pin_trait_impl!(DA9Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA10, $af:expr) => {
pin_trait_impl!(DA10Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA11, $af:expr) => {
pin_trait_impl!(DA11Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA12, $af:expr) => {
pin_trait_impl!(DA12Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA13, $af:expr) => {
pin_trait_impl!(DA13Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA14, $af:expr) => {
pin_trait_impl!(DA14Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, DA15, $af:expr) => {
pin_trait_impl!(DA15Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, SDNWE, $af:expr) => {
pin_trait_impl!(SDNWEPin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, SDNCAS, $af:expr) => {
pin_trait_impl!(SDNCASPin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, SDNRAS, $af:expr) => {
pin_trait_impl!(SDNRASPin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, SDNE0, $af:expr) => {
pin_trait_impl!(SDNE0Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, SDNE1, $af:expr) => {
pin_trait_impl!(SDNE1Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, SDCKE0, $af:expr) => {
pin_trait_impl!(SDCKE0Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, SDCKE1, $af:expr) => {
pin_trait_impl!(SDCKE1Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, SDCLK, $af:expr) => {
pin_trait_impl!(SDCLKPin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, NBL0, $af:expr) => {
pin_trait_impl!(NBL0Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, NBL1, $af:expr) => {
pin_trait_impl!(NBL1Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, NBL2, $af:expr) => {
pin_trait_impl!(NBL2Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, NBL3, $af:expr) => {
pin_trait_impl!(NBL3Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, INT, $af:expr) => {
pin_trait_impl!(INTPin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, NL, $af:expr) => {
pin_trait_impl!(NLPin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, NWAIT, $af:expr) => {
pin_trait_impl!(NWaitPin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, NE1, $af:expr) => {
pin_trait_impl!(NE1Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, NE2, $af:expr) => {
pin_trait_impl!(NE2Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, NE3, $af:expr) => {
pin_trait_impl!(NE3Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, NE4, $af:expr) => {
pin_trait_impl!(NE4Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, NCE, $af:expr) => {
pin_trait_impl!(NCEPin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, NOE, $af:expr) => {
pin_trait_impl!(NOEPin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, NWE, $af:expr) => {
pin_trait_impl!(NWEPin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, Clk, $af:expr) => {
pin_trait_impl!(ClkPin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, BA0, $af:expr) => {
pin_trait_impl!(BA0Pin, $inst, $pin, $af);
};
($inst:ident, fmc, FMC, $pin:ident, BA1, $af:expr) => {
pin_trait_impl!(BA1Pin, $inst, $pin, $af);
};
);

20
embassy-stm32/src/i2c/mod.rs
View File

@ -71,23 +71,3 @@ crate::pac::interrupts!(
}
};
);
#[cfg(not(rcc_f1))]
crate::pac::peripheral_pins!(
($inst:ident, i2c, I2C, $pin:ident, SDA, $af:expr) => {
pin_trait_impl!(SdaPin, $inst, $pin, $af);
};
($inst:ident, i2c, I2C, $pin:ident, SCL, $af:expr) => {
pin_trait_impl!(SclPin, $inst, $pin, $af);
};
);
#[cfg(rcc_f1)]
crate::pac::peripheral_pins!(
($inst:ident, i2c, I2C, $pin:ident, SDA) => {
pin_trait_impl!(SdaPin, $inst, $pin, 0);
};
($inst:ident, i2c, I2C, $pin:ident, SCL) => {
pin_trait_impl!(SdaPin, $inst, $pin, 0);
};
);

48
embassy-stm32/src/pwm/mod.rs
View File

@ -258,51 +258,3 @@ pin_trait!(BreakInputComparator2Pin, CaptureCompare16bitInstance);
pin_trait!(BreakInput2Pin, CaptureCompare16bitInstance);
pin_trait!(BreakInput2Comparator1Pin, CaptureCompare16bitInstance);
pin_trait!(BreakInput2Comparator2Pin, CaptureCompare16bitInstance);
crate::pac::peripheral_pins!(
($inst:ident, timer, $block:ident, $pin:ident, CH1, $af:expr) => {
pin_trait_impl!(Channel1Pin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, CH1N, $af:expr) => {
pin_trait_impl!(Channel1ComplementaryPin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, CH2, $af:expr) => {
pin_trait_impl!(Channel2Pin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, CH2N, $af:expr) => {
pin_trait_impl!(Channel2ComplementaryPin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, CH3, $af:expr) => {
pin_trait_impl!(Channel3Pin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, CH3N, $af:expr) => {
pin_trait_impl!(Channel3ComplementaryPin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, CH4, $af:expr) => {
pin_trait_impl!(Channel4Pin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, CH4N, $af:expr) => {
pin_trait_impl!(Channel4ComplementaryPin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, ETR, $af:expr) => {
pin_trait_impl!(ExternalTriggerPin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, BKIN, $af:expr) => {
pin_trait_impl!(BreakInputPin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, BKIN_COMP1, $af:expr) => {
pin_trait_impl!(BreakInputComparator1Pin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, BKIN_COMP2, $af:expr) => {
pin_trait_impl!(BreakInputComparator2Pin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, BKIN2, $af:expr) => {
pin_trait_impl!(BreakInput2Pin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, BKIN2_COMP1, $af:expr) => {
pin_trait_impl!(BreakInput2Comparator1Pin, $inst, $pin, $af);
};
($inst:ident, timer, $block:ident, $pin:ident, BKIN2_COMP2, $af:expr) => {
pin_trait_impl!(BreakInput2Comparator2Pin, $inst, $pin, $af);
};
);

4
embassy-stm32/src/rcc/h7.rs
View File

@ -350,10 +350,10 @@ impl_peri!(MCO2, Mco2, set_mco2, set_mco2pre);
crate::pac::peripheral_pins!(
($inst:ident, rcc, RCC, $pin:ident, MCO_1, $af:expr) => {
pin_trait_impl!(McoPin, MCO1, $pin, $af);
pin_trait_impl!(crate::rcc::McoPin, MCO1, $pin, $af);
};
($inst:ident, rcc, RCC, $pin:ident, MCO_2, $af:expr) => {
pin_trait_impl!(McoPin, MCO2, $pin, $af);
pin_trait_impl!(crate::rcc::McoPin, MCO2, $pin, $af);
};
);

36
embassy-stm32/src/sdmmc/v2.rs
View File

@ -1460,42 +1460,6 @@ crate::pac::peripherals!(
};
);
crate::pac::peripheral_pins!(
($inst:ident, sdmmc, SDMMC, $pin:ident, CK, $af:expr) => {
pin_trait_impl!(CkPin, $inst, $pin, $af);
};
($inst:ident, sdmmc, SDMMC, $pin:ident, CMD, $af:expr) => {
pin_trait_impl!(CmdPin, $inst, $pin, $af);
};
($inst:ident, sdmmc, SDMMC, $pin:ident, D0, $af:expr) => {
pin_trait_impl!(D0Pin, $inst, $pin, $af);
};
($inst:ident, sdmmc, SDMMC, $pin:ident, D1, $af:expr) => {
pin_trait_impl!(D1Pin, $inst, $pin, $af);
};
($inst:ident, sdmmc, SDMMC, $pin:ident, D2, $af:expr) => {
pin_trait_impl!(D2Pin, $inst, $pin, $af);
};
($inst:ident, sdmmc, SDMMC, $pin:ident, D3, $af:expr) => {
pin_trait_impl!(D3Pin, $inst, $pin, $af);
};
($inst:ident, sdmmc, SDMMC, $pin:ident, D4, $af:expr) => {
pin_trait_impl!(D4Pin, $inst, $pin, $af);
};
($inst:ident, sdmmc, SDMMC, $pin:ident, D5, $af:expr) => {
pin_trait_impl!(D5Pin, $inst, $pin, $af);
};
($inst:ident, sdmmc, SDMMC, $pin:ident, D6, $af:expr) => {
pin_trait_impl!(D6Pin, $inst, $pin, $af);
};
($inst:ident, sdmmc, SDMMC, $pin:ident, D6, $af:expr) => {
pin_trait_impl!(D7Pin, $inst, $pin, $af);
};
($inst:ident, sdmmc, SDMMC, $pin:ident, D8, $af:expr) => {
pin_trait_impl!(D8Pin, $inst, $pin, $af);
};
);
#[cfg(feature = "sdmmc-rs")]
mod sdmmc_rs {
use super::*;

26
embassy-stm32/src/spi/mod.rs
View File

@ -885,29 +885,3 @@ crate::pac::peripherals!(
impl Instance for peripherals::$inst {}
};
);
#[cfg(not(rcc_f1))]
crate::pac::peripheral_pins!(
($inst:ident, spi, SPI, $pin:ident, SCK, $af:expr) => {
pin_trait_impl!(SckPin, $inst, $pin, $af);
};
($inst:ident, spi, SPI, $pin:ident, MOSI, $af:expr) => {
pin_trait_impl!(MosiPin, $inst, $pin, $af);
};
($inst:ident, spi, SPI, $pin:ident, MISO, $af:expr) => {
pin_trait_impl!(MisoPin, $inst, $pin, $af);
};
);
#[cfg(rcc_f1)]
crate::pac::peripheral_pins!(
($inst:ident, spi, SPI, $pin:ident, SCK) => {
pin_trait_impl!(SckPin, $inst, $pin, 0);
};
($inst:ident, spi, SPI, $pin:ident, MOSI) => {
pin_trait_impl!(MosiPin, $inst, $pin, 0);
};
($inst:ident, spi, SPI, $pin:ident, MISO) => {
pin_trait_impl!(MisoPin, $inst, $pin, 0);
};
);

4
embassy-stm32/src/traits.rs
View File

@ -9,8 +9,8 @@ macro_rules! pin_trait {
}
macro_rules! pin_trait_impl {
($signal:ident, $instance:ident, $pin:ident, $af:expr) => {
impl $signal<crate::peripherals::$instance> for crate::peripherals::$pin {
(crate::$mod:ident::$trait:ident, $instance:ident, $pin:ident, $af:expr) => {
impl crate::$mod::$trait<crate::peripherals::$instance> for crate::peripherals::$pin {
fn af_num(&self) -> u8 {
$af
}

76
embassy-stm32/src/usart/mod.rs
View File

@ -636,79 +636,3 @@ crate::pac::interrupts!(
}
};
);
#[cfg(not(rcc_f1))]
crate::pac::peripheral_pins!(
// USART
($inst:ident, usart, USART, $pin:ident, TX, $af:expr) => {
pin_trait_impl!(TxPin, $inst, $pin, $af);
};
($inst:ident, usart, USART, $pin:ident, RX, $af:expr) => {
pin_trait_impl!(RxPin, $inst, $pin, $af);
};
($inst:ident, usart, USART, $pin:ident, CTS, $af:expr) => {
pin_trait_impl!(CtsPin, $inst, $pin, $af);
};
($inst:ident, usart, USART, $pin:ident, RTS, $af:expr) => {
pin_trait_impl!(RtsPin, $inst, $pin, $af);
};
($inst:ident, usart, USART, $pin:ident, CK, $af:expr) => {
pin_trait_impl!(CkPin, $inst, $pin, $af);
};
// UART
($inst:ident, usart, UART, $pin:ident, TX, $af:expr) => {
pin_trait_impl!(TxPin, $inst, $pin, $af);
};
($inst:ident, usart, UART, $pin:ident, RX, $af:expr) => {
pin_trait_impl!(RxPin, $inst, $pin, $af);
};
($inst:ident, usart, UART, $pin:ident, CTS, $af:expr) => {
pin_trait_impl!(CtsPin, $inst, $pin, $af);
};
($inst:ident, usart, UART, $pin:ident, RTS, $af:expr) => {
pin_trait_impl!(RtsPin, $inst, $pin, $af);
};
($inst:ident, usart, UART, $pin:ident, CK, $af:expr) => {
pin_trait_impl!(CkPin, $inst, $pin, $af);
};
);
#[cfg(rcc_f1)]
crate::pac::peripheral_pins!(
// USART
($inst:ident, usart, USART, $pin:ident, TX) => {
pin_trait_impl!(TxPin, $inst, $pin, 0);
};
($inst:ident, usart, USART, $pin:ident, RX) => {
pin_trait_impl!(RxPin, $inst, $pin, 0);
};
($inst:ident, usart, USART, $pin:ident, CTS) => {
pin_trait_impl!(CtsPin, $inst, $pin, 0);
};
($inst:ident, usart, USART, $pin:ident, RTS) => {
pin_trait_impl!(RtsPin, $inst, $pin, 0);
};
($inst:ident, usart, USART, $pin:ident, CK) => {
pin_trait_impl!(CkPin, $inst, $pin, 0);
};
// UART
($inst:ident, usart, UART, $pin:ident, TX) => {
pin_trait_impl!(TxPin, $inst, $pin, 0);
};
($inst:ident, usart, UART, $pin:ident, RX) => {
pin_trait_impl!(RxPin, $inst, $pin, 0);
};
($inst:ident, usart, UART, $pin:ident, CTS) => {
pin_trait_impl!(CtsPin, $inst, $pin, 0);
};
($inst:ident, usart, UART, $pin:ident, RTS) => {
pin_trait_impl!(RtsPin, $inst, $pin, 0);
};
($inst:ident, usart, UART, $pin:ident, CK) => {
pin_trait_impl!(CkPin, $inst, $pin, 0);
};
);

56
embassy-stm32/src/usb_otg.rs
View File

@ -231,59 +231,3 @@ crate::pac::interrupts!(
unsafe impl USBInterrupt for crate::interrupt::$irq {}
};
);
crate::pac::peripheral_pins!(
// FS internal phy pins
($inst:ident, otgfs, OTG_FS, $pin:ident, DP, $af:expr) => {
pin_trait_impl!(DpPin, $inst, $pin, $af);
};
($inst:ident, otgfs, OTG_FS, $pin:ident, DM, $af:expr) => {
pin_trait_impl!(DmPin, $inst, $pin, $af);
};
// HS internal phy pins
($inst:ident, otghs, OTG_HS, $pin:ident, DP, $af:expr) => {
pin_trait_impl!(DpPin, $inst, $pin, $af);
};
($inst:ident, otghs, OTG_HS, $pin:ident, DM, $af:expr) => {
pin_trait_impl!(DmPin, $inst, $pin, $af);
};
// HS external phy pins
($inst:ident, otghs, OTG_HS, $pin:ident, ULPI_CK, $af:expr) => {
pin_trait_impl!(UlpiClkPin, $inst, $pin, $af);
};
($inst:ident, otghs, OTG_HS, $pin:ident, ULPI_DIR, $af:expr) => {
pin_trait_impl!(UlpiDirPin, $inst, $pin, $af);
};
($inst:ident, otghs, OTG_HS, $pin:ident, ULPI_NXT, $af:expr) => {
pin_trait_impl!(UlpiNxtPin, $inst, $pin, $af);
};
($inst:ident, otghs, OTG_HS, $pin:ident, ULPI_STP, $af:expr) => {
pin_trait_impl!(UlpiStpPin, $inst, $pin, $af);
};
($inst:ident, otghs, OTG_HS, $pin:ident, ULPI_D0, $af:expr) => {
pin_trait_impl!(UlpiD0Pin, $inst, $pin, $af);
};
($inst:ident, otghs, OTG_HS, $pin:ident, ULPI_D1, $af:expr) => {
pin_trait_impl!(UlpiD1Pin, $inst, $pin, $af);
};
($inst:ident, otghs, OTG_HS, $pin:ident, ULPI_D2, $af:expr) => {
pin_trait_impl!(UlpiD2Pin, $inst, $pin, $af);
};
($inst:ident, otghs, OTG_HS, $pin:ident, ULPI_D3, $af:expr) => {
pin_trait_impl!(UlpiD3Pin, $inst, $pin, $af);
};
($inst:ident, otghs, OTG_HS, $pin:ident, ULPI_D4, $af:expr) => {
pin_trait_impl!(UlpiD4Pin, $inst, $pin, $af);
};
($inst:ident, otghs, OTG_HS, $pin:ident, ULPI_D5, $af:expr) => {
pin_trait_impl!(UlpiD5Pin, $inst, $pin, $af);
};
($inst:ident, otghs, OTG_HS, $pin:ident, ULPI_D6, $af:expr) => {
pin_trait_impl!(UlpiD6Pin, $inst, $pin, $af);
};
($inst:ident, otghs, OTG_HS, $pin:ident, ULPI_D7, $af:expr) => {
pin_trait_impl!(UlpiD7Pin, $inst, $pin, $af);
};
);