TPS6699x wrapper changes

Author: RobertZ2011

type-c-service/src/driver/tps6699x.rs

@@ -1,5 +1,4 @@
 use core::array::from_fn;
-use core::cell::RefCell;
 use core::iter::zip;
 
 use ::tps6699x::registers::field_sets::IntEventBus1;
@@ -17,7 +16,7 @@ use embedded_usb_pd::type_c::Current as TypecCurrent;
 use embedded_usb_pd::{Error, PdError, PortId as LocalPortId};
 use tps6699x::asynchronous::embassy as tps6699x;
 
-use crate::ControllerWrapper;
+use crate::wrapper::{Controller, ControllerWrapper};
 
 pub struct Tps6699x<'a, M: RawMutex, B: I2c> {
     port_events: [PortEventKind; MAX_CONTROLLER_PORTS],
@@ -33,7 +32,7 @@ impl<'a, M: RawMutex, B: I2c> Tps6699x<'a, M, B> {
     }
 }
 
-impl<'a, M: RawMutex, B: I2c> crate::Controller for Tps6699x<'a, M, B> {
+impl<'a, M: RawMutex, B: I2c> Controller for Tps6699x<'a, M, B> {
     type BusError = B::Error;
 
     /// Wait for an event on any port
@@ -158,11 +157,11 @@ pub fn tps66994<'a, M: RawMutex, B: I2c>(
     port_ids: [GlobalPortId; TPS66994_NUM_PORTS],
     power_ids: [policy::DeviceId; TPS66994_NUM_PORTS],
 ) -> Result<ControllerWrapper<TPS66994_NUM_PORTS, Tps6699x<'a, M, B>>, PdError> {
-    Ok(ControllerWrapper {
-        pd_controller: controller::Device::new(controller_id, port_ids.as_slice())?,
-        power: from_fn(|i| policy::device::Device::new(power_ids[i])),
-        controller: RefCell::new(Tps6699x::new(controller)),
-    })
+    Ok(ControllerWrapper::new(
+        controller::Device::new(controller_id, port_ids.as_slice())?,
+        from_fn(|i| policy::device::Device::new(power_ids[i])),
+        Tps6699x::new(controller),
+    ))
 }
 
 /// Create a new TPS66993 controller wrapper
@@ -172,9 +171,9 @@ pub fn tps66993<'a, M: RawMutex, B: I2c>(
     port_ids: [GlobalPortId; TPS66993_NUM_PORTS],
     power_ids: [policy::DeviceId; TPS66993_NUM_PORTS],
 ) -> Result<ControllerWrapper<TPS66993_NUM_PORTS, Tps6699x<'a, M, B>>, PdError> {
-    Ok(ControllerWrapper {
-        pd_controller: controller::Device::new(controller_id, port_ids.as_slice())?,
-        power: from_fn(|i| policy::device::Device::new(power_ids[i])),
-        controller: RefCell::new(Tps6699x::new(controller)),
-    })
+    Ok(ControllerWrapper::new(
+        controller::Device::new(controller_id, port_ids.as_slice())?,
+        from_fn(|i| policy::device::Device::new(power_ids[i])),
+        Tps6699x::new(controller),
+    ))
 }