From 43ad6152960acc687d1538b419303a3fb80e38ab Mon Sep 17 00:00:00 2001 From: crasbe Date: Wed, 11 Dec 2024 15:58:59 +0100 Subject: [PATCH] fixup! cpu/stm32: make ADC resolution uniform --- cpu/stm32/periph/adc_f0_g0_c0.c | 2 +- cpu/stm32/periph/adc_f2.c | 2 +- cpu/stm32/periph/adc_f3.c | 2 +- cpu/stm32/periph/adc_f4_f7.c | 2 +- cpu/stm32/periph/adc_l0.c | 2 +- cpu/stm32/periph/adc_l1.c | 2 +- cpu/stm32/periph/adc_l4_wb.c | 2 +- cpu/stm32/periph/adc_wl.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cpu/stm32/periph/adc_f0_g0_c0.c b/cpu/stm32/periph/adc_f0_g0_c0.c index 53b29e1bf103..6d8297dab438 100644 --- a/cpu/stm32/periph/adc_f0_g0_c0.c +++ b/cpu/stm32/periph/adc_f0_g0_c0.c @@ -101,7 +101,7 @@ int32_t adc_sample(adc_t line, adc_res_t res) int sample; /* check if resolution is applicable */ - if ((res & ADC_CFGR_RES_Msk) != res) { + if ((res & ADC_CFGR_RES) != res) { return -1; } diff --git a/cpu/stm32/periph/adc_f2.c b/cpu/stm32/periph/adc_f2.c index c66a9ad1e5ea..49f030f30be5 100644 --- a/cpu/stm32/periph/adc_f2.c +++ b/cpu/stm32/periph/adc_f2.c @@ -109,7 +109,7 @@ int32_t adc_sample(adc_t line, adc_res_t res) int sample; /* check if resolution is applicable */ - if ((res & ADC_CR1_RES_Msk) != res) { + if ((res & ADC_CR1_RES) != res) { return -1; } diff --git a/cpu/stm32/periph/adc_f3.c b/cpu/stm32/periph/adc_f3.c index 9460cf3e6a49..7a9818ae17eb 100644 --- a/cpu/stm32/periph/adc_f3.c +++ b/cpu/stm32/periph/adc_f3.c @@ -194,7 +194,7 @@ int32_t adc_sample(adc_t line, adc_res_t res) int sample; /* Check if resolution is applicable */ - if ((res & ADC_CFGR_RES_Msk) != res) { + if ((res & ADC_CFGR_RES) != res) { return -1; } diff --git a/cpu/stm32/periph/adc_f4_f7.c b/cpu/stm32/periph/adc_f4_f7.c index cb83f95adac3..947bd0f6f772 100644 --- a/cpu/stm32/periph/adc_f4_f7.c +++ b/cpu/stm32/periph/adc_f4_f7.c @@ -129,7 +129,7 @@ int32_t adc_sample(adc_t line, adc_res_t res) int sample; /* check if resolution is applicable */ - if ((res & ADC_CR1_RES_Msk) != res) { + if ((res & ADC_CR1_RES) != res) { return -1; } diff --git a/cpu/stm32/periph/adc_l0.c b/cpu/stm32/periph/adc_l0.c index ba47f8cfbe06..7475a403a28e 100644 --- a/cpu/stm32/periph/adc_l0.c +++ b/cpu/stm32/periph/adc_l0.c @@ -118,7 +118,7 @@ int32_t adc_sample(adc_t line, adc_res_t res) int sample; /* check if resolution is applicable */ - if ((res & ADC_CFGR1_RES_Msk) != res) { + if ((res & ADC_CFGR1_RES) != res) { return -1; } diff --git a/cpu/stm32/periph/adc_l1.c b/cpu/stm32/periph/adc_l1.c index 03bbb0c3bed7..78a393057956 100644 --- a/cpu/stm32/periph/adc_l1.c +++ b/cpu/stm32/periph/adc_l1.c @@ -145,7 +145,7 @@ int32_t adc_sample(adc_t line, adc_res_t res) int sample; /* check if resolution is applicable */ - if ((res & ADC_CR1_RES_Msk) != res) { + if ((res & ADC_CR1_RES) != res) { return -1; } diff --git a/cpu/stm32/periph/adc_l4_wb.c b/cpu/stm32/periph/adc_l4_wb.c index 26e16b2075eb..b057ae64ffd4 100644 --- a/cpu/stm32/periph/adc_l4_wb.c +++ b/cpu/stm32/periph/adc_l4_wb.c @@ -218,7 +218,7 @@ int32_t adc_sample(adc_t line, adc_res_t res) int sample; /* check if resolution is applicable */ - if ((res & ADC_CFGR_RES_Msk) != res) { + if ((res & ADC_CFGR_RES) != res) { return -1; } diff --git a/cpu/stm32/periph/adc_wl.c b/cpu/stm32/periph/adc_wl.c index 5f162cd16c82..a0bedbde2251 100644 --- a/cpu/stm32/periph/adc_wl.c +++ b/cpu/stm32/periph/adc_wl.c @@ -119,7 +119,7 @@ int32_t adc_sample(adc_t line, adc_res_t res) int sample; /* check if resolution is applicable */ - if ((res & ADC_CFGR_RES_Msk) != res) { + if ((res & ADC_CFGR_RES) != res) { return -1; }