Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/silabs/common-hal/_bleio/PacketBuffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ void _common_hal_bleio_packet_buffer_construct(
uint32_t *outgoing_buffer1,
uint32_t *outgoing_buffer2,
size_t max_packet_size,
ble_event_handler_t static_handler_entry) {
ble_event_handler_t *static_handler_entry) {

bleio_characteristic_properties_t temp_prop;
self->characteristic = characteristic;
Expand Down
3 changes: 3 additions & 0 deletions ports/silabs/common-hal/microcontroller/__init__.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
}
}

// CHIP_Reset does not return, but is not declared as such in the SDK.
void __attribute__ ((noreturn)) CHIP_Reset(void);

void common_hal_mcu_reset(void) {
filesystem_flush(); // TODO: implement as part of flash improvements
CHIP_Reset();
Expand Down
4 changes: 1 addition & 3 deletions shared-bindings/_bleio/PacketBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ 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 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,
uint32_t *outgoing_buffer1, uint32_t *outgoing_buffer2, size_t max_packet_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);
Expand Down