Additional missing-prototypes fixes

I think this correctly enables missing-prototypes in atmel-samd
and raspberrypi ports.

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

@@ -857,20 +857,6 @@ 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[]) {
-    struct __packed req {
-        struct bt_att_hdr h;
-        struct bt_att_find_info_req r;
-    } req = { {
-                  .code = BT_ATT_OP_FIND_INFO_REQ,
-              }, {
-                  .start_handle = start_handle,
-                  .end_handle = end_handle,
-              }};
-
-    return send_req_wait_for_rsp(conn_handle, sizeof(req), (uint8_t *)&req, response_buffer);
-}
-
 STATIC void process_find_info_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) {
     if (dlen < 2) {
         return; // invalid, drop
@@ -925,7 +911,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,25 +995,6 @@ 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[]) {
-
-    typedef struct __packed {
-        struct bt_att_hdr h;
-        struct bt_att_read_group_req r;
-    } req_t;
-
-    uint8_t req_bytes[sizeof(req_t) + sizeof(uuid)];
-    req_t *req = (req_t *)req_bytes;
-
-    req->h.code = BT_ATT_OP_READ_GROUP_REQ;
-    req->r.start_handle = start_handle;
-    req->r.end_handle = end_handle;
-    req->r.uuid[0] = uuid & 0xff;
-    req->r.uuid[1] = uuid >> 8;
-
-    return send_req_wait_for_rsp(conn_handle, sizeof(req_bytes), req_bytes, response_buffer);
-}
-
 STATIC void process_read_group_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) {
     if (dlen < 2) {
         return; // invalid, drop
@@ -1305,24 +1272,6 @@ 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[]) {
-    typedef struct __packed {
-        struct bt_att_hdr h;
-        struct bt_att_read_type_req r;
-    } req_t;
-
-    uint8_t req_bytes[sizeof(req_t) + sizeof(type)];
-    req_t *req = (req_t *)req_bytes;
-
-    req->h.code = BT_ATT_OP_READ_TYPE_REQ;
-    req->r.start_handle = start_handle;
-    req->r.end_handle = end_handle;
-    req->r.uuid[0] = type & 0xff;
-    req->r.uuid[1] = type >> 8;
-
-    return send_req_wait_for_rsp(conn_handle, sizeof(req_bytes), req_bytes, response_buffer);
-}
-
 STATIC void process_read_type_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) {
     if (dlen < 1) {
         return; // invalid, drop
@@ -1713,77 +1662,3 @@ void att_process_data(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) {
             break;
     }
 }
-
-// FIX Do we need all of these?
-void check_att_err(uint8_t err) {
-    const compressed_string_t *msg = NULL;
-    switch (err) {
-        case 0:
-            return;
-        case BT_ATT_ERR_INVALID_HANDLE:
-            msg = translate("Invalid handle");
-            break;
-        case BT_ATT_ERR_READ_NOT_PERMITTED:
-            msg = translate("Read not permitted");
-            break;
-        case BT_ATT_ERR_WRITE_NOT_PERMITTED:
-            msg = translate("Write not permitted");
-            break;
-        case BT_ATT_ERR_INVALID_PDU:
-            msg = translate("Invalid PDU");
-            break;
-        case BT_ATT_ERR_NOT_SUPPORTED:
-            msg = translate("Not supported");
-            break;
-        case BT_ATT_ERR_INVALID_OFFSET:
-            msg = translate("Invalid offset");
-            break;
-        case BT_ATT_ERR_PREPARE_QUEUE_FULL:
-            msg = translate("Prepare queue full");
-            break;
-        case BT_ATT_ERR_ATTRIBUTE_NOT_FOUND:
-            msg = translate("Attribute not found");
-            break;
-        case BT_ATT_ERR_ATTRIBUTE_NOT_LONG:
-            msg = translate("Attribute not long");
-            break;
-        case BT_ATT_ERR_ENCRYPTION_KEY_SIZE:
-            msg = translate("Encryption key size");
-            break;
-        case BT_ATT_ERR_INVALID_ATTRIBUTE_LEN:
-            msg = translate("Invalid attribute length");
-            break;
-        case BT_ATT_ERR_UNLIKELY:
-            msg = translate("Unlikely");
-            break;
-        case BT_ATT_ERR_UNSUPPORTED_GROUP_TYPE:
-            msg = translate("Unsupported group type");
-            break;
-        case BT_ATT_ERR_INSUFFICIENT_RESOURCES:
-            msg = translate("Insufficient resources");
-            break;
-        case BT_ATT_ERR_DB_OUT_OF_SYNC:
-            msg = translate("DB out of sync");
-            break;
-        case BT_ATT_ERR_VALUE_NOT_ALLOWED:
-            msg = translate("Value not allowed");
-            break;
-    }
-    if (msg) {
-        mp_raise_bleio_BluetoothError(msg);
-    }
-
-    switch (err) {
-        case BT_ATT_ERR_AUTHENTICATION:
-            msg = translate("Insufficient authentication");
-            break;
-        case BT_ATT_ERR_INSUFFICIENT_ENCRYPTION:
-            msg = translate("Insufficient encryption");
-            break;
-    }
-    if (msg) {
-        mp_raise_bleio_SecurityError(msg);
-    }
-
-    mp_raise_bleio_BluetoothError(translate("Unknown ATT error: 0x%02x"), err);
-}

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 \

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/countio/Counter.c

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

ports/atmel-samd/common-hal/microcontroller/Processor.c

@@ -65,6 +65,7 @@
 
 #include "py/mphal.h"
 #include "common-hal/microcontroller/Processor.h"
+#include "shared-bindings/microcontroller/Processor.h"
 #include "shared-bindings/microcontroller/ResetReason.h"
 
 #include "samd/adc.h"

ports/atmel-samd/common-hal/nvm/ByteArray.c

@@ -25,6 +25,7 @@
  */
 
 #include "common-hal/nvm/ByteArray.h"
+#include "shared-bindings/nvm/ByteArray.h"
 
 #include "hal_flash.h"
 
@@ -33,11 +34,11 @@
 #include <stdint.h>
 #include <string.h>
 
-uint32_t common_hal_nvm_bytearray_get_length(nvm_bytearray_obj_t *self) {
+uint32_t common_hal_nvm_bytearray_get_length(const nvm_bytearray_obj_t *self) {
     return self->len;
 }
 
-bool common_hal_nvm_bytearray_set_bytes(nvm_bytearray_obj_t *self,
+bool common_hal_nvm_bytearray_set_bytes(const nvm_bytearray_obj_t *self,
     uint32_t start_index, uint8_t *values, uint32_t len) {
     // We don't use features that use any advanced NVMCTRL features so we can fake the descriptor
     // whenever we need it instead of storing it long term.
@@ -49,7 +50,7 @@ bool common_hal_nvm_bytearray_set_bytes(nvm_bytearray_obj_t *self,
 }
 
 // NVM memory is memory mapped so reading it is easy.
-void common_hal_nvm_bytearray_get_bytes(nvm_bytearray_obj_t *self,
+void common_hal_nvm_bytearray_get_bytes(const nvm_bytearray_obj_t *self,
     uint32_t start_index, uint32_t len, uint8_t *values) {
     memcpy(values, self->start_address + start_index, len);
 }

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

@@ -30,6 +30,8 @@
 #include "py/objtuple.h"
 #include "py/qstr.h"
 
+#include "shared-bindings/os/__init__.h"
+
 #ifdef SAM_D5X_E5X
 #include "hal/include/hal_rand_sync.h"
 #endif
@@ -66,7 +68,7 @@ mp_obj_t common_hal_os_uname(void) {
     return (mp_obj_t)&os_uname_info_obj;
 }
 
-bool common_hal_os_urandom(uint8_t *buffer, uint32_t length) {
+bool common_hal_os_urandom(uint8_t *buffer, mp_uint_t length) {
     #ifdef SAM_D5X_E5X
     hri_mclk_set_APBCMASK_TRNG_bit(MCLK);
     struct rand_sync_desc random;

ports/atmel-samd/common-hal/ps2io/Ps2.c

@@ -26,6 +26,7 @@
  */
 
 #include "common-hal/ps2io/Ps2.h"
+#include "shared-bindings/ps2io/Ps2.h"
 
 #include <stdint.h>
 
@@ -302,11 +303,6 @@ uint16_t common_hal_ps2io_ps2_get_len(ps2io_ps2_obj_t *self) {
     return self->bufcount;
 }
 
-bool common_hal_ps2io_ps2_get_paused(ps2io_ps2_obj_t *self) {
-    uint32_t mask = 1 << self->channel;
-    return (EIC->INTENSET.reg & (mask << EIC_INTENSET_EXTINT_Pos)) == 0;
-}
-
 int16_t common_hal_ps2io_ps2_popleft(ps2io_ps2_obj_t *self) {
     common_hal_mcu_disable_interrupts();
     if (self->bufcount <= 0) {

ports/atmel-samd/common-hal/pulseio/PulseOut.c

@@ -59,7 +59,7 @@ static void turn_off(__IO PORT_PINCFG_Type *pincfg) {
     pincfg->reg = PORT_PINCFG_RESETVALUE;
 }
 
-void pulse_finish(void) {
+STATIC void pulse_finish(void) {
     pulse_index++;
 
     if (active_pincfg == NULL) {

ports/atmel-samd/common-hal/pwmio/PWMOut.c

@@ -91,7 +91,7 @@ static uint8_t tcc_channel(const pin_timer_t *t) {
     return t->wave_output % tcc_cc_num[t->index];
 }
 
-bool channel_ok(const pin_timer_t *t) {
+STATIC bool channel_ok(const pin_timer_t *t) {
     uint8_t channel_bit = 1 << tcc_channel(t);
     return (!t->is_tc && ((tcc_channels[t->index] & channel_bit) == 0)) ||
            t->is_tc;

ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c

@@ -25,6 +25,7 @@
  */
 
 #include "common-hal/rotaryio/IncrementalEncoder.h"
+#include "shared-bindings/rotaryio/IncrementalEncoder.h"
 #include "shared-module/rotaryio/IncrementalEncoder.h"
 
 #include "atmel_start_pins.h"

ports/atmel-samd/common-hal/rtc/RTC.c

@@ -35,6 +35,7 @@
 #include "py/runtime.h"
 #include "shared/timeutils/timeutils.h"
 #include "shared-bindings/rtc/__init__.h"
+#include "shared-bindings/rtc/RTC.h"
 #include "supervisor/port.h"
 #include "supervisor/shared/translate.h"
 

ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c

@@ -50,7 +50,7 @@ mp_float_t common_hal_watchdog_get_timeout(watchdog_watchdogtimer_obj_t *self) {
     return self->timeout;
 }
 
-void setup_wdt(watchdog_watchdogtimer_obj_t *self, int setting) {
+STATIC void setup_wdt(watchdog_watchdogtimer_obj_t *self, int setting) {
     OSC32KCTRL->OSCULP32K.bit.EN1K = 1;  // Enable out 1K (for WDT)
 
     // disable watchdog for config

ports/raspberrypi/Makefile

@@ -132,7 +132,7 @@ endif
 # Remove -Wno-stringop-overflow after we can test with CI's GCC 10. Mac's looks weird.
 DISABLE_WARNINGS = -Wno-stringop-overflow -Wno-unused-function -Wno-unused-variable -Wno-strict-overflow -Wno-cast-align -Wno-strict-prototypes -Wno-nested-externs -Wno-double-promotion -Wno-sign-compare
 
-CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS)
+CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) $(DISABLE_WARNINGS) -Werror=missing-prototypes
 
 CFLAGS += \
   -march=armv6-m \

ports/raspberrypi/bindings/rp2pio/StateMachine.c

@@ -617,7 +617,7 @@ const mp_obj_type_t rp2pio_statemachine_type = {
     .locals_dict = (mp_obj_dict_t *)&rp2pio_statemachine_locals_dict,
 };
 
-rp2pio_statemachine_obj_t *validate_obj_is_statemachine(mp_obj_t obj) {
+static rp2pio_statemachine_obj_t *validate_obj_is_statemachine(mp_obj_t obj) {
     if (!mp_obj_is_type(obj, &rp2pio_statemachine_type)) {
         mp_raise_TypeError_varg(translate("Expected a %q"), rp2pio_statemachine_type.name);
     }

ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c

@@ -31,6 +31,7 @@
 #include "shared-bindings/busio/SPI.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "supervisor/board.h"
 #include "supervisor/shared/board.h"
 
 displayio_fourwire_obj_t board_display_obj;

ports/raspberrypi/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"
 
 void alarm_sleep_memory_reset(void) {
 }

ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c

@@ -42,7 +42,7 @@ STATIC bool _pinalarm_set = false;
 
 #define GPIO_IRQ_ALL_EVENTS 0x15u
 
-void gpio_callback(uint gpio, uint32_t events) {
+STATIC void gpio_callback(uint gpio, uint32_t events) {
     alarm_triggered_pins |= (1 << gpio);
     woke_up = true;
 

ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c

@@ -37,7 +37,7 @@
 STATIC bool woke_up = false;
 STATIC bool _timealarm_set = false;
 
-void timer_callback(void) {
+STATIC void timer_callback(void) {
     woke_up = true;
 }
 

ports/raspberrypi/common-hal/analogio/AnalogIn.c

@@ -25,6 +25,7 @@
  */
 
 #include "common-hal/analogio/AnalogIn.h"
+#include "shared-bindings/analogio/AnalogIn.h"
 #include "py/runtime.h"
 #include "supervisor/shared/translate.h"