diff options
Diffstat (limited to 'main/bte_conf.cc')
-rw-r--r-- | main/bte_conf.cc | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/main/bte_conf.cc b/main/bte_conf.cc index 4634ccec1..a60015a4e 100644 --- a/main/bte_conf.cc +++ b/main/bte_conf.cc @@ -35,7 +35,7 @@ void bte_load_did_conf(const char* p_path) { std::unique_ptr<config_t> config = config_new(p_path); if (!config) { - LOG_ERROR("%s unable to load DID config '%s'.", __func__, p_path); + LOG_ERROR(LOG_TAG, "%s unable to load DID config '%s'.", __func__, p_path); return; } @@ -44,11 +44,11 @@ void bte_load_did_conf(const char* p_path) { snprintf(section_name, sizeof(section_name), "DID%d", i); if (!config_has_section(*config, section_name)) { - LOG_INFO("%s no section named %s.", __func__, section_name); + LOG_DEBUG(LOG_TAG, "%s no section named %s.", __func__, section_name); break; } - tSDP_DI_RECORD record; + tBTA_DI_RECORD record; record.vendor = config_get_int(*config, section_name, "vendorId", LMP_COMPID_GOOGLE); record.vendor_id_source = config_get_int( @@ -75,26 +75,29 @@ void bte_load_did_conf(const char* p_path) { if (record.vendor_id_source != DI_VENDOR_ID_SOURCE_BTSIG && record.vendor_id_source != DI_VENDOR_ID_SOURCE_USBIF) { - LOG_ERROR("%s invalid vendor id source %d; ignoring DID record %d.", + LOG_ERROR(LOG_TAG, + "%s invalid vendor id source %d; ignoring DID record %d.", __func__, record.vendor_id_source, i); continue; } - LOG_INFO("Device ID record %d : %s", i, - (record.primary_record ? "primary" : "not primary")); - LOG_INFO(" vendorId = %04x", record.vendor); - LOG_INFO(" vendorIdSource = %04x", record.vendor_id_source); - LOG_INFO(" product = %04x", record.product); - LOG_INFO(" version = %04x", record.version); - LOG_INFO(" clientExecutableURL = %s", record.client_executable_url); - LOG_INFO(" serviceDescription = %s", record.service_description); - LOG_INFO(" documentationURL = %s", record.documentation_url); + LOG_DEBUG(LOG_TAG, "Device ID record %d : %s", i, + (record.primary_record ? "primary" : "not primary")); + LOG_DEBUG(LOG_TAG, " vendorId = %04x", record.vendor); + LOG_DEBUG(LOG_TAG, " vendorIdSource = %04x", record.vendor_id_source); + LOG_DEBUG(LOG_TAG, " product = %04x", record.product); + LOG_DEBUG(LOG_TAG, " version = %04x", record.version); + LOG_DEBUG(LOG_TAG, " clientExecutableURL = %s", + record.client_executable_url); + LOG_DEBUG(LOG_TAG, " serviceDescription = %s", + record.service_description); + LOG_DEBUG(LOG_TAG, " documentationURL = %s", record.documentation_url); uint32_t record_handle; tBTA_STATUS status = BTA_DmSetLocalDiRecord(&record, &record_handle); if (status != BTA_SUCCESS) { - LOG_ERROR("%s unable to set device ID record %d: error %d.", __func__, i, - status); + LOG_ERROR(LOG_TAG, "%s unable to set device ID record %d: error %d.", + __func__, i, status); } } } |