Merge pull request #5563 from jepler/enable-error-missing-prototypes

Additional missing-prototypes fixes

Author: dhalbert

devices/ble_hci/common-hal/_bleio/CharacteristicBuffer.c

@@ -33,6 +33,7 @@
 
 #include "shared-bindings/_bleio/__init__.h"
 #include "shared-bindings/_bleio/Connection.h"
+#include "shared-bindings/_bleio/CharacteristicBuffer.h"
 #include "supervisor/shared/tick.h"
 #include "common-hal/_bleio/CharacteristicBuffer.h"
 

devices/ble_hci/common-hal/_bleio/Connection.h

@@ -85,5 +85,6 @@ typedef struct {
 uint16_t bleio_connection_get_conn_handle(bleio_connection_obj_t *self);
 mp_obj_t bleio_connection_new_from_internal(bleio_connection_internal_t *connection);
 bleio_connection_internal_t *bleio_conn_handle_to_connection(uint16_t conn_handle);
+void bleio_connection_clear(bleio_connection_internal_t *self);
 
 #endif // MICROPY_INCLUDED_BLE_HCI_COMMON_HAL_CONNECTION_H

devices/ble_hci/common-hal/_bleio/att.c

@@ -1,6 +1,12 @@
 // Derived from ArduinoBLE.
 // Copyright 2020 Dan Halbert for Adafruit Industries
 
+// Some functions here are unused now, but may be used in the future.
+// Don't warn or error about this, and depend on the compiler & linker to
+// eliminate the associated code.
+#pragma GCC diagnostic ignored "-Wunused"
+#pragma GCC diagnostic ignored "-Wunused-function"
+
 /*
   This file is part of the ArduinoBLE library.
   Copyright (c) 2018 Arduino SA. All rights reserved.
@@ -857,7 +863,7 @@ STATIC void process_find_info_req(uint16_t conn_handle, uint16_t mtu, uint8_t dl
     }
 }
 
-int att_find_info_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint8_t response_buffer[]) {
+static int att_find_info_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint8_t response_buffer[]) {
     struct __packed req {
         struct bt_att_hdr h;
         struct bt_att_find_info_req r;
@@ -925,7 +931,7 @@ STATIC void process_find_type_req(uint16_t conn_handle, uint16_t mtu, uint8_t dl
     }
 }
 
-void process_read_group_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) {
+static void process_read_group_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) {
     struct bt_att_read_group_req *req = (struct bt_att_read_group_req *)data;
     uint16_t type_uuid = req->uuid[0] | (req->uuid[1] << 8);
 
@@ -1009,7 +1015,7 @@ void process_read_group_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, ui
     }
 }
 
-int att_read_group_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint16_t uuid, uint8_t response_buffer[]) {
+static int att_read_group_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint16_t uuid, uint8_t response_buffer[]) {
 
     typedef struct __packed {
         struct bt_att_hdr h;
@@ -1305,7 +1311,7 @@ STATIC void process_read_type_req(uint16_t conn_handle, uint16_t mtu, uint8_t dl
     }
 }
 
-int att_read_type_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint16_t type, uint8_t response_buffer[]) {
+static int att_read_type_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint16_t type, uint8_t response_buffer[]) {
     typedef struct __packed {
         struct bt_att_hdr h;
         struct bt_att_read_type_req r;
@@ -1715,7 +1721,7 @@ void att_process_data(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) {
 }
 
 // FIX Do we need all of these?
-void check_att_err(uint8_t err) {
+static void check_att_err(uint8_t err) {
     const compressed_string_t *msg = NULL;
     switch (err) {
         case 0:

ports/atmel-samd/Makefile

@@ -291,7 +291,7 @@ $(BUILD)/asf4/$(CHIP_FAMILY)/hpl/sdhc/hpl_sdhc.o: CFLAGS += -Wno-cast-align -Wno
 endif
 
 SRC_ASF := $(addprefix asf4/$(CHIP_FAMILY)/, $(SRC_ASF))
-$(patsubst $(SRC_ASF),%.c,%.o): CFLAGS += -Wno-missing-prototypes
+$(patsubst %.c,$(BUILD)/%.o,$(SRC_ASF)): CFLAGS += -Wno-missing-prototypes
 
 SRC_PERIPHERALS := \
 	peripherals/samd/$(PERIPHERALS_CHIP_FAMILY)/adc.c \
@@ -310,7 +310,7 @@ SRC_PERIPHERALS := \
 	peripherals/samd/sercom.c \
 	peripherals/samd/timers.c \
 
-$(patsubst $(SRC_PERIPHERALS),%.c,%.o): CFLAGS += -Wno-missing-prototypes
+$(patsubst %.c,$(BUILD)/%.o,$(SRC_PERIPHERALS)): CFLAGS += -Wno-missing-prototypes
 
 SRC_C += \
 	audio_dma.c \
@@ -328,6 +328,8 @@ SRC_C += \
 	timer_handler.c \
 	$(SRC_PERIPHERALS) \
 
+$(BUILD)/lib/tinyusb/src/portable/microchip/samd/dcd_samd.o: CFLAGS += -Wno-missing-prototypes
+
 # This is an OR because it filters to any 1s and then checks to see if it is not
 # empty.
 ifneq (,$(filter 1,$(CIRCUITPY_PWMIO) $(CIRCUITPY_AUDIOIO) $(CIRCUITPY_RGBMATRIX)))

ports/atmel-samd/boards/pewpew_m4/board.c

@@ -50,7 +50,7 @@ typedef struct {
 
 #define DELAY 0x80
 
-uint32_t lookupCfg(uint32_t key, uint32_t defl) {
+STATIC uint32_t lookupCfg(uint32_t key, uint32_t defl) {
     const uint32_t *ptr = UF2_BINFO->config_data;
     if (!ptr || (((uint32_t)ptr) & 3) || *ptr != CFG_MAGIC0) {
         // no config data!

ports/atmel-samd/common-hal/alarm/SleepMemory.c

@@ -28,6 +28,7 @@
 
 #include "py/runtime.h"
 #include "common-hal/alarm/SleepMemory.h"
+#include "shared-bindings/alarm/SleepMemory.h"
 #include "shared-bindings/nvm/ByteArray.h"
 
 void alarm_sleep_memory_reset(void) {

ports/atmel-samd/common-hal/audiobusio/PDMIn.c

@@ -485,6 +485,3 @@ uint32_t common_hal_audiobusio_pdmin_record_to_buffer(audiobusio_pdmin_obj_t* se
 
     return values_output;
 }
-
-void common_hal_audiobusio_pdmin_record_to_file(audiobusio_pdmin_obj_t* self, uint8_t* buffer, uint32_t length) {
-}

ports/atmel-samd/common-hal/busio/__init__.c

@@ -25,6 +25,7 @@
  */
 
 #include "samd/sercom.h"
+#include "common-hal/busio/__init__.h"
 
 static bool never_reset_sercoms[SERCOM_INST_NUM];
 

ports/atmel-samd/common-hal/canio/Listener.c

@@ -195,7 +195,7 @@ STATIC void install_extended_filter(CanMramXidfe *extended, int id1, int id2, in
 
 
 #define NO_ID (-1)
-void set_filters(canio_listener_obj_t *self, size_t nmatch, canio_match_obj_t **matches) {
+STATIC void set_filters(canio_listener_obj_t *self, size_t nmatch, canio_match_obj_t **matches) {
     int fifo = self->fifo_idx;
 
     if (!nmatch) {

ports/atmel-samd/common-hal/countio/Counter.c

@@ -1,5 +1,6 @@
 
 #include "common-hal/countio/Counter.h"
+#include "shared-bindings/countio/Counter.h"
 
 #include "atmel_start_pins.h"