diff --git a/CHANGELOG.md b/CHANGELOG.md index d44501395..bf83dc04b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -235,3 +235,4 @@ - Mifare Nested: Superseded by NFC app after OFW PR 3822 (MIFARE Classic Key Recovery Improvements) - ESP Flasher: - Removed Airtag Scanner and ESP32-S2 Wardriver due to low user interest and to make space for Ghost ESP +- API: Removed `furi_hal_bt_reverse_mac_addr()` and implemented in individual apps instead diff --git a/applications/main/bad_kb/bad_kb_app_i.h b/applications/main/bad_kb/bad_kb_app_i.h index a7d3844ac..cf9b931f0 100644 --- a/applications/main/bad_kb/bad_kb_app_i.h +++ b/applications/main/bad_kb/bad_kb_app_i.h @@ -110,3 +110,12 @@ void bad_kb_conn_reset(BadKbApp* app); void bad_kb_config_refresh(BadKbApp* app); void bad_kb_config_adjust(BadKbConfig* cfg); + +void reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]) { + uint8_t tmp; + for(size_t i = 0; i < GAP_MAC_ADDR_SIZE / 2; i++) { + tmp = mac_addr[i]; + mac_addr[i] = mac_addr[GAP_MAC_ADDR_SIZE - 1 - i]; + mac_addr[GAP_MAC_ADDR_SIZE - 1 - i] = tmp; + } +} diff --git a/applications/main/bad_kb/helpers/ducky_script.c b/applications/main/bad_kb/helpers/ducky_script.c index 607f48a04..64b78d9eb 100644 --- a/applications/main/bad_kb/helpers/ducky_script.c +++ b/applications/main/bad_kb/helpers/ducky_script.c @@ -342,7 +342,7 @@ static bool ducky_set_bt_id(BadKbScript* bad_kb, const char* line) { return false; } } - furi_hal_bt_reverse_mac_addr(cfg->ble.mac); + reverse_mac_addr(cfg->ble.mac); strlcpy(cfg->ble.name, line + mac_len, sizeof(cfg->ble.name)); FURI_LOG_D(WORKER_TAG, "set bt id: %s", line); diff --git a/applications/main/bad_kb/scenes/bad_kb_scene_config_bt_mac.c b/applications/main/bad_kb/scenes/bad_kb_scene_config_bt_mac.c index ea9849448..d80a874c7 100644 --- a/applications/main/bad_kb/scenes/bad_kb_scene_config_bt_mac.c +++ b/applications/main/bad_kb/scenes/bad_kb_scene_config_bt_mac.c @@ -14,7 +14,7 @@ void bad_kb_scene_config_bt_mac_on_enter(void* context) { bad_kb->bt_mac_buf, bad_kb->set_bt_id ? bad_kb->id_config.ble.mac : bad_kb->config.ble.mac, sizeof(bad_kb->bt_mac_buf)); - furi_hal_bt_reverse_mac_addr(bad_kb->bt_mac_buf); + reverse_mac_addr(bad_kb->bt_mac_buf); byte_input_set_header_text(byte_input, "Set BT MAC address"); byte_input_set_result_callback( @@ -35,7 +35,7 @@ bool bad_kb_scene_config_bt_mac_on_event(void* context, SceneManagerEvent event) if(event.type == SceneManagerEventTypeCustom) { consumed = true; if(event.event == BadKbAppCustomEventByteInputDone) { - furi_hal_bt_reverse_mac_addr(bad_kb->bt_mac_buf); + reverse_mac_addr(bad_kb->bt_mac_buf); // Set user config and remember memcpy(bad_kb->config.ble.mac, bad_kb->bt_mac_buf, sizeof(bad_kb->config.ble.mac)); // Apply to ID config so its temporarily overridden diff --git a/applications/system/findmy/findmy.c b/applications/system/findmy/findmy.c index 24a27ced6..bfd91db52 100644 --- a/applications/system/findmy/findmy.c +++ b/applications/system/findmy/findmy.c @@ -131,7 +131,7 @@ void findmy_set_tag_type(FindMy* app, FindMyType type) { findmy_main_update_type(app->findmy_main, type); } -void furi_hal_bt_reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]) { +void reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]) { uint8_t tmp; for(size_t i = 0; i < GAP_MAC_ADDR_SIZE / 2; i++) { tmp = mac_addr[i]; diff --git a/applications/system/findmy/findmy_i.h b/applications/system/findmy/findmy_i.h index 565c35fdf..3a4688da5 100644 --- a/applications/system/findmy/findmy_i.h +++ b/applications/system/findmy/findmy_i.h @@ -20,9 +20,8 @@ #include #include "scenes/findmy_scene.h" #include "helpers/base64.h" -#ifdef FW_ORIGIN_Official -void furi_hal_bt_reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]); -#endif + +void reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]); struct FindMy { Gui* gui; diff --git a/applications/system/findmy/scenes/findmy_scene_config_import.c b/applications/system/findmy/scenes/findmy_scene_config_import.c index 90297e6b2..d8632427d 100644 --- a/applications/system/findmy/scenes/findmy_scene_config_import.c +++ b/applications/system/findmy/scenes/findmy_scene_config_import.c @@ -28,7 +28,7 @@ static const char* parse_nrf_connect(FindMy* app, const char* path) { } } if(error) break; - furi_hal_bt_reverse_mac_addr(mac); + reverse_mac_addr(mac); error = "Can't open file"; if(!file_stream_open(stream, path, FSAM_READ, FSOM_OPEN_EXISTING)) break; @@ -109,7 +109,7 @@ static const char* parse_open_haystack(FindMy* app, const char* path) { memcpy(app->state.mac, public_key, sizeof(app->state.mac)); app->state.mac[0] |= 0b11000000; - furi_hal_bt_reverse_mac_addr(app->state.mac); + reverse_mac_addr(app->state.mac); uint8_t advertisement_template[EXTRA_BEACON_MAX_DATA_SIZE] = { 0x1e, // length (30) diff --git a/applications/system/findmy/scenes/findmy_scene_config_mac.c b/applications/system/findmy/scenes/findmy_scene_config_mac.c index e14ef5e07..360df5320 100644 --- a/applications/system/findmy/scenes/findmy_scene_config_mac.c +++ b/applications/system/findmy/scenes/findmy_scene_config_mac.c @@ -17,7 +17,7 @@ void findmy_scene_config_mac_on_enter(void* context) { byte_input_set_header_text(byte_input, "Enter Bluetooth MAC:"); memcpy(app->mac_buf, app->state.mac, sizeof(app->mac_buf)); - furi_hal_bt_reverse_mac_addr(app->mac_buf); + reverse_mac_addr(app->mac_buf); byte_input_set_result_callback( byte_input, @@ -38,7 +38,7 @@ bool findmy_scene_config_mac_on_event(void* context, SceneManagerEvent event) { consumed = true; switch(event.event) { case ByteInputResultOk: - furi_hal_bt_reverse_mac_addr(app->mac_buf); + reverse_mac_addr(app->mac_buf); memcpy(&app->state.mac, app->mac_buf, sizeof(app->state.mac)); findmy_state_save_and_apply(&app->state); findmy_main_update_mac(app->findmy_main, app->state.mac); diff --git a/applications/system/findmy/views/findmy_main.c b/applications/system/findmy/views/findmy_main.c index bc89de975..711f73d09 100644 --- a/applications/system/findmy/views/findmy_main.c +++ b/applications/system/findmy/views/findmy_main.c @@ -177,7 +177,7 @@ void findmy_main_update_mac(FindMyMain* findmy_main, uint8_t* mac) { FindMyMainModel * model, { memcpy(model->mac, mac, sizeof(model->mac)); - furi_hal_bt_reverse_mac_addr(model->mac); + reverse_mac_addr(model->mac); }, true); } diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index cd892e373..5f98152bb 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -1333,7 +1333,6 @@ Function,+,furi_hal_bt_lock_core2,void, Function,+,furi_hal_bt_nvm_sram_sem_acquire,void, Function,+,furi_hal_bt_nvm_sram_sem_release,void, Function,+,furi_hal_bt_reinit,void, -Function,+,furi_hal_bt_reverse_mac_addr,void,uint8_t[( 6 )] Function,+,furi_hal_bt_set_key_storage_change_callback,void,"BleGlueKeyStorageChangedCallback, void*" Function,+,furi_hal_bt_start_advertising,void, Function,+,furi_hal_bt_start_app,FuriHalBleProfileBase*,"const FuriHalBleProfileTemplate*, FuriHalBleProfileParams, GapEventCallback, void*" diff --git a/targets/f7/furi_hal/furi_hal_bt.c b/targets/f7/furi_hal/furi_hal_bt.c index e7882576d..1d5c181b8 100644 --- a/targets/f7/furi_hal/furi_hal_bt.c +++ b/targets/f7/furi_hal/furi_hal_bt.c @@ -406,15 +406,6 @@ uint32_t furi_hal_bt_get_conn_rssi(uint8_t* rssi) { return since; } -void furi_hal_bt_reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]) { - uint8_t tmp; - for(size_t i = 0; i < GAP_MAC_ADDR_SIZE / 2; i++) { - tmp = mac_addr[i]; - mac_addr[i] = mac_addr[GAP_MAC_ADDR_SIZE - 1 - i]; - mac_addr[GAP_MAC_ADDR_SIZE - 1 - i] = tmp; - } -} - uint32_t furi_hal_bt_get_transmitted_packets(void) { uint32_t packets = 0; aci_hal_le_tx_test_packet_number(&packets); diff --git a/targets/furi_hal_include/furi_hal_bt.h b/targets/furi_hal_include/furi_hal_bt.h index 14c2975ac..b5cdfc829 100644 --- a/targets/furi_hal_include/furi_hal_bt.h +++ b/targets/furi_hal_include/furi_hal_bt.h @@ -231,11 +231,6 @@ float furi_hal_bt_get_rssi(void); */ uint32_t furi_hal_bt_get_transmitted_packets(void); -/** Reverse a MAC address byte order in-place - * @param[in] mac mac address to reverse -*/ -void furi_hal_bt_reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]); - uint32_t furi_hal_bt_get_conn_rssi(uint8_t* rssi); bool furi_hal_bt_is_connected(void);