[feat] Start incremental i2c refactoring. Modify HardwareInterface trait.

- Introduce init_with_system_control function.
- Make init function fallible.

Author: rusty1968

src/i2c/ast1060_i2c.rs

@@ -9,6 +9,7 @@ use ast1060_pac::{I2cglobal, Scu};
 use core::cmp::min;
 use core::fmt::Write;
 use core::marker::PhantomData;
+use core::ops::Drop;
 use core::sync::atomic::{AtomicBool, Ordering};
 
 use embedded_hal::delay::DelayNs;
@@ -305,7 +306,27 @@ macro_rules! i2c_error {
 impl<I2C: Instance, I2CT: I2CTarget, L: Logger> HardwareInterface for Ast1060I2c<'_, I2C, I2CT, L> {
     type Error = Error;
 
-    fn init(&mut self, config: &mut I2cConfig) {
+    fn init_with_system_control<
+        S: proposed_traits::system_control::ResetControl<ResetId = crate::syscon::ResetId>
+            + proposed_traits::system_control::ClockControl,
+    >(
+        &mut self,
+        system_control: &mut S,
+        config: &mut I2cConfig,
+    ) -> Result<(), Self::Error> {
+        use crate::syscon::ResetId;
+
+        // Enable I2C clock and deassert reset
+        let reset_id = ResetId::RstI2C;
+        system_control
+            .reset_deassert(&reset_id)
+            .map_err(|_| Error::Bus)?;
+
+        // Initialize the I2C controller
+        self.init(config)
+    }
+
+    fn init(&mut self, config: &mut I2cConfig) -> Result<(), Self::Error> {
         i2c_debug!(self.logger, "i2c init");
         i2c_debug!(
             self.logger,
@@ -408,6 +429,8 @@ impl<I2C: Instance, I2CT: I2CTarget, L: Logger> HardwareInterface for Ast1060I2c
                 });
             }
         }
+
+        Ok(())
     }
     #[allow(clippy::too_many_lines)]
     fn configure_timing(&mut self, config: &mut I2cConfig) {

src/i2c/i2c_controller.rs

@@ -2,13 +2,24 @@
 
 use crate::common::{Logger, NoOpLogger};
 use crate::i2c::common::I2cConfig;
+use core::result::Result;
 use embedded_hal::i2c::{Operation, SevenBitAddress};
+use proposed_traits::system_control::{ClockControl, ResetControl};
 
 pub trait HardwareInterface {
     type Error: embedded_hal::i2c::Error + core::fmt::Debug;
 
+    fn init_with_system_control<
+        S: ResetControl<ResetId = crate::syscon::ResetId>
+            + ClockControl<ClockId = crate::syscon::ClockId>,
+    >(
+        &mut self,
+        system_control: &mut S,
+        config: &mut I2cConfig,
+    ) -> Result<(), Self::Error>;
+
     // Methods return hardware-specific errors
-    fn init(&mut self, config: &mut I2cConfig);
+    fn init(&mut self, config: &mut I2cConfig) -> Result<(), Self::Error>;
     fn configure_timing(&mut self, config: &mut I2cConfig);
     fn enable_interrupts(&mut self, mask: u32);
     fn clear_interrupts(&mut self, mask: u32);

src/tests/functional/i2c_test.rs

@@ -122,7 +122,7 @@ pub fn test_i2c_master(uart: &mut UartController<'_>) {
     };
 
     pinctrl::Pinctrl::apply_pinctrl_group(pinctrl::PINCTRL_I2C1);
-    i2c1.hardware.init(&mut i2c1.config);
+    let _ = i2c1.hardware.init(&mut i2c1.config);
 
     let addr = 0x2e; //device ADT7490
     let mut buf = [0x4e];