Skip to content

Commit 6f94f6a

Browse files
committed
Add -Wuninitialized -Wunused -Wcast-align to warnings checked by kitchen_sink (and fixup warnings) (earlephilhower#125)
1 parent a59fd52 commit 6f94f6a

File tree

15 files changed

+32
-31
lines changed

15 files changed

+32
-31
lines changed

src/common/pico_time/time.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,9 @@ static void alarm_pool_dump_key(pheap_node_id_t id, void *user_data) {
253253
#endif
254254
}
255255

256-
static int64_t repeating_timer_callback(alarm_id_t id, void *user_data) {
256+
static int64_t repeating_timer_callback(__unused alarm_id_t id, __unused void *user_data) {
257257
repeating_timer_t *rt = (repeating_timer_t *)user_data;
258+
assert(rt->alarm_id == id);
258259
if (rt->callback(rt)) {
259260
return rt->delay_us;
260261
} else {
@@ -289,7 +290,7 @@ void alarm_pool_dump(alarm_pool_t *pool) {
289290
}
290291

291292
#if !PICO_TIME_DEFAULT_ALARM_POOL_DISABLED
292-
static int64_t sev_callback(alarm_id_t id, void *user_data) {
293+
static int64_t sev_callback(__unused alarm_id_t id, __unused void *user_data) {
293294
__sev();
294295
return 0;
295296
}

src/rp2_common/hardware_dma/include/hardware/dma.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ extern "C" {
4242
#define PARAM_ASSERTIONS_ENABLED_DMA 0
4343
#endif
4444

45-
static inline void check_dma_channel_param(uint channel) {
45+
static inline void check_dma_channel_param(__unused uint channel) {
4646
#if PARAM_ASSERTIONS_ENABLED(DMA)
4747
// this method is used a lot by inline functions so avoid code bloat by deferring to function
4848
extern void check_dma_channel_param_impl(uint channel);

src/rp2_common/hardware_flash/flash.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ static_assert(FLASH_UNIQUE_ID_SIZE_BYTES == FLASH_RUID_DATA_BYTES, "");
169169

170170
void flash_get_unique_id(uint8_t *id_out) {
171171
#if PICO_NO_FLASH
172+
__unused uint8_t *ignore = id_out;
172173
panic_unsupported();
173174
#else
174175
uint8_t txbuf[FLASH_RUID_TOTAL_BYTES] = {0};

src/rp2_common/hardware_irq/irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static void set_raw_irq_handler_and_unlock(uint num, irq_handler_t handler, uint
3434
spin_unlock(spin_lock_instance(PICO_SPINLOCK_ID_IRQ), save);
3535
}
3636

37-
static inline void check_irq_param(uint num) {
37+
static inline void check_irq_param(__unused uint num) {
3838
invalid_params_if(IRQ, num >= NUM_IRQS);
3939
}
4040

src/rp2_common/hardware_pio/include/hardware/pio.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ typedef struct {
104104
uint32_t pinctrl;
105105
} pio_sm_config;
106106

107-
static inline void check_sm_param(uint sm) {
107+
static inline void check_sm_param(__unused uint sm) {
108108
valid_params_if(PIO, sm < NUM_PIO_STATE_MACHINES);
109109
}
110110

src/rp2_common/hardware_pio/pio.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@ int pio_claim_unused_sm(PIO pio, bool required) {
5050
return index >= base ? index - base : -1;
5151
}
5252

53-
void pio_load_program(PIO pio, const uint16_t *prog, uint8_t prog_len, uint8_t load_offset) {
54-
// instructions are only 16 bits, but instruction memory locations are spaced 32 bits apart
55-
// Adjust the addresses of any jump instructions to respect load offset
56-
assert(load_offset + prog_len <= PIO_INSTRUCTION_COUNT);
57-
58-
}
59-
6053
static_assert(PIO_INSTRUCTION_COUNT <= 32, "");
6154
static uint32_t _used_instruction_space[2];
6255

src/rp2_common/hardware_spi/include/hardware/spi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ static inline spi_hw_t *spi_get_hw(spi_inst_t *spi) {
136136
* \param cpha SSPCLKOUT phase, applicable to Motorola SPI frame format only
137137
* \param order Must be SPI_MSB_FIRST, no other values supported on the PL022
138138
*/
139-
static inline void spi_set_format(spi_inst_t *spi, uint data_bits, spi_cpol_t cpol, spi_cpha_t cpha, spi_order_t order) {
139+
static inline void spi_set_format(spi_inst_t *spi, uint data_bits, spi_cpol_t cpol, spi_cpha_t cpha, __unused spi_order_t order) {
140140
invalid_params_if(SPI, data_bits < 4 || data_bits > 16);
141141
// LSB-first not supported on PL022:
142142
invalid_params_if(SPI, order != SPI_MSB_FIRST);

src/rp2_common/hardware_timer/include/hardware/timer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ extern "C" {
5050
#define PARAM_ASSERTIONS_ENABLED_TIMER 0
5151
#endif
5252

53-
static inline void check_hardware_alarm_num_param(uint alarm_num) {
53+
static inline void check_hardware_alarm_num_param(__unused uint alarm_num) {
5454
invalid_params_if(TIMER, alarm_num >= NUM_TIMERS);
5555
}
5656

src/rp2_common/pico_fix/rp2040_usb_device_enumeration/rp2040_usb_device_enumeration.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static inline uint8_t hw_line_state(void) {
3838
return (usb_hw->sie_status & USB_SIE_STATUS_LINE_STATE_BITS) >> USB_SIE_STATUS_LINE_STATE_LSB;
3939
}
4040

41-
int64_t hw_enumeration_fix_wait_se0_callback(alarm_id_t id, void *user_data) {
41+
int64_t hw_enumeration_fix_wait_se0_callback(__unused alarm_id_t id, __unused void *user_data) {
4242
if (hw_line_state() == LS_SE0) {
4343
// Come back in 1ms and check again
4444
return 1000;
@@ -71,7 +71,7 @@ static void hw_enumeration_fix_wait_se0(void) {
7171
hw_enumeration_fix_busy_wait_se0();
7272
}
7373

74-
int64_t hw_enumeration_fix_force_ls_j_done(alarm_id_t id, void *user_data) {
74+
int64_t hw_enumeration_fix_force_ls_j_done(__unused alarm_id_t id, __unused void *user_data) {
7575
hw_enumeration_fix_finish();
7676
return 0;
7777
}

src/rp2_common/pico_malloc/pico_malloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ extern void __real_free(void *mem);
1919

2020
extern char __StackLimit; /* Set by linker. */
2121

22-
static inline void check_alloc(void *mem, uint8_t size) {
22+
static inline void check_alloc(__unused void *mem, __unused uint8_t size) {
2323
#if PICO_MALLOC_PANIC
2424
if (!mem || (((char *)mem) + size) > &__StackLimit) {
2525
panic("Out of memory");

0 commit comments

Comments
 (0)