Skip to content

Commit 7d8d9e7

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents f65029e + 2effd12 commit 7d8d9e7

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ void _common_hal_bleio_packet_buffer_construct(
145145
uint32_t *outgoing_buffer1,
146146
uint32_t *outgoing_buffer2,
147147
size_t max_packet_size,
148-
ble_event_handler_t static_handler_entry) {
148+
ble_event_handler_t *static_handler_entry) {
149149

150150
bleio_characteristic_properties_t temp_prop;
151151
self->characteristic = characteristic;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
6060
}
6161
}
6262

63+
// CHIP_Reset does not return, but is not declared as such in the SDK.
64+
void __attribute__ ((noreturn)) CHIP_Reset(void);
65+
6366
void common_hal_mcu_reset(void) {
6467
filesystem_flush(); // TODO: implement as part of flash improvements
6568
CHIP_Reset();

shared-bindings/_bleio/PacketBuffer.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ void common_hal_bleio_packet_buffer_construct(
2121
bleio_packet_buffer_obj_t *self, bleio_characteristic_obj_t *characteristic,
2222
size_t buffer_size, size_t max_packet_size);
2323
// Allocation free version for BLE workflow use.
24-
#if CIRCUITPY_SERIAL_BLE || CIRCUITPY_BLE_FILE_SERVICE
2524
void _common_hal_bleio_packet_buffer_construct(
2625
bleio_packet_buffer_obj_t *self, bleio_characteristic_obj_t *characteristic,
2726
uint32_t *incoming_buffer, size_t incoming_buffer_size,
2827
uint32_t *outgoing_buffer1, uint32_t *outgoing_buffer2, size_t max_packet_size,
2928
ble_event_handler_t *static_handler_entry);
30-
#endif
3129
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);
3230
mp_int_t common_hal_bleio_packet_buffer_readinto(bleio_packet_buffer_obj_t *self, uint8_t *data, size_t len);
3331
mp_int_t common_hal_bleio_packet_buffer_get_incoming_packet_length(bleio_packet_buffer_obj_t *self);

0 commit comments

Comments
 (0)