From 7a066b7b569782a4da6c40e2a30b40df79c4a4dd Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Thu, 31 Mar 2022 15:52:46 +0700 Subject: [PATCH] components: correct abs() use for unsigned argument --- components/hal/esp32/include/hal/i2s_ll.h | 2 +- components/hal/esp32c3/include/hal/i2s_ll.h | 4 ++-- components/hal/esp32h2/include/hal/i2s_ll.h | 4 ++-- components/hal/esp32s2/include/hal/i2s_ll.h | 2 +- components/hal/esp32s3/include/hal/i2s_ll.h | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/hal/esp32/include/hal/i2s_ll.h b/components/hal/esp32/include/hal/i2s_ll.h index 0cca009f16..3e791d3e8c 100644 --- a/components/hal/esp32/include/hal/i2s_ll.h +++ b/components/hal/esp32/include/hal/i2s_ll.h @@ -292,7 +292,7 @@ static inline void i2s_ll_tx_set_mclk(i2s_dev_t *hw, uint32_t sclk, uint32_t mcl int denominator = 1; int numerator = 0; - uint32_t freq_diff = abs(sclk - mclk * mclk_div); + uint32_t freq_diff = abs((int)sclk - (int)(mclk * mclk_div)); if (!freq_diff) { goto finish; } diff --git a/components/hal/esp32c3/include/hal/i2s_ll.h b/components/hal/esp32c3/include/hal/i2s_ll.h index 9eb3439813..e97697de9e 100644 --- a/components/hal/esp32c3/include/hal/i2s_ll.h +++ b/components/hal/esp32c3/include/hal/i2s_ll.h @@ -232,7 +232,7 @@ static inline void i2s_ll_tx_set_mclk(i2s_dev_t *hw, uint32_t sclk, uint32_t mcl int denominator = 1; int numerator = 0; - uint32_t freq_diff = abs(sclk - mclk * mclk_div); + uint32_t freq_diff = abs((int)sclk - (int)(mclk * mclk_div)); if (!freq_diff) { goto finish; } @@ -306,7 +306,7 @@ static inline void i2s_ll_rx_set_mclk(i2s_dev_t *hw, uint32_t sclk, uint32_t mcl int denominator = 1; int numerator = 0; - uint32_t freq_diff = abs(sclk - mclk * mclk_div); + uint32_t freq_diff = abs((int)sclk - (int)(mclk * mclk_div)); if (!freq_diff) { goto finish; } diff --git a/components/hal/esp32h2/include/hal/i2s_ll.h b/components/hal/esp32h2/include/hal/i2s_ll.h index fb531cbb24..11a4e93feb 100644 --- a/components/hal/esp32h2/include/hal/i2s_ll.h +++ b/components/hal/esp32h2/include/hal/i2s_ll.h @@ -233,7 +233,7 @@ static inline void i2s_ll_tx_set_mclk(i2s_dev_t *hw, uint32_t sclk, uint32_t mcl int denominator = 1; int numerator = 0; - uint32_t freq_diff = abs(sclk - mclk * mclk_div); + uint32_t freq_diff = abs((int)sclk - (int)(mclk * mclk_div)); if (!freq_diff) { goto finish; } @@ -307,7 +307,7 @@ static inline void i2s_ll_rx_set_mclk(i2s_dev_t *hw, uint32_t sclk, uint32_t mcl int denominator = 1; int numerator = 0; - uint32_t freq_diff = abs(sclk - mclk * mclk_div); + uint32_t freq_diff = abs((int)sclk - (int)(mclk * mclk_div)); if (!freq_diff) { goto finish; } diff --git a/components/hal/esp32s2/include/hal/i2s_ll.h b/components/hal/esp32s2/include/hal/i2s_ll.h index a9ffa641bc..e6dc1c025b 100644 --- a/components/hal/esp32s2/include/hal/i2s_ll.h +++ b/components/hal/esp32s2/include/hal/i2s_ll.h @@ -287,7 +287,7 @@ static inline void i2s_ll_tx_set_mclk(i2s_dev_t *hw, uint32_t sclk, uint32_t mcl int denominator = 1; int numerator = 0; - uint32_t freq_diff = abs(sclk - mclk * mclk_div); + uint32_t freq_diff = abs((int)sclk - (int)(mclk * mclk_div)); if (!freq_diff) { goto finish; } diff --git a/components/hal/esp32s3/include/hal/i2s_ll.h b/components/hal/esp32s3/include/hal/i2s_ll.h index 8d6387e24e..3f76ef07b1 100644 --- a/components/hal/esp32s3/include/hal/i2s_ll.h +++ b/components/hal/esp32s3/include/hal/i2s_ll.h @@ -235,7 +235,7 @@ static inline void i2s_ll_tx_set_mclk(i2s_dev_t *hw, uint32_t sclk, uint32_t mcl int denominator = 1; int numerator = 0; - uint32_t freq_diff = abs(sclk - mclk * mclk_div); + uint32_t freq_diff = abs((int)sclk - (int)(mclk * mclk_div)); if (!freq_diff) { goto finish; } @@ -309,7 +309,7 @@ static inline void i2s_ll_rx_set_mclk(i2s_dev_t *hw, uint32_t sclk, uint32_t mcl int denominator = 1; int numerator = 0; - uint32_t freq_diff = abs(sclk - mclk * mclk_div); + uint32_t freq_diff = abs((int)sclk - (int)(mclk * mclk_div)); if (!freq_diff) { goto finish; }