diff --git a/arch/arc/core/mpu/arc_mpu_v2_internal.h b/arch/arc/core/mpu/arc_mpu_v2_internal.h index b6cce00799d..75f69318437 100644 --- a/arch/arc/core/mpu/arc_mpu_v2_internal.h +++ b/arch/arc/core/mpu/arc_mpu_v2_internal.h @@ -31,7 +31,7 @@ static inline void _region_init(u32_t index, u32_t region_addr, u32_t size, { u8_t bits = find_msb_set(size) - 1; - index = 2 * index; + index = index * 2U; if (bits < ARC_FEATURE_MPU_ALIGNMENT_BITS) { bits = ARC_FEATURE_MPU_ALIGNMENT_BITS; @@ -98,7 +98,7 @@ static inline int _get_region_index_by_type(u32_t type) */ static inline bool _is_enabled_region(u32_t r_index) { - return ((z_arc_v2_aux_reg_read(_ARC_V2_MPU_RDB0 + 2 * r_index) + return ((z_arc_v2_aux_reg_read(_ARC_V2_MPU_RDB0 + r_index * 2U) & AUX_MPU_RDB_VALID_MASK) == AUX_MPU_RDB_VALID_MASK); } @@ -111,9 +111,9 @@ static inline bool _is_in_region(u32_t r_index, u32_t start, u32_t size) u32_t r_addr_end; u32_t r_size_lshift; - r_addr_start = z_arc_v2_aux_reg_read(_ARC_V2_MPU_RDB0 + 2 * r_index) + r_addr_start = z_arc_v2_aux_reg_read(_ARC_V2_MPU_RDB0 + r_index * 2U) & (~AUX_MPU_RDB_VALID_MASK); - r_size_lshift = z_arc_v2_aux_reg_read(_ARC_V2_MPU_RDP0 + 2 * r_index) + r_size_lshift = z_arc_v2_aux_reg_read(_ARC_V2_MPU_RDP0 + r_index * 2U) & AUX_MPU_RDP_SIZE_MASK; r_size_lshift = (r_size_lshift & 0x3) | ((r_size_lshift >> 7) & 0x1C); r_addr_end = r_addr_start + (1 << (r_size_lshift + 1)); @@ -132,7 +132,7 @@ static inline bool _is_user_accessible_region(u32_t r_index, int write) { u32_t r_ap; - r_ap = z_arc_v2_aux_reg_read(_ARC_V2_MPU_RDP0 + 2 * r_index); + r_ap = z_arc_v2_aux_reg_read(_ARC_V2_MPU_RDP0 + r_index * 2U); r_ap &= AUX_MPU_RDP_ATTR_MASK; diff --git a/boards/arm/mimxrt1020_evk/pinmux.c b/boards/arm/mimxrt1020_evk/pinmux.c index e9e362e8f3c..e404b9fd315 100644 --- a/boards/arm/mimxrt1020_evk/pinmux.c +++ b/boards/arm/mimxrt1020_evk/pinmux.c @@ -151,7 +151,7 @@ static int mimxrt1020_evk_init(struct device *dev) static int mimxrt1020_evk_phy_reset(struct device *dev) { /* RESET PHY chip. */ - k_busy_wait(10*USEC_PER_MSEC); + k_busy_wait(USEC_PER_MSEC * 10U); GPIO_WritePinOutput(GPIO1, 4, 1); return 0; diff --git a/boards/arm/mimxrt1050_evk/pinmux.c b/boards/arm/mimxrt1050_evk/pinmux.c index 79208ff28d7..eac54b48d13 100644 --- a/boards/arm/mimxrt1050_evk/pinmux.c +++ b/boards/arm/mimxrt1050_evk/pinmux.c @@ -220,7 +220,7 @@ static int mimxrt1050_evk_init(struct device *dev) static int mimxrt1050_evk_phy_reset(struct device *dev) { /* RESET PHY chip. */ - k_busy_wait(10*USEC_PER_MSEC); + k_busy_wait(USEC_PER_MSEC * 10U); GPIO_WritePinOutput(GPIO1, 9, 1); return 0; diff --git a/boards/arm/mimxrt1064_evk/pinmux.c b/boards/arm/mimxrt1064_evk/pinmux.c index 6c1cd939b14..1515b6c3c5a 100644 --- a/boards/arm/mimxrt1064_evk/pinmux.c +++ b/boards/arm/mimxrt1064_evk/pinmux.c @@ -156,7 +156,7 @@ static int mimxrt1064_evk_init(struct device *dev) static int mimxrt1064_evk_phy_reset(struct device *dev) { /* RESET PHY chip. */ - k_busy_wait(10*USEC_PER_MSEC); + k_busy_wait(USEC_PER_MSEC * 10U); GPIO_WritePinOutput(GPIO1, 9, 1); return 0; diff --git a/drivers/display/display_ili9340.c b/drivers/display/display_ili9340.c index 468c44b084e..5ec53c4be4f 100644 --- a/drivers/display/display_ili9340.c +++ b/drivers/display/display_ili9340.c @@ -126,7 +126,7 @@ static int ili9340_write(const struct device *dev, const u16_t x, u16_t write_h; __ASSERT(desc->width <= desc->pitch, "Pitch is smaller then width"); - __ASSERT((3 * desc->pitch * desc->height) <= desc->bu_size, + __ASSERT((desc->pitch * 3U * desc->height) <= desc->bu_size, "Input buffer to small"); LOG_DBG("Writing %dx%d (w,h) @ %dx%d (x,y)", desc->width, desc->height, @@ -142,17 +142,18 @@ static int ili9340_write(const struct device *dev, const u16_t x, } ili9340_transmit(data, ILI9340_CMD_MEM_WRITE, - (void *) write_data_start, 3 * desc->width * write_h); + (void *) write_data_start, + desc->width * 3U * write_h); tx_bufs.buffers = &tx_buf; tx_bufs.count = 1; - write_data_start += (3 * desc->pitch); + write_data_start += (desc->pitch * 3U); for (write_cnt = 1U; write_cnt < nbr_of_writes; ++write_cnt) { tx_buf.buf = (void *)write_data_start; - tx_buf.len = 3 * desc->width * write_h; + tx_buf.len = desc->width * 3U * write_h; spi_write(data->spi_dev, &data->spi_config, &tx_bufs); - write_data_start += (3 * desc->pitch); + write_data_start += (desc->pitch * 3U); } return 0; diff --git a/drivers/display/display_sdl.c b/drivers/display/display_sdl.c index cc4dbe06715..c036943df42 100644 --- a/drivers/display/display_sdl.c +++ b/drivers/display/display_sdl.c @@ -72,10 +72,10 @@ static int sdl_display_init(struct device *dev) static void sdl_display_write_argb8888(void *disp_buf, const struct display_buffer_descriptor *desc, const void *buf) { - __ASSERT((4 * desc->pitch * desc->height) <= desc->buf_size, + __ASSERT((desc->pitch * 4U * desc->height) <= desc->buf_size, "Input buffer to small"); - memcpy(disp_buf, buf, 4 * desc->pitch * desc->height); + memcpy(disp_buf, buf, desc->pitch * 4U * desc->height); } static void sdl_display_write_rgb888(u8_t *disp_buf, @@ -86,13 +86,13 @@ static void sdl_display_write_rgb888(u8_t *disp_buf, u32_t pixel; const u8_t *byte_ptr; - __ASSERT((3 * desc->pitch * desc->height) <= desc->buf_size, + __ASSERT((desc->pitch * 3U * desc->height) <= desc->buf_size, "Input buffer to small"); for (h_idx = 0U; h_idx < desc->height; ++h_idx) { for (w_idx = 0U; w_idx < desc->width; ++w_idx) { byte_ptr = (const u8_t *)buf + - 3 * ((h_idx * desc->pitch) + w_idx); + ((h_idx * desc->pitch) + w_idx) * 3U; pixel = *byte_ptr << 16; pixel |= *(byte_ptr + 1) << 8; pixel |= *(byte_ptr + 2); @@ -114,7 +114,7 @@ static void sdl_display_write_mono(u8_t *disp_buf, u32_t one_color; u8_t *disp_buf_start; - __ASSERT((desc->pitch * desc->height) <= (8 * desc->buf_size), + __ASSERT((desc->pitch * desc->height) <= (desc->buf_size * 8U), "Input buffer to small"); __ASSERT((desc->height % 8) == 0U, "Input buffer height not aligned per 8 pixels"); @@ -137,12 +137,12 @@ static void sdl_display_write_mono(u8_t *disp_buf, pixel = (~one_color) & 0x00FFFFFF; } *((u32_t *)disp_buf) = pixel; - disp_buf += (4 * desc->width); + disp_buf += (desc->width * 4U); } disp_buf = disp_buf_start; disp_buf += 4; } - disp_buf += 7 * (4 * desc->width); + disp_buf += 7 * (desc->width * 4U); } } @@ -207,11 +207,11 @@ static int sdl_display_read(const struct device *dev, const u16_t x, desc->height, x, y); __ASSERT(desc->width <= desc->pitch, "Pitch is smaller then width"); - __ASSERT((3 * desc->pitch * desc->height) <= desc->buf_size, + __ASSERT((desc->pitch * 3U * desc->height) <= desc->buf_size, "Input buffer to small"); return SDL_RenderReadPixels(disp_data->renderer, &rect, 0, buf, - 4 * desc->pitch); + desc->pitch * 4U); } static void *sdl_display_get_framebuffer(const struct device *dev) diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c index 0acc1e29629..cd5557157c9 100644 --- a/drivers/flash/soc_flash_nrf.c +++ b/drivers/flash/soc_flash_nrf.c @@ -538,7 +538,7 @@ static int write_op(void *context) ticks_diff = ticker_ticks_diff_get(ticker_ticks_now_get(), ticks_begin); - if (2 * ticks_diff > + if (ticks_diff * 2U > HAL_TICKER_US_TO_TICKS(w_ctx->slot)) { nvmc_wait_ready(); return FLASH_OP_ONGOING; diff --git a/drivers/gpio/gpio_esp32.c b/drivers/gpio/gpio_esp32.c index 092dcc38a55..59384a508de 100644 --- a/drivers/gpio/gpio_esp32.c +++ b/drivers/gpio/gpio_esp32.c @@ -109,7 +109,7 @@ static int config_interrupt(u32_t pin, int flags) static void config_polarity(u32_t pin, int flags) { - volatile u32_t *reg = (u32_t *)(GPIO_FUNC0_IN_SEL_CFG_REG + 4 * pin); + volatile u32_t *reg = (u32_t *)(GPIO_FUNC0_IN_SEL_CFG_REG + pin * 4U); if (flags & GPIO_POL_INV) { *reg |= BIT(GPIO_FUNC0_IN_INV_SEL_S); diff --git a/drivers/i2c/i2c_sam_twi.c b/drivers/i2c/i2c_sam_twi.c index 2e5f538ebe6..b723e95141a 100644 --- a/drivers/i2c/i2c_sam_twi.c +++ b/drivers/i2c/i2c_sam_twi.c @@ -80,7 +80,7 @@ static int i2c_clk_set(Twi *const twi, u32_t speed) * T_low = ( ( CLDIV × 2^CKDIV ) + 4 ) × T_MCK */ while (!div_completed) { - cl_div = ((SOC_ATMEL_SAM_MCK_FREQ_HZ / (2 * speed)) - 4) + cl_div = ((SOC_ATMEL_SAM_MCK_FREQ_HZ / (speed * 2U)) - 4) / (1 << ck_div); if (cl_div <= 255U) { diff --git a/drivers/i2c/i2c_sam_twihs.c b/drivers/i2c/i2c_sam_twihs.c index 7fbfe50c6a2..9dff4b00c84 100644 --- a/drivers/i2c/i2c_sam_twihs.c +++ b/drivers/i2c/i2c_sam_twihs.c @@ -80,7 +80,7 @@ static int i2c_clk_set(Twihs *const twihs, u32_t speed) * T_low = ( ( CLDIV × 2^CKDIV ) + 3 ) × T_MCK */ while (!div_completed) { - cl_div = ((SOC_ATMEL_SAM_MCK_FREQ_HZ / (2 * speed)) - 3) + cl_div = ((SOC_ATMEL_SAM_MCK_FREQ_HZ / (speed * 2U)) - 3) / (1 << ck_div); if (cl_div <= 255U) { diff --git a/drivers/i2c/i2c_sifive.c b/drivers/i2c/i2c_sifive.c index 43d7339a18d..d455768ffa5 100644 --- a/drivers/i2c/i2c_sifive.c +++ b/drivers/i2c/i2c_sifive.c @@ -237,7 +237,7 @@ static int i2c_sifive_configure(struct device *dev, u32_t dev_config) } /* Calculate prescale value */ - prescale = (config->f_sys / (5 * i2c_speed)) - 1; + prescale = (config->f_sys / (i2c_speed * 5U)) - 1; /* Configure peripheral with calculated prescale */ sys_write8((u8_t) (0xFF & prescale), I2C_REG(config, REG_PRESCALE_LOW)); diff --git a/drivers/ieee802154/ieee802154_cc1200.c b/drivers/ieee802154/ieee802154_cc1200.c index b549b0bfcc4..89ad048b5eb 100644 --- a/drivers/ieee802154/ieee802154_cc1200.c +++ b/drivers/ieee802154/ieee802154_cc1200.c @@ -353,7 +353,7 @@ static int rf_calibrate(struct cc1200_context *ctx) return -EIO; } - k_busy_wait(5 * USEC_PER_MSEC); + k_busy_wait(USEC_PER_MSEC * 5U); /* We need to re-enable RX as SCAL shuts off the freq synth */ if (!instruct_sidle(ctx) || @@ -363,7 +363,7 @@ static int rf_calibrate(struct cc1200_context *ctx) return -EIO; } - k_busy_wait(10 * USEC_PER_MSEC); + k_busy_wait(USEC_PER_MSEC * 10U); _cc1200_print_status(get_status(ctx)); diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c index e99332e53df..caa00ff4f7a 100644 --- a/drivers/ieee802154/ieee802154_cc2520.c +++ b/drivers/ieee802154/ieee802154_cc2520.c @@ -719,7 +719,7 @@ static int cc2520_set_channel(struct device *dev, u16_t channel) } /* See chapter 16 */ - channel = 11 + 5 * (channel - 11); + channel = 11 + (channel - 11) * 5U; if (!write_reg_freqctrl(cc2520, FREQCTRL_FREQ(channel))) { LOG_ERR("Failed"); diff --git a/drivers/ieee802154/ieee802154_kw41z.c b/drivers/ieee802154/ieee802154_kw41z.c index b916a9267ab..7c6f1e36ef5 100644 --- a/drivers/ieee802154/ieee802154_kw41z.c +++ b/drivers/ieee802154/ieee802154_kw41z.c @@ -468,7 +468,7 @@ static u8_t kw41z_convert_lqi(u8_t hw_lqi) if (hw_lqi >= 220U) { return 255; } else { - return (51 * hw_lqi) / 44; + return (hw_lqi * 51U) / 44; } } diff --git a/drivers/pwm/pwm_imx.c b/drivers/pwm/pwm_imx.c index d1d1b810338..902e5ac2bc4 100644 --- a/drivers/pwm/pwm_imx.c +++ b/drivers/pwm/pwm_imx.c @@ -71,7 +71,7 @@ static int imx_pwm_pin_set(struct device *dev, u32_t pwm, LOG_DBG("enabled=%d, pulse_cycles=%d, period_cycles=%d," " duty_cycle=%d\n", enabled, pulse_cycles, period_cycles, - (100 * pulse_cycles / period_cycles)); + (pulse_cycles * 100U / period_cycles)); /* * i.MX PWMv2 has a 4-word sample FIFO. diff --git a/drivers/pwm/pwm_mcux_ftm.c b/drivers/pwm/pwm_mcux_ftm.c index 5b445f89b6f..e23a7495994 100644 --- a/drivers/pwm/pwm_mcux_ftm.c +++ b/drivers/pwm/pwm_mcux_ftm.c @@ -48,7 +48,7 @@ static int mcux_ftm_pin_set(struct device *dev, u32_t pwm, return -ENOTSUP; } - duty_cycle = 100 * pulse_cycles / period_cycles; + duty_cycle = pulse_cycles * 100U / period_cycles; data->channel[pwm].dutyCyclePercent = duty_cycle; LOG_DBG("pulse_cycles=%d, period_cycles=%d, duty_cycle=%d", diff --git a/drivers/pwm/pwm_stm32.c b/drivers/pwm/pwm_stm32.c index f0761fb3381..caa0f3ca55d 100644 --- a/drivers/pwm/pwm_stm32.c +++ b/drivers/pwm/pwm_stm32.c @@ -50,7 +50,7 @@ static u32_t __get_tim_clk(u32_t bus_clk, if (apb_psc == 1U) { tim_clk = bus_clk; } else { - tim_clk = 2 * bus_clk; + tim_clk = bus_clk * 2U; } return tim_clk; diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.c b/drivers/sensor/bmc150_magn/bmc150_magn.c index 31dde7411fb..8d45863c159 100644 --- a/drivers/sensor/bmc150_magn/bmc150_magn.c +++ b/drivers/sensor/bmc150_magn/bmc150_magn.c @@ -63,7 +63,7 @@ static int bmc150_magn_set_power_mode(struct device *dev, !state) < 0) { return -EIO; } - k_busy_wait(5 * USEC_PER_MSEC); + k_busy_wait(USEC_PER_MSEC * 5U); return 0; case BMC150_MAGN_POWER_MODE_SLEEP: diff --git a/drivers/sensor/bmi160/bmi160_trigger.c b/drivers/sensor/bmi160/bmi160_trigger.c index f7d3e49d78c..6245d094e0a 100644 --- a/drivers/sensor/bmi160/bmi160_trigger.c +++ b/drivers/sensor/bmi160/bmi160_trigger.c @@ -217,7 +217,7 @@ int bmi160_acc_slope_config(struct device *dev, enum sensor_attribute attr, return -EINVAL; } - reg_val = 512 * (slope_th_ums2 - 1) / (acc_range_g * SENSOR_G); + reg_val = (slope_th_ums2 - 1) * 512U / (acc_range_g * SENSOR_G); if (bmi160_byte_write(dev, BMI160_REG_INT_MOTION1, reg_val) < 0) { diff --git a/drivers/sensor/bmm150/bmm150.c b/drivers/sensor/bmm150/bmm150.c index c330f2f11ec..1c730310091 100644 --- a/drivers/sensor/bmm150/bmm150.c +++ b/drivers/sensor/bmm150/bmm150.c @@ -51,7 +51,7 @@ static int bmm150_set_power_mode(struct device *dev, !state) < 0) { return -EIO; } - k_busy_wait(5 * USEC_PER_MSEC); + k_busy_wait(USEC_PER_MSEC * 5U); return 0; case BMM150_POWER_MODE_SLEEP: diff --git a/drivers/sensor/hdc1008/hdc1008.c b/drivers/sensor/hdc1008/hdc1008.c index d643f803bbd..41cdc96241d 100644 --- a/drivers/sensor/hdc1008/hdc1008.c +++ b/drivers/sensor/hdc1008/hdc1008.c @@ -75,16 +75,16 @@ static int hdc1008_channel_get(struct device *dev, */ if (chan == SENSOR_CHAN_AMBIENT_TEMP) { /* val = -40 + 165 * sample / 2^16 */ - tmp = 165 * (u64_t)drv_data->t_sample; + tmp = (u64_t)drv_data->t_sample * 165U; val->val1 = (s32_t)(tmp >> 16) - 40; - val->val2 = (1000000 * (tmp & 0xFFFF)) >> 16; + val->val2 = ((tmp & 0xFFFF) * 1000000U) >> 16; } else if (chan == SENSOR_CHAN_HUMIDITY) { /* val = 100 * sample / 2^16 */ u32_t tmp2; - tmp2 = 100 * (u32_t)drv_data->rh_sample; + tmp2 = (u32_t)drv_data->rh_sample * 100U; val->val1 = tmp2 >> 16; /* x * 1000000 / 65536 == x * 15625 / 1024 */ - val->val2 = (15625 * (tmp2 & 0xFFFF)) >> 10; + val->val2 = ((tmp2 & 0xFFFF) * 15625U) >> 10; } else { return -ENOTSUP; } diff --git a/drivers/sensor/lps25hb/lps25hb.c b/drivers/sensor/lps25hb/lps25hb.c index ceccf50b088..5d23911aa02 100644 --- a/drivers/sensor/lps25hb/lps25hb.c +++ b/drivers/sensor/lps25hb/lps25hb.c @@ -117,14 +117,14 @@ static int lps25hb_init_chip(struct device *dev) u8_t chip_id; lps25hb_power_ctrl(dev, 0); - k_busy_wait(50 * USEC_PER_MSEC); + k_busy_wait(USEC_PER_MSEC * 50U); if (lps25hb_power_ctrl(dev, 1) < 0) { LOG_DBG("failed to power on device"); return -EIO; } - k_busy_wait(20 * USEC_PER_MSEC); + k_busy_wait(USEC_PER_MSEC * 20U); if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, LPS25HB_REG_WHO_AM_I, &chip_id) < 0) { diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.c b/drivers/sensor/lsm6ds0/lsm6ds0.c index a08f63c781d..53afceedc08 100644 --- a/drivers/sensor/lsm6ds0/lsm6ds0.c +++ b/drivers/sensor/lsm6ds0/lsm6ds0.c @@ -33,7 +33,7 @@ static inline int lsm6ds0_reboot(struct device *dev) return -EIO; } - k_busy_wait(50 * USEC_PER_MSEC); + k_busy_wait(USEC_PER_MSEC * 50U); return 0; } diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.c b/drivers/sensor/lsm6dsl/lsm6dsl.c index 4944c813b02..5fa424a1c44 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl.c @@ -98,7 +98,7 @@ static inline int lsm6dsl_reboot(struct device *dev) } /* Wait sensor turn-on time as per datasheet */ - k_busy_wait(35 * USEC_PER_MSEC); + k_busy_wait(USEC_PER_MSEC * 35U); return 0; } diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c index 13a728dea48..78ffb3ff187 100644 --- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c +++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c @@ -35,7 +35,7 @@ static inline int lsm9ds0_mfd_reboot_memory(struct device *dev) return -EIO; } - k_busy_wait(50 * USEC_PER_MSEC); + k_busy_wait(USEC_PER_MSEC * 50U); return 0; } diff --git a/drivers/sensor/mpu6050/mpu6050.c b/drivers/sensor/mpu6050/mpu6050.c index bf319642398..0f092fe63a4 100644 --- a/drivers/sensor/mpu6050/mpu6050.c +++ b/drivers/sensor/mpu6050/mpu6050.c @@ -33,7 +33,7 @@ static void mpu6050_convert_gyro(struct sensor_value *val, s16_t raw_val, s64_t conv_val; conv_val = ((s64_t)raw_val * SENSOR_PI * 10) / - (180 * sensitivity_x10); + (sensitivity_x10 * 180U); val->val1 = conv_val / 1000000; val->val2 = conv_val % 1000000; } diff --git a/drivers/sensor/sht3xd/sht3xd.c b/drivers/sensor/sht3xd/sht3xd.c index e12103b54c7..065794c3af9 100644 --- a/drivers/sensor/sht3xd/sht3xd.c +++ b/drivers/sensor/sht3xd/sht3xd.c @@ -127,12 +127,12 @@ static int sht3xd_channel_get(struct device *dev, */ if (chan == SENSOR_CHAN_AMBIENT_TEMP) { /* val = -45 + 175 * sample / (2^16 -1) */ - tmp = 175 * (u64_t)data->t_sample; + tmp = (u64_t)data->t_sample * 175U; val->val1 = (s32_t)(tmp / 0xFFFF) - 45; - val->val2 = (1000000 * (tmp % 0xFFFF)) / 0xFFFF; + val->val2 = ((tmp % 0xFFFF) * 1000000U) / 0xFFFF; } else if (chan == SENSOR_CHAN_HUMIDITY) { /* val = 100 * sample / (2^16 -1) */ - u32_t tmp2 = 100 * (u32_t)data->rh_sample; + u32_t tmp2 = (u32_t)data->rh_sample * 100U; val->val1 = tmp2 / 0xFFFF; /* x * 100000 / 65536 == x * 15625 / 1024 */ val->val2 = (tmp2 % 0xFFFF) * 15625U / 1024; diff --git a/drivers/serial/uart_miv.c b/drivers/serial/uart_miv.c index 9084f348189..f8e06eb4c8f 100644 --- a/drivers/serial/uart_miv.c +++ b/drivers/serial/uart_miv.c @@ -343,7 +343,7 @@ static int uart_miv_init(struct device *dev) const struct uart_miv_device_config *const cfg = DEV_CFG(dev); volatile struct uart_miv_regs_t *uart = DEV_UART(dev); /* Calculate divider value to set baudrate */ - u16_t baud_value = (cfg->sys_clk_freq / (16 * cfg->baud_rate)) - 1; + u16_t baud_value = (cfg->sys_clk_freq / (cfg->baud_rate * 16U)) - 1; /* Set baud rate */ uart->ctrlreg1 = (u8_t)(baud_value & BAUDVALUE_LSB); diff --git a/drivers/serial/uart_pl011.c b/drivers/serial/uart_pl011.c index a4539efe3c0..744d0f7ced5 100644 --- a/drivers/serial/uart_pl011.c +++ b/drivers/serial/uart_pl011.c @@ -172,7 +172,7 @@ static int pl011_set_baudrate(struct device *dev, { /* Avoiding float calculations, bauddiv is left shifted by 6 */ u64_t bauddiv = (((u64_t)clk) << PL011_FBRD_WIDTH) - / (16 * baudrate); + / (baudrate * 16U); /* Valid bauddiv value * uart_clk (min) >= 16 x baud_rate (max) diff --git a/drivers/serial/uart_stellaris.c b/drivers/serial/uart_stellaris.c index 3f77f980317..4f365a8a1df 100644 --- a/drivers/serial/uart_stellaris.c +++ b/drivers/serial/uart_stellaris.c @@ -165,7 +165,7 @@ static void baudrate_set(struct device *dev, /* upon reset, the system clock uses the intenal OSC @ 12MHz */ - div = (16 * baudrate); + div = (baudrate * 16U); rem = sys_clk_freq_hz % div; /* diff --git a/drivers/spi/spi_sifive.c b/drivers/spi/spi_sifive.c index f77abda2e9d..7c4803dd363 100644 --- a/drivers/spi/spi_sifive.c +++ b/drivers/spi/spi_sifive.c @@ -38,7 +38,7 @@ int spi_config(struct device *dev, u32_t frequency, u16_t operation) } /* Set the SPI frequency */ - div = (SPI_CFG(dev)->f_sys / (2 * frequency)) - 1; + div = (SPI_CFG(dev)->f_sys / (frequency * 2U)) - 1; sys_write32((SF_SCKDIV_DIV_MASK & div), SPI_REG(dev, REG_SCKDIV)); /* Set the polarity */ diff --git a/drivers/usb/device/usb_dc_dw.c b/drivers/usb/device/usb_dc_dw.c index c4c8bf96c59..3699e1f2be9 100644 --- a/drivers/usb/device/usb_dc_dw.c +++ b/drivers/usb/device/usb_dc_dw.c @@ -1128,7 +1128,7 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len, for (j = 0U; j < (bytes_to_copy & 0x3); j++) { *(data + i + j) = - (sys_cpu_to_le32(last_dw) >> (8 * j)) & 0xFF; + (sys_cpu_to_le32(last_dw) >> (j * 8U)) & 0xFF; } } diff --git a/include/logging/log_core.h b/include/logging/log_core.h index ef13a64b4ac..c76da481de5 100644 --- a/include/logging/log_core.h +++ b/include/logging/log_core.h @@ -223,7 +223,7 @@ extern "C" { .source_id = _id \ }; \ \ - if ((BIT(_level) & LOG_FUNCTION_PREFIX_MASK) != 0) {\ + if ((BIT(_level) & LOG_FUNCTION_PREFIX_MASK) != 0U) {\ __LOG_INTERNAL(src_level, \ Z_LOG_STR(__VA_ARGS__)); \ } else { \ diff --git a/kernel/include/ksched.h b/kernel/include/ksched.h index 7d8fd55a062..bf5e242bf5b 100644 --- a/kernel/include/ksched.h +++ b/kernel/include/ksched.h @@ -87,7 +87,7 @@ static inline bool z_is_idle_thread(void *entry_point) static inline bool z_is_thread_pending(struct k_thread *thread) { - return (thread->base.thread_state & _THREAD_PENDING) != 0; + return (thread->base.thread_state & _THREAD_PENDING) != 0U; } static inline bool z_is_thread_prevented_from_running(struct k_thread *thread) @@ -117,7 +117,7 @@ static inline bool z_has_thread_started(struct k_thread *thread) static inline bool z_is_thread_state_set(struct k_thread *thread, u32_t state) { - return (thread->base.thread_state & state) != 0; + return (thread->base.thread_state & state) != 0U; } static inline bool z_is_thread_queued(struct k_thread *thread) diff --git a/kernel/sched.c b/kernel/sched.c index bc4ad520463..84fea6d2eea 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -75,7 +75,7 @@ static inline int is_metairq(struct k_thread *thread) #if CONFIG_ASSERT static inline bool is_thread_dummy(struct k_thread *thread) { - return (thread->base.thread_state & _THREAD_DUMMY) != 0; + return (thread->base.thread_state & _THREAD_DUMMY) != 0U; } #endif diff --git a/kernel/userspace.c b/kernel/userspace.c index 0d1c9548fd8..5c95ae745ea 100644 --- a/kernel/userspace.c +++ b/kernel/userspace.c @@ -565,12 +565,12 @@ int z_object_validate(struct _k_object *ko, enum k_objects otype, /* Initialization state checks. _OBJ_INIT_ANY, we don't care */ if (likely(init == _OBJ_INIT_TRUE)) { /* Object MUST be intialized */ - if (unlikely((ko->flags & K_OBJ_FLAG_INITIALIZED) == 0)) { + if (unlikely((ko->flags & K_OBJ_FLAG_INITIALIZED) == 0U)) { return -EINVAL; } } else if (init < _OBJ_INIT_TRUE) { /* _OBJ_INIT_FALSE case */ /* Object MUST NOT be initialized */ - if (unlikely((ko->flags & K_OBJ_FLAG_INITIALIZED) != 0)) { + if (unlikely((ko->flags & K_OBJ_FLAG_INITIALIZED) != 0U)) { return -EADDRINUSE; } } else { diff --git a/lib/gui/lvgl/lvgl_color_16.c b/lib/gui/lvgl/lvgl_color_16.c index 8b34a0fc527..8b24c2caa86 100644 --- a/lib/gui/lvgl/lvgl_color_16.c +++ b/lib/gui/lvgl/lvgl_color_16.c @@ -17,7 +17,7 @@ static void zephyr_disp_flush(s32_t x1, s32_t y1, s32_t x2, s32_t y2, u16_t h = y2 - y1 + 1; struct display_buffer_descriptor desc; - desc.buf_size = 2 * w * h; + desc.buf_size = w * 2U * h; desc.width = w; desc.pitch = w; desc.height = h; diff --git a/lib/gui/lvgl/lvgl_color_32.c b/lib/gui/lvgl/lvgl_color_32.c index 497b10dc22b..659fdd1c3c5 100644 --- a/lib/gui/lvgl/lvgl_color_32.c +++ b/lib/gui/lvgl/lvgl_color_32.c @@ -17,7 +17,7 @@ static void zephyr_disp_flush(s32_t x1, s32_t y1, s32_t x2, s32_t y2, u16_t h = y2 - y1 + 1; struct display_buffer_descriptor desc; - desc.buf_size = 4 * w * h; + desc.buf_size = w * 4U * h; desc.width = w; desc.pitch = w; desc.height = h; @@ -37,7 +37,7 @@ static void zephyr_disp_flush(s32_t x1, s32_t y1, s32_t x2, s32_t y2, u16_t h = y2 - y1 + 1; struct display_buffer_descriptor desc; - desc.buf_size = 3 * w * h; + desc.buf_size = w * 3U * h; desc.width = w; desc.pitch = w; desc.height = h; diff --git a/lib/os/crc16_sw.c b/lib/os/crc16_sw.c index 9bbc32e30fe..e72e93f32c0 100644 --- a/lib/os/crc16_sw.c +++ b/lib/os/crc16_sw.c @@ -26,7 +26,7 @@ u16_t crc16(const u8_t *src, size_t len, u16_t polynomial, crc |= !!(src[i] & (0x80U >> b)); } - if (divide != 0) { + if (divide != 0U) { crc = crc ^ polynomial; } } diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c index d5218428060..62cfe00d5f7 100644 --- a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c +++ b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c @@ -616,7 +616,7 @@ void onoff_handler(struct generic_onoff_state *state) k_timer_init(ptr_timer, onoff_tt_handler, NULL); k_timer_start(ptr_timer, - K_MSEC(5 * state->transition->delay), + K_MSEC(state->transition->delay * 5U), K_MSEC(state->transition->quo_tt)); } @@ -627,7 +627,7 @@ void level_lightness_handler(struct generic_level_state *state) k_timer_init(ptr_timer, level_lightness_tt_handler, NULL); k_timer_start(ptr_timer, - K_MSEC(5 * state->transition->delay), + K_MSEC(state->transition->delay * 5U), K_MSEC(state->transition->quo_tt)); } @@ -638,7 +638,7 @@ void level_temp_handler(struct generic_level_state *state) k_timer_init(ptr_timer, level_temp_tt_handler, NULL); k_timer_start(ptr_timer, - K_MSEC(5 * state->transition->delay), + K_MSEC(state->transition->delay * 5U), K_MSEC(state->transition->quo_tt)); } @@ -649,7 +649,7 @@ void light_lightness_actual_handler(struct light_lightness_state *state) k_timer_init(ptr_timer, light_lightness_actual_tt_handler, NULL); k_timer_start(ptr_timer, - K_MSEC(5 * state->transition->delay), + K_MSEC(state->transition->delay * 5U), K_MSEC(state->transition->quo_tt)); } @@ -660,7 +660,7 @@ void light_lightness_linear_handler(struct light_lightness_state *state) k_timer_init(ptr_timer, light_lightness_linear_tt_handler, NULL); k_timer_start(ptr_timer, - K_MSEC(5 * state->transition->delay), + K_MSEC(state->transition->delay * 5U), K_MSEC(state->transition->quo_tt)); } @@ -671,7 +671,7 @@ void light_ctl_handler(struct light_ctl_state *state) k_timer_init(ptr_timer, light_ctl_tt_handler, NULL); k_timer_start(ptr_timer, - K_MSEC(5 * state->transition->delay), + K_MSEC(state->transition->delay * 5U), K_MSEC(state->transition->quo_tt)); } @@ -682,7 +682,7 @@ void light_ctl_temp_handler(struct light_ctl_state *state) k_timer_init(ptr_timer, light_ctl_temp_tt_handler, NULL); k_timer_start(ptr_timer, - K_MSEC(5 * state->transition->delay), + K_MSEC(state->transition->delay * 5U), K_MSEC(state->transition->quo_tt)); } /* Messages handlers (End) */ diff --git a/samples/drivers/counter/alarm/src/main.c b/samples/drivers/counter/alarm/src/main.c index 517cbfa2cfc..a0f58c1a64f 100644 --- a/samples/drivers/counter/alarm/src/main.c +++ b/samples/drivers/counter/alarm/src/main.c @@ -27,7 +27,7 @@ static void test_counter_interrupt_fn(struct device *counter_dev, printk("Now: %u\n", now_sec); /* Set a new alarm with a double lenght duration */ - config->ticks = 2 * config->ticks; + config->ticks = config->ticks * 2U; printk("Set alarm in %u sec\n", config->ticks); counter_set_channel_alarm(counter_dev, ALARM_CHANNEL_ID, user_data); diff --git a/samples/net/google_iot_mqtt/src/protocol.c b/samples/net/google_iot_mqtt/src/protocol.c index 9e4a1a5436e..c23bd53daeb 100644 --- a/samples/net/google_iot_mqtt/src/protocol.c +++ b/samples/net/google_iot_mqtt/src/protocol.c @@ -201,7 +201,7 @@ static int wait_for_input(int timeout) return res; } -#define ALIVE_TIME (60 * MSEC_PER_SEC) +#define ALIVE_TIME (MSEC_PER_SEC * 60U) static struct mqtt_utf8 password = { .utf8 = token diff --git a/samples/net/sockets/coap_server/src/coap-server.c b/samples/net/sockets/coap_server/src/coap-server.c index ebe19fee962..94954459ffc 100644 --- a/samples/net/sockets/coap_server/src/coap-server.c +++ b/samples/net/sockets/coap_server/src/coap-server.c @@ -995,7 +995,7 @@ static void update_counter(struct k_work *work) coap_resource_notify(resource_to_notify); } - k_delayed_work_submit(&observer_work, 5 * MSEC_PER_SEC); + k_delayed_work_submit(&observer_work, MSEC_PER_SEC * 5U); } static int create_pending_request(struct coap_packet *response, @@ -1099,7 +1099,7 @@ static int send_notification_packet(const struct sockaddr *addr, } } - k_delayed_work_submit(&observer_work, 5 * MSEC_PER_SEC); + k_delayed_work_submit(&observer_work, MSEC_PER_SEC * 5U); r = send_coap_reply(&response, addr, addr_len); diff --git a/samples/xtensa_asm2/src/main.c b/samples/xtensa_asm2/src/main.c index 4d32f19def6..1e26dcbe785 100644 --- a/samples/xtensa_asm2/src/main.c +++ b/samples/xtensa_asm2/src/main.c @@ -426,7 +426,7 @@ int interrupt_test(void) */ const int max_reps = 8; int wh = white[i % ARRAY_SIZE(white)]; - int delay = 2*spill_time + int delay = spill_time * 2U + ((wh * (i+1)) % (spill_time * (max_reps - 2))); int alarm = ccount() + delay; diff --git a/subsys/bluetooth/controller/ll_sw/lll_chan.c b/subsys/bluetooth/controller/ll_sw/lll_chan.c index 4d585527faa..b9826899e6e 100644 --- a/subsys/bluetooth/controller/ll_sw/lll_chan.c +++ b/subsys/bluetooth/controller/ll_sw/lll_chan.c @@ -38,9 +38,9 @@ void lll_chan_set(u32_t chan) default: if (chan < 11) { - radio_freq_chan_set(4 + (2 * chan)); + radio_freq_chan_set(4 + (chan * 2U)); } else if (chan < 40) { - radio_freq_chan_set(28 + (2 * (chan - 11))); + radio_freq_chan_set(28 + ((chan - 11) * 2U)); } else { LL_ASSERT(0); } diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c index 6f92bc3bdd4..5e0bf194ac1 100644 --- a/subsys/bluetooth/host/hci_core.c +++ b/subsys/bluetooth/host/hci_core.c @@ -1209,7 +1209,7 @@ bool bt_le_conn_params_valid(const struct bt_le_conn_param *param) } if (param->timeout < 10 || param->timeout > 3200 || - ((4 * param->timeout) <= + ((param->timeout * 4U) <= ((1 + param->latency) * param->interval_max))) { return false; } diff --git a/subsys/bluetooth/host/mesh/prov.c b/subsys/bluetooth/host/mesh/prov.c index f2b2fa6d65b..3b768f46209 100644 --- a/subsys/bluetooth/host/mesh/prov.c +++ b/subsys/bluetooth/host/mesh/prov.c @@ -1330,7 +1330,7 @@ static void gen_prov_cont(struct prov_rx *rx, struct net_buf_simple *buf) u8_t expect_len; expect_len = (link.rx.buf->len - 20U - - (23 * (link.rx.last_seg - 1))); + ((link.rx.last_seg - 1) * 23U)); if (expect_len != buf->len) { BT_ERR("Incorrect last seg len: %u != %u", expect_len, buf->len); diff --git a/subsys/bluetooth/host/mesh/transport.c b/subsys/bluetooth/host/mesh/transport.c index e2b39a54bfa..9215611e147 100644 --- a/subsys/bluetooth/host/mesh/transport.c +++ b/subsys/bluetooth/host/mesh/transport.c @@ -913,7 +913,7 @@ static inline s32_t ack_timeout(struct seg_rx *rx) /* The acknowledgment timer shall be set to a minimum of * 150 + 50 * TTL milliseconds. */ - to = K_MSEC(150 + (50 * ttl)); + to = K_MSEC(150 + (ttl * 50U)); /* 100 ms for every not yet received segment */ to += K_MSEC(((rx->seg_n + 1) - popcount(rx->block)) * 100U); diff --git a/subsys/logging/log_output.c b/subsys/logging/log_output.c index a79f9c969f9..1991405dcd9 100644 --- a/subsys/logging/log_output.c +++ b/subsys/logging/log_output.c @@ -174,7 +174,7 @@ static int timestamp_print(const struct log_output *log_output, remainder = timestamp % freq; ms = (remainder * 1000U) / freq; - us = (1000 * (1000 * remainder - (ms * freq))) / freq; + us = (1000 * (remainder * 1000U - (ms * freq))) / freq; if (IS_ENABLED(CONFIG_LOG_BACKEND_NET) && flags & LOG_OUTPUT_FLAG_FORMAT_SYSLOG) { diff --git a/subsys/net/ip/ipv6_nbr.c b/subsys/net/ip/ipv6_nbr.c index 1926a393296..167094af6bf 100644 --- a/subsys/net/ip/ipv6_nbr.c +++ b/subsys/net/ip/ipv6_nbr.c @@ -1010,7 +1010,7 @@ static inline struct net_nbr *handle_ns_neighbor(struct net_pkt *pkt, struct net_linkaddr_storage lladdr; struct net_linkaddr nbr_lladdr; - lladdr.len = 8 * ll_len - 2; + lladdr.len = ll_len * 8U - 2; if (net_pkt_read(pkt, lladdr.addr, lladdr.len)) { return NULL; diff --git a/tests/benchmarks/app_kernel/src/mailbox_b.c b/tests/benchmarks/app_kernel/src/mailbox_b.c index 807fa5678d4..d61e0041e77 100644 --- a/tests/benchmarks/app_kernel/src/mailbox_b.c +++ b/tests/benchmarks/app_kernel/src/mailbox_b.c @@ -42,7 +42,7 @@ static struct k_mbox_msg message; #define PRINT_ONE_RESULT() \ PRINT_F(output_file, "|%11u|%32u|%32u|\n", putsize, puttime, \ - (u32_t)((1000000 * (u64_t)putsize) / SAFE_DIVISOR(puttime))) + (u32_t)(((u64_t)putsize * 1000000U) / SAFE_DIVISOR(puttime))) #define PRINT_OVERHEAD() \ PRINT_F(output_file, \ @@ -52,7 +52,7 @@ static struct k_mbox_msg message; #define PRINT_XFER_RATE() \ PRINT_F(output_file, "| raw transfer rate: %10u KB/sec (without" \ " overhead) |\n", \ - (u32_t)(1000000 * (u64_t)(putsize >> 1) \ + (u32_t)((u64_t)(putsize >> 1) * 1000000U \ / SAFE_DIVISOR(puttime - empty_msg_put_time))) #endif diff --git a/tests/benchmarks/app_kernel/src/pipe_b.c b/tests/benchmarks/app_kernel/src/pipe_b.c index 00c3b3cd19d..8bdad71cde6 100644 --- a/tests/benchmarks/app_kernel/src/pipe_b.c +++ b/tests/benchmarks/app_kernel/src/pipe_b.c @@ -72,9 +72,9 @@ puttime[0], \ puttime[1], \ puttime[2], \ - (u32_t)((1000000 * (u64_t)putsize) / SAFE_DIVISOR(puttime[0])), \ - (u32_t)((1000000 * (u64_t)putsize) / SAFE_DIVISOR(puttime[1])), \ - (u32_t)((1000000 * (u64_t)putsize) / SAFE_DIVISOR(puttime[2]))) + (u32_t)(((u64_t)putsize * 1000000U) / SAFE_DIVISOR(puttime[0])), \ + (u32_t)(((u64_t)putsize * 1000000U) / SAFE_DIVISOR(puttime[1])), \ + (u32_t)(((u64_t)putsize * 1000000U) / SAFE_DIVISOR(puttime[2]))) #endif /* FLOAT */ /* diff --git a/tests/crypto/tinycrypt/src/test_ecc_utils.c b/tests/crypto/tinycrypt/src/test_ecc_utils.c index 400935ec409..c1fc111dd51 100644 --- a/tests/crypto/tinycrypt/src/test_ecc_utils.c +++ b/tests/crypto/tinycrypt/src/test_ecc_utils.c @@ -129,16 +129,16 @@ int hex2bin(uint8_t *buf, const size_t buflen, const char *hex, void string2scalar(unsigned int *scalar, unsigned int num_word32, char *str) { - unsigned int num_bytes = 4 * num_word32; + unsigned int num_bytes = num_word32 * 4U; uint8_t tmp[num_bytes]; size_t hexlen = strlen(str); int padding; - padding = 2 * num_bytes - strlen(str); + padding = num_bytes * 2U - strlen(str); if (0 > padding) { printf("Error: 2 * num_bytes(%d) < strlen(hex) (%zu)\n", - 2 * num_bytes, strlen(str)); + num_bytes * 2U, strlen(str)); k_panic(); } @@ -182,7 +182,7 @@ int check_ecc_result(const int num, const char *name, const unsigned int *computed, const unsigned int num_word32, const bool verbose) { - uint32_t num_bytes = 4 * num_word32; + uint32_t num_bytes = num_word32 * 4U; if (memcmp(computed, expected, num_bytes)) { TC_PRINT("\n Vector #%02d check %s - FAILURE:\n\n", num, name); diff --git a/tests/drivers/counter/counter_basic_api/src/test_counter.c b/tests/drivers/counter/counter_basic_api/src/test_counter.c index dc3f142460d..968a6d5e4f5 100644 --- a/tests/drivers/counter/counter_basic_api/src/test_counter.c +++ b/tests/drivers/counter/counter_basic_api/src/test_counter.c @@ -16,7 +16,7 @@ static void top_handler(struct device *dev, void *user_data); void *exp_user_data = (void *)199; #if defined(CONFIG_COUNTER_MCUX_RTC) || defined(CONFIG_COUNTER_RTC_STM32) -#define COUNTER_PERIOD_US (2*USEC_PER_SEC) +#define COUNTER_PERIOD_US (USEC_PER_SEC * 2U) #else #define COUNTER_PERIOD_US 20000 #endif @@ -307,7 +307,7 @@ void test_multiple_alarms_instance(const char *dev_name) err = counter_set_channel_alarm(dev, 1, &alarm_cfg2); zassert_equal(0, err, "Counter set alarm failed\n"); - k_busy_wait(1.2*counter_ticks_to_us(dev, 2*ticks)); + k_busy_wait(1.2*counter_ticks_to_us(dev, ticks * 2U)); tmp_alarm_cnt = alarm_cnt; /* to avoid passing volatile to the macro */ zassert_equal(2, tmp_alarm_cnt, "Counter set alarm failed\n"); zassert_equal(&alarm_cfg2, clbk_data[0], diff --git a/tests/kernel/tickless/tickless/src/main.c b/tests/kernel/tickless/tickless/src/main.c index 2d1e356853a..88598346b23 100644 --- a/tests/kernel/tickless/tickless/src/main.c +++ b/tests/kernel/tickless/tickless/src/main.c @@ -196,9 +196,9 @@ void ticklessTestThread(void) * calibrated TSC diff and measured result */ if (diff_tsc > cal_tsc) { - diff_per = (100 * (diff_tsc - cal_tsc)) / cal_tsc; + diff_per = ((diff_tsc - cal_tsc) * 100U) / cal_tsc; } else { - diff_per = (100 * (cal_tsc - diff_tsc)) / cal_tsc; + diff_per = ((cal_tsc - diff_tsc) * 100U) / cal_tsc; } printk("variance in time stamp diff: %d percent\n", (s32_t)diff_per); diff --git a/tests/net/ipv6_fragment/src/main.c b/tests/net/ipv6_fragment/src/main.c index a367be8882a..babc398dd71 100644 --- a/tests/net/ipv6_fragment/src/main.c +++ b/tests/net/ipv6_fragment/src/main.c @@ -1271,13 +1271,13 @@ without: return -EINVAL; } - if ((frag_offset & 0xfff8) != 0) { + if ((frag_offset & 0xfff8) != 0U) { DBG("Invalid fragment offset %d\n", frag_offset & 0xfff8); return -EINVAL; } - if ((frag_offset & 0x0001) != 1) { + if ((frag_offset & 0x0001) != 1U) { DBG("Fragment More flag should be set\n"); return -EINVAL; } @@ -1317,13 +1317,13 @@ without: return -EINVAL; } - if ((frag_offset & 0xfff8) != 1232) { + if ((frag_offset & 0xfff8) != 1232U) { DBG("Invalid fragment offset %d\n", frag_offset & 0xfff8); return -EINVAL; } - if ((frag_offset & 0x0001) != 0) { + if ((frag_offset & 0x0001) != 0U) { DBG("Fragment More flag should be unset\n"); return -EINVAL; } diff --git a/tests/net/tcp/src/main.c b/tests/net/tcp/src/main.c index 0b0fb8c2b07..6ec751c258a 100644 --- a/tests/net/tcp/src/main.c +++ b/tests/net/tcp/src/main.c @@ -1515,7 +1515,7 @@ static bool test_tcp_seq_validity(void) } tcp->send_ack = sys_get_be32(tcp_hdr->seq) + - 2 * get_recv_wnd(tcp); + get_recv_wnd(tcp) * 2U; if (net_tcp_validate_seq(tcp, tcp_hdr)) { DBG("3) Sequence validation failed (send_ack %u vs seq %u)\n", tcp->send_ack, sys_get_be32(tcp_hdr->seq)); @@ -1523,7 +1523,7 @@ static bool test_tcp_seq_validity(void) } tcp->send_ack = sys_get_be32(tcp_hdr->seq) - - 2 * get_recv_wnd(tcp); + get_recv_wnd(tcp) * 2U; if (net_tcp_validate_seq(tcp, tcp_hdr)) { DBG("4) Sequence validation failed (send_ack %u vs seq %u)\n", tcp->send_ack, sys_get_be32(tcp_hdr->seq)); diff --git a/tests/posix/common/src/clock.c b/tests/posix/common/src/clock.c index ceb4759d907..c93546dcfe5 100644 --- a/tests/posix/common/src/clock.c +++ b/tests/posix/common/src/clock.c @@ -90,7 +90,7 @@ void test_posix_realtime(void) */ s64_t last_delta = 0; for (int i = 1; i <= 20; i++) { - usleep(90 * USEC_PER_MSEC); + usleep(USEC_PER_MSEC * 90U); ret = clock_gettime(CLOCK_REALTIME, &rts); zassert_equal(ret, 0, "Fail to read realitime clock"); diff --git a/tests/posix/common/src/mqueue.c b/tests/posix/common/src/mqueue.c index fd84c4603c0..9f376a604bf 100644 --- a/tests/posix/common/src/mqueue.c +++ b/tests/posix/common/src/mqueue.c @@ -95,7 +95,7 @@ void test_posix_mqueue(void) zassert_equal(pthread_attr_destroy(&attr[i]), 0, NULL); } - usleep(10 * USEC_PER_MSEC); + usleep(USEC_PER_MSEC * 10U); for (i = 0; i < N_THR; i++) { pthread_join(newthread[i], &retval); diff --git a/tests/posix/common/src/pthread.c b/tests/posix/common/src/pthread.c index dc9c374f99d..293eb038e0e 100644 --- a/tests/posix/common/src/pthread.c +++ b/tests/posix/common/src/pthread.c @@ -94,7 +94,7 @@ void *thread_top_exec(void *p1) pthread_cond_wait(&cvar0, &lock); } else { pthread_mutex_unlock(&lock); - usleep(500 * USEC_PER_MSEC); + usleep(USEC_PER_MSEC * 500U); pthread_mutex_lock(&lock); }