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

This reverts commit b690a0314f0f2e42137ad4b3e867e056c1d3c14e.

3 files changed, 14 insertions, 33 deletions

diff --git a/embassy-stm32/src/i2c/mod.rs b/embassy-stm32/src/i2c/mod.rs
index 675a392f9..4caa35efb 100644
--- a/embassy-stm32/src/i2c/mod.rs
+++ b/embassy-stm32/src/i2c/mod.rs
@@ -5,9 +5,6 @@
 #[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;
@@ -16,6 +13,7 @@ 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;
@@ -277,6 +275,19 @@ 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 b362ab017..879d1686b 100644
--- a/embassy-stm32/src/i2c/v1.rs
+++ b/embassy-stm32/src/i2c/v1.rs
@@ -17,21 +17,6 @@ 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 72a7d05ab..3b09f1b34 100644
--- a/embassy-stm32/src/i2c/v2.rs
+++ b/embassy-stm32/src/i2c/v2.rs
@@ -12,21 +12,6 @@ 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 {