From 6572959fd3f55050f5cad6f0b79ca3efbc808fb9 Mon Sep 17 00:00:00 2001 From: Wei Tian Hua Date: Mon, 25 May 2020 11:57:37 +0800 Subject: [PATCH] Add user invisible kconfig for bt mac offset Closes https://github.com/espressif/esp-idf/issues/5320 --- components/esp_common/Kconfig | 5 +++++ components/esp_common/src/mac_addr.c | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/components/esp_common/Kconfig b/components/esp_common/Kconfig index da4f29b53..919a95d6d 100644 --- a/components/esp_common/Kconfig +++ b/components/esp_common/Kconfig @@ -224,6 +224,11 @@ menu "Common ESP-related" config ESP_MAC_ADDR_UNIVERSE_BT bool + config ESP_MAC_ADDR_UNIVERSE_BT_OFFSET + int + default 2 if ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR + default 1 if ESP32_UNIVERSAL_MAC_ADDRESSES_TWO + config ESP_MAC_ADDR_UNIVERSE_ETH bool diff --git a/components/esp_common/src/mac_addr.c b/components/esp_common/src/mac_addr.c index 1cbcf7627..2bbd5de52 100644 --- a/components/esp_common/src/mac_addr.c +++ b/components/esp_common/src/mac_addr.c @@ -185,11 +185,9 @@ esp_err_t esp_read_mac(uint8_t* mac, esp_mac_type_t type) #endif break; case ESP_MAC_BT: - memcpy(mac, efuse_mac, 6); #if CONFIG_ESP_MAC_ADDR_UNIVERSE_BT - mac[5] += 2; -#else - mac[5] += 1; + memcpy(mac, efuse_mac, 6); + mac[5] += CONFIG_ESP_MAC_ADDR_UNIVERSE_BT_OFFSET; #endif break; case ESP_MAC_ETH: