stm32/i2c: v1 and v2 now has separate definitions for the State struct

3 files changed, 33 insertions, 14 deletions

diff --git a/embassy-stm32/src/i2c/mod.rs b/embassy-stm32/src/i2c/mod.rs
index f51682900..58225d937 100644
--- a/embassy-stm32/src/i2c/mod.rs
+++ b/embassy-stm32/src/i2c/mod.rs
@@ -5,6 +5,9 @@
 #[cfg_attr(any(i2c_v2, i2c_v3), path = "v2.rs")]
 mod _version;
 
+// Type alias for the peri_trait! macro
+type State = _version::State;
+
 mod config;
 
 use core::future::Future;
@@ -13,7 +16,6 @@ use core::marker::PhantomData;
 
 pub use config::*;
 use embassy_hal_internal::Peri;
-use embassy_sync::waitqueue::AtomicWaker;
 #[cfg(feature = "time")]
 use embassy_time::{Duration, Instant};
 use mode::MasterMode;
@@ -274,19 +276,6 @@ impl Timeout {
     }
 }
 
-struct State {
-    #[allow(unused)]
-    waker: AtomicWaker,
-}
-
-impl State {
-    const fn new() -> Self {
-        Self {
-            waker: AtomicWaker::new(),
-        }
-    }
-}
-
 struct Info {
     regs: crate::pac::i2c::I2c,
     rcc: RccInfo,
diff --git a/embassy-stm32/src/i2c/v1.rs b/embassy-stm32/src/i2c/v1.rs
index 7d2b731d5..78abb85ea 100644
--- a/embassy-stm32/src/i2c/v1.rs
+++ b/embassy-stm32/src/i2c/v1.rs
@@ -17,6 +17,21 @@ use super::*;
 use crate::mode::Mode;
 use crate::pac::i2c;
 
+use embassy_sync::waitqueue::AtomicWaker;
+
+/// I2C v2 peripheral state  
+pub(crate) struct State {
+    pub(crate) waker: AtomicWaker,
+}
+
+impl State {
+    pub(crate) const fn new() -> Self {
+        Self {
+            waker: AtomicWaker::new(),
+        }
+    }
+}
+
 // /!\                      /!\
 // /!\ Implementation note! /!\
 // /!\                      /!\
diff --git a/embassy-stm32/src/i2c/v2.rs b/embassy-stm32/src/i2c/v2.rs
index 3b09f1b34..72a7d05ab 100644
--- a/embassy-stm32/src/i2c/v2.rs
+++ b/embassy-stm32/src/i2c/v2.rs
@@ -12,6 +12,21 @@ use stm32_metapac::i2c::vals::{Addmode, Oamsk};
 use super::*;
 use crate::pac::i2c;
 
+use embassy_sync::waitqueue::AtomicWaker;
+
+/// I2C v2 peripheral state  
+pub(crate) struct State {
+    pub(crate) waker: AtomicWaker,
+}
+
+impl State {
+    pub(crate) const fn new() -> Self {
+        Self {
+            waker: AtomicWaker::new(),
+        }
+    }
+}
+
 impl From<AddrMask> for Oamsk {
     fn from(value: AddrMask) -> Self {
         match value {