diff options
Diffstat (limited to 'os/hal/platforms/STM32F30x')
| -rw-r--r-- | os/hal/platforms/STM32F30x/adc_lld.h | 4 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F30x/hal_lld.h | 60 |
2 files changed, 32 insertions, 32 deletions
diff --git a/os/hal/platforms/STM32F30x/adc_lld.h b/os/hal/platforms/STM32F30x/adc_lld.h index cda0c193a..5c64d035c 100644 --- a/os/hal/platforms/STM32F30x/adc_lld.h +++ b/os/hal/platforms/STM32F30x/adc_lld.h @@ -291,7 +291,7 @@ #endif
#if STM32_ADC_ADC12_CLOCK_MODE == ADC_CCR_CKMODE_ADCCK
-#define STM32_ADC12_CLOCK STM32ADC1CLK
+#define STM32_ADC12_CLOCK STM32_ADC12CLK
#elif STM32_ADC_ADC12_CLOCK_MODE == ADC_CCR_CKMODE_AHB_DIV1
#define STM32_ADC12_CLOCK (STM32_HCLK / 1)
#elif STM32_ADC_ADC12_CLOCK_MODE == ADC_CCR_CKMODE_AHB_DIV2
@@ -303,7 +303,7 @@ #endif
#if STM32_ADC_ADC34_CLOCK_MODE == ADC_CCR_CKMODE_ADCCK
-#define STM32_ADC34_CLOCK STM32ADC3CLK
+#define STM32_ADC34_CLOCK STM32_ADC34CLK
#elif STM32_ADC_ADC34_CLOCK_MODE == ADC_CCR_CKMODE_AHB_DIV1
#define STM32_ADC34_CLOCK (STM32_HCLK / 1)
#elif STM32_ADC_ADC34_CLOCK_MODE == ADC_CCR_CKMODE_AHB_DIV2
diff --git a/os/hal/platforms/STM32F30x/hal_lld.h b/os/hal/platforms/STM32F30x/hal_lld.h index 78da224bc..684faf5d1 100644 --- a/os/hal/platforms/STM32F30x/hal_lld.h +++ b/os/hal/platforms/STM32F30x/hal_lld.h @@ -1010,31 +1010,31 @@ * @brief ADC12 frequency.
*/
#if (STM32_ADC12PRES == STM32_ADC12PRES_NOCLOCK) || defined(__DOXYGEN__)
-#define STM32ADC12CLK 0
+#define STM32_ADC12CLK 0
#elif STM32_ADC12PRES == STM32_ADC12PRES_DIV1
-#define STM32ADC12CLK (STM32_PLLCLKOUT / 1)
+#define STM32_ADC12CLK (STM32_PLLCLKOUT / 1)
#elif STM32_ADC12PRES == STM32_ADC12PRES_DIV2
-#define STM32ADC12CLK (STM32_PLLCLKOUT / 2)
+#define STM32_ADC12CLK (STM32_PLLCLKOUT / 2)
#elif STM32_ADC12PRES == STM32_ADC12PRES_DIV4
-#define STM32ADC12CLK (STM32_PLLCLKOUT / 4)
+#define STM32_ADC12CLK (STM32_PLLCLKOUT / 4)
#elif STM32_ADC12PRES == STM32_ADC12PRES_DIV6
-#define STM32ADC12CLK (STM32_PLLCLKOUT / 6)
+#define STM32_ADC12CLK (STM32_PLLCLKOUT / 6)
#elif STM32_ADC12PRES == STM32_ADC12PRES_DIV8
-#define STM32ADC12CLK (STM32_PLLCLKOUT / 8)
+#define STM32_ADC12CLK (STM32_PLLCLKOUT / 8)
#elif STM32_ADC12PRES == STM32_ADC12PRES_DIV10
-#define STM32ADC12CLK (STM32_PLLCLKOUT / 10)
+#define STM32_ADC12CLK (STM32_PLLCLKOUT / 10)
#elif STM32_ADC12PRES == STM32_ADC12PRES_DIV12
-#define STM32ADC12CLK (STM32_PLLCLKOUT / 12)
+#define STM32_ADC12CLK (STM32_PLLCLKOUT / 12)
#elif STM32_ADC12PRES == STM32_ADC12PRES_DIV16
-#define STM32ADC12CLK (STM32_PLLCLKOUT / 16)
+#define STM32_ADC12CLK (STM32_PLLCLKOUT / 16)
#elif STM32_ADC12PRES == STM32_ADC12PRES_DIV32
-#define STM32ADC12CLK (STM32_PLLCLKOUT / 32)
+#define STM32_ADC12CLK (STM32_PLLCLKOUT / 32)
#elif STM32_ADC12PRES == STM32_ADC12PRES_DIV64
-#define STM32ADC12CLK (STM32_PLLCLKOUT / 64)
+#define STM32_ADC12CLK (STM32_PLLCLKOUT / 64)
#elif STM32_ADC12PRES == STM32_ADC12PRES_DIV128
-#define STM32ADC12CLK (STM32_PLLCLKOUT / 128)
+#define STM32_ADC12CLK (STM32_PLLCLKOUT / 128)
#elif STM32_ADC12PRES == STM32_ADC12PRES_DIV256
-#define STM32ADC12CLK (STM32_PLLCLKOUT / 256)
+#define STM32_ADC12CLK (STM32_PLLCLKOUT / 256)
#else
#error "invalid STM32_ADC12PRES value specified"
#endif
@@ -1043,43 +1043,43 @@ * @brief ADC34 frequency.
*/
#if (STM32_ADC43PRES == STM32_ADC34PRES_NOCLOCK) || defined(__DOXYGEN__)
-#define STM32ADC34CLK 0
+#define STM32_ADC34CLK 0
#elif STM32_ADC34PRES == STM32_ADC34PRES_DIV1
-#define STM32ADC34CLK (STM32_PLLCLKOUT / 1)
+#define STM32_ADC34CLK (STM32_PLLCLKOUT / 1)
#elif STM32_ADC34PRES == STM32_ADC34PRES_DIV2
-#define STM32ADC34CLK (STM32_PLLCLKOUT / 2)
+#define STM32_ADC34CLK (STM32_PLLCLKOUT / 2)
#elif STM32_ADC34PRES == STM32_ADC34PRES_DIV4
-#define STM32ADC34CLK (STM32_PLLCLKOUT / 4)
+#define STM32_ADC34CLK (STM32_PLLCLKOUT / 4)
#elif STM32_ADC34PRES == STM32_ADC34PRES_DIV6
-#define STM32ADC34CLK (STM32_PLLCLKOUT / 6)
+#define STM32_ADC34CLK (STM32_PLLCLKOUT / 6)
#elif STM32_ADC34PRES == STM32_ADC34PRES_DIV8
-#define STM32ADC34CLK (STM32_PLLCLKOUT / 8)
+#define STM32_ADC34CLK (STM32_PLLCLKOUT / 8)
#elif STM32_ADC34PRES == STM32_ADC34PRES_DIV10
-#define STM32ADC34CLK (STM32_PLLCLKOUT / 10)
+#define STM32_ADC34CLK (STM32_PLLCLKOUT / 10)
#elif STM32_ADC34PRES == STM32_ADC34PRES_DIV12
-#define STM32ADC34CLK (STM32_PLLCLKOUT / 12)
+#define STM32_ADC34CLK (STM32_PLLCLKOUT / 12)
#elif STM32_ADC34PRES == STM32_ADC34PRES_DIV16
-#define STM32ADC34CLK (STM32_PLLCLKOUT / 16)
+#define STM32_ADC34CLK (STM32_PLLCLKOUT / 16)
#elif STM32_ADC34PRES == STM32_ADC34PRES_DIV32
-#define STM32ADC34CLK (STM32_PLLCLKOUT / 32)
+#define STM32_ADC34CLK (STM32_PLLCLKOUT / 32)
#elif STM32_ADC34PRES == STM32_ADC34PRES_DIV64
-#define STM32ADC34CLK (STM32_PLLCLKOUT / 64)
+#define STM32_ADC34CLK (STM32_PLLCLKOUT / 64)
#elif STM32_ADC34PRES == STM32_ADC34PRES_DIV128
-#define STM32ADC34CLK (STM32_PLLCLKOUT / 128)
+#define STM32_ADC34CLK (STM32_PLLCLKOUT / 128)
#elif STM32_ADC34PRES == STM32_ADC34PRES_DIV256
-#define STM32ADC34CLK (STM32_PLLCLKOUT / 256)
+#define STM32_ADC34CLK (STM32_PLLCLKOUT / 256)
#else
#error "invalid STM32_ADC34PRES value specified"
#endif
/* ADC12 frequency check.*/
-#if STM32ADC12CLK > STM32_ADCCLK_MAX
-#error "STM32ADC12CLK exceeding maximum frequency (STM32_ADCCLK_MAX)"
+#if STM32_ADC12CLK > STM32_ADCCLK_MAX
+#error "STM32_ADC12CLK exceeding maximum frequency (STM32_ADCCLK_MAX)"
#endif
/* ADC34 frequency check.*/
-#if STM32ADC34CLK > STM32_ADCCLK_MAX
-#error "STM32ADC34CLK exceeding maximum frequency (STM32_ADCCLK_MAX)"
+#if STM32_ADC34CLK > STM32_ADCCLK_MAX
+#error "STM32_ADC34CLK exceeding maximum frequency (STM32_ADCCLK_MAX)"
#endif
/**
|