diff options
| author | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
|---|---|---|
| committer | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
| commit | 2d89cfb18f00aefbfa108728dfea3398e80ea3e4 (patch) | |
| tree | 6485dacac7e61c4378ac522e709edb0a86bd7523 /embassy-stm32/src/i2c/mod.rs | |
| parent | 2dd5ce83ec0421564e85b667f5dabd592f313e5c (diff) | |
| parent | ab86b060500ceda1c80e39f35af69cb08a7b63a2 (diff) | |
fix merge conflict
Diffstat (limited to 'embassy-stm32/src/i2c/mod.rs')
| -rw-r--r-- | embassy-stm32/src/i2c/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/embassy-stm32/src/i2c/mod.rs b/embassy-stm32/src/i2c/mod.rs index f898fcc8b..b35678ed9 100644 --- a/embassy-stm32/src/i2c/mod.rs +++ b/embassy-stm32/src/i2c/mod.rs | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #![macro_use] | 1 | #![macro_use] |
| 2 | 2 | ||
| 3 | use crate::interrupt::Interrupt; | 3 | use crate::interrupt; |
| 4 | 4 | ||
| 5 | #[cfg_attr(i2c_v1, path = "v1.rs")] | 5 | #[cfg_attr(i2c_v1, path = "v1.rs")] |
| 6 | #[cfg_attr(i2c_v2, path = "v2.rs")] | 6 | #[cfg_attr(i2c_v2, path = "v2.rs")] |
| @@ -35,7 +35,7 @@ pub(crate) mod sealed { | |||
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | pub trait Instance: sealed::Instance + 'static { | 37 | pub trait Instance: sealed::Instance + 'static { |
| 38 | type Interrupt: Interrupt; | 38 | type Interrupt: interrupt::typelevel::Interrupt; |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | pin_trait!(SclPin, Instance); | 41 | pin_trait!(SclPin, Instance); |
| @@ -57,7 +57,7 @@ foreach_interrupt!( | |||
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | impl Instance for peripherals::$inst { | 59 | impl Instance for peripherals::$inst { |
| 60 | type Interrupt = crate::interrupt::$irq; | 60 | type Interrupt = crate::interrupt::typelevel::$irq; |
| 61 | } | 61 | } |
| 62 | }; | 62 | }; |
| 63 | ); | 63 | ); |
