8000 Merge pull request #10377 from jepler/old-style-definition-more-ports · adafruit/circuitpython@116b29b · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 116b29b

Browse files
eightycceightycc
authored
Merge pull request #10377 from jepler/old-style-definition-more-ports
Enable -Werror=old-style-definition against more ports
2 parents 86fc1e1 + a4158a3 commit 116b29b

File tree

24 files changed

+32
-32
lines changed

24 files changed

+32
-32
lines changed

‎ports/broadcom/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ else
9595
endif
9696

9797

98-
CFLAGS += $(INC) -Wall -Werror -std=gnu11 $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS)
98+
CFLAGS += $(INC) -Wall -Werror -std=gnu11 $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=old-style-definition
9999

100100
$(BUILD)/lib/tlsf/tlsf.o: CFLAGS += -Wno-cast-align
101101

‎ports/cxd56/common-hal/camera/Camera.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static const image_size_t isx019_image_size_table[] = {
4444
{ VIDEO_HSIZE_QUADVGA, VIDEO_VSIZE_QUADVGA },
4545
};
4646

47-
static const char *get_imgsensor_name() {
47+
static const char *get_imgsensor_name(void) {
4848
static struct v4l2_capability cap;
4949

5050
ioctl(camera_dev.fd, VIDIOC_QUERYCAP, (unsigned long)&cap);
@@ -113,7 +113,7 @@ static void camera_start_streaming(enum v4l2_buf_type type) {
113113
ioctl(camera_dev.fd, VIDIOC_STREAMON, (unsigned long)&type);
114114
}
115115

116-
static void camera_start_preview() {
116+
static void camera_start_preview(void) {
117117
camera_set_format(V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_PIX_FMT_UYVY, VIDEO_HSIZE_QVGA, VIDEO_VSIZE_QVGA);
118118

119119
v4l2_buffer_t buf;

‎ports/espressif/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ endif
191191
# option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
192192
CFLAGS += $(OPTIMIZATION_FLAGS)
193193

194-
CFLAGS += $(INC) -Werror -Wall -std=gnu11 -Wl,--gc-sections $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT) -Werror=missing-prototypes
194+
CFLAGS += $(INC) -Werror -Wall -std=gnu11 -Wl,--gc-sections $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT) -Werror=missing-prototypes -Werror=old-style-definition
195195

196196
# Most current ESPs have nano versions of newlib in ROM so we use them.
197197
ifneq ($(IDF_TARGET),esp32c6)

‎ports/espressif/common-hal/_bleio/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static uint64_t _timeout_start_time;
3131

3232
background_callback_t bleio_background_callback;
3333

34-
void bleio_user_reset() {
34+
void bleio_user_reset(void) {
3535
// Stop any user scanning or advertising.
3636
common_hal_bleio_adapter_stop_scan(&common_hal_bleio_adapter_obj);
3737
common_hal_bleio_adapter_stop_advertising(&common_hal_bleio_adapter_obj);
@@ -43,7 +43,7 @@ void bleio_user_reset() {
4343
}
4444

4545
// Turn off BLE on a reset or reload.
46-
void bleio_reset() {
46+
void bleio_reset(void) {
4747
// Set this explicitly to save data.
4848
if (!common_hal_bleio_adapter_get_enabled(&common_hal_bleio_adapter_obj)) {
4949
return;

‎ports/espressif/common-hal/sdioio/SDCard.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ void common_hal_sdioio_sdcard_never_reset(sdioio_sdcard_obj_t *self) {
245245
}
246246
}
247247

248-
void sdioio_reset() {
248+
void sdioio_reset(void) {
249249
for (size_t i = 0; i < MP_ARRAY_SIZE(slot_in_use); i++) {
250250
if (!never_reset_sdio[i]) {
251251
slot_in_use[i] = false;

‎ports/espressif/supervisor/port.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,19 +461,19 @@ void port_disable_tick(void) {
461461
esp_timer_stop(_tick_timer);
462462
}
463463

464-
void port_wake_main_task() {
464+
void port_wake_main_task(void) {
465465
xTaskNotifyGive(circuitpython_task);
466466
}
467467

468-
void port_wake_main_task_from_isr() {
468+
void port_wake_main_task_from_isr(void) {
469469
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
470470
vTaskNotifyGiveFromISR(circuitpython_task, &xHigherPriorityTaskWoken);
471471
if (xHigherPriorityTaskWoken == pdTRUE) {
472472
portYIELD_FROM_ISR();
473473
}
474474
}
475475

476-
void port_yield() {
476+
void port_yield(void) {
477477
vTaskDelay(4);
478478
}
479479

‎ports/litex/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ endif
3838
# option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
3939
CFLAGS += $(OPTIMIZATION_FLAGS)
4040

41-
CFLAGS += $(INC) -Werror -Wall -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT) -Werror=missing-prototypes
41+
CFLAGS += $(INC) -Werror -Wall -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT) -Werror=missing-prototypes -Werror=old-style-definition
4242

4343
# TODO: check this
4444
CFLAGS += -D__START=main -DFOMU

‎ports/mimxrt10xx/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ifeq ($(DEBUG), 1)
4545
CFLAGS += -fno-ipa-sra
4646
endif
4747

48-
CFLAGS += $(INC) -ggdb -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) -Werror=missing-prototypes
48+
CFLAGS += $(INC) -ggdb -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) -Werror=missing-prototypes -Werror=old-style-definition
4949

5050
# TODO: add these when -Werror is applied
5151
# Disable some warnings, as do most ports. NXP SDK causes undef, tinyusb causes cast-align

‎ports/mimxrt10xx/common-hal/audiobusio/__init__.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,6 @@ void port_i2s_resume(i2s_t *self) {
439439
self->paused = false;
440440
}
441441

442-
void i2s_reset() {
442+
void i2s_reset(void) {
443443
// this port relies on object finalizers for reset
444444
}

‎ports/nordic/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ endif
4747
# option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
4848
CFLAGS += $(OPTIMIZATION_FLAGS)
4949

50-
CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) -Werror=missing-prototypes
50+
CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) -Werror=missing-prototypes -Werror=old-style-definition
5151

5252
# Nordic Softdevice SDK header files contains inline assembler that has
5353
# broken constraints. As a result the IPA-modref pass, introduced in gcc-11,

‎ports/nordic/common-hal/_bleio/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void check_sec_status(uint8_t sec_status) {
8080
void common_hal_bleio_init(void) {
8181
}
8282

83-
void bleio_user_reset() {
83+
void bleio_user_reset(void) {
8484
if (common_hal_bleio_adapter_get_enabled(&common_hal_bleio_adapter_obj)) {
8585
// Stop any user scanning or advertising.
8686
common_hal_bleio_adapter_stop_scan(&common_hal_bleio_adapter_obj);
@@ -94,7 +94,7 @@ void bleio_user_reset() {
9494
}
9595

9696
// Turn off BLE on a reset or reload.
97-
void bleio_reset() {
97+
void bleio_reset(void) {
9898
// Set this explicitly to save data.
9999
common_hal_bleio_adapter_obj.base.type = &bleio_adapter_type;
100100
if (!common_hal_bleio_adapter_get_enabled(&common_hal_bleio_adapter_obj)) {

‎ports/nordic/common-hal/audiopwmio/PWMAudioOut.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ static void audiopwmout_background_obj(audiopwmio_pwmaudioout_obj_t *self) {
136136
}
137137
}
138138

139-
void audiopwmout_background() {
139+
void audiopwmout_background(void) {
140140
// Check the NVIC first because it is part of the CPU and fast to read.
141141
if (!NVIC_GetPendingIRQ(PWM0_IRQn) &&
142142
!NVIC_GetPendingIRQ(PWM1_IRQn) &&

‎ports/nordic/common-hal/microcontroller/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void common_hal_mcu_delay_us(uint32_t delay) {
3535

3636
static volatile uint32_t nesting_count = 0;
3737
static uint8_t is_nested_critical_region;
38-
void common_hal_mcu_disable_interrupts() {
38+
void common_hal_mcu_disable_interrupts(void) {
3939
if (nesting_count == 0) {
4040
// Unlike __disable_irq(), this should only be called the first time
4141
// "is_nested_critical_region" is sd's equivalent of our nesting count
@@ -51,7 +51,7 @@ void common_hal_mcu_disable_interrupts() {
5151
nesting_count++;
5252
}
5353

54-
void common_hal_mcu_enable_interrupts() {
54+
void common_hal_mcu_enable_interrupts(void) {
5555
if (nesting_count == 0) {
5656
// This is very very bad because it means there was mismatched disable/enables.
5757
reset_into_safe_mode(SAFE_MODE_INTERRUPT_ERROR);

‎ports/renode/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ INC += \
2121
CFLAGS += -ggdb3 -Os
2222

2323
DISABLE_WARNINGS = -Wno-cast-align
24-
CFLAGS += $(INC) -Wall -Werror -std=gnu11 -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=missing-prototypes
24+
CFLAGS += $(INC) -Wall -Werror -std=gnu11 -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=missing-prototypes -Werror=old-style-definition
2525

2626
CFLAGS += \
2727
-march=armv6-m \

‎ports/renode/supervisor/port.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ __attribute__((used)) void HardFault_Handler(void) {
210210
}
211211
}
212212

213-
void port_yield() {
213+
void port_yield(void) {
214214
}
215215

216216
void port_boot_info(void) {

‎ports/silabs/boards/devkit_xg24_brd2601b/sensor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static mp_obj_t sensor_init(mp_obj_t i2c_in) {
7575
return mp_const_true;
7676
}
7777

78-
static mp_obj_t sensor_deinit() {
78+
static mp_obj_t sensor_deinit(void) {
7979

8080
sl_sensor_hall_deinit();
8181
sl_sensor_lux_deinit();

‎ports/silabs/common-hal/_bleio/CharacteristicBuffer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ bool common_hal_bleio_characteristic_buffer_connected(
156156
common_hal_bleio_connection_get_connected(self->characteristic->service->connection)));
157157
}
158158

159-
void reset_characteristic_buffer_list() {
159+
void reset_characteristic_buffer_list(void) {
160160
// Remove characteristic_buffer list
161161
memset(bleio_characteristic_buffer_list.data, 0,
162162
sizeof(bleio_characteristic_buffer_list.data));

‎ports/silabs/common-hal/_bleio/PacketBuffer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ void common_hal_bleio_packet_buffer_deinit(bleio_packet_buffer_obj_t *self) {
391391
}
392392

393393
// Remove packet_buffer list when reload
394-
void reset_packet_buffer_list() {
394+
void reset_packet_buffer_list(void) {
395395
// Remove packet_buffer list
396396
memset(bleio_packet_buffer_list.data, 0,
397397
sizeof(bleio_packet_buffer_list.data));

‎ports/silabs/common-hal/_bleio/Service.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ void common_hal_bleio_service_add_characteristic(bleio_service_obj_t *self,
230230
}
231231

232232
// Remove dynamic service when reload
233-
void reset_dynamic_service() {
233+
void reset_dynamic_service(void) {
234234

235235
uint16_t gattdb_session;
236236
uint8_t svc_index;

‎ports/silabs/common-hal/_bleio/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const osMutexAttr_t bluetooth_connection_mutex_attr = {
5454
void common_hal_bleio_init(void) {
5555
}
5656

57-
void bleio_user_reset() {
57+
void bleio_user_reset(void) {
5858
// Stop any user scanning or advertising.
5959
common_hal_bleio_adapter_stop_scan(&common_hal_bleio_adapter_obj);
6060
common_hal_bleio_adapter_stop_advertising(&common_hal_bleio_adapter_obj);
@@ -63,7 +63,7 @@ void bleio_user_reset() {
6363
supervisor_bluetooth_background();
6464
}
6565

66-
void bleio_reset() {
66+
void bleio_reset(void) {
6767
reset_dynamic_service();
6868
reset_packet_buffer_list();
6969
reset_characteristic_buffer_list();

‎ports/stm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ CFLAGS += -ftree-vrp
5151
# STM32 MCU series must be defined. See supervisor/linker.h
5252
C_DEFS = -D$(MCU_PACKAGE) -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER -D$(MCU_VARIANT) -DSTM32$(MCU_SERIES)
5353

54-
CFLAGS += $(INC) -Werror -Wall -std=gnu11 -fshort-enums $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT) -nostdlib -nostartfiles
54+
CFLAGS += $(INC) -Werror -Wall -std=gnu11 -fshort-enums $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT) -nostdlib -nostartfiles -Werror=old-style-definition
5555

5656
# Undo some warnings.
5757
# STM32 HAL uses undefined preprocessor variables, shadowed variables, casts that change alignment reqs

‎ports/stm/common-hal/sdioio/SDCard.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ void common_hal_sdioio_sdcard_never_reset(sdioio_sdcard_obj_t *self) {
338338
}
339339
}
340340

341-
void sdioio_reset() {
341+
void sdioio_reset(void) {
342342
for (size_t i = 0; i < MP_ARRAY_SIZE(reserved_sdio); i++) {
343343
if (!never_reset_sdio[i]) {
344344
reserved_sdio[i] = false;

‎ports/stm/supervisor/port.c

Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ void HAL_Delay(uint32_t delay_ms) {
285285
}
286286
}
287287

288-
uint32_t HAL_GetTick() {
288+
uint32_t HAL_GetTick(void) {
289289
if (SysTick->CTRL != 0) {
290290
return systick_ms;
291291
} else {
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,10 @@ size_t usb_vendor_descriptor_length(void) {
356356

357357
static uint8_t *ms_os_20_descriptor = NULL;
358358

359-
size_t vendor_ms_os_20_descriptor_length() {
359+
size_t vendor_ms_os_20_descriptor_length(void) {
360360
return ms_os_20_descriptor != NULL ? sizeof(ms_os_20_descriptor_template) : 0;
361361
}
362-
uint8_t const *vendor_ms_os_20_descriptor() {
362+
uint8_t const *vendor_ms_os_20_descriptor(void) {
363363
return ms_os_20_descriptor;
364364
}
365365