Skip to content

Commit a6ae2e6

Browse files
authored
Fix compilation warnings (#2089)
1 parent 3c39eec commit a6ae2e6

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

src/host/pico_time_adapter/include/pico/time_adapter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void ta_clear_force_irq(alarm_pool_timer_t *timer, uint hardware_alarm_num);
1919
void ta_clear_irq(alarm_pool_timer_t *timer, uint hardware_alarm_num);
2020
void ta_force_irq(alarm_pool_timer_t *timer, uint hardware_alarm_num);
2121
void ta_set_timeout(alarm_pool_timer_t *timer, uint hardware_alarm_num, int64_t target);
22-
void ta_wakes_up_on_or_before(alarm_pool_timer_t *timer, uint alarm_num, int64_t target);
22+
bool ta_wakes_up_on_or_before(alarm_pool_timer_t *timer, uint alarm_num, int64_t target);
2323
void ta_enable_irq_handler(alarm_pool_timer_t *timer, uint hardware_alarm_num, void (*irq_handler)(void));
2424
void ta_disable_irq_handler(alarm_pool_timer_t *timer, uint hardware_alarm_num, void (*irq_handler)(void));
2525
void ta_hardware_alarm_claim(alarm_pool_timer_t *timer, uint hardware_alarm_num);

src/host/pico_time_adapter/time_adapter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void PICO_WEAK_FUNCTION_IMPL_NAME(ta_set_timeout)(alarm_pool_timer_t *timer, uin
2828
panic_unsupported();
2929
}
3030
PICO_WEAK_FUNCTION_DEF(ta_wakes_up_on_or_before)
31-
void PICO_WEAK_FUNCTION_IMPL_NAME(ta_wakes_up_on_or_before)(alarm_pool_timer_t *timer, uint hardware_alarm_num, int64_t target) {
31+
bool PICO_WEAK_FUNCTION_IMPL_NAME(ta_wakes_up_on_or_before)(alarm_pool_timer_t *timer, uint hardware_alarm_num, int64_t target) {
3232
panic_unsupported();
3333
}
3434
PICO_WEAK_FUNCTION_DEF(ta_enable_irq_handler)

src/rp2_common/hardware_flash/flash.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,9 @@ void flash_devinfo_set_cs_size(uint cs, flash_devinfo_size_t size) {
335335
invalid_params_if(HARDWARE_FLASH, cs > 1);
336336
invalid_params_if(HARDWARE_FLASH, (uint)size > (uint)FLASH_DEVINFO_SIZE_MAX);
337337
uint cs_shift = cs == 0u ? OTP_DATA_FLASH_DEVINFO_CS0_SIZE_LSB : OTP_DATA_FLASH_DEVINFO_CS1_SIZE_LSB;
338-
uint cs_mask = OTP_DATA_FLASH_DEVINFO_CS0_SIZE_BITS >> OTP_DATA_FLASH_DEVINFO_CS0_SIZE_LSB;
338+
uint16_t cs_mask = OTP_DATA_FLASH_DEVINFO_CS0_SIZE_BITS >> OTP_DATA_FLASH_DEVINFO_CS0_SIZE_LSB;
339339
flash_devinfo_update_field(
340-
(uint)size << cs_shift,
340+
(uint16_t)size << cs_shift,
341341
cs_mask << cs_shift
342342
);
343343
}
@@ -364,7 +364,7 @@ void flash_devinfo_set_cs_gpio(uint cs, uint gpio) {
364364
invalid_params_if(HARDWARE_FLASH, gpio >= NUM_BANK0_GPIOS);
365365
(void)cs;
366366
flash_devinfo_update_field(
367-
gpio << OTP_DATA_FLASH_DEVINFO_CS1_GPIO_LSB,
367+
((uint16_t)gpio) << OTP_DATA_FLASH_DEVINFO_CS1_GPIO_LSB,
368368
OTP_DATA_FLASH_DEVINFO_CS1_GPIO_BITS
369369
);
370370
}

src/rp2_common/hardware_pio/pio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ void pio_sm_set_pins_with_mask64(PIO pio, uint sm, uint64_t pin_values, uint64_t
292292
pin_values >>= pio_get_gpio_base(pio);
293293
pin_mask >>= pio_get_gpio_base(pio);
294294
#endif
295-
pio_sm_set_pins_with_mask_internal(pio, sm, pin_values, pin_mask);
295+
pio_sm_set_pins_with_mask_internal(pio, sm, (uint32_t)pin_values, (uint32_t)pin_mask);
296296
}
297297

298298
void pio_sm_set_pindirs_with_mask_internal(PIO pio, uint sm, uint32_t pindirs, uint32_t pin_mask) {

src/rp2_common/pico_bootrom/bootrom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void __attribute__((noreturn)) rom_reset_usb_boot_extra(int usb_activity_gpio_pi
7676
flags |= BOOTSEL_FLAG_GPIO_PIN_ACTIVE_LOW;
7777
}
7878
}
79-
rom_reboot(REBOOT2_FLAG_REBOOT_TYPE_BOOTSEL | REBOOT2_FLAG_NO_RETURN_ON_SUCCESS, 10, flags, usb_activity_gpio_pin);
79+
rom_reboot(REBOOT2_FLAG_REBOOT_TYPE_BOOTSEL | REBOOT2_FLAG_NO_RETURN_ON_SUCCESS, 10, flags, (uint)usb_activity_gpio_pin);
8080
__builtin_unreachable();
8181
#else
8282
panic_unsupported();

0 commit comments

Comments
 (0)