From 2d4484e1577edc66c52bcb260329387f93123a6d Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 16 Feb 2022 21:34:37 -0800 Subject: [PATCH] altos/stm32l0: Add casts to reduce -Wconversion warnings No bugs identified Signed-off-by: Keith Packard --- src/stm32l0/ao_adc_stm32l0.c | 10 +- src/stm32l0/ao_arch_funcs.h | 2 +- src/stm32l0/ao_exti_stm.c | 2 +- src/stm32l0/ao_flash_stm32l0.c | 2 +- src/stm32l0/ao_lpuart_stm.c | 8 +- src/stm32l0/ao_serial_stm.c | 6 +- src/stm32l0/ao_spi_stm32l0.c | 2 +- src/stm32l0/stm32l0.h | 174 ++++++++++++++++----------------- 8 files changed, 103 insertions(+), 103 deletions(-) diff --git a/src/stm32l0/ao_adc_stm32l0.c b/src/stm32l0/ao_adc_stm32l0.c index a7af0a08..5c0f4c2b 100644 --- a/src/stm32l0/ao_adc_stm32l0.c +++ b/src/stm32l0/ao_adc_stm32l0.c @@ -54,8 +54,8 @@ ao_adc_init(void) (0 << STM_ADC_CCR_VREFEN)); /* Calibrate. This also enables the ADC vreg */ - stm_adc.cr |= (1 << STM_ADC_CR_ADCAL); - while ((stm_adc.cr & (1 << STM_ADC_CR_ADCAL)) != 0) + stm_adc.cr |= (1UL << STM_ADC_CR_ADCAL); + while ((stm_adc.cr & (1UL << STM_ADC_CR_ADCAL)) != 0) ; /* Enable */ @@ -77,10 +77,10 @@ ao_adc_shutdown(void) stm_adc.isr = (1 << STM_ADC_ISR_ADRDY); /* Disable ADC vreg */ - stm_adc.cr &= ~(1 << STM_ADC_CR_ADVREGEN); + stm_adc.cr &= ~(1UL << STM_ADC_CR_ADVREGEN); /* Disable ADC clocks */ - stm_rcc.apb2enr &= ~(1 << STM_RCC_APB2ENR_ADCEN); + stm_rcc.apb2enr &= ~(1UL << STM_RCC_APB2ENR_ADCEN); } uint16_t @@ -104,7 +104,7 @@ ao_adc_read_vref(void) ; /* Fetch result */ - value = stm_adc.dr; + value = (uint16_t) stm_adc.dr; ao_adc_shutdown(); return value; diff --git a/src/stm32l0/ao_arch_funcs.h b/src/stm32l0/ao_arch_funcs.h index 297bd66c..f03d9695 100644 --- a/src/stm32l0/ao_arch_funcs.h +++ b/src/stm32l0/ao_arch_funcs.h @@ -133,7 +133,7 @@ ao_spi_recv_byte(uint8_t spi_index) stm_spi->dr = 0xff; while (!(stm_spi->sr & (1 << STM_SPI_SR_RXNE))) ; - return stm_spi->dr; + return (uint8_t) stm_spi->dr; } void diff --git a/src/stm32l0/ao_exti_stm.c b/src/stm32l0/ao_exti_stm.c index d808d1e9..d01fe7c0 100644 --- a/src/stm32l0/ao_exti_stm.c +++ b/src/stm32l0/ao_exti_stm.c @@ -24,7 +24,7 @@ static void (*ao_exti_callback[16])(void); uint32_t ao_last_exti; static void ao_exti_range_isr(uint8_t first, uint8_t last, uint16_t mask) { - uint16_t pending = (ao_last_exti = stm_exti.pr) & mask; + uint16_t pending = (uint16_t) (ao_last_exti = stm_exti.pr) & mask; uint8_t pin; static uint16_t last_mask; static uint8_t last_pin; diff --git a/src/stm32l0/ao_flash_stm32l0.c b/src/stm32l0/ao_flash_stm32l0.c index ba327442..521c5c0c 100644 --- a/src/stm32l0/ao_flash_stm32l0.c +++ b/src/stm32l0/ao_flash_stm32l0.c @@ -186,7 +186,7 @@ ao_storage_device_write(ao_pos_t pos, void *buf, uint16_t len) flash_write_select(this_pos); /* Update write buffer with new contents */ - int this_word = 4 - (pos & 3); + uint16_t this_word = 4 - (pos & 3); if (this_word > len) this_word = len; memcpy(&write_buf.u8[pos & 3], b8, this_word); diff --git a/src/stm32l0/ao_lpuart_stm.c b/src/stm32l0/ao_lpuart_stm.c index c4a23f5b..08a0859b 100644 --- a/src/stm32l0/ao_lpuart_stm.c +++ b/src/stm32l0/ao_lpuart_stm.c @@ -85,7 +85,7 @@ _ao_lpuart_rx(struct ao_stm_lpuart *lpuart, int is_stdin) } #endif } else { - lpuart->reg->cr1 &= ~(1 << STM_LPUART_CR1_RXNEIE); + lpuart->reg->cr1 &= ~(1UL << STM_LPUART_CR1_RXNEIE); } } } @@ -96,11 +96,11 @@ ao_lpuart_isr(struct ao_stm_lpuart *lpuart, int is_stdin) _ao_lpuart_rx(lpuart, is_stdin); if (!_ao_lpuart_tx_start(lpuart)) - lpuart->reg->cr1 &= ~(1<< STM_LPUART_CR1_TXEIE); + lpuart->reg->cr1 &= ~(1UL << STM_LPUART_CR1_TXEIE); if (lpuart->reg->isr & (1 << STM_LPUART_ISR_TC)) { lpuart->tx_running = 0; - lpuart->reg->cr1 &= ~(1 << STM_LPUART_CR1_TCIE); + lpuart->reg->cr1 &= ~(1UL << STM_LPUART_CR1_TCIE); if (lpuart->draining) { lpuart->draining = 0; ao_wakeup(&lpuart->tx_fifo); @@ -370,6 +370,6 @@ ao_lpuart1_disable(void) # endif /* Disable LPUART */ - stm_rcc.apb1enr &= ~(1 << STM_RCC_APB1ENR_LPUART1EN); + stm_rcc.apb1enr &= ~(1UL << STM_RCC_APB1ENR_LPUART1EN); } diff --git a/src/stm32l0/ao_serial_stm.c b/src/stm32l0/ao_serial_stm.c index ac745d97..650f2f1f 100644 --- a/src/stm32l0/ao_serial_stm.c +++ b/src/stm32l0/ao_serial_stm.c @@ -66,7 +66,7 @@ _ao_usart_rx(struct ao_stm_usart *usart, int is_stdin) } #endif } else { - usart->reg->cr1 &= ~(1 << STM_USART_CR1_RXNEIE); + usart->reg->cr1 &= ~(1UL << STM_USART_CR1_RXNEIE); } } } @@ -77,11 +77,11 @@ ao_usart_isr(struct ao_stm_usart *usart, int is_stdin) _ao_usart_rx(usart, is_stdin); if (!_ao_usart_tx_start(usart)) - usart->reg->cr1 &= ~(1<< STM_USART_CR1_TXEIE); + usart->reg->cr1 &= ~(1UL << STM_USART_CR1_TXEIE); if (usart->reg->isr & (1 << STM_USART_ISR_TC)) { usart->tx_running = 0; - usart->reg->cr1 &= ~(1 << STM_USART_CR1_TCIE); + usart->reg->cr1 &= ~(1UL << STM_USART_CR1_TCIE); if (usart->draining) { usart->draining = 0; ao_wakeup(&usart->tx_fifo); diff --git a/src/stm32l0/ao_spi_stm32l0.c b/src/stm32l0/ao_spi_stm32l0.c index b8831d5a..4f76c6c2 100644 --- a/src/stm32l0/ao_spi_stm32l0.c +++ b/src/stm32l0/ao_spi_stm32l0.c @@ -229,7 +229,7 @@ ao_spi_recv(void *block, uint16_t len, uint8_t spi_index) while ((stm_spi->sr & (1 << STM_SPI_SR_TXE)) == 0); stm_spi->dr = 0xff; while ((stm_spi->sr & (1 << STM_SPI_SR_RXNE)) == 0); - *bytes++ = stm_spi->dr; + *bytes++ = (uint8_t) stm_spi->dr; } #endif } diff --git a/src/stm32l0/stm32l0.h b/src/stm32l0/stm32l0.h index 90f070ce..41cad245 100644 --- a/src/stm32l0/stm32l0.h +++ b/src/stm32l0/stm32l0.h @@ -42,7 +42,7 @@ struct stm_gpio { }; #define STM_MODER_SHIFT(pin) ((pin) << 1) -#define STM_MODER_MASK 3 +#define STM_MODER_MASK 3UL #define STM_MODER_INPUT 0 #define STM_MODER_OUTPUT 1 #define STM_MODER_ALTERNATE 2 @@ -50,9 +50,9 @@ struct stm_gpio { static inline void stm_moder_set(struct stm_gpio *gpio, int pin, vuint32_t value) { - gpio->moder = ((gpio->moder & - ~(STM_MODER_MASK << STM_MODER_SHIFT(pin))) | - value << STM_MODER_SHIFT(pin)); + gpio->moder = (((uint32_t) gpio->moder & + (uint32_t) ~(STM_MODER_MASK << STM_MODER_SHIFT(pin))) | + (value << STM_MODER_SHIFT(pin))); } static inline uint32_t @@ -86,15 +86,15 @@ stm_moder_get(struct stm_gpio *gpio, int pin) { } #define STM_OTYPER_SHIFT(pin) (pin) -#define STM_OTYPER_MASK 1 +#define STM_OTYPER_MASK 1UL #define STM_OTYPER_PUSH_PULL 0 #define STM_OTYPER_OPEN_DRAIN 1 static inline void stm_otyper_set(struct stm_gpio *gpio, int pin, vuint32_t value) { gpio->otyper = ((gpio->otyper & - ~(STM_OTYPER_MASK << STM_OTYPER_SHIFT(pin))) | - value << STM_OTYPER_SHIFT(pin)); + (uint32_t) ~(STM_OTYPER_MASK << STM_OTYPER_SHIFT(pin))) | + (value << STM_OTYPER_SHIFT(pin))); } static inline uint32_t @@ -103,7 +103,7 @@ stm_otyper_get(struct stm_gpio *gpio, int pin) { } #define STM_OSPEEDR_SHIFT(pin) ((pin) << 1) -#define STM_OSPEEDR_MASK 3 +#define STM_OSPEEDR_MASK 3UL #define STM_OSPEEDR_LOW 0 #define STM_OSPEEDR_MEDIUM 1 #define STM_OSPEEDR_HIGH 2 @@ -112,8 +112,8 @@ stm_otyper_get(struct stm_gpio *gpio, int pin) { static inline void stm_ospeedr_set(struct stm_gpio *gpio, int pin, uint32_t value) { gpio->ospeedr = ((gpio->ospeedr & - ~(STM_OSPEEDR_MASK << STM_OSPEEDR_SHIFT(pin))) | - value << STM_OSPEEDR_SHIFT(pin)); + (uint32_t) ~(STM_OSPEEDR_MASK << STM_OSPEEDR_SHIFT(pin))) | + (value << STM_OSPEEDR_SHIFT(pin))); } static inline void @@ -131,7 +131,7 @@ stm_ospeedr_get(struct stm_gpio *gpio, int pin) { } #define STM_PUPDR_SHIFT(pin) ((pin) << 1) -#define STM_PUPDR_MASK 3 +#define STM_PUPDR_MASK 3UL #define STM_PUPDR_NONE 0 #define STM_PUPDR_PULL_UP 1 #define STM_PUPDR_PULL_DOWN 2 @@ -140,8 +140,8 @@ stm_ospeedr_get(struct stm_gpio *gpio, int pin) { static inline void stm_pupdr_set(struct stm_gpio *gpio, int pin, uint32_t value) { gpio->pupdr = ((gpio->pupdr & - ~(STM_PUPDR_MASK << STM_PUPDR_SHIFT(pin))) | - value << STM_PUPDR_SHIFT(pin)); + (uint32_t) ~(STM_PUPDR_MASK << STM_PUPDR_SHIFT(pin))) | + (value << STM_PUPDR_SHIFT(pin))); } static inline void @@ -159,7 +159,7 @@ stm_pupdr_get(struct stm_gpio *gpio, int pin) { } #define STM_AFR_SHIFT(pin) ((pin) << 2) -#define STM_AFR_MASK 0xf +#define STM_AFR_MASK 0xfUL #define STM_AFR_AF0 0x0 #define STM_AFR_AF1 0x1 #define STM_AFR_AF2 0x2 @@ -185,13 +185,13 @@ stm_afr_set(struct stm_gpio *gpio, int pin, uint32_t value) { stm_moder_set(gpio, pin, STM_MODER_ALTERNATE); if (pin < 8) gpio->afrl = ((gpio->afrl & - ~(STM_AFR_MASK << STM_AFR_SHIFT(pin))) | - value << STM_AFR_SHIFT(pin)); + (uint32_t) ~(STM_AFR_MASK << STM_AFR_SHIFT(pin))) | + (value << STM_AFR_SHIFT(pin))); else { pin -= 8; gpio->afrh = ((gpio->afrh & - ~(STM_AFR_MASK << STM_AFR_SHIFT(pin))) | - value << STM_AFR_SHIFT(pin)); + (uint32_t) ~(STM_AFR_MASK << STM_AFR_SHIFT(pin))) | + (value << STM_AFR_SHIFT(pin))); } } @@ -234,7 +234,7 @@ stm_gpio_get(struct stm_gpio *gpio, int pin) { static inline uint16_t stm_gpio_get_all(struct stm_gpio *gpio) { - return gpio->idr; + return (uint16_t) gpio->idr; } /* @@ -511,7 +511,7 @@ extern struct stm_tim1011 stm_tim11; #define STM_TIM1011_CR1_CKD_1 0 #define STM_TIM1011_CR1_CKD_2 1 #define STM_TIM1011_CR1_CKD_4 2 -#define STM_TIM1011_CR1_CKD_MASK 3 +#define STM_TIM1011_CR1_CKD_MASK 3UL #define STM_TIM1011_CR1_ARPE 7 #define STM_TIM1011_CR1_URS 2 #define STM_TIM1011_CR1_UDIS 1 @@ -524,7 +524,7 @@ extern struct stm_tim1011 stm_tim11; #define STM_TIM1011_SMCR_ETPS_2 1 #define STM_TIM1011_SMCR_ETPS_4 2 #define STM_TIM1011_SMCR_ETPS_8 3 -#define STM_TIM1011_SMCR_ETPS_MASK 3 +#define STM_TIM1011_SMCR_ETPS_MASK 3UL #define STM_TIM1011_SMCR_ETF 8 #define STM_TIM1011_SMCR_ETF_NONE 0 #define STM_TIM1011_SMCR_ETF_CK_INT_2 1 @@ -542,7 +542,7 @@ extern struct stm_tim1011 stm_tim11; #define STM_TIM1011_SMCR_ETF_DTS_32_5 13 #define STM_TIM1011_SMCR_ETF_DTS_32_6 14 #define STM_TIM1011_SMCR_ETF_DTS_32_8 15 -#define STM_TIM1011_SMCR_ETF_MASK 15 +#define STM_TIM1011_SMCR_ETF_MASK 15UL #define STM_TIM1011_DIER_CC1E 1 #define STM_TIM1011_DIER_UIE 0 @@ -564,7 +564,7 @@ extern struct stm_tim1011 stm_tim11; #define STM_TIM1011_CCMR1_OC1M_FORCE_ACTIVE 5 #define STM_TIM1011_CCMR1_OC1M_PWM_MODE_1 6 #define STM_TIM1011_CCMR1_OC1M_PWM_MODE_2 7 -#define STM_TIM1011_CCMR1_OC1M_MASK 7 +#define STM_TIM1011_CCMR1_OC1M_MASK 7UL #define STM_TIM1011_CCMR1_OC1PE 3 #define STM_TIM1011_CCMR1_OC1FE 2 #define STM_TIM1011_CCMR1_CC1S 0 @@ -572,7 +572,7 @@ extern struct stm_tim1011 stm_tim11; #define STM_TIM1011_CCMR1_CC1S_INPUT_TI1 1 #define STM_TIM1011_CCMR1_CC1S_INPUT_TI2 2 #define STM_TIM1011_CCMR1_CC1S_INPUT_TRC 3 -#define STM_TIM1011_CCMR1_CC1S_MASK 3 +#define STM_TIM1011_CCMR1_CC1S_MASK 3UL #define STM_TIM1011_CCMR1_IC1F_NONE 0 #define STM_TIM1011_CCMR1_IC1F_CK_INT_2 1 @@ -590,13 +590,13 @@ extern struct stm_tim1011 stm_tim11; #define STM_TIM1011_CCMR1_IC1F_DTS_32_5 13 #define STM_TIM1011_CCMR1_IC1F_DTS_32_6 14 #define STM_TIM1011_CCMR1_IC1F_DTS_32_8 15 -#define STM_TIM1011_CCMR1_IC1F_MASK 15 +#define STM_TIM1011_CCMR1_IC1F_MASK 15UL #define STM_TIM1011_CCMR1_IC1PSC 2 #define STM_TIM1011_CCMR1_IC1PSC_1 0 #define STM_TIM1011_CCMR1_IC1PSC_2 1 #define STM_TIM1011_CCMR1_IC1PSC_4 2 #define STM_TIM1011_CCMR1_IC1PSC_8 3 -#define STM_TIM1011_CCMR1_IC1PSC_MASK 3 +#define STM_TIM1011_CCMR1_IC1PSC_MASK 3UL #define STM_TIM1011_CCMR1_CC1S 0 #define STM_TIM1011_CCER_CC1NP 3 @@ -610,7 +610,7 @@ extern struct stm_tim1011 stm_tim11; #define STM_TIM1011_TI1_RMP_LSI 1 #define STM_TIM1011_TI1_RMP_LSE 2 #define STM_TIM1011_TI1_RMP_RTC 3 -#define STM_TIM1011_TI1_RMP_MASK 3 +#define STM_TIM1011_TI1_RMP_MASK 3UL struct stm_rcc { vuint32_t cr; @@ -658,7 +658,7 @@ extern struct stm_rcc stm_rcc; #define STM_RCC_CR_RTCPRE_HSE_DIV_4 1 #define STM_RCC_CR_RTCPRE_HSE_DIV_8 2 #define STM_RCC_CR_RTCPRE_HSE_DIV_16 3 -#define STM_RCC_CR_RTCPRE_HSE_MASK 3 +#define STM_RCC_CR_RTCPRE_HSE_MASK 3UL #define STM_RCC_CR_CSSON (28) #define STM_RCC_CR_PLLRDY (25) @@ -681,7 +681,7 @@ extern struct stm_rcc stm_rcc; #define STM_RCC_ICSCR_MSIRANGE_1048576 4 #define STM_RCC_ICSCR_MSIRANGE_2097152 5 #define STM_RCC_ICSCR_MSIRANGE_4194304 6 -#define STM_RCC_ICSCR_MSIRANGE_MASK 0x7 +#define STM_RCC_ICSCR_MSIRANGE_MASK 0x7UL #define STM_RCC_ICSCR_MSICAL 16 #define STM_RCC_ICSCR_MSITRIM 24 @@ -691,7 +691,7 @@ extern struct stm_rcc stm_rcc; #define STM_RCC_CFGR_MCOPRE_DIV_4 2 #define STM_RCC_CFGR_MCOPRE_DIV_8 3 #define STM_RCC_CFGR_MCOPRE_DIV_16 4 -#define STM_RCC_CFGR_MCOPRE_MASK 7 +#define STM_RCC_CFGR_MCOPRE_MASK 7UL #define STM_RCC_CFGR_MCOSEL (24) #define STM_RCC_CFGR_MCOSEL_DISABLE 0 @@ -702,13 +702,13 @@ extern struct stm_rcc stm_rcc; #define STM_RCC_CFGR_MCOSEL_PLL 5 #define STM_RCC_CFGR_MCOSEL_LSI 6 #define STM_RCC_CFGR_MCOSEL_LSE 7 -#define STM_RCC_CFGR_MCOSEL_MASK 7 +#define STM_RCC_CFGR_MCOSEL_MASK 7UL #define STM_RCC_CFGR_PLLDIV (22) #define STM_RCC_CFGR_PLLDIV_2 1 #define STM_RCC_CFGR_PLLDIV_3 2 #define STM_RCC_CFGR_PLLDIV_4 3 -#define STM_RCC_CFGR_PLLDIV_MASK 3 +#define STM_RCC_CFGR_PLLDIV_MASK 3UL #define STM_RCC_CFGR_PLLMUL (18) #define STM_RCC_CFGR_PLLMUL_3 0 @@ -720,7 +720,7 @@ extern struct stm_rcc stm_rcc; #define STM_RCC_CFGR_PLLMUL_24 6 #define STM_RCC_CFGR_PLLMUL_32 7 #define STM_RCC_CFGR_PLLMUL_48 8 -#define STM_RCC_CFGR_PLLMUL_MASK 0xf +#define STM_RCC_CFGR_PLLMUL_MASK 0xfUL #define STM_RCC_CFGR_PLLSRC (16) @@ -730,7 +730,7 @@ extern struct stm_rcc stm_rcc; #define STM_RCC_CFGR_PPRE2_DIV_4 5 #define STM_RCC_CFGR_PPRE2_DIV_8 6 #define STM_RCC_CFGR_PPRE2_DIV_16 7 -#define STM_RCC_CFGR_PPRE2_MASK 7 +#define STM_RCC_CFGR_PPRE2_MASK 7UL #define STM_RCC_CFGR_PPRE1 (8) #define STM_RCC_CFGR_PPRE1_DIV_1 0 @@ -738,7 +738,7 @@ extern struct stm_rcc stm_rcc; #define STM_RCC_CFGR_PPRE1_DIV_4 5 #define STM_RCC_CFGR_PPRE1_DIV_8 6 #define STM_RCC_CFGR_PPRE1_DIV_16 7 -#define STM_RCC_CFGR_PPRE1_MASK 7 +#define STM_RCC_CFGR_PPRE1_MASK 7UL #define STM_RCC_CFGR_HPRE (4) #define STM_RCC_CFGR_HPRE_DIV_1 0 @@ -750,21 +750,21 @@ extern struct stm_rcc stm_rcc; #define STM_RCC_CFGR_HPRE_DIV_128 0xd #define STM_RCC_CFGR_HPRE_DIV_256 0xe #define STM_RCC_CFGR_HPRE_DIV_512 0xf -#define STM_RCC_CFGR_HPRE_MASK 0xf +#define STM_RCC_CFGR_HPRE_MASK 0xfUL #define STM_RCC_CFGR_SWS (2) #define STM_RCC_CFGR_SWS_MSI 0 #define STM_RCC_CFGR_SWS_HSI 1 #define STM_RCC_CFGR_SWS_HSE 2 #define STM_RCC_CFGR_SWS_PLL 3 -#define STM_RCC_CFGR_SWS_MASK 3 +#define STM_RCC_CFGR_SWS_MASK 3UL #define STM_RCC_CFGR_SW (0) #define STM_RCC_CFGR_SW_MSI 0 #define STM_RCC_CFGR_SW_HSI 1 #define STM_RCC_CFGR_SW_HSE 2 #define STM_RCC_CFGR_SW_PLL 3 -#define STM_RCC_CFGR_SW_MASK 3 +#define STM_RCC_CFGR_SW_MASK 3UL #define STM_RCC_IOPENR_IOPAEN 0 #define STM_RCC_IOPENR_IOPBEN 1 @@ -830,7 +830,7 @@ extern struct stm_rcc stm_rcc; #define STM_RCC_CSR_RTCSEL_LSE 1 #define STM_RCC_CSR_RTCSEL_LSI 2 #define STM_RCC_CSR_RTCSEL_HSE 3 -#define STM_RCC_CSR_RTCSEL_MASK 3 +#define STM_RCC_CSR_RTCSEL_MASK 3UL #define STM_RCC_CSR_LSEBYP (10) #define STM_RCC_CSR_LSERDY (9) @@ -853,7 +853,7 @@ extern struct stm_pwr stm_pwr; #define STM_PWR_CR_VOS_1_8 1 #define STM_PWR_CR_VOS_1_5 2 #define STM_PWR_CR_VOS_1_2 3 -#define STM_PWR_CR_VOS_MASK 3 +#define STM_PWR_CR_VOS_MASK 3UL #define STM_PWR_CR_FWU 10 #define STM_PWR_CR_ULP 9 #define STM_PWR_CR_DBP 8 @@ -866,7 +866,7 @@ extern struct stm_pwr stm_pwr; #define STM_PWR_CR_PLS_2_9 5 #define STM_PWR_CR_PLS_3_1 6 #define STM_PWR_CR_PLS_EXT 7 -#define STM_PWR_CR_PLS_MASK 7 +#define STM_PWR_CR_PLS_MASK 7UL #define STM_PWR_CR_PVDE 4 #define STM_PWR_CR_CSBF 3 #define STM_PWR_CR_CWUF 2 @@ -912,7 +912,7 @@ extern struct stm_tim67 stm_tim6; #define STM_TIM67_CR2_MMS_RESET 0 #define STM_TIM67_CR2_MMS_ENABLE 1 #define STM_TIM67_CR2_MMS_UPDATE 2 -#define STM_TIM67_CR2_MMS_MASK 7 +#define STM_TIM67_CR2_MMS_MASK 7UL #define STM_TIM67_DIER_UDE (8) #define STM_TIM67_DIER_UIE (0) @@ -938,7 +938,7 @@ extern struct stm_lcd stm_lcd; #define STM_LCD_CR_BIAS_1_4 0 #define STM_LCD_CR_BIAS_1_2 1 #define STM_LCD_CR_BIAS_1_3 2 -#define STM_LCD_CR_BIAS_MASK 3 +#define STM_LCD_CR_BIAS_MASK 3UL #define STM_LCD_CR_DUTY (2) #define STM_LCD_CR_DUTY_STATIC 0 @@ -946,7 +946,7 @@ extern struct stm_lcd stm_lcd; #define STM_LCD_CR_DUTY_1_3 2 #define STM_LCD_CR_DUTY_1_4 3 #define STM_LCD_CR_DUTY_1_8 4 -#define STM_LCD_CR_DUTY_MASK 7 +#define STM_LCD_CR_DUTY_MASK 7UL #define STM_LCD_CR_VSEL (1) #define STM_LCD_CR_LCDEN (0) @@ -968,7 +968,7 @@ extern struct stm_lcd stm_lcd; #define STM_LCD_FCR_PS_8192 0xd #define STM_LCD_FCR_PS_16384 0xe #define STM_LCD_FCR_PS_32768 0xf -#define STM_LCD_FCR_PS_MASK 0xf +#define STM_LCD_FCR_PS_MASK 0xfUL #define STM_LCD_FCR_DIV (18) #define STM_LCD_FCR_DIV_16 0x0 @@ -987,14 +987,14 @@ extern struct stm_lcd stm_lcd; #define STM_LCD_FCR_DIV_29 0xd #define STM_LCD_FCR_DIV_30 0xe #define STM_LCD_FCR_DIV_31 0xf -#define STM_LCD_FCR_DIV_MASK 0xf +#define STM_LCD_FCR_DIV_MASK 0xfUL #define STM_LCD_FCR_BLINK (16) #define STM_LCD_FCR_BLINK_DISABLE 0 #define STM_LCD_FCR_BLINK_SEG0_COM0 1 #define STM_LCD_FCR_BLINK_SEG0_COMALL 2 #define STM_LCD_FCR_BLINK_SEGALL_COMALL 3 -#define STM_LCD_FCR_BLINK_MASK 3 +#define STM_LCD_FCR_BLINK_MASK 3UL #define STM_LCD_FCR_BLINKF (13) #define STM_LCD_FCR_BLINKF_8 0 @@ -1005,16 +1005,16 @@ extern struct stm_lcd stm_lcd; #define STM_LCD_FCR_BLINKF_256 5 #define STM_LCD_FCR_BLINKF_512 6 #define STM_LCD_FCR_BLINKF_1024 7 -#define STM_LCD_FCR_BLINKF_MASK 7 +#define STM_LCD_FCR_BLINKF_MASK 7UL #define STM_LCD_FCR_CC (10) -#define STM_LCD_FCR_CC_MASK 7 +#define STM_LCD_FCR_CC_MASK 7UL #define STM_LCD_FCR_DEAD (7) -#define STM_LCD_FCR_DEAD_MASK 7 +#define STM_LCD_FCR_DEAD_MASK 7UL #define STM_LCD_FCR_PON (4) -#define STM_LCD_FCR_PON_MASK 7 +#define STM_LCD_FCR_PON_MASK 7UL #define STM_LCD_FCR_UDDIE (3) #define STM_LCD_FCR_SOFIE (1) @@ -1115,7 +1115,7 @@ stm_nvic_set_priority(int irq, uint8_t prio) { uint32_t v; v = stm_nvic.ipr[n]; - v &= ~IRQ_PRIO_MASK(irq); + v &= (uint32_t) ~IRQ_PRIO_MASK(irq); v |= (prio) << IRQ_PRIO_BIT(irq); stm_nvic.ipr[n] = v; } @@ -1177,9 +1177,9 @@ struct stm_mpu { extern struct stm_mpu stm_mpu; #define STM_MPU_TYPER_IREGION 16 -#define STM_MPU_TYPER_IREGION_MASK 0xff +#define STM_MPU_TYPER_IREGION_MASK 0xffUL #define STM_MPU_TYPER_DREGION 8 -#define STM_MPU_TYPER_DREGION_MASK 0xff +#define STM_MPU_TYPER_DREGION_MASK 0xffUL #define STM_MPU_TYPER_SEPARATE 0 #define STM_MPU_CR_PRIVDEFENA 2 @@ -1187,14 +1187,14 @@ extern struct stm_mpu stm_mpu; #define STM_MPU_CR_ENABLE 0 #define STM_MPU_RNR_REGION 0 -#define STM_MPU_RNR_REGION_MASK 0xff +#define STM_MPU_RNR_REGION_MASK 0xffUL #define STM_MPU_RBAR_ADDR 5 -#define STM_MPU_RBAR_ADDR_MASK 0x7ffffff +#define STM_MPU_RBAR_ADDR_MASK 0x7ffffffUL #define STM_MPU_RBAR_VALID 4 #define STM_MPU_RBAR_REGION 0 -#define STM_MPU_RBAR_REGION_MASK 0xf +#define STM_MPU_RBAR_REGION_MASK 0xfUL #define STM_MPU_RASR_XN 28 #define STM_MPU_RASR_AP 24 @@ -1204,16 +1204,16 @@ extern struct stm_mpu stm_mpu; #define STM_MPU_RASR_AP_RW_RW 3 #define STM_MPU_RASR_AP_RO_NONE 5 #define STM_MPU_RASR_AP_RO_RO 6 -#define STM_MPU_RASR_AP_MASK 7 +#define STM_MPU_RASR_AP_MASK 7UL #define STM_MPU_RASR_TEX 19 -#define STM_MPU_RASR_TEX_MASK 7 +#define STM_MPU_RASR_TEX_MASK 7UL #define STM_MPU_RASR_S 18 #define STM_MPU_RASR_C 17 #define STM_MPU_RASR_B 16 #define STM_MPU_RASR_SRD 8 -#define STM_MPU_RASR_SRD_MASK 0xff +#define STM_MPU_RASR_SRD_MASK 0xffUL #define STM_MPU_RASR_SIZE 1 -#define STM_MPU_RASR_SIZE_MASK 0x1f +#define STM_MPU_RASR_SIZE_MASK 0x1fUL #define STM_MPU_RASR_ENABLE 0 #define isr_decl(name) void stm_ ## name ## _isr(void) @@ -1302,7 +1302,7 @@ extern struct stm_syscfg stm_syscfg; #define STM_SYSCFG_MEMRMP_MEM_MODE_MAIN_FLASH 0 #define STM_SYSCFG_MEMRMP_MEM_MODE_SYSTEM_FLASH 1 #define STM_SYSCFG_MEMRMP_MEM_MODE_SRAM 3 -#define STM_SYSCFG_MEMRMP_MEM_MODE_MASK 3 +#define STM_SYSCFG_MEMRMP_MEM_MODE_MASK 3UL #define STM_SYSCFG_PMC_USB_PU 0 @@ -1314,7 +1314,7 @@ extern struct stm_syscfg stm_syscfg; #define STM_SYSCFG_EXTICR_PH 5 static inline void -stm_exticr_set(struct stm_gpio *gpio, int pin) { +stm_exticr_set(struct stm_gpio *gpio, uint8_t pin) { uint8_t reg = pin >> 2; uint8_t shift = (pin & 3) << 2; uint8_t val = 0; @@ -1333,7 +1333,7 @@ stm_exticr_set(struct stm_gpio *gpio, int pin) { else if (gpio == &stm_gpioe) val = STM_SYSCFG_EXTICR_PE; - stm_syscfg.exticr[reg] = (stm_syscfg.exticr[reg] & ~(0xf << shift)) | val << shift; + stm_syscfg.exticr[reg] = (stm_syscfg.exticr[reg] & ~(0xfUL << shift)) | val << shift; } struct stm_dma_channel { @@ -1363,14 +1363,14 @@ extern struct stm_dma stm_dma1; #define STM_DMA_INDEX(channel) ((channel) - 1) #define STM_DMA_ISR(index) ((index) << 2) -#define STM_DMA_ISR_MASK 0xf +#define STM_DMA_ISR_MASK 0xfUL #define STM_DMA_ISR_TEIF 3 #define STM_DMA_ISR_HTIF 2 #define STM_DMA_ISR_TCIF 1 #define STM_DMA_ISR_GIF 0 #define STM_DMA_IFCR(index) ((index) << 2) -#define STM_DMA_IFCR_MASK 0xf +#define STM_DMA_IFCR_MASK 0xfUL #define STM_DMA_IFCR_CTEIF 3 #define STM_DMA_IFCR_CHTIF 2 #define STM_DMA_IFCR_CTCIF 1 @@ -1508,7 +1508,7 @@ extern struct stm_spi stm_spi1; #define STM_SPI_CR1_BR_PCLK_64 5 #define STM_SPI_CR1_BR_PCLK_128 6 #define STM_SPI_CR1_BR_PCLK_256 7 -#define STM_SPI_CR1_BR_MASK 7 +#define STM_SPI_CR1_BR_MASK 7UL #define STM_SPI_CR1_MSTR 2 #define STM_SPI_CR1_CPOL 1 @@ -1596,7 +1596,7 @@ extern struct stm_adc stm_adc; #define STM_ADC_CFGR1_EXTEN_RISING 1 #define STM_ADC_CFGR1_EXTEN_FALLING 2 #define STM_ADC_CFGR1_EXTEN_BOTH 3 -#define STM_ADC_CFGR1_EXTEN_MASK 3 +#define STM_ADC_CFGR1_EXTEN_MASK 3UL #define STM_ADC_CFGR1_EXTSEL 6 #define STM_ADC_CFGR1_ALIGN 5 @@ -1605,7 +1605,7 @@ extern struct stm_adc stm_adc; #define STM_ADC_CFGR1_RES_10 1 #define STM_ADC_CFGR1_RES_8 2 #define STM_ADC_CFGR1_RES_6 3 -#define STM_ADC_CFGR1_RES_MASK 3 +#define STM_ADC_CFGR1_RES_MASK 3UL #define STM_ADC_CFGR1_SCANDIR 2 #define STM_ADC_CFGR1_SCANDIR_UP 0 #define STM_ADC_CFGR1_SCANDIR_DOWN 1 @@ -1732,7 +1732,7 @@ extern struct stm_i2c stm_i2c1, stm_i2c2; #define STM_I2C_CR2_FREQ_16_MHZ 16 #define STM_I2C_CR2_FREQ_24_MHZ 24 #define STM_I2C_CR2_FREQ_32_MHZ 32 -#define STM_I2C_CR2_FREQ_MASK 0x3f +#define STM_I2C_CR2_FREQ_MASK 0x3fUL #define STM_I2C_SR1_SMBALERT 15 #define STM_I2C_SR1_TIMEOUT 14 @@ -1750,7 +1750,7 @@ extern struct stm_i2c stm_i2c1, stm_i2c2; #define STM_I2C_SR1_SB 0 #define STM_I2C_SR2_PEC 8 -#define STM_I2C_SR2_PEC_MASK 0xff00 +#define STM_I2C_SR2_PEC_MASK 0xff00UL #define STM_I2C_SR2_DUALF 7 #define STM_I2C_SR2_SMBHOST 6 #define STM_I2C_SR2_SMBDEFAULT 5 @@ -1762,7 +1762,7 @@ extern struct stm_i2c stm_i2c1, stm_i2c2; #define STM_I2C_CCR_FS 15 #define STM_I2C_CCR_DUTY 14 #define STM_I2C_CCR_CCR 0 -#define STM_I2C_CCR_MASK 0x7ff +#define STM_I2C_CCR_MASK 0x7ffUL struct stm_tim234 { vuint32_t cr1; @@ -1799,14 +1799,14 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_CR1_CKD_1 0 #define STM_TIM234_CR1_CKD_2 1 #define STM_TIM234_CR1_CKD_4 2 -#define STM_TIM234_CR1_CKD_MASK 3 +#define STM_TIM234_CR1_CKD_MASK 3UL #define STM_TIM234_CR1_ARPE 7 #define STM_TIM234_CR1_CMS 5 #define STM_TIM234_CR1_CMS_EDGE 0 #define STM_TIM234_CR1_CMS_CENTER_1 1 #define STM_TIM234_CR1_CMS_CENTER_2 2 #define STM_TIM234_CR1_CMS_CENTER_3 3 -#define STM_TIM234_CR1_CMS_MASK 3 +#define STM_TIM234_CR1_CMS_MASK 3UL #define STM_TIM234_CR1_DIR 4 #define STM_TIM234_CR1_DIR_UP 0 #define STM_TIM234_CR1_DIR_DOWN 1 @@ -1825,7 +1825,7 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_CR2_MMS_COMPARE_OC2REF 5 #define STM_TIM234_CR2_MMS_COMPARE_OC3REF 6 #define STM_TIM234_CR2_MMS_COMPARE_OC4REF 7 -#define STM_TIM234_CR2_MMS_MASK 7 +#define STM_TIM234_CR2_MMS_MASK 7UL #define STM_TIM234_CR2_CCDS 3 #define STM_TIM234_SMCR_ETP 15 @@ -1835,7 +1835,7 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_SMCR_ETPS_DIV_2 1 #define STM_TIM234_SMCR_ETPS_DIV_4 2 #define STM_TIM234_SMCR_ETPS_DIV_8 3 -#define STM_TIM234_SMCR_ETPS_MASK 3 +#define STM_TIM234_SMCR_ETPS_MASK 3UL #define STM_TIM234_SMCR_ETF 8 #define STM_TIM234_SMCR_ETF_NONE 0 #define STM_TIM234_SMCR_ETF_INT_N_2 1 @@ -1853,7 +1853,7 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_SMCR_ETF_DTS_32_N_5 13 #define STM_TIM234_SMCR_ETF_DTS_32_N_6 14 #define STM_TIM234_SMCR_ETF_DTS_32_N_8 15 -#define STM_TIM234_SMCR_ETF_MASK 15 +#define STM_TIM234_SMCR_ETF_MASK 15UL #define STM_TIM234_SMCR_MSM 7 #define STM_TIM234_SMCR_TS 4 #define STM_TIM234_SMCR_TS_ITR0 0 @@ -1864,7 +1864,7 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_SMCR_TS_TI1FP1 5 #define STM_TIM234_SMCR_TS_TI2FP2 6 #define STM_TIM234_SMCR_TS_ETRF 7 -#define STM_TIM234_SMCR_TS_MASK 7 +#define STM_TIM234_SMCR_TS_MASK 7UL #define STM_TIM234_SMCR_OCCS 3 #define STM_TIM234_SMCR_SMS 0 #define STM_TIM234_SMCR_SMS_DISABLE 0 @@ -1875,7 +1875,7 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_SMCR_SMS_GATED_MODE 5 #define STM_TIM234_SMCR_SMS_TRIGGER_MODE 6 #define STM_TIM234_SMCR_SMS_EXTERNAL_CLOCK 7 -#define STM_TIM234_SMCR_SMS_MASK 7 +#define STM_TIM234_SMCR_SMS_MASK 7UL #define STM_TIM234_DIER_TDE 14 #define STM_TIM234_DIER_CC4DE 12 @@ -1919,7 +1919,7 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_CCMR1_OC2M_FORCE_HIGH 5 #define STM_TIM234_CCMR1_OC2M_PWM_MODE_1 6 #define STM_TIM234_CCMR1_OC2M_PWM_MODE_2 7 -#define STM_TIM234_CCMR1_OC2M_MASK 7 +#define STM_TIM234_CCMR1_OC2M_MASK 7UL #define STM_TIM234_CCMR1_OC2PE 11 #define STM_TIM234_CCMR1_OC2FE 10 #define STM_TIM234_CCMR1_CC2S 8 @@ -1927,7 +1927,7 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_CCMR1_CC2S_INPUT_TI2 1 #define STM_TIM234_CCMR1_CC2S_INPUT_TI1 2 #define STM_TIM234_CCMR1_CC2S_INPUT_TRC 3 -#define STM_TIM234_CCMR1_CC2S_MASK 3 +#define STM_TIM234_CCMR1_CC2S_MASK 3UL #define STM_TIM234_CCMR1_OC1CE 7 #define STM_TIM234_CCMR1_OC1M 4 @@ -1939,7 +1939,7 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_CCMR1_OC1M_FORCE_HIGH 5 #define STM_TIM234_CCMR1_OC1M_PWM_MODE_1 6 #define STM_TIM234_CCMR1_OC1M_PWM_MODE_2 7 -#define STM_TIM234_CCMR1_OC1M_MASK 7 +#define STM_TIM234_CCMR1_OC1M_MASK 7UL #define STM_TIM234_CCMR1_OC1PE 3 #define STM_TIM234_CCMR1_OC1FE 2 #define STM_TIM234_CCMR1_CC1S 0 @@ -1947,7 +1947,7 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_CCMR1_CC1S_INPUT_TI1 1 #define STM_TIM234_CCMR1_CC1S_INPUT_TI2 2 #define STM_TIM234_CCMR1_CC1S_INPUT_TRC 3 -#define STM_TIM234_CCMR1_CC1S_MASK 3 +#define STM_TIM234_CCMR1_CC1S_MASK 3UL #define STM_TIM234_CCMR1_IC2F 12 #define STM_TIM234_CCMR1_IC2F_NONE 0 @@ -2004,7 +2004,7 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_CCMR2_OC4M_FORCE_HIGH 5 #define STM_TIM234_CCMR2_OC4M_PWM_MODE_1 6 #define STM_TIM234_CCMR2_OC4M_PWM_MODE_2 7 -#define STM_TIM234_CCMR2_OC4M_MASK 7 +#define STM_TIM234_CCMR2_OC4M_MASK 7UL #define STM_TIM234_CCMR2_OC4PE 11 #define STM_TIM234_CCMR2_OC4FE 10 #define STM_TIM234_CCMR2_CC4S 8 @@ -2012,7 +2012,7 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_CCMR2_CC4S_INPUT_TI4 1 #define STM_TIM234_CCMR2_CC4S_INPUT_TI3 2 #define STM_TIM234_CCMR2_CC4S_INPUT_TRC 3 -#define STM_TIM234_CCMR2_CC4S_MASK 3 +#define STM_TIM234_CCMR2_CC4S_MASK 3UL #define STM_TIM234_CCMR2_OC3CE 7 #define STM_TIM234_CCMR2_OC3M 4 @@ -2024,7 +2024,7 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_CCMR2_OC3M_FORCE_HIGH 5 #define STM_TIM234_CCMR2_OC3M_PWM_MODE_1 6 #define STM_TIM234_CCMR2_OC3M_PWM_MODE_2 7 -#define STM_TIM234_CCMR2_OC3M_MASK 7 +#define STM_TIM234_CCMR2_OC3M_MASK 7UL #define STM_TIM234_CCMR2_OC3PE 3 #define STM_TIM234_CCMR2_OC3FE 2 #define STM_TIM234_CCMR2_CC3S 0 @@ -2032,7 +2032,7 @@ extern struct stm_tim234 stm_tim2, stm_tim3, stm_tim4; #define STM_TIM234_CCMR2_CC3S_INPUT_TI3 1 #define STM_TIM234_CCMR2_CC3S_INPUT_TI4 2 #define STM_TIM234_CCMR2_CC3S_INPUT_TRC 3 -#define STM_TIM234_CCMR2_CC3S_MASK 3 +#define STM_TIM234_CCMR2_CC3S_MASK 3UL #define STM_TIM234_CCER_CC4NP 15 #define STM_TIM234_CCER_CC4P 13 -- 2.30.2