Data_Register_Address for Timers

Author: python36

arch/ARM/STM32/drivers/stm32-pwm.adb

@@ -31,7 +31,6 @@
 
 with STM32_SVD;     use STM32_SVD;
 with STM32.Device;  use STM32.Device;
-with System.Storage_Elements; use System.Storage_Elements;
 
 package body STM32.PWM is
 
@@ -453,7 +452,7 @@ package body STM32.PWM is
    function Data_Register_Address
      (This : PWM_Modulator) return Address is
    begin
-      return This.Generator.all'Address + 16#4C#;
+      return STM32.Timers.Data_Register_Address (This.Generator.all);
    end Data_Register_Address;
 
 end STM32.PWM;

arch/ARM/STM32/drivers/stm32-timers.adb

@@ -435,6 +435,16 @@ package body STM32.Timers is
       This.CR2.Capture_Compare_DMA_Selection := False;
    end Disable_Capture_Compare_DMA;
 
+   ---------------------------
+   -- Data_Register_Address --
+   ---------------------------
+
+   function Data_Register_Address
+     (This : Timer) return Address is
+   begin
+      return This.DMAR'Address;
+   end Data_Register_Address;
+
    -----------------------
    -- Current_Prescaler --
    -----------------------

arch/ARM/STM32/drivers/stm32-timers.ads

@@ -437,6 +437,9 @@ package STM32.Timers is
    procedure Disable_Capture_Compare_DMA
      (This : in out Timer);
 
+   function Data_Register_Address
+     (This : Timer) return Address with Inline;
+
    ----------------------------------------------------------------------------
 
    --  Output Compare Management ----------------------------------------------