Fix other BLE builds

Author: tannewt

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

@@ -37,6 +37,9 @@ bool vm_used_ble;
 //     }
 // }
 
+void common_hal_bleio_init(void) {
+}
+
 void bleio_user_reset() {
     // HCI doesn't support the BLE workflow so just do a full reset.
     bleio_reset();

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

@@ -74,6 +74,9 @@ void check_sec_status(uint8_t sec_status) {
     }
 }
 
+void common_hal_bleio_init(void) {
+}
+
 void bleio_user_reset() {
     // Stop any user scanning or advertising.
     common_hal_bleio_adapter_stop_scan(&common_hal_bleio_adapter_obj);

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

@@ -145,7 +145,7 @@ void _common_hal_bleio_packet_buffer_construct(
     uint32_t *outgoing_buffer1,
     uint32_t *outgoing_buffer2,
     size_t max_packet_size,
-    void *static_handler_entry) {
+    ble_event_handler_t static_handler_entry) {
 
     bleio_characteristic_properties_t temp_prop;
     self->characteristic = characteristic;

ports/silabs/common-hal/_bleio/PacketBuffer.h

@@ -57,6 +57,9 @@ typedef struct {
     uint8_t len;
 } bleio_packet_buffer_obj_list_t;
 
+// Unused
+typedef void *ble_event_handler_t;
+
 extern bool packet_buffer_on_ble_evt(uint16_t attribute,
     uint8_t *data,
     uint16_t len);

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

@@ -51,6 +51,9 @@ const osMutexAttr_t bluetooth_connection_mutex_attr = {
     .cb_size = osMutexCbSize
 };
 
+void common_hal_bleio_init(void) {
+}
+
 void bleio_user_reset() {
     // Stop any user scanning or advertising.
     common_hal_bleio_adapter_stop_scan(&common_hal_bleio_adapter_obj);

shared-bindings/_bleio/PacketBuffer.h

@@ -20,12 +20,14 @@ extern const mp_obj_type_t bleio_packet_buffer_type;
 void common_hal_bleio_packet_buffer_construct(
     bleio_packet_buffer_obj_t *self, bleio_characteristic_obj_t *characteristic,
     size_t buffer_size, size_t max_packet_size);
-// Allocation free
+// Allocation free version for BLE workflow use.
+#if CIRCUITPY_SERIAL_BLE || CIRCUITPY_BLE_FILE_SERVICE
 void _common_hal_bleio_packet_buffer_construct(
     bleio_packet_buffer_obj_t *self, bleio_characteristic_obj_t *characteristic,
     uint32_t *incoming_buffer, size_t incoming_buffer_size,
     uint32_t *outgoing_buffer1, uint32_t *outgoing_buffer2, size_t outgoing_buffer_size,
     ble_event_handler_t *static_handler_entry);
+#endif
 mp_int_t common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, const uint8_t *data, size_t len, uint8_t *header, size_t header_len);
 mp_int_t common_hal_bleio_packet_buffer_readinto(bleio_packet_buffer_obj_t *self, uint8_t *data, size_t len);
 mp_int_t common_hal_bleio_packet_buffer_get_incoming_packet_length(bleio_packet_buffer_obj_t *self);

supervisor/shared/bluetooth/serial.c

@@ -36,6 +36,9 @@ const uint8_t circuitpython_base_uuid[16] = {0x6e, 0x68, 0x74, 0x79, 0x50, 0x74,
 static mp_obj_list_t characteristic_list;
 static mp_obj_t characteristic_list_items[3];
 
+#if BLEIO_PACKET_BUFFER_MAX_PACKET_SIZE % 4 != 0
+#error "BLEIO_PACKET_BUFFER_MAX_PACKET_SIZE must be a multiple of 4"
+#endif
 static uint32_t _outgoing1[BLEIO_PACKET_BUFFER_MAX_PACKET_SIZE / 4];
 static uint32_t _outgoing2[BLEIO_PACKET_BUFFER_MAX_PACKET_SIZE / 4];
 static ble_event_handler_t rx_static_handler_entry;