From a88c5e716e7a374e2fc7a602b0c70dea267a2e8a Mon Sep 17 00:00:00 2001
From: Matous Hybl <hyblmatous@gmail.com>
Date: Mon, 28 Feb 2022 16:20:42 +0100
Subject: stm32: Register access for timers now doesn't require self

---
 examples/stm32h7/src/bin/low_level_timer_api.rs | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'examples')

diff --git a/examples/stm32h7/src/bin/low_level_timer_api.rs b/examples/stm32h7/src/bin/low_level_timer_api.rs
index 0c99b0941..3a47dc22b 100644
--- a/examples/stm32h7/src/bin/low_level_timer_api.rs
+++ b/examples/stm32h7/src/bin/low_level_timer_api.rs
@@ -90,20 +90,16 @@ impl<'d, T: CaptureCompare32bitInstance> SimplePwm32<'d, T> {
         this.inner.start();
 
         unsafe {
-            this.inner
-                .regs_gp32()
+            T::regs_gp32()
                 .ccmr_output(0)
                 .modify(|w| w.set_ocm(0, OutputCompareMode::PwmMode1.into()));
-            this.inner
-                .regs_gp32()
+            T::regs_gp32()
                 .ccmr_output(0)
                 .modify(|w| w.set_ocm(1, OutputCompareMode::PwmMode1.into()));
-            this.inner
-                .regs_gp32()
+            T::regs_gp32()
                 .ccmr_output(1)
                 .modify(|w| w.set_ocm(0, OutputCompareMode::PwmMode1.into()));
-            this.inner
-                .regs_gp32()
+            T::regs_gp32()
                 .ccmr_output(1)
                 .modify(|w| w.set_ocm(1, OutputCompareMode::PwmMode1.into()));
         }
@@ -112,8 +108,7 @@ impl<'d, T: CaptureCompare32bitInstance> SimplePwm32<'d, T> {
 
     pub fn enable(&mut self, channel: Channel) {
         unsafe {
-            self.inner
-                .regs_gp32()
+            T::regs_gp32()
                 .ccer()
                 .modify(|w| w.set_cce(channel.raw(), true));
         }
@@ -121,8 +116,7 @@ impl<'d, T: CaptureCompare32bitInstance> SimplePwm32<'d, T> {
 
     pub fn disable(&mut self, channel: Channel) {
         unsafe {
-            self.inner
-                .regs_gp32()
+            T::regs_gp32()
                 .ccer()
                 .modify(|w| w.set_cce(channel.raw(), false));
         }
@@ -136,14 +130,13 @@ impl<'d, T: CaptureCompare32bitInstance> SimplePwm32<'d, T> {
     }
 
     pub fn get_max_duty(&self) -> u32 {
-        unsafe { self.inner.regs_gp32().arr().read().arr() }
+        unsafe { T::regs_gp32().arr().read().arr() }
     }
 
     pub fn set_duty(&mut self, channel: Channel, duty: u32) {
         defmt::assert!(duty < self.get_max_duty());
         unsafe {
-            self.inner
-                .regs_gp32()
+            T::regs_gp32()
                 .ccr(channel.raw())
                 .modify(|w| w.set_ccr(duty))
         }
-- 
cgit