From 06223b78feedba1ea16895689d9bd7892d0d6217 Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Thu, 20 Feb 2025 09:13:11 +0100 Subject: [PATCH] refactor(ble): rename ble_management [no changelog] --- nordic/trezor/trezor-ble/CMakeLists.txt | 2 +- .../trezor/trezor-ble/src/ble/advertising.c | 10 +++---- nordic/trezor/trezor-ble/src/ble/ble.c | 4 +-- .../trezor/trezor-ble/src/ble/ble_internal.h | 8 +++--- .../ble/{management.c => ble_management.c} | 26 +++++++++---------- nordic/trezor/trezor-ble/src/ble/connection.c | 4 +-- 6 files changed, 27 insertions(+), 27 deletions(-) rename nordic/trezor/trezor-ble/src/ble/{management.c => ble_management.c} (86%) diff --git a/nordic/trezor/trezor-ble/CMakeLists.txt b/nordic/trezor/trezor-ble/CMakeLists.txt index 4446c38e84..81e6f3e8c4 100644 --- a/nordic/trezor/trezor-ble/CMakeLists.txt +++ b/nordic/trezor/trezor-ble/CMakeLists.txt @@ -13,7 +13,7 @@ target_sources(app PRIVATE src/main.c src/ble/connection.c src/ble/advertising.c - src/ble/management.c + src/ble/ble_management.c src/ble/service.c src/ble/bonds.c src/ble/pairing.c diff --git a/nordic/trezor/trezor-ble/src/ble/advertising.c b/nordic/trezor/trezor-ble/src/ble/advertising.c index 5a84f3adad..f5f0ca6d71 100644 --- a/nordic/trezor/trezor-ble/src/ble/advertising.c +++ b/nordic/trezor/trezor-ble/src/ble/advertising.c @@ -129,32 +129,32 @@ void advertising_start(bool wl, uint8_t color, uint32_t device_code, } if (err) { LOG_ERR("Advertising failed to start (err %d)", err); - management_send_status_event(); + ble_management_send_status_event(); return; } advertising = true; advertising_wl = wl; - management_send_status_event(); + ble_management_send_status_event(); } void advertising_stop(void) { if (!advertising) { LOG_WRN("Not advertising"); - management_send_status_event(); + ble_management_send_status_event(); return; } int err = bt_le_adv_stop(); if (err) { LOG_ERR("Advertising failed to stop (err %d)", err); - management_send_status_event(); + ble_management_send_status_event(); return; } advertising = false; advertising_wl = false; - management_send_status_event(); + ble_management_send_status_event(); } bool advertising_is_advertising(void) { return advertising; } diff --git a/nordic/trezor/trezor-ble/src/ble/ble.c b/nordic/trezor/trezor-ble/src/ble/ble.c index 5bf829deac..685baef4c7 100644 --- a/nordic/trezor/trezor-ble/src/ble/ble.c +++ b/nordic/trezor/trezor-ble/src/ble/ble.c @@ -74,12 +74,12 @@ bool ble_init(void) { } advertising_init(); - management_init(); + ble_management_init(); k_sem_give(&ble_init_ok); LOG_INF("Bluetooth initialized"); - management_send_status_event(); + ble_management_send_status_event(); return true; } diff --git a/nordic/trezor/trezor-ble/src/ble/ble_internal.h b/nordic/trezor/trezor-ble/src/ble/ble_internal.h index 37f54e0abf..1cf9e801e7 100644 --- a/nordic/trezor/trezor-ble/src/ble/ble_internal.h +++ b/nordic/trezor/trezor-ble/src/ble/ble_internal.h @@ -88,13 +88,13 @@ typedef enum { // BLE management functions // Initialization -void management_init(void); +void ble_management_init(void); // Send status event -void management_send_status_event(void); +void ble_management_send_status_event(void); // Send Pairing Request event, data is the pairing code -void management_send_pairing_request_event(uint8_t *data, uint16_t len); +void ble_management_send_pairing_request_event(uint8_t *data, uint16_t len); // Send Pairing Cancelled event -void management_send_pairing_cancelled_event(void); +void ble_management_send_pairing_cancelled_event(void); // Bonds // Erase all bonds diff --git a/nordic/trezor/trezor-ble/src/ble/management.c b/nordic/trezor/trezor-ble/src/ble/ble_management.c similarity index 86% rename from nordic/trezor/trezor-ble/src/ble/management.c rename to nordic/trezor/trezor-ble/src/ble/ble_management.c index 463a8fadbe..ea14e1c3c1 100644 --- a/nordic/trezor/trezor-ble/src/ble/management.c +++ b/nordic/trezor/trezor-ble/src/ble/ble_management.c @@ -33,9 +33,9 @@ #define LOG_MODULE_NAME ble_manangement LOG_MODULE_REGISTER(LOG_MODULE_NAME); -static K_SEM_DEFINE(management_ok, 0, 1); +static K_SEM_DEFINE(ble_management_ok, 0, 1); -void management_send_status_event(void) { +void ble_management_send_status_event(void) { // ble_version_t version = {0}; // // sd_ble_version_get(&version); @@ -60,21 +60,21 @@ void management_send_status_event(void) { trz_comm_send_msg(NRF_SERVICE_BLE_MANAGER, (uint8_t *)&msg, sizeof(msg)); } -void management_send_success_event(void) { +static void management_send_success_event(void) { uint8_t tx_data[] = { INTERNAL_EVENT_SUCCESS, }; trz_comm_send_msg(NRF_SERVICE_BLE_MANAGER, tx_data, sizeof(tx_data)); } -void management_send_failure_event(void) { +static void management_send_failure_event(void) { uint8_t tx_data[] = { INTERNAL_EVENT_FAILURE, }; trz_comm_send_msg(NRF_SERVICE_BLE_MANAGER, tx_data, sizeof(tx_data)); } -void management_send_pairing_cancelled_event(void) { +void ble_management_send_pairing_cancelled_event(void) { uint8_t tx_data[1] = {0}; tx_data[0] = INTERNAL_EVENT_PAIRING_CANCELLED; @@ -82,7 +82,7 @@ void management_send_pairing_cancelled_event(void) { trz_comm_send_msg(NRF_SERVICE_BLE_MANAGER, tx_data, sizeof(tx_data)); } -void management_send_pairing_request_event(uint8_t *data, uint16_t len) { +void ble_management_send_pairing_request_event(uint8_t *data, uint16_t len) { uint8_t tx_data[7] = {0}; tx_data[0] = INTERNAL_EVENT_PAIRING_REQUEST; @@ -96,7 +96,7 @@ void management_send_pairing_request_event(uint8_t *data, uint16_t len) { trz_comm_send_msg(NRF_SERVICE_BLE_MANAGER, tx_data, sizeof(tx_data)); } -void management_send_mac(uint8_t *mac) { +static void management_send_mac(uint8_t *mac) { uint8_t tx_data[1 + BT_ADDR_SIZE] = {0}; tx_data[0] = INTERNAL_EVENT_MAC; memcpy(&tx_data[1], mac, BT_ADDR_SIZE); @@ -110,7 +110,7 @@ static void process_command(uint8_t *data, uint16_t len) { switch (cmd) { case INTERNAL_CMD_SEND_STATE: send_response = false; - management_send_status_event(); + ble_management_send_status_event(); break; case INTERNAL_CMD_ADVERTISING_ON: { uint8_t color = data[2]; @@ -162,11 +162,11 @@ static void process_command(uint8_t *data, uint16_t len) { } } -void management_init(void) { k_sem_give(&management_ok); } +void ble_management_init(void) { k_sem_give(&ble_management_ok); } -void management_thread(void) { +void ble_management_thread(void) { /* Don't go any further until BLE is initialized */ - k_sem_take(&management_ok, K_FOREVER); + k_sem_take(&ble_management_ok, K_FOREVER); for (;;) { trz_packet_t *buf = trz_comm_poll_data(NRF_SERVICE_BLE_MANAGER); @@ -175,5 +175,5 @@ void management_thread(void) { } } -K_THREAD_DEFINE(management_thread_id, CONFIG_DEFAULT_THREAD_STACK_SIZE, - management_thread, NULL, NULL, NULL, 7, 0, 0); +K_THREAD_DEFINE(ble_management_thread_id, CONFIG_DEFAULT_THREAD_STACK_SIZE, + ble_management_thread, NULL, NULL, NULL, 7, 0, 0); diff --git a/nordic/trezor/trezor-ble/src/ble/connection.c b/nordic/trezor/trezor-ble/src/ble/connection.c index ca761adae2..f0e0dba719 100644 --- a/nordic/trezor/trezor-ble/src/ble/connection.c +++ b/nordic/trezor/trezor-ble/src/ble/connection.c @@ -56,7 +56,7 @@ void connected(struct bt_conn *conn, uint8_t err) { // LOG_ERR("Phy update request failed: %d", err); // } - management_send_status_event(); + ble_management_send_status_event(); } void disconnected(struct bt_conn *conn, uint8_t reason) { @@ -73,7 +73,7 @@ void disconnected(struct bt_conn *conn, uint8_t reason) { current_conn = NULL; } - management_send_status_event(); + ble_management_send_status_event(); } static void security_changed(struct bt_conn *conn, bt_security_t level,