diff --git a/include/libopencm3/stm32/common/hrtim_common_all.h b/include/libopencm3/stm32/common/hrtim_common_all.h
index ae4094cc..7ca0b735 100644
--- a/include/libopencm3/stm32/common/hrtim_common_all.h
+++ b/include/libopencm3/stm32/common/hrtim_common_all.h
@@ -577,16 +577,16 @@ specific memorymap.h header before including this header file.*/
 #define HRTIM_BMCR_BMPRSC_SHIFT 6
 #define HRTIM_BMCR_BMPRSC_MASK  (0xf << HRTIM_BMCR_BMPRSC_SHIFT)
 
-#define HRTIM_BMCR_BMPRSC_1          ( 0 << HRTIM_BMCR_BMPRSC_SHIFT)
-#define HRTIM_BMCR_BMPRSC_2          ( 1 << HRTIM_BMCR_BMPRSC_SHIFT)
-#define HRTIM_BMCR_BMPRSC_4          ( 2 << HRTIM_BMCR_BMPRSC_SHIFT)
-#define HRTIM_BMCR_BMPRSC_8          ( 3 << HRTIM_BMCR_BMPRSC_SHIFT)
-#define HRTIM_BMCR_BMPRSC_16         ( 4 << HRTIM_BMCR_BMPRSC_SHIFT)
-#define HRTIM_BMCR_BMPRSC_32         ( 5 << HRTIM_BMCR_BMPRSC_SHIFT)
-#define HRTIM_BMCR_BMPRSC_64         ( 6 << HRTIM_BMCR_BMPRSC_SHIFT)
-#define HRTIM_BMCR_BMPRSC_128        ( 7 << HRTIM_BMCR_BMPRSC_SHIFT)
-#define HRTIM_BMCR_BMPRSC_256        ( 8 << HRTIM_BMCR_BMPRSC_SHIFT)
-#define HRTIM_BMCR_BMPRSC_512        ( 9 << HRTIM_BMCR_BMPRSC_SHIFT)
+#define HRTIM_BMCR_BMPRSC_1          (0 << HRTIM_BMCR_BMPRSC_SHIFT)
+#define HRTIM_BMCR_BMPRSC_2          (1 << HRTIM_BMCR_BMPRSC_SHIFT)
+#define HRTIM_BMCR_BMPRSC_4          (2 << HRTIM_BMCR_BMPRSC_SHIFT)
+#define HRTIM_BMCR_BMPRSC_8          (3 << HRTIM_BMCR_BMPRSC_SHIFT)
+#define HRTIM_BMCR_BMPRSC_16         (4 << HRTIM_BMCR_BMPRSC_SHIFT)
+#define HRTIM_BMCR_BMPRSC_32         (5 << HRTIM_BMCR_BMPRSC_SHIFT)
+#define HRTIM_BMCR_BMPRSC_64         (6 << HRTIM_BMCR_BMPRSC_SHIFT)
+#define HRTIM_BMCR_BMPRSC_128        (7 << HRTIM_BMCR_BMPRSC_SHIFT)
+#define HRTIM_BMCR_BMPRSC_256        (8 << HRTIM_BMCR_BMPRSC_SHIFT)
+#define HRTIM_BMCR_BMPRSC_512        (9 << HRTIM_BMCR_BMPRSC_SHIFT)
 #define HRTIM_BMCR_BMPRSC_1024       (10 << HRTIM_BMCR_BMPRSC_SHIFT)
 #define HRTIM_BMCR_BMPRSC_2048       (11 << HRTIM_BMCR_BMPRSC_SHIFT)
 #define HRTIM_BMCR_BMPRSC_4096       (12 << HRTIM_BMCR_BMPRSC_SHIFT)
@@ -598,16 +598,16 @@ specific memorymap.h header before including this header file.*/
 #define HRTIM_BMCR_BMCLK_SHIFT  2
 #define HRTIM_BMCR_BMCLK_MASK   (0xf << HRTIM_BMCR_BMCLK_SHIFT)
 
-#define HRTIM_BMCR_BMCLK_MASTER    ( 0 << HRTIM_BMCR_BMCLK_SHIFT)
-#define HRTIM_BMCR_BMCLK_TIMA      ( 1 << HRTIM_BMCR_BMCLK_SHIFT)
-#define HRTIM_BMCR_BMCLK_TIMB      ( 2 << HRTIM_BMCR_BMCLK_SHIFT)
-#define HRTIM_BMCR_BMCLK_TIMC      ( 3 << HRTIM_BMCR_BMCLK_SHIFT)
-#define HRTIM_BMCR_BMCLK_TIMD      ( 4 << HRTIM_BMCR_BMCLK_SHIFT)
-#define HRTIM_BMCR_BMCLK_TIME      ( 5 << HRTIM_BMCR_BMCLK_SHIFT)
-#define HRTIM_BMCR_BMCLK_BMC1      ( 6 << HRTIM_BMCR_BMCLK_SHIFT)
-#define HRTIM_BMCR_BMCLK_BMC2      ( 7 << HRTIM_BMCR_BMCLK_SHIFT)
-#define HRTIM_BMCR_BMCLK_BMC3      ( 8 << HRTIM_BMCR_BMCLK_SHIFT)
-#define HRTIM_BMCR_BMCLK_BMC4      ( 9 << HRTIM_BMCR_BMCLK_SHIFT)
+#define HRTIM_BMCR_BMCLK_MASTER    (0 << HRTIM_BMCR_BMCLK_SHIFT)
+#define HRTIM_BMCR_BMCLK_TIMA      (1 << HRTIM_BMCR_BMCLK_SHIFT)
+#define HRTIM_BMCR_BMCLK_TIMB      (2 << HRTIM_BMCR_BMCLK_SHIFT)
+#define HRTIM_BMCR_BMCLK_TIMC      (3 << HRTIM_BMCR_BMCLK_SHIFT)
+#define HRTIM_BMCR_BMCLK_TIMD      (4 << HRTIM_BMCR_BMCLK_SHIFT)
+#define HRTIM_BMCR_BMCLK_TIME      (5 << HRTIM_BMCR_BMCLK_SHIFT)
+#define HRTIM_BMCR_BMCLK_BMC1      (6 << HRTIM_BMCR_BMCLK_SHIFT)
+#define HRTIM_BMCR_BMCLK_BMC2      (7 << HRTIM_BMCR_BMCLK_SHIFT)
+#define HRTIM_BMCR_BMCLK_BMC3      (8 << HRTIM_BMCR_BMCLK_SHIFT)
+#define HRTIM_BMCR_BMCLK_BMC4      (9 << HRTIM_BMCR_BMCLK_SHIFT)
 #define HRTIM_BMCR_BMCLK_HRTIM     (10 << HRTIM_BMCR_BMCLK_SHIFT)
 
 /** BMOM: Burst Mode operating mode */
@@ -2104,16 +2104,16 @@ specific memorymap.h header before including this header file.*/
 #define HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x)      ((x) * 6 - 5)
 #define HRTIM_TIMx_EEF1_EExFLTR_MASK(x)       (0xf << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
 
-#define HRTIM_TIMx_EEF1_EExFLTR_NONE(x)           ( 0 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
-#define HRTIM_TIMx_EEF1_EExFLTR_CMP1(x)           ( 1 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
-#define HRTIM_TIMx_EEF1_EExFLTR_CMP2(x)           ( 2 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
-#define HRTIM_TIMx_EEF1_EExFLTR_CMP3(x)           ( 3 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
-#define HRTIM_TIMx_EEF1_EExFLTR_CMP4(x)           ( 4 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
-#define HRTIM_TIMx_EEF1_EExFLTR_TIMFLTR1(x)       ( 5 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
-#define HRTIM_TIMx_EEF1_EExFLTR_TIMFLTR2(x)       ( 6 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
-#define HRTIM_TIMx_EEF1_EExFLTR_TIMFLTR3(x)       ( 7 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
-#define HRTIM_TIMx_EEF1_EExFLTR_TIMFLTR4(x)       ( 8 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
-#define HRTIM_TIMx_EEF1_EExFLTR_TIMFLTR5(x)       ( 9 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
+#define HRTIM_TIMx_EEF1_EExFLTR_NONE(x)           (0 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
+#define HRTIM_TIMx_EEF1_EExFLTR_CMP1(x)           (1 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
+#define HRTIM_TIMx_EEF1_EExFLTR_CMP2(x)           (2 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
+#define HRTIM_TIMx_EEF1_EExFLTR_CMP3(x)           (3 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
+#define HRTIM_TIMx_EEF1_EExFLTR_CMP4(x)           (4 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
+#define HRTIM_TIMx_EEF1_EExFLTR_TIMFLTR1(x)       (5 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
+#define HRTIM_TIMx_EEF1_EExFLTR_TIMFLTR2(x)       (6 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
+#define HRTIM_TIMx_EEF1_EExFLTR_TIMFLTR3(x)       (7 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
+#define HRTIM_TIMx_EEF1_EExFLTR_TIMFLTR4(x)       (8 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
+#define HRTIM_TIMx_EEF1_EExFLTR_TIMFLTR5(x)       (9 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
 #define HRTIM_TIMx_EEF1_EExFLTR_TIMFLTR6(x)       (10 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
 #define HRTIM_TIMx_EEF1_EExFLTR_TIMFLTR7(x)       (11 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))
 #define HRTIM_TIMx_EEF1_EExFLTR_TIMFLTR8(x)       (12 << HRTIM_TIMx_EEF1_EExFLTR_SHIFT(x))