Skip to content

Commit afc1c0e

Browse files
committed
Fix unused variable diagnostics, make it a fatal error
1 parent 37620d4 commit afc1c0e

File tree

8 files changed

+7
-18
lines changed

8 files changed

+7
-18
lines changed

ports/raspberrypi/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ else
198198
endif
199199

200200
# Remove -Wno-stringop-overflow after we can test with CI's GCC 10. Mac's looks weird.
201-
DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-unused-variable -Wno-strict-overflow -Wno-cast-align
201+
DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-strict-overflow -Wno-cast-align
202202

203203
CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=missing-prototypes
204204

@@ -256,7 +256,7 @@ SRC_SDK := \
256256
$(SRC_SDK_CYW43) \
257257

258258
SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
259-
$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function -Wno-nested-externs -Wno-strict-prototypes -Wno-double-promotion -Wno-sign-compare
259+
$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK) $(SRC_CYW43)): CFLAGS += -Wno-missing-prototypes -Wno-undef -Wno-unused-function -Wno-nested-externs -Wno-strict-prototypes -Wno-double-promotion -Wno-sign-compare -Wno-unused-variable
260260

261261
SRC_C += \
262262
boards/$(BOARD)/board.c \

ports/raspberrypi/bindings/rp2pio/StateMachine.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,10 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n
259259
bufinfo.buf, bufinfo.len / 2,
260260
args[ARG_frequency].u_int,
261261
init_bufinfo.buf, init_bufinfo.len / 2,
262-
first_out_pin, args[ARG_out_pin_count].u_int, args[ARG_initial_out_pin_state].u_int, args[ARG_initial_out_pin_direction].u_int,
263-
first_in_pin, args[ARG_in_pin_count].u_int, args[ARG_pull_in_pin_up].u_int, args[ARG_pull_in_pin_down].u_int,
264-
first_set_pin, args[ARG_set_pin_count].u_int, args[ARG_initial_set_pin_state].u_int, args[ARG_initial_set_pin_direction].u_int,
265-
first_sideset_pin, args[ARG_sideset_pin_count].u_int, args[ARG_initial_sideset_pin_state].u_int, args[ARG_initial_sideset_pin_direction].u_int,
262+
first_out_pin, out_pin_count, args[ARG_initial_out_pin_state].u_int, args[ARG_initial_out_pin_direction].u_int,
263+
first_in_pin, in_pin_count, args[ARG_pull_in_pin_up].u_int, args[ARG_pull_in_pin_down].u_int,
264+
first_set_pin, set_pin_count, args[ARG_initial_set_pin_state].u_int, args[ARG_initial_set_pin_direction].u_int,
265+
first_sideset_pin, sideset_pin_count, args[ARG_initial_sideset_pin_state].u_int, args[ARG_initial_sideset_pin_direction].u_int,
266266
args[ARG_sideset_enable].u_bool,
267267
jmp_pin, jmp_pin_pull,
268268
0,
@@ -397,7 +397,6 @@ STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_arg
397397
return mp_const_none;
398398
}
399399

400-
uint8_t *original_pointer = bufinfo.buf;
401400
int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
402401
if (stride_in_bytes > 4) {
403402
mp_raise_ValueError(translate("Buffer elements must be 4 bytes long or less"));
@@ -606,7 +605,6 @@ STATIC mp_obj_t rp2pio_statemachine_readinto(size_t n_args, const mp_obj_t *pos_
606605
return mp_const_none;
607606
}
608607

609-
uint8_t *original_pointer = bufinfo.buf;
610608
int stride_in_bytes = mp_binary_get_size('@', bufinfo.typecode, NULL);
611609
if (stride_in_bytes > 4) {
612610
mp_raise_ValueError(translate("Buffer elements must be 4 bytes long or less"));

ports/raspberrypi/common-hal/countio/Counter.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ void common_hal_countio_counter_construct(countio_counter_obj_t *self,
3131
mp_raise_RuntimeError(translate("PWM slice already in use"));
3232
}
3333

34-
uint8_t ab_channel = pwm_gpio_to_channel(self->pin);
3534
if (!pwmio_claim_slice_ab_channels(self->slice_num)) {
3635
mp_raise_RuntimeError(translate("PWM slice channel A already in use"));
3736
}

ports/raspberrypi/common-hal/digitalio/DigitalInOut.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
158158
}
159159
}
160160
#endif
161-
const uint8_t pin = self->pin->number;
162161
bool value = common_hal_digitalio_digitalinout_get_value(self);
163162
self->open_drain = drive_mode == DRIVE_MODE_OPEN_DRAIN;
164163
// True is implemented differently between modes so reset the value to make

ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,6 @@ void common_hal_imagecapture_parallelimagecapture_construct(imagecapture_paralle
120120
true, 32, true, // in settings
121121
false, // Not user-interruptible.
122122
2, 5); // wrap settings
123-
124-
125-
PIO pio = self->state_machine.pio;
126-
uint8_t pio_index = pio_get_index(pio);
127-
uint sm = self->state_machine.state_machine;
128123
}
129124

130125
void common_hal_imagecapture_parallelimagecapture_deinit(imagecapture_parallelimagecapture_obj_t *self) {

ports/raspberrypi/common-hal/rp2pio/StateMachine.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ bool common_hal_rp2pio_statemachine_get_txstall(rp2pio_statemachine_obj_t *self)
871871
}
872872

873873
void common_hal_rp2pio_statemachine_clear_txstall(rp2pio_statemachine_obj_t *self) {
874-
uint8_t level = pio_sm_get_rx_fifo_level(self->pio, self->state_machine);
874+
(void)pio_sm_get_rx_fifo_level(self->pio, self->state_machine);
875875
uint32_t stall_mask = 1 << (PIO_FDEBUG_TXSTALL_LSB + self->state_machine);
876876
self->pio->fdebug = stall_mask;
877877
}

ports/raspberrypi/common-hal/socketpool/Socket.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,6 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o
829829

830830
bool common_hal_socketpool_socket_bind(socketpool_socket_obj_t *socket,
831831
const char *host, size_t hostlen, uint32_t port) {
832-
uint8_t ip[NETUTILS_IPV4ADDR_BUFSIZE];
833832

834833
// get address
835834
ip_addr_t bind_addr;

ports/raspberrypi/common-hal/wifi/__init__.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ void wifi_reset(void) {
8282
}
8383
// the cyw43 wifi chip is not reset due to https://github.com/raspberrypi/pico-sdk/issues/980
8484
common_hal_wifi_monitor_deinit(MP_STATE_VM(wifi_monitor_singleton));
85-
wifi_radio_obj_t *radio = &common_hal_wifi_radio_obj;
8685
common_hal_wifi_radio_obj.current_scan = NULL;
8786
// common_hal_wifi_radio_set_enabled(radio, false);
8887
supervisor_workflow_request_background();

0 commit comments

Comments
 (0)